From 6c67004e2406c0953e1f6692a381d7bf80ea0ec3 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 12 Jul 2023 20:26:26 -0400
Subject: [PATCH 0001/1141] Begin scaffolding new Selection data structure

---
 mathesar_ui/.eslintrc.cjs                     |   1 +
 mathesar_ui/src/components/sheet/cellIds.ts   |  24 ++
 .../components/sheet/selection/IdSequence.ts  |  50 ++++
 .../src/components/sheet/selection/Plane.ts   |  72 ++++++
 .../components/sheet/selection/Selection.ts   | 243 ++++++++++++++++++
 .../components/sheet/tests/cellIds.test.ts    |  27 ++
 .../src/utils/__tests__/iterUtils.test.ts     |  21 ++
 mathesar_ui/src/utils/iterUtils.ts            |  14 +
 8 files changed, 452 insertions(+)
 create mode 100644 mathesar_ui/src/components/sheet/cellIds.ts
 create mode 100644 mathesar_ui/src/components/sheet/selection/IdSequence.ts
 create mode 100644 mathesar_ui/src/components/sheet/selection/Plane.ts
 create mode 100644 mathesar_ui/src/components/sheet/selection/Selection.ts
 create mode 100644 mathesar_ui/src/components/sheet/tests/cellIds.test.ts
 create mode 100644 mathesar_ui/src/utils/__tests__/iterUtils.test.ts
 create mode 100644 mathesar_ui/src/utils/iterUtils.ts

diff --git a/mathesar_ui/.eslintrc.cjs b/mathesar_ui/.eslintrc.cjs
index 5487252656..7de5aaf976 100644
--- a/mathesar_ui/.eslintrc.cjs
+++ b/mathesar_ui/.eslintrc.cjs
@@ -21,6 +21,7 @@ module.exports = {
   rules: {
     'import/no-extraneous-dependencies': ['error', { devDependencies: true }],
     'no-console': ['warn', { allow: ['error'] }],
+    'generator-star-spacing': 'off',
     '@typescript-eslint/explicit-member-accessibility': 'off',
     '@typescript-eslint/ban-ts-comment': [
       'error',
diff --git a/mathesar_ui/src/components/sheet/cellIds.ts b/mathesar_ui/src/components/sheet/cellIds.ts
new file mode 100644
index 0000000000..40c8297dea
--- /dev/null
+++ b/mathesar_ui/src/components/sheet/cellIds.ts
@@ -0,0 +1,24 @@
+const CELL_ID_DELIMITER = '-';
+
+/**
+ * We can serialize a cell id this way only because we're confident that the
+ * rowId will never contain the delimiter. Some columnIds _do_ contain
+ * delimiters (e.g. in the Data Explorer), but that's okay because we can still
+ * separate the values based on the first delimiter.
+ */
+export function makeCellId(rowId: string, columnId: string): string {
+  return `${rowId}${CELL_ID_DELIMITER}${columnId}`;
+}
+
+export function parseCellId(cellId: string): {
+  rowId: string;
+  columnId: string;
+} {
+  const delimiterIndex = cellId.indexOf(CELL_ID_DELIMITER);
+  if (delimiterIndex === -1) {
+    throw new Error(`Unable to parse cell id without a delimiter: ${cellId}.`);
+  }
+  const rowId = cellId.slice(0, delimiterIndex);
+  const columnId = cellId.slice(delimiterIndex + 1);
+  return { rowId, columnId };
+}
diff --git a/mathesar_ui/src/components/sheet/selection/IdSequence.ts b/mathesar_ui/src/components/sheet/selection/IdSequence.ts
new file mode 100644
index 0000000000..85eb73ebe6
--- /dev/null
+++ b/mathesar_ui/src/components/sheet/selection/IdSequence.ts
@@ -0,0 +1,50 @@
+import { ImmutableMap } from '@mathesar/component-library';
+
+export default class IdSequence<Id> {
+  private readonly values: Id[];
+
+  /** Maps the id value to its index */
+  private readonly indexLookup: ImmutableMap<Id, number>;
+
+  /**
+   * @throws Error if duplicate values are provided
+   */
+  constructor(values: Id[]) {
+    this.values = values;
+    this.indexLookup = new ImmutableMap(
+      values.map((value, index) => [value, index]),
+    );
+    if (new Set(values).size !== values.length) {
+      throw new Error('Duplicate values are not allowed within an IdSequence.');
+    }
+  }
+
+  get length(): number {
+    return this.values.length;
+  }
+
+  /**
+   * Return an iterator of all values between the two provided values,
+   * inclusive. Iteration occurs in the order stored. The two provided values
+   * may be present in any order.
+   *
+   * @throws an Error if either value is not present in the sequence
+   */
+  range(a: Id, b: Id): Iterable<Id> {
+    const aIndex = this.indexLookup.get(a);
+    const bIndex = this.indexLookup.get(b);
+
+    if (aIndex === undefined || bIndex === undefined) {
+      throw new Error('Id value not found within sequence.');
+    }
+
+    const startIndex = Math.min(aIndex, bIndex);
+    const endIndex = Math.max(aIndex, bIndex);
+
+    return this.values.slice(startIndex, endIndex + 1);
+  }
+
+  [Symbol.iterator](): Iterator<Id> {
+    return this.values[Symbol.iterator]();
+  }
+}
diff --git a/mathesar_ui/src/components/sheet/selection/Plane.ts b/mathesar_ui/src/components/sheet/selection/Plane.ts
new file mode 100644
index 0000000000..cec6abe732
--- /dev/null
+++ b/mathesar_ui/src/components/sheet/selection/Plane.ts
@@ -0,0 +1,72 @@
+import { map } from 'iter-tools';
+
+import { cartesianProduct } from '@mathesar/utils/iterUtils';
+import type IdSequence from './IdSequence';
+import { makeCellId } from '../cellIds';
+
+function makeCells(
+  rowIds: Iterable<string>,
+  columnIds: Iterable<string>,
+): Iterable<string> {
+  return map(
+    ([rowId, columnId]) => makeCellId(rowId, columnId),
+    cartesianProduct(rowIds, columnIds),
+  );
+}
+
+export default class Plane {
+  readonly rowIds: IdSequence<string>;
+
+  readonly columnIds: IdSequence<string>;
+
+  readonly placeholderRowId: string | undefined;
+
+  constructor(
+    rowIds: IdSequence<string>,
+    columnIds: IdSequence<string>,
+    placeholderRowId: string | undefined,
+  ) {
+    this.rowIds = rowIds;
+    this.columnIds = columnIds;
+    this.placeholderRowId = placeholderRowId;
+  }
+
+  /**
+   * @returns an iterable of all the data cells in the plane. This does not
+   * include header cells or placeholder cells.
+   */
+  allDataCells(): Iterable<string> {
+    return makeCells(this.rowIds, this.columnIds);
+  }
+
+  /**
+   * @returns an iterable of all the data cells in the plane that are in or
+   * between the two given rows. This does not include header cells.
+   *
+   * @throws Error if the id of the placeholder row is specified because the
+   * placeholder row is not a data row.
+   */
+  dataCellsInRowRange(rowIdA: string, rowIdB: string): Iterable<string> {
+    return makeCells(this.rowIds.range(rowIdA, rowIdB), this.columnIds);
+  }
+
+  /**
+   * @returns an iterable of all the data cells in the plane that are in or
+   * between the two given columns. This does not include header cells or
+   * placeholder cells.
+   */
+  dataCellsInColumnRange(
+    columnIdA: string,
+    columnIdB: string,
+  ): Iterable<string> {
+    return makeCells(this.rowIds, this.columnIds.range(columnIdA, columnIdB));
+  }
+
+  get hasResultRows(): boolean {
+    return this.rowIds.length > 0;
+  }
+
+  get hasPlaceholder(): boolean {
+    return this.placeholderRowId !== undefined;
+  }
+}
diff --git a/mathesar_ui/src/components/sheet/selection/Selection.ts b/mathesar_ui/src/components/sheet/selection/Selection.ts
new file mode 100644
index 0000000000..44f70d27c4
--- /dev/null
+++ b/mathesar_ui/src/components/sheet/selection/Selection.ts
@@ -0,0 +1,243 @@
+import { first } from 'iter-tools';
+
+import { ImmutableSet } from '@mathesar/component-library';
+import type Plane from './Plane';
+import { parseCellId } from '../cellIds';
+
+export enum Direction {
+  Up = 'up',
+  Down = 'down',
+  Left = 'left',
+  Right = 'right',
+}
+
+interface Basis {
+  /**
+   * - `'dataCells'` means that the selection contains data cells. This is by
+   *   far the most common type of selection basis.
+   *
+   * - `'emptyColumns'` is used when the sheet has no rows. In this case we
+   *   still want to allow the user to select columns, so we use this basis.
+   *
+   * - `'placeholderCell'` is used when the user is selecting a cell in the
+   *   placeholder row. This is a special case because we don't want to allow
+   *   the user to select multiple cells in the placeholder row, and we also
+   *   don't want to allow selections that include cells in data rows _and_ the
+   *   placeholder row.
+   */
+  readonly type: 'dataCells' | 'emptyColumns' | 'placeholderCell';
+  readonly activeCellId: string | undefined;
+  readonly cellIds: ImmutableSet<string>;
+  readonly rowIds: ImmutableSet<string>;
+  readonly columnIds: ImmutableSet<string>;
+}
+
+function basisFromDataCells(
+  cellIds: Iterable<string>,
+  activeCellId?: string,
+): Basis {
+  const parsedCells = [...cellIds].map(parseCellId);
+  return {
+    type: 'dataCells',
+    activeCellId: activeCellId ?? first(cellIds),
+    cellIds: new ImmutableSet(cellIds),
+    columnIds: new ImmutableSet(parsedCells.map((cellId) => cellId.columnId)),
+    rowIds: new ImmutableSet(parsedCells.map((cellId) => cellId.rowId)),
+  };
+}
+
+function basisFromEmptyColumns(columnIds: Iterable<string>): Basis {
+  return {
+    type: 'emptyColumns',
+    activeCellId: undefined,
+    cellIds: new ImmutableSet(),
+    columnIds: new ImmutableSet(columnIds),
+    rowIds: new ImmutableSet(),
+  };
+}
+
+function basisFromZeroEmptyColumns(): Basis {
+  return basisFromEmptyColumns([]);
+}
+
+function basisFromPlaceholderCell(activeCellId: string): Basis {
+  return {
+    type: 'placeholderCell',
+    activeCellId,
+    cellIds: new ImmutableSet([activeCellId]),
+    columnIds: new ImmutableSet([parseCellId(activeCellId).columnId]),
+    rowIds: new ImmutableSet(),
+  };
+}
+
+export default class Selection {
+  private readonly plane: Plane;
+
+  private readonly basis: Basis;
+
+  constructor(plane: Plane, basis: Basis) {
+    this.plane = plane;
+    this.basis = basis;
+  }
+
+  get activeCellId() {
+    return this.basis.activeCellId;
+  }
+
+  get cellIds() {
+    return this.basis.cellIds;
+  }
+
+  get rowIds() {
+    return this.basis.rowIds;
+  }
+
+  get columnIds() {
+    return this.basis.columnIds;
+  }
+
+  private withBasis(basis: Basis): Selection {
+    return new Selection(this.plane, basis);
+  }
+
+  /**
+   * @returns a new selection with all cells selected. The active cell will be the
+   * cell in the first row and first column.
+   */
+  ofAllDataCells(): Selection {
+    if (!this.plane.hasResultRows) {
+      return this.withBasis(basisFromZeroEmptyColumns());
+    }
+    return this.withBasis(basisFromDataCells(this.plane.allDataCells()));
+  }
+
+  /**
+   * @returns a new selection with the cell in the first row and first column
+   * selected.
+   */
+  ofFirstDataCell(): Selection {
+    const firstCellId = first(this.plane.allDataCells());
+    if (firstCellId === undefined) {
+      return this.withBasis(basisFromZeroEmptyColumns());
+    }
+    return this.withBasis(basisFromDataCells([firstCellId]));
+  }
+
+  /**
+   * @returns a new selection with all rows selected between (and including) the
+   * provided rows.
+   *
+   * If either of the provided rows are placeholder rows, then the last data row
+   * will be used in their place. This ensures that the selection is made only
+   * of data rows, and will never include the placeholder row, even if a user
+   * drags to select it.
+   */
+  ofRowRange(rowIdA: string, rowIdB: string): Selection {
+    throw new Error('Not implemented');
+  }
+
+  /**
+   * @returns a new selection of all data cells in all columns between the
+   * provided columnIds, inclusive.
+   */
+  ofColumnRange(columnIdA: string, columnIdB: string): Selection {
+    if (!this.plane.hasResultRows) {
+      throw new Error('Not implemented');
+    }
+    throw new Error('Not implemented');
+  }
+
+  /**
+   * @returns a new selection formed by the rectangle between the provided
+   * cells, inclusive.
+   *
+   * If either of the provided cells are in the placeholder row, then the cell
+   * in the last data row will be used in its place. This ensures that the
+   * selection is made only of data cells, and will never include cells in the
+   * placeholder row, even if a user drags to select a cell in it.
+   */
+  ofCellRange(cellIdA: string, cellIdB: string): Selection {
+    throw new Error('Not implemented');
+  }
+
+  /**
+   * @returns a new selection formed from one cell within the placeholder row.
+   * Note that we do not support selections of multiple cells in the placeholder
+   * row.
+   */
+  atPlaceholderCell(cellId: string): Selection {
+    throw new Error('Not implemented');
+  }
+
+  /**
+   * @returns a new selection that fits within the provided plane. This is
+   * useful when a column is deleted, reordered, or inserted.
+   */
+  forNewPlane(plane: Plane): Selection {
+    throw new Error('Not implemented');
+  }
+
+  /**
+   * @returns a new selection formed by the rectangle between the currently
+   * active cell and provided cell, inclusive.
+   *
+   * This operation is designed to mimic the behavior of Google Sheets when
+   * shift-clicking a specific cell, or when dragging to create a new selection.
+   * A new selection is created that contains all cells in a rectangle bounded
+   * by the active cell (also the first cell selected when dragging) and the
+   * provided cell.
+   */
+  drawnToCell(cellId: string): Selection {
+    throw new Error('Not implemented');
+  }
+
+  /**
+   * @returns a new selection formed by the cells in all the rows between the
+   * active cell and the provided row, inclusive.
+   */
+  drawnToRow(rowId: string): Selection {
+    throw new Error('Not implemented');
+  }
+
+  drawnToColumn(columnId: string): Selection {
+    throw new Error('Not implemented');
+  }
+
+  /**
+   * @returns a new selection that mimics the behavior of arrow keys in
+   * spreadsheets. If the active cell can be moved in the provided direction,
+   * then a new selection is created with only that one cell selected.
+   */
+  collapsedAndMoved(direction: Direction): Selection {
+    throw new Error('Not implemented');
+  }
+
+  /**
+   * @returns a new selection with the active cell moved within the selection,
+   * left to right, top to bottom.
+   *
+   * This is to handle the `Tab` and `Shift+Tab` keys.
+   */
+  withActiveCellAdvanced(direction: 'forward' | 'back' = 'forward'): Selection {
+    throw new Error('Not implemented');
+  }
+
+  /**
+   * @returns a new selection that is grown or shrunk to mimic the behavior of
+   * Google Sheets when manipulating selections via keyboard shortcuts like
+   * `Shift+Down`. The selection is deformed in the direction of the provided
+   * argument. The selection is _shrunk_ if doing so will keep the active cell
+   * within the selection. Otherwise, the selection is _grown_.
+   *
+   * Note that other spreadsheet applications have slightly different behavior
+   * for Shift + arrow keys. For example, LibreOffice Calc maintains state for
+   * the origin of the selection separate from the active cell. The two cells
+   * may be different if the user presses `Tab` after making a selection. In
+   * this case, the selection will be resized with respect to the origin, not
+   * the active cell. We chose to mimic Google Sheets behavior here because it
+   * is simpler.
+   */
+  resized(direction: Direction): Selection {
+    throw new Error('Not implemented');
+  }
+}
diff --git a/mathesar_ui/src/components/sheet/tests/cellIds.test.ts b/mathesar_ui/src/components/sheet/tests/cellIds.test.ts
new file mode 100644
index 0000000000..a4c8702b66
--- /dev/null
+++ b/mathesar_ui/src/components/sheet/tests/cellIds.test.ts
@@ -0,0 +1,27 @@
+import { parseCellId } from '../cellIds';
+
+test.each(
+  // prettier-ignore
+  [
+  // cellId    , rowId , columnId
+    ['a-b'     , 'a'   , 'b'    ],
+    ['a-b-c'   , 'a'   , 'b-c'  ],
+    ['a--b'    , 'a'   , '-b'   ],
+    [' a - b ' , ' a ' , ' b '  ],
+    ['-'       , ''    , ''     ],
+    [' - '     , ' '   , ' '    ],
+    ['--'      , ''    , '-'    ],
+    ['-a-b'    , ''    , 'a-b'  ],
+    ['a-'      , 'a'   , ''     ],
+  ],
+)('parseCellId success %#', (cellId, rowId, columnId) => {
+  const result = parseCellId(cellId);
+  expect(result.rowId).toBe(rowId);
+  expect(result.columnId).toBe(columnId);
+});
+
+test.each([[''], ['foobar']])('parseCellId failure %#', (cellId) => {
+  expect(() => {
+    parseCellId(cellId);
+  }).toThrow();
+});
diff --git a/mathesar_ui/src/utils/__tests__/iterUtils.test.ts b/mathesar_ui/src/utils/__tests__/iterUtils.test.ts
new file mode 100644
index 0000000000..a87d5dc5ef
--- /dev/null
+++ b/mathesar_ui/src/utils/__tests__/iterUtils.test.ts
@@ -0,0 +1,21 @@
+import { cartesianProduct } from '../iterUtils';
+
+test.each([
+  [[], [], []],
+  [[], ['a', 'b'], []],
+  [['a', 'b'], [], []],
+  [
+    ['a', 'b'],
+    ['x', 'y', 'z'],
+    [
+      ['a', 'x'],
+      ['a', 'y'],
+      ['a', 'z'],
+      ['b', 'x'],
+      ['b', 'y'],
+      ['b', 'z'],
+    ],
+  ],
+])('cartesianProduct', (a, b, result) => {
+  expect([...cartesianProduct(a, b)]).toStrictEqual(result);
+});
diff --git a/mathesar_ui/src/utils/iterUtils.ts b/mathesar_ui/src/utils/iterUtils.ts
new file mode 100644
index 0000000000..6a8b915719
--- /dev/null
+++ b/mathesar_ui/src/utils/iterUtils.ts
@@ -0,0 +1,14 @@
+export function cartesianProduct<T, U>(
+  a: Iterable<T>,
+  b: Iterable<U>,
+): Iterable<[T, U]> {
+  return {
+    *[Symbol.iterator]() {
+      for (const x of a) {
+        for (const y of b) {
+          yield [x, y];
+        }
+      }
+    },
+  };
+}

From be561de892212d04c87f3415d1c81375a49e1b61 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 18 Jul 2023 12:35:46 -0400
Subject: [PATCH 0002/1141] Upgrade iter-tools package

---
 mathesar_ui/package-lock.json | 6 +++---
 mathesar_ui/package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mathesar_ui/package-lock.json b/mathesar_ui/package-lock.json
index bd4d9d4ed3..6e78aa6ad4 100644
--- a/mathesar_ui/package-lock.json
+++ b/mathesar_ui/package-lock.json
@@ -18511,9 +18511,9 @@
       }
     },
     "iter-tools": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/iter-tools/-/iter-tools-7.4.0.tgz",
-      "integrity": "sha512-twcHD87GOpbnfFmOtEQMcZuJzBCViNaYx4//70KkkjFcQTkKcUfcuni5G5dfO4Uyb80KIsWnVGZ4vvkpmYCNQQ==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/iter-tools/-/iter-tools-7.5.3.tgz",
+      "integrity": "sha512-iEcHpgM9cn6tsI5MewqxyEega9KPbIDytQTEnu6c0MtlQQhQFofssYuRqxCarZgUdzliepRZPwwwflE4wAIjaA==",
       "requires": {
         "@babel/runtime": "^7.12.1"
       }
diff --git a/mathesar_ui/package.json b/mathesar_ui/package.json
index b092a7c033..9a25e205b9 100644
--- a/mathesar_ui/package.json
+++ b/mathesar_ui/package.json
@@ -63,7 +63,7 @@
     "dayjs": "^1.11.5",
     "fast-diff": "^1.2.0",
     "flatpickr": "^4.6.13",
-    "iter-tools": "^7.4.0",
+    "iter-tools": "^7.5.3",
     "js-cookie": "^3.0.1",
     "papaparse": "^5.4.1",
     "perfect-scrollbar": "^1.5.5"

From 29aedab6ae6e605adc8a4c4630442cb7b571a790 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 18 Jul 2023 15:15:31 -0400
Subject: [PATCH 0003/1141] Fill in more logic within Selection scaffolding

---
 .../components/sheet/selection/Direction.ts   |  50 +++++++
 .../components/sheet/selection/IdSequence.ts  |  82 +++++++++-
 .../src/components/sheet/selection/Plane.ts   | 141 +++++++++++++++++-
 .../components/sheet/selection/Selection.ts   | 122 ++++++++++-----
 .../selection/__tests__/IdSequence.test.ts    |  44 ++++++
 .../sheet/selection/__tests__/Plane.test.ts   |  58 +++++++
 6 files changed, 456 insertions(+), 41 deletions(-)
 create mode 100644 mathesar_ui/src/components/sheet/selection/Direction.ts
 create mode 100644 mathesar_ui/src/components/sheet/selection/__tests__/IdSequence.test.ts
 create mode 100644 mathesar_ui/src/components/sheet/selection/__tests__/Plane.test.ts

diff --git a/mathesar_ui/src/components/sheet/selection/Direction.ts b/mathesar_ui/src/components/sheet/selection/Direction.ts
new file mode 100644
index 0000000000..2693dd9000
--- /dev/null
+++ b/mathesar_ui/src/components/sheet/selection/Direction.ts
@@ -0,0 +1,50 @@
+export enum Direction {
+  Up = 'up',
+  Down = 'down',
+  Left = 'left',
+  Right = 'right',
+}
+
+export function getDirection(event: KeyboardEvent): Direction | undefined {
+  const { key } = event;
+  const shift = event.shiftKey;
+  switch (true) {
+    case shift && key === 'Tab':
+      return Direction.Left;
+    case shift:
+      return undefined;
+    case key === 'ArrowUp':
+      return Direction.Up;
+    case key === 'ArrowDown':
+      return Direction.Down;
+    case key === 'ArrowLeft':
+      return Direction.Left;
+    case key === 'ArrowRight':
+    case key === 'Tab':
+      return Direction.Right;
+    default:
+      return undefined;
+  }
+}
+
+export function getColumnOffset(direction: Direction): number {
+  switch (direction) {
+    case Direction.Left:
+      return -1;
+    case Direction.Right:
+      return 1;
+    default:
+      return 0;
+  }
+}
+
+export function getRowOffset(direction: Direction): number {
+  switch (direction) {
+    case Direction.Up:
+      return -1;
+    case Direction.Down:
+      return 1;
+    default:
+      return 0;
+  }
+}
diff --git a/mathesar_ui/src/components/sheet/selection/IdSequence.ts b/mathesar_ui/src/components/sheet/selection/IdSequence.ts
index 85eb73ebe6..ea0396f621 100644
--- a/mathesar_ui/src/components/sheet/selection/IdSequence.ts
+++ b/mathesar_ui/src/components/sheet/selection/IdSequence.ts
@@ -1,4 +1,5 @@
 import { ImmutableMap } from '@mathesar/component-library';
+import { filter, findBest, firstHighest, firstLowest } from 'iter-tools';
 
 export default class IdSequence<Id> {
   private readonly values: Id[];
@@ -19,6 +20,10 @@ export default class IdSequence<Id> {
     }
   }
 
+  private getIndex(value: Id): number | undefined {
+    return this.indexLookup.get(value);
+  }
+
   get length(): number {
     return this.values.length;
   }
@@ -31,8 +36,8 @@ export default class IdSequence<Id> {
    * @throws an Error if either value is not present in the sequence
    */
   range(a: Id, b: Id): Iterable<Id> {
-    const aIndex = this.indexLookup.get(a);
-    const bIndex = this.indexLookup.get(b);
+    const aIndex = this.getIndex(a);
+    const bIndex = this.getIndex(b);
 
     if (aIndex === undefined || bIndex === undefined) {
       throw new Error('Id value not found within sequence.');
@@ -44,6 +49,79 @@ export default class IdSequence<Id> {
     return this.values.slice(startIndex, endIndex + 1);
   }
 
+  get first(): Id | undefined {
+    return this.values[0];
+  }
+
+  get last(): Id | undefined {
+    return this.values[this.values.length - 1];
+  }
+
+  has(value: Id): boolean {
+    return this.getIndex(value) !== undefined;
+  }
+
+  /**
+   * This method is used for `min` and `max`, but could potentially be used for
+   * other things too.
+   *
+   * @param comparator Corresponds to the [iter-tools comparators][1]
+   *
+   * [1]:
+   * https://github.com/iter-tools/iter-tools/blob/d7.5/API.md#compare-values-and-return-true-or-false
+   */
+  best(
+    values: Iterable<Id>,
+    comparator: (best: number, v: number) => boolean,
+  ): Id | undefined {
+    const validValues = filter((v) => this.has(v), values);
+    return findBest(comparator, (v) => this.getIndex(v) ?? 0, validValues);
+  }
+
+  min(values: Iterable<Id>): Id | undefined {
+    return this.best(values, firstLowest);
+  }
+
+  max(values: Iterable<Id>): Id | undefined {
+    return this.best(values, firstHighest);
+  }
+
+  /**
+   * @returns the value positioned relative to the given value by the given
+   * offset. If the offset is 0, the given value will be returned. If the offset
+   * is positive, the returned value will be that many positions _after_ the
+   * given value. If no such value is present, then `undefined` will be
+   * returned.
+   */
+  offset(value: Id, offset: number): Id | undefined {
+    if (offset === 0) {
+      return this.has(value) ? value : undefined;
+    }
+    const index = this.getIndex(value);
+    if (index === undefined) {
+      return undefined;
+    }
+    return this.values[index + offset];
+  }
+
+  /**
+   * This is similar to `offset`, but accepts an iterable of values and treats
+   * them as a unified block to be collapsed into one value. When `offset` is
+   * positive, the returned value will be that many positions _after_ the last
+   * value in the block. If no such value is present, then `undefined` will be
+   * returned. If offset is zero, then `undefined` will be returned.
+   */
+  collapsedOffset(values: Iterable<Id>, offset: number): Id | undefined {
+    if (offset === 0) {
+      return undefined;
+    }
+    const outerValue = offset > 0 ? this.max(values) : this.min(values);
+    if (outerValue === undefined) {
+      return undefined;
+    }
+    return this.offset(outerValue, offset);
+  }
+
   [Symbol.iterator](): Iterator<Id> {
     return this.values[Symbol.iterator]();
   }
diff --git a/mathesar_ui/src/components/sheet/selection/Plane.ts b/mathesar_ui/src/components/sheet/selection/Plane.ts
index cec6abe732..7b70dd6cb4 100644
--- a/mathesar_ui/src/components/sheet/selection/Plane.ts
+++ b/mathesar_ui/src/components/sheet/selection/Plane.ts
@@ -1,8 +1,9 @@
 import { map } from 'iter-tools';
 
 import { cartesianProduct } from '@mathesar/utils/iterUtils';
+import { makeCellId, parseCellId } from '../cellIds';
+import { Direction, getColumnOffset, getRowOffset } from './Direction';
 import type IdSequence from './IdSequence';
-import { makeCellId } from '../cellIds';
 
 function makeCells(
   rowIds: Iterable<string>,
@@ -14,6 +15,35 @@ function makeCells(
   );
 }
 
+/**
+ * This describes the different kinds of cells that can be adjacent to a given
+ * cell in a particular direction.
+ */
+export type AdjacentCell =
+  | {
+      type: 'dataCell';
+      cellId: string;
+    }
+  | {
+      type: 'placeholderCell';
+      cellId: string;
+    }
+  | {
+      type: 'none';
+    };
+
+function noAdjacentCell(): AdjacentCell {
+  return { type: 'none' };
+}
+
+function adjacentDataCell(cellId: string): AdjacentCell {
+  return { type: 'dataCell', cellId };
+}
+
+function adjacentPlaceholderCell(cellId: string): AdjacentCell {
+  return { type: 'placeholderCell', cellId };
+}
+
 export default class Plane {
   readonly rowIds: IdSequence<string>;
 
@@ -31,6 +61,19 @@ export default class Plane {
     this.placeholderRowId = placeholderRowId;
   }
 
+  /**
+   * @returns the row id that should be used to represent the given row id in
+   * the plane. If the given row id is the placeholder row id, then the last
+   * row id in the plane will be returned. Otherwise, the given row id will be
+   * returned.
+   */
+  private normalizeFlexibleRowId(rowId: string): string | undefined {
+    if (rowId === this.placeholderRowId) {
+      return this.rowIds.last;
+    }
+    return rowId;
+  }
+
   /**
    * @returns an iterable of all the data cells in the plane. This does not
    * include header cells or placeholder cells.
@@ -43,11 +86,24 @@ export default class Plane {
    * @returns an iterable of all the data cells in the plane that are in or
    * between the two given rows. This does not include header cells.
    *
-   * @throws Error if the id of the placeholder row is specified because the
-   * placeholder row is not a data row.
+   * If either of the provided rows are placeholder rows, then the last data row
+   * will be used in their place. This ensures that the selection is made only
+   * of data rows, and will never include the placeholder row, even if a user
+   * drags to select it.
    */
-  dataCellsInRowRange(rowIdA: string, rowIdB: string): Iterable<string> {
-    return makeCells(this.rowIds.range(rowIdA, rowIdB), this.columnIds);
+  dataCellsInFlexibleRowRange(
+    rowIdA: string,
+    rowIdB: string,
+  ): Iterable<string> {
+    const a = this.normalizeFlexibleRowId(rowIdA);
+    if (a === undefined) {
+      return [];
+    }
+    const b = this.normalizeFlexibleRowId(rowIdB);
+    if (b === undefined) {
+      return [];
+    }
+    return makeCells(this.rowIds.range(a, b), this.columnIds);
   }
 
   /**
@@ -62,6 +118,81 @@ export default class Plane {
     return makeCells(this.rowIds, this.columnIds.range(columnIdA, columnIdB));
   }
 
+  /**
+   * @returns an iterable of all the data cells in the plane that are in or
+   * between the two given cell. This does not include header cells.
+   *
+   * If either of the provided cells are placeholder cells, then cells in the
+   * last row and last column will be used in their place. This ensures that the
+   * selection is made only of data cells, and will never include the
+   * placeholder cell, even if a user drags to select it.
+   */
+  dataCellsInFlexibleCellRange(
+    cellIdA: string,
+    cellIdB: string,
+  ): Iterable<string> {
+    const cellA = parseCellId(cellIdA);
+    const cellB = parseCellId(cellIdB);
+    const rowIdA = this.normalizeFlexibleRowId(cellA.rowId);
+    if (rowIdA === undefined) {
+      return [];
+    }
+    const rowIdB = this.normalizeFlexibleRowId(cellB.rowId);
+    if (rowIdB === undefined) {
+      return [];
+    }
+    const rowIds = this.rowIds.range(rowIdA, rowIdB);
+    const columnIds = this.columnIds.range(cellA.columnId, cellB.columnId);
+    return makeCells(rowIds, columnIds);
+  }
+
+  getAdjacentCell(cellId: string, direction: Direction): AdjacentCell {
+    const cell = parseCellId(cellId);
+
+    const columnOffset = getColumnOffset(direction);
+    const newColumnId = this.columnIds.offset(cell.columnId, columnOffset);
+    if (newColumnId === undefined) {
+      return noAdjacentCell();
+    }
+
+    if (cell.rowId === this.placeholderRowId) {
+      if (direction === Direction.Up) {
+        const lastRowId = this.rowIds.last;
+        if (lastRowId === undefined) {
+          // Can't go up from the placeholder row if there are no data rows
+          return noAdjacentCell();
+        }
+        // Move up from the placeholder row into the last data row
+        return adjacentDataCell(makeCellId(lastRowId, newColumnId));
+      }
+      if (direction === Direction.Down) {
+        // Can't go down from the placeholder row
+        return noAdjacentCell();
+      }
+      // Move laterally within the placeholder row
+      return adjacentPlaceholderCell(makeCellId(cell.rowId, newColumnId));
+    }
+
+    const rowOffset = getRowOffset(direction);
+    const newRowId = this.rowIds.offset(cell.rowId, rowOffset);
+    if (newRowId === undefined) {
+      if (direction === Direction.Down) {
+        if (this.placeholderRowId === undefined) {
+          // Can't go down from the last data row if there is no placeholder row
+          return noAdjacentCell();
+        }
+        const newCellId = makeCellId(this.placeholderRowId, newColumnId);
+        // Move down from the last data row into the placeholder row
+        return adjacentPlaceholderCell(newCellId);
+      }
+      // Can't move up from the first data row
+      return noAdjacentCell();
+    }
+
+    // Normal movement from one data cell to another data cell
+    return adjacentDataCell(makeCellId(newRowId, newColumnId));
+  }
+
   get hasResultRows(): boolean {
     return this.rowIds.length > 0;
   }
diff --git a/mathesar_ui/src/components/sheet/selection/Selection.ts b/mathesar_ui/src/components/sheet/selection/Selection.ts
index 44f70d27c4..c98e5570dc 100644
--- a/mathesar_ui/src/components/sheet/selection/Selection.ts
+++ b/mathesar_ui/src/components/sheet/selection/Selection.ts
@@ -1,31 +1,28 @@
 import { first } from 'iter-tools';
 
 import { ImmutableSet } from '@mathesar/component-library';
-import type Plane from './Plane';
+import { assertExhaustive } from '@mathesar/utils/typeUtils';
 import { parseCellId } from '../cellIds';
+import { Direction, getColumnOffset } from './Direction';
+import type Plane from './Plane';
 
-export enum Direction {
-  Up = 'up',
-  Down = 'down',
-  Left = 'left',
-  Right = 'right',
-}
+/**
+ * - `'dataCells'` means that the selection contains data cells. This is by
+ *   far the most common type of selection basis.
+ *
+ * - `'emptyColumns'` is used when the sheet has no rows. In this case we
+ *   still want to allow the user to select columns, so we use this basis.
+ *
+ * - `'placeholderCell'` is used when the user is selecting a cell in the
+ *   placeholder row. This is a special case because we don't want to allow
+ *   the user to select multiple cells in the placeholder row, and we also
+ *   don't want to allow selections that include cells in data rows _and_ the
+ *   placeholder row.
+ */
+type BasisType = 'dataCells' | 'emptyColumns' | 'placeholderCell';
 
 interface Basis {
-  /**
-   * - `'dataCells'` means that the selection contains data cells. This is by
-   *   far the most common type of selection basis.
-   *
-   * - `'emptyColumns'` is used when the sheet has no rows. In this case we
-   *   still want to allow the user to select columns, so we use this basis.
-   *
-   * - `'placeholderCell'` is used when the user is selecting a cell in the
-   *   placeholder row. This is a special case because we don't want to allow
-   *   the user to select multiple cells in the placeholder row, and we also
-   *   don't want to allow selections that include cells in data rows _and_ the
-   *   placeholder row.
-   */
-  readonly type: 'dataCells' | 'emptyColumns' | 'placeholderCell';
+  readonly type: BasisType;
   readonly activeCellId: string | undefined;
   readonly cellIds: ImmutableSet<string>;
   readonly rowIds: ImmutableSet<string>;
@@ -101,8 +98,8 @@ export default class Selection {
   }
 
   /**
-   * @returns a new selection with all cells selected. The active cell will be the
-   * cell in the first row and first column.
+   * @returns a new selection with all cells selected. The active cell will be
+   * the cell in the first row and first column.
    */
   ofAllDataCells(): Selection {
     if (!this.plane.hasResultRows) {
@@ -133,7 +130,11 @@ export default class Selection {
    * drags to select it.
    */
   ofRowRange(rowIdA: string, rowIdB: string): Selection {
-    throw new Error('Not implemented');
+    return this.withBasis(
+      basisFromDataCells(
+        this.plane.dataCellsInFlexibleRowRange(rowIdA, rowIdB),
+      ),
+    );
   }
 
   /**
@@ -141,10 +142,12 @@ export default class Selection {
    * provided columnIds, inclusive.
    */
   ofColumnRange(columnIdA: string, columnIdB: string): Selection {
-    if (!this.plane.hasResultRows) {
-      throw new Error('Not implemented');
-    }
-    throw new Error('Not implemented');
+    const newBasis = this.plane.hasResultRows
+      ? basisFromDataCells(
+          this.plane.dataCellsInColumnRange(columnIdA, columnIdB),
+        )
+      : basisFromEmptyColumns(this.plane.columnIds.range(columnIdA, columnIdB));
+    return this.withBasis(newBasis);
   }
 
   /**
@@ -157,7 +160,11 @@ export default class Selection {
    * placeholder row, even if a user drags to select a cell in it.
    */
   ofCellRange(cellIdA: string, cellIdB: string): Selection {
-    throw new Error('Not implemented');
+    return this.withBasis(
+      basisFromDataCells(
+        this.plane.dataCellsInFlexibleCellRange(cellIdA, cellIdB),
+      ),
+    );
   }
 
   /**
@@ -166,7 +173,14 @@ export default class Selection {
    * row.
    */
   atPlaceholderCell(cellId: string): Selection {
-    throw new Error('Not implemented');
+    return this.withBasis(basisFromPlaceholderCell(cellId));
+  }
+
+  /**
+   * @returns a new selection formed from one cell within the data rows.
+   */
+  atDataCell(cellId: string): Selection {
+    return this.withBasis(basisFromDataCells([cellId], cellId));
   }
 
   /**
@@ -188,7 +202,7 @@ export default class Selection {
    * provided cell.
    */
   drawnToCell(cellId: string): Selection {
-    throw new Error('Not implemented');
+    return this.ofCellRange(this.activeCellId ?? cellId, cellId);
   }
 
   /**
@@ -196,11 +210,19 @@ export default class Selection {
    * active cell and the provided row, inclusive.
    */
   drawnToRow(rowId: string): Selection {
-    throw new Error('Not implemented');
+    const activeRowId = this.activeCellId
+      ? parseCellId(this.activeCellId).rowId
+      : rowId;
+    return this.ofRowRange(activeRowId, rowId);
   }
 
   drawnToColumn(columnId: string): Selection {
-    throw new Error('Not implemented');
+    // TODO improve handling for empty columns
+
+    const activeColumnId = this.activeCellId
+      ? parseCellId(this.activeCellId).columnId
+      : columnId;
+    return this.ofColumnRange(activeColumnId, columnId);
   }
 
   /**
@@ -209,7 +231,39 @@ export default class Selection {
    * then a new selection is created with only that one cell selected.
    */
   collapsedAndMoved(direction: Direction): Selection {
-    throw new Error('Not implemented');
+    if (this.basis.type === 'emptyColumns') {
+      const offset = getColumnOffset(direction);
+      const newActiveColumnId = this.plane.columnIds.collapsedOffset(
+        this.basis.columnIds,
+        offset,
+      );
+      if (newActiveColumnId === undefined) {
+        // If we couldn't shift in the direction, then do nothing
+        return this;
+      }
+      return this.withBasis(basisFromEmptyColumns([newActiveColumnId]));
+    }
+
+    if (this.activeCellId === undefined) {
+      // If no cells are selected, then select the first data cell
+      return this.ofFirstDataCell();
+    }
+
+    const adjacent = this.plane.getAdjacentCell(this.activeCellId, direction);
+
+    if (adjacent.type === 'none') {
+      // If we can't move anywhere, then do nothing
+      return this;
+    }
+    if (adjacent.type === 'dataCell') {
+      // Move to an adjacent data cell
+      return this.atDataCell(adjacent.cellId);
+    }
+    if (adjacent.type === 'placeholderCell') {
+      // Move to an adjacent placeholder cell
+      return this.atPlaceholderCell(adjacent.cellId);
+    }
+    return assertExhaustive(adjacent);
   }
 
   /**
diff --git a/mathesar_ui/src/components/sheet/selection/__tests__/IdSequence.test.ts b/mathesar_ui/src/components/sheet/selection/__tests__/IdSequence.test.ts
new file mode 100644
index 0000000000..14da6d0a24
--- /dev/null
+++ b/mathesar_ui/src/components/sheet/selection/__tests__/IdSequence.test.ts
@@ -0,0 +1,44 @@
+import IdSequence from '../IdSequence';
+
+test('IdSequence', () => {
+  const s = new IdSequence(['h', 'i', 'j', 'k', 'l']);
+  expect(s.length).toBe(5);
+  expect(s.first).toBe('h');
+  expect(s.last).toBe('l');
+
+  expect([...s]).toEqual(['h', 'i', 'j', 'k', 'l']);
+
+  expect(s.min(['i', 'j', 'k'])).toBe('i');
+  expect(s.min(['k', 'j', 'i'])).toBe('i');
+  expect(s.min(['i', 'NOPE'])).toBe('i');
+  expect(s.min(['NOPE'])).toBe(undefined);
+  expect(s.min([])).toBe(undefined);
+
+  expect(s.max(['i', 'j', 'k'])).toBe('k');
+  expect(s.max(['k', 'j', 'i'])).toBe('k');
+  expect(s.max(['i', 'NOPE'])).toBe('i');
+  expect(s.max(['NOPE'])).toBe(undefined);
+  expect(s.max([])).toBe(undefined);
+
+  expect([...s.range('i', 'k')]).toEqual(['i', 'j', 'k']);
+  expect([...s.range('k', 'i')]).toEqual(['i', 'j', 'k']);
+  expect([...s.range('i', 'i')]).toEqual(['i']);
+  expect(() => s.range('i', 'NOPE')).toThrow();
+
+  expect(s.offset('i', 0)).toBe('i');
+  expect(s.offset('i', 1)).toBe('j');
+  expect(s.offset('i', 2)).toBe('k');
+  expect(s.offset('i', -1)).toBe('h');
+  expect(s.offset('i', -2)).toBe(undefined);
+  expect(s.offset('NOPE', 0)).toBe(undefined);
+  expect(s.offset('NOPE', 1)).toBe(undefined);
+
+  expect(s.collapsedOffset(['i', 'k'], 0)).toBe(undefined);
+  expect(s.collapsedOffset(['i', 'k'], 1)).toBe('l');
+  expect(s.collapsedOffset(['i', 'k'], 2)).toBe(undefined);
+  expect(s.collapsedOffset(['i', 'k'], -1)).toBe('h');
+  expect(s.collapsedOffset(['i', 'k'], -2)).toBe(undefined);
+  expect(s.collapsedOffset(['i', 'NOPE'], 0)).toBe(undefined);
+  expect(s.collapsedOffset(['i', 'NOPE'], 1)).toBe('j');
+  expect(s.collapsedOffset([], 0)).toBe(undefined);
+});
diff --git a/mathesar_ui/src/components/sheet/selection/__tests__/Plane.test.ts b/mathesar_ui/src/components/sheet/selection/__tests__/Plane.test.ts
new file mode 100644
index 0000000000..6e70548ed2
--- /dev/null
+++ b/mathesar_ui/src/components/sheet/selection/__tests__/Plane.test.ts
@@ -0,0 +1,58 @@
+import IdSequence from '../IdSequence';
+import Plane from '../Plane';
+import { Direction } from '../Direction';
+
+test('Plane with placeholder row', () => {
+  const p = new Plane(
+    new IdSequence(['r1', 'r2', 'r3', 'r4']),
+    new IdSequence(['c1', 'c2', 'c3', 'c4']),
+    'PL',
+  );
+
+  expect([...p.allDataCells()]).toEqual([
+    'r1-c1',
+    'r1-c2',
+    'r1-c3',
+    'r1-c4',
+    'r2-c1',
+    'r2-c2',
+    'r2-c3',
+    'r2-c4',
+    'r3-c1',
+    'r3-c2',
+    'r3-c3',
+    'r3-c4',
+    'r4-c1',
+    'r4-c2',
+    'r4-c3',
+    'r4-c4',
+  ]);
+
+  expect([...p.dataCellsInFlexibleRowRange('r1', 'r2')].length).toBe(8);
+  expect([...p.dataCellsInFlexibleRowRange('r1', 'r3')].length).toBe(12);
+  expect([...p.dataCellsInFlexibleRowRange('r3', 'r4')].length).toBe(8);
+  expect([...p.dataCellsInFlexibleRowRange('r3', 'PL')].length).toBe(8);
+  expect([...p.dataCellsInFlexibleRowRange('PL', 'PL')]).toEqual([
+    'r4-c1',
+    'r4-c2',
+    'r4-c3',
+    'r4-c4',
+  ]);
+
+  expect([...p.dataCellsInColumnRange('c1', 'c2')].length).toBe(8);
+  expect([...p.dataCellsInColumnRange('c1', 'c3')].length).toBe(12);
+
+  expect(p.getAdjacentCell('r4-c4', Direction.Up)).toEqual({
+    type: 'dataCell',
+    cellId: 'r3-c4',
+  });
+  expect(p.getAdjacentCell('r4-c4', Direction.Right)).toEqual({ type: 'none' });
+  expect(p.getAdjacentCell('r4-c4', Direction.Down)).toEqual({
+    type: 'placeholderCell',
+    cellId: 'PL-c4',
+  });
+  expect(p.getAdjacentCell('r4-c4', Direction.Left)).toEqual({
+    type: 'dataCell',
+    cellId: 'r4-c3',
+  });
+});

From 8b5ccdcb7a54b59b144c8b99602d987b42200886 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 18 Jul 2023 15:17:46 -0400
Subject: [PATCH 0004/1141] Improve some naming

---
 mathesar_ui/src/components/sheet/selection/Plane.ts    | 10 +++++-----
 .../sheet/selection/{IdSequence.ts => Series.ts}       |  4 ++--
 .../components/sheet/selection/__tests__/Plane.test.ts |  6 +++---
 .../__tests__/{IdSequence.test.ts => Series.test.ts}   |  6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)
 rename mathesar_ui/src/components/sheet/selection/{IdSequence.ts => Series.ts} (98%)
 rename mathesar_ui/src/components/sheet/selection/__tests__/{IdSequence.test.ts => Series.test.ts} (92%)

diff --git a/mathesar_ui/src/components/sheet/selection/Plane.ts b/mathesar_ui/src/components/sheet/selection/Plane.ts
index 7b70dd6cb4..20ed0fccc5 100644
--- a/mathesar_ui/src/components/sheet/selection/Plane.ts
+++ b/mathesar_ui/src/components/sheet/selection/Plane.ts
@@ -3,7 +3,7 @@ import { map } from 'iter-tools';
 import { cartesianProduct } from '@mathesar/utils/iterUtils';
 import { makeCellId, parseCellId } from '../cellIds';
 import { Direction, getColumnOffset, getRowOffset } from './Direction';
-import type IdSequence from './IdSequence';
+import type Series from './Series';
 
 function makeCells(
   rowIds: Iterable<string>,
@@ -45,15 +45,15 @@ function adjacentPlaceholderCell(cellId: string): AdjacentCell {
 }
 
 export default class Plane {
-  readonly rowIds: IdSequence<string>;
+  readonly rowIds: Series<string>;
 
-  readonly columnIds: IdSequence<string>;
+  readonly columnIds: Series<string>;
 
   readonly placeholderRowId: string | undefined;
 
   constructor(
-    rowIds: IdSequence<string>,
-    columnIds: IdSequence<string>,
+    rowIds: Series<string>,
+    columnIds: Series<string>,
     placeholderRowId: string | undefined,
   ) {
     this.rowIds = rowIds;
diff --git a/mathesar_ui/src/components/sheet/selection/IdSequence.ts b/mathesar_ui/src/components/sheet/selection/Series.ts
similarity index 98%
rename from mathesar_ui/src/components/sheet/selection/IdSequence.ts
rename to mathesar_ui/src/components/sheet/selection/Series.ts
index ea0396f621..7b8cd45dcc 100644
--- a/mathesar_ui/src/components/sheet/selection/IdSequence.ts
+++ b/mathesar_ui/src/components/sheet/selection/Series.ts
@@ -1,7 +1,7 @@
 import { ImmutableMap } from '@mathesar/component-library';
 import { filter, findBest, firstHighest, firstLowest } from 'iter-tools';
 
-export default class IdSequence<Id> {
+export default class Series<Id> {
   private readonly values: Id[];
 
   /** Maps the id value to its index */
@@ -16,7 +16,7 @@ export default class IdSequence<Id> {
       values.map((value, index) => [value, index]),
     );
     if (new Set(values).size !== values.length) {
-      throw new Error('Duplicate values are not allowed within an IdSequence.');
+      throw new Error('Duplicate values are not allowed within a Series.');
     }
   }
 
diff --git a/mathesar_ui/src/components/sheet/selection/__tests__/Plane.test.ts b/mathesar_ui/src/components/sheet/selection/__tests__/Plane.test.ts
index 6e70548ed2..dd6b89500c 100644
--- a/mathesar_ui/src/components/sheet/selection/__tests__/Plane.test.ts
+++ b/mathesar_ui/src/components/sheet/selection/__tests__/Plane.test.ts
@@ -1,11 +1,11 @@
-import IdSequence from '../IdSequence';
+import Series from '../Series';
 import Plane from '../Plane';
 import { Direction } from '../Direction';
 
 test('Plane with placeholder row', () => {
   const p = new Plane(
-    new IdSequence(['r1', 'r2', 'r3', 'r4']),
-    new IdSequence(['c1', 'c2', 'c3', 'c4']),
+    new Series(['r1', 'r2', 'r3', 'r4']),
+    new Series(['c1', 'c2', 'c3', 'c4']),
     'PL',
   );
 
diff --git a/mathesar_ui/src/components/sheet/selection/__tests__/IdSequence.test.ts b/mathesar_ui/src/components/sheet/selection/__tests__/Series.test.ts
similarity index 92%
rename from mathesar_ui/src/components/sheet/selection/__tests__/IdSequence.test.ts
rename to mathesar_ui/src/components/sheet/selection/__tests__/Series.test.ts
index 14da6d0a24..8109932d9f 100644
--- a/mathesar_ui/src/components/sheet/selection/__tests__/IdSequence.test.ts
+++ b/mathesar_ui/src/components/sheet/selection/__tests__/Series.test.ts
@@ -1,7 +1,7 @@
-import IdSequence from '../IdSequence';
+import Series from '../Series';
 
-test('IdSequence', () => {
-  const s = new IdSequence(['h', 'i', 'j', 'k', 'l']);
+test('Series', () => {
+  const s = new Series(['h', 'i', 'j', 'k', 'l']);
   expect(s.length).toBe(5);
   expect(s.first).toBe('h');
   expect(s.last).toBe('l');

From 66f4e637cc1759af7cf08475ea3389513acfab0e Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 18 Jul 2023 16:34:44 -0400
Subject: [PATCH 0005/1141] Rename classes to mark old code as deprecated

---
 ...etSelection.ts => LegacySheetSelection.ts} |  5 ++-
 .../components/sheet/SheetClipboardHandler.ts |  6 ++--
 mathesar_ui/src/components/sheet/index.ts     |  4 +--
 .../{Selection.ts => SheetSelection.ts}       | 36 ++++++++++---------
 .../src/stores/table-data/tabularData.ts      | 13 ++++---
 .../src/systems/data-explorer/QueryRunner.ts  |  6 ++--
 .../src/systems/table-view/Body.svelte        |  2 +-
 .../src/systems/table-view/StatusPane.svelte  |  2 +-
 .../src/systems/table-view/TableView.svelte   |  9 +++--
 .../systems/table-view/header/Header.svelte   |  2 +-
 .../src/systems/table-view/row/Row.svelte     |  9 +++--
 .../table-inspector/TableInspector.svelte     |  2 +-
 .../table-inspector/column/ColumnMode.svelte  |  2 +-
 .../ExtractColumnsModal.svelte                |  6 +++-
 .../table-inspector/record/RecordMode.svelte  |  2 +-
 15 files changed, 64 insertions(+), 42 deletions(-)
 rename mathesar_ui/src/components/sheet/{SheetSelection.ts => LegacySheetSelection.ts} (99%)
 rename mathesar_ui/src/components/sheet/selection/{Selection.ts => SheetSelection.ts} (90%)

diff --git a/mathesar_ui/src/components/sheet/SheetSelection.ts b/mathesar_ui/src/components/sheet/LegacySheetSelection.ts
similarity index 99%
rename from mathesar_ui/src/components/sheet/SheetSelection.ts
rename to mathesar_ui/src/components/sheet/LegacySheetSelection.ts
index 4c88ef8c50..0aeeeb31c6 100644
--- a/mathesar_ui/src/components/sheet/SheetSelection.ts
+++ b/mathesar_ui/src/components/sheet/LegacySheetSelection.ts
@@ -196,7 +196,10 @@ export function getSelectedRowIndex(selectedCell: string): number {
   return Number(selectedCell.split(ROW_COLUMN_SEPARATOR)[0]);
 }
 
-export default class SheetSelection<
+/**
+ * @deprecated
+ */
+export default class LegacySheetSelection<
   Row extends SelectionRow,
   Column extends SelectionColumn,
 > {
diff --git a/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts b/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts
index c8e7a8b3d7..2af5549205 100644
--- a/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts
+++ b/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts
@@ -2,9 +2,9 @@ import * as Papa from 'papaparse';
 import { get } from 'svelte/store';
 
 import { ImmutableSet, type MakeToast } from '@mathesar-component-library';
-import SheetSelection, {
+import LegacySheetSelection, {
   isCellSelected,
-} from '@mathesar/components/sheet/SheetSelection';
+} from '@mathesar/components/sheet/LegacySheetSelection';
 import type { ClipboardHandler } from '@mathesar/stores/clipboard';
 import type {
   ProcessedColumn,
@@ -76,7 +76,7 @@ interface SheetClipboardHandlerDeps<
   Row extends QueryRow | RecordRow,
   Column extends ProcessedQueryOutputColumn | ProcessedColumn,
 > {
-  selection: SheetSelection<Row, Column>;
+  selection: LegacySheetSelection<Row, Column>;
   toast: MakeToast;
   getRows(): Row[];
   getColumnsMap(): ReadableMapLike<Column['id'], Column>;
diff --git a/mathesar_ui/src/components/sheet/index.ts b/mathesar_ui/src/components/sheet/index.ts
index cc67f1275b..0448df86aa 100644
--- a/mathesar_ui/src/components/sheet/index.ts
+++ b/mathesar_ui/src/components/sheet/index.ts
@@ -5,7 +5,7 @@ export { default as SheetPositionableCell } from './SheetPositionableCell.svelte
 export { default as SheetCellResizer } from './SheetCellResizer.svelte';
 export { default as SheetVirtualRows } from './SheetVirtualRows.svelte';
 export { default as SheetRow } from './SheetRow.svelte';
-export { default as SheetSelection } from './SheetSelection';
+export { default as LegacySheetSelection } from './LegacySheetSelection';
 export {
   isColumnSelected,
   isRowSelected,
@@ -14,4 +14,4 @@ export {
   isCellActive,
   scrollBasedOnActiveCell,
   scrollBasedOnSelection,
-} from './SheetSelection';
+} from './LegacySheetSelection';
diff --git a/mathesar_ui/src/components/sheet/selection/Selection.ts b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
similarity index 90%
rename from mathesar_ui/src/components/sheet/selection/Selection.ts
rename to mathesar_ui/src/components/sheet/selection/SheetSelection.ts
index c98e5570dc..ba8c8b1b8b 100644
--- a/mathesar_ui/src/components/sheet/selection/Selection.ts
+++ b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
@@ -67,7 +67,7 @@ function basisFromPlaceholderCell(activeCellId: string): Basis {
   };
 }
 
-export default class Selection {
+export default class SheetSelection {
   private readonly plane: Plane;
 
   private readonly basis: Basis;
@@ -93,15 +93,15 @@ export default class Selection {
     return this.basis.columnIds;
   }
 
-  private withBasis(basis: Basis): Selection {
-    return new Selection(this.plane, basis);
+  private withBasis(basis: Basis): SheetSelection {
+    return new SheetSelection(this.plane, basis);
   }
 
   /**
    * @returns a new selection with all cells selected. The active cell will be
    * the cell in the first row and first column.
    */
-  ofAllDataCells(): Selection {
+  ofAllDataCells(): SheetSelection {
     if (!this.plane.hasResultRows) {
       return this.withBasis(basisFromZeroEmptyColumns());
     }
@@ -112,7 +112,7 @@ export default class Selection {
    * @returns a new selection with the cell in the first row and first column
    * selected.
    */
-  ofFirstDataCell(): Selection {
+  ofFirstDataCell(): SheetSelection {
     const firstCellId = first(this.plane.allDataCells());
     if (firstCellId === undefined) {
       return this.withBasis(basisFromZeroEmptyColumns());
@@ -129,7 +129,7 @@ export default class Selection {
    * of data rows, and will never include the placeholder row, even if a user
    * drags to select it.
    */
-  ofRowRange(rowIdA: string, rowIdB: string): Selection {
+  ofRowRange(rowIdA: string, rowIdB: string): SheetSelection {
     return this.withBasis(
       basisFromDataCells(
         this.plane.dataCellsInFlexibleRowRange(rowIdA, rowIdB),
@@ -141,7 +141,7 @@ export default class Selection {
    * @returns a new selection of all data cells in all columns between the
    * provided columnIds, inclusive.
    */
-  ofColumnRange(columnIdA: string, columnIdB: string): Selection {
+  ofColumnRange(columnIdA: string, columnIdB: string): SheetSelection {
     const newBasis = this.plane.hasResultRows
       ? basisFromDataCells(
           this.plane.dataCellsInColumnRange(columnIdA, columnIdB),
@@ -159,7 +159,7 @@ export default class Selection {
    * selection is made only of data cells, and will never include cells in the
    * placeholder row, even if a user drags to select a cell in it.
    */
-  ofCellRange(cellIdA: string, cellIdB: string): Selection {
+  ofCellRange(cellIdA: string, cellIdB: string): SheetSelection {
     return this.withBasis(
       basisFromDataCells(
         this.plane.dataCellsInFlexibleCellRange(cellIdA, cellIdB),
@@ -172,14 +172,14 @@ export default class Selection {
    * Note that we do not support selections of multiple cells in the placeholder
    * row.
    */
-  atPlaceholderCell(cellId: string): Selection {
+  atPlaceholderCell(cellId: string): SheetSelection {
     return this.withBasis(basisFromPlaceholderCell(cellId));
   }
 
   /**
    * @returns a new selection formed from one cell within the data rows.
    */
-  atDataCell(cellId: string): Selection {
+  atDataCell(cellId: string): SheetSelection {
     return this.withBasis(basisFromDataCells([cellId], cellId));
   }
 
@@ -187,7 +187,7 @@ export default class Selection {
    * @returns a new selection that fits within the provided plane. This is
    * useful when a column is deleted, reordered, or inserted.
    */
-  forNewPlane(plane: Plane): Selection {
+  forNewPlane(plane: Plane): SheetSelection {
     throw new Error('Not implemented');
   }
 
@@ -201,7 +201,7 @@ export default class Selection {
    * by the active cell (also the first cell selected when dragging) and the
    * provided cell.
    */
-  drawnToCell(cellId: string): Selection {
+  drawnToCell(cellId: string): SheetSelection {
     return this.ofCellRange(this.activeCellId ?? cellId, cellId);
   }
 
@@ -209,14 +209,14 @@ export default class Selection {
    * @returns a new selection formed by the cells in all the rows between the
    * active cell and the provided row, inclusive.
    */
-  drawnToRow(rowId: string): Selection {
+  drawnToRow(rowId: string): SheetSelection {
     const activeRowId = this.activeCellId
       ? parseCellId(this.activeCellId).rowId
       : rowId;
     return this.ofRowRange(activeRowId, rowId);
   }
 
-  drawnToColumn(columnId: string): Selection {
+  drawnToColumn(columnId: string): SheetSelection {
     // TODO improve handling for empty columns
 
     const activeColumnId = this.activeCellId
@@ -230,7 +230,7 @@ export default class Selection {
    * spreadsheets. If the active cell can be moved in the provided direction,
    * then a new selection is created with only that one cell selected.
    */
-  collapsedAndMoved(direction: Direction): Selection {
+  collapsedAndMoved(direction: Direction): SheetSelection {
     if (this.basis.type === 'emptyColumns') {
       const offset = getColumnOffset(direction);
       const newActiveColumnId = this.plane.columnIds.collapsedOffset(
@@ -272,7 +272,9 @@ export default class Selection {
    *
    * This is to handle the `Tab` and `Shift+Tab` keys.
    */
-  withActiveCellAdvanced(direction: 'forward' | 'back' = 'forward'): Selection {
+  withActiveCellAdvanced(
+    direction: 'forward' | 'back' = 'forward',
+  ): SheetSelection {
     throw new Error('Not implemented');
   }
 
@@ -291,7 +293,7 @@ export default class Selection {
    * the active cell. We chose to mimic Google Sheets behavior here because it
    * is simpler.
    */
-  resized(direction: Direction): Selection {
+  resized(direction: Direction): SheetSelection {
     throw new Error('Not implemented');
   }
 }
diff --git a/mathesar_ui/src/stores/table-data/tabularData.ts b/mathesar_ui/src/stores/table-data/tabularData.ts
index a29e0c9836..543e977ea3 100644
--- a/mathesar_ui/src/stores/table-data/tabularData.ts
+++ b/mathesar_ui/src/stores/table-data/tabularData.ts
@@ -11,7 +11,7 @@ import type { TableEntry } from '@mathesar/api/types/tables';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
 import { States } from '@mathesar/api/utils/requestUtils';
 import type { Column } from '@mathesar/api/types/tables/columns';
-import { SheetSelection } from '@mathesar/components/sheet';
+import { LegacySheetSelection } from '@mathesar/components/sheet';
 import { getColumnOrder } from '@mathesar/utils/tables';
 import { Meta } from './meta';
 import { ColumnsDataStore } from './columns';
@@ -44,7 +44,10 @@ export interface TabularDataProps {
   >[0]['hasEnhancedPrimaryKeyCell'];
 }
 
-export type TabularDataSelection = SheetSelection<RecordRow, ProcessedColumn>;
+export type TabularDataSelection = LegacySheetSelection<
+  RecordRow,
+  ProcessedColumn
+>;
 
 export class TabularData {
   id: DBObjectEntry['id'];
@@ -63,7 +66,7 @@ export class TabularData {
 
   isLoading: Readable<boolean>;
 
-  selection: TabularDataSelection;
+  legacySelection: TabularDataSelection;
 
   table: TableEntry;
 
@@ -109,7 +112,7 @@ export class TabularData {
 
     this.table = props.table;
 
-    this.selection = new SheetSelection({
+    this.legacySelection = new LegacySheetSelection({
       getColumns: () => [...get(this.processedColumns).values()],
       getColumnOrder: () =>
         getColumnOrder([...get(this.processedColumns).values()], this.table),
@@ -218,7 +221,7 @@ export class TabularData {
     this.recordsData.destroy();
     this.constraintsDataStore.destroy();
     this.columnsDataStore.destroy();
-    this.selection.destroy();
+    this.legacySelection.destroy();
   }
 }
 
diff --git a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
index bf3985c226..2b7ee402e2 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
@@ -14,7 +14,7 @@ import type {
   QueryColumnMetaData,
 } from '@mathesar/api/types/queries';
 import { runQuery } from '@mathesar/stores/queries';
-import { SheetSelection } from '@mathesar/components/sheet';
+import { LegacySheetSelection } from '@mathesar/components/sheet';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
 import type QueryModel from './QueryModel';
 import QueryInspector from './QueryInspector';
@@ -42,7 +42,7 @@ export interface QueryRowsData {
   rows: QueryRow[];
 }
 
-export type QuerySheetSelection = SheetSelection<
+export type QuerySheetSelection = LegacySheetSelection<
   QueryRow,
   ProcessedQueryOutputColumn
 >;
@@ -81,7 +81,7 @@ export default class QueryRunner<
     this.query = writable(query);
     this.speculateProcessedColumns();
     void this.run();
-    this.selection = new SheetSelection({
+    this.selection = new LegacySheetSelection({
       getColumns: () => [...get(this.processedColumns).values()],
       getColumnOrder: () =>
         [...get(this.processedColumns).values()].map((column) => column.id),
diff --git a/mathesar_ui/src/systems/table-view/Body.svelte b/mathesar_ui/src/systems/table-view/Body.svelte
index bed4c366a6..f917c5dc71 100644
--- a/mathesar_ui/src/systems/table-view/Body.svelte
+++ b/mathesar_ui/src/systems/table-view/Body.svelte
@@ -31,7 +31,7 @@
 
   export let usesVirtualList = false;
 
-  $: ({ id, display, columnsDataStore, selection } = $tabularData);
+  $: ({ id, display, columnsDataStore } = $tabularData);
   $: ({ displayableRecords } = display);
   $: ({ pkColumn } = columnsDataStore);
 
diff --git a/mathesar_ui/src/systems/table-view/StatusPane.svelte b/mathesar_ui/src/systems/table-view/StatusPane.svelte
index 36a0672e1c..459e02c56c 100644
--- a/mathesar_ui/src/systems/table-view/StatusPane.svelte
+++ b/mathesar_ui/src/systems/table-view/StatusPane.svelte
@@ -32,7 +32,7 @@
     isLoading,
     columnsDataStore,
     constraintsDataStore,
-    selection,
+    legacySelection: selection,
   } = $tabularData);
   $: ({ pagination } = meta);
   $: ({ size: pageSize, leftBound, rightBound } = $pagination);
diff --git a/mathesar_ui/src/systems/table-view/TableView.svelte b/mathesar_ui/src/systems/table-view/TableView.svelte
index 3cb518ae72..8e7e129cff 100644
--- a/mathesar_ui/src/systems/table-view/TableView.svelte
+++ b/mathesar_ui/src/systems/table-view/TableView.svelte
@@ -40,8 +40,13 @@
   $: usesVirtualList = context === 'page';
   $: allowsDdlOperations = context === 'page' && canExecuteDDL;
   $: sheetHasBorder = context === 'widget';
-  $: ({ processedColumns, display, isLoading, selection, recordsData } =
-    $tabularData);
+  $: ({
+    processedColumns,
+    display,
+    isLoading,
+    legacySelection: selection,
+    recordsData,
+  } = $tabularData);
   $: clipboardHandler = new SheetClipboardHandler({
     selection,
     toast,
diff --git a/mathesar_ui/src/systems/table-view/header/Header.svelte b/mathesar_ui/src/systems/table-view/header/Header.svelte
index e70a5574fd..3b71564078 100644
--- a/mathesar_ui/src/systems/table-view/header/Header.svelte
+++ b/mathesar_ui/src/systems/table-view/header/Header.svelte
@@ -28,7 +28,7 @@
   $: columnOrder = columnOrder ?? [];
   $: columnOrderString = columnOrder.map(String);
 
-  $: ({ selection, processedColumns } = $tabularData);
+  $: ({ legacySelection: selection, processedColumns } = $tabularData);
   $: ({
     selectedCells,
     columnsSelectedWhenTheTableIsEmpty,
diff --git a/mathesar_ui/src/systems/table-view/row/Row.svelte b/mathesar_ui/src/systems/table-view/row/Row.svelte
index eb717f1ba6..967c17b677 100644
--- a/mathesar_ui/src/systems/table-view/row/Row.svelte
+++ b/mathesar_ui/src/systems/table-view/row/Row.svelte
@@ -29,8 +29,13 @@
 
   const tabularData = getTabularDataStoreFromContext();
 
-  $: ({ recordsData, columnsDataStore, meta, processedColumns, selection } =
-    $tabularData);
+  $: ({
+    recordsData,
+    columnsDataStore,
+    meta,
+    processedColumns,
+    legacySelection: selection,
+  } = $tabularData);
   $: ({
     rowStatus,
     rowCreationStatus,
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte b/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
index 967d289a26..d628a0d124 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
@@ -29,7 +29,7 @@
   let activeTab: TabItem;
 
   const tabularData = getTabularDataStoreFromContext();
-  $: ({ selection } = $tabularData);
+  $: ({ legacySelection: selection } = $tabularData);
   $: ({ selectedCells } = selection);
 
   $: {
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
index cf92780c1b..fe1e01f610 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
@@ -21,7 +21,7 @@
 
   $: database = $currentDatabase;
   $: schema = $currentSchema;
-  $: ({ processedColumns, selection } = $tabularData);
+  $: ({ processedColumns, legacySelection: selection } = $tabularData);
   $: ({ selectedCells, columnsSelectedWhenTheTableIsEmpty } = selection);
   $: selectedColumns = (() => {
     const ids = selection.getSelectedUniqueColumnsId(
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
index cb1d622145..ed5d468f15 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
@@ -48,7 +48,11 @@
 
   export let controller: ExtractColumnsModalController;
 
-  $: ({ processedColumns, constraintsDataStore, selection } = $tabularData);
+  $: ({
+    processedColumns,
+    constraintsDataStore,
+    legacySelection: selection,
+  } = $tabularData);
   $: ({ constraints } = $constraintsDataStore);
   $: availableProcessedColumns = [...$processedColumns.values()];
   $: ({ targetType, columns, isOpen } = controller);
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
index f85100b121..878701fec1 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
@@ -14,7 +14,7 @@
 
   $: database = $currentDatabase;
   $: schema = $currentSchema;
-  $: ({ selection, recordsData } = $tabularData);
+  $: ({ legacySelection: selection, recordsData } = $tabularData);
   $: ({ selectedCells } = selection);
   $: selectedRowIndices = $selectedCells
     .valuesArray()

From 8157a8bc27cac20951ecca92edd795444a06911c Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 19 Jul 2023 13:53:22 -0400
Subject: [PATCH 0006/1141] Begin integrating SheetSelection into TabularData

---
 .../src/components/sheet/selection/Plane.ts   |  8 +--
 .../src/components/sheet/selection/Series.ts  |  5 +-
 .../sheet/selection/SheetSelection.ts         | 37 +++++++++-----
 mathesar_ui/src/stores/table-data/records.ts  | 12 +++++
 .../src/stores/table-data/tabularData.ts      | 49 ++++++++++++++++---
 5 files changed, 86 insertions(+), 25 deletions(-)

diff --git a/mathesar_ui/src/components/sheet/selection/Plane.ts b/mathesar_ui/src/components/sheet/selection/Plane.ts
index 20ed0fccc5..7a3185852e 100644
--- a/mathesar_ui/src/components/sheet/selection/Plane.ts
+++ b/mathesar_ui/src/components/sheet/selection/Plane.ts
@@ -3,7 +3,7 @@ import { map } from 'iter-tools';
 import { cartesianProduct } from '@mathesar/utils/iterUtils';
 import { makeCellId, parseCellId } from '../cellIds';
 import { Direction, getColumnOffset, getRowOffset } from './Direction';
-import type Series from './Series';
+import Series from './Series';
 
 function makeCells(
   rowIds: Iterable<string>,
@@ -52,9 +52,9 @@ export default class Plane {
   readonly placeholderRowId: string | undefined;
 
   constructor(
-    rowIds: Series<string>,
-    columnIds: Series<string>,
-    placeholderRowId: string | undefined,
+    rowIds: Series<string> = new Series(),
+    columnIds: Series<string> = new Series(),
+    placeholderRowId?: string,
   ) {
     this.rowIds = rowIds;
     this.columnIds = columnIds;
diff --git a/mathesar_ui/src/components/sheet/selection/Series.ts b/mathesar_ui/src/components/sheet/selection/Series.ts
index 7b8cd45dcc..7034fd06b7 100644
--- a/mathesar_ui/src/components/sheet/selection/Series.ts
+++ b/mathesar_ui/src/components/sheet/selection/Series.ts
@@ -1,6 +1,7 @@
-import { ImmutableMap } from '@mathesar/component-library';
 import { filter, findBest, firstHighest, firstLowest } from 'iter-tools';
 
+import { ImmutableMap } from '@mathesar/component-library';
+
 export default class Series<Id> {
   private readonly values: Id[];
 
@@ -10,7 +11,7 @@ export default class Series<Id> {
   /**
    * @throws Error if duplicate values are provided
    */
-  constructor(values: Id[]) {
+  constructor(values: Id[] = []) {
     this.values = values;
     this.indexLookup = new ImmutableMap(
       values.map((value, index) => [value, index]),
diff --git a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
index ba8c8b1b8b..a16948d9e0 100644
--- a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
+++ b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
@@ -4,22 +4,26 @@ import { ImmutableSet } from '@mathesar/component-library';
 import { assertExhaustive } from '@mathesar/utils/typeUtils';
 import { parseCellId } from '../cellIds';
 import { Direction, getColumnOffset } from './Direction';
-import type Plane from './Plane';
+import Plane from './Plane';
 
 /**
- * - `'dataCells'` means that the selection contains data cells. This is by
- *   far the most common type of selection basis.
+ * - `'dataCells'` means that the selection contains data cells. This is by far
+ *   the most common type of selection basis.
  *
- * - `'emptyColumns'` is used when the sheet has no rows. In this case we
- *   still want to allow the user to select columns, so we use this basis.
+ * - `'emptyColumns'` is used when the sheet has no rows. In this case we still
+ *   want to allow the user to select columns, so we use this basis.
  *
  * - `'placeholderCell'` is used when the user is selecting a cell in the
- *   placeholder row. This is a special case because we don't want to allow
- *   the user to select multiple cells in the placeholder row, and we also
- *   don't want to allow selections that include cells in data rows _and_ the
+ *   placeholder row. This is a special case because we don't want to allow the
+ *   user to select multiple cells in the placeholder row, and we also don't
+ *   want to allow selections that include cells in data rows _and_ the
  *   placeholder row.
+ *
+ * - `'empty'` is used when no cells are selected. We try to avoid this state,
+ *   but we also allow for it because it makes it easier to construct selection
+ *   instances if we don't already have the full plane data.
  */
-type BasisType = 'dataCells' | 'emptyColumns' | 'placeholderCell';
+type BasisType = 'dataCells' | 'emptyColumns' | 'placeholderCell' | 'empty';
 
 interface Basis {
   readonly type: BasisType;
@@ -67,12 +71,22 @@ function basisFromPlaceholderCell(activeCellId: string): Basis {
   };
 }
 
+function emptyBasis(): Basis {
+  return {
+    type: 'empty',
+    activeCellId: undefined,
+    cellIds: new ImmutableSet(),
+    columnIds: new ImmutableSet(),
+    rowIds: new ImmutableSet(),
+  };
+}
+
 export default class SheetSelection {
   private readonly plane: Plane;
 
   private readonly basis: Basis;
 
-  constructor(plane: Plane, basis: Basis) {
+  constructor(plane: Plane = new Plane(), basis: Basis = emptyBasis()) {
     this.plane = plane;
     this.basis = basis;
   }
@@ -187,7 +201,8 @@ export default class SheetSelection {
    * @returns a new selection that fits within the provided plane. This is
    * useful when a column is deleted, reordered, or inserted.
    */
-  forNewPlane(plane: Plane): SheetSelection {
+  forNewPlane(newPlane: Plane): SheetSelection {
+    // TODO_NEXT
     throw new Error('Not implemented');
   }
 
diff --git a/mathesar_ui/src/stores/table-data/records.ts b/mathesar_ui/src/stores/table-data/records.ts
index 4719c1ac81..870770ff9e 100644
--- a/mathesar_ui/src/stores/table-data/records.ts
+++ b/mathesar_ui/src/stores/table-data/records.ts
@@ -29,6 +29,7 @@ import {
   patchAPI,
   postAPI,
 } from '@mathesar/api/utils/requestUtils';
+import Series from '@mathesar/components/sheet/selection/Series';
 import type Pagination from '@mathesar/utils/Pagination';
 import { getErrorMessage } from '@mathesar/utils/errors';
 import { pluralize } from '@mathesar/utils/languageUtils';
@@ -293,6 +294,8 @@ export class RecordsData {
 
   error: Writable<string | undefined>;
 
+  selectableRowIds: Readable<Series<string>>;
+
   private promise: CancellablePromise<ApiRecordsResponse> | undefined;
 
   // @ts-ignore: https://github.com/centerofci/mathesar/issues/1055
@@ -339,6 +342,15 @@ export class RecordsData {
     this.url = `/api/db/v0/tables/${this.parentId}/records/`;
     void this.fetch();
 
+    this.selectableRowIds = derived(
+      [this.savedRecords, this.newRecords],
+      ([savedRecords, newRecords]) =>
+        new Series([
+          ...savedRecords.map((r) => r.identifier),
+          ...newRecords.map((r) => r.identifier),
+        ]),
+    );
+
     // TODO: Create base class to abstract subscriptions and unsubscriptions
     this.requestParamsUnsubscriber =
       this.meta.recordsRequestParamsData.subscribe(() => {
diff --git a/mathesar_ui/src/stores/table-data/tabularData.ts b/mathesar_ui/src/stores/table-data/tabularData.ts
index 543e977ea3..086affd1e3 100644
--- a/mathesar_ui/src/stores/table-data/tabularData.ts
+++ b/mathesar_ui/src/stores/table-data/tabularData.ts
@@ -1,30 +1,34 @@
 import { getContext, setContext } from 'svelte';
 import {
   derived,
-  writable,
   get,
+  writable,
   type Readable,
   type Writable,
 } from 'svelte/store';
+
 import type { DBObjectEntry } from '@mathesar/AppTypes';
 import type { TableEntry } from '@mathesar/api/types/tables';
-import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
-import { States } from '@mathesar/api/utils/requestUtils';
 import type { Column } from '@mathesar/api/types/tables/columns';
+import { States } from '@mathesar/api/utils/requestUtils';
 import { LegacySheetSelection } from '@mathesar/components/sheet';
-import { getColumnOrder } from '@mathesar/utils/tables';
-import { Meta } from './meta';
+import Plane from '@mathesar/components/sheet/selection/Plane';
+import Series from '@mathesar/components/sheet/selection/Series';
+import SheetSelection from '@mathesar/components/sheet/selection/SheetSelection';
+import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
+import { getColumnOrder, orderProcessedColumns } from '@mathesar/utils/tables';
 import { ColumnsDataStore } from './columns';
-import type { RecordRow, TableRecordsData } from './records';
-import { RecordsData } from './records';
-import { Display } from './display';
 import type { ConstraintsData } from './constraints';
 import { ConstraintsDataStore } from './constraints';
+import { Display } from './display';
+import { Meta } from './meta';
 import type {
   ProcessedColumn,
   ProcessedColumnsStore,
 } from './processedColumns';
 import { processColumn } from './processedColumns';
+import type { RecordRow, TableRecordsData } from './records';
+import { RecordsData } from './records';
 
 export interface TabularDataProps {
   id: DBObjectEntry['id'];
@@ -56,8 +60,11 @@ export class TabularData {
 
   columnsDataStore: ColumnsDataStore;
 
+  /** TODO eliminate `processedColumns` in favor of `orderedProcessedColumns` */
   processedColumns: ProcessedColumnsStore;
 
+  orderedProcessedColumns: ProcessedColumnsStore;
+
   constraintsDataStore: ConstraintsDataStore;
 
   recordsData: RecordsData;
@@ -68,8 +75,12 @@ export class TabularData {
 
   legacySelection: TabularDataSelection;
 
+  selection: Writable<SheetSelection>;
+
   table: TableEntry;
 
+  cleanupFunctions: (() => void)[] = [];
+
   constructor(props: TabularDataProps) {
     const contextualFilters =
       props.contextualFilters ?? new Map<number, string | number>();
@@ -112,6 +123,27 @@ export class TabularData {
 
     this.table = props.table;
 
+    this.orderedProcessedColumns = derived(this.processedColumns, (p) =>
+      orderProcessedColumns(p, this.table),
+    );
+
+    const plane = derived(
+      [this.recordsData.selectableRowIds, this.orderedProcessedColumns],
+      ([selectableRowIds, orderedProcessedColumns]) => {
+        const columnIds = new Series(
+          [...orderedProcessedColumns.values()].map((c) => String(c.id)),
+        );
+        return new Plane(selectableRowIds, columnIds);
+      },
+    );
+
+    // TODO add id of placeholder row to selection
+    this.selection = writable(new SheetSelection());
+
+    this.cleanupFunctions.push(
+      plane.subscribe((p) => this.selection.update((s) => s.forNewPlane(p))),
+    );
+
     this.legacySelection = new LegacySheetSelection({
       getColumns: () => [...get(this.processedColumns).values()],
       getColumnOrder: () =>
@@ -222,6 +254,7 @@ export class TabularData {
     this.constraintsDataStore.destroy();
     this.columnsDataStore.destroy();
     this.legacySelection.destroy();
+    this.cleanupFunctions.forEach((f) => f());
   }
 }
 

From 640eb9b08ba1636005cad928652c13a41de4731e Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 25 Aug 2023 09:42:40 -0400
Subject: [PATCH 0007/1141] Some readability improvements

---
 .../src/components/sheet/selection/Plane.ts   | 12 +++++++
 .../src/components/sheet/selection/Series.ts  | 36 ++++++++++---------
 .../sheet/selection/SheetSelection.ts         | 17 +++++++++
 3 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/mathesar_ui/src/components/sheet/selection/Plane.ts b/mathesar_ui/src/components/sheet/selection/Plane.ts
index 7a3185852e..2fd4b9df48 100644
--- a/mathesar_ui/src/components/sheet/selection/Plane.ts
+++ b/mathesar_ui/src/components/sheet/selection/Plane.ts
@@ -44,6 +44,18 @@ function adjacentPlaceholderCell(cellId: string): AdjacentCell {
   return { type: 'placeholderCell', cellId };
 }
 
+/**
+ * A Plane is like a coordinate system for a sheet. We can query it to find the
+ * ids of cells within certain bounding rectangles.
+ *
+ * The Plane can also have a "placeholder row", which is a row at the bottom of
+ * the sheet that provides a visual cue to the user that they can add more rows.
+ * It never contains any data, but we allow the user to move the active cell
+ * into the placeholder row in order to easily add more rows.
+ *
+ * The term "Flexible" is used in methods to indicate that it will gracefully
+ * handle ids of cells within the placeholder row.
+ */
 export default class Plane {
   readonly rowIds: Series<string>;
 
diff --git a/mathesar_ui/src/components/sheet/selection/Series.ts b/mathesar_ui/src/components/sheet/selection/Series.ts
index 7034fd06b7..cbfd31d16d 100644
--- a/mathesar_ui/src/components/sheet/selection/Series.ts
+++ b/mathesar_ui/src/components/sheet/selection/Series.ts
@@ -2,16 +2,20 @@ import { filter, findBest, firstHighest, firstLowest } from 'iter-tools';
 
 import { ImmutableMap } from '@mathesar/component-library';
 
-export default class Series<Id> {
-  private readonly values: Id[];
+/**
+ * A Series is an immutable ordered collection of values with methods that
+ * provide efficient access to _ranges_ of those values.
+ */
+export default class Series<Value> {
+  private readonly values: Value[];
 
   /** Maps the id value to its index */
-  private readonly indexLookup: ImmutableMap<Id, number>;
+  private readonly indexLookup: ImmutableMap<Value, number>;
 
   /**
    * @throws Error if duplicate values are provided
    */
-  constructor(values: Id[] = []) {
+  constructor(values: Value[] = []) {
     this.values = values;
     this.indexLookup = new ImmutableMap(
       values.map((value, index) => [value, index]),
@@ -21,7 +25,7 @@ export default class Series<Id> {
     }
   }
 
-  private getIndex(value: Id): number | undefined {
+  private getIndex(value: Value): number | undefined {
     return this.indexLookup.get(value);
   }
 
@@ -36,7 +40,7 @@ export default class Series<Id> {
    *
    * @throws an Error if either value is not present in the sequence
    */
-  range(a: Id, b: Id): Iterable<Id> {
+  range(a: Value, b: Value): Iterable<Value> {
     const aIndex = this.getIndex(a);
     const bIndex = this.getIndex(b);
 
@@ -50,15 +54,15 @@ export default class Series<Id> {
     return this.values.slice(startIndex, endIndex + 1);
   }
 
-  get first(): Id | undefined {
+  get first(): Value | undefined {
     return this.values[0];
   }
 
-  get last(): Id | undefined {
+  get last(): Value | undefined {
     return this.values[this.values.length - 1];
   }
 
-  has(value: Id): boolean {
+  has(value: Value): boolean {
     return this.getIndex(value) !== undefined;
   }
 
@@ -72,18 +76,18 @@ export default class Series<Id> {
    * https://github.com/iter-tools/iter-tools/blob/d7.5/API.md#compare-values-and-return-true-or-false
    */
   best(
-    values: Iterable<Id>,
+    values: Iterable<Value>,
     comparator: (best: number, v: number) => boolean,
-  ): Id | undefined {
+  ): Value | undefined {
     const validValues = filter((v) => this.has(v), values);
     return findBest(comparator, (v) => this.getIndex(v) ?? 0, validValues);
   }
 
-  min(values: Iterable<Id>): Id | undefined {
+  min(values: Iterable<Value>): Value | undefined {
     return this.best(values, firstLowest);
   }
 
-  max(values: Iterable<Id>): Id | undefined {
+  max(values: Iterable<Value>): Value | undefined {
     return this.best(values, firstHighest);
   }
 
@@ -94,7 +98,7 @@ export default class Series<Id> {
    * given value. If no such value is present, then `undefined` will be
    * returned.
    */
-  offset(value: Id, offset: number): Id | undefined {
+  offset(value: Value, offset: number): Value | undefined {
     if (offset === 0) {
       return this.has(value) ? value : undefined;
     }
@@ -112,7 +116,7 @@ export default class Series<Id> {
    * value in the block. If no such value is present, then `undefined` will be
    * returned. If offset is zero, then `undefined` will be returned.
    */
-  collapsedOffset(values: Iterable<Id>, offset: number): Id | undefined {
+  collapsedOffset(values: Iterable<Value>, offset: number): Value | undefined {
     if (offset === 0) {
       return undefined;
     }
@@ -123,7 +127,7 @@ export default class Series<Id> {
     return this.offset(outerValue, offset);
   }
 
-  [Symbol.iterator](): Iterator<Id> {
+  [Symbol.iterator](): Iterator<Value> {
     return this.values[Symbol.iterator]();
   }
 }
diff --git a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
index a16948d9e0..d9b7bcd84f 100644
--- a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
+++ b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
@@ -25,6 +25,14 @@ import Plane from './Plane';
  */
 type BasisType = 'dataCells' | 'emptyColumns' | 'placeholderCell' | 'empty';
 
+/**
+ * This type stores data about "which cells are selected", with some redundancy
+ * for efficient and consistent lookup across different kinds of selections.
+ *
+ * Due to the redundant nature of some properties on this type, you should be
+ * sure to only instantiate Basis using the utility functions below. This will
+ * ensure that the data is always valid.
+ */
 interface Basis {
   readonly type: BasisType;
   readonly activeCellId: string | undefined;
@@ -81,6 +89,15 @@ function emptyBasis(): Basis {
   };
 }
 
+/**
+ * This is an immutable data structure which fully represents the state of a
+ * selection selection of cells along with the Plane in which they were
+ * selected.
+ *
+ * We store the Plane here so to make it possible to provide methods on
+ * `SheetSelection` instances which return new mutations of the selection that
+ * are still valid within the Plane.
+ */
 export default class SheetSelection {
   private readonly plane: Plane;
 

From de875e41130da4d667e0615a04a4d18a852f20f4 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 25 Aug 2023 10:48:46 -0400
Subject: [PATCH 0008/1141] Add `intersect` method to ImmutableSet

---
 .../component-library/common/utils/ImmutableSet.ts   |  9 +++++++++
 .../common/utils/__tests__/ImmutableSet.test.ts      | 12 ++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/mathesar_ui/src/component-library/common/utils/ImmutableSet.ts b/mathesar_ui/src/component-library/common/utils/ImmutableSet.ts
index 609c156ecd..d442984ad0 100644
--- a/mathesar_ui/src/component-library/common/utils/ImmutableSet.ts
+++ b/mathesar_ui/src/component-library/common/utils/ImmutableSet.ts
@@ -32,6 +32,15 @@ export default class ImmutableSet<T> {
     return this.getNewInstance(set);
   }
 
+  /**
+   * @returns a new ImmutableSet that contains only the items that are present
+   * in both this set and the other set. The order of the items in the returned
+   * set is taken from this set (not the supplied set).
+   */
+  intersect(other: { has: (v: T) => boolean }): this {
+    return this.getNewInstance([...this].filter((v) => other.has(v)));
+  }
+
   without(itemOrItems: T | T[]): this {
     const items = Array.isArray(itemOrItems) ? itemOrItems : [itemOrItems];
     const set = new Set(this.set);
diff --git a/mathesar_ui/src/component-library/common/utils/__tests__/ImmutableSet.test.ts b/mathesar_ui/src/component-library/common/utils/__tests__/ImmutableSet.test.ts
index 24938eb957..3d20add0d6 100644
--- a/mathesar_ui/src/component-library/common/utils/__tests__/ImmutableSet.test.ts
+++ b/mathesar_ui/src/component-library/common/utils/__tests__/ImmutableSet.test.ts
@@ -20,3 +20,15 @@ test('union', () => {
   expect(a.union(empty).valuesArray()).toEqual([2, 7, 13, 19, 5]);
   expect(empty.union(a).valuesArray()).toEqual([2, 7, 13, 19, 5]);
 });
+
+test('intersect', () => {
+  const a = new ImmutableSet([2, 7, 13, 19, 5]);
+  const b = new ImmutableSet([23, 13, 3, 2]);
+  const empty = new ImmutableSet<number>();
+  expect(a.intersect(a).valuesArray()).toEqual([2, 7, 13, 19, 5]);
+  expect(a.intersect(b).valuesArray()).toEqual([2, 13]);
+  expect(b.intersect(a).valuesArray()).toEqual([13, 2]);
+  expect(a.intersect(empty).valuesArray()).toEqual([]);
+  expect(empty.intersect(a).valuesArray()).toEqual([]);
+  expect(empty.intersect(empty).valuesArray()).toEqual([]);
+});

From c64e12b87a9f6d81b19770e0c0290fc235309b0f Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 25 Aug 2023 21:57:14 -0400
Subject: [PATCH 0009/1141] Refactor Series tests to use cases

---
 .../sheet/selection/__tests__/Series.test.ts  | 116 +++++++++++-------
 1 file changed, 75 insertions(+), 41 deletions(-)

diff --git a/mathesar_ui/src/components/sheet/selection/__tests__/Series.test.ts b/mathesar_ui/src/components/sheet/selection/__tests__/Series.test.ts
index 8109932d9f..0d485b64a7 100644
--- a/mathesar_ui/src/components/sheet/selection/__tests__/Series.test.ts
+++ b/mathesar_ui/src/components/sheet/selection/__tests__/Series.test.ts
@@ -1,44 +1,78 @@
 import Series from '../Series';
 
-test('Series', () => {
-  const s = new Series(['h', 'i', 'j', 'k', 'l']);
-  expect(s.length).toBe(5);
-  expect(s.first).toBe('h');
-  expect(s.last).toBe('l');
-
-  expect([...s]).toEqual(['h', 'i', 'j', 'k', 'l']);
-
-  expect(s.min(['i', 'j', 'k'])).toBe('i');
-  expect(s.min(['k', 'j', 'i'])).toBe('i');
-  expect(s.min(['i', 'NOPE'])).toBe('i');
-  expect(s.min(['NOPE'])).toBe(undefined);
-  expect(s.min([])).toBe(undefined);
-
-  expect(s.max(['i', 'j', 'k'])).toBe('k');
-  expect(s.max(['k', 'j', 'i'])).toBe('k');
-  expect(s.max(['i', 'NOPE'])).toBe('i');
-  expect(s.max(['NOPE'])).toBe(undefined);
-  expect(s.max([])).toBe(undefined);
-
-  expect([...s.range('i', 'k')]).toEqual(['i', 'j', 'k']);
-  expect([...s.range('k', 'i')]).toEqual(['i', 'j', 'k']);
-  expect([...s.range('i', 'i')]).toEqual(['i']);
-  expect(() => s.range('i', 'NOPE')).toThrow();
-
-  expect(s.offset('i', 0)).toBe('i');
-  expect(s.offset('i', 1)).toBe('j');
-  expect(s.offset('i', 2)).toBe('k');
-  expect(s.offset('i', -1)).toBe('h');
-  expect(s.offset('i', -2)).toBe(undefined);
-  expect(s.offset('NOPE', 0)).toBe(undefined);
-  expect(s.offset('NOPE', 1)).toBe(undefined);
-
-  expect(s.collapsedOffset(['i', 'k'], 0)).toBe(undefined);
-  expect(s.collapsedOffset(['i', 'k'], 1)).toBe('l');
-  expect(s.collapsedOffset(['i', 'k'], 2)).toBe(undefined);
-  expect(s.collapsedOffset(['i', 'k'], -1)).toBe('h');
-  expect(s.collapsedOffset(['i', 'k'], -2)).toBe(undefined);
-  expect(s.collapsedOffset(['i', 'NOPE'], 0)).toBe(undefined);
-  expect(s.collapsedOffset(['i', 'NOPE'], 1)).toBe('j');
-  expect(s.collapsedOffset([], 0)).toBe(undefined);
+describe('Series', () => {
+  const h = 'h';
+  const i = 'i';
+  const j = 'j';
+  const k = 'k';
+  const l = 'l';
+  const all = [h, i, j, k, l];
+  const s = new Series(all);
+
+  test('basics', () => {
+    expect(s.length).toBe(5);
+    expect(s.first).toBe(h);
+    expect(s.last).toBe(l);
+    expect([...s]).toEqual(all);
+  });
+
+  test.each([
+    [[i, j, k], i],
+    [[k, j, i], i],
+    [[i, 'NOPE'], i],
+    [['NOPE'], undefined],
+    [[], undefined],
+  ])('min %#', (input, expected) => {
+    expect(s.min(input)).toBe(expected);
+  });
+
+  test.each([
+    [[i, j, k], k],
+    [[k, j, i], k],
+    [[i, 'NOPE'], i],
+    [['NOPE'], undefined],
+    [[], undefined],
+  ])('max %#', (input, expected) => {
+    expect(s.max(input)).toBe(expected);
+  });
+
+  test.each([
+    [i, k, [i, j, k]],
+    [k, i, [i, j, k]],
+    [i, i, [i]],
+  ])('range %#', (a, b, expected) => {
+    expect([...s.range(a, b)]).toEqual(expected);
+  });
+
+  test.each([
+    [i, 'NOPE'],
+    ['NOPE', i],
+  ])('range failures %#', (a, b) => {
+    expect(() => s.range(a, b)).toThrow();
+  });
+
+  test.each([
+    [i, 0, i],
+    [i, 1, j],
+    [i, 2, k],
+    [i, -1, h],
+    [i, -2, undefined],
+    ['NOPE', 0, undefined],
+    ['NOPE', 1, undefined],
+  ])('offset %#', (value, offset, expected) => {
+    expect(s.offset(value, offset)).toBe(expected);
+  });
+
+  test.each([
+    [[i, k], 0, undefined],
+    [[i, k], 1, l],
+    [[i, k], 2, undefined],
+    [[i, k], -1, h],
+    [[i, k], -2, undefined],
+    [[i, 'NOPE'], 0, undefined],
+    [[i, 'NOPE'], 1, j],
+    [[], 0, undefined],
+  ])('collapsedOffset %#', (values, offset, expected) => {
+    expect(s.collapsedOffset(values, offset)).toBe(expected);
+  });
 });

From be749bad54be4996f0a4055d4db818b7f5fed7f1 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 25 Aug 2023 21:57:48 -0400
Subject: [PATCH 0010/1141] Tiny readability improvement

---
 mathesar_ui/src/components/sheet/selection/Series.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/mathesar_ui/src/components/sheet/selection/Series.ts b/mathesar_ui/src/components/sheet/selection/Series.ts
index cbfd31d16d..b0e897aab3 100644
--- a/mathesar_ui/src/components/sheet/selection/Series.ts
+++ b/mathesar_ui/src/components/sheet/selection/Series.ts
@@ -1,10 +1,9 @@
 import { filter, findBest, firstHighest, firstLowest } from 'iter-tools';
-
-import { ImmutableMap } from '@mathesar/component-library';
+import { ImmutableMap } from '@mathesar-component-library';
 
 /**
- * A Series is an immutable ordered collection of values with methods that
- * provide efficient access to _ranges_ of those values.
+ * A Series is an immutable ordered collection of unique values with methods
+ * that provide efficient access to _ranges_ of those values.
  */
 export default class Series<Value> {
   private readonly values: Value[];

From 0476730ddbfaca8bd3548b926ce8c17d0ce1fbba Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 25 Aug 2023 21:58:20 -0400
Subject: [PATCH 0011/1141] Implement SheetSelection.forNewPlane

---
 .../src/components/sheet/selection/Plane.ts   | 30 ++++++++-
 .../sheet/selection/SheetSelection.ts         | 62 ++++++++++++++++++-
 2 files changed, 87 insertions(+), 5 deletions(-)

diff --git a/mathesar_ui/src/components/sheet/selection/Plane.ts b/mathesar_ui/src/components/sheet/selection/Plane.ts
index 2fd4b9df48..3f0d87780f 100644
--- a/mathesar_ui/src/components/sheet/selection/Plane.ts
+++ b/mathesar_ui/src/components/sheet/selection/Plane.ts
@@ -145,16 +145,40 @@ export default class Plane {
   ): Iterable<string> {
     const cellA = parseCellId(cellIdA);
     const cellB = parseCellId(cellIdB);
-    const rowIdA = this.normalizeFlexibleRowId(cellA.rowId);
+    return this.dataCellsInFlexibleRowColumnRange(
+      cellA.rowId,
+      cellB.rowId,
+      cellA.columnId,
+      cellB.columnId,
+    );
+  }
+
+  /**
+   * @returns an iterable of all the data cells in the plane that are within the
+   * rectangle bounded by the given rows and columns. This does not include
+   * header cells.
+   *
+   * If either of the provided rowIds are placeholder cells, then cells in the
+   * last row and last column will be used in their place. This ensures that the
+   * selection is made only of data cells, and will never include the
+   * placeholder cell, even if a user drags to select it.
+   */
+  dataCellsInFlexibleRowColumnRange(
+    flexibleRowIdA: string,
+    flexibleRowIdB: string,
+    columnIdA: string,
+    columnIdB: string,
+  ): Iterable<string> {
+    const rowIdA = this.normalizeFlexibleRowId(flexibleRowIdA);
     if (rowIdA === undefined) {
       return [];
     }
-    const rowIdB = this.normalizeFlexibleRowId(cellB.rowId);
+    const rowIdB = this.normalizeFlexibleRowId(flexibleRowIdB);
     if (rowIdB === undefined) {
       return [];
     }
     const rowIds = this.rowIds.range(rowIdA, rowIdB);
-    const columnIds = this.columnIds.range(cellA.columnId, cellB.columnId);
+    const columnIds = this.columnIds.range(columnIdA, columnIdB);
     return makeCells(rowIds, columnIds);
   }
 
diff --git a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
index d9b7bcd84f..9be7602e84 100644
--- a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
+++ b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
@@ -219,8 +219,66 @@ export default class SheetSelection {
    * useful when a column is deleted, reordered, or inserted.
    */
   forNewPlane(newPlane: Plane): SheetSelection {
-    // TODO_NEXT
-    throw new Error('Not implemented');
+    if (this.basis.type === 'dataCells') {
+      if (!newPlane.hasResultRows) {
+        return new SheetSelection(newPlane, basisFromZeroEmptyColumns());
+      }
+      const minColumnId = newPlane.columnIds.min(this.basis.columnIds);
+      const maxColumnId = newPlane.columnIds.max(this.basis.columnIds);
+      const minRowId = newPlane.rowIds.min(this.basis.rowIds);
+      const maxRowId = newPlane.rowIds.max(this.basis.rowIds);
+      if (
+        minColumnId === undefined ||
+        maxColumnId === undefined ||
+        minRowId === undefined ||
+        maxRowId === undefined
+      ) {
+        return new SheetSelection(newPlane);
+      }
+      const cellIds = newPlane.dataCellsInFlexibleRowColumnRange(
+        minRowId,
+        maxRowId,
+        minColumnId,
+        maxColumnId,
+      );
+      return new SheetSelection(newPlane, basisFromDataCells(cellIds));
+    }
+
+    if (this.basis.type === 'emptyColumns') {
+      if (newPlane.hasResultRows) {
+        return new SheetSelection(newPlane);
+      }
+      const minColumnId = newPlane.columnIds.min(this.basis.columnIds);
+      const maxColumnId = newPlane.columnIds.max(this.basis.columnIds);
+      if (minColumnId === undefined || maxColumnId === undefined) {
+        return new SheetSelection(newPlane, basisFromZeroEmptyColumns());
+      }
+      const columnIds = newPlane.columnIds.range(minColumnId, maxColumnId);
+      return new SheetSelection(newPlane, basisFromEmptyColumns(columnIds));
+    }
+
+    if (this.basis.type === 'placeholderCell') {
+      const columnId = first(this.basis.columnIds);
+      if (columnId === undefined) {
+        return new SheetSelection(newPlane);
+      }
+      const newPlaneHasSelectedCell =
+        newPlane.columnIds.has(columnId) &&
+        newPlane.placeholderRowId === this.plane.placeholderRowId;
+      if (newPlaneHasSelectedCell) {
+        // If we can retain the selected placeholder cell, then do so.
+        return new SheetSelection(newPlane, basisFromPlaceholderCell(columnId));
+      }
+      // Otherwise, return an empty selection
+      return new SheetSelection(newPlane);
+    }
+
+    if (this.basis.type === 'empty') {
+      // If the selection is empty, we keep it empty.
+      return new SheetSelection(newPlane);
+    }
+
+    return assertExhaustive(this.basis.type);
   }
 
   /**

From 09cd2198ede775e1d79dad7f05057675e4df9f1e Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Sun, 27 Aug 2023 21:15:45 -0400
Subject: [PATCH 0012/1141] Begin incorporating new Selection into table sheet

---
 .../sheet/selection/SheetSelection.ts         | 42 ++++++-----
 .../src/systems/table-view/row/Row.svelte     | 41 +++++------
 .../src/systems/table-view/row/RowCell.svelte | 72 ++++++++-----------
 3 files changed, 68 insertions(+), 87 deletions(-)

diff --git a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
index 9be7602e84..08f5b67a61 100644
--- a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
+++ b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
@@ -55,6 +55,10 @@ function basisFromDataCells(
   };
 }
 
+function basisFromOneDataCell(cellId: string): Basis {
+  return basisFromDataCells([cellId], cellId);
+}
+
 function basisFromEmptyColumns(columnIds: Iterable<string>): Basis {
   return {
     type: 'emptyColumns',
@@ -106,6 +110,8 @@ export default class SheetSelection {
   constructor(plane: Plane = new Plane(), basis: Basis = emptyBasis()) {
     this.plane = plane;
     this.basis = basis;
+    // TODO validate that basis is valid within plane. For example, remove
+    // selected cells from the basis that do not occur within the plane.
   }
 
   get activeCellId() {
@@ -199,19 +205,17 @@ export default class SheetSelection {
   }
 
   /**
-   * @returns a new selection formed from one cell within the placeholder row.
-   * Note that we do not support selections of multiple cells in the placeholder
-   * row.
+   * @returns a new selection formed from one cell within the data rows or the
+   * placeholder row.
    */
-  atPlaceholderCell(cellId: string): SheetSelection {
-    return this.withBasis(basisFromPlaceholderCell(cellId));
-  }
-
-  /**
-   * @returns a new selection formed from one cell within the data rows.
-   */
-  atDataCell(cellId: string): SheetSelection {
-    return this.withBasis(basisFromDataCells([cellId], cellId));
+  ofOneCell(cellId: string): SheetSelection {
+    const { rowId } = parseCellId(cellId);
+    const { placeholderRowId } = this.plane;
+    const makeBasis =
+      rowId === placeholderRowId
+        ? basisFromPlaceholderCell
+        : basisFromOneDataCell;
+    return this.withBasis(makeBasis(cellId));
   }
 
   /**
@@ -233,6 +237,10 @@ export default class SheetSelection {
         minRowId === undefined ||
         maxRowId === undefined
       ) {
+        // TODO: in some cases maybe we can be smarter here. Instead of
+        // returning an empty selection, we could try to return a selection of
+        // the same dimensions that is placed as close as possible to the
+        // original selection.
         return new SheetSelection(newPlane);
       }
       const cellIds = newPlane.dataCellsInFlexibleRowColumnRange(
@@ -345,13 +353,9 @@ export default class SheetSelection {
       // If we can't move anywhere, then do nothing
       return this;
     }
-    if (adjacent.type === 'dataCell') {
-      // Move to an adjacent data cell
-      return this.atDataCell(adjacent.cellId);
-    }
-    if (adjacent.type === 'placeholderCell') {
-      // Move to an adjacent placeholder cell
-      return this.atPlaceholderCell(adjacent.cellId);
+    if (adjacent.type === 'dataCell' || adjacent.type === 'placeholderCell') {
+      // Move to an adjacent data cell or adjacent placeholder cell
+      return this.ofOneCell(adjacent.cellId);
     }
     return assertExhaustive(adjacent);
   }
diff --git a/mathesar_ui/src/systems/table-view/row/Row.svelte b/mathesar_ui/src/systems/table-view/row/Row.svelte
index 967c17b677..07a1faab61 100644
--- a/mathesar_ui/src/systems/table-view/row/Row.svelte
+++ b/mathesar_ui/src/systems/table-view/row/Row.svelte
@@ -11,11 +11,7 @@
     ID_ROW_CONTROL_COLUMN,
     type Row,
   } from '@mathesar/stores/table-data';
-  import {
-    SheetRow,
-    SheetCell,
-    isRowSelected,
-  } from '@mathesar/components/sheet';
+  import { SheetRow, SheetCell } from '@mathesar/components/sheet';
   import { rowHeightPx } from '@mathesar/geometry';
   import { ContextMenu } from '@mathesar/component-library';
   import NewRecordMessage from './NewRecordMessage.svelte';
@@ -29,13 +25,8 @@
 
   const tabularData = getTabularDataStoreFromContext();
 
-  $: ({
-    recordsData,
-    columnsDataStore,
-    meta,
-    processedColumns,
-    legacySelection: selection,
-  } = $tabularData);
+  $: ({ recordsData, columnsDataStore, meta, processedColumns, selection } =
+    $tabularData);
   $: ({
     rowStatus,
     rowCreationStatus,
@@ -50,29 +41,31 @@
   $: creationStatus = $rowCreationStatus.get(rowKey)?.state;
   $: status = $rowStatus.get(rowKey);
   $: wholeRowState = status?.wholeRowState;
-  $: ({ selectedCells } = selection);
-  $: isSelected = rowHasRecord(row) && isRowSelected($selectedCells, row);
+  $: isSelected = $selection.rowIds.has(row.identifier);
   $: hasWholeRowErrors = wholeRowState === 'failure';
   /** Including whole row errors and individual cell errors */
   $: hasAnyErrors = !!status?.errorsFromWholeRowAndCells?.length;
 
   function checkAndCreateEmptyRow() {
-    if (isPlaceholderRow(row)) {
-      void recordsData.addEmptyRecord();
-      selection.selectAndActivateFirstDataEntryCellInLastRow();
-    }
+    // // TODO_3037
+    // if (isPlaceholderRow(row)) {
+    //   void recordsData.addEmptyRecord();
+    //   selection.selectAndActivateFirstDataEntryCellInLastRow();
+    // }
   }
 
   const handleRowMouseDown = () => {
-    if (rowHasRecord(row) && !isPlaceholderRow(row)) {
-      selection.onRowSelectionStart(row);
-    }
+    // // TODO_3037
+    // if (rowHasRecord(row) && !isPlaceholderRow(row)) {
+    //   selection.onRowSelectionStart(row);
+    // }
   };
 
   const handleRowMouseEnter = () => {
-    if (rowHasRecord(row) && !isPlaceholderRow(row)) {
-      selection.onMouseEnterRowHeaderWhileSelection(row);
-    }
+    // // TODO_3037
+    // if (rowHasRecord(row) && !isPlaceholderRow(row)) {
+    //   selection.onMouseEnterRowHeaderWhileSelection(row);
+    // }
   };
 </script>
 
diff --git a/mathesar_ui/src/systems/table-view/row/RowCell.svelte b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
index d91fb0657a..0b9aa43f15 100644
--- a/mathesar_ui/src/systems/table-view/row/RowCell.svelte
+++ b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
@@ -1,26 +1,27 @@
 <script lang="ts">
   import { tick } from 'svelte';
+  import type { Writable } from 'svelte/store';
 
   import {
     ButtonMenuItem,
     ContextMenu,
     LinkMenuItem,
-    WritableMap,
     MenuDivider,
     MenuHeading,
+    WritableMap,
   } from '@mathesar-component-library';
   import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
   import { States } from '@mathesar/api/utils/requestUtils';
-  import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
   import CellBackground from '@mathesar/components/CellBackground.svelte';
   import Null from '@mathesar/components/Null.svelte';
   import RowCellBackgrounds from '@mathesar/components/RowCellBackgrounds.svelte';
+  import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
   import {
-    isCellActive,
-    isCellSelected,
-    scrollBasedOnActiveCell,
     SheetCell,
+    scrollBasedOnActiveCell,
   } from '@mathesar/components/sheet';
+  import { makeCellId } from '@mathesar/components/sheet/cellIds';
+  import type SheetSelection from '@mathesar/components/sheet/selection/SheetSelection';
   import { iconLinkToRecordPage, iconSetToNull } from '@mathesar/icons';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
@@ -31,15 +32,14 @@
     type ProcessedColumn,
     type RecordRow,
     type RecordsData,
-    type TabularDataSelection,
   } from '@mathesar/stores/table-data';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
-  import CellErrors from './CellErrors.svelte';
   import ColumnHeaderContextMenu from '../header/header-cell/ColumnHeaderContextMenu.svelte';
+  import CellErrors from './CellErrors.svelte';
   import RowContextOptions from './RowContextOptions.svelte';
 
   export let recordsData: RecordsData;
-  export let selection: TabularDataSelection;
+  export let selection: Writable<SheetSelection>;
   export let row: RecordRow;
   export let rowHasErrors = false;
   export let key: CellKey;
@@ -51,6 +51,7 @@
 
   const userProfile = getUserProfileStoreFromContext();
 
+  $: cellId = makeCellId(row.identifier, String(processedColumn.id));
   $: database = $currentDatabase;
   $: schema = $currentSchema;
   $: canEditTableRecords = !!$userProfile?.hasPermission(
@@ -65,28 +66,8 @@
   $: ({ recordSummaries } = recordsData);
   $: ({ column, linkFk } = processedColumn);
   $: columnId = column.id;
-  $: ({ activeCell, selectedCells } = selection);
-  $: isActive = $activeCell && isCellActive($activeCell, row, processedColumn);
-
-  /**
-   * The name indicates that this boolean is only true when more than one cell
-   * is selected. However, because of the bug that [the active cell and selected
-   * cells do not remain in sync when using keyboard][1] this boolean is
-   * sometimes true even when multiple cells are selected. This is to
-   * differentiate between different active and selected cell using blue
-   * background styling for selected cell and blue border styling for active
-   * cell.
-   *
-   * The above bug can be fixed when following two conditions are met
-   *
-   * - We are working on keyboard accessability of the application.
-   * - `selectedCells` and `activeCell` are merged in a single store.
-   *
-   * [1]: https://github.com/centerofci/mathesar/issues/1534
-   */
-  $: isSelectedInRange =
-    isCellSelected($selectedCells, row, processedColumn) &&
-    $selectedCells.size > 1;
+  $: isActive = $selection.activeCellId === cellId;
+  $: isSelectedInRange = $selection.cellIds.has(cellId);
   $: modificationStatus = $modificationStatusMap.get(key);
   $: serverErrors =
     modificationStatus?.state === 'failure' ? modificationStatus?.errors : [];
@@ -112,13 +93,14 @@
   async function moveThroughCells(
     event: CustomEvent<{ originalEvent: KeyboardEvent; key: string }>,
   ) {
-    const { originalEvent } = event.detail;
-    const type = selection.handleKeyEventsOnActiveCell(originalEvent);
-    if (type) {
-      originalEvent.stopPropagation();
-      originalEvent.preventDefault();
-      await checkTypeAndScroll(type);
-    }
+    // // TODO_3037
+    // const { originalEvent } = event.detail;
+    // const type = selection.handleKeyEventsOnActiveCell(originalEvent);
+    // if (type) {
+    //   originalEvent.stopPropagation();
+    //   originalEvent.preventDefault();
+    //   await checkTypeAndScroll(type);
+    // }
   }
 
   async function setValue(newValue: unknown) {
@@ -179,18 +161,20 @@
       showAsSkeleton={$recordsDataState === States.Loading}
       disabled={!isEditable}
       on:movementKeyDown={moveThroughCells}
-      on:activate={() => {
-        selection.activateCell(row, processedColumn);
-      }}
+      on:activate={() => selection.update((s) => s.ofOneCell(cellId))}
       on:update={valueUpdated}
       horizontalAlignment={column.primary_key ? 'left' : undefined}
       on:onSelectionStart={() => {
-        selection.onStartSelection(row, processedColumn);
+        // // TODO_3037
+        // selection.onStartSelection(row, processedColumn);
       }}
       on:onMouseEnterCellWhileSelection={() => {
-        // This enables the click + drag to
-        // select multiple cells
-        selection.onMouseEnterCellWhileSelection(row, processedColumn);
+        // // This enables the click + drag to
+        // // select multiple cells
+        // //
+        // // TODO_3037
+        // //
+        // selection.onMouseEnterCellWhileSelection(row, processedColumn);
       }}
     />
     <ContextMenu>

From 63ef9cb8ef9aee7905caac2eb0ec66068dec1e21 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 29 Aug 2023 11:41:51 -0400
Subject: [PATCH 0013/1141] Show selection status in column header

---
 .../sheet/selection/SheetSelection.ts         | 50 +++++++++++--
 .../src/stores/table-data/tabularData.ts      |  7 +-
 .../src/systems/table-view/Body.svelte        |  2 -
 .../systems/table-view/header/Header.svelte   | 70 ++++++++-----------
 .../header/drag-and-drop/Draggable.svelte     | 22 +++---
 5 files changed, 92 insertions(+), 59 deletions(-)

diff --git a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
index 08f5b67a61..b2da58135f 100644
--- a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
+++ b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
@@ -93,6 +93,38 @@ function emptyBasis(): Basis {
   };
 }
 
+function getFullySelectedColumnIds(
+  plane: Plane,
+  basis: Basis,
+): ImmutableSet<string> {
+  if (basis.type === 'dataCells') {
+    // The logic here is: if all rows are selected, then every selected column
+    // FULLY selected. Otherwise, no columns are fully selected.
+    //
+    // THIS LOGIC ASSUMES THAT ALL SELECTIONS ARE RECTANGULAR. The application
+    // enforces this assumption at various levels, but NOT within the Basis data
+    // structure. That is, it's theoretically possible to have basis data which
+    // represents a non-rectangular selection, but such data should be
+    // considered a bug. The logic within this function leverages this
+    // assumption for the purpose of improving performance. If we know that the
+    // selection is rectangular, then we can avoid iterating over all cells in
+    // each selected column to see if the column is fully selected.
+    return basis.rowIds.size < plane.rowIds.length
+      ? new ImmutableSet()
+      : basis.columnIds;
+  }
+  if (basis.type === 'emptyColumns') {
+    return basis.columnIds;
+  }
+  if (basis.type === 'placeholderCell') {
+    return new ImmutableSet();
+  }
+  if (basis.type === 'empty') {
+    return new ImmutableSet();
+  }
+  return assertExhaustive(basis.type);
+}
+
 /**
  * This is an immutable data structure which fully represents the state of a
  * selection selection of cells along with the Plane in which they were
@@ -107,26 +139,36 @@ export default class SheetSelection {
 
   private readonly basis: Basis;
 
+  /** Ids of columns in which _all_ cells are selected */
+  fullySelectedColumnIds: ImmutableSet<string>;
+
   constructor(plane: Plane = new Plane(), basis: Basis = emptyBasis()) {
     this.plane = plane;
     this.basis = basis;
     // TODO validate that basis is valid within plane. For example, remove
     // selected cells from the basis that do not occur within the plane.
+
+    this.fullySelectedColumnIds = getFullySelectedColumnIds(
+      this.plane,
+      this.basis,
+    );
   }
 
-  get activeCellId() {
+  get activeCellId(): string | undefined {
     return this.basis.activeCellId;
   }
 
-  get cellIds() {
+  get cellIds(): ImmutableSet<string> {
     return this.basis.cellIds;
   }
 
-  get rowIds() {
+  /** Ids of rows which are at least _partially_ selected */
+  get rowIds(): ImmutableSet<string> {
     return this.basis.rowIds;
   }
 
-  get columnIds() {
+  /** Ids of columns which are at least _partially_ selected */
+  get columnIds(): ImmutableSet<string> {
     return this.basis.columnIds;
   }
 
diff --git a/mathesar_ui/src/stores/table-data/tabularData.ts b/mathesar_ui/src/stores/table-data/tabularData.ts
index 8fd5a63cc1..5029d92376 100644
--- a/mathesar_ui/src/stores/table-data/tabularData.ts
+++ b/mathesar_ui/src/stores/table-data/tabularData.ts
@@ -75,6 +75,11 @@ export class TabularData {
 
   isLoading: Readable<boolean>;
 
+  /**
+   * TODO_3037
+   *
+   * @deprecated
+   */
   legacySelection: TabularDataSelection;
 
   selection: Writable<SheetSelection>;
@@ -147,7 +152,7 @@ export class TabularData {
       },
     );
 
-    // TODO add id of placeholder row to selection
+    // TODO_3037 add id of placeholder row to selection
     this.selection = writable(new SheetSelection());
 
     this.cleanupFunctions.push(
diff --git a/mathesar_ui/src/systems/table-view/Body.svelte b/mathesar_ui/src/systems/table-view/Body.svelte
index f917c5dc71..ebb168153f 100644
--- a/mathesar_ui/src/systems/table-view/Body.svelte
+++ b/mathesar_ui/src/systems/table-view/Body.svelte
@@ -59,8 +59,6 @@
   }
 </script>
 
-<svelte:window />
-
 {#key id}
   {#if usesVirtualList}
     <SheetVirtualRows
diff --git a/mathesar_ui/src/systems/table-view/header/Header.svelte b/mathesar_ui/src/systems/table-view/header/Header.svelte
index 3b71564078..01d7fa1d3b 100644
--- a/mathesar_ui/src/systems/table-view/header/Header.svelte
+++ b/mathesar_ui/src/systems/table-view/header/Header.svelte
@@ -1,23 +1,24 @@
 <script lang="ts">
+  import { first } from 'iter-tools';
+
+  import type { TableEntry } from '@mathesar/api/types/tables';
+  import { ContextMenu } from '@mathesar/component-library';
   import {
-    getTabularDataStoreFromContext,
-    ID_ADD_NEW_COLUMN,
-    ID_ROW_CONTROL_COLUMN,
-  } from '@mathesar/stores/table-data';
-  import {
-    SheetHeader,
     SheetCell,
     SheetCellResizer,
-    isColumnSelected,
+    SheetHeader,
   } from '@mathesar/components/sheet';
   import type { ProcessedColumn } from '@mathesar/stores/table-data';
+  import {
+    getTabularDataStoreFromContext,
+    ID_ADD_NEW_COLUMN,
+    ID_ROW_CONTROL_COLUMN,
+  } from '@mathesar/stores/table-data';
   import { saveColumnOrder } from '@mathesar/stores/tables';
-  import type { TableEntry } from '@mathesar/api/types/tables';
-  import { ContextMenu } from '@mathesar/component-library';
-  import HeaderCell from './header-cell/HeaderCell.svelte';
-  import NewColumnCell from './new-column-cell/NewColumnCell.svelte';
   import { Draggable, Droppable } from './drag-and-drop';
   import ColumnHeaderContextMenu from './header-cell/ColumnHeaderContextMenu.svelte';
+  import HeaderCell from './header-cell/HeaderCell.svelte';
+  import NewColumnCell from './new-column-cell/NewColumnCell.svelte';
 
   const tabularData = getTabularDataStoreFromContext();
 
@@ -27,17 +28,7 @@
 
   $: columnOrder = columnOrder ?? [];
   $: columnOrderString = columnOrder.map(String);
-
-  $: ({ legacySelection: selection, processedColumns } = $tabularData);
-  $: ({
-    selectedCells,
-    columnsSelectedWhenTheTableIsEmpty,
-    selectionInProgress,
-  } = selection);
-  $: selectedColumnIds = selection.getSelectedUniqueColumnsId(
-    $selectedCells,
-    $columnsSelectedWhenTheTableIsEmpty,
-  );
+  $: ({ selection, processedColumns } = $tabularData);
 
   let locationOfFirstDraggedColumn: number | undefined = undefined;
   let selectedColumnIdsOrdered: string[] = [];
@@ -55,7 +46,7 @@
     columnOrderString = columnOrderString;
     // Remove selected column IDs and keep their order
     for (const id of columnOrderString) {
-      if (selectedColumnIds.map(String).includes(id)) {
+      if ($selection.columnIds.has(id)) {
         selectedColumnIdsOrdered.push(id);
         if (!locationOfFirstDraggedColumn) {
           locationOfFirstDraggedColumn = columnOrderString.indexOf(id);
@@ -70,9 +61,8 @@
     // Early exit if a column is dropped in the same place.
     // Should only be done for single column if non-continuous selection is allowed.
     if (
-      selectedColumnIds.length > 0 &&
       columnDroppedOn &&
-      selectedColumnIds[0] === columnDroppedOn.id
+      first($selection.columnIds) === String(columnDroppedOn.id)
     ) {
       // Reset drag information
       locationOfFirstDraggedColumn = undefined;
@@ -122,6 +112,7 @@
   </SheetCell>
 
   {#each [...$processedColumns] as [columnId, processedColumn] (columnId)}
+    {@const isSelected = $selection.columnIds.has(String(columnId))}
     <SheetCell columnIdentifierKey={columnId} let:htmlAttributes let:style>
       <div>
         <div {...htmlAttributes} {style}>
@@ -129,32 +120,27 @@
             on:dragstart={() => dragColumn()}
             column={processedColumn}
             {selection}
-            selectionInProgress={$selectionInProgress}
           >
             <Droppable
               on:drop={() => dropColumn(processedColumn)}
               on:dragover={(e) => e.preventDefault()}
               {locationOfFirstDraggedColumn}
               columnLocation={columnOrderString.indexOf(columnId.toString())}
-              isSelected={isColumnSelected(
-                $selectedCells,
-                $columnsSelectedWhenTheTableIsEmpty,
-                processedColumn,
-              )}
+              {isSelected}
             >
               <HeaderCell
                 {processedColumn}
-                isSelected={isColumnSelected(
-                  $selectedCells,
-                  $columnsSelectedWhenTheTableIsEmpty,
-                  processedColumn,
-                )}
-                on:mousedown={() =>
-                  selection.onColumnSelectionStart(processedColumn)}
-                on:mouseenter={() =>
-                  selection.onMouseEnterColumnHeaderWhileSelection(
-                    processedColumn,
-                  )}
+                {isSelected}
+                on:mousedown={() => {
+                  // // TODO_3037
+                  // selection.onColumnSelectionStart(processedColumn)
+                }}
+                on:mouseenter={() => {
+                  // // TODO_3037
+                  // selection.onMouseEnterColumnHeaderWhileSelection(
+                  //   processedColumn,
+                  // )
+                }}
               />
             </Droppable>
           </Draggable>
diff --git a/mathesar_ui/src/systems/table-view/header/drag-and-drop/Draggable.svelte b/mathesar_ui/src/systems/table-view/header/drag-and-drop/Draggable.svelte
index 2dcfe0a5bd..1347bd2f5a 100644
--- a/mathesar_ui/src/systems/table-view/header/drag-and-drop/Draggable.svelte
+++ b/mathesar_ui/src/systems/table-view/header/drag-and-drop/Draggable.svelte
@@ -1,17 +1,19 @@
 <script lang="ts">
-  import type {
-    ProcessedColumn,
-    TabularDataSelection,
-  } from '@mathesar/stores/table-data';
+  import type { Writable } from 'svelte/store';
 
-  export let selection: TabularDataSelection;
-  export let selectionInProgress = true;
+  import type SheetSelection from '@mathesar/components/sheet/selection/SheetSelection';
+  import type { ProcessedColumn } from '@mathesar/stores/table-data';
+
+  export let selection: Writable<SheetSelection>;
   export let column: ProcessedColumn;
 
-  $: draggable =
-    !selectionInProgress &&
-    selection &&
-    selection.isCompleteColumnSelected(column);
+  // // TODO_3037: Verify that we're not losing functionality here by removing
+  // `selectionInProgress` logic
+  //
+  // $: draggable = !selectionInProgress && selection &&
+  //   selection.isCompleteColumnSelected(column);
+
+  $: draggable = $selection.fullySelectedColumnIds.has(String(column.id));
 </script>
 
 <div

From bc8b8fe6c428676a043edee0eaa40af146e88e88 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 1 Sep 2023 12:53:56 -0400
Subject: [PATCH 0014/1141] Fix clipboard code to work with new selection code

---
 .../components/sheet/SheetClipboardHandler.ts | 116 +++++++-----------
 mathesar_ui/src/stores/table-data/records.ts  |  22 ++--
 .../src/stores/table-data/tabularData.ts      |  12 +-
 .../src/systems/data-explorer/QueryRunner.ts  |  15 ++-
 .../exploration-inspector/CellTab.svelte      |   1 +
 .../data-explorer/result-pane/Results.svelte  |  20 +--
 .../src/systems/table-view/TableView.svelte   |  86 ++++++-------
 .../src/systems/table-view/row/Row.svelte     |  21 ++--
 .../src/systems/table-view/row/RowCell.svelte |   3 +-
 mathesar_ui/src/utils/collectionUtils.ts      |   3 +
 10 files changed, 148 insertions(+), 151 deletions(-)
 create mode 100644 mathesar_ui/src/utils/collectionUtils.ts

diff --git a/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts b/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts
index 39728674d7..4d55f5aad3 100644
--- a/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts
+++ b/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts
@@ -1,19 +1,9 @@
 import * as Papa from 'papaparse';
-import { get } from 'svelte/store';
 
-import { ImmutableSet, type MakeToast } from '@mathesar-component-library';
-import LegacySheetSelection, {
-  isCellSelected,
-} from '@mathesar/components/sheet/LegacySheetSelection';
+import type { ImmutableSet } from '@mathesar-component-library';
 import type { AbstractTypeCategoryIdentifier } from '@mathesar/stores/abstract-types/types';
 import type { ClipboardHandler } from '@mathesar/stores/clipboard';
-import type {
-  ProcessedColumn,
-  RecordRow,
-  RecordSummariesForSheet,
-} from '@mathesar/stores/table-data';
-import type { QueryRow } from '@mathesar/systems/data-explorer/QueryRunner';
-import type { ProcessedQueryOutputColumn } from '@mathesar/systems/data-explorer/utils';
+import type { RecordSummariesForSheet } from '@mathesar/stores/table-data';
 import type { ReadableMapLike } from '@mathesar/typeUtils';
 import { labeledCount } from '@mathesar/utils/languageUtils';
 
@@ -21,25 +11,34 @@ const MIME_PLAIN_TEXT = 'text/plain';
 const MIME_MATHESAR_SHEET_CLIPBOARD =
   'application/x-vnd.mathesar-sheet-clipboard';
 
-/** Keys are row ids, values are records */
-type IndexedRecords = Map<number, Record<string, unknown>>;
+/**
+ * A column which allows the cells in it to be copied.
+ */
+interface CopyableColumn {
+  abstractType: { identifier: AbstractTypeCategoryIdentifier };
+  formatCellValue: (
+    cellValue: unknown,
+    recordSummaries?: RecordSummariesForSheet,
+  ) => string | null | undefined;
+}
 
-function getRawCellValue<
-  Column extends ProcessedQueryOutputColumn | ProcessedColumn,
->(
-  indexedRecords: IndexedRecords,
-  rowId: number,
-  columnId: Column['id'],
-): unknown {
-  return indexedRecords.get(rowId)?.[String(columnId)];
+/**
+ * This is the stuff we need to know from the sheet in order to copy the content
+ * of cells to the clipboard.
+ */
+interface CopyingContext {
+  /** Keys are row ids, values are records */
+  rowsMap: Map<string, Record<string, unknown>>;
+  columnsMap: ReadableMapLike<string, CopyableColumn>;
+  recordSummaries: RecordSummariesForSheet;
+  selectedRowIds: ImmutableSet<string>;
+  selectedColumnIds: ImmutableSet<string>;
 }
 
-function getFormattedCellValue<
-  Column extends ProcessedQueryOutputColumn | ProcessedColumn,
->(
+function getFormattedCellValue(
   rawCellValue: unknown,
-  columnsMap: ReadableMapLike<Column['id'], Column>,
-  columnId: Column['id'],
+  columnsMap: CopyingContext['columnsMap'],
+  columnId: string,
   recordSummaries: RecordSummariesForSheet,
 ): string {
   if (rawCellValue === undefined || rawCellValue === null) {
@@ -76,70 +75,37 @@ export interface StructuredCell {
   formatted: string;
 }
 
-interface SheetClipboardHandlerDeps<
-  Row extends QueryRow | RecordRow,
-  Column extends ProcessedQueryOutputColumn | ProcessedColumn,
-> {
-  selection: LegacySheetSelection<Row, Column>;
-  toast: MakeToast;
-  getRows(): Row[];
-  getColumnsMap(): ReadableMapLike<Column['id'], Column>;
-  getRecordSummaries(): RecordSummariesForSheet;
+interface Dependencies {
+  getCopyingContext(): CopyingContext;
+  showToastInfo(msg: string): void;
 }
 
-export class SheetClipboardHandler<
-  Row extends QueryRow | RecordRow,
-  Column extends ProcessedQueryOutputColumn | ProcessedColumn,
-> implements ClipboardHandler
-{
-  private readonly deps: SheetClipboardHandlerDeps<Row, Column>;
+export class SheetClipboardHandler implements ClipboardHandler {
+  private readonly deps: Dependencies;
 
-  constructor(deps: SheetClipboardHandlerDeps<Row, Column>) {
+  constructor(deps: Dependencies) {
     this.deps = deps;
   }
 
-  private getColumnIds(cells: ImmutableSet<string>) {
-    return this.deps.selection.getSelectedUniqueColumnsId(
-      cells,
-      // We don't care about the columns selected when the table is empty,
-      // because we only care about cells selected that have content.
-      new ImmutableSet(),
-    );
-  }
-
-  private getRowIds(cells: ImmutableSet<string>) {
-    return this.deps.selection.getSelectedUniqueRowsId(cells);
-  }
-
   private getCopyContent(): { structured: string; tsv: string } {
-    const cells = get(this.deps.selection.selectedCells);
-    const indexedRecords = new Map(
-      this.deps.getRows().map((r) => [r.rowIndex, r.record]),
-    );
-    const columns = this.deps.getColumnsMap();
-    const recordSummaries = this.deps.getRecordSummaries();
-
+    const context = this.deps.getCopyingContext();
     const tsvRows: string[][] = [];
     const structuredRows: StructuredCell[][] = [];
-    for (const rowId of this.getRowIds(cells)) {
+    for (const rowId of context.selectedRowIds) {
       const tsvRow: string[] = [];
       const structuredRow: StructuredCell[] = [];
-      for (const columnId of this.getColumnIds(cells)) {
-        const column = columns.get(columnId);
-        if (!isCellSelected(cells, { rowIndex: rowId }, { id: columnId })) {
-          // Ignore cells that are not selected.
-          continue;
-        }
+      for (const columnId of context.selectedColumnIds) {
+        const column = context.columnsMap.get(columnId);
         if (!column) {
           // Ignore cells with no associated column. This should never happen.
           continue;
         }
-        const rawCellValue = getRawCellValue(indexedRecords, rowId, columnId);
+        const rawCellValue = context.rowsMap.get(rowId)?.[columnId];
         const formattedCellValue = getFormattedCellValue(
           rawCellValue,
-          columns,
+          context.columnsMap,
           columnId,
-          recordSummaries,
+          context.recordSummaries,
         );
         const type = column.abstractType.identifier;
         structuredRow.push({
@@ -152,7 +118,9 @@ export class SheetClipboardHandler<
       tsvRows.push(tsvRow);
       structuredRows.push(structuredRow);
     }
-    this.deps.toast.info(`Copied ${labeledCount(cells.size, 'cells')}.`);
+    const cellCount =
+      context.selectedRowIds.size * context.selectedColumnIds.size;
+    this.deps.showToastInfo(`Copied ${labeledCount(cellCount, 'cells')}.`);
     return {
       structured: JSON.stringify(structuredRows),
       tsv: serializeTsv(tsvRows),
diff --git a/mathesar_ui/src/stores/table-data/records.ts b/mathesar_ui/src/stores/table-data/records.ts
index d2fcd34183..da90576fd9 100644
--- a/mathesar_ui/src/stores/table-data/records.ts
+++ b/mathesar_ui/src/stores/table-data/records.ts
@@ -26,11 +26,10 @@ import {
   States,
   deleteAPI,
   getAPI,
+  getQueryStringFromParams,
   patchAPI,
   postAPI,
-  getQueryStringFromParams,
 } from '@mathesar/api/utils/requestUtils';
-import Series from '@mathesar/components/sheet/selection/Series';
 import type Pagination from '@mathesar/utils/Pagination';
 import { getErrorMessage } from '@mathesar/utils/errors';
 import { pluralize } from '@mathesar/utils/languageUtils';
@@ -175,7 +174,6 @@ export function filterRecordRows(rows: Row[]): RecordRow[] {
 export function rowHasSavedRecord(row: Row): row is RecordRow {
   return rowHasRecord(row) && Object.entries(row.record).length > 0;
 }
-
 export interface TableRecordsData {
   state: States;
   error?: string;
@@ -184,6 +182,10 @@ export interface TableRecordsData {
   grouping?: RecordGrouping;
 }
 
+export function getRowSelectionId(row: Row): string {
+  return row.identifier;
+}
+
 export function getRowKey(row: Row, primaryKeyColumnId?: Column['id']): string {
   if (rowHasRecord(row) && primaryKeyColumnId !== undefined) {
     const primaryKeyCellValue = row.record[primaryKeyColumnId];
@@ -300,7 +302,8 @@ export class RecordsData {
 
   error: Writable<string | undefined>;
 
-  selectableRowIds: Readable<Series<string>>;
+  /** Keys are row ids, values are records */
+  selectableRowsMap: Readable<Map<string, Record<string, unknown>>>;
 
   private promise: CancellablePromise<ApiRecordsResponse> | undefined;
 
@@ -357,13 +360,12 @@ export class RecordsData {
     this.url = `/api/db/v0/tables/${this.tableId}/records/`;
     void this.fetch();
 
-    this.selectableRowIds = derived(
+    this.selectableRowsMap = derived(
       [this.savedRecords, this.newRecords],
-      ([savedRecords, newRecords]) =>
-        new Series([
-          ...savedRecords.map((r) => r.identifier),
-          ...newRecords.map((r) => r.identifier),
-        ]),
+      ([savedRecords, newRecords]) => {
+        const records = [...savedRecords, ...newRecords];
+        return new Map(records.map((r) => [getRowSelectionId(r), r.record]));
+      },
     );
 
     // TODO: Create base class to abstract subscriptions and unsubscriptions
diff --git a/mathesar_ui/src/stores/table-data/tabularData.ts b/mathesar_ui/src/stores/table-data/tabularData.ts
index 5029d92376..46d8453809 100644
--- a/mathesar_ui/src/stores/table-data/tabularData.ts
+++ b/mathesar_ui/src/stores/table-data/tabularData.ts
@@ -143,12 +143,12 @@ export class TabularData {
     );
 
     const plane = derived(
-      [this.recordsData.selectableRowIds, this.orderedProcessedColumns],
-      ([selectableRowIds, orderedProcessedColumns]) => {
-        const columnIds = new Series(
-          [...orderedProcessedColumns.values()].map((c) => String(c.id)),
-        );
-        return new Plane(selectableRowIds, columnIds);
+      [this.recordsData.selectableRowsMap, this.orderedProcessedColumns],
+      ([selectableRowsMap, orderedProcessedColumns]) => {
+        const rowIds = new Series([...selectableRowsMap.keys()]);
+        const columns = [...orderedProcessedColumns.values()];
+        const columnIds = new Series(columns.map((c) => String(c.id)));
+        return new Plane(rowIds, columnIds);
       },
     );
 
diff --git a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
index 1a678575b8..ae6c285652 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
@@ -1,5 +1,5 @@
-import { get, writable } from 'svelte/store';
-import type { Writable } from 'svelte/store';
+import { derived, get, writable } from 'svelte/store';
+import type { Readable, Writable } from 'svelte/store';
 import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
 import { ApiMultiError } from '@mathesar/api/utils/errors';
 import { ImmutableMap, CancellablePromise } from '@mathesar-component-library';
@@ -31,6 +31,10 @@ export interface QueryRow {
   rowIndex: number;
 }
 
+function getRowSelectionId(row: QueryRow): string {
+  return String(row.rowIndex);
+}
+
 export interface QueryRowsData {
   totalCount: number;
   rows: QueryRow[];
@@ -63,6 +67,9 @@ export default class QueryRunner {
     new ImmutableMap(),
   );
 
+  /** Keys are row ids, values are records */
+  selectableRowsMap: Readable<Map<string, Record<string, unknown>>>;
+
   selection: QuerySheetSelection;
 
   inspector: QueryInspector;
@@ -100,6 +107,10 @@ export default class QueryRunner {
     this.shareConsumer = shareConsumer;
     this.speculateProcessedColumns();
     void this.run();
+    this.selectableRowsMap = derived(
+      this.rowsData,
+      ({ rows }) => new Map(rows.map((r) => [getRowSelectionId(r), r.record])),
+    );
     this.selection = new LegacySheetSelection({
       getColumns: () => [...get(this.processedColumns).values()],
       getColumnOrder: () =>
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/CellTab.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/CellTab.svelte
index a9490a9ceb..e6fccb7554 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/CellTab.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/CellTab.svelte
@@ -10,6 +10,7 @@
     const cell = $activeCell;
     if (cell) {
       const rows = queryHandler.getRows();
+      // TODO_3037 change rowIndex to use getRowSelectionId
       if (rows[cell.rowIndex]) {
         return rows[cell.rowIndex].record[cell.columnId];
       }
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
index 9703ad41a9..da32a65f4d 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
@@ -1,16 +1,16 @@
 <script lang="ts">
   import { get } from 'svelte/store';
 
-  import { ImmutableMap } from '@mathesar-component-library';
+  import { ImmutableMap, ImmutableSet } from '@mathesar-component-library';
   import CellBackground from '@mathesar/components/CellBackground.svelte';
   import PaginationGroup from '@mathesar/components/PaginationGroup.svelte';
   import {
-    isColumnSelected,
     Sheet,
     SheetCell,
     SheetHeader,
     SheetRow,
     SheetVirtualRows,
+    isColumnSelected,
   } from '@mathesar/components/sheet';
   import { SheetClipboardHandler } from '@mathesar/components/sheet/SheetClipboardHandler';
   import { rowHeaderWidthPx, rowHeightPx } from '@mathesar/geometry';
@@ -34,6 +34,7 @@
     query,
     processedColumns,
     rowsData,
+    selectableRowsMap,
     pagination,
     runState,
     selection,
@@ -41,11 +42,16 @@
   } = queryHandler);
   $: ({ initial_columns } = $query);
   $: clipboardHandler = new SheetClipboardHandler({
-    selection,
-    toast,
-    getRows: () => get(rowsData).rows,
-    getColumnsMap: () => get(processedColumns),
-    getRecordSummaries: () => new ImmutableMap(),
+    getCopyingContext: () => ({
+      rowsMap: get(selectableRowsMap),
+      columnsMap: get(processedColumns),
+      recordSummaries: new ImmutableMap(),
+      // TODO_3037
+      selectedRowIds: new ImmutableSet(),
+      // TODO_3037
+      selectedColumnIds: new ImmutableSet(),
+    }),
+    showToastInfo: toast.info,
   });
   $: ({ selectedCells, columnsSelectedWhenTheTableIsEmpty } = selection);
   $: recordRunState = $runState?.state;
diff --git a/mathesar_ui/src/systems/table-view/TableView.svelte b/mathesar_ui/src/systems/table-view/TableView.svelte
index 3fbfeaa29a..bebf88e214 100644
--- a/mathesar_ui/src/systems/table-view/TableView.svelte
+++ b/mathesar_ui/src/systems/table-view/TableView.svelte
@@ -2,6 +2,7 @@
   import { get } from 'svelte/store';
 
   import { ImmutableMap } from '@mathesar-component-library';
+  import type { TableEntry } from '@mathesar/api/types/tables';
   import { Sheet } from '@mathesar/components/sheet';
   import { SheetClipboardHandler } from '@mathesar/components/sheet/SheetClipboardHandler';
   import { rowHeaderWidthPx } from '@mathesar/geometry';
@@ -11,12 +12,16 @@
     getTabularDataStoreFromContext,
     ID_ADD_NEW_COLUMN,
     ID_ROW_CONTROL_COLUMN,
-    type TabularDataSelection,
+    type ProcessedColumn,
   } from '@mathesar/stores/table-data';
+  import {
+    getRowSelectionId,
+    type RecordRow,
+  } from '@mathesar/stores/table-data/records';
   import { toast } from '@mathesar/stores/toast';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
+  import { stringifyMapKeys } from '@mathesar/utils/collectionUtils';
   import { orderProcessedColumns } from '@mathesar/utils/tables';
-  import type { TableEntry } from '@mathesar/api/types/tables';
   import Body from './Body.svelte';
   import Header from './header/Header.svelte';
   import StatusPane from './StatusPane.svelte';
@@ -40,24 +45,18 @@
   $: usesVirtualList = context !== 'widget';
   $: allowsDdlOperations = context !== 'widget' && canExecuteDDL;
   $: sheetHasBorder = context === 'widget';
-  $: ({
-    processedColumns,
-    display,
-    isLoading,
-    legacySelection: selection,
-    recordsData,
-  } = $tabularData);
+  $: ({ processedColumns, display, isLoading, selection, recordsData } =
+    $tabularData);
   $: clipboardHandler = new SheetClipboardHandler({
-    selection,
-    toast,
-    getRows: () => [
-      ...get(recordsData.savedRecords),
-      ...get(recordsData.newRecords),
-    ],
-    getColumnsMap: () => get(processedColumns),
-    getRecordSummaries: () => get(recordsData.recordSummaries),
+    getCopyingContext: () => ({
+      rowsMap: get(recordsData.selectableRowsMap),
+      columnsMap: stringifyMapKeys(get(processedColumns)),
+      recordSummaries: get(recordsData.recordSummaries),
+      selectedRowIds: get(selection).rowIds,
+      selectedColumnIds: get(selection).columnIds,
+    }),
+    showToastInfo: toast.info,
   });
-  $: ({ activeCell } = selection);
   $: ({ horizontalScrollOffset, scrollOffset, isTableInspectorVisible } =
     display);
   $: ({ settings } = table);
@@ -90,32 +89,37 @@
   ]);
   $: showTableInspector = $isTableInspectorVisible && supportsTableInspector;
 
-  function selectAndActivateFirstCellOnTableLoad(
-    _isLoading: boolean,
-    _selection: TabularDataSelection,
-    _context: Context,
-  ) {
-    // We only activate the first cell on the page, not in the widget. Doing so
-    // on the widget causes the cell to focus and the page to scroll down to
-    // bring that element into view.
-    if (_context !== 'widget' && !_isLoading) {
-      _selection.selectAndActivateFirstCellIfExists();
-    }
-  }
-
   function checkAndReinstateFocusOnActiveCell(e: Event) {
-    const target = e.target as HTMLElement;
-    if (!target.closest('[data-sheet-element="cell"')) {
-      if ($activeCell) {
-        selection.focusCell(
-          { rowIndex: $activeCell.rowIndex },
-          { id: Number($activeCell.columnId) },
-        );
-      }
-    }
+    // // TODO_3037 Figure out what is actually broken without this code.
+    // //Better document why we need id.
+    //
+    // const target = e.target as HTMLElement;
+    // if (!target.closest('[data-sheet-element="cell"')) {
+    //   if ($activeCell) {
+    //     selection.focusCell(
+    //       // TODO make sure to use getRowSelectionId instead of rowIndex
+    //       { rowIndex: $activeCell.rowIndex },
+    //       { id: Number($activeCell.columnId) },
+    //     );
+    //   }
+    // }
   }
 
-  $: void selectAndActivateFirstCellOnTableLoad($isLoading, selection, context);
+  // function selectAndActivateFirstCellOnTableLoad(
+  //   _isLoading: boolean,
+  //   _selection: TabularDataSelection,
+  //   _context: Context,
+  // ) {
+  //   // We only activate the first cell on the page, not in the widget. Doing so
+  //   // on the widget causes the cell to focus and the page to scroll down to
+  //   // bring that element into view.
+  //   if (_context !== 'widget' && !_isLoading) {
+  //     _selection.selectAndActivateFirstCellIfExists();
+  //   }
+  // }
+
+  // // TODO_3037 Figure out what is actually broken without this code.
+  // $: void selectAndActivateFirstCellOnTableLoad($isLoading, selection, context);
 </script>
 
 <div class="table-view">
diff --git a/mathesar_ui/src/systems/table-view/row/Row.svelte b/mathesar_ui/src/systems/table-view/row/Row.svelte
index 07a1faab61..a07cbddbc7 100644
--- a/mathesar_ui/src/systems/table-view/row/Row.svelte
+++ b/mathesar_ui/src/systems/table-view/row/Row.svelte
@@ -1,24 +1,25 @@
 <script lang="ts">
+  import { ContextMenu } from '@mathesar/component-library';
+  import { SheetCell, SheetRow } from '@mathesar/components/sheet';
+  import { rowHeightPx } from '@mathesar/geometry';
   import {
+    ID_ROW_CONTROL_COLUMN,
     getCellKey,
+    getRowKey,
     getTabularDataStoreFromContext,
+    isGroupHeaderRow,
+    isHelpTextRow,
     isNewRecordRow,
     isPlaceholderRow,
     rowHasRecord,
-    isGroupHeaderRow,
-    isHelpTextRow,
-    getRowKey,
-    ID_ROW_CONTROL_COLUMN,
     type Row,
   } from '@mathesar/stores/table-data';
-  import { SheetRow, SheetCell } from '@mathesar/components/sheet';
-  import { rowHeightPx } from '@mathesar/geometry';
-  import { ContextMenu } from '@mathesar/component-library';
-  import NewRecordMessage from './NewRecordMessage.svelte';
+  import { getRowSelectionId } from '@mathesar/stores/table-data/records';
   import GroupHeader from './GroupHeader.svelte';
+  import NewRecordMessage from './NewRecordMessage.svelte';
   import RowCell from './RowCell.svelte';
-  import RowControl from './RowControl.svelte';
   import RowContextOptions from './RowContextOptions.svelte';
+  import RowControl from './RowControl.svelte';
 
   export let row: Row;
   export let style: { [key: string]: string | number };
@@ -41,7 +42,7 @@
   $: creationStatus = $rowCreationStatus.get(rowKey)?.state;
   $: status = $rowStatus.get(rowKey);
   $: wholeRowState = status?.wholeRowState;
-  $: isSelected = $selection.rowIds.has(row.identifier);
+  $: isSelected = $selection.rowIds.has(getRowSelectionId(row));
   $: hasWholeRowErrors = wholeRowState === 'failure';
   /** Including whole row errors and individual cell errors */
   $: hasAnyErrors = !!status?.errorsFromWholeRowAndCells?.length;
diff --git a/mathesar_ui/src/systems/table-view/row/RowCell.svelte b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
index 0b9aa43f15..68f6e973b7 100644
--- a/mathesar_ui/src/systems/table-view/row/RowCell.svelte
+++ b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
@@ -33,6 +33,7 @@
     type RecordRow,
     type RecordsData,
   } from '@mathesar/stores/table-data';
+  import { getRowSelectionId } from '@mathesar/stores/table-data/records';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import ColumnHeaderContextMenu from '../header/header-cell/ColumnHeaderContextMenu.svelte';
   import CellErrors from './CellErrors.svelte';
@@ -51,7 +52,7 @@
 
   const userProfile = getUserProfileStoreFromContext();
 
-  $: cellId = makeCellId(row.identifier, String(processedColumn.id));
+  $: cellId = makeCellId(getRowSelectionId(row), String(processedColumn.id));
   $: database = $currentDatabase;
   $: schema = $currentSchema;
   $: canEditTableRecords = !!$userProfile?.hasPermission(
diff --git a/mathesar_ui/src/utils/collectionUtils.ts b/mathesar_ui/src/utils/collectionUtils.ts
new file mode 100644
index 0000000000..ebed9303cd
--- /dev/null
+++ b/mathesar_ui/src/utils/collectionUtils.ts
@@ -0,0 +1,3 @@
+export function stringifyMapKeys<V>(m: Map<number, V>): Map<string, V> {
+  return new Map([...m.entries()].map(([k, v]) => [String(k), v]));
+}

From cc61dc31b84dd6acca327db63eb61135f8b0f531 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 11 Sep 2023 08:03:17 -0400
Subject: [PATCH 0015/1141] Remove legacySelection from table inspector

---
 .../src/stores/table-data/tabularData.ts      |  2 +-
 .../src/systems/table-view/StatusPane.svelte  | 13 +++-----
 .../table-inspector/TableInspector.svelte     | 30 +++++++++----------
 .../table-inspector/column/ColumnMode.svelte  | 17 +++++------
 .../table-inspector/record/RecordMode.svelte  | 30 +++++++++----------
 .../table-inspector/record/RowActions.svelte  |  5 ++--
 6 files changed, 43 insertions(+), 54 deletions(-)

diff --git a/mathesar_ui/src/stores/table-data/tabularData.ts b/mathesar_ui/src/stores/table-data/tabularData.ts
index 46d8453809..820db37e0e 100644
--- a/mathesar_ui/src/stores/table-data/tabularData.ts
+++ b/mathesar_ui/src/stores/table-data/tabularData.ts
@@ -62,7 +62,7 @@ export class TabularData {
 
   columnsDataStore: ColumnsDataStore;
 
-  /** TODO eliminate `processedColumns` in favor of `orderedProcessedColumns` */
+  /** TODO_3037 eliminate `processedColumns` in favor of `orderedProcessedColumns` */
   processedColumns: ProcessedColumnsStore;
 
   orderedProcessedColumns: ProcessedColumnsStore;
diff --git a/mathesar_ui/src/systems/table-view/StatusPane.svelte b/mathesar_ui/src/systems/table-view/StatusPane.svelte
index 4784398330..3aad14a8d5 100644
--- a/mathesar_ui/src/systems/table-view/StatusPane.svelte
+++ b/mathesar_ui/src/systems/table-view/StatusPane.svelte
@@ -26,14 +26,8 @@
 
   export let context: 'page' | 'widget' | 'shared-consumer-page' = 'page';
 
-  $: ({
-    recordsData,
-    meta,
-    isLoading,
-    columnsDataStore,
-    constraintsDataStore,
-    legacySelection: selection,
-  } = $tabularData);
+  $: ({ recordsData, meta, isLoading, columnsDataStore, constraintsDataStore } =
+    $tabularData);
   $: ({ pagination } = meta);
   $: ({ size: pageSize, leftBound, rightBound } = $pagination);
   $: ({ totalCount, state, newRecords } = recordsData);
@@ -76,7 +70,8 @@
         appearance="primary"
         on:click={() => {
           recordsData.addEmptyRecord();
-          selection.selectAndActivateFirstDataEntryCellInLastRow();
+          // // TODO_3037
+          // selection.selectAndActivateFirstDataEntryCellInLastRow();
         }}
       >
         <Icon {...iconAddNew} />
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte b/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
index d628a0d124..14a561b473 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
@@ -28,22 +28,20 @@
 
   let activeTab: TabItem;
 
-  const tabularData = getTabularDataStoreFromContext();
-  $: ({ legacySelection: selection } = $tabularData);
-  $: ({ selectedCells } = selection);
-
-  $: {
-    // Explicit dependency
-    $selectedCells;
-
-    if (selection.isAnyColumnCompletelySelected()) {
-      [, activeTab] = tabs;
-    }
-
-    if (selection.isAnyRowCompletelySelected()) {
-      [, , activeTab] = tabs;
-    }
-  }
+  // // TODO_3037 restore logic to select tab based on cell selection
+  // const tabularData = getTabularDataStoreFromContext();
+  // $: ({ selection } = $tabularData);
+  // $: ({ selectedCells } = selection);
+  // $: {
+  //   // Explicit dependency
+  //   $selectedCells;
+  //   if (selection.isAnyColumnCompletelySelected()) {
+  //     [, activeTab] = tabs;
+  //   }
+  //   if (selection.isAnyRowCompletelySelected()) {
+  //     [, , activeTab] = tabs;
+  //   }
+  // }
 </script>
 
 <div class="table-inspector">
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
index fe1e01f610..7be1b9cd62 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
@@ -21,18 +21,17 @@
 
   $: database = $currentDatabase;
   $: schema = $currentSchema;
-  $: ({ processedColumns, legacySelection: selection } = $tabularData);
-  $: ({ selectedCells, columnsSelectedWhenTheTableIsEmpty } = selection);
+  $: ({ processedColumns, selection } = $tabularData);
+  // TODO_3037 verify that table inspector shows selected columns
   $: selectedColumns = (() => {
-    const ids = selection.getSelectedUniqueColumnsId(
-      $selectedCells,
-      $columnsSelectedWhenTheTableIsEmpty,
-    );
+    const ids = $selection.columnIds;
     const columns = [];
     for (const id of ids) {
-      const c = $processedColumns.get(id);
-      if (c !== undefined) {
-        columns.push(c);
+      // TODO_3037 add code comments explaining why this is necessary
+      const parsedId = parseInt(id, 10);
+      const column = $processedColumns.get(parsedId);
+      if (column !== undefined) {
+        columns.push(column);
       }
     }
     return columns;
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
index 878701fec1..c342c3eefa 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
   import { Collapsible } from '@mathesar-component-library';
-  import { getSelectedRowIndex } from '@mathesar/components/sheet';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
@@ -14,42 +13,41 @@
 
   $: database = $currentDatabase;
   $: schema = $currentSchema;
-  $: ({ legacySelection: selection, recordsData } = $tabularData);
-  $: ({ selectedCells } = selection);
-  $: selectedRowIndices = $selectedCells
-    .valuesArray()
-    .map((cell) => getSelectedRowIndex(cell));
-  $: uniquelySelectedRowIndices = Array.from(new Set(selectedRowIndices));
-
+  $: ({ selection, recordsData } = $tabularData);
   $: canEditTableRecords = !!$userProfile?.hasPermission(
     { database, schema },
     'canEditTableRecords',
   );
+  $: selectedRowCount = $selection.rowIds.size;
+
+  // TODO_3037 Need to calculate selectedRowIndices. This might be a deeper
+  // problem. Seems like we might need access to the row index here instead of
+  // the row identifier.
+  $: selectedRowIndices = [];
 </script>
 
 <div class="column-mode-container">
-  {#if uniquelySelectedRowIndices.length}
-    {#if uniquelySelectedRowIndices.length > 1}
+  {#if selectedRowCount > 0}
+    {#if selectedRowCount > 1}
       <span class="records-selected-count">
-        {labeledCount(uniquelySelectedRowIndices, 'records')} selected
+        {labeledCount(selectedRowCount, 'records')} selected
       </span>
     {/if}
     <Collapsible isOpen triggerAppearance="plain">
       <CollapsibleHeader slot="header" title="Actions" />
       <div slot="content" class="content-container">
         <RowActions
-          selectedRowIndices={uniquelySelectedRowIndices}
+          {selectedRowIndices}
           {recordsData}
-          {selection}
           columnsDataStore={$tabularData.columnsDataStore}
           {canEditTableRecords}
         />
       </div>
     </Collapsible>
   {:else}
-    <span class="no-records-selected"
-      >Select one or more cells to view associated record properties.</span
-    >
+    <span class="no-records-selected">
+      Select one or more cells to view associated record properties.
+    </span>
   {/if}
 </div>
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
index 66f343f999..53435f4981 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
@@ -12,7 +12,6 @@
   import type {
     ColumnsDataStore,
     RecordsData,
-    TabularDataSelection,
   } from '@mathesar/stores/table-data';
   import { getPkValueInRecord } from '@mathesar/stores/table-data/records';
   import { toast } from '@mathesar/stores/toast';
@@ -20,7 +19,6 @@
 
   export let selectedRowIndices: number[];
   export let recordsData: RecordsData;
-  export let selection: TabularDataSelection;
   export let columnsDataStore: ColumnsDataStore;
   export let canEditTableRecords: boolean;
 
@@ -38,7 +36,8 @@
         toast.success({
           title: `${confirmationTitle} deleted successfully!`,
         });
-        selection.resetSelection();
+        // // TODO_3037 verify that selection behaves okay after deleting records
+        // selection.resetSelection();
       },
     });
   }

From dd7f24232bd9d5b3f10b30f7a85e859a6992d182 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 11 Sep 2023 13:28:10 -0400
Subject: [PATCH 0016/1141] Modify util fn to handle non-rectangular selection

---
 .../sheet/selection/SheetSelection.ts         | 63 ++++++++++++++-----
 1 file changed, 47 insertions(+), 16 deletions(-)

diff --git a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
index b2da58135f..3cf039710e 100644
--- a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
+++ b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
@@ -1,4 +1,4 @@
-import { first } from 'iter-tools';
+import { execPipe, filter, first, map } from 'iter-tools';
 
 import { ImmutableSet } from '@mathesar/component-library';
 import { assertExhaustive } from '@mathesar/utils/typeUtils';
@@ -98,30 +98,61 @@ function getFullySelectedColumnIds(
   basis: Basis,
 ): ImmutableSet<string> {
   if (basis.type === 'dataCells') {
-    // The logic here is: if all rows are selected, then every selected column
-    // FULLY selected. Otherwise, no columns are fully selected.
-    //
-    // THIS LOGIC ASSUMES THAT ALL SELECTIONS ARE RECTANGULAR. The application
-    // enforces this assumption at various levels, but NOT within the Basis data
-    // structure. That is, it's theoretically possible to have basis data which
-    // represents a non-rectangular selection, but such data should be
-    // considered a bug. The logic within this function leverages this
-    // assumption for the purpose of improving performance. If we know that the
-    // selection is rectangular, then we can avoid iterating over all cells in
-    // each selected column to see if the column is fully selected.
-    return basis.rowIds.size < plane.rowIds.length
-      ? new ImmutableSet()
-      : basis.columnIds;
+    // The logic within this branch is somewhat complex because:
+    // - We want to suppor non-rectangular selections.
+    // - For performance, we want to avoid iterating over all the selected
+    //   cells.
+
+    const selctedRowCount = basis.rowIds.size;
+    const availableRowCount = plane.rowIds.length;
+    if (selctedRowCount < availableRowCount) {
+      // Performance heuristic. If the number of selected rows is less than the
+      // total number of rows, we can assume that no column exist in which all
+      // rows are selected.
+      return new ImmutableSet();
+    }
+
+    const selectedColumnCount = basis.columnIds.size;
+    const selectedCellCount = basis.cellIds.size;
+    const avgCellsSelectedPerColumn = selectedCellCount / selectedColumnCount;
+    if (avgCellsSelectedPerColumn === availableRowCount) {
+      // Performance heuristic. We know that no column can have more cells
+      // selected than the number of rows. Thus, if the average number of cells
+      // selected per column is equal to the number of rows, then we know that
+      // all selected columns are fully selected.
+      return basis.columnIds;
+    }
+
+    // This is the worst-case scenario, performance-wise, which is why we try to
+    // return early before hitting this branch. This case will only happen when
+    // we have a mix of fully selected columns and partially selected columns.
+    // This case should be rare because most selections are rectangular.
+    const countSelectedCellsPerColumn = new Map<string, number>();
+    for (const cellId of basis.cellIds) {
+      const { columnId } = parseCellId(cellId);
+      const count = countSelectedCellsPerColumn.get(columnId) ?? 0;
+      countSelectedCellsPerColumn.set(columnId, count + 1);
+    }
+    const fullySelectedColumnIds = execPipe(
+      countSelectedCellsPerColumn,
+      filter(([, count]) => count === availableRowCount),
+      map(([id]) => id),
+    );
+    return new ImmutableSet(fullySelectedColumnIds);
   }
+
   if (basis.type === 'emptyColumns') {
     return basis.columnIds;
   }
+
   if (basis.type === 'placeholderCell') {
     return new ImmutableSet();
   }
+
   if (basis.type === 'empty') {
     return new ImmutableSet();
   }
+
   return assertExhaustive(basis.type);
 }
 
@@ -139,7 +170,7 @@ export default class SheetSelection {
 
   private readonly basis: Basis;
 
-  /** Ids of columns in which _all_ cells are selected */
+  /** Ids of columns in which _all_ data cells are selected */
   fullySelectedColumnIds: ImmutableSet<string>;
 
   constructor(plane: Plane = new Plane(), basis: Basis = emptyBasis()) {

From 70927ff2380a8376755be85347667f8edc48335f Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 11 Sep 2023 13:49:18 -0400
Subject: [PATCH 0017/1141] Refactor ExtractColumnsModal to use new selection

---
 mathesar_ui/src/components/sheet/cellIds.ts   | 14 +++++
 .../src/components/sheet/selection/Plane.ts   | 15 +-----
 .../sheet/selection/SheetSelection.ts         | 21 +++++++-
 mathesar_ui/src/stores/table-data/index.ts    |  1 -
 .../src/stores/table-data/tabularData.ts      | 54 ++-----------------
 .../ExtractColumnsModal.svelte                | 12 ++---
 6 files changed, 44 insertions(+), 73 deletions(-)

diff --git a/mathesar_ui/src/components/sheet/cellIds.ts b/mathesar_ui/src/components/sheet/cellIds.ts
index 40c8297dea..fd6a263637 100644
--- a/mathesar_ui/src/components/sheet/cellIds.ts
+++ b/mathesar_ui/src/components/sheet/cellIds.ts
@@ -1,3 +1,7 @@
+import { map } from 'iter-tools';
+
+import { cartesianProduct } from '@mathesar/utils/iterUtils';
+
 const CELL_ID_DELIMITER = '-';
 
 /**
@@ -22,3 +26,13 @@ export function parseCellId(cellId: string): {
   const columnId = cellId.slice(delimiterIndex + 1);
   return { rowId, columnId };
 }
+
+export function makeCells(
+  rowIds: Iterable<string>,
+  columnIds: Iterable<string>,
+): Iterable<string> {
+  return map(
+    ([rowId, columnId]) => makeCellId(rowId, columnId),
+    cartesianProduct(rowIds, columnIds),
+  );
+}
diff --git a/mathesar_ui/src/components/sheet/selection/Plane.ts b/mathesar_ui/src/components/sheet/selection/Plane.ts
index 3f0d87780f..0c57de5c5b 100644
--- a/mathesar_ui/src/components/sheet/selection/Plane.ts
+++ b/mathesar_ui/src/components/sheet/selection/Plane.ts
@@ -1,20 +1,7 @@
-import { map } from 'iter-tools';
-
-import { cartesianProduct } from '@mathesar/utils/iterUtils';
-import { makeCellId, parseCellId } from '../cellIds';
+import { makeCellId, makeCells, parseCellId } from '../cellIds';
 import { Direction, getColumnOffset, getRowOffset } from './Direction';
 import Series from './Series';
 
-function makeCells(
-  rowIds: Iterable<string>,
-  columnIds: Iterable<string>,
-): Iterable<string> {
-  return map(
-    ([rowId, columnId]) => makeCellId(rowId, columnId),
-    cartesianProduct(rowIds, columnIds),
-  );
-}
-
 /**
  * This describes the different kinds of cells that can be adjacent to a given
  * cell in a particular direction.
diff --git a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
index 3cf039710e..53318a7af3 100644
--- a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
+++ b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
@@ -2,7 +2,7 @@ import { execPipe, filter, first, map } from 'iter-tools';
 
 import { ImmutableSet } from '@mathesar/component-library';
 import { assertExhaustive } from '@mathesar/utils/typeUtils';
-import { parseCellId } from '../cellIds';
+import { makeCells, parseCellId } from '../cellIds';
 import { Direction, getColumnOffset } from './Direction';
 import Plane from './Plane';
 
@@ -260,6 +260,17 @@ export default class SheetSelection {
     return this.withBasis(newBasis);
   }
 
+  /**
+   * @returns a new selection of all data cells in the intersection of the
+   * provided rows and columns.
+   */
+  ofRowColumnIntersection(
+    rowIds: Iterable<string>,
+    columnIds: Iterable<string>,
+  ): SheetSelection {
+    return this.withBasis(basisFromDataCells(makeCells(rowIds, columnIds)));
+  }
+
   /**
    * @returns a new selection formed by the rectangle between the provided
    * cells, inclusive.
@@ -291,6 +302,14 @@ export default class SheetSelection {
     return this.withBasis(makeBasis(cellId));
   }
 
+  ofOneRow(rowId: string): SheetSelection {
+    return this.ofRowRange(rowId, rowId);
+  }
+
+  ofOneColumn(columnId: string): SheetSelection {
+    return this.ofColumnRange(columnId, columnId);
+  }
+
   /**
    * @returns a new selection that fits within the provided plane. This is
    * useful when a column is deleted, reordered, or inserted.
diff --git a/mathesar_ui/src/stores/table-data/index.ts b/mathesar_ui/src/stores/table-data/index.ts
index 279ba7d931..2d68b467ac 100644
--- a/mathesar_ui/src/stores/table-data/index.ts
+++ b/mathesar_ui/src/stores/table-data/index.ts
@@ -42,7 +42,6 @@ export {
   getTabularDataStoreFromContext,
   TabularData,
   type TabularDataProps,
-  type TabularDataSelection,
 } from './tabularData';
 export {
   type ProcessedColumn,
diff --git a/mathesar_ui/src/stores/table-data/tabularData.ts b/mathesar_ui/src/stores/table-data/tabularData.ts
index 820db37e0e..0e81eb4775 100644
--- a/mathesar_ui/src/stores/table-data/tabularData.ts
+++ b/mathesar_ui/src/stores/table-data/tabularData.ts
@@ -1,34 +1,24 @@
 import { getContext, setContext } from 'svelte';
-import {
-  derived,
-  get,
-  writable,
-  type Readable,
-  type Writable,
-} from 'svelte/store';
+import { derived, writable, type Readable, type Writable } from 'svelte/store';
 
 import type { DBObjectEntry } from '@mathesar/AppTypes';
 import type { TableEntry } from '@mathesar/api/types/tables';
 import type { Column } from '@mathesar/api/types/tables/columns';
 import { States } from '@mathesar/api/utils/requestUtils';
-import { LegacySheetSelection } from '@mathesar/components/sheet';
 import Plane from '@mathesar/components/sheet/selection/Plane';
 import Series from '@mathesar/components/sheet/selection/Series';
 import SheetSelection from '@mathesar/components/sheet/selection/SheetSelection';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
-import { getColumnOrder, orderProcessedColumns } from '@mathesar/utils/tables';
 import type { ShareConsumer } from '@mathesar/utils/shares';
+import { orderProcessedColumns } from '@mathesar/utils/tables';
 import { ColumnsDataStore } from './columns';
 import type { ConstraintsData } from './constraints';
 import { ConstraintsDataStore } from './constraints';
 import { Display } from './display';
 import { Meta } from './meta';
-import type {
-  ProcessedColumn,
-  ProcessedColumnsStore,
-} from './processedColumns';
+import type { ProcessedColumnsStore } from './processedColumns';
 import { processColumn } from './processedColumns';
-import type { RecordRow, TableRecordsData } from './records';
+import type { TableRecordsData } from './records';
 import { RecordsData } from './records';
 
 export interface TabularDataProps {
@@ -50,11 +40,6 @@ export interface TabularDataProps {
   >[0]['hasEnhancedPrimaryKeyCell'];
 }
 
-export type TabularDataSelection = LegacySheetSelection<
-  RecordRow,
-  ProcessedColumn
->;
-
 export class TabularData {
   id: DBObjectEntry['id'];
 
@@ -75,13 +60,6 @@ export class TabularData {
 
   isLoading: Readable<boolean>;
 
-  /**
-   * TODO_3037
-   *
-   * @deprecated
-   */
-  legacySelection: TabularDataSelection;
-
   selection: Writable<SheetSelection>;
 
   table: TableEntry;
@@ -159,29 +137,6 @@ export class TabularData {
       plane.subscribe((p) => this.selection.update((s) => s.forNewPlane(p))),
     );
 
-    this.legacySelection = new LegacySheetSelection({
-      getColumns: () => [...get(this.processedColumns).values()],
-      getColumnOrder: () =>
-        getColumnOrder([...get(this.processedColumns).values()], this.table),
-      getRows: () => this.recordsData.getRecordRows(),
-      getMaxSelectionRowIndex: () => {
-        const totalCount = get(this.recordsData.totalCount) ?? 0;
-        const savedRecords = get(this.recordsData.savedRecords);
-        const newRecords = get(this.recordsData.newRecords);
-        const pagination = get(this.meta.pagination);
-        const { offset } = pagination;
-        const pageSize = pagination.size;
-        /**
-         * We are not subtracting 1 from the below maxRowIndex calculation
-         * inorder to account for the add-new-record placeholder row
-         */
-        return (
-          Math.min(pageSize, totalCount - offset, savedRecords.length) +
-          newRecords.length
-        );
-      },
-    });
-
     this.isLoading = derived(
       [
         this.columnsDataStore.fetchStatus,
@@ -268,7 +223,6 @@ export class TabularData {
     this.recordsData.destroy();
     this.constraintsDataStore.destroy();
     this.columnsDataStore.destroy();
-    this.legacySelection.destroy();
     this.cleanupFunctions.forEach((f) => f());
   }
 }
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
index ed5d468f15..f1fb68cfa3 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
@@ -48,11 +48,7 @@
 
   export let controller: ExtractColumnsModalController;
 
-  $: ({
-    processedColumns,
-    constraintsDataStore,
-    legacySelection: selection,
-  } = $tabularData);
+  $: ({ processedColumns, constraintsDataStore, selection } = $tabularData);
   $: ({ constraints } = $constraintsDataStore);
   $: availableProcessedColumns = [...$processedColumns.values()];
   $: ({ targetType, columns, isOpen } = controller);
@@ -110,7 +106,9 @@
       // unmounting this component.
       return;
     }
-    selection.intersectSelectedRowsWithGivenColumns(_columns);
+    // TODO_3037 test to verify that selected columns are updated
+    const columnIds = _columns.map((c) => String(c.id));
+    selection.update((s) => s.ofRowColumnIntersection(s.rowIds, columnIds));
   }
   $: handleColumnsChange($columns);
 
@@ -193,7 +191,7 @@
         // will need to modify this logic when we position the new column where
         // the old columns were.
         const newFkColumn = allColumns.slice(-1)[0];
-        selection.toggleColumnSelection(newFkColumn);
+        selection.update((s) => s.ofOneColumn(String(newFkColumn.id)));
         await tick();
         scrollBasedOnSelection();
       }

From 9bc1e5ed2a05b69dadc81567a2350cb7a978389e Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 11 Sep 2023 15:03:38 -0400
Subject: [PATCH 0018/1141] Deprecate selection within Data Explorer

---
 .../src/stores/table-data/tabularData.ts      |  2 +-
 .../src/systems/data-explorer/QueryRunner.ts  | 78 +++++++++++++------
 .../exploration-inspector/CellTab.svelte      |  2 +-
 .../column-tab/ColumnTab.svelte               |  6 +-
 .../data-explorer/result-pane/Results.svelte  |  2 +-
 5 files changed, 64 insertions(+), 26 deletions(-)

diff --git a/mathesar_ui/src/stores/table-data/tabularData.ts b/mathesar_ui/src/stores/table-data/tabularData.ts
index 0e81eb4775..a16572f80f 100644
--- a/mathesar_ui/src/stores/table-data/tabularData.ts
+++ b/mathesar_ui/src/stores/table-data/tabularData.ts
@@ -64,7 +64,7 @@ export class TabularData {
 
   table: TableEntry;
 
-  cleanupFunctions: (() => void)[] = [];
+  private cleanupFunctions: (() => void)[] = [];
 
   shareConsumer?: ShareConsumer;
 
diff --git a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
index ae6c285652..e2089bee6d 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
@@ -1,29 +1,33 @@
-import { derived, get, writable } from 'svelte/store';
 import type { Readable, Writable } from 'svelte/store';
-import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
-import { ApiMultiError } from '@mathesar/api/utils/errors';
-import { ImmutableMap, CancellablePromise } from '@mathesar-component-library';
-import Pagination from '@mathesar/utils/Pagination';
+import { derived, get, writable } from 'svelte/store';
+
+import { CancellablePromise, ImmutableMap } from '@mathesar-component-library';
 import type {
+  QueryColumnMetaData,
   QueryResultRecord,
-  QueryRunResponse,
   QueryResultsResponse,
-  QueryColumnMetaData,
+  QueryRunResponse,
 } from '@mathesar/api/types/queries';
-import { runQuery, fetchQueryResults } from '@mathesar/stores/queries';
+import { ApiMultiError } from '@mathesar/api/utils/errors';
+import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
 import { LegacySheetSelection } from '@mathesar/components/sheet';
+import Plane from '@mathesar/components/sheet/selection/Plane';
+import Series from '@mathesar/components/sheet/selection/Series';
+import SheetSelection from '@mathesar/components/sheet/selection/SheetSelection';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
+import { fetchQueryResults, runQuery } from '@mathesar/stores/queries';
+import Pagination from '@mathesar/utils/Pagination';
 import type { ShareConsumer } from '@mathesar/utils/shares';
-import type QueryModel from './QueryModel';
 import QueryInspector from './QueryInspector';
+import type QueryModel from './QueryModel';
 import {
-  processColumnMetaData,
   getProcessedOutputColumns,
+  processColumnMetaData,
   speculateColumnMetaData,
+  type InputColumnsStoreSubstance,
   type ProcessedQueryOutputColumn,
-  type ProcessedQueryResultColumnMap,
   type ProcessedQueryOutputColumnMap,
-  type InputColumnsStoreSubstance,
+  type ProcessedQueryResultColumnMap,
 } from './utils';
 
 export interface QueryRow {
@@ -40,6 +44,7 @@ export interface QueryRowsData {
   rows: QueryRow[];
 }
 
+/** @deprecated TODO_3037 remove */
 export type QuerySheetSelection = LegacySheetSelection<
   QueryRow,
   ProcessedQueryOutputColumn
@@ -70,7 +75,10 @@ export default class QueryRunner {
   /** Keys are row ids, values are records */
   selectableRowsMap: Readable<Map<string, Record<string, unknown>>>;
 
-  selection: QuerySheetSelection;
+  /** @deprecated TODO_3037 remove */
+  legacySelection: QuerySheetSelection;
+
+  selection: Writable<SheetSelection>;
 
   inspector: QueryInspector;
 
@@ -84,6 +92,8 @@ export default class QueryRunner {
 
   private shareConsumer?: ShareConsumer;
 
+  private cleanupFunctions: (() => void)[] = [];
+
   constructor({
     query,
     abstractTypeMap,
@@ -111,7 +121,8 @@ export default class QueryRunner {
       this.rowsData,
       ({ rows }) => new Map(rows.map((r) => [getRowSelectionId(r), r.record])),
     );
-    this.selection = new LegacySheetSelection({
+
+    this.legacySelection = new LegacySheetSelection({
       getColumns: () => [...get(this.processedColumns).values()],
       getColumnOrder: () =>
         [...get(this.processedColumns).values()].map((column) => column.id),
@@ -125,6 +136,27 @@ export default class QueryRunner {
         return Math.min(pageSize, totalCount - offset, rowLength) - 1;
       },
     });
+
+    const plane = derived(
+      [this.rowsData, this.processedColumns],
+      ([{ rows }, columnsMap]) => {
+        const rowIds = new Series(rows.map(getRowSelectionId));
+        const columns = [...columnsMap.values()];
+        const columnIds = new Series(columns.map((c) => String(c.id)));
+        return new Plane(rowIds, columnIds);
+      },
+    );
+
+    this.selection = writable(new SheetSelection());
+
+    this.cleanupFunctions.push(
+      plane.subscribe((p) => this.selection.update((s) => s.forNewPlane(p))),
+    );
+
+    this.cleanupFunctions.push(
+      plane.subscribe((p) => this.selection.update((s) => s.forNewPlane(p))),
+    );
+
     this.inspector = new QueryInspector(this.query);
   }
 
@@ -237,7 +269,7 @@ export default class QueryRunner {
   async setPagination(pagination: Pagination): Promise<void> {
     this.pagination.set(pagination);
     await this.run();
-    this.selection.activateFirstCellInSelectedColumn();
+    this.legacySelection.activateFirstCellInSelectedColumn();
   }
 
   protected resetPagination(): void {
@@ -262,30 +294,31 @@ export default class QueryRunner {
   protected async resetPaginationAndRun(): Promise<void> {
     this.resetPagination();
     await this.run();
-    this.selection.activateFirstCellInSelectedColumn();
+    this.legacySelection.activateFirstCellInSelectedColumn();
   }
 
   selectColumn(alias: QueryColumnMetaData['alias']): void {
     const processedColumn = get(this.processedColumns).get(alias);
     if (!processedColumn) {
-      this.selection.resetSelection();
-      this.selection.selectAndActivateFirstCellIfExists();
+      this.legacySelection.resetSelection();
+      this.legacySelection.selectAndActivateFirstCellIfExists();
       this.inspector.selectCellTab();
       return;
     }
 
-    const isSelected = this.selection.toggleColumnSelection(processedColumn);
+    const isSelected =
+      this.legacySelection.toggleColumnSelection(processedColumn);
     if (isSelected) {
       this.inspector.selectColumnTab();
       return;
     }
 
-    this.selection.activateFirstCellInSelectedColumn();
+    this.legacySelection.activateFirstCellInSelectedColumn();
     this.inspector.selectCellTab();
   }
 
   clearSelection(): void {
-    this.selection.resetSelection();
+    this.legacySelection.resetSelection();
   }
 
   getRows(): QueryRow[] {
@@ -297,7 +330,8 @@ export default class QueryRunner {
   }
 
   destroy(): void {
-    this.selection.destroy();
+    this.legacySelection.destroy();
     this.runPromise?.cancel();
+    this.cleanupFunctions.forEach((fn) => fn());
   }
 }
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/CellTab.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/CellTab.svelte
index e6fccb7554..e90240883c 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/CellTab.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/CellTab.svelte
@@ -3,7 +3,7 @@
   import type QueryRunner from '../QueryRunner';
 
   export let queryHandler: QueryRunner;
-  $: ({ selection, processedColumns } = queryHandler);
+  $: ({ legacySelection: selection, processedColumns } = queryHandler);
   $: ({ activeCell } = selection);
 
   $: selectedCellValue = (() => {
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/ColumnTab.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/ColumnTab.svelte
index c7c3d42332..0f1847c6d1 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/ColumnTab.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/ColumnTab.svelte
@@ -14,7 +14,11 @@
 
   $: queryManager =
     queryHandler instanceof QueryManager ? queryHandler : undefined;
-  $: ({ selection, columnsMetaData, processedColumns } = queryHandler);
+  $: ({
+    legacySelection: selection,
+    columnsMetaData,
+    processedColumns,
+  } = queryHandler);
   $: ({ selectedCells, columnsSelectedWhenTheTableIsEmpty } = selection);
   $: selectedColumns = (() => {
     const ids = selection.getSelectedUniqueColumnsId(
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
index da32a65f4d..8004a6bd0b 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
@@ -37,7 +37,7 @@
     selectableRowsMap,
     pagination,
     runState,
-    selection,
+    legacySelection: selection,
     inspector,
   } = queryHandler);
   $: ({ initial_columns } = $query);

From aeae784729b10752f03df40923dbe9a93697c60b Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 11 Sep 2023 20:26:59 -0400
Subject: [PATCH 0019/1141] Use new Selection code in data explorer cell tab

---
 .../src/systems/data-explorer/QueryRunner.ts  |  6 +--
 .../exploration-inspector/CellTab.svelte      | 49 +++++++------------
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
index e2089bee6d..7e69371554 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
@@ -35,7 +35,7 @@ export interface QueryRow {
   rowIndex: number;
 }
 
-function getRowSelectionId(row: QueryRow): string {
+export function getRowSelectionId(row: QueryRow): string {
   return String(row.rowIndex);
 }
 
@@ -321,10 +321,6 @@ export default class QueryRunner {
     this.legacySelection.resetSelection();
   }
 
-  getRows(): QueryRow[] {
-    return get(this.rowsData).rows;
-  }
-
   getQueryModel(): QueryModel {
     return get(this.query);
   }
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/CellTab.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/CellTab.svelte
index e90240883c..dfc26ed3d4 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/CellTab.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/CellTab.svelte
@@ -1,48 +1,33 @@
 <script lang="ts">
   import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
-  import type QueryRunner from '../QueryRunner';
+  import { parseCellId } from '@mathesar/components/sheet/cellIds';
+  import QueryRunner, { getRowSelectionId } from '../QueryRunner';
 
   export let queryHandler: QueryRunner;
-  $: ({ legacySelection: selection, processedColumns } = queryHandler);
-  $: ({ activeCell } = selection);
 
-  $: selectedCellValue = (() => {
-    const cell = $activeCell;
-    if (cell) {
-      const rows = queryHandler.getRows();
-      // TODO_3037 change rowIndex to use getRowSelectionId
-      if (rows[cell.rowIndex]) {
-        return rows[cell.rowIndex].record[cell.columnId];
-      }
-    }
-    return undefined;
-  })();
-  $: processedQueryColumn = (() => {
-    const cell = $activeCell;
-    if (cell) {
-      const processedColumn = $processedColumns.get(String(cell.columnId));
-      if (processedColumn) {
-        return processedColumn;
-      }
-    }
-    return undefined;
-  })();
+  $: ({ selection, processedColumns, rowsData } = queryHandler);
+  $: ({ rows } = $rowsData);
+  $: ({ activeCellId } = $selection);
+  $: cell = activeCellId ? parseCellId(activeCellId) : undefined;
+  $: columnId = cell?.columnId ?? '';
+  // TODO: Usage of `find` is not ideal for perf here. Would be nice to store
+  // rows in a map for faster lookup.
+  $: row = rows.find((r) => getRowSelectionId(r) === cell?.rowId);
+  $: cellValue = row?.record[columnId];
+  $: column = $processedColumns.get(columnId);
 </script>
 
-<div
-  class="section-content"
-  class:has-content={selectedCellValue !== undefined}
->
-  {#if selectedCellValue !== undefined}
+<div class="section-content" class:has-content={cellValue !== undefined}>
+  {#if cellValue !== undefined}
     <section class="cell-content">
       <header>Content</header>
       <div class="content">
-        {#if processedQueryColumn}
+        {#if column}
           <CellFabric
             isIndependentOfSheet={true}
             disabled={true}
-            columnFabric={processedQueryColumn}
-            value={selectedCellValue}
+            columnFabric={column}
+            value={cellValue}
           />
         {/if}
       </div>

From efa0dcb2fc2b71283bd831db94e5e623769bd6cc Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 11 Sep 2023 20:58:09 -0400
Subject: [PATCH 0020/1141] Use new Selection code in DE col tab and results

---
 .../column-tab/ColumnTab.svelte               | 34 +++----
 .../result-pane/ResultRowCell.svelte          | 96 ++++++++-----------
 .../data-explorer/result-pane/Results.svelte  | 13 +--
 3 files changed, 55 insertions(+), 88 deletions(-)

diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/ColumnTab.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/ColumnTab.svelte
index 0f1847c6d1..e37d358fdc 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/ColumnTab.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/ColumnTab.svelte
@@ -1,12 +1,15 @@
 <script lang="ts">
+  import { execPipe, filter, map } from 'iter-tools';
   import { onDestroy } from 'svelte';
+
   import {
     Collapsible,
     LabeledInput,
     TextInput,
+    isDefinedNonNullable,
   } from '@mathesar-component-library';
-  import type QueryRunner from '../../QueryRunner';
   import QueryManager from '../../QueryManager';
+  import type QueryRunner from '../../QueryRunner';
   import ColumnSource from './ColumnSource.svelte';
   import DeleteColumnAction from './DeleteColumnAction.svelte';
 
@@ -14,26 +17,15 @@
 
   $: queryManager =
     queryHandler instanceof QueryManager ? queryHandler : undefined;
-  $: ({
-    legacySelection: selection,
-    columnsMetaData,
-    processedColumns,
-  } = queryHandler);
-  $: ({ selectedCells, columnsSelectedWhenTheTableIsEmpty } = selection);
-  $: selectedColumns = (() => {
-    const ids = selection.getSelectedUniqueColumnsId(
-      $selectedCells,
-      $columnsSelectedWhenTheTableIsEmpty,
-    );
-    const columns = [];
-    for (const id of ids) {
-      const c = $processedColumns.get(id);
-      if (c !== undefined) {
-        columns.push(c);
-      }
-    }
-    return columns;
-  })();
+  $: ({ selection, columnsMetaData, processedColumns } = queryHandler);
+  $: ({ columnIds } = $selection);
+  $: selectedColumns = Array.from(
+    execPipe(
+      columnIds,
+      map((id) => $processedColumns.get(id)),
+      filter(isDefinedNonNullable),
+    ),
+  );
   $: hasMultipleSelectedColumns = selectedColumns.length > 1;
   $: selectedColumn =
     selectedColumns.length > 0 ? selectedColumns[0] : undefined;
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
index 1fd0244cd5..f46e21b500 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
@@ -1,47 +1,27 @@
 <script lang="ts">
   import { tick } from 'svelte';
+  import type { Writable } from 'svelte/store';
+
+  import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
+  import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
   import {
     SheetCell,
-    isCellActive,
     scrollBasedOnActiveCell,
-    isCellSelected,
   } from '@mathesar/components/sheet';
-  import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
-  import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
-  import type { QueryRow, QuerySheetSelection } from '../QueryRunner';
-  import type { ProcessedQueryOutputColumn } from '../utils';
+  import { makeCellId } from '@mathesar/components/sheet/cellIds';
+  import type SheetSelection from '@mathesar/components/sheet/selection/SheetSelection';
   import type QueryInspector from '../QueryInspector';
+  import { getRowSelectionId, type QueryRow } from '../QueryRunner';
+  import type { ProcessedQueryOutputColumn } from '../utils';
 
-  export let processedQueryColumn: ProcessedQueryOutputColumn;
+  export let column: ProcessedQueryOutputColumn;
   export let row: QueryRow | undefined;
   export let recordRunState: RequestStatus['state'] | undefined;
-  export let selection: QuerySheetSelection;
+  export let selection: Writable<SheetSelection>;
   export let inspector: QueryInspector;
 
-  $: ({ activeCell, selectedCells } = selection);
-  $: isActive =
-    $activeCell && row && isCellActive($activeCell, row, processedQueryColumn);
-
-  /**
-   * The name indicates that this boolean is only true when more than one cell
-   * is selected. However, because of the bug that [the active cell and selected
-   * cells do not remain in sync when using keyboard][1] this boolean is
-   * sometimes true even when multiple cells are selected. This is to
-   * differentiate between different active and selected cell using blue
-   * background styling for selected cell and blue border styling for active
-   * cell.
-   *
-   * The above bug can be fixed when following two conditions are met
-   *
-   * - We are working on keyboard accessability of the application.
-   * - `selectedCells` and `activeCell` are merged in a single store.
-   *
-   * [1]: https://github.com/centerofci/mathesar/issues/1534
-   */
-  $: isSelectedInRange =
-    row &&
-    isCellSelected($selectedCells, row, processedQueryColumn) &&
-    $selectedCells.size > 1;
+  $: cellId = row && makeCellId(getRowSelectionId(row), column.id);
+  $: isActive = cellId === $selection.activeCellId;
 
   async function checkTypeAndScroll(type?: string) {
     if (type === 'moved') {
@@ -54,48 +34,48 @@
     event: CustomEvent<{ originalEvent: KeyboardEvent; key: string }>,
   ) {
     const { originalEvent } = event.detail;
-    const type = selection.handleKeyEventsOnActiveCell(originalEvent);
-    if (type) {
-      originalEvent.stopPropagation();
-      originalEvent.preventDefault();
+    // // TODO_3037
+    // const type = selection.handleKeyEventsOnActiveCell(originalEvent);
+    // if (type) {
+    //   originalEvent.stopPropagation();
+    //   originalEvent.preventDefault();
 
-      await checkTypeAndScroll(type);
-    }
+    //   await checkTypeAndScroll(type);
+    // }
   }
 </script>
 
-<SheetCell
-  columnIdentifierKey={processedQueryColumn.id}
-  let:htmlAttributes
-  let:style
->
+<SheetCell columnIdentifierKey={column.id} let:htmlAttributes let:style>
   <div {...htmlAttributes} {style} class="cell" class:is-active={isActive}>
     {#if row || recordRunState === 'processing'}
       <CellFabric
         {isActive}
-        {isSelectedInRange}
-        columnFabric={processedQueryColumn}
-        value={row?.record[processedQueryColumn.id]}
+        isSelectedInRange={$selection.cellIds.has(cellId ?? '')}
+        columnFabric={column}
+        value={row?.record[column.id]}
         showAsSkeleton={recordRunState === 'processing'}
         disabled={true}
         on:movementKeyDown={moveThroughCells}
         on:activate={() => {
-          if (row) {
-            selection.activateCell(row, processedQueryColumn);
-            inspector.selectCellTab();
-          }
+          // // TODO_3037
+          // if (row) {
+          //   selection.activateCell(row, processedQueryColumn);
+          //   inspector.selectCellTab();
+          // }
         }}
         on:onSelectionStart={() => {
-          if (row) {
-            selection.onStartSelection(row, processedQueryColumn);
-          }
+          // // TODO_3037
+          // if (row) {
+          //   selection.onStartSelection(row, processedQueryColumn);
+          // }
         }}
         on:onMouseEnterCellWhileSelection={() => {
-          if (row) {
-            // This enables the click + drag to
-            // select multiple cells
-            selection.onMouseEnterCellWhileSelection(row, processedQueryColumn);
-          }
+          // // TODO_3037
+          // if (row) {
+          //   // This enables the click + drag to
+          //   // select multiple cells
+          //   selection.onMouseEnterCellWhileSelection(row, processedQueryColumn);
+          // }
         }}
       />
     {/if}
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
index 8004a6bd0b..63370db7c0 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
@@ -10,7 +10,6 @@
     SheetHeader,
     SheetRow,
     SheetVirtualRows,
-    isColumnSelected,
   } from '@mathesar/components/sheet';
   import { SheetClipboardHandler } from '@mathesar/components/sheet/SheetClipboardHandler';
   import { rowHeaderWidthPx, rowHeightPx } from '@mathesar/geometry';
@@ -37,7 +36,7 @@
     selectableRowsMap,
     pagination,
     runState,
-    legacySelection: selection,
+    selection,
     inspector,
   } = queryHandler);
   $: ({ initial_columns } = $query);
@@ -53,7 +52,7 @@
     }),
     showToastInfo: toast.info,
   });
-  $: ({ selectedCells, columnsSelectedWhenTheTableIsEmpty } = selection);
+  $: ({ columnIds } = $selection);
   $: recordRunState = $runState?.state;
   $: errors = $runState?.state === 'failure' ? $runState.errors : undefined;
   $: columnList = [...$processedColumns.values()];
@@ -102,11 +101,7 @@
           <ResultHeaderCell
             {processedQueryColumn}
             queryRunner={queryHandler}
-            isSelected={isColumnSelected(
-              $selectedCells,
-              $columnsSelectedWhenTheTableIsEmpty,
-              processedQueryColumn,
-            )}
+            isSelected={columnIds.has(processedQueryColumn.id)}
           />
         {/each}
       </SheetHeader>
@@ -139,8 +134,8 @@
 
                 {#each columnList as processedQueryColumn (processedQueryColumn.id)}
                   <ResultRowCell
-                    {processedQueryColumn}
                     row={rows[item.index]}
+                    column={processedQueryColumn}
                     {recordRunState}
                     {selection}
                     {inspector}

From faabf47c64a182469f493bf85c238bb6d368e456 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 11 Sep 2023 21:24:54 -0400
Subject: [PATCH 0021/1141] Remove lots of dead code

---
 .../components/sheet/LegacySheetSelection.ts  | 731 ------------------
 mathesar_ui/src/components/sheet/index.ts     |   8 +-
 .../components/sheet/sheetScollingUtils.ts    |  49 ++
 .../systems/data-explorer/ActionsPane.svelte  |   1 -
 .../src/systems/data-explorer/QueryRunner.ts  |  53 +-
 .../column-tab/DeleteColumnAction.svelte      |   1 -
 6 files changed, 52 insertions(+), 791 deletions(-)
 delete mode 100644 mathesar_ui/src/components/sheet/LegacySheetSelection.ts
 create mode 100644 mathesar_ui/src/components/sheet/sheetScollingUtils.ts

diff --git a/mathesar_ui/src/components/sheet/LegacySheetSelection.ts b/mathesar_ui/src/components/sheet/LegacySheetSelection.ts
deleted file mode 100644
index 0aeeeb31c6..0000000000
--- a/mathesar_ui/src/components/sheet/LegacySheetSelection.ts
+++ /dev/null
@@ -1,731 +0,0 @@
-import { ImmutableSet, WritableSet } from '@mathesar-component-library';
-import { get, writable, type Unsubscriber, type Writable } from 'svelte/store';
-
-export interface SelectionColumn {
-  id: number | string;
-}
-
-export interface SelectionRow {
-  rowIndex: number;
-}
-
-// TODO: Select active cell using primary key instead of index
-// Checkout scenarios with pk consisting multiple columns
-export interface ActiveCell {
-  rowIndex: number;
-  columnId: number | string;
-}
-
-enum Direction {
-  Up = 'up',
-  Down = 'down',
-  Left = 'left',
-  Right = 'right',
-}
-
-function getDirection(event: KeyboardEvent): Direction | undefined {
-  const { key } = event;
-  const shift = event.shiftKey;
-  switch (true) {
-    case shift && key === 'Tab':
-      return Direction.Left;
-    case shift:
-      return undefined;
-    case key === 'ArrowUp':
-      return Direction.Up;
-    case key === 'ArrowDown':
-      return Direction.Down;
-    case key === 'ArrowLeft':
-      return Direction.Left;
-    case key === 'ArrowRight':
-    case key === 'Tab':
-      return Direction.Right;
-    default:
-      return undefined;
-  }
-}
-
-function getHorizontalDelta(direction: Direction): number {
-  switch (direction) {
-    case Direction.Left:
-      return -1;
-    case Direction.Right:
-      return 1;
-    default:
-      return 0;
-  }
-}
-
-function getVerticalDelta(direction: Direction): number {
-  switch (direction) {
-    case Direction.Up:
-      return -1;
-    case Direction.Down:
-      return 1;
-    default:
-      return 0;
-  }
-}
-
-export function isCellActive(
-  activeCell: ActiveCell,
-  row: SelectionRow,
-  column: SelectionColumn,
-): boolean {
-  return (
-    activeCell &&
-    activeCell?.columnId === column.id &&
-    activeCell.rowIndex === row.rowIndex
-  );
-}
-
-// TODO: Create a common utility action to handle active element based scroll
-function scrollToElement(htmlElement: HTMLElement | null): void {
-  const activeRow = htmlElement?.parentElement;
-  const container = document.querySelector('[data-sheet-body-element="list"]');
-  if (!container || !activeRow) {
-    return;
-  }
-  // Vertical scroll
-  if (
-    activeRow.offsetTop + activeRow.clientHeight + 40 >
-    container.scrollTop + container.clientHeight
-  ) {
-    const offsetValue: number =
-      container.getBoundingClientRect().bottom -
-      activeRow.getBoundingClientRect().bottom -
-      40;
-    container.scrollTop -= offsetValue;
-  } else if (activeRow.offsetTop - 30 < container.scrollTop) {
-    container.scrollTop = activeRow.offsetTop - 30;
-  }
-
-  // Horizontal scroll
-  if (
-    htmlElement.offsetLeft + activeRow.clientWidth + 30 >
-    container.scrollLeft + container.clientWidth
-  ) {
-    const offsetValue: number =
-      container.getBoundingClientRect().right -
-      htmlElement.getBoundingClientRect().right -
-      30;
-    container.scrollLeft -= offsetValue;
-  } else if (htmlElement.offsetLeft - 30 < container.scrollLeft) {
-    container.scrollLeft = htmlElement.offsetLeft - 30;
-  }
-}
-
-export function scrollBasedOnActiveCell(): void {
-  const activeCell: HTMLElement | null = document.querySelector(
-    '[data-sheet-element="cell"].is-active',
-  );
-  scrollToElement(activeCell);
-}
-
-export function scrollBasedOnSelection(): void {
-  const selectedCell: HTMLElement | null = document.querySelector(
-    '[data-sheet-element="cell"].is-selected',
-  );
-  scrollToElement(selectedCell);
-}
-
-type SelectionBounds = {
-  startRowIndex: number;
-  endRowIndex: number;
-  startColumnId: number | string;
-  endColumnId: number | string;
-};
-
-type Cell<Row extends SelectionRow, Column extends SelectionColumn> = [
-  Row,
-  Column,
-];
-
-const ROW_COLUMN_SEPARATOR = '-';
-
-/**
- * Creates Unique identifier for a cell using rowIndex and columnId
- * Storing this identifier instead of an object {rowIndex: number, columnId: number}
- * enables easier usage of the Set data type & faster equality checks
- */
-const createSelectedCellIdentifier = (
-  { rowIndex }: Pick<SelectionRow, 'rowIndex'>,
-  { id }: Pick<SelectionColumn, 'id'>,
-): string => `${rowIndex}${ROW_COLUMN_SEPARATOR}${id}`;
-
-export const isRowSelected = (
-  selectedCells: ImmutableSet<string>,
-  row: SelectionRow,
-): boolean =>
-  selectedCells
-    .valuesArray()
-    .some((cell) => cell.startsWith(`${row.rowIndex}-`));
-
-export const isColumnSelected = (
-  selectedCells: ImmutableSet<string>,
-  columnsSelectedWhenTheTableIsEmpty: ImmutableSet<SelectionColumn['id']>,
-  column: Pick<SelectionColumn, 'id'>,
-): boolean =>
-  columnsSelectedWhenTheTableIsEmpty.has(column.id) ||
-  selectedCells.valuesArray().some((cell) => cell.endsWith(`-${column.id}`));
-
-export const isCellSelected = (
-  selectedCells: ImmutableSet<string>,
-  row: Pick<SelectionRow, 'rowIndex'>,
-  column: Pick<SelectionColumn, 'id'>,
-): boolean => selectedCells.has(createSelectedCellIdentifier(row, column));
-
-// The following function is similar to splitting the string with max_split = 1.
-// input "a-b-c" => output "b-c"
-// input "a-b" => output "b"
-function splitWithLimit(str: string): string {
-  const tokens = str.split(ROW_COLUMN_SEPARATOR);
-  return tokens.slice(1).join(ROW_COLUMN_SEPARATOR);
-}
-
-function getSelectedColumnId(selectedCell: string): SelectionColumn['id'] {
-  const columnId = splitWithLimit(selectedCell);
-  const numericalColumnId = Number(columnId);
-  if (Number.isNaN(numericalColumnId)) {
-    return columnId;
-  }
-  return numericalColumnId;
-}
-
-export function getSelectedRowIndex(selectedCell: string): number {
-  return Number(selectedCell.split(ROW_COLUMN_SEPARATOR)[0]);
-}
-
-/**
- * @deprecated
- */
-export default class LegacySheetSelection<
-  Row extends SelectionRow,
-  Column extends SelectionColumn,
-> {
-  private getColumns: () => Column[];
-
-  private getColumnOrder: () => string[] | number[];
-
-  private getRows: () => Row[];
-
-  // max index is inclusive
-  private getMaxSelectionRowIndex: () => number;
-
-  activeCell: Writable<ActiveCell | undefined>;
-
-  private selectionBounds: SelectionBounds | undefined;
-
-  private activeCellUnsubscriber: Unsubscriber;
-
-  selectedCells: WritableSet<string>;
-
-  /**
-   * When the table has a non-zero number of rows, we store the user's selection
-   * in the `selectedCells` store. But when the table has no rows (and thus no
-   * cells) we still need a way to select columns to configure the data types,
-   * so we use this store as a workaround. More elegant solutions are being
-   * discussed in [1732][1].
-   *
-   * [1]: https://github.com/centerofci/mathesar/issues/1732
-   */
-  columnsSelectedWhenTheTableIsEmpty: WritableSet<Column['id']>;
-
-  freezeSelection: boolean;
-
-  selectionInProgress: Writable<boolean>;
-
-  constructor(args: {
-    getColumns: () => Column[];
-    getColumnOrder: () => string[] | number[];
-    getRows: () => Row[];
-    getMaxSelectionRowIndex: () => number;
-  }) {
-    this.selectedCells = new WritableSet<string>();
-    this.columnsSelectedWhenTheTableIsEmpty = new WritableSet<Column['id']>();
-    this.getColumns = args.getColumns;
-    this.getColumnOrder = args.getColumnOrder;
-    this.getRows = args.getRows;
-    this.getMaxSelectionRowIndex = args.getMaxSelectionRowIndex;
-    this.freezeSelection = false;
-    this.selectionInProgress = writable<boolean>(false);
-    this.activeCell = writable<ActiveCell | undefined>(undefined);
-
-    /**
-     * TODO:
-     * - This adds a document level event listener for each selection
-     * store instance, and the listener doesn't seem to get removed.
-     * - Refactor this logic and avoid such listeners within the store instance.
-     */
-    // This event terminates the cell selection process
-    // specially useful when selecting multiple cells
-    // Adding this on document to enable boundry cells selection
-    // when the user drags the mouse out of the table view
-    document.addEventListener('mouseup', () => {
-      this.onEndSelection();
-    });
-
-    // Keep active cell and selected cell in sync
-    this.activeCellUnsubscriber = this.activeCell.subscribe((activeCell) => {
-      if (activeCell) {
-        const activeCellRow = this.getRows().find(
-          (row) => row.rowIndex === activeCell.rowIndex,
-        );
-        const activeCellColumn = this.getColumns().find(
-          (column) => column.id === activeCell.columnId,
-        );
-        if (activeCellRow && activeCellColumn) {
-          /**
-           * This handles the very rare edge case
-           * when the user starts the selection using mouse
-           * but before ending(mouseup event)
-           * she change the active cell using keyboard
-           */
-          this.selectionBounds = undefined;
-          this.selectMultipleCells([[activeCellRow, activeCellColumn]]);
-        } else {
-          // We need to unselect the Selected cells
-          // when navigating Placeholder cells
-          this.resetSelection();
-        }
-      } else {
-        this.resetSelection();
-      }
-    });
-  }
-
-  onStartSelection(row: SelectionRow, column: SelectionColumn): void {
-    if (this.freezeSelection) {
-      return;
-    }
-
-    this.selectionInProgress.set(true);
-    // Initialize the bounds of the selection
-    this.selectionBounds = {
-      startColumnId: column.id,
-      endColumnId: column.id,
-      startRowIndex: row.rowIndex,
-      endRowIndex: row.rowIndex,
-    };
-
-    const cells = this.getIncludedCells(this.selectionBounds);
-    this.selectMultipleCells(cells);
-  }
-
-  onMouseEnterCellWhileSelection(
-    row: SelectionRow,
-    column: SelectionColumn,
-  ): void {
-    const { rowIndex } = row;
-    const { id } = column;
-
-    // If there is no selection start cell,
-    // this means the selection was never initiated
-    if (!this.selectionBounds || this.freezeSelection) {
-      return;
-    }
-
-    this.selectionBounds.endRowIndex = rowIndex;
-    this.selectionBounds.endColumnId = id;
-    const cells = this.getIncludedCells(this.selectionBounds);
-    this.selectMultipleCells(cells);
-  }
-
-  onEndSelection(): void {
-    if (this.selectionBounds) {
-      const cells = this.getIncludedCells(this.selectionBounds);
-      this.selectMultipleCells(cells);
-      this.selectionBounds = undefined;
-    }
-    this.selectionInProgress.set(false);
-  }
-
-  selectAndActivateFirstCellIfExists(): void {
-    const firstRow = this.getRows()[0];
-    const firstColumn = this.getColumns()[0];
-    if (firstRow && firstColumn) {
-      this.selectMultipleCells([[firstRow, firstColumn]]);
-      this.activateCell(firstRow, firstColumn);
-    }
-  }
-
-  selectAndActivateFirstDataEntryCellInLastRow(): void {
-    const currentRows = this.getRows();
-    const currentColumns = this.getColumns();
-    if (currentRows.length > 0 && currentColumns.length > 1) {
-      this.activateCell(currentRows[currentRows.length - 1], currentColumns[1]);
-    }
-  }
-
-  getIncludedCells(selectionBounds: SelectionBounds): Cell<Row, Column>[] {
-    const { startRowIndex, endRowIndex, startColumnId, endColumnId } =
-      selectionBounds;
-    const minRowIndex = Math.min(startRowIndex, endRowIndex);
-    const maxRowIndex = Math.max(startRowIndex, endRowIndex);
-
-    const columnOrder = this.getColumnOrder();
-
-    const startOrderIndex = columnOrder.findIndex((id) => id === startColumnId);
-    const endOrderIndex = columnOrder.findIndex((id) => id === endColumnId);
-
-    const minColumnPosition = Math.min(startOrderIndex, endOrderIndex);
-    const maxColumnPosition = Math.max(startOrderIndex, endOrderIndex);
-    const columnOrderSelected = columnOrder.slice(
-      minColumnPosition,
-      maxColumnPosition + 1,
-    );
-
-    const columns = this.getColumns();
-
-    const cells: Cell<Row, Column>[] = [];
-    this.getRows().forEach((row) => {
-      const { rowIndex } = row;
-      if (rowIndex >= minRowIndex && rowIndex <= maxRowIndex) {
-        columnOrderSelected.forEach((columnId) => {
-          const column = columns.find((c) => c.id === columnId);
-          if (column) {
-            cells.push([row, column]);
-          }
-        });
-      }
-    });
-
-    return cells;
-  }
-
-  private selectMultipleCells(cells: Array<Cell<Row, Column>>) {
-    const identifiers = cells.map(([row, column]) =>
-      createSelectedCellIdentifier(row, column),
-    );
-    this.selectedCells.reconstruct(identifiers);
-  }
-
-  resetSelection(): void {
-    this.selectionBounds = undefined;
-    this.columnsSelectedWhenTheTableIsEmpty.clear();
-    this.selectedCells.clear();
-  }
-
-  isCompleteColumnSelected(column: Pick<Column, 'id'>): boolean {
-    if (this.getRows().length) {
-      return (
-        this.columnsSelectedWhenTheTableIsEmpty.getHas(column.id) ||
-        this.getRows().every((row) =>
-          isCellSelected(get(this.selectedCells), row, column),
-        )
-      );
-    }
-    return this.columnsSelectedWhenTheTableIsEmpty.getHas(column.id);
-  }
-
-  private isCompleteRowSelected(row: Pick<Row, 'rowIndex'>): boolean {
-    const columns = this.getColumns();
-    return (
-      columns.length > 0 &&
-      columns.every((column) =>
-        isCellSelected(get(this.selectedCells), row, column),
-      )
-    );
-  }
-
-  isAnyColumnCompletelySelected(): boolean {
-    const selectedCellsArray = get(this.selectedCells).valuesArray();
-    const checkedColumns: (number | string)[] = [];
-
-    for (const cell of selectedCellsArray) {
-      const columnId = getSelectedColumnId(cell);
-      if (!checkedColumns.includes(columnId)) {
-        if (this.isCompleteColumnSelected({ id: columnId })) {
-          return true;
-        }
-        checkedColumns.push(columnId);
-      }
-    }
-
-    return false;
-  }
-
-  isAnyRowCompletelySelected(): boolean {
-    const selectedCellsArray = get(this.selectedCells).valuesArray();
-    const checkedRows: number[] = [];
-
-    for (const cell of selectedCellsArray) {
-      const rowIndex = getSelectedRowIndex(cell);
-      if (!checkedRows.includes(rowIndex)) {
-        if (this.isCompleteRowSelected({ rowIndex })) {
-          return true;
-        }
-        checkedRows.push(rowIndex);
-      }
-    }
-
-    return false;
-  }
-
-  /**
-   * Modifies the selected cells, forming a new selection by maintaining the
-   * currently selected rows but altering the selected columns to match the
-   * supplied columns.
-   */
-  intersectSelectedRowsWithGivenColumns(columns: Column[]): void {
-    const selectedRows = this.getSelectedUniqueRowsId(
-      new ImmutableSet(this.selectedCells.getValues()),
-    );
-    const cells: Cell<Row, Column>[] = [];
-    columns.forEach((column) => {
-      selectedRows.forEach((rowIndex) => {
-        const row = this.getRows()[rowIndex];
-        cells.push([row, column]);
-      });
-    });
-
-    this.selectMultipleCells(cells);
-  }
-
-  /**
-   * Use this only for programmatic selection
-   *
-   * Prefer: onColumnSelectionStart when
-   * selection is done using
-   * user interactions
-   */
-  toggleColumnSelection(column: Column): boolean {
-    const isCompleteColumnSelected = this.isCompleteColumnSelected(column);
-    this.activateCell({ rowIndex: 0 }, column);
-
-    if (isCompleteColumnSelected) {
-      this.resetSelection();
-      return false;
-    }
-
-    const rows = this.getRows();
-
-    if (rows.length === 0) {
-      this.resetSelection();
-      this.columnsSelectedWhenTheTableIsEmpty.add(column.id);
-      return true;
-    }
-
-    const cells: Cell<Row, Column>[] = [];
-    rows.forEach((row) => {
-      cells.push([row, column]);
-    });
-
-    // Clearing the selection
-    // since we do not have cmd+click to select
-    // disjointed cells
-    this.resetSelection();
-    this.selectMultipleCells(cells);
-    return true;
-  }
-
-  /**
-   * Use this only for programmatic selection
-   *
-   * Prefer: onRowSelectionStart when
-   * selection is done using
-   * user interactions
-   */
-  toggleRowSelection(row: Row): void {
-    const isCompleteRowSelected = this.isCompleteRowSelected(row);
-
-    if (isCompleteRowSelected) {
-      // Clear the selection - deselect the row
-      this.resetSelection();
-    } else {
-      const cells: Cell<Row, Column>[] = [];
-      this.getColumns().forEach((column) => {
-        cells.push([row, column]);
-      });
-
-      // Clearing the selection
-      // since we do not have cmd+click to select
-      // disjointed cells
-      this.resetSelection();
-      this.selectMultipleCells(cells);
-    }
-  }
-
-  onColumnSelectionStart(column: Column): boolean {
-    if (!this.isCompleteColumnSelected(column)) {
-      this.activateCell({ rowIndex: 0 }, { id: column.id });
-      const rows = this.getRows();
-
-      if (rows.length === 0) {
-        this.resetSelection();
-        this.columnsSelectedWhenTheTableIsEmpty.add(column.id);
-        return true;
-      }
-
-      this.onStartSelection(rows[0], column);
-      this.onMouseEnterCellWhileSelection(rows[rows.length - 1], column);
-    }
-    return true;
-  }
-
-  onMouseEnterColumnHeaderWhileSelection(column: Column): boolean {
-    const rows = this.getRows();
-
-    if (rows.length === 0) {
-      this.resetSelection();
-      this.columnsSelectedWhenTheTableIsEmpty.add(column.id);
-      return true;
-    }
-
-    this.onMouseEnterCellWhileSelection(rows[rows.length - 1], column);
-    return true;
-  }
-
-  onRowSelectionStart(row: Row): boolean {
-    const columns = this.getColumns();
-    const columnOrder = this.getColumnOrder();
-
-    if (!columns.length) {
-      // Not possible to have tables without columns
-    }
-
-    const startColumnId = columnOrder[0];
-    const endColumnId = columnOrder[columnOrder.length - 1];
-    const startColumn = columns.find((c) => c.id === startColumnId);
-    const endColumn = columns.find((c) => c.id === endColumnId);
-
-    if (startColumn && endColumn) {
-      this.activateCell(row, startColumn);
-      this.onStartSelection(row, startColumn);
-      this.onMouseEnterCellWhileSelection(row, endColumn);
-    }
-
-    return true;
-  }
-
-  onMouseEnterRowHeaderWhileSelection(row: Row): boolean {
-    const columns = this.getColumns();
-
-    if (!columns.length) {
-      // Not possible to have tables without columns
-    }
-
-    const endColumn = columns[columns.length - 1];
-    this.onMouseEnterCellWhileSelection(row, endColumn);
-    return true;
-  }
-
-  resetActiveCell(): void {
-    this.activeCell.set(undefined);
-  }
-
-  activateCell(row: Pick<Row, 'rowIndex'>, column: Pick<Column, 'id'>): void {
-    this.activeCell.set({
-      rowIndex: row.rowIndex,
-      columnId: column.id,
-    });
-  }
-
-  focusCell(row: Pick<Row, 'rowIndex'>, column: Pick<Column, 'id'>): void {
-    const cellsInTheColumn = document.querySelectorAll(
-      `[data-column-identifier="${column.id}"]`,
-    );
-    const targetCell = cellsInTheColumn.item(row.rowIndex);
-    (targetCell?.querySelector('.cell-wrapper') as HTMLElement)?.focus();
-  }
-
-  private getAdjacentCell(
-    activeCell: ActiveCell,
-    direction: Direction,
-  ): ActiveCell | undefined {
-    const columnOrder = this.getColumnOrder();
-
-    const rowIndex = (() => {
-      const delta = getVerticalDelta(direction);
-      if (delta === 0) {
-        return activeCell.rowIndex;
-      }
-      const minRowIndex = 0;
-      const maxRowIndex = this.getMaxSelectionRowIndex();
-      const newRowIndex = activeCell.rowIndex + delta;
-      if (newRowIndex < minRowIndex || newRowIndex > maxRowIndex) {
-        return undefined;
-      }
-      return newRowIndex;
-    })();
-    if (rowIndex === undefined) {
-      return undefined;
-    }
-
-    const columnId = (() => {
-      const delta = getHorizontalDelta(direction);
-      if (delta === 0) {
-        return activeCell.columnId;
-      }
-      if (activeCell.columnId) {
-        const index = columnOrder.findIndex((id) => id === activeCell.columnId);
-        const targetId = columnOrder[index + delta];
-        return targetId;
-      }
-      return '';
-    })();
-    if (!columnId) {
-      return undefined;
-    }
-    return { rowIndex, columnId };
-  }
-
-  handleKeyEventsOnActiveCell(key: KeyboardEvent): 'moved' | undefined {
-    const direction = getDirection(key);
-    if (!direction) {
-      return undefined;
-    }
-    let moved = false;
-    this.activeCell.update((activeCell) => {
-      if (!activeCell) {
-        return undefined;
-      }
-      const adjacentCell = this.getAdjacentCell(activeCell, direction);
-      if (adjacentCell) {
-        moved = true;
-        return adjacentCell;
-      }
-      return activeCell;
-    });
-
-    return moved ? 'moved' : undefined;
-  }
-
-  activateFirstCellInSelectedColumn() {
-    const activeCell = get(this.activeCell);
-    if (activeCell) {
-      this.activateCell({ rowIndex: 0 }, { id: activeCell.columnId });
-    }
-  }
-
-  /**
-   * This method does not utilize class properties inorder
-   * to make it reactive during component usage.
-   *
-   * It is placed within the class inorder to make use of
-   * class types
-   */
-  getSelectedUniqueColumnsId(
-    selectedCells: ImmutableSet<string>,
-    columnsSelectedWhenTheTableIsEmpty: ImmutableSet<Column['id']>,
-  ): Column['id'][] {
-    const setOfUniqueColumnIds = new Set([
-      ...[...selectedCells].map(getSelectedColumnId),
-      ...columnsSelectedWhenTheTableIsEmpty,
-    ]);
-    return Array.from(setOfUniqueColumnIds);
-  }
-
-  getSelectedUniqueRowsId(
-    selectedCells: ImmutableSet<string>,
-  ): Row['rowIndex'][] {
-    const setOfUniqueRowIndex = new Set([
-      ...[...selectedCells].map(getSelectedRowIndex),
-    ]);
-    return Array.from(setOfUniqueRowIndex);
-  }
-
-  destroy(): void {
-    this.activeCellUnsubscriber();
-  }
-}
diff --git a/mathesar_ui/src/components/sheet/index.ts b/mathesar_ui/src/components/sheet/index.ts
index 0448df86aa..cae20e3d07 100644
--- a/mathesar_ui/src/components/sheet/index.ts
+++ b/mathesar_ui/src/components/sheet/index.ts
@@ -5,13 +5,7 @@ export { default as SheetPositionableCell } from './SheetPositionableCell.svelte
 export { default as SheetCellResizer } from './SheetCellResizer.svelte';
 export { default as SheetVirtualRows } from './SheetVirtualRows.svelte';
 export { default as SheetRow } from './SheetRow.svelte';
-export { default as LegacySheetSelection } from './LegacySheetSelection';
 export {
-  isColumnSelected,
-  isRowSelected,
-  isCellSelected,
-  getSelectedRowIndex,
-  isCellActive,
   scrollBasedOnActiveCell,
   scrollBasedOnSelection,
-} from './LegacySheetSelection';
+} from './sheetScollingUtils';
diff --git a/mathesar_ui/src/components/sheet/sheetScollingUtils.ts b/mathesar_ui/src/components/sheet/sheetScollingUtils.ts
new file mode 100644
index 0000000000..130f87cefd
--- /dev/null
+++ b/mathesar_ui/src/components/sheet/sheetScollingUtils.ts
@@ -0,0 +1,49 @@
+// TODO: Create a common utility action to handle active element based scroll
+function scrollToElement(htmlElement: HTMLElement | null): void {
+  const activeRow = htmlElement?.parentElement;
+  const container = document.querySelector('[data-sheet-body-element="list"]');
+  if (!container || !activeRow) {
+    return;
+  }
+  // Vertical scroll
+  if (
+    activeRow.offsetTop + activeRow.clientHeight + 40 >
+    container.scrollTop + container.clientHeight
+  ) {
+    const offsetValue: number =
+      container.getBoundingClientRect().bottom -
+      activeRow.getBoundingClientRect().bottom -
+      40;
+    container.scrollTop -= offsetValue;
+  } else if (activeRow.offsetTop - 30 < container.scrollTop) {
+    container.scrollTop = activeRow.offsetTop - 30;
+  }
+
+  // Horizontal scroll
+  if (
+    htmlElement.offsetLeft + activeRow.clientWidth + 30 >
+    container.scrollLeft + container.clientWidth
+  ) {
+    const offsetValue: number =
+      container.getBoundingClientRect().right -
+      htmlElement.getBoundingClientRect().right -
+      30;
+    container.scrollLeft -= offsetValue;
+  } else if (htmlElement.offsetLeft - 30 < container.scrollLeft) {
+    container.scrollLeft = htmlElement.offsetLeft - 30;
+  }
+}
+
+export function scrollBasedOnActiveCell(): void {
+  const activeCell: HTMLElement | null = document.querySelector(
+    '[data-sheet-element="cell"].is-active',
+  );
+  scrollToElement(activeCell);
+}
+
+export function scrollBasedOnSelection(): void {
+  const selectedCell: HTMLElement | null = document.querySelector(
+    '[data-sheet-element="cell"].is-selected',
+  );
+  scrollToElement(selectedCell);
+}
diff --git a/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte b/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
index 77d06c808a..b13fc93274 100644
--- a/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
+++ b/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
@@ -50,7 +50,6 @@
     void queryManager.update((q) =>
       q.withBaseTable(tableEntry ? tableEntry.id : undefined),
     );
-    queryManager.clearSelection();
     linkCollapsibleOpenState = {};
   }
 
diff --git a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
index 7e69371554..63a4cb6db0 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
@@ -10,7 +10,6 @@ import type {
 } from '@mathesar/api/types/queries';
 import { ApiMultiError } from '@mathesar/api/utils/errors';
 import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
-import { LegacySheetSelection } from '@mathesar/components/sheet';
 import Plane from '@mathesar/components/sheet/selection/Plane';
 import Series from '@mathesar/components/sheet/selection/Series';
 import SheetSelection from '@mathesar/components/sheet/selection/SheetSelection';
@@ -25,7 +24,6 @@ import {
   processColumnMetaData,
   speculateColumnMetaData,
   type InputColumnsStoreSubstance,
-  type ProcessedQueryOutputColumn,
   type ProcessedQueryOutputColumnMap,
   type ProcessedQueryResultColumnMap,
 } from './utils';
@@ -44,12 +42,6 @@ export interface QueryRowsData {
   rows: QueryRow[];
 }
 
-/** @deprecated TODO_3037 remove */
-export type QuerySheetSelection = LegacySheetSelection<
-  QueryRow,
-  ProcessedQueryOutputColumn
->;
-
 type QueryRunMode = 'queryId' | 'queryObject';
 
 export default class QueryRunner {
@@ -75,9 +67,6 @@ export default class QueryRunner {
   /** Keys are row ids, values are records */
   selectableRowsMap: Readable<Map<string, Record<string, unknown>>>;
 
-  /** @deprecated TODO_3037 remove */
-  legacySelection: QuerySheetSelection;
-
   selection: Writable<SheetSelection>;
 
   inspector: QueryInspector;
@@ -122,21 +111,6 @@ export default class QueryRunner {
       ({ rows }) => new Map(rows.map((r) => [getRowSelectionId(r), r.record])),
     );
 
-    this.legacySelection = new LegacySheetSelection({
-      getColumns: () => [...get(this.processedColumns).values()],
-      getColumnOrder: () =>
-        [...get(this.processedColumns).values()].map((column) => column.id),
-      getRows: () => get(this.rowsData).rows,
-      getMaxSelectionRowIndex: () => {
-        const rowLength = get(this.rowsData).rows.length;
-        const totalCount = get(this.rowsData).totalCount ?? 0;
-        const pagination = get(this.pagination);
-        const { offset } = pagination;
-        const pageSize = pagination.size;
-        return Math.min(pageSize, totalCount - offset, rowLength) - 1;
-      },
-    });
-
     const plane = derived(
       [this.rowsData, this.processedColumns],
       ([{ rows }, columnsMap]) => {
@@ -153,10 +127,6 @@ export default class QueryRunner {
       plane.subscribe((p) => this.selection.update((s) => s.forNewPlane(p))),
     );
 
-    this.cleanupFunctions.push(
-      plane.subscribe((p) => this.selection.update((s) => s.forNewPlane(p))),
-    );
-
     this.inspector = new QueryInspector(this.query);
   }
 
@@ -269,7 +239,6 @@ export default class QueryRunner {
   async setPagination(pagination: Pagination): Promise<void> {
     this.pagination.set(pagination);
     await this.run();
-    this.legacySelection.activateFirstCellInSelectedColumn();
   }
 
   protected resetPagination(): void {
@@ -283,7 +252,6 @@ export default class QueryRunner {
   }
 
   protected resetResults(): void {
-    this.clearSelection();
     this.runPromise?.cancel();
     this.resetPagination();
     this.rowsData.set({ totalCount: 0, rows: [] });
@@ -294,31 +262,15 @@ export default class QueryRunner {
   protected async resetPaginationAndRun(): Promise<void> {
     this.resetPagination();
     await this.run();
-    this.legacySelection.activateFirstCellInSelectedColumn();
   }
 
   selectColumn(alias: QueryColumnMetaData['alias']): void {
     const processedColumn = get(this.processedColumns).get(alias);
     if (!processedColumn) {
-      this.legacySelection.resetSelection();
-      this.legacySelection.selectAndActivateFirstCellIfExists();
-      this.inspector.selectCellTab();
-      return;
-    }
-
-    const isSelected =
-      this.legacySelection.toggleColumnSelection(processedColumn);
-    if (isSelected) {
-      this.inspector.selectColumnTab();
       return;
     }
-
-    this.legacySelection.activateFirstCellInSelectedColumn();
-    this.inspector.selectCellTab();
-  }
-
-  clearSelection(): void {
-    this.legacySelection.resetSelection();
+    this.selection.update((s) => s.ofOneColumn(processedColumn.id));
+    this.inspector.selectColumnTab();
   }
 
   getQueryModel(): QueryModel {
@@ -326,7 +278,6 @@ export default class QueryRunner {
   }
 
   destroy(): void {
-    this.legacySelection.destroy();
     this.runPromise?.cancel();
     this.cleanupFunctions.forEach((fn) => fn());
   }
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/DeleteColumnAction.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/DeleteColumnAction.svelte
index 1b1c124bdb..2beb400e82 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/DeleteColumnAction.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/DeleteColumnAction.svelte
@@ -50,7 +50,6 @@
     void queryManager.update((q) =>
       q.withoutInitialColumns(selectedColumnAliases),
     );
-    queryManager.clearSelection();
   }
 </script>
 

From 9a9dbd8da4fc69c84ac2b355388b30efe137a6d4 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 11 Sep 2023 21:27:00 -0400
Subject: [PATCH 0022/1141] Rename `isSelectedInRange` to `isSelected`

---
 mathesar_ui/src/components/cell-fabric/CellFabric.svelte    | 4 ++--
 .../cell-fabric/data-types/components/CellWrapper.svelte    | 4 ++--
 .../data-types/components/SteppedInputCell.svelte           | 4 ++--
 .../components/__tests__/SteppedInputCell.test.ts           | 2 +-
 .../data-types/components/array/ArrayCell.svelte            | 4 ++--
 .../data-types/components/checkbox/CheckboxCell.svelte      | 4 ++--
 .../data-types/components/date-time/DateTimeCell.svelte     | 4 ++--
 .../components/formatted-input/FormattedInputCell.svelte    | 4 ++--
 .../components/linked-record/LinkedRecordCell.svelte        | 4 ++--
 .../components/linked-record/LinkedRecordInput.svelte       | 2 +-
 .../data-types/components/money/MoneyCell.svelte            | 4 ++--
 .../data-types/components/number/NumberCell.svelte          | 4 ++--
 .../data-types/components/primary-key/PrimaryKeyCell.svelte | 4 ++--
 .../data-types/components/select/SingleSelectCell.svelte    | 4 ++--
 .../data-types/components/textarea/TextAreaCell.svelte      | 4 ++--
 .../data-types/components/textbox/TextBoxCell.svelte        | 4 ++--
 .../cell-fabric/data-types/components/typeDefinitions.ts    | 2 +-
 .../cell-fabric/data-types/components/uri/UriCell.svelte    | 4 ++--
 .../systems/data-explorer/result-pane/ResultRowCell.svelte  | 2 +-
 mathesar_ui/src/systems/table-view/row/RowCell.svelte       | 6 +++---
 20 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/mathesar_ui/src/components/cell-fabric/CellFabric.svelte b/mathesar_ui/src/components/cell-fabric/CellFabric.svelte
index 8a405123da..9046a74872 100644
--- a/mathesar_ui/src/components/cell-fabric/CellFabric.svelte
+++ b/mathesar_ui/src/components/cell-fabric/CellFabric.svelte
@@ -21,7 +21,7 @@
     | ((recordId: string, recordSummary: string) => void)
     | undefined = undefined;
   export let isActive = false;
-  export let isSelectedInRange = false;
+  export let isSelected = false;
   export let disabled = false;
   export let showAsSkeleton = false;
   export let horizontalAlignment: HorizontalAlignment | undefined = undefined;
@@ -56,7 +56,7 @@
     this={component}
     {...props}
     {isActive}
-    {isSelectedInRange}
+    {isSelected}
     {disabled}
     {isIndependentOfSheet}
     {horizontalAlignment}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
index a731edd395..ab639cc1d8 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
@@ -6,7 +6,7 @@
 
   export let element: HTMLElement | undefined = undefined;
   export let isActive = false;
-  export let isSelectedInRange = false;
+  export let isSelected = false;
   export let disabled = false;
   export let mode: 'edit' | 'default' = 'default';
   export let multiLineTruncate = false;
@@ -116,7 +116,7 @@
   {...$$restProps}
 >
   {#if mode !== 'edit'}
-    <CellBackground color="rgba(14, 101, 235, 0.1)" when={isSelectedInRange} />
+    <CellBackground color="rgba(14, 101, 235, 0.1)" when={isSelected} />
     <CellBackground
       color="var(--cell-background-color)"
       when={valueComparisonOutcome !== 'noMatch'}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/SteppedInputCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/SteppedInputCell.svelte
index 695fbb968e..4544741629 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/SteppedInputCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/SteppedInputCell.svelte
@@ -21,7 +21,7 @@
   type Props = CellTypeProps<Value>;
 
   export let isActive: Props['isActive'];
-  export let isSelectedInRange: Props['isSelectedInRange'];
+  export let isSelected: Props['isSelected'];
   export let value: Props['value'];
   export let disabled: Props['disabled'];
   export let multiLineTruncate = false;
@@ -154,7 +154,7 @@
 
 <CellWrapper
   {isActive}
-  {isSelectedInRange}
+  {isSelected}
   {disabled}
   bind:element={cellRef}
   on:dblclick={setModeToEdit}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/__tests__/SteppedInputCell.test.ts b/mathesar_ui/src/components/cell-fabric/data-types/components/__tests__/SteppedInputCell.test.ts
index 6be1b9daeb..987056f69e 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/__tests__/SteppedInputCell.test.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/__tests__/SteppedInputCell.test.ts
@@ -4,7 +4,7 @@ import SteppedInputCell from '../SteppedInputCell.svelte';
 
 const requiredProps = {
   isActive: false,
-  isSelectedInRange: false,
+  isSelected: false,
   disabled: false,
 };
 
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/array/ArrayCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/array/ArrayCell.svelte
index 4dfff4c2aa..1f25b9fc64 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/array/ArrayCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/array/ArrayCell.svelte
@@ -12,7 +12,7 @@
   const dispatch = createEventDispatcher();
 
   export let isActive: $$Props['isActive'];
-  export let isSelectedInRange: $$Props['isSelectedInRange'];
+  export let isSelected: $$Props['isSelected'];
   export let value: $$Props['value'] = undefined;
   export let disabled: $$Props['disabled'];
   export let isIndependentOfSheet: $$Props['isIndependentOfSheet'];
@@ -44,7 +44,7 @@
 
 <CellWrapper
   {isActive}
-  {isSelectedInRange}
+  {isSelected}
   {disabled}
   {isIndependentOfSheet}
   on:mouseenter
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/checkbox/CheckboxCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/checkbox/CheckboxCell.svelte
index d9932a13f8..dd31115e7c 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/checkbox/CheckboxCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/checkbox/CheckboxCell.svelte
@@ -10,7 +10,7 @@
   const dispatch = createEventDispatcher();
 
   export let isActive: $$Props['isActive'];
-  export let isSelectedInRange: $$Props['isSelectedInRange'];
+  export let isSelected: $$Props['isSelected'];
   export let value: $$Props['value'] = undefined;
   export let disabled: $$Props['disabled'];
   export let searchValue: $$Props['searchValue'] = undefined;
@@ -69,7 +69,7 @@
 <CellWrapper
   bind:element={cellRef}
   {isActive}
-  {isSelectedInRange}
+  {isSelected}
   {disabled}
   {isIndependentOfSheet}
   {valueComparisonOutcome}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/DateTimeCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/DateTimeCell.svelte
index 26a046e6fb..e3a8144221 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/DateTimeCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/DateTimeCell.svelte
@@ -6,7 +6,7 @@
   type $$Props = DateTimeCellProps;
 
   export let isActive: $$Props['isActive'];
-  export let isSelectedInRange: $$Props['isSelectedInRange'];
+  export let isSelected: $$Props['isSelected'];
   export let value: $$Props['value'];
   export let disabled: $$Props['disabled'];
   export let isIndependentOfSheet: $$Props['isIndependentOfSheet'];
@@ -22,7 +22,7 @@
 <SteppedInputCell
   bind:value
   {isActive}
-  {isSelectedInRange}
+  {isSelected}
   {disabled}
   highlightSubstringMatches={false}
   {isIndependentOfSheet}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/formatted-input/FormattedInputCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/formatted-input/FormattedInputCell.svelte
index e4dea6cf04..1738bc4170 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/formatted-input/FormattedInputCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/formatted-input/FormattedInputCell.svelte
@@ -6,7 +6,7 @@
   type $$Props = FormattedInputCellProps;
 
   export let isActive: $$Props['isActive'];
-  export let isSelectedInRange: $$Props['isSelectedInRange'];
+  export let isSelected: $$Props['isSelected'];
   export let value: $$Props['value'];
   export let disabled: $$Props['disabled'];
   export let isIndependentOfSheet: $$Props['isIndependentOfSheet'];
@@ -23,7 +23,7 @@
 <SteppedInputCell
   bind:value
   {isActive}
-  {isSelectedInRange}
+  {isSelected}
   {disabled}
   {isIndependentOfSheet}
   {showTruncationPopover}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordCell.svelte
index 0fc9277cd6..654e7a4085 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordCell.svelte
@@ -20,7 +20,7 @@
   const recordSelector = getRecordSelectorFromContext();
 
   export let isActive: $$Props['isActive'];
-  export let isSelectedInRange: $$Props['isSelectedInRange'];
+  export let isSelected: $$Props['isSelected'];
   export let value: $$Props['value'] = undefined;
   export let searchValue: $$Props['searchValue'] = undefined;
   export let recordSummary: $$Props['recordSummary'] = undefined;
@@ -88,7 +88,7 @@
 
 <CellWrapper
   {isActive}
-  {isSelectedInRange}
+  {isSelected}
   {disabled}
   {isIndependentOfSheet}
   on:mouseenter
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordInput.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordInput.svelte
index 1cbbf10429..618ea9c5cb 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordInput.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordInput.svelte
@@ -22,7 +22,7 @@
   interface $$Props
     extends Omit<
       LinkedRecordCellProps,
-      'isActive' | 'isSelectedInRange' | 'isProcessing' | 'isIndependentOfSheet'
+      'isActive' | 'isSelected' | 'isProcessing' | 'isIndependentOfSheet'
     > {
     class?: string;
     id?: string;
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/money/MoneyCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/money/MoneyCell.svelte
index 54e9f7a556..ee81c06f06 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/money/MoneyCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/money/MoneyCell.svelte
@@ -6,7 +6,7 @@
   type $$Props = MoneyCellProps;
 
   export let isActive: $$Props['isActive'];
-  export let isSelectedInRange: $$Props['isSelectedInRange'];
+  export let isSelected: $$Props['isSelected'];
   export let value: $$Props['value'];
   export let disabled: $$Props['disabled'];
   export let searchValue: $$Props['searchValue'] = undefined;
@@ -19,7 +19,7 @@
 <SteppedInputCell
   bind:value
   {isActive}
-  {isSelectedInRange}
+  {isSelected}
   {disabled}
   {searchValue}
   {isIndependentOfSheet}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/number/NumberCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/number/NumberCell.svelte
index af78d264ec..a7941ad677 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/number/NumberCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/number/NumberCell.svelte
@@ -9,7 +9,7 @@
   type $$Props = NumberCellProps;
 
   export let isActive: $$Props['isActive'];
-  export let isSelectedInRange: $$Props['isSelectedInRange'];
+  export let isSelected: $$Props['isSelected'];
   export let value: $$Props['value'];
   export let disabled: $$Props['disabled'];
   export let searchValue: $$Props['searchValue'] = undefined;
@@ -23,7 +23,7 @@
 <SteppedInputCell
   bind:value
   {isActive}
-  {isSelectedInRange}
+  {isSelected}
   {disabled}
   {isIndependentOfSheet}
   {showTruncationPopover}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/primary-key/PrimaryKeyCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/primary-key/PrimaryKeyCell.svelte
index 3401064021..dbea8f0f5e 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/primary-key/PrimaryKeyCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/primary-key/PrimaryKeyCell.svelte
@@ -13,7 +13,7 @@
   const dispatch = createEventDispatcher();
 
   export let isActive: $$Props['isActive'];
-  export let isSelectedInRange: $$Props['isSelectedInRange'];
+  export let isSelected: $$Props['isSelected'];
   export let value: $$Props['value'] = undefined;
   export let disabled: $$Props['disabled'];
   export let tableId: $$Props['tableId'];
@@ -52,7 +52,7 @@
 
 <CellWrapper
   {isActive}
-  {isSelectedInRange}
+  {isSelected}
   {disabled}
   {isIndependentOfSheet}
   on:mouseenter
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/select/SingleSelectCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/select/SingleSelectCell.svelte
index a50750788f..9e2c64e214 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/select/SingleSelectCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/select/SingleSelectCell.svelte
@@ -24,7 +24,7 @@
   const id = getGloballyUniqueId();
 
   export let isActive: DefinedProps['isActive'];
-  export let isSelectedInRange: $$Props['isSelectedInRange'];
+  export let isSelected: $$Props['isSelected'];
   export let value: DefinedProps['value'] = undefined;
   export let disabled: DefinedProps['disabled'];
   export let isIndependentOfSheet: $$Props['isIndependentOfSheet'];
@@ -113,7 +113,7 @@
     aria-controls={id}
     aria-haspopup="listbox"
     {isActive}
-    {isSelectedInRange}
+    {isSelected}
     {disabled}
     {isIndependentOfSheet}
     on:mousedown={handleMouseDown}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/textarea/TextAreaCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/textarea/TextAreaCell.svelte
index 4783748f39..5e948ad64e 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/textarea/TextAreaCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/textarea/TextAreaCell.svelte
@@ -7,7 +7,7 @@
   type $$Props = TextAreaCellProps;
 
   export let isActive: $$Props['isActive'];
-  export let isSelectedInRange: $$Props['isSelectedInRange'];
+  export let isSelected: $$Props['isSelected'];
   export let value: $$Props['value'] = undefined;
   export let disabled: $$Props['disabled'];
   export let searchValue: $$Props['searchValue'] = undefined;
@@ -33,7 +33,7 @@
 <SteppedInputCell
   bind:value
   {isActive}
-  {isSelectedInRange}
+  {isSelected}
   {disabled}
   {searchValue}
   {isIndependentOfSheet}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/textbox/TextBoxCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/textbox/TextBoxCell.svelte
index b14bc78854..1cecffa707 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/textbox/TextBoxCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/textbox/TextBoxCell.svelte
@@ -6,7 +6,7 @@
   type $$Props = TextBoxCellProps;
 
   export let isActive: $$Props['isActive'];
-  export let isSelectedInRange: $$Props['isSelectedInRange'];
+  export let isSelected: $$Props['isSelected'];
   export let value: $$Props['value'] = undefined;
   export let disabled: $$Props['disabled'];
   export let searchValue: $$Props['searchValue'] = undefined;
@@ -20,7 +20,7 @@
 <SteppedInputCell
   bind:value
   {isActive}
-  {isSelectedInRange}
+  {isSelected}
   {disabled}
   {searchValue}
   {isIndependentOfSheet}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts b/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts
index 93e6dafa29..a1ab9c1178 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts
@@ -13,7 +13,7 @@ export type CellValueFormatter<T> = (
 export interface CellTypeProps<Value> {
   value: Value | null | undefined;
   isActive: boolean;
-  isSelectedInRange: boolean;
+  isSelected: boolean;
   disabled: boolean;
   searchValue?: unknown;
   isProcessing: boolean;
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/uri/UriCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/uri/UriCell.svelte
index 08bfa74608..0ff4e5c8fd 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/uri/UriCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/uri/UriCell.svelte
@@ -11,7 +11,7 @@
   type $$Props = CellTypeProps<string>;
 
   export let isActive: $$Props['isActive'];
-  export let isSelectedInRange: $$Props['isSelectedInRange'];
+  export let isSelected: $$Props['isSelected'];
   export let value: $$Props['value'] = undefined;
   export let disabled: $$Props['disabled'];
   export let searchValue: $$Props['searchValue'] = undefined;
@@ -22,7 +22,7 @@
 <SteppedInputCell
   bind:value
   {isActive}
-  {isSelectedInRange}
+  {isSelected}
   {disabled}
   {searchValue}
   {isIndependentOfSheet}
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
index f46e21b500..50620a2fbd 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
@@ -50,7 +50,7 @@
     {#if row || recordRunState === 'processing'}
       <CellFabric
         {isActive}
-        isSelectedInRange={$selection.cellIds.has(cellId ?? '')}
+        isSelected={$selection.cellIds.has(cellId ?? '')}
         columnFabric={column}
         value={row?.record[column.id]}
         showAsSkeleton={recordRunState === 'processing'}
diff --git a/mathesar_ui/src/systems/table-view/row/RowCell.svelte b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
index 68f6e973b7..538c466937 100644
--- a/mathesar_ui/src/systems/table-view/row/RowCell.svelte
+++ b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
@@ -68,7 +68,7 @@
   $: ({ column, linkFk } = processedColumn);
   $: columnId = column.id;
   $: isActive = $selection.activeCellId === cellId;
-  $: isSelectedInRange = $selection.cellIds.has(cellId);
+  $: isSelected = $selection.cellIds.has(cellId);
   $: modificationStatus = $modificationStatusMap.get(key);
   $: serverErrors =
     modificationStatus?.state === 'failure' ? modificationStatus?.errors : [];
@@ -128,7 +128,7 @@
     class:is-active={isActive}
     class:is-processing={isProcessing}
     class:is-pk={column.primary_key}
-    class:is-selected={isSelectedInRange}
+    class:is-selected={isSelected}
     {...htmlAttributes}
     {style}
   >
@@ -146,7 +146,7 @@
     <CellFabric
       columnFabric={processedColumn}
       {isActive}
-      {isSelectedInRange}
+      {isSelected}
       {value}
       {isProcessing}
       {canViewLinkedEntities}

From ab60ce1ed9d40f4a21929956835c6f19a39439a3 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 5 Feb 2024 20:26:58 -0500
Subject: [PATCH 0023/1141] Handle movement keys

---
 mathesar_ui/src/components/sheet/index.ts     |  2 +-
 .../components/sheet/selection/Direction.ts   | 22 -------
 .../sheet/selection/SheetSelection.ts         |  4 +-
 .../components/sheet/sheetKeyboardUtils.ts    | 47 ++++++++++++++
 ...collingUtils.ts => sheetScrollingUtils.ts} |  7 +++
 mathesar_ui/src/components/sheet/utils.ts     |  3 +-
 .../result-pane/ResultRowCell.svelte          | 31 ++-------
 .../src/systems/table-view/row/RowCell.svelte | 26 ++------
 mathesar_ui/src/utils/KeyboardShortcut.ts     | 63 +++++++++++++++++++
 9 files changed, 131 insertions(+), 74 deletions(-)
 create mode 100644 mathesar_ui/src/components/sheet/sheetKeyboardUtils.ts
 rename mathesar_ui/src/components/sheet/{sheetScollingUtils.ts => sheetScrollingUtils.ts} (93%)
 create mode 100644 mathesar_ui/src/utils/KeyboardShortcut.ts

diff --git a/mathesar_ui/src/components/sheet/index.ts b/mathesar_ui/src/components/sheet/index.ts
index cae20e3d07..b0a1df34f4 100644
--- a/mathesar_ui/src/components/sheet/index.ts
+++ b/mathesar_ui/src/components/sheet/index.ts
@@ -8,4 +8,4 @@ export { default as SheetRow } from './SheetRow.svelte';
 export {
   scrollBasedOnActiveCell,
   scrollBasedOnSelection,
-} from './sheetScollingUtils';
+} from './sheetScrollingUtils';
diff --git a/mathesar_ui/src/components/sheet/selection/Direction.ts b/mathesar_ui/src/components/sheet/selection/Direction.ts
index 2693dd9000..b53704f378 100644
--- a/mathesar_ui/src/components/sheet/selection/Direction.ts
+++ b/mathesar_ui/src/components/sheet/selection/Direction.ts
@@ -5,28 +5,6 @@ export enum Direction {
   Right = 'right',
 }
 
-export function getDirection(event: KeyboardEvent): Direction | undefined {
-  const { key } = event;
-  const shift = event.shiftKey;
-  switch (true) {
-    case shift && key === 'Tab':
-      return Direction.Left;
-    case shift:
-      return undefined;
-    case key === 'ArrowUp':
-      return Direction.Up;
-    case key === 'ArrowDown':
-      return Direction.Down;
-    case key === 'ArrowLeft':
-      return Direction.Left;
-    case key === 'ArrowRight':
-    case key === 'Tab':
-      return Direction.Right;
-    default:
-      return undefined;
-  }
-}
-
 export function getColumnOffset(direction: Direction): number {
   switch (direction) {
     case Direction.Left:
diff --git a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
index 53318a7af3..7c11c67476 100644
--- a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
+++ b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
@@ -480,6 +480,8 @@ export default class SheetSelection {
    * is simpler.
    */
   resized(direction: Direction): SheetSelection {
-    throw new Error('Not implemented');
+    // TODO
+    console.log('Sheet selection resizing is not yet implemented');
+    return this;
   }
 }
diff --git a/mathesar_ui/src/components/sheet/sheetKeyboardUtils.ts b/mathesar_ui/src/components/sheet/sheetKeyboardUtils.ts
new file mode 100644
index 0000000000..f2035c747b
--- /dev/null
+++ b/mathesar_ui/src/components/sheet/sheetKeyboardUtils.ts
@@ -0,0 +1,47 @@
+import type { Writable } from 'svelte/store';
+
+import { KeyboardShortcut } from '@mathesar/utils/KeyboardShortcut';
+import { Direction } from './selection/Direction';
+import type SheetSelection from './selection/SheetSelection';
+import { autoScroll } from './sheetScrollingUtils';
+
+function move(selection: Writable<SheetSelection>, direction: Direction) {
+  selection.update((s) => s.collapsedAndMoved(direction));
+  void autoScroll();
+}
+
+function resize(selection: Writable<SheetSelection>, direction: Direction) {
+  selection.update((s) => s.resized(direction));
+  void autoScroll();
+}
+
+function key(...args: Parameters<typeof KeyboardShortcut.fromKey>) {
+  return KeyboardShortcut.fromKey(...args).toString();
+}
+
+const shortcutMapData: [string, (s: Writable<SheetSelection>) => void][] = [
+  [key('ArrowUp'), (s) => move(s, Direction.Up)],
+  [key('ArrowDown'), (s) => move(s, Direction.Down)],
+  [key('ArrowLeft'), (s) => move(s, Direction.Left)],
+  [key('ArrowRight'), (s) => move(s, Direction.Right)],
+  [key('Tab'), (s) => move(s, Direction.Right)],
+  [key('Tab', ['Shift']), (s) => move(s, Direction.Left)],
+  [key('ArrowUp', ['Shift']), (s) => resize(s, Direction.Up)],
+  [key('ArrowDown', ['Shift']), (s) => resize(s, Direction.Down)],
+  [key('ArrowLeft', ['Shift']), (s) => resize(s, Direction.Left)],
+  [key('ArrowRight', ['Shift']), (s) => resize(s, Direction.Right)],
+];
+
+const shortcutMap = new Map(shortcutMapData);
+
+export function handleKeyboardEventOnCell(
+  event: KeyboardEvent,
+  selection: Writable<SheetSelection>,
+): void {
+  const shortcut = KeyboardShortcut.fromKeyboardEvent(event);
+  const action = shortcutMap.get(shortcut.toString());
+  if (action) {
+    event.preventDefault();
+    action(selection);
+  }
+}
diff --git a/mathesar_ui/src/components/sheet/sheetScollingUtils.ts b/mathesar_ui/src/components/sheet/sheetScrollingUtils.ts
similarity index 93%
rename from mathesar_ui/src/components/sheet/sheetScollingUtils.ts
rename to mathesar_ui/src/components/sheet/sheetScrollingUtils.ts
index 130f87cefd..1155a4ec7b 100644
--- a/mathesar_ui/src/components/sheet/sheetScollingUtils.ts
+++ b/mathesar_ui/src/components/sheet/sheetScrollingUtils.ts
@@ -1,3 +1,5 @@
+import { tick } from 'svelte';
+
 // TODO: Create a common utility action to handle active element based scroll
 function scrollToElement(htmlElement: HTMLElement | null): void {
   const activeRow = htmlElement?.parentElement;
@@ -47,3 +49,8 @@ export function scrollBasedOnSelection(): void {
   );
   scrollToElement(selectedCell);
 }
+
+export async function autoScroll() {
+  await tick();
+  scrollBasedOnActiveCell();
+}
diff --git a/mathesar_ui/src/components/sheet/utils.ts b/mathesar_ui/src/components/sheet/utils.ts
index c05015864a..4f3915d8d0 100644
--- a/mathesar_ui/src/components/sheet/utils.ts
+++ b/mathesar_ui/src/components/sheet/utils.ts
@@ -1,5 +1,6 @@
-import { setContext, getContext } from 'svelte';
+import { getContext, setContext } from 'svelte';
 import type { Readable } from 'svelte/store';
+
 import type { ImmutableMap } from '@mathesar-component-library/types';
 
 export interface ColumnPosition {
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
index 50620a2fbd..6010b66a53 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
@@ -1,15 +1,12 @@
 <script lang="ts">
-  import { tick } from 'svelte';
   import type { Writable } from 'svelte/store';
 
   import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
   import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
-  import {
-    SheetCell,
-    scrollBasedOnActiveCell,
-  } from '@mathesar/components/sheet';
+  import { SheetCell } from '@mathesar/components/sheet';
   import { makeCellId } from '@mathesar/components/sheet/cellIds';
   import type SheetSelection from '@mathesar/components/sheet/selection/SheetSelection';
+  import { handleKeyboardEventOnCell } from '@mathesar/components/sheet/sheetKeyboardUtils';
   import type QueryInspector from '../QueryInspector';
   import { getRowSelectionId, type QueryRow } from '../QueryRunner';
   import type { ProcessedQueryOutputColumn } from '../utils';
@@ -22,27 +19,6 @@
 
   $: cellId = row && makeCellId(getRowSelectionId(row), column.id);
   $: isActive = cellId === $selection.activeCellId;
-
-  async function checkTypeAndScroll(type?: string) {
-    if (type === 'moved') {
-      await tick();
-      scrollBasedOnActiveCell();
-    }
-  }
-
-  async function moveThroughCells(
-    event: CustomEvent<{ originalEvent: KeyboardEvent; key: string }>,
-  ) {
-    const { originalEvent } = event.detail;
-    // // TODO_3037
-    // const type = selection.handleKeyEventsOnActiveCell(originalEvent);
-    // if (type) {
-    //   originalEvent.stopPropagation();
-    //   originalEvent.preventDefault();
-
-    //   await checkTypeAndScroll(type);
-    // }
-  }
 </script>
 
 <SheetCell columnIdentifierKey={column.id} let:htmlAttributes let:style>
@@ -55,7 +31,8 @@
         value={row?.record[column.id]}
         showAsSkeleton={recordRunState === 'processing'}
         disabled={true}
-        on:movementKeyDown={moveThroughCells}
+        on:movementKeyDown={({ detail }) =>
+          handleKeyboardEventOnCell(detail.originalEvent, selection)}
         on:activate={() => {
           // // TODO_3037
           // if (row) {
diff --git a/mathesar_ui/src/systems/table-view/row/RowCell.svelte b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
index 168a2bd019..61ce76d658 100644
--- a/mathesar_ui/src/systems/table-view/row/RowCell.svelte
+++ b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { tick } from 'svelte';
-  import type { Writable } from 'svelte/store';
   import { _ } from 'svelte-i18n';
+  import type { Writable } from 'svelte/store';
 
   import {
     ButtonMenuItem,
@@ -39,6 +39,7 @@
   import ColumnHeaderContextMenu from '../header/header-cell/ColumnHeaderContextMenu.svelte';
   import CellErrors from './CellErrors.svelte';
   import RowContextOptions from './RowContextOptions.svelte';
+  import { handleKeyboardEventOnCell } from '@mathesar/components/sheet/sheetKeyboardUtils';
 
   export let recordsData: RecordsData;
   export let selection: Writable<SheetSelection>;
@@ -85,26 +86,6 @@
     : undefined;
   $: showLinkedRecordHyperLink = linkedRecordHref && canViewLinkedEntities;
 
-  async function checkTypeAndScroll(type?: string) {
-    if (type === 'moved') {
-      await tick();
-      scrollBasedOnActiveCell();
-    }
-  }
-
-  async function moveThroughCells(
-    event: CustomEvent<{ originalEvent: KeyboardEvent; key: string }>,
-  ) {
-    // // TODO_3037
-    // const { originalEvent } = event.detail;
-    // const type = selection.handleKeyEventsOnActiveCell(originalEvent);
-    // if (type) {
-    //   originalEvent.stopPropagation();
-    //   originalEvent.preventDefault();
-    //   await checkTypeAndScroll(type);
-    // }
-  }
-
   async function setValue(newValue: unknown) {
     if (newValue === value) {
       return;
@@ -162,7 +143,8 @@
         })}
       showAsSkeleton={$recordsDataState === States.Loading}
       disabled={!isEditable}
-      on:movementKeyDown={moveThroughCells}
+      on:movementKeyDown={({ detail }) =>
+        handleKeyboardEventOnCell(detail.originalEvent, selection)}
       on:activate={() => selection.update((s) => s.ofOneCell(cellId))}
       on:update={valueUpdated}
       horizontalAlignment={column.primary_key ? 'left' : undefined}
diff --git a/mathesar_ui/src/utils/KeyboardShortcut.ts b/mathesar_ui/src/utils/KeyboardShortcut.ts
new file mode 100644
index 0000000000..17c45b75b1
--- /dev/null
+++ b/mathesar_ui/src/utils/KeyboardShortcut.ts
@@ -0,0 +1,63 @@
+/**
+ * A stricter definition KeyboardEvent['key']. We'll add more variants as we
+ * need them.
+ */
+type Key = 'ArrowUp' | 'ArrowDown' | 'ArrowLeft' | 'ArrowRight' | 'Tab';
+
+type Mod = 'Ctrl' | 'Shift' | 'Alt' | 'Meta';
+
+export class KeyboardShortcut {
+  ctrl: boolean;
+
+  shift: boolean;
+
+  alt: boolean;
+
+  meta: boolean;
+
+  key: Key;
+
+  constructor(props: {
+    ctrl: boolean;
+    shift: boolean;
+    alt: boolean;
+    meta: boolean;
+    key: Key;
+  }) {
+    this.ctrl = props.ctrl;
+    this.shift = props.shift;
+    this.alt = props.alt;
+    this.meta = props.meta;
+    this.key = props.key;
+  }
+
+  static fromKey(key: Key, mods: Mod[] = []): KeyboardShortcut {
+    return new KeyboardShortcut({
+      ctrl: mods.includes('Ctrl'),
+      shift: mods.includes('Shift'),
+      alt: mods.includes('Alt'),
+      meta: mods.includes('Meta'),
+      key,
+    });
+  }
+
+  static fromKeyboardEvent(event: KeyboardEvent): KeyboardShortcut {
+    return new KeyboardShortcut({
+      ctrl: event.ctrlKey,
+      shift: event.shiftKey,
+      alt: event.altKey,
+      meta: event.metaKey,
+      key: event.key as Key,
+    });
+  }
+
+  toString(): string {
+    return [
+      ...(this.ctrl ? ['Ctrl'] : []),
+      ...(this.shift ? ['Shift'] : []),
+      ...(this.alt ? ['Alt'] : []),
+      ...(this.meta ? ['Meta'] : []),
+      this.key,
+    ].join('+');
+  }
+}

From 5e72917758d40db05991d46c50af34f33e3fd9eb Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 5 Feb 2024 21:43:58 -0500
Subject: [PATCH 0024/1141] Begin moving mouse handling logic

---
 .../components/cell-fabric/CellFabric.svelte  | 19 -----------------
 .../components/SteppedInputCell.svelte        |  7 -------
 .../components/array/ArrayCell.svelte         |  7 -------
 .../components/checkbox/CheckboxCell.svelte   | 16 +++++++-------
 .../components/date-time/DateTimeCell.svelte  |  1 -
 .../formatted-input/FormattedInputCell.svelte |  1 -
 .../linked-record/LinkedRecordCell.svelte     | 10 ++++-----
 .../components/money/MoneyCell.svelte         |  1 -
 .../components/number/NumberCell.svelte       |  1 -
 .../primary-key/PrimaryKeyCell.svelte         |  6 +-----
 .../components/select/SingleSelectCell.svelte | 14 ++++++-------
 .../components/textarea/TextAreaCell.svelte   |  1 -
 .../components/textbox/TextBoxCell.svelte     |  1 -
 .../data-types/components/uri/UriCell.svelte  |  1 -
 .../result-pane/ResultRowCell.svelte          | 21 -------------------
 .../src/systems/table-view/row/RowCell.svelte | 21 ++-----------------
 16 files changed, 24 insertions(+), 104 deletions(-)

diff --git a/mathesar_ui/src/components/cell-fabric/CellFabric.svelte b/mathesar_ui/src/components/cell-fabric/CellFabric.svelte
index 95e8762470..a5b8a90e60 100644
--- a/mathesar_ui/src/components/cell-fabric/CellFabric.svelte
+++ b/mathesar_ui/src/components/cell-fabric/CellFabric.svelte
@@ -4,16 +4,9 @@
   This component is meant to be common for tables, queries, and for import preview
 -->
 <script lang="ts">
-  import { createEventDispatcher } from 'svelte';
   import type { HorizontalAlignment } from './data-types/components/typeDefinitions';
   import type { CellColumnFabric } from './types';
 
-  type CustomEvents = {
-    onSelectionStart: { e: MouseEvent };
-    onMouseEnterCellWhileSelection: { e: MouseEvent };
-  };
-  const dispatch = createEventDispatcher<CustomEvents>();
-
   export let columnFabric: CellColumnFabric;
   export let value: unknown;
   export let recordSummary: string | undefined = undefined;
@@ -34,14 +27,6 @@
   $: ({ cellComponentAndProps } = columnFabric);
   $: ({ component } = cellComponentAndProps);
   $: props = cellComponentAndProps.props as Record<string, unknown>;
-
-  function handleMouseDown(e: MouseEvent) {
-    dispatch('onSelectionStart', { e });
-  }
-
-  function handleMouseEnter(e: MouseEvent) {
-    dispatch('onMouseEnterCellWhileSelection', { e });
-  }
 </script>
 
 <div
@@ -49,8 +34,6 @@
   data-column-identifier={columnFabric.id}
   class:show-as-skeleton={showAsSkeleton}
   class:is-independent={isIndependentOfSheet}
-  on:mousedown={handleMouseDown}
-  on:mouseenter={handleMouseEnter}
 >
   <svelte:component
     this={component}
@@ -69,9 +52,7 @@
     {canViewLinkedEntities}
     bind:value
     on:movementKeyDown
-    on:activate
     on:update
-    on:mouseenter
   />
 
   <div class="loader">
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/SteppedInputCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/SteppedInputCell.svelte
index 4544741629..98f1bdcd02 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/SteppedInputCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/SteppedInputCell.svelte
@@ -143,12 +143,6 @@
     resetEditMode();
   }
 
-  function handleMouseDown() {
-    if (!isActive) {
-      dispatch('activate');
-    }
-  }
-
   onMount(initLastSavedValue);
 </script>
 
@@ -159,7 +153,6 @@
   bind:element={cellRef}
   on:dblclick={setModeToEdit}
   on:keydown={handleKeyDown}
-  on:mousedown={handleMouseDown}
   on:mouseenter
   mode={isEditMode ? 'edit' : 'default'}
   {multiLineTruncate}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/array/ArrayCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/array/ArrayCell.svelte
index 1f25b9fc64..66121cef76 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/array/ArrayCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/array/ArrayCell.svelte
@@ -34,12 +34,6 @@
         break;
     }
   }
-
-  function handleMouseDown() {
-    if (!isActive) {
-      dispatch('activate');
-    }
-  }
 </script>
 
 <CellWrapper
@@ -49,7 +43,6 @@
   {isIndependentOfSheet}
   on:mouseenter
   on:keydown={handleWrapperKeyDown}
-  on:mousedown={handleMouseDown}
 >
   <CellValue {value}>
     {#if isDefinedNonNullable(value)}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/checkbox/CheckboxCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/checkbox/CheckboxCell.svelte
index dd31115e7c..a6a469c9d3 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/checkbox/CheckboxCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/checkbox/CheckboxCell.svelte
@@ -58,12 +58,15 @@
     cellRef?.focus();
   }
 
-  function handleMouseDown() {
-    if (!isActive) {
-      isFirstActivated = true;
-      dispatch('activate');
-    }
-  }
+  // // TODO_3037: test checkbox cell thoroughly. The `isFirstActivated`
+  // // variable is no longer getting set. We need to figure out what to do to
+  // // handle this.
+  // function handleMouseDown() {
+  //   if (!isActive) {
+  //     isFirstActivated = true;
+  //     dispatch('activate');
+  //   }
+  // }
 </script>
 
 <CellWrapper
@@ -76,7 +79,6 @@
   on:mouseenter
   on:keydown={handleWrapperKeyDown}
   on:click={checkAndToggle}
-  on:mousedown={handleMouseDown}
 >
   {#if value === undefined}
     <Default />
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/DateTimeCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/DateTimeCell.svelte
index e3a8144221..b50c154cab 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/DateTimeCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/DateTimeCell.svelte
@@ -31,7 +31,6 @@
   let:handleInputKeydown
   formatValue={formatForDisplay}
   on:movementKeyDown
-  on:activate
   on:mouseenter
   on:update
 >
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/formatted-input/FormattedInputCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/formatted-input/FormattedInputCell.svelte
index 1738bc4170..42df86179c 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/formatted-input/FormattedInputCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/formatted-input/FormattedInputCell.svelte
@@ -32,7 +32,6 @@
   let:handleInputKeydown
   formatValue={formatForDisplay}
   on:movementKeyDown
-  on:activate
   on:mouseenter
   on:update
 >
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordCell.svelte
index 2759539ba1..63de26a0ca 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordCell.svelte
@@ -80,10 +80,11 @@
     }
   }
 
-  function handleMouseDown() {
-    wasActiveBeforeClick = isActive;
-    dispatch('activate');
-  }
+  // // TODO_3037: test and see if we need `wasActiveBeforeClick`
+  // function handleMouseDown() {
+  //   wasActiveBeforeClick = isActive;
+  //   dispatch('activate');
+  // }
 
   function handleClick() {
     if (wasActiveBeforeClick) {
@@ -99,7 +100,6 @@
   {isIndependentOfSheet}
   on:mouseenter
   on:keydown={handleWrapperKeyDown}
-  on:mousedown={handleMouseDown}
   on:click={handleClick}
   on:dblclick={launchRecordSelector}
   hasPadding={false}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/money/MoneyCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/money/MoneyCell.svelte
index ee81c06f06..6d271559d6 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/money/MoneyCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/money/MoneyCell.svelte
@@ -30,7 +30,6 @@
   let:handleInputKeydown
   on:movementKeyDown
   on:mouseenter
-  on:activate
   on:update
 >
   <MoneyCellInput
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/number/NumberCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/number/NumberCell.svelte
index a7941ad677..173e801418 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/number/NumberCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/number/NumberCell.svelte
@@ -33,7 +33,6 @@
   let:handleInputBlur
   let:handleInputKeydown
   on:movementKeyDown
-  on:activate
   on:mouseenter
   on:update
 >
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/primary-key/PrimaryKeyCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/primary-key/PrimaryKeyCell.svelte
index bb51bc0540..dc01938b39 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/primary-key/PrimaryKeyCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/primary-key/PrimaryKeyCell.svelte
@@ -28,10 +28,6 @@
     e.stopPropagation();
   }
 
-  function handleValueMouseDown() {
-    dispatch('activate');
-  }
-
   function handleKeyDown(e: KeyboardEvent) {
     switch (e.key) {
       case 'Tab':
@@ -63,7 +59,7 @@
     class="primary-key-cell"
     class:is-independent-of-sheet={isIndependentOfSheet}
   >
-    <span class="value" on:mousedown={handleValueMouseDown}>
+    <span class="value">
       {#if value === undefined}
         <Default />
       {:else}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/select/SingleSelectCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/select/SingleSelectCell.svelte
index 9e2c64e214..886f86c83f 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/select/SingleSelectCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/select/SingleSelectCell.svelte
@@ -43,12 +43,13 @@
     isInitiallyActivated = false;
   }
 
-  function handleMouseDown() {
-    if (!isActive) {
-      isInitiallyActivated = true;
-      dispatch('activate');
-    }
-  }
+  // // TODO_3037 test an see how to fix `isInitiallyActivated` logic
+  // function handleMouseDown() {
+  //   if (!isActive) {
+  //     isInitiallyActivated = true;
+  //     dispatch('activate');
+  //   }
+  // }
 
   function handleKeyDown(
     e: KeyboardEvent,
@@ -116,7 +117,6 @@
     {isSelected}
     {disabled}
     {isIndependentOfSheet}
-    on:mousedown={handleMouseDown}
     on:mouseenter
     on:click={() => checkAndToggle(api)}
     on:keydown={(e) => handleKeyDown(e, api, isOpen)}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/textarea/TextAreaCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/textarea/TextAreaCell.svelte
index 5e948ad64e..9ebc8b88a1 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/textarea/TextAreaCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/textarea/TextAreaCell.svelte
@@ -42,7 +42,6 @@
   let:handleInputBlur
   let:handleInputKeydown
   on:movementKeyDown
-  on:activate
   on:mouseenter
   on:update
 >
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/textbox/TextBoxCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/textbox/TextBoxCell.svelte
index 1cecffa707..f560933a6f 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/textbox/TextBoxCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/textbox/TextBoxCell.svelte
@@ -28,7 +28,6 @@
   let:handleInputBlur
   let:handleInputKeydown
   on:movementKeyDown
-  on:activate
   on:mouseenter
   on:update
 >
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/uri/UriCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/uri/UriCell.svelte
index 0ff4e5c8fd..2e919190ec 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/uri/UriCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/uri/UriCell.svelte
@@ -30,7 +30,6 @@
   let:handleInputBlur
   let:handleInputKeydown
   on:movementKeyDown
-  on:activate
   on:mouseenter
   on:update
 >
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
index 6010b66a53..75d97df662 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
@@ -33,27 +33,6 @@
         disabled={true}
         on:movementKeyDown={({ detail }) =>
           handleKeyboardEventOnCell(detail.originalEvent, selection)}
-        on:activate={() => {
-          // // TODO_3037
-          // if (row) {
-          //   selection.activateCell(row, processedQueryColumn);
-          //   inspector.selectCellTab();
-          // }
-        }}
-        on:onSelectionStart={() => {
-          // // TODO_3037
-          // if (row) {
-          //   selection.onStartSelection(row, processedQueryColumn);
-          // }
-        }}
-        on:onMouseEnterCellWhileSelection={() => {
-          // // TODO_3037
-          // if (row) {
-          //   // This enables the click + drag to
-          //   // select multiple cells
-          //   selection.onMouseEnterCellWhileSelection(row, processedQueryColumn);
-          // }
-        }}
       />
     {/if}
   </div>
diff --git a/mathesar_ui/src/systems/table-view/row/RowCell.svelte b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
index 61ce76d658..0316d7d465 100644
--- a/mathesar_ui/src/systems/table-view/row/RowCell.svelte
+++ b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import { tick } from 'svelte';
   import { _ } from 'svelte-i18n';
   import type { Writable } from 'svelte/store';
 
@@ -17,12 +16,10 @@
   import Null from '@mathesar/components/Null.svelte';
   import RowCellBackgrounds from '@mathesar/components/RowCellBackgrounds.svelte';
   import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
-  import {
-    SheetCell,
-    scrollBasedOnActiveCell,
-  } from '@mathesar/components/sheet';
+  import { SheetCell } from '@mathesar/components/sheet';
   import { makeCellId } from '@mathesar/components/sheet/cellIds';
   import type SheetSelection from '@mathesar/components/sheet/selection/SheetSelection';
+  import { handleKeyboardEventOnCell } from '@mathesar/components/sheet/sheetKeyboardUtils';
   import { iconLinkToRecordPage, iconSetToNull } from '@mathesar/icons';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
@@ -39,7 +36,6 @@
   import ColumnHeaderContextMenu from '../header/header-cell/ColumnHeaderContextMenu.svelte';
   import CellErrors from './CellErrors.svelte';
   import RowContextOptions from './RowContextOptions.svelte';
-  import { handleKeyboardEventOnCell } from '@mathesar/components/sheet/sheetKeyboardUtils';
 
   export let recordsData: RecordsData;
   export let selection: Writable<SheetSelection>;
@@ -145,21 +141,8 @@
       disabled={!isEditable}
       on:movementKeyDown={({ detail }) =>
         handleKeyboardEventOnCell(detail.originalEvent, selection)}
-      on:activate={() => selection.update((s) => s.ofOneCell(cellId))}
       on:update={valueUpdated}
       horizontalAlignment={column.primary_key ? 'left' : undefined}
-      on:onSelectionStart={() => {
-        // // TODO_3037
-        // selection.onStartSelection(row, processedColumn);
-      }}
-      on:onMouseEnterCellWhileSelection={() => {
-        // // This enables the click + drag to
-        // // select multiple cells
-        // //
-        // // TODO_3037
-        // //
-        // selection.onMouseEnterCellWhileSelection(row, processedColumn);
-      }}
     />
     <ContextMenu>
       {#if canEditTableRecords || showLinkedRecordHyperLink}

From c20541007e7bd27215e081b3c5c64b09c78fba69 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 6 Feb 2024 17:06:46 -0500
Subject: [PATCH 0025/1141] Refactor sheet element attributes

---
 mathesar_ui/src/components/sheet/Sheet.svelte |  37 +---
 .../src/components/sheet/SheetCell.svelte     |  99 ++++++++++-
 .../src/components/sheet/SheetHeader.svelte   |  14 +-
 .../sheet/SheetPositionableCell.svelte        |  11 +-
 .../src/components/sheet/SheetRow.svelte      |   3 +-
 .../components/sheet/sheetScrollingUtils.ts   |   4 +-
 mathesar_ui/src/components/sheet/types.ts     |  39 +++++
 .../preview/ImportPreviewContent.svelte       |   3 +-
 .../import/preview/ImportPreviewSheet.svelte  |  56 +++---
 mathesar_ui/src/pages/record/Widgets.svelte   |   4 -
 .../result-pane/ResultHeaderCell.svelte       |  45 +++--
 .../result-pane/ResultRowCell.svelte          |  45 ++---
 .../data-explorer/result-pane/Results.svelte  |  25 +--
 .../src/systems/table-view/TableView.svelte   |   2 +-
 .../systems/table-view/header/Header.svelte   |  82 +++------
 .../systems/table-view/row/GroupHeader.svelte |  10 +-
 .../table-view/row/NewRecordMessage.svelte    |  20 +--
 .../src/systems/table-view/row/Row.svelte     |  54 ++----
 .../src/systems/table-view/row/RowCell.svelte | 163 ++++++++----------
 19 files changed, 328 insertions(+), 388 deletions(-)

diff --git a/mathesar_ui/src/components/sheet/Sheet.svelte b/mathesar_ui/src/components/sheet/Sheet.svelte
index f14d947adb..9e01daf36f 100644
--- a/mathesar_ui/src/components/sheet/Sheet.svelte
+++ b/mathesar_ui/src/components/sheet/Sheet.svelte
@@ -139,10 +139,11 @@
     --z-index__sheet__column-resizer: 2;
     --z-index__sheet__active-cell: 3;
     --z-index__sheet__row-header-cell: 4;
-    --z-index__sheet__group-header: 5;
-    --z-index__sheet__new-record-message: 6;
-    --z-index__sheet__horizontal-scrollbar: 7;
-    --z-index__sheet__vertical-scrollbar: 8;
+    --z-index__sheet__positionable-cell: 5;
+    --z-index__sheet__column-header-cell: 6;
+    --z-index__sheet__origin-cell: 7;
+    --z-index__sheet__horizontal-scrollbar: 8;
+    --z-index__sheet__vertical-scrollbar: 9;
 
     --virtual-list-horizontal-scrollbar-z-index: var(
       --z-index__sheet__horizontal-scrollbar
@@ -168,33 +169,7 @@
       min-width: 100%;
     }
 
-    :global([data-sheet-element='cell']) {
-      position: absolute;
-      display: flex;
-      align-items: center;
-      border-bottom: var(--cell-border-horizontal);
-      border-right: var(--cell-border-vertical);
-      left: 0;
-      top: 0;
-      height: 100%;
-    }
-
-    :global([data-sheet-element='cell'][data-cell-static='true']) {
-      position: sticky;
-      z-index: var(--z-index__sheet__row-header-cell);
-    }
-
-    :global([data-sheet-element='cell'][data-cell-control='true']) {
-      font-size: var(--text-size-x-small);
-      padding: 0 1.5rem;
-      justify-content: center;
-      color: var(--color-text-muted);
-      display: inline-flex;
-      align-items: center;
-      height: 100%;
-    }
-
-    :global([data-sheet-element='row']) {
+    :global([data-sheet-element='data-row']) {
       transition: all 0.2s cubic-bezier(0, 0, 0.2, 1);
     }
   }
diff --git a/mathesar_ui/src/components/sheet/SheetCell.svelte b/mathesar_ui/src/components/sheet/SheetCell.svelte
index fb70966943..9c9ad390b8 100644
--- a/mathesar_ui/src/components/sheet/SheetCell.svelte
+++ b/mathesar_ui/src/components/sheet/SheetCell.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import type { SheetCellType } from './types';
   import { getSheetContext } from './utils';
 
   type SheetColumnIdentifierKey = $$Generic;
@@ -6,18 +7,98 @@
   const { stores } = getSheetContext();
   const { columnStyleMap } = stores;
 
+  export let type: SheetCellType;
   export let columnIdentifierKey: SheetColumnIdentifierKey;
+  export let isActive = false;
+  export let isSelected = false;
+  export let lightText = false;
 
   $: styleMap = $columnStyleMap.get(columnIdentifierKey);
+</script>
 
-  export let isStatic = false;
-  export let isControlCell = false;
+<div
+  class="sheet-cell"
+  data-sheet-element={type}
+  style={styleMap?.styleString}
+  class:is-active={isActive}
+  class:is-selected={isSelected}
+  class:light-text={lightText}
+>
+  <slot />
+</div>
 
-  $: htmlAttributes = {
-    'data-sheet-element': 'cell',
-    'data-cell-static': isStatic ? true : undefined,
-    'data-cell-control': isControlCell ? true : undefined,
-  };
-</script>
+<style lang="scss">
+  .sheet-cell {
+    &[data-sheet-element='origin-cell'],
+    &[data-sheet-element='column-header-cell'],
+    &[data-sheet-element='new-column-cell'],
+    &[data-sheet-element='row-header-cell'],
+    &[data-sheet-element='data-cell'] {
+      position: absolute;
+      display: flex;
+      align-items: center;
+      border-bottom: var(--cell-border-horizontal);
+      border-right: var(--cell-border-vertical);
+      left: 0;
+      top: 0;
+      height: 100%;
+    }
+
+    &[data-sheet-element='column-header-cell'],
+    &[data-sheet-element='origin-cell'],
+    &[data-sheet-element='new-column-cell'] {
+      border-bottom: none;
+      background: var(--slate-100);
+      font-size: var(--text-size-small);
+      font-weight: 500;
+      overflow: hidden;
+    }
+
+    &[data-sheet-element='origin-cell'] {
+      position: sticky;
+      z-index: var(--z-index__sheet__origin-cell);
+    }
+
+    &[data-sheet-element='column-header-cell'] {
+      z-index: var(--z-index__sheet__column-header-cell);
+    }
+
+    &[data-sheet-element='positionable-cell'] {
+      z-index: var(--z-index__sheet__positionable-cell);
+    }
+
+    &[data-sheet-element='row-header-cell'] {
+      position: sticky;
+      z-index: var(--z-index__sheet__row-header-cell);
+      font-size: var(--text-size-x-small);
+      padding: 0 1.5rem;
+      justify-content: center;
+      color: var(--color-text-muted);
+      display: inline-flex;
+      align-items: center;
+      height: 100%;
+    }
+
+    &.is-active {
+      z-index: var(--z-index__sheet__active-cell);
+      border-color: transparent;
+      min-height: 100%;
+      /* TODO: why do we need !important here? Please remove or document */
+      height: auto !important;
+    }
+
+    &.light-text {
+      color: var(--cell-text-color-processing);
+    }
+
+    &[data-sheet-element='data-cell'] {
+      user-select: none;
+      -webkit-user-select: none; /* Safari */
+      background: var(--cell-bg-color-base);
+    }
 
-<slot {htmlAttributes} style={styleMap?.styleString} />
+    &[data-sheet-element='new-column-cell'] {
+      padding: 0 0.2rem;
+    }
+  }
+</style>
diff --git a/mathesar_ui/src/components/sheet/SheetHeader.svelte b/mathesar_ui/src/components/sheet/SheetHeader.svelte
index 7b5e7ac7d8..37203e70f8 100644
--- a/mathesar_ui/src/components/sheet/SheetHeader.svelte
+++ b/mathesar_ui/src/components/sheet/SheetHeader.svelte
@@ -41,7 +41,7 @@
 
 <div
   bind:this={headerRef}
-  data-sheet-element="header"
+  data-sheet-element="header-row"
   class:inherit-font-style={inheritFontStyle}
 >
   <div style:width="{$rowWidth}px">
@@ -50,7 +50,7 @@
 </div>
 
 <style lang="scss">
-  [data-sheet-element='header'] {
+  [data-sheet-element='header-row'] {
     min-width: 100%;
     position: relative;
     flex-grow: 0;
@@ -65,16 +65,8 @@
       height: var(--sheet-header-height, 32px);
     }
 
-    :global([data-sheet-element='cell']) {
-      border-bottom: none;
-      background: var(--slate-100);
-      font-size: var(--text-size-small);
-      font-weight: 500;
-      overflow: hidden;
-    }
-
     &.inherit-font-style {
-      :global([data-sheet-element='cell']) {
+      :global([data-sheet-element='column-header-cell']) {
         font-size: inherit;
         font-weight: inherit;
       }
diff --git a/mathesar_ui/src/components/sheet/SheetPositionableCell.svelte b/mathesar_ui/src/components/sheet/SheetPositionableCell.svelte
index 1b7a10f22d..8c731acda8 100644
--- a/mathesar_ui/src/components/sheet/SheetPositionableCell.svelte
+++ b/mathesar_ui/src/components/sheet/SheetPositionableCell.svelte
@@ -25,13 +25,8 @@
   }
 
   $: style = calculateStyle($columnStyleMap, index, columnSpan);
-
-  export let isStatic = false;
-
-  $: htmlAttributes = {
-    'data-sheet-element': 'cell',
-    'data-cell-static': isStatic ? true : undefined,
-  };
 </script>
 
-<slot {htmlAttributes} {style} />
+<div data-sheet-element="positionable-cell" {style}>
+  <slot />
+</div>
diff --git a/mathesar_ui/src/components/sheet/SheetRow.svelte b/mathesar_ui/src/components/sheet/SheetRow.svelte
index 09d930b6fc..cc3cfb65e7 100644
--- a/mathesar_ui/src/components/sheet/SheetRow.svelte
+++ b/mathesar_ui/src/components/sheet/SheetRow.svelte
@@ -20,8 +20,7 @@
   $: styleString = calculateStyle(style, $rowWidth);
 
   const htmlAttributes = {
-    'data-sheet-element': 'row',
-    'data-sheet-section': 'body',
+    'data-sheet-element': 'data-row',
   };
 </script>
 
diff --git a/mathesar_ui/src/components/sheet/sheetScrollingUtils.ts b/mathesar_ui/src/components/sheet/sheetScrollingUtils.ts
index 1155a4ec7b..16bede15b2 100644
--- a/mathesar_ui/src/components/sheet/sheetScrollingUtils.ts
+++ b/mathesar_ui/src/components/sheet/sheetScrollingUtils.ts
@@ -38,14 +38,14 @@ function scrollToElement(htmlElement: HTMLElement | null): void {
 
 export function scrollBasedOnActiveCell(): void {
   const activeCell: HTMLElement | null = document.querySelector(
-    '[data-sheet-element="cell"].is-active',
+    '[data-sheet-element="data-cell"].is-active',
   );
   scrollToElement(activeCell);
 }
 
 export function scrollBasedOnSelection(): void {
   const selectedCell: HTMLElement | null = document.querySelector(
-    '[data-sheet-element="cell"].is-selected',
+    '[data-sheet-element="data-cell"].is-selected',
   );
   scrollToElement(selectedCell);
 }
diff --git a/mathesar_ui/src/components/sheet/types.ts b/mathesar_ui/src/components/sheet/types.ts
index b69d3b24d3..bbc97588a2 100644
--- a/mathesar_ui/src/components/sheet/types.ts
+++ b/mathesar_ui/src/components/sheet/types.ts
@@ -4,3 +4,42 @@ export interface SheetVirtualRowsApi {
   scrollToPosition: (vScrollOffset: number, hScrollOffset: number) => void;
   recalculateHeightsAfterIndex: (index: number) => void;
 }
+
+/**
+ * These are the different kinds of cells that we can have within a sheet.
+ *
+ * - `origin-cell`: The cell in the top-left corner of the sheet.
+ *
+ * - `column-header-cell`: Contains the column names.
+ *
+ * - `new-column-cell`: Contains the `+` button for adding a new column.
+ *
+ * - `row-header-cell`: Contains the row numbers.
+ *
+ * - `data-cell`: Regular data cells.
+ */
+export type SheetCellType =
+  | 'origin-cell'
+  | 'column-header-cell'
+  | 'new-column-cell'
+  | 'row-header-cell'
+  | 'data-cell';
+
+/**
+ * These are values used for the `data-sheet-element` attribute on the sheet
+ * elements.
+ *
+ * - `header-row`: The top most row of the sheet. It contains the column header
+ *   cells.
+ *
+ * - `data-row`: Used for the remaining rows, including (for now) weird ones
+ *   like grouping headers and such.
+ *
+ * - `positionable-cell`: Cells that span multiple columns or are taken out of
+ *   regular flow e.g. "New records" message, grouping headers, etc.
+ */
+export type SheetElement =
+  | 'header-row'
+  | 'data-row'
+  | 'positionable-cell'
+  | SheetCellType;
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index 2c01712646..5b380486f7 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -266,7 +266,8 @@
   }
   .sheet-holder {
     max-width: fit-content;
-    overflow: auto;
+    overflow-x: auto;
+    overflow-y: hidden;
     margin: 0 auto;
     border: 1px solid var(--slate-200);
   }
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewSheet.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewSheet.svelte
index dec9363708..3ffd200dad 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewSheet.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewSheet.svelte
@@ -25,20 +25,18 @@
   <Sheet restrictWidthToRowWidth {columns} getColumnIdentifier={(c) => c.id}>
     <SheetHeader inheritFontStyle>
       {#each columns as column (column.id)}
-        <SheetCell columnIdentifierKey={column.id} let:htmlAttributes let:style>
-          <div {...htmlAttributes} {style}>
-            <PreviewColumn
-              {isLoading}
-              processedColumn={column}
-              {updateTypeRelatedOptions}
-              bind:selected={columnPropertiesMap[column.id].selected}
-              bind:displayName={columnPropertiesMap[column.id].displayName}
-            />
-            <SheetCellResizer
-              columnIdentifierKey={column.id}
-              minColumnWidth={120}
-            />
-          </div>
+        <SheetCell type="column-header-cell" columnIdentifierKey={column.id}>
+          <PreviewColumn
+            {isLoading}
+            processedColumn={column}
+            {updateTypeRelatedOptions}
+            bind:selected={columnPropertiesMap[column.id].selected}
+            bind:displayName={columnPropertiesMap[column.id].displayName}
+          />
+          <SheetCellResizer
+            columnIdentifierKey={column.id}
+            minColumnWidth={120}
+          />
         </SheetCell>
       {/each}
     </SheetHeader>
@@ -50,19 +48,13 @@
       >
         <div {...htmlAttributes} style={styleString}>
           {#each columns as column (column)}
-            <SheetCell
-              columnIdentifierKey={column.id}
-              let:htmlAttributes={sheetCellHtmlAttributes}
-              let:style
-            >
-              <div {...sheetCellHtmlAttributes} {style}>
-                <CellFabric
-                  columnFabric={column}
-                  value={record[column.column.name]}
-                  showAsSkeleton={isLoading}
-                  disabled={true}
-                />
-              </div>
+            <SheetCell type="data-cell" columnIdentifierKey={column.id}>
+              <CellFabric
+                columnFabric={column}
+                value={record[column.column.name]}
+                showAsSkeleton={isLoading}
+                disabled={true}
+              />
             </SheetCell>
           {/each}
         </div>
@@ -73,13 +65,17 @@
 
 <style lang="scss">
   .import-preview {
-    :global([data-sheet-element='row'] [data-sheet-element='cell']) {
+    :global([data-sheet-element='data-cell']) {
       background: var(--white);
     }
-    :global([data-sheet-element] [data-sheet-element='cell']:last-child) {
+    :global([data-sheet-element='data-cell']:last-child),
+    :global([data-sheet-element='column-header-cell']:last-child) {
       border-right: none;
     }
-    :global([data-sheet-element='row']:last-child [data-sheet-element='cell']) {
+    :global(
+        [data-sheet-element='data-row']:last-child
+          [data-sheet-element='data-cell']
+      ) {
       border-bottom: none;
     }
   }
diff --git a/mathesar_ui/src/pages/record/Widgets.svelte b/mathesar_ui/src/pages/record/Widgets.svelte
index 07492bbbcb..ce9a8d2b39 100644
--- a/mathesar_ui/src/pages/record/Widgets.svelte
+++ b/mathesar_ui/src/pages/record/Widgets.svelte
@@ -84,10 +84,6 @@
     :global(.sheet) {
       background: var(--white);
     }
-
-    :global(.sheet [data-sheet-element='header']) {
-      background: var(--slate-100);
-    }
   }
 
   .table-widget-positioner {
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/ResultHeaderCell.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/ResultHeaderCell.svelte
index 5a1996a8a9..edc9ccbfc0 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/ResultHeaderCell.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/ResultHeaderCell.svelte
@@ -15,31 +15,28 @@
 </script>
 
 <SheetCell
+  type="column-header-cell"
   columnIdentifierKey={processedQueryColumn.id}
-  let:htmlAttributes
-  let:style
 >
-  <div {...htmlAttributes} {style}>
-    <Button
-      appearance="plain"
-      class="column-name-wrapper {isSelected ? 'selected' : ''}"
-      on:click={() => {
-        queryRunner.selectColumn(processedQueryColumn.column.alias);
+  <Button
+    appearance="plain"
+    class="column-name-wrapper {isSelected ? 'selected' : ''}"
+    on:click={() => {
+      queryRunner.selectColumn(processedQueryColumn.column.alias);
+    }}
+  >
+    <!--TODO: Use a separate prop to identify column that isn't fetched yet
+                    instead of type:unknown-->
+    <ColumnName
+      isLoading={columnRunState === 'processing' &&
+        processedQueryColumn.column.type === 'unknown'}
+      column={{
+        ...processedQueryColumn.column,
+        name:
+          processedQueryColumn.column.display_name ??
+          processedQueryColumn.column.alias,
       }}
-    >
-      <!--TODO: Use a separate prop to identify column that isn't fetched yet
-                      instead of type:unknown-->
-      <ColumnName
-        isLoading={columnRunState === 'processing' &&
-          processedQueryColumn.column.type === 'unknown'}
-        column={{
-          ...processedQueryColumn.column,
-          name:
-            processedQueryColumn.column.display_name ??
-            processedQueryColumn.column.alias,
-        }}
-      />
-    </Button>
-    <SheetCellResizer columnIdentifierKey={processedQueryColumn.id} />
-  </div>
+    />
+  </Button>
+  <SheetCellResizer columnIdentifierKey={processedQueryColumn.id} />
 </SheetCell>
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
index 75d97df662..eda7fda532 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
@@ -7,7 +7,6 @@
   import { makeCellId } from '@mathesar/components/sheet/cellIds';
   import type SheetSelection from '@mathesar/components/sheet/selection/SheetSelection';
   import { handleKeyboardEventOnCell } from '@mathesar/components/sheet/sheetKeyboardUtils';
-  import type QueryInspector from '../QueryInspector';
   import { getRowSelectionId, type QueryRow } from '../QueryRunner';
   import type { ProcessedQueryOutputColumn } from '../utils';
 
@@ -15,40 +14,22 @@
   export let row: QueryRow | undefined;
   export let recordRunState: RequestStatus['state'] | undefined;
   export let selection: Writable<SheetSelection>;
-  export let inspector: QueryInspector;
 
   $: cellId = row && makeCellId(getRowSelectionId(row), column.id);
   $: isActive = cellId === $selection.activeCellId;
 </script>
 
-<SheetCell columnIdentifierKey={column.id} let:htmlAttributes let:style>
-  <div {...htmlAttributes} {style} class="cell" class:is-active={isActive}>
-    {#if row || recordRunState === 'processing'}
-      <CellFabric
-        {isActive}
-        isSelected={$selection.cellIds.has(cellId ?? '')}
-        columnFabric={column}
-        value={row?.record[column.id]}
-        showAsSkeleton={recordRunState === 'processing'}
-        disabled={true}
-        on:movementKeyDown={({ detail }) =>
-          handleKeyboardEventOnCell(detail.originalEvent, selection)}
-      />
-    {/if}
-  </div>
+<SheetCell type="data-cell" columnIdentifierKey={column.id} {isActive}>
+  {#if row || recordRunState === 'processing'}
+    <CellFabric
+      {isActive}
+      isSelected={$selection.cellIds.has(cellId ?? '')}
+      columnFabric={column}
+      value={row?.record[column.id]}
+      showAsSkeleton={recordRunState === 'processing'}
+      disabled={true}
+      on:movementKeyDown={({ detail }) =>
+        handleKeyboardEventOnCell(detail.originalEvent, selection)}
+    />
+  {/if}
 </SheetCell>
-
-<style lang="scss">
-  .cell {
-    user-select: none;
-    -webkit-user-select: none; /* Safari */
-    background: var(--cell-bg-color-base);
-
-    &.is-active {
-      z-index: var(--z-index__sheet__active-cell);
-      border-color: transparent;
-      min-height: 100%;
-      height: auto;
-    }
-  }
-</style>
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
index 05841970a8..1a6c80302e 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
@@ -37,7 +37,6 @@
     pagination,
     runState,
     selection,
-    inspector,
   } = queryHandler);
   $: ({ initial_columns } = $query);
   $: clipboardHandler = new SheetClipboardHandler({
@@ -87,15 +86,9 @@
     >
       <SheetHeader>
         <SheetCell
+          type="origin-cell"
           columnIdentifierKey={ID_ROW_CONTROL_COLUMN}
-          isStatic
-          isControlCell
-          let:htmlAttributes
-          let:style
-        >
-          <div {...htmlAttributes} {style} />
-        </SheetCell>
-
+        />
         {#each columnList as processedQueryColumn (processedQueryColumn.id)}
           <ResultHeaderCell
             {processedQueryColumn}
@@ -119,16 +112,11 @@
                 style="--cell-height:{rowHeightPx - 1}px;{styleString}"
               >
                 <SheetCell
+                  type="row-header-cell"
                   columnIdentifierKey={ID_ROW_CONTROL_COLUMN}
-                  isStatic
-                  isControlCell
-                  let:htmlAttributes={sheetCellHtmlAttributes}
-                  let:style
                 >
-                  <div {...sheetCellHtmlAttributes} {style}>
-                    <CellBackground color="var(--cell-bg-color-header)" />
-                    {$pagination.offset + item.index + 1}
-                  </div>
+                  <CellBackground color="var(--cell-bg-color-header)" />
+                  {$pagination.offset + item.index + 1}
                 </SheetCell>
 
                 {#each columnList as processedQueryColumn (processedQueryColumn.id)}
@@ -137,7 +125,6 @@
                     column={processedQueryColumn}
                     {recordRunState}
                     {selection}
-                    {inspector}
                   />
                 {/each}
               </div>
@@ -234,7 +221,7 @@
     :global(.column-name-wrapper.selected) {
       background: var(--slate-200) !important;
     }
-    :global([data-sheet-element='cell'].selected) {
+    :global([data-sheet-element='data-cell'].selected) {
       background: var(--slate-100);
     }
   }
diff --git a/mathesar_ui/src/systems/table-view/TableView.svelte b/mathesar_ui/src/systems/table-view/TableView.svelte
index d209587b2b..fb048a3460 100644
--- a/mathesar_ui/src/systems/table-view/TableView.svelte
+++ b/mathesar_ui/src/systems/table-view/TableView.svelte
@@ -94,7 +94,7 @@
     // //Better document why we need id.
     //
     // const target = e.target as HTMLElement;
-    // if (!target.closest('[data-sheet-element="cell"')) {
+    // if (!target.closest('[data-sheet-element="data-cell"')) {
     //   if ($activeCell) {
     //     selection.focusCell(
     //       // TODO make sure to use getRowSelectionId instead of rowIndex
diff --git a/mathesar_ui/src/systems/table-view/header/Header.svelte b/mathesar_ui/src/systems/table-view/header/Header.svelte
index 01d7fa1d3b..0dd73689d9 100644
--- a/mathesar_ui/src/systems/table-view/header/Header.svelte
+++ b/mathesar_ui/src/systems/table-view/header/Header.svelte
@@ -94,80 +94,46 @@
 </script>
 
 <SheetHeader>
-  <SheetCell
-    columnIdentifierKey={ID_ROW_CONTROL_COLUMN}
-    isStatic
-    isControlCell
-    let:htmlAttributes
-    let:style
-  >
+  <SheetCell type="origin-cell" columnIdentifierKey={ID_ROW_CONTROL_COLUMN}>
     <Droppable
       on:drop={() => dropColumn()}
       on:dragover={(e) => e.preventDefault()}
       locationOfFirstDraggedColumn={0}
       columnLocation={-1}
-    >
-      <div {...htmlAttributes} {style} />
-    </Droppable>
+    />
   </SheetCell>
 
   {#each [...$processedColumns] as [columnId, processedColumn] (columnId)}
     {@const isSelected = $selection.columnIds.has(String(columnId))}
-    <SheetCell columnIdentifierKey={columnId} let:htmlAttributes let:style>
+    <SheetCell type="column-header-cell" columnIdentifierKey={columnId}>
+      <!-- TODO_3037: why is this div here? Can we get rid of it? -->
       <div>
-        <div {...htmlAttributes} {style}>
-          <Draggable
-            on:dragstart={() => dragColumn()}
-            column={processedColumn}
-            {selection}
+        <Draggable
+          on:dragstart={() => dragColumn()}
+          column={processedColumn}
+          {selection}
+        >
+          <Droppable
+            on:drop={() => dropColumn(processedColumn)}
+            on:dragover={(e) => e.preventDefault()}
+            {locationOfFirstDraggedColumn}
+            columnLocation={columnOrderString.indexOf(columnId.toString())}
+            {isSelected}
           >
-            <Droppable
-              on:drop={() => dropColumn(processedColumn)}
-              on:dragover={(e) => e.preventDefault()}
-              {locationOfFirstDraggedColumn}
-              columnLocation={columnOrderString.indexOf(columnId.toString())}
-              {isSelected}
-            >
-              <HeaderCell
-                {processedColumn}
-                {isSelected}
-                on:mousedown={() => {
-                  // // TODO_3037
-                  // selection.onColumnSelectionStart(processedColumn)
-                }}
-                on:mouseenter={() => {
-                  // // TODO_3037
-                  // selection.onMouseEnterColumnHeaderWhileSelection(
-                  //   processedColumn,
-                  // )
-                }}
-              />
-            </Droppable>
-          </Draggable>
-          <SheetCellResizer columnIdentifierKey={columnId} />
-          <ContextMenu>
-            <ColumnHeaderContextMenu {processedColumn} />
-          </ContextMenu>
-        </div>
+            <HeaderCell {processedColumn} {isSelected} />
+          </Droppable>
+        </Draggable>
+        <SheetCellResizer columnIdentifierKey={columnId} />
+        <ContextMenu>
+          <ColumnHeaderContextMenu {processedColumn} />
+        </ContextMenu>
       </div>
     </SheetCell>
   {/each}
 
   {#if hasNewColumnButton}
-    <SheetCell
-      columnIdentifierKey={ID_ADD_NEW_COLUMN}
-      let:htmlAttributes
-      let:style
-    >
-      <div {...htmlAttributes} class="new-column-cell" {style}>
-        <NewColumnCell />
-      </div>
+    <SheetCell type="new-column-cell" columnIdentifierKey={ID_ADD_NEW_COLUMN}>
+      <NewColumnCell />
     </SheetCell>
   {/if}
 </SheetHeader>
-
-<style lang="scss">
-  .new-column-cell {
-    padding: 0 0.2rem;
-  }
-</style>
diff --git a/mathesar_ui/src/systems/table-view/row/GroupHeader.svelte b/mathesar_ui/src/systems/table-view/row/GroupHeader.svelte
index 06a739656c..a71cdfd10f 100644
--- a/mathesar_ui/src/systems/table-view/row/GroupHeader.svelte
+++ b/mathesar_ui/src/systems/table-view/row/GroupHeader.svelte
@@ -30,13 +30,8 @@
   );
 </script>
 
-<SheetPositionableCell
-  index={0}
-  columnSpan={processedColumnsMap.size + 1}
-  let:htmlAttributes
-  let:style
->
-  <div {...htmlAttributes} {style} class="group-header">
+<SheetPositionableCell index={0} columnSpan={processedColumnsMap.size + 1}>
+  <div class="group-header">
     <CellBackground color="var(--sand-200)" />
     <div class="groups-data">
       {#each columnIds as columnId, index (columnId)}
@@ -60,7 +55,6 @@
 <style lang="scss">
   .group-header {
     padding: 0.5rem 1.5rem;
-    z-index: var(--z-index__sheet__group-header);
 
     .groups-data {
       align-items: start;
diff --git a/mathesar_ui/src/systems/table-view/row/NewRecordMessage.svelte b/mathesar_ui/src/systems/table-view/row/NewRecordMessage.svelte
index 88782f52dd..cb73fbe93f 100644
--- a/mathesar_ui/src/systems/table-view/row/NewRecordMessage.svelte
+++ b/mathesar_ui/src/systems/table-view/row/NewRecordMessage.svelte
@@ -3,27 +3,19 @@
   import { SheetPositionableCell } from '@mathesar/components/sheet';
 
   export let columnCount: number;
+
+  // Adding once since the index is starting from 0
+  $: columnSpan = columnCount + 1;
 </script>
 
-<SheetPositionableCell
-  index={0}
-  columnSpan={// Adding once since the index is starting from 0
-  columnCount + 1}
-  let:htmlAttributes
-  let:style
->
-  <div
-    class="new-record-message"
-    {...htmlAttributes}
-    style="{style};min-width:400px;"
-  >
+<SheetPositionableCell index={0} {columnSpan}>
+  <div class="new-record-message">
     {$_('new_records_reposition_refresh')}
   </div>
 </SheetPositionableCell>
 
-<style lang="scss">
+<style>
   .new-record-message {
-    z-index: var(--z-index__sheet__new-record-message, auto);
     background: var(--sky-200);
     display: flex;
     align-items: center;
diff --git a/mathesar_ui/src/systems/table-view/row/Row.svelte b/mathesar_ui/src/systems/table-view/row/Row.svelte
index 6ff3003f80..0e08c59f76 100644
--- a/mathesar_ui/src/systems/table-view/row/Row.svelte
+++ b/mathesar_ui/src/systems/table-view/row/Row.svelte
@@ -54,20 +54,6 @@
     //   selection.selectAndActivateFirstDataEntryCellInLastRow();
     // }
   }
-
-  const handleRowMouseDown = () => {
-    // // TODO_3037
-    // if (rowHasRecord(row) && !isPlaceholderRow(row)) {
-    //   selection.onRowSelectionStart(row);
-    // }
-  };
-
-  const handleRowMouseEnter = () => {
-    // // TODO_3037
-    // if (rowHasRecord(row) && !isPlaceholderRow(row)) {
-    //   selection.onMouseEnterRowHeaderWhileSelection(row);
-    // }
-  };
 </script>
 
 <SheetRow {style} let:htmlAttributes let:styleString>
@@ -85,32 +71,22 @@
     on:mousedown={checkAndCreateEmptyRow}
   >
     <SheetCell
+      type="row-header-cell"
       columnIdentifierKey={ID_ROW_CONTROL_COLUMN}
-      isStatic
-      isControlCell
-      let:htmlAttributes={cellHtmlAttr}
-      let:style={sheetCellStyle}
     >
-      <div
-        {...cellHtmlAttr}
-        style={sheetCellStyle}
-        on:mousedown={handleRowMouseDown}
-        on:mouseenter={handleRowMouseEnter}
-      >
-        {#if rowHasRecord(row)}
-          <RowControl
-            {primaryKeyColumnId}
-            {row}
-            {meta}
-            {recordsData}
-            {isSelected}
-            hasErrors={hasAnyErrors}
-          />
-          <ContextMenu>
-            <RowContextOptions recordPk={rowKey} {recordsData} {row} />
-          </ContextMenu>
-        {/if}
-      </div>
+      {#if rowHasRecord(row)}
+        <RowControl
+          {primaryKeyColumnId}
+          {row}
+          {meta}
+          {recordsData}
+          {isSelected}
+          hasErrors={hasAnyErrors}
+        />
+        <ContextMenu>
+          <RowContextOptions recordPk={rowKey} {recordsData} {row} />
+        </ContextMenu>
+      {/if}
     </SheetCell>
 
     {#if isHelpTextRow(row)}
@@ -159,7 +135,7 @@
       cursor: pointer;
 
       :global(
-          [data-sheet-element='cell']:not(.is-active)
+          [data-sheet-element='data-cell']:not(.is-active)
             .cell-fabric
             .cell-wrapper
             > *
diff --git a/mathesar_ui/src/systems/table-view/row/RowCell.svelte b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
index 0316d7d465..7fbea0c0f7 100644
--- a/mathesar_ui/src/systems/table-view/row/RowCell.svelte
+++ b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
@@ -98,104 +98,77 @@
   }
 </script>
 
-<SheetCell columnIdentifierKey={column.id} let:htmlAttributes let:style>
-  <div
-    class="cell editable-cell"
-    class:error={hasError}
-    class:modified={modificationStatus?.state === 'success'}
-    class:is-active={isActive}
-    class:is-processing={isProcessing}
-    class:is-pk={column.primary_key}
-    class:is-selected={isSelected}
-    {...htmlAttributes}
-    {style}
-  >
-    <CellBackground when={hasError} color="var(--cell-bg-color-error)" />
-    <CellBackground when={!isEditable} color="var(--cell-bg-color-disabled)" />
-    {#if !(isEditable && isActive)}
-      <!--
-      We hide these backgrounds when the cell is editable and active because a
-      white background better communicates that the user can edit the active
-      cell.
-    -->
-      <RowCellBackgrounds hasErrors={rowHasErrors} />
-    {/if}
+<SheetCell
+  type="data-cell"
+  columnIdentifierKey={column.id}
+  {isActive}
+  lightText={hasError || isProcessing}
+>
+  <CellBackground when={hasError} color="var(--cell-bg-color-error)" />
+  <CellBackground when={!isEditable} color="var(--cell-bg-color-disabled)" />
+  {#if !(isEditable && isActive)}
+    <!--
+    We hide these backgrounds when the cell is editable and active because a
+    white background better communicates that the user can edit the active
+    cell.
+  -->
+    <RowCellBackgrounds hasErrors={rowHasErrors} />
+  {/if}
 
-    <CellFabric
-      columnFabric={processedColumn}
-      {isActive}
-      {isSelected}
-      {value}
-      {isProcessing}
-      {canViewLinkedEntities}
-      recordSummary={$recordSummaries
-        .get(String(column.id))
-        ?.get(String(value))}
-      setRecordSummary={(recordId, recordSummary) =>
-        recordSummaries.addBespokeRecordSummary({
-          columnId: String(columnId),
-          recordId,
-          recordSummary,
-        })}
-      showAsSkeleton={$recordsDataState === States.Loading}
-      disabled={!isEditable}
-      on:movementKeyDown={({ detail }) =>
-        handleKeyboardEventOnCell(detail.originalEvent, selection)}
-      on:update={valueUpdated}
-      horizontalAlignment={column.primary_key ? 'left' : undefined}
-    />
-    <ContextMenu>
-      {#if canEditTableRecords || showLinkedRecordHyperLink}
-        <MenuHeading>{$_('cell')}</MenuHeading>
-        {#if canEditTableRecords}
-          <ButtonMenuItem
-            icon={iconSetToNull}
-            disabled={!canSetNull}
-            on:click={() => setValue(null)}
-          >
-            {$_('set_to')}
-            <Null />
-          </ButtonMenuItem>
-        {/if}
-        {#if showLinkedRecordHyperLink && linkedRecordHref}
-          <LinkMenuItem icon={iconLinkToRecordPage} href={linkedRecordHref}>
-            {$_('go_to_linked_record')}
-          </LinkMenuItem>
-        {/if}
-        <MenuDivider />
+  <CellFabric
+    columnFabric={processedColumn}
+    {isActive}
+    {isSelected}
+    {value}
+    {isProcessing}
+    {canViewLinkedEntities}
+    recordSummary={$recordSummaries.get(String(column.id))?.get(String(value))}
+    setRecordSummary={(recordId, recordSummary) =>
+      recordSummaries.addBespokeRecordSummary({
+        columnId: String(columnId),
+        recordId,
+        recordSummary,
+      })}
+    showAsSkeleton={$recordsDataState === States.Loading}
+    disabled={!isEditable}
+    on:movementKeyDown={({ detail }) =>
+      handleKeyboardEventOnCell(detail.originalEvent, selection)}
+    on:update={valueUpdated}
+    horizontalAlignment={column.primary_key ? 'left' : undefined}
+  />
+  <ContextMenu>
+    {#if canEditTableRecords || showLinkedRecordHyperLink}
+      <MenuHeading>{$_('cell')}</MenuHeading>
+      {#if canEditTableRecords}
+        <ButtonMenuItem
+          icon={iconSetToNull}
+          disabled={!canSetNull}
+          on:click={() => setValue(null)}
+        >
+          {$_('set_to')}
+          <Null />
+        </ButtonMenuItem>
+      {/if}
+      {#if showLinkedRecordHyperLink && linkedRecordHref}
+        <LinkMenuItem icon={iconLinkToRecordPage} href={linkedRecordHref}>
+          {$_('go_to_linked_record')}
+        </LinkMenuItem>
       {/if}
+      <MenuDivider />
+    {/if}
 
-      <!-- Column Attributes -->
-      <MenuHeading>{$_('column')}</MenuHeading>
-      <ColumnHeaderContextMenu {processedColumn} />
+    <!-- Column Attributes -->
+    <MenuHeading>{$_('column')}</MenuHeading>
+    <ColumnHeaderContextMenu {processedColumn} />
 
-      <!-- Row -->
-      {#if canEditTableRecords || showLinkedRecordHyperLink}
-        <MenuDivider />
-        <MenuHeading>{$_('row')}</MenuHeading>
-        <RowContextOptions recordPk={rowKey} {recordsData} {row} />
-      {/if}
-    </ContextMenu>
-    {#if errors.length}
-      <CellErrors {errors} forceShowErrors={isActive} />
+    <!-- Row -->
+    {#if canEditTableRecords || showLinkedRecordHyperLink}
+      <MenuDivider />
+      <MenuHeading>{$_('row')}</MenuHeading>
+      <RowContextOptions recordPk={rowKey} {recordsData} {row} />
     {/if}
-  </div>
+  </ContextMenu>
+  {#if errors.length}
+    <CellErrors {errors} forceShowErrors={isActive} />
+  {/if}
 </SheetCell>
-
-<style lang="scss">
-  .editable-cell.cell {
-    user-select: none;
-    -webkit-user-select: none; /* Safari */
-    background: var(--cell-bg-color-base);
-    &.is-active {
-      z-index: var(--z-index__sheet__active-cell);
-      border-color: transparent;
-      min-height: 100%;
-      height: auto !important;
-    }
-    &.error,
-    &.is-processing {
-      color: var(--cell-text-color-processing);
-    }
-  }
-</style>

From 44dd519b5815e96ecfe774b86f9a8c4354cf2143 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 7 Feb 2024 09:05:21 -0500
Subject: [PATCH 0026/1141] Use dedicated components for sheet cell types

---
 .../components/cell-fabric/CellFabric.svelte  |   5 +
 mathesar_ui/src/components/sheet/README.md    |  25 +++--
 .../src/components/sheet/SheetCell.svelte     | 104 ------------------
 .../cells/SheetColumnCreationCell.svelte      |  29 +++++
 .../sheet/cells/SheetColumnHeaderCell.svelte  |  35 ++++++
 .../sheet/cells/SheetDataCell.svelte          |  45 ++++++++
 .../sheet/cells/SheetOriginCell.svelte        |  23 ++++
 .../{ => cells}/SheetPositionableCell.svelte  |   4 +-
 .../sheet/cells/SheetRowHeaderCell.svelte     |  34 ++++++
 .../src/components/sheet/cells/index.ts       |   6 +
 .../components/sheet/cells/sheetCellUtils.ts  |  13 +++
 mathesar_ui/src/components/sheet/index.ts     |   4 +-
 .../components/sheet/sheetScrollingUtils.ts   |  12 +-
 mathesar_ui/src/components/sheet/types.ts     |  39 -------
 .../import/preview/ImportPreviewSheet.svelte  |  11 +-
 .../result-pane/ResultHeaderCell.svelte       |  18 +--
 .../result-pane/ResultRowCell.svelte          |  10 +-
 .../data-explorer/result-pane/Results.svelte  |  18 ++-
 .../systems/table-view/header/Header.svelte   |  22 ++--
 .../src/systems/table-view/row/Row.svelte     |   9 +-
 .../src/systems/table-view/row/RowCell.svelte |  10 +-
 21 files changed, 262 insertions(+), 214 deletions(-)
 delete mode 100644 mathesar_ui/src/components/sheet/SheetCell.svelte
 create mode 100644 mathesar_ui/src/components/sheet/cells/SheetColumnCreationCell.svelte
 create mode 100644 mathesar_ui/src/components/sheet/cells/SheetColumnHeaderCell.svelte
 create mode 100644 mathesar_ui/src/components/sheet/cells/SheetDataCell.svelte
 create mode 100644 mathesar_ui/src/components/sheet/cells/SheetOriginCell.svelte
 rename mathesar_ui/src/components/sheet/{ => cells}/SheetPositionableCell.svelte (90%)
 create mode 100644 mathesar_ui/src/components/sheet/cells/SheetRowHeaderCell.svelte
 create mode 100644 mathesar_ui/src/components/sheet/cells/index.ts
 create mode 100644 mathesar_ui/src/components/sheet/cells/sheetCellUtils.ts

diff --git a/mathesar_ui/src/components/cell-fabric/CellFabric.svelte b/mathesar_ui/src/components/cell-fabric/CellFabric.svelte
index a5b8a90e60..70f52b80ab 100644
--- a/mathesar_ui/src/components/cell-fabric/CellFabric.svelte
+++ b/mathesar_ui/src/components/cell-fabric/CellFabric.svelte
@@ -23,6 +23,7 @@
   export let isIndependentOfSheet = false;
   export let showTruncationPopover = false;
   export let canViewLinkedEntities = true;
+  export let lightText = false;
 
   $: ({ cellComponentAndProps } = columnFabric);
   $: ({ component } = cellComponentAndProps);
@@ -34,6 +35,7 @@
   data-column-identifier={columnFabric.id}
   class:show-as-skeleton={showAsSkeleton}
   class:is-independent={isIndependentOfSheet}
+  class:light-text={lightText}
 >
   <svelte:component
     this={component}
@@ -98,4 +100,7 @@
   .cell-fabric:not(.show-as-skeleton) .loader {
     display: none;
   }
+  .light-text {
+    color: var(--cell-text-color-processing);
+  }
 </style>
diff --git a/mathesar_ui/src/components/sheet/README.md b/mathesar_ui/src/components/sheet/README.md
index 711552011a..ec8340cbe1 100644
--- a/mathesar_ui/src/components/sheet/README.md
+++ b/mathesar_ui/src/components/sheet/README.md
@@ -1,9 +1,16 @@
-This is a placeholder directory for the Sheet component which is meant to be implemented for use with Tables, Views and Data Explorer.
-
-- This would be a lower-order component.
-- It would encapsulate:
-  - Rows
-  - Cells
-- It will _not_ include column headers.
-- It would be a pure component and will _not_ hardcode requests from within the component.
-  - They would be made on the parent components utilizing the Sheet component using callbacks, events and/or by exposing a Sheet API through slot.
+# Sheet
+
+The Sheet components help us display things in a spreadsheet-like format for the table page and the data explorer.
+
+## `data-sheet-element` values
+
+We use the `data-sheet-element` HTML attribute for CSS styling and JS functionality. The values are:
+
+- `header-row`: The top most row of the sheet. It contains the column header cells.
+- `data-row`: Used for the remaining rows, including (for now) non-standard ones like grouping headers which don't contain data.
+- `positionable-cell`: Cells that span multiple columns or are taken out of regular flow e.g. "New records" message, grouping headers, etc.
+- `origin-cell`: The cell in the top-left corner of the sheet.
+- `column-header-cell`: Contains the column names.
+- `new-column-cell`: Contains the `+` button for adding a new column.
+- `row-header-cell`: Contains the row numbers.
+- `data-cell`: Regular data cells.
diff --git a/mathesar_ui/src/components/sheet/SheetCell.svelte b/mathesar_ui/src/components/sheet/SheetCell.svelte
deleted file mode 100644
index 9c9ad390b8..0000000000
--- a/mathesar_ui/src/components/sheet/SheetCell.svelte
+++ /dev/null
@@ -1,104 +0,0 @@
-<script lang="ts">
-  import type { SheetCellType } from './types';
-  import { getSheetContext } from './utils';
-
-  type SheetColumnIdentifierKey = $$Generic;
-
-  const { stores } = getSheetContext();
-  const { columnStyleMap } = stores;
-
-  export let type: SheetCellType;
-  export let columnIdentifierKey: SheetColumnIdentifierKey;
-  export let isActive = false;
-  export let isSelected = false;
-  export let lightText = false;
-
-  $: styleMap = $columnStyleMap.get(columnIdentifierKey);
-</script>
-
-<div
-  class="sheet-cell"
-  data-sheet-element={type}
-  style={styleMap?.styleString}
-  class:is-active={isActive}
-  class:is-selected={isSelected}
-  class:light-text={lightText}
->
-  <slot />
-</div>
-
-<style lang="scss">
-  .sheet-cell {
-    &[data-sheet-element='origin-cell'],
-    &[data-sheet-element='column-header-cell'],
-    &[data-sheet-element='new-column-cell'],
-    &[data-sheet-element='row-header-cell'],
-    &[data-sheet-element='data-cell'] {
-      position: absolute;
-      display: flex;
-      align-items: center;
-      border-bottom: var(--cell-border-horizontal);
-      border-right: var(--cell-border-vertical);
-      left: 0;
-      top: 0;
-      height: 100%;
-    }
-
-    &[data-sheet-element='column-header-cell'],
-    &[data-sheet-element='origin-cell'],
-    &[data-sheet-element='new-column-cell'] {
-      border-bottom: none;
-      background: var(--slate-100);
-      font-size: var(--text-size-small);
-      font-weight: 500;
-      overflow: hidden;
-    }
-
-    &[data-sheet-element='origin-cell'] {
-      position: sticky;
-      z-index: var(--z-index__sheet__origin-cell);
-    }
-
-    &[data-sheet-element='column-header-cell'] {
-      z-index: var(--z-index__sheet__column-header-cell);
-    }
-
-    &[data-sheet-element='positionable-cell'] {
-      z-index: var(--z-index__sheet__positionable-cell);
-    }
-
-    &[data-sheet-element='row-header-cell'] {
-      position: sticky;
-      z-index: var(--z-index__sheet__row-header-cell);
-      font-size: var(--text-size-x-small);
-      padding: 0 1.5rem;
-      justify-content: center;
-      color: var(--color-text-muted);
-      display: inline-flex;
-      align-items: center;
-      height: 100%;
-    }
-
-    &.is-active {
-      z-index: var(--z-index__sheet__active-cell);
-      border-color: transparent;
-      min-height: 100%;
-      /* TODO: why do we need !important here? Please remove or document */
-      height: auto !important;
-    }
-
-    &.light-text {
-      color: var(--cell-text-color-processing);
-    }
-
-    &[data-sheet-element='data-cell'] {
-      user-select: none;
-      -webkit-user-select: none; /* Safari */
-      background: var(--cell-bg-color-base);
-    }
-
-    &[data-sheet-element='new-column-cell'] {
-      padding: 0 0.2rem;
-    }
-  }
-</style>
diff --git a/mathesar_ui/src/components/sheet/cells/SheetColumnCreationCell.svelte b/mathesar_ui/src/components/sheet/cells/SheetColumnCreationCell.svelte
new file mode 100644
index 0000000000..482f2bf5f0
--- /dev/null
+++ b/mathesar_ui/src/components/sheet/cells/SheetColumnCreationCell.svelte
@@ -0,0 +1,29 @@
+<script lang="ts">
+  import { ID_ADD_NEW_COLUMN } from '@mathesar/stores/table-data';
+  import { getSheetCellStyle } from './sheetCellUtils';
+
+  const style = getSheetCellStyle(ID_ADD_NEW_COLUMN);
+</script>
+
+<div data-sheet-element="new-column-cell" style={$style}>
+  <slot />
+</div>
+
+<style>
+  [data-sheet-element='new-column-cell'] {
+    position: absolute;
+    display: flex;
+    align-items: center;
+    border-bottom: var(--cell-border-horizontal);
+    border-right: var(--cell-border-vertical);
+    left: 0;
+    top: 0;
+    height: 100%;
+    border-bottom: none;
+    background: var(--slate-100);
+    font-size: var(--text-size-small);
+    font-weight: 500;
+    overflow: hidden;
+    padding: 0 0.2rem;
+  }
+</style>
diff --git a/mathesar_ui/src/components/sheet/cells/SheetColumnHeaderCell.svelte b/mathesar_ui/src/components/sheet/cells/SheetColumnHeaderCell.svelte
new file mode 100644
index 0000000000..0feba78d76
--- /dev/null
+++ b/mathesar_ui/src/components/sheet/cells/SheetColumnHeaderCell.svelte
@@ -0,0 +1,35 @@
+<script lang="ts">
+  import { getSheetCellStyle } from './sheetCellUtils';
+
+  type SheetColumnIdentifierKey = $$Generic;
+
+  export let columnIdentifierKey: SheetColumnIdentifierKey;
+
+  const style = getSheetCellStyle(columnIdentifierKey);
+</script>
+
+<div
+  data-sheet-element="column-header-cell"
+  data-column-identifier={columnIdentifierKey}
+  style={$style}
+>
+  <slot />
+</div>
+
+<style>
+  [data-sheet-element='column-header-cell'] {
+    position: absolute;
+    z-index: var(--z-index__sheet__column-header-cell);
+    display: flex;
+    align-items: center;
+    left: 0;
+    top: 0;
+    height: 100%;
+    border-right: var(--cell-border-vertical);
+    border-bottom: none;
+    background: var(--slate-100);
+    font-size: var(--text-size-small);
+    font-weight: 500;
+    overflow: hidden;
+  }
+</style>
diff --git a/mathesar_ui/src/components/sheet/cells/SheetDataCell.svelte b/mathesar_ui/src/components/sheet/cells/SheetDataCell.svelte
new file mode 100644
index 0000000000..93feef613d
--- /dev/null
+++ b/mathesar_ui/src/components/sheet/cells/SheetDataCell.svelte
@@ -0,0 +1,45 @@
+<script lang="ts">
+  import { getSheetCellStyle } from './sheetCellUtils';
+
+  type SheetColumnIdentifierKey = $$Generic;
+
+  export let columnIdentifierKey: SheetColumnIdentifierKey;
+  export let cellSelectionId: string | undefined = undefined;
+  export let isActive = false;
+  export let isSelected = false;
+
+  $: style = getSheetCellStyle(columnIdentifierKey);
+</script>
+
+<div
+  data-sheet-element="data-cell"
+  data-cell-selection-id={cellSelectionId}
+  data-cell-active={isActive ? '' : undefined}
+  data-cell-selected={isSelected ? '' : undefined}
+  style={$style}
+>
+  <slot />
+</div>
+
+<style>
+  [data-sheet-element='data-cell'] {
+    position: absolute;
+    display: flex;
+    align-items: center;
+    border-bottom: var(--cell-border-horizontal);
+    border-right: var(--cell-border-vertical);
+    left: 0;
+    top: 0;
+    height: 100%;
+    user-select: none;
+    -webkit-user-select: none; /* Safari */
+    background: var(--cell-bg-color-base);
+  }
+
+  [data-cell-active] {
+    z-index: var(--z-index__sheet__active-cell);
+    border-color: transparent;
+    min-height: 100%;
+    height: auto;
+  }
+</style>
diff --git a/mathesar_ui/src/components/sheet/cells/SheetOriginCell.svelte b/mathesar_ui/src/components/sheet/cells/SheetOriginCell.svelte
new file mode 100644
index 0000000000..8f1096d02d
--- /dev/null
+++ b/mathesar_ui/src/components/sheet/cells/SheetOriginCell.svelte
@@ -0,0 +1,23 @@
+<script lang="ts">
+  import { ID_ROW_CONTROL_COLUMN } from '@mathesar/stores/table-data';
+  import { getSheetCellStyle } from './sheetCellUtils';
+
+  const style = getSheetCellStyle(ID_ROW_CONTROL_COLUMN);
+</script>
+
+<div data-sheet-element="origin-cell" style={$style}>
+  <slot />
+</div>
+
+<style>
+  [data-sheet-element='origin-cell'] {
+    position: sticky;
+    left: 0;
+    top: 0;
+    z-index: var(--z-index__sheet__origin-cell);
+    height: 100%;
+    border-right: var(--cell-border-vertical);
+    border-bottom: none;
+    background: var(--slate-100);
+  }
+</style>
diff --git a/mathesar_ui/src/components/sheet/SheetPositionableCell.svelte b/mathesar_ui/src/components/sheet/cells/SheetPositionableCell.svelte
similarity index 90%
rename from mathesar_ui/src/components/sheet/SheetPositionableCell.svelte
rename to mathesar_ui/src/components/sheet/cells/SheetPositionableCell.svelte
index 8c731acda8..27b7806069 100644
--- a/mathesar_ui/src/components/sheet/SheetPositionableCell.svelte
+++ b/mathesar_ui/src/components/sheet/cells/SheetPositionableCell.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import { getSheetContext } from './utils';
-  import type { ColumnPosition } from './utils';
+  import { getSheetContext } from '../utils';
+  import type { ColumnPosition } from '../utils';
 
   const { stores } = getSheetContext();
   const { columnStyleMap } = stores;
diff --git a/mathesar_ui/src/components/sheet/cells/SheetRowHeaderCell.svelte b/mathesar_ui/src/components/sheet/cells/SheetRowHeaderCell.svelte
new file mode 100644
index 0000000000..b0df3b2a0a
--- /dev/null
+++ b/mathesar_ui/src/components/sheet/cells/SheetRowHeaderCell.svelte
@@ -0,0 +1,34 @@
+<script lang="ts">
+  import { ID_ROW_CONTROL_COLUMN } from '@mathesar/stores/table-data';
+  import { getSheetCellStyle } from './sheetCellUtils';
+
+  const style = getSheetCellStyle(ID_ROW_CONTROL_COLUMN);
+
+  export let rowSelectionId: string;
+</script>
+
+<div
+  data-sheet-element="row-header-cell"
+  data-row-selection-id={rowSelectionId}
+  style={$style}
+>
+  <slot />
+</div>
+
+<style lang="scss">
+  [data-sheet-element='row-header-cell'] {
+    position: sticky;
+    left: 0;
+    top: 0;
+    z-index: var(--z-index__sheet__row-header-cell);
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-bottom: var(--cell-border-horizontal);
+    border-right: var(--cell-border-vertical);
+    font-size: var(--text-size-x-small);
+    padding: 0 1.5rem;
+    color: var(--color-text-muted);
+  }
+</style>
diff --git a/mathesar_ui/src/components/sheet/cells/index.ts b/mathesar_ui/src/components/sheet/cells/index.ts
new file mode 100644
index 0000000000..4dc087562c
--- /dev/null
+++ b/mathesar_ui/src/components/sheet/cells/index.ts
@@ -0,0 +1,6 @@
+export { default as SheetColumnHeaderCell } from './SheetColumnHeaderCell.svelte';
+export { default as SheetDataCell } from './SheetDataCell.svelte';
+export { default as SheetColumnCreationCell } from './SheetColumnCreationCell.svelte';
+export { default as SheetOriginCell } from './SheetOriginCell.svelte';
+export { default as SheetPositionableCell } from './SheetPositionableCell.svelte';
+export { default as SheetRowHeaderCell } from './SheetRowHeaderCell.svelte';
diff --git a/mathesar_ui/src/components/sheet/cells/sheetCellUtils.ts b/mathesar_ui/src/components/sheet/cells/sheetCellUtils.ts
new file mode 100644
index 0000000000..c1312a0adc
--- /dev/null
+++ b/mathesar_ui/src/components/sheet/cells/sheetCellUtils.ts
@@ -0,0 +1,13 @@
+import { derived, type Readable } from 'svelte/store';
+import { getSheetContext } from '../utils';
+
+export function getSheetCellStyle<ColumnIdentifierKey>(
+  columnIdentifierKey: ColumnIdentifierKey,
+): Readable<string | undefined> {
+  const { stores } = getSheetContext();
+  const { columnStyleMap } = stores;
+  return derived(columnStyleMap, (map) => {
+    const columnPosition = map.get(columnIdentifierKey);
+    return columnPosition?.styleString;
+  });
+}
diff --git a/mathesar_ui/src/components/sheet/index.ts b/mathesar_ui/src/components/sheet/index.ts
index b0a1df34f4..e541c3f139 100644
--- a/mathesar_ui/src/components/sheet/index.ts
+++ b/mathesar_ui/src/components/sheet/index.ts
@@ -1,7 +1,5 @@
 export { default as Sheet } from './Sheet.svelte';
 export { default as SheetHeader } from './SheetHeader.svelte';
-export { default as SheetCell } from './SheetCell.svelte';
-export { default as SheetPositionableCell } from './SheetPositionableCell.svelte';
 export { default as SheetCellResizer } from './SheetCellResizer.svelte';
 export { default as SheetVirtualRows } from './SheetVirtualRows.svelte';
 export { default as SheetRow } from './SheetRow.svelte';
@@ -9,3 +7,5 @@ export {
   scrollBasedOnActiveCell,
   scrollBasedOnSelection,
 } from './sheetScrollingUtils';
+
+export * from './cells';
diff --git a/mathesar_ui/src/components/sheet/sheetScrollingUtils.ts b/mathesar_ui/src/components/sheet/sheetScrollingUtils.ts
index 16bede15b2..b59cbc2bdf 100644
--- a/mathesar_ui/src/components/sheet/sheetScrollingUtils.ts
+++ b/mathesar_ui/src/components/sheet/sheetScrollingUtils.ts
@@ -37,17 +37,13 @@ function scrollToElement(htmlElement: HTMLElement | null): void {
 }
 
 export function scrollBasedOnActiveCell(): void {
-  const activeCell: HTMLElement | null = document.querySelector(
-    '[data-sheet-element="data-cell"].is-active',
-  );
-  scrollToElement(activeCell);
+  const cell = document.querySelector<HTMLElement>('[data-cell-active]');
+  scrollToElement(cell);
 }
 
 export function scrollBasedOnSelection(): void {
-  const selectedCell: HTMLElement | null = document.querySelector(
-    '[data-sheet-element="data-cell"].is-selected',
-  );
-  scrollToElement(selectedCell);
+  const cell = document.querySelector<HTMLElement>('[data-cell-selected]');
+  scrollToElement(cell);
 }
 
 export async function autoScroll() {
diff --git a/mathesar_ui/src/components/sheet/types.ts b/mathesar_ui/src/components/sheet/types.ts
index bbc97588a2..b69d3b24d3 100644
--- a/mathesar_ui/src/components/sheet/types.ts
+++ b/mathesar_ui/src/components/sheet/types.ts
@@ -4,42 +4,3 @@ export interface SheetVirtualRowsApi {
   scrollToPosition: (vScrollOffset: number, hScrollOffset: number) => void;
   recalculateHeightsAfterIndex: (index: number) => void;
 }
-
-/**
- * These are the different kinds of cells that we can have within a sheet.
- *
- * - `origin-cell`: The cell in the top-left corner of the sheet.
- *
- * - `column-header-cell`: Contains the column names.
- *
- * - `new-column-cell`: Contains the `+` button for adding a new column.
- *
- * - `row-header-cell`: Contains the row numbers.
- *
- * - `data-cell`: Regular data cells.
- */
-export type SheetCellType =
-  | 'origin-cell'
-  | 'column-header-cell'
-  | 'new-column-cell'
-  | 'row-header-cell'
-  | 'data-cell';
-
-/**
- * These are values used for the `data-sheet-element` attribute on the sheet
- * elements.
- *
- * - `header-row`: The top most row of the sheet. It contains the column header
- *   cells.
- *
- * - `data-row`: Used for the remaining rows, including (for now) weird ones
- *   like grouping headers and such.
- *
- * - `positionable-cell`: Cells that span multiple columns or are taken out of
- *   regular flow e.g. "New records" message, grouping headers, etc.
- */
-export type SheetElement =
-  | 'header-row'
-  | 'data-row'
-  | 'positionable-cell'
-  | SheetCellType;
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewSheet.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewSheet.svelte
index 3ffd200dad..a775f29ab2 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewSheet.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewSheet.svelte
@@ -3,8 +3,9 @@
   import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
   import {
     Sheet,
-    SheetCell,
     SheetCellResizer,
+    SheetColumnHeaderCell,
+    SheetDataCell,
     SheetHeader,
     SheetRow,
   } from '@mathesar/components/sheet';
@@ -25,7 +26,7 @@
   <Sheet restrictWidthToRowWidth {columns} getColumnIdentifier={(c) => c.id}>
     <SheetHeader inheritFontStyle>
       {#each columns as column (column.id)}
-        <SheetCell type="column-header-cell" columnIdentifierKey={column.id}>
+        <SheetColumnHeaderCell columnIdentifierKey={column.id}>
           <PreviewColumn
             {isLoading}
             processedColumn={column}
@@ -37,7 +38,7 @@
             columnIdentifierKey={column.id}
             minColumnWidth={120}
           />
-        </SheetCell>
+        </SheetColumnHeaderCell>
       {/each}
     </SheetHeader>
     {#each records as record (record)}
@@ -48,14 +49,14 @@
       >
         <div {...htmlAttributes} style={styleString}>
           {#each columns as column (column)}
-            <SheetCell type="data-cell" columnIdentifierKey={column.id}>
+            <SheetDataCell columnIdentifierKey={column.id}>
               <CellFabric
                 columnFabric={column}
                 value={record[column.column.name]}
                 showAsSkeleton={isLoading}
                 disabled={true}
               />
-            </SheetCell>
+            </SheetDataCell>
           {/each}
         </div>
       </SheetRow>
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/ResultHeaderCell.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/ResultHeaderCell.svelte
index edc9ccbfc0..ba9855e119 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/ResultHeaderCell.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/ResultHeaderCell.svelte
@@ -1,6 +1,9 @@
 <script lang="ts">
   import { Button } from '@mathesar-component-library';
-  import { SheetCell, SheetCellResizer } from '@mathesar/components/sheet';
+  import {
+    SheetColumnHeaderCell,
+    SheetCellResizer,
+  } from '@mathesar/components/sheet';
   import ColumnName from '@mathesar/components/column/ColumnName.svelte';
   import type { ProcessedQueryOutputColumn } from '../utils';
   import type QueryRunner from '../QueryRunner';
@@ -14,10 +17,7 @@
   $: columnRunState = $runState?.state;
 </script>
 
-<SheetCell
-  type="column-header-cell"
-  columnIdentifierKey={processedQueryColumn.id}
->
+<SheetColumnHeaderCell columnIdentifierKey={processedQueryColumn.id}>
   <Button
     appearance="plain"
     class="column-name-wrapper {isSelected ? 'selected' : ''}"
@@ -25,8 +25,10 @@
       queryRunner.selectColumn(processedQueryColumn.column.alias);
     }}
   >
-    <!--TODO: Use a separate prop to identify column that isn't fetched yet
-                    instead of type:unknown-->
+    <!--
+      TODO: Use a separate prop to identify column that isn't fetched yet
+      instead of type:unknown
+    -->
     <ColumnName
       isLoading={columnRunState === 'processing' &&
         processedQueryColumn.column.type === 'unknown'}
@@ -39,4 +41,4 @@
     />
   </Button>
   <SheetCellResizer columnIdentifierKey={processedQueryColumn.id} />
-</SheetCell>
+</SheetColumnHeaderCell>
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
index eda7fda532..502c388eee 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
@@ -3,7 +3,7 @@
 
   import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
   import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
-  import { SheetCell } from '@mathesar/components/sheet';
+  import { SheetDataCell } from '@mathesar/components/sheet';
   import { makeCellId } from '@mathesar/components/sheet/cellIds';
   import type SheetSelection from '@mathesar/components/sheet/selection/SheetSelection';
   import { handleKeyboardEventOnCell } from '@mathesar/components/sheet/sheetKeyboardUtils';
@@ -19,7 +19,11 @@
   $: isActive = cellId === $selection.activeCellId;
 </script>
 
-<SheetCell type="data-cell" columnIdentifierKey={column.id} {isActive}>
+<SheetDataCell
+  columnIdentifierKey={column.id}
+  cellSelectionId={cellId}
+  {isActive}
+>
   {#if row || recordRunState === 'processing'}
     <CellFabric
       {isActive}
@@ -32,4 +36,4 @@
         handleKeyboardEventOnCell(detail.originalEvent, selection)}
     />
   {/if}
-</SheetCell>
+</SheetDataCell>
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
index 1a6c80302e..bb5c7b3d9a 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
@@ -1,15 +1,17 @@
 <script lang="ts">
-  import { get } from 'svelte/store';
   import { _ } from 'svelte-i18n';
+  import { get } from 'svelte/store';
+
   import { ImmutableMap, ImmutableSet } from '@mathesar-component-library';
   import CellBackground from '@mathesar/components/CellBackground.svelte';
   import PaginationGroup from '@mathesar/components/PaginationGroup.svelte';
   import {
     Sheet,
-    SheetCell,
     SheetHeader,
+    SheetRowHeaderCell,
     SheetRow,
     SheetVirtualRows,
+    SheetOriginCell,
   } from '@mathesar/components/sheet';
   import { SheetClipboardHandler } from '@mathesar/components/sheet/SheetClipboardHandler';
   import { rowHeaderWidthPx, rowHeightPx } from '@mathesar/geometry';
@@ -85,10 +87,7 @@
       usesVirtualList
     >
       <SheetHeader>
-        <SheetCell
-          type="origin-cell"
-          columnIdentifierKey={ID_ROW_CONTROL_COLUMN}
-        />
+        <SheetOriginCell />
         {#each columnList as processedQueryColumn (processedQueryColumn.id)}
           <ResultHeaderCell
             {processedQueryColumn}
@@ -111,13 +110,10 @@
                 {...htmlAttributes}
                 style="--cell-height:{rowHeightPx - 1}px;{styleString}"
               >
-                <SheetCell
-                  type="row-header-cell"
-                  columnIdentifierKey={ID_ROW_CONTROL_COLUMN}
-                >
+                <SheetRowHeaderCell rowSelectionId={'TODO_3037'}>
                   <CellBackground color="var(--cell-bg-color-header)" />
                   {$pagination.offset + item.index + 1}
-                </SheetCell>
+                </SheetRowHeaderCell>
 
                 {#each columnList as processedQueryColumn (processedQueryColumn.id)}
                   <ResultRowCell
diff --git a/mathesar_ui/src/systems/table-view/header/Header.svelte b/mathesar_ui/src/systems/table-view/header/Header.svelte
index 0dd73689d9..df3c19d110 100644
--- a/mathesar_ui/src/systems/table-view/header/Header.svelte
+++ b/mathesar_ui/src/systems/table-view/header/Header.svelte
@@ -4,16 +4,14 @@
   import type { TableEntry } from '@mathesar/api/types/tables';
   import { ContextMenu } from '@mathesar/component-library';
   import {
-    SheetCell,
     SheetCellResizer,
+    SheetColumnHeaderCell,
     SheetHeader,
+    SheetColumnCreationCell,
   } from '@mathesar/components/sheet';
+  import SheetOriginCell from '@mathesar/components/sheet/cells/SheetOriginCell.svelte';
   import type { ProcessedColumn } from '@mathesar/stores/table-data';
-  import {
-    getTabularDataStoreFromContext,
-    ID_ADD_NEW_COLUMN,
-    ID_ROW_CONTROL_COLUMN,
-  } from '@mathesar/stores/table-data';
+  import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import { saveColumnOrder } from '@mathesar/stores/tables';
   import { Draggable, Droppable } from './drag-and-drop';
   import ColumnHeaderContextMenu from './header-cell/ColumnHeaderContextMenu.svelte';
@@ -94,18 +92,18 @@
 </script>
 
 <SheetHeader>
-  <SheetCell type="origin-cell" columnIdentifierKey={ID_ROW_CONTROL_COLUMN}>
+  <SheetOriginCell>
     <Droppable
       on:drop={() => dropColumn()}
       on:dragover={(e) => e.preventDefault()}
       locationOfFirstDraggedColumn={0}
       columnLocation={-1}
     />
-  </SheetCell>
+  </SheetOriginCell>
 
   {#each [...$processedColumns] as [columnId, processedColumn] (columnId)}
     {@const isSelected = $selection.columnIds.has(String(columnId))}
-    <SheetCell type="column-header-cell" columnIdentifierKey={columnId}>
+    <SheetColumnHeaderCell columnIdentifierKey={columnId}>
       <!-- TODO_3037: why is this div here? Can we get rid of it? -->
       <div>
         <Draggable
@@ -128,12 +126,12 @@
           <ColumnHeaderContextMenu {processedColumn} />
         </ContextMenu>
       </div>
-    </SheetCell>
+    </SheetColumnHeaderCell>
   {/each}
 
   {#if hasNewColumnButton}
-    <SheetCell type="new-column-cell" columnIdentifierKey={ID_ADD_NEW_COLUMN}>
+    <SheetColumnCreationCell>
       <NewColumnCell />
-    </SheetCell>
+    </SheetColumnCreationCell>
   {/if}
 </SheetHeader>
diff --git a/mathesar_ui/src/systems/table-view/row/Row.svelte b/mathesar_ui/src/systems/table-view/row/Row.svelte
index 0e08c59f76..cddf79d67c 100644
--- a/mathesar_ui/src/systems/table-view/row/Row.svelte
+++ b/mathesar_ui/src/systems/table-view/row/Row.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { ContextMenu } from '@mathesar/component-library';
-  import { SheetCell, SheetRow } from '@mathesar/components/sheet';
+  import { SheetRow, SheetRowHeaderCell } from '@mathesar/components/sheet';
   import { rowHeightPx } from '@mathesar/geometry';
   import {
     ID_ROW_CONTROL_COLUMN,
@@ -70,10 +70,7 @@
     style="--cell-height:{rowHeightPx - 1}px;{styleString}"
     on:mousedown={checkAndCreateEmptyRow}
   >
-    <SheetCell
-      type="row-header-cell"
-      columnIdentifierKey={ID_ROW_CONTROL_COLUMN}
-    >
+    <SheetRowHeaderCell rowSelectionId={'TODO_3037'}>
       {#if rowHasRecord(row)}
         <RowControl
           {primaryKeyColumnId}
@@ -87,7 +84,7 @@
           <RowContextOptions recordPk={rowKey} {recordsData} {row} />
         </ContextMenu>
       {/if}
-    </SheetCell>
+    </SheetRowHeaderCell>
 
     {#if isHelpTextRow(row)}
       <NewRecordMessage columnCount={$processedColumns.size} />
diff --git a/mathesar_ui/src/systems/table-view/row/RowCell.svelte b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
index 7fbea0c0f7..90e5931aea 100644
--- a/mathesar_ui/src/systems/table-view/row/RowCell.svelte
+++ b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
@@ -16,7 +16,7 @@
   import Null from '@mathesar/components/Null.svelte';
   import RowCellBackgrounds from '@mathesar/components/RowCellBackgrounds.svelte';
   import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
-  import { SheetCell } from '@mathesar/components/sheet';
+  import { SheetDataCell } from '@mathesar/components/sheet';
   import { makeCellId } from '@mathesar/components/sheet/cellIds';
   import type SheetSelection from '@mathesar/components/sheet/selection/SheetSelection';
   import { handleKeyboardEventOnCell } from '@mathesar/components/sheet/sheetKeyboardUtils';
@@ -98,11 +98,10 @@
   }
 </script>
 
-<SheetCell
-  type="data-cell"
+<SheetDataCell
   columnIdentifierKey={column.id}
+  cellSelectionId={cellId}
   {isActive}
-  lightText={hasError || isProcessing}
 >
   <CellBackground when={hasError} color="var(--cell-bg-color-error)" />
   <CellBackground when={!isEditable} color="var(--cell-bg-color-disabled)" />
@@ -135,6 +134,7 @@
       handleKeyboardEventOnCell(detail.originalEvent, selection)}
     on:update={valueUpdated}
     horizontalAlignment={column.primary_key ? 'left' : undefined}
+    lightText={hasError || isProcessing}
   />
   <ContextMenu>
     {#if canEditTableRecords || showLinkedRecordHyperLink}
@@ -171,4 +171,4 @@
   {#if errors.length}
     <CellErrors {errors} forceShowErrors={isActive} />
   {/if}
-</SheetCell>
+</SheetDataCell>

From f5448669a3348120184ab63c39ab4cc4bb21f0d2 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 7 Feb 2024 20:35:43 -0500
Subject: [PATCH 0027/1141] Add match utility function for TS pattern matching

---
 .../utils/__tests__/patternMatching.test.ts   | 20 +++++++++++++++++++
 mathesar_ui/src/utils/patternMatching.ts      | 14 +++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 mathesar_ui/src/utils/__tests__/patternMatching.test.ts
 create mode 100644 mathesar_ui/src/utils/patternMatching.ts

diff --git a/mathesar_ui/src/utils/__tests__/patternMatching.test.ts b/mathesar_ui/src/utils/__tests__/patternMatching.test.ts
new file mode 100644
index 0000000000..b00d25a7fc
--- /dev/null
+++ b/mathesar_ui/src/utils/__tests__/patternMatching.test.ts
@@ -0,0 +1,20 @@
+import { match } from '../patternMatching';
+
+test('match', () => {
+  type Shape =
+    | { kind: 'circle'; radius: number }
+    | { kind: 'square'; x: number }
+    | { kind: 'triangle'; x: number; y: number };
+
+  function area(shape: Shape) {
+    return match(shape, 'kind', {
+      circle: ({ radius }) => Math.PI * radius ** 2,
+      square: ({ x }) => x ** 2,
+      triangle: ({ x, y }) => (x * y) / 2,
+    });
+  }
+
+  expect(area({ kind: 'circle', radius: 5 })).toBe(78.53981633974483);
+  expect(area({ kind: 'square', x: 5 })).toBe(25);
+  expect(area({ kind: 'triangle', x: 5, y: 6 })).toBe(15);
+});
diff --git a/mathesar_ui/src/utils/patternMatching.ts b/mathesar_ui/src/utils/patternMatching.ts
new file mode 100644
index 0000000000..9f349df973
--- /dev/null
+++ b/mathesar_ui/src/utils/patternMatching.ts
@@ -0,0 +1,14 @@
+export function match<
+  /** Discriminant Property name */
+  P extends string,
+  /** The other stuff in the type (besides the discriminant property) */
+  O,
+  /** The union valued type */
+  V extends Record<P, string> & O,
+  /** The match arms */
+  C extends { [K in V[P]]: (v: Extract<V, Record<P, K>>) => unknown },
+>(value: V, property: P, cases: C) {
+  return cases[value[property]](
+    value as Extract<V, Record<P, string>>,
+  ) as ReturnType<C[keyof C]>;
+}

From e8e5e347c1220caf8702224362176db0d8794d8b Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 7 Feb 2024 20:57:06 -0500
Subject: [PATCH 0028/1141] Begin scaffolding to handle drag selection

---
 mathesar_ui/src/components/sheet/Sheet.svelte | 23 +++++-
 .../src/components/sheet/cells/index.ts       |  1 +
 .../sheet/selection/SheetSelection.ts         | 48 ++++++++++++-
 .../src/components/sheet/selection/index.ts   |  1 +
 .../sheet/selection/selectionUtils.ts         | 71 +++++++++++++++++++
 .../src/systems/table-view/TableView.svelte   | 13 ++--
 6 files changed, 145 insertions(+), 12 deletions(-)
 create mode 100644 mathesar_ui/src/components/sheet/selection/index.ts
 create mode 100644 mathesar_ui/src/components/sheet/selection/selectionUtils.ts

diff --git a/mathesar_ui/src/components/sheet/Sheet.svelte b/mathesar_ui/src/components/sheet/Sheet.svelte
index 9e01daf36f..92b876876e 100644
--- a/mathesar_ui/src/components/sheet/Sheet.svelte
+++ b/mathesar_ui/src/components/sheet/Sheet.svelte
@@ -1,12 +1,14 @@
 <script lang="ts">
-  import { writable } from 'svelte/store';
+  import { writable, type Writable } from 'svelte/store';
 
   import { ImmutableMap } from '@mathesar-component-library/types';
   import type { ClipboardHandler } from '@mathesar/stores/clipboard';
   import { getClipboardHandlerStoreFromContext } from '@mathesar/stores/clipboard';
+  import { beginSelection, findContainingSheetCell } from './selection';
+  import type SheetSelection from './selection/SheetSelection';
   import {
-    DEFAULT_COLUMN_WIDTH,
     calculateColumnStyleMapAndRowWidth,
+    DEFAULT_COLUMN_WIDTH,
     setSheetContext,
   } from './utils';
 
@@ -21,6 +23,7 @@
   export let hasBorder = false;
   export let hasPaddingRight = false;
   export let clipboardHandler: ClipboardHandler | undefined = undefined;
+  export let selection: Writable<SheetSelection> | undefined = undefined;
 
   export let getColumnIdentifier: (
     c: SheetColumnType,
@@ -34,6 +37,8 @@
   export let columnWidths: ImmutableMap<SheetColumnIdentifierKey, number> =
     new ImmutableMap();
 
+  let sheetElement: HTMLElement;
+
   $: ({ columnStyleMap, rowWidth } = calculateColumnStyleMapAndRowWidth(
     columns,
     getColumnIdentifier,
@@ -114,6 +119,17 @@
   function disableClipboard() {
     clipboardHandlerStore?.set(undefined);
   }
+
+  function handleMouseDown(e: MouseEvent) {
+    if (!selection) return;
+    // TODO_3037:
+    // - handle mouse events with other buttons
+    // - handle Shift/Alt/Ctrl key modifiers
+    const target = e.target as HTMLElement;
+    const startingCell = findContainingSheetCell(target);
+    if (!startingCell) return;
+    beginSelection({ selection, sheetElement, startingCell });
+  }
 </script>
 
 <div
@@ -122,9 +138,10 @@
   class:uses-virtual-list={usesVirtualList}
   class:set-to-row-width={restrictWidthToRowWidth}
   {style}
-  on:click
+  on:mousedown={handleMouseDown}
   on:focusin={enableClipboard}
   on:focusout={disableClipboard}
+  bind:this={sheetElement}
 >
   {#if columns.length}
     <slot />
diff --git a/mathesar_ui/src/components/sheet/cells/index.ts b/mathesar_ui/src/components/sheet/cells/index.ts
index 4dc087562c..2fd6716ac2 100644
--- a/mathesar_ui/src/components/sheet/cells/index.ts
+++ b/mathesar_ui/src/components/sheet/cells/index.ts
@@ -4,3 +4,4 @@ export { default as SheetColumnCreationCell } from './SheetColumnCreationCell.sv
 export { default as SheetOriginCell } from './SheetOriginCell.svelte';
 export { default as SheetPositionableCell } from './SheetPositionableCell.svelte';
 export { default as SheetRowHeaderCell } from './SheetRowHeaderCell.svelte';
+export * from './sheetCellUtils';
diff --git a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
index 7c11c67476..38dde70bda 100644
--- a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
+++ b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
@@ -1,10 +1,12 @@
 import { execPipe, filter, first, map } from 'iter-tools';
 
 import { ImmutableSet } from '@mathesar/component-library';
+import { match } from '@mathesar/utils/patternMatching';
 import { assertExhaustive } from '@mathesar/utils/typeUtils';
 import { makeCells, parseCellId } from '../cellIds';
 import { Direction, getColumnOffset } from './Direction';
 import Plane from './Plane';
+import type { SheetCellDetails } from './selectionUtils';
 
 /**
  * - `'dataCells'` means that the selection contains data cells. This is by far
@@ -280,7 +282,7 @@ export default class SheetSelection {
    * selection is made only of data cells, and will never include cells in the
    * placeholder row, even if a user drags to select a cell in it.
    */
-  ofCellRange(cellIdA: string, cellIdB: string): SheetSelection {
+  ofDataCellRange(cellIdA: string, cellIdB: string): SheetSelection {
     return this.withBasis(
       basisFromDataCells(
         this.plane.dataCellsInFlexibleCellRange(cellIdA, cellIdB),
@@ -288,6 +290,46 @@ export default class SheetSelection {
     );
   }
 
+  ofSheetCellRange(
+    cellA: SheetCellDetails,
+    cellB: SheetCellDetails,
+  ): SheetSelection {
+    // TODO_3037 finish implementation
+    return match(cellA, 'type', {
+      'data-cell': (a) =>
+        match(cellB, 'type', {
+          'data-cell': (b) => this.ofDataCellRange(a.cellId, b.cellId),
+          'column-header-cell': (b) => {
+            throw new Error('Not implemented');
+          },
+          'row-header-cell': (b) => {
+            throw new Error('Not implemented');
+          },
+        }),
+      'column-header-cell': (a) =>
+        match(cellB, 'type', {
+          'data-cell': (b) => {
+            throw new Error('Not implemented');
+          },
+          'column-header-cell': (b) =>
+            this.ofColumnRange(a.columnId, b.columnId),
+          'row-header-cell': (b) => {
+            throw new Error('Not implemented');
+          },
+        }),
+      'row-header-cell': (a) =>
+        match(cellB, 'type', {
+          'data-cell': (b) => {
+            throw new Error('Not implemented');
+          },
+          'column-header-cell': (b) => {
+            throw new Error('Not implemented');
+          },
+          'row-header-cell': (b) => this.ofRowRange(a.rowId, b.rowId),
+        }),
+    });
+  }
+
   /**
    * @returns a new selection formed from one cell within the data rows or the
    * placeholder row.
@@ -391,8 +433,8 @@ export default class SheetSelection {
    * by the active cell (also the first cell selected when dragging) and the
    * provided cell.
    */
-  drawnToCell(cellId: string): SheetSelection {
-    return this.ofCellRange(this.activeCellId ?? cellId, cellId);
+  drawnToDataCell(cellId: string): SheetSelection {
+    return this.ofDataCellRange(this.activeCellId ?? cellId, cellId);
   }
 
   /**
diff --git a/mathesar_ui/src/components/sheet/selection/index.ts b/mathesar_ui/src/components/sheet/selection/index.ts
new file mode 100644
index 0000000000..ec81a55c52
--- /dev/null
+++ b/mathesar_ui/src/components/sheet/selection/index.ts
@@ -0,0 +1 @@
+export * from './selectionUtils';
diff --git a/mathesar_ui/src/components/sheet/selection/selectionUtils.ts b/mathesar_ui/src/components/sheet/selection/selectionUtils.ts
new file mode 100644
index 0000000000..32558f0884
--- /dev/null
+++ b/mathesar_ui/src/components/sheet/selection/selectionUtils.ts
@@ -0,0 +1,71 @@
+import type { Writable } from 'svelte/store';
+
+import type SheetSelection from './SheetSelection';
+
+export type SheetCellDetails =
+  | { type: 'data-cell'; cellId: string }
+  | { type: 'column-header-cell'; columnId: string }
+  | { type: 'row-header-cell'; rowId: string };
+
+export function findContainingSheetCell(
+  element: HTMLElement,
+): SheetCellDetails | undefined {
+  const containingElement = element.closest('[data-sheet-element]');
+  if (!containingElement) return undefined;
+
+  const elementType = containingElement.getAttribute('data-sheet-element');
+  if (!elementType) return undefined;
+
+  if (elementType === 'data-cell') {
+    const cellId = containingElement.getAttribute('data-cell-selection-id');
+    if (!cellId) return undefined;
+    return { type: 'data-cell', cellId };
+  }
+
+  if (elementType === 'column-header-cell') {
+    const columnId = containingElement.getAttribute('data-column-identifier');
+    if (!columnId) return undefined;
+    return { type: 'column-header-cell', columnId };
+  }
+
+  if (elementType === 'row-header-cell') {
+    const rowId = containingElement.getAttribute('data-row-selection-id');
+    if (!rowId) return undefined;
+    return { type: 'row-header-cell', rowId };
+  }
+
+  return undefined;
+}
+
+export function beginSelection({
+  selection,
+  sheetElement,
+  startingCell,
+}: {
+  startingCell: SheetCellDetails;
+  selection: Writable<SheetSelection>;
+  sheetElement: HTMLElement;
+}) {
+  let previousTarget: HTMLElement | undefined;
+
+  function drawToCell(endingCell: SheetCellDetails) {
+    selection.update((s) => s.ofSheetCellRange(startingCell, endingCell));
+  }
+
+  function drawToPoint(e: MouseEvent) {
+    const target = e.target as HTMLElement;
+    if (target === previousTarget) return; // For performance
+    const cell = findContainingSheetCell(target);
+    if (!cell) return;
+    drawToCell(cell);
+  }
+
+  function finish() {
+    sheetElement.removeEventListener('mousemove', drawToPoint);
+    window.removeEventListener('mouseup', finish);
+  }
+
+  drawToCell(startingCell);
+  sheetElement.addEventListener('mousemove', drawToPoint);
+  window.addEventListener('mouseup', finish);
+}
diff --git a/mathesar_ui/src/systems/table-view/TableView.svelte b/mathesar_ui/src/systems/table-view/TableView.svelte
index fb048a3460..3f3dad227e 100644
--- a/mathesar_ui/src/systems/table-view/TableView.svelte
+++ b/mathesar_ui/src/systems/table-view/TableView.svelte
@@ -127,16 +127,17 @@
     <div class="sheet-area" on:click={checkAndReinstateFocusOnActiveCell}>
       {#if $processedColumns.size}
         <Sheet
-          columns={sheetColumns}
-          getColumnIdentifier={(entry) => entry.column.id}
-          {usesVirtualList}
-          {columnWidths}
           {clipboardHandler}
-          hasBorder={sheetHasBorder}
-          restrictWidthToRowWidth={!usesVirtualList}
+          {columnWidths}
+          {selection}
+          {usesVirtualList}
           bind:horizontalScrollOffset={$horizontalScrollOffset}
           bind:scrollOffset={$scrollOffset}
+          columns={sheetColumns}
+          getColumnIdentifier={(entry) => entry.column.id}
+          hasBorder={sheetHasBorder}
           hasPaddingRight
+          restrictWidthToRowWidth={!usesVirtualList}
         >
           <Header {hasNewColumnButton} {columnOrder} {table} />
           <Body {usesVirtualList} />

From 4f2a253cc8c83a1bd231ae2158b31fbb4c1c4097 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 8 Feb 2024 20:10:42 -0500
Subject: [PATCH 0029/1141] Document match function

---
 mathesar_ui/src/utils/patternMatching.ts | 28 ++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/mathesar_ui/src/utils/patternMatching.ts b/mathesar_ui/src/utils/patternMatching.ts
index 9f349df973..8b69cbdaed 100644
--- a/mathesar_ui/src/utils/patternMatching.ts
+++ b/mathesar_ui/src/utils/patternMatching.ts
@@ -1,3 +1,31 @@
+/**
+ * Performs branching logic by exhaustively pattern-matching all variants of a
+ * TypeScript discriminated union.
+ *
+ * @param value The value to match
+ * @param property The name of the discriminant property
+ * @param cases An object representing the match arms. It should have one entry
+ * per variant of the union. The key should be the value of the discriminant
+ * property for that variant, and the value should be a function that takes the
+ * value of that variant and returns the result of the match arm.
+ *
+ * @example
+ *
+ * ```ts
+ * type Shape =
+ *   | { kind: 'circle'; radius: number }
+ *   | { kind: 'square'; x: number }
+ *   | { kind: 'triangle'; x: number; y: number };
+ *
+ * function area(shape: Shape) {
+ *   return match(shape, 'kind', {
+ *     circle: ({ radius }) => Math.PI * radius ** 2,
+ *     square: ({ x }) => x ** 2,
+ *     triangle: ({ x, y }) => (x * y) / 2,
+ *   });
+ * }
+ * ```
+ */
 export function match<
   /** Discriminant Property name */
   P extends string,

From ab4aca0c895d61b26462c91ff9e02de765beaf98 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 8 Feb 2024 20:12:35 -0500
Subject: [PATCH 0030/1141] Finish implementation of ofSheetCellRange method

---
 .../sheet/selection/SheetSelection.ts         | 71 +++++++++----------
 1 file changed, 35 insertions(+), 36 deletions(-)

diff --git a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
index 38dde70bda..f177794704 100644
--- a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
+++ b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
@@ -3,7 +3,7 @@ import { execPipe, filter, first, map } from 'iter-tools';
 import { ImmutableSet } from '@mathesar/component-library';
 import { match } from '@mathesar/utils/patternMatching';
 import { assertExhaustive } from '@mathesar/utils/typeUtils';
-import { makeCells, parseCellId } from '../cellIds';
+import { makeCellId, makeCells, parseCellId } from '../cellIds';
 import { Direction, getColumnOffset } from './Direction';
 import Plane from './Plane';
 import type { SheetCellDetails } from './selectionUtils';
@@ -291,42 +291,41 @@ export default class SheetSelection {
   }
 
   ofSheetCellRange(
-    cellA: SheetCellDetails,
-    cellB: SheetCellDetails,
+    startingCell: SheetCellDetails,
+    endingCell: SheetCellDetails,
   ): SheetSelection {
-    // TODO_3037 finish implementation
-    return match(cellA, 'type', {
-      'data-cell': (a) =>
-        match(cellB, 'type', {
-          'data-cell': (b) => this.ofDataCellRange(a.cellId, b.cellId),
-          'column-header-cell': (b) => {
-            throw new Error('Not implemented');
-          },
-          'row-header-cell': (b) => {
-            throw new Error('Not implemented');
-          },
-        }),
-      'column-header-cell': (a) =>
-        match(cellB, 'type', {
-          'data-cell': (b) => {
-            throw new Error('Not implemented');
-          },
-          'column-header-cell': (b) =>
-            this.ofColumnRange(a.columnId, b.columnId),
-          'row-header-cell': (b) => {
-            throw new Error('Not implemented');
-          },
-        }),
-      'row-header-cell': (a) =>
-        match(cellB, 'type', {
-          'data-cell': (b) => {
-            throw new Error('Not implemented');
-          },
-          'column-header-cell': (b) => {
-            throw new Error('Not implemented');
-          },
-          'row-header-cell': (b) => this.ofRowRange(a.rowId, b.rowId),
-        }),
+    // Nullish coalescing is safe here since we know we'll have a first row and
+    // first column in the cases where we're selecting things.
+    const firstRow = () => this.plane.rowIds.first ?? '';
+    const firstColumn = () => this.plane.columnIds.first ?? '';
+
+    return match(startingCell, 'type', {
+      'data-cell': ({ cellId: startingCellId }) => {
+        const endingCellId = match(endingCell, 'type', {
+          'data-cell': (b) => b.cellId,
+          'column-header-cell': (b) => makeCellId(firstRow(), b.columnId),
+          'row-header-cell': (b) => makeCellId(b.rowId, firstColumn()),
+        });
+        return this.ofDataCellRange(startingCellId, endingCellId);
+      },
+
+      'column-header-cell': ({ columnId: startingColumnId }) => {
+        const endingColumnId = match(endingCell, 'type', {
+          'data-cell': (b) => parseCellId(b.cellId).columnId,
+          'column-header-cell': (b) => b.columnId,
+          'row-header-cell': () => firstColumn(),
+        });
+        return this.ofColumnRange(startingColumnId, endingColumnId);
+      },
+
+      'row-header-cell': ({ rowId: startingRowId }) => {
+        const endingRowId = match(endingCell, 'type', {
+          'data-cell': (b) => parseCellId(b.cellId).rowId,
+          'column-header-cell': () => firstRow(),
+          'row-header-cell': (b) => b.rowId,
+        });
+        return this.ofRowRange(startingRowId, endingRowId);
+      },
     });
   }
 

From 4e83d8d3a2814165985220d4e257a60df1129d1f Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Sun, 11 Feb 2024 21:07:34 -0500
Subject: [PATCH 0031/1141] Lift isSelected prop way up

Move from being used in CellWrapper to being used in SheetDataCell.
---
 .../components/cell-fabric/CellFabric.svelte  |  2 --
 .../data-types/components/CellWrapper.svelte  |  2 --
 .../components/SteppedInputCell.svelte        |  2 --
 .../components/array/ArrayCell.svelte         |  2 --
 .../components/checkbox/CheckboxCell.svelte   |  2 --
 .../components/date-time/DateTimeCell.svelte  |  2 --
 .../formatted-input/FormattedInputCell.svelte |  2 --
 .../linked-record/LinkedRecordCell.svelte     |  2 --
 .../components/money/MoneyCell.svelte         |  2 --
 .../components/number/NumberCell.svelte       |  2 --
 .../primary-key/PrimaryKeyCell.svelte         |  2 --
 .../components/select/SingleSelectCell.svelte |  2 --
 .../components/textarea/TextAreaCell.svelte   |  2 --
 .../components/textbox/TextBoxCell.svelte     |  2 --
 .../data-types/components/typeDefinitions.ts  |  1 -
 .../data-types/components/uri/UriCell.svelte  |  2 --
 .../sheet/cells/SheetDataCell.svelte          | 25 ++++++++++++++++---
 .../result-pane/ResultRowCell.svelte          |  5 ++--
 .../src/systems/table-view/row/RowCell.svelte |  6 ++---
 19 files changed, 26 insertions(+), 41 deletions(-)

diff --git a/mathesar_ui/src/components/cell-fabric/CellFabric.svelte b/mathesar_ui/src/components/cell-fabric/CellFabric.svelte
index 70f52b80ab..41d9390317 100644
--- a/mathesar_ui/src/components/cell-fabric/CellFabric.svelte
+++ b/mathesar_ui/src/components/cell-fabric/CellFabric.svelte
@@ -14,7 +14,6 @@
     | ((recordId: string, recordSummary: string) => void)
     | undefined = undefined;
   export let isActive = false;
-  export let isSelected = false;
   export let disabled = false;
   export let showAsSkeleton = false;
   export let horizontalAlignment: HorizontalAlignment | undefined = undefined;
@@ -42,7 +41,6 @@
     {...props}
     {columnFabric}
     {isActive}
-    {isSelected}
     {disabled}
     {isIndependentOfSheet}
     {horizontalAlignment}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
index 8fe7f4bf02..3f4c9ca1d1 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
@@ -6,7 +6,6 @@
 
   export let element: HTMLElement | undefined = undefined;
   export let isActive = false;
-  export let isSelected = false;
   export let disabled = false;
   export let mode: 'edit' | 'default' = 'default';
   export let multiLineTruncate = false;
@@ -116,7 +115,6 @@
   {...$$restProps}
 >
   {#if mode !== 'edit'}
-    <CellBackground color="rgba(14, 101, 235, 0.1)" when={isSelected} />
     <CellBackground
       color="var(--cell-background-color)"
       when={valueComparisonOutcome !== 'noMatch'}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/SteppedInputCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/SteppedInputCell.svelte
index 98f1bdcd02..beec3c7dc8 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/SteppedInputCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/SteppedInputCell.svelte
@@ -21,7 +21,6 @@
   type Props = CellTypeProps<Value>;
 
   export let isActive: Props['isActive'];
-  export let isSelected: Props['isSelected'];
   export let value: Props['value'];
   export let disabled: Props['disabled'];
   export let multiLineTruncate = false;
@@ -148,7 +147,6 @@
 
 <CellWrapper
   {isActive}
-  {isSelected}
   {disabled}
   bind:element={cellRef}
   on:dblclick={setModeToEdit}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/array/ArrayCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/array/ArrayCell.svelte
index 66121cef76..3ee54ac16c 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/array/ArrayCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/array/ArrayCell.svelte
@@ -12,7 +12,6 @@
   const dispatch = createEventDispatcher();
 
   export let isActive: $$Props['isActive'];
-  export let isSelected: $$Props['isSelected'];
   export let value: $$Props['value'] = undefined;
   export let disabled: $$Props['disabled'];
   export let isIndependentOfSheet: $$Props['isIndependentOfSheet'];
@@ -38,7 +37,6 @@
 
 <CellWrapper
   {isActive}
-  {isSelected}
   {disabled}
   {isIndependentOfSheet}
   on:mouseenter
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/checkbox/CheckboxCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/checkbox/CheckboxCell.svelte
index a6a469c9d3..d85f256b1f 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/checkbox/CheckboxCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/checkbox/CheckboxCell.svelte
@@ -10,7 +10,6 @@
   const dispatch = createEventDispatcher();
 
   export let isActive: $$Props['isActive'];
-  export let isSelected: $$Props['isSelected'];
   export let value: $$Props['value'] = undefined;
   export let disabled: $$Props['disabled'];
   export let searchValue: $$Props['searchValue'] = undefined;
@@ -72,7 +71,6 @@
 <CellWrapper
   bind:element={cellRef}
   {isActive}
-  {isSelected}
   {disabled}
   {isIndependentOfSheet}
   {valueComparisonOutcome}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/DateTimeCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/DateTimeCell.svelte
index b50c154cab..530b6f464d 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/DateTimeCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/DateTimeCell.svelte
@@ -6,7 +6,6 @@
   type $$Props = DateTimeCellProps;
 
   export let isActive: $$Props['isActive'];
-  export let isSelected: $$Props['isSelected'];
   export let value: $$Props['value'];
   export let disabled: $$Props['disabled'];
   export let isIndependentOfSheet: $$Props['isIndependentOfSheet'];
@@ -22,7 +21,6 @@
 <SteppedInputCell
   bind:value
   {isActive}
-  {isSelected}
   {disabled}
   highlightSubstringMatches={false}
   {isIndependentOfSheet}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/formatted-input/FormattedInputCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/formatted-input/FormattedInputCell.svelte
index 42df86179c..d8c16bc720 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/formatted-input/FormattedInputCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/formatted-input/FormattedInputCell.svelte
@@ -6,7 +6,6 @@
   type $$Props = FormattedInputCellProps;
 
   export let isActive: $$Props['isActive'];
-  export let isSelected: $$Props['isSelected'];
   export let value: $$Props['value'];
   export let disabled: $$Props['disabled'];
   export let isIndependentOfSheet: $$Props['isIndependentOfSheet'];
@@ -23,7 +22,6 @@
 <SteppedInputCell
   bind:value
   {isActive}
-  {isSelected}
   {disabled}
   {isIndependentOfSheet}
   {showTruncationPopover}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordCell.svelte
index 63de26a0ca..9f71177829 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordCell.svelte
@@ -21,7 +21,6 @@
 
   export let isActive: $$Props['isActive'];
   export let columnFabric: $$Props['columnFabric'];
-  export let isSelected: $$Props['isSelected'];
   export let value: $$Props['value'] = undefined;
   export let searchValue: $$Props['searchValue'] = undefined;
   export let recordSummary: $$Props['recordSummary'] = undefined;
@@ -95,7 +94,6 @@
 
 <CellWrapper
   {isActive}
-  {isSelected}
   {disabled}
   {isIndependentOfSheet}
   on:mouseenter
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/money/MoneyCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/money/MoneyCell.svelte
index 6d271559d6..395f4009aa 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/money/MoneyCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/money/MoneyCell.svelte
@@ -6,7 +6,6 @@
   type $$Props = MoneyCellProps;
 
   export let isActive: $$Props['isActive'];
-  export let isSelected: $$Props['isSelected'];
   export let value: $$Props['value'];
   export let disabled: $$Props['disabled'];
   export let searchValue: $$Props['searchValue'] = undefined;
@@ -19,7 +18,6 @@
 <SteppedInputCell
   bind:value
   {isActive}
-  {isSelected}
   {disabled}
   {searchValue}
   {isIndependentOfSheet}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/number/NumberCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/number/NumberCell.svelte
index 173e801418..ec07dcde99 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/number/NumberCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/number/NumberCell.svelte
@@ -9,7 +9,6 @@
   type $$Props = NumberCellProps;
 
   export let isActive: $$Props['isActive'];
-  export let isSelected: $$Props['isSelected'];
   export let value: $$Props['value'];
   export let disabled: $$Props['disabled'];
   export let searchValue: $$Props['searchValue'] = undefined;
@@ -23,7 +22,6 @@
 <SteppedInputCell
   bind:value
   {isActive}
-  {isSelected}
   {disabled}
   {isIndependentOfSheet}
   {showTruncationPopover}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/primary-key/PrimaryKeyCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/primary-key/PrimaryKeyCell.svelte
index dc01938b39..d649693cf3 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/primary-key/PrimaryKeyCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/primary-key/PrimaryKeyCell.svelte
@@ -13,7 +13,6 @@
   const dispatch = createEventDispatcher();
 
   export let isActive: $$Props['isActive'];
-  export let isSelected: $$Props['isSelected'];
   export let value: $$Props['value'] = undefined;
   export let disabled: $$Props['disabled'];
   export let tableId: $$Props['tableId'];
@@ -48,7 +47,6 @@
 
 <CellWrapper
   {isActive}
-  {isSelected}
   {disabled}
   {isIndependentOfSheet}
   on:mouseenter
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/select/SingleSelectCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/select/SingleSelectCell.svelte
index 886f86c83f..2469775798 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/select/SingleSelectCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/select/SingleSelectCell.svelte
@@ -24,7 +24,6 @@
   const id = getGloballyUniqueId();
 
   export let isActive: DefinedProps['isActive'];
-  export let isSelected: $$Props['isSelected'];
   export let value: DefinedProps['value'] = undefined;
   export let disabled: DefinedProps['disabled'];
   export let isIndependentOfSheet: $$Props['isIndependentOfSheet'];
@@ -114,7 +113,6 @@
     aria-controls={id}
     aria-haspopup="listbox"
     {isActive}
-    {isSelected}
     {disabled}
     {isIndependentOfSheet}
     on:mouseenter
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/textarea/TextAreaCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/textarea/TextAreaCell.svelte
index 9ebc8b88a1..41cc545644 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/textarea/TextAreaCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/textarea/TextAreaCell.svelte
@@ -7,7 +7,6 @@
   type $$Props = TextAreaCellProps;
 
   export let isActive: $$Props['isActive'];
-  export let isSelected: $$Props['isSelected'];
   export let value: $$Props['value'] = undefined;
   export let disabled: $$Props['disabled'];
   export let searchValue: $$Props['searchValue'] = undefined;
@@ -33,7 +32,6 @@
 <SteppedInputCell
   bind:value
   {isActive}
-  {isSelected}
   {disabled}
   {searchValue}
   {isIndependentOfSheet}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/textbox/TextBoxCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/textbox/TextBoxCell.svelte
index f560933a6f..ebabc12875 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/textbox/TextBoxCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/textbox/TextBoxCell.svelte
@@ -6,7 +6,6 @@
   type $$Props = TextBoxCellProps;
 
   export let isActive: $$Props['isActive'];
-  export let isSelected: $$Props['isSelected'];
   export let value: $$Props['value'] = undefined;
   export let disabled: $$Props['disabled'];
   export let searchValue: $$Props['searchValue'] = undefined;
@@ -20,7 +19,6 @@
 <SteppedInputCell
   bind:value
   {isActive}
-  {isSelected}
   {disabled}
   {searchValue}
   {isIndependentOfSheet}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts b/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts
index 2488bd93bf..906e2c8d09 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts
@@ -33,7 +33,6 @@ export type CellValueFormatter<T> = (
 export interface CellTypeProps<Value> {
   value: Value | null | undefined;
   isActive: boolean;
-  isSelected: boolean;
   disabled: boolean;
   searchValue?: unknown;
   isProcessing: boolean;
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/uri/UriCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/uri/UriCell.svelte
index 2e919190ec..23782f18cb 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/uri/UriCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/uri/UriCell.svelte
@@ -11,7 +11,6 @@
   type $$Props = CellTypeProps<string>;
 
   export let isActive: $$Props['isActive'];
-  export let isSelected: $$Props['isSelected'];
   export let value: $$Props['value'] = undefined;
   export let disabled: $$Props['disabled'];
   export let searchValue: $$Props['searchValue'] = undefined;
@@ -22,7 +21,6 @@
 <SteppedInputCell
   bind:value
   {isActive}
-  {isSelected}
   {disabled}
   {searchValue}
   {isIndependentOfSheet}
diff --git a/mathesar_ui/src/components/sheet/cells/SheetDataCell.svelte b/mathesar_ui/src/components/sheet/cells/SheetDataCell.svelte
index 93feef613d..7a3c4a65c9 100644
--- a/mathesar_ui/src/components/sheet/cells/SheetDataCell.svelte
+++ b/mathesar_ui/src/components/sheet/cells/SheetDataCell.svelte
@@ -1,14 +1,30 @@
 <script lang="ts">
+  import type SheetSelection from '../selection/SheetSelection';
+
+  import CellBackground from '@mathesar/components/CellBackground.svelte';
   import { getSheetCellStyle } from './sheetCellUtils';
 
   type SheetColumnIdentifierKey = $$Generic;
 
   export let columnIdentifierKey: SheetColumnIdentifierKey;
   export let cellSelectionId: string | undefined = undefined;
-  export let isActive = false;
-  export let isSelected = false;
+  export let selection: SheetSelection | undefined = undefined;
 
   $: style = getSheetCellStyle(columnIdentifierKey);
+  $: ({ isActive, isSelected, hasSelectionBackground } = (() => {
+    if (!selection || !cellSelectionId)
+      return {
+        isActive: false,
+        isSelected: false,
+        hasSelectionBackground: false,
+      };
+    const isSelected = selection.cellIds.has(cellSelectionId);
+    return {
+      isActive: selection.activeCellId === cellSelectionId,
+      isSelected: selection.cellIds.has(cellSelectionId),
+      hasSelectionBackground: isSelected && selection.cellIds.size > 1,
+    };
+  })());
 </script>
 
 <div
@@ -18,7 +34,10 @@
   data-cell-selected={isSelected ? '' : undefined}
   style={$style}
 >
-  <slot />
+  {#if hasSelectionBackground}
+    <CellBackground color="rgba(14, 101, 235, 0.1)" when={isSelected} />
+  {/if}
+  <slot {isActive} {isSelected} />
 </div>
 
 <style>
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
index 502c388eee..30f947fcee 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
@@ -16,18 +16,17 @@
   export let selection: Writable<SheetSelection>;
 
   $: cellId = row && makeCellId(getRowSelectionId(row), column.id);
-  $: isActive = cellId === $selection.activeCellId;
 </script>
 
 <SheetDataCell
   columnIdentifierKey={column.id}
   cellSelectionId={cellId}
-  {isActive}
+  selection={$selection}
+  let:isActive
 >
   {#if row || recordRunState === 'processing'}
     <CellFabric
       {isActive}
-      isSelected={$selection.cellIds.has(cellId ?? '')}
       columnFabric={column}
       value={row?.record[column.id]}
       showAsSkeleton={recordRunState === 'processing'}
diff --git a/mathesar_ui/src/systems/table-view/row/RowCell.svelte b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
index 90e5931aea..5328dfd9e8 100644
--- a/mathesar_ui/src/systems/table-view/row/RowCell.svelte
+++ b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
@@ -65,8 +65,6 @@
   $: ({ recordSummaries } = recordsData);
   $: ({ column, linkFk } = processedColumn);
   $: columnId = column.id;
-  $: isActive = $selection.activeCellId === cellId;
-  $: isSelected = $selection.cellIds.has(cellId);
   $: modificationStatus = $modificationStatusMap.get(key);
   $: serverErrors =
     modificationStatus?.state === 'failure' ? modificationStatus?.errors : [];
@@ -101,7 +99,8 @@
 <SheetDataCell
   columnIdentifierKey={column.id}
   cellSelectionId={cellId}
-  {isActive}
+  selection={$selection}
+  let:isActive
 >
   <CellBackground when={hasError} color="var(--cell-bg-color-error)" />
   <CellBackground when={!isEditable} color="var(--cell-bg-color-disabled)" />
@@ -117,7 +116,6 @@
   <CellFabric
     columnFabric={processedColumn}
     {isActive}
-    {isSelected}
     {value}
     {isProcessing}
     {canViewLinkedEntities}

From 457513a6b424e29e74c257e6caf6630e0e301512 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 12 Feb 2024 09:53:08 -0500
Subject: [PATCH 0032/1141] Clean up CellMode component

---
 .../cell/ActiveCellValue.svelte               | 52 ++++++++++++++++
 .../table-inspector/cell/CellMode.svelte      | 61 +++----------------
 2 files changed, 59 insertions(+), 54 deletions(-)
 create mode 100644 mathesar_ui/src/systems/table-view/table-inspector/cell/ActiveCellValue.svelte

diff --git a/mathesar_ui/src/systems/table-view/table-inspector/cell/ActiveCellValue.svelte b/mathesar_ui/src/systems/table-view/table-inspector/cell/ActiveCellValue.svelte
new file mode 100644
index 0000000000..368514e70f
--- /dev/null
+++ b/mathesar_ui/src/systems/table-view/table-inspector/cell/ActiveCellValue.svelte
@@ -0,0 +1,52 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
+  import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
+  import { parseCellId } from '@mathesar/components/sheet/cellIds';
+
+  const tabularData = getTabularDataStoreFromContext();
+
+  export let activeCellId: string;
+
+  $: ({ recordsData, processedColumns } = $tabularData);
+  $: ({ recordSummaries, selectableRowsMap } = recordsData);
+  $: rows = $selectableRowsMap;
+  $: ({ rowId, columnId } = parseCellId(activeCellId));
+  $: record = rows.get(rowId) ?? {};
+  $: selectedCellValue = record[columnId];
+  $: column = $processedColumns.get(Number(columnId));
+  $: recordSummary =
+    column &&
+    $recordSummaries.get(String(column.id))?.get(String(selectedCellValue));
+</script>
+
+<section class="cell-content">
+  <header>{$_('content')}</header>
+  <div class="content">
+    {#if column}
+      <CellFabric
+        isIndependentOfSheet={true}
+        disabled={true}
+        columnFabric={column}
+        value={selectedCellValue}
+        {recordSummary}
+      />
+    {/if}
+  </div>
+</section>
+
+<style lang="scss">
+  .cell-content {
+    header {
+      font-weight: 500;
+    }
+    .content {
+      white-space: pre-wrap;
+      border: 1px solid var(--slate-300);
+      padding: var(--size-xx-small);
+      border-radius: var(--border-radius-m);
+      margin-top: var(--size-x-small);
+    }
+  }
+</style>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/cell/CellMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/cell/CellMode.svelte
index cb7a00bfd4..883a431fc0 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/cell/CellMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/cell/CellMode.svelte
@@ -8,73 +8,26 @@
    * changes to both files as necessary.
    */
   import { _ } from 'svelte-i18n';
+
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
-  import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
+  import ActiveCellValue from './ActiveCellValue.svelte';
 
   const tabularData = getTabularDataStoreFromContext();
 
-  $: ({ selection, recordsData, processedColumns } = $tabularData);
-  $: ({ activeCell } = selection);
-  $: ({ recordSummaries } = recordsData);
-  $: cell = $activeCell;
-  $: selectedCellValue = (() => {
-    if (cell) {
-      const rows = recordsData.getRecordRows();
-      if (rows[cell.rowIndex]) {
-        return rows[cell.rowIndex].record[cell.columnId];
-      }
-    }
-    return undefined;
-  })();
-  $: column = (() => {
-    if (cell) {
-      const processedColumn = $processedColumns.get(Number(cell.columnId));
-      if (processedColumn) {
-        return processedColumn;
-      }
-    }
-    return undefined;
-  })();
-  $: recordSummary =
-    column &&
-    $recordSummaries.get(String(column.id))?.get(String(selectedCellValue));
+  $: ({ selection } = $tabularData);
+  $: ({ activeCellId } = $selection);
 </script>
 
 <div class="section-content">
-  {#if selectedCellValue !== undefined}
-    <section class="cell-content">
-      <header>{$_('content')}</header>
-      <div class="content">
-        {#if column}
-          <CellFabric
-            isIndependentOfSheet={true}
-            disabled={true}
-            columnFabric={column}
-            value={selectedCellValue}
-            {recordSummary}
-          />
-        {/if}
-      </div>
-    </section>
+  {#if activeCellId}
+    <ActiveCellValue {activeCellId} />
   {:else}
     {$_('select_cell_view_properties')}
   {/if}
 </div>
 
-<style lang="scss">
+<style>
   .section-content {
     padding: var(--size-x-small);
-    .cell-content {
-      header {
-        font-weight: 500;
-      }
-      .content {
-        white-space: pre-wrap;
-        border: 1px solid var(--slate-300);
-        padding: var(--size-xx-small);
-        border-radius: var(--border-radius-m);
-        margin-top: var(--size-x-small);
-      }
-    }
   }
 </style>

From 2608b222c954c361defb99b8bb6992e5cda4318d Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Sun, 18 Feb 2024 11:19:49 -0500
Subject: [PATCH 0033/1141] Remove table-view deps from CellInspector code

---
 .../inspector/cell/CellInspector.svelte       | 69 +++++++++++++++++++
 .../inspector/cell/cellInspectorUtils.ts      | 16 +++++
 .../cell/ActiveCellValue.svelte               | 52 --------------
 .../table-inspector/cell/CellMode.svelte      | 37 +++-------
 .../table-inspector/cell/cellModeUtils.ts     | 35 ++++++++++
 5 files changed, 131 insertions(+), 78 deletions(-)
 create mode 100644 mathesar_ui/src/components/inspector/cell/CellInspector.svelte
 create mode 100644 mathesar_ui/src/components/inspector/cell/cellInspectorUtils.ts
 delete mode 100644 mathesar_ui/src/systems/table-view/table-inspector/cell/ActiveCellValue.svelte
 create mode 100644 mathesar_ui/src/systems/table-view/table-inspector/cell/cellModeUtils.ts

diff --git a/mathesar_ui/src/components/inspector/cell/CellInspector.svelte b/mathesar_ui/src/components/inspector/cell/CellInspector.svelte
new file mode 100644
index 0000000000..f01da7a677
--- /dev/null
+++ b/mathesar_ui/src/components/inspector/cell/CellInspector.svelte
@@ -0,0 +1,69 @@
+<script lang="ts">
+  /**
+   * @file
+   *
+   * NOTICE: There is some code duplication between this file and
+   * `CellTab.svelte` used for the data explorer. It might be good to resolve
+   * this duplication at some point. In the meantime, be mindful of propagating
+   * changes to both files as necessary.
+   */
+  import { _ } from 'svelte-i18n';
+
+  import type { SelectedCellData } from './cellInspectorUtils';
+  import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
+
+  export let selectedCellData: SelectedCellData;
+
+  $: ({ activeCellData } = selectedCellData);
+
+  // TODO:
+  //
+  // - Add two collapsible sections: "Active Cell" and "Selected Cells". This
+  //   will require some refactoring of the collapsible sections code to do this
+  //   cleanly. Ideally we should extract that code out from the table inspector
+  //   and Data Explorer inspector and put it here.
+  //
+  // - Utilize `selectedCellData.selectionData` to display the count of
+  //   selected cells.
+  //
+  // - Add other computed aggregate values for the selected cells, such as
+  //   average, sum, etc.
+</script>
+
+<div class="cell-inspector">
+  {#if activeCellData}
+    {@const { column, value, recordSummary } = activeCellData}
+    <section class="active-cell">
+      <header class="header">{$_('content')}</header>
+      <div class="content">
+        {#if column}
+          <CellFabric
+            isIndependentOfSheet={true}
+            disabled={true}
+            columnFabric={column}
+            {value}
+            {recordSummary}
+          />
+        {/if}
+      </div>
+    </section>
+  {:else}
+    {$_('select_cell_view_properties')}
+  {/if}
+</div>
+
+<style>
+  .cell-inspector {
+    padding: var(--size-x-small);
+  }
+  .header {
+    font-weight: 500;
+  }
+  .content {
+    white-space: pre-wrap;
+    border: 1px solid var(--slate-300);
+    padding: var(--size-xx-small);
+    border-radius: var(--border-radius-m);
+    margin-top: var(--size-x-small);
+  }
+</style>
diff --git a/mathesar_ui/src/components/inspector/cell/cellInspectorUtils.ts b/mathesar_ui/src/components/inspector/cell/cellInspectorUtils.ts
new file mode 100644
index 0000000000..b493f92069
--- /dev/null
+++ b/mathesar_ui/src/components/inspector/cell/cellInspectorUtils.ts
@@ -0,0 +1,16 @@
+import type { CellColumnFabric } from '@mathesar/components/cell-fabric/types';
+
+interface ActiveCellData {
+  column: CellColumnFabric;
+  value: unknown;
+  recordSummary?: string;
+}
+
+interface SelectionData {
+  cellCount: number;
+}
+
+export interface SelectedCellData {
+  activeCellData?: ActiveCellData;
+  selectionData: SelectionData;
+}
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/cell/ActiveCellValue.svelte b/mathesar_ui/src/systems/table-view/table-inspector/cell/ActiveCellValue.svelte
deleted file mode 100644
index 368514e70f..0000000000
--- a/mathesar_ui/src/systems/table-view/table-inspector/cell/ActiveCellValue.svelte
+++ /dev/null
@@ -1,52 +0,0 @@
-<script lang="ts">
-  import { _ } from 'svelte-i18n';
-
-  import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
-  import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
-  import { parseCellId } from '@mathesar/components/sheet/cellIds';
-
-  const tabularData = getTabularDataStoreFromContext();
-
-  export let activeCellId: string;
-
-  $: ({ recordsData, processedColumns } = $tabularData);
-  $: ({ recordSummaries, selectableRowsMap } = recordsData);
-  $: rows = $selectableRowsMap;
-  $: ({ rowId, columnId } = parseCellId(activeCellId));
-  $: record = rows.get(rowId) ?? {};
-  $: selectedCellValue = record[columnId];
-  $: column = $processedColumns.get(Number(columnId));
-  $: recordSummary =
-    column &&
-    $recordSummaries.get(String(column.id))?.get(String(selectedCellValue));
-</script>
-
-<section class="cell-content">
-  <header>{$_('content')}</header>
-  <div class="content">
-    {#if column}
-      <CellFabric
-        isIndependentOfSheet={true}
-        disabled={true}
-        columnFabric={column}
-        value={selectedCellValue}
-        {recordSummary}
-      />
-    {/if}
-  </div>
-</section>
-
-<style lang="scss">
-  .cell-content {
-    header {
-      font-weight: 500;
-    }
-    .content {
-      white-space: pre-wrap;
-      border: 1px solid var(--slate-300);
-      padding: var(--size-xx-small);
-      border-radius: var(--border-radius-m);
-      margin-top: var(--size-x-small);
-    }
-  }
-</style>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/cell/CellMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/cell/CellMode.svelte
index 883a431fc0..dcdf6b3073 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/cell/CellMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/cell/CellMode.svelte
@@ -1,33 +1,18 @@
 <script lang="ts">
-  /**
-   * @file
-   *
-   * NOTICE: There is some code duplication between this file and
-   * `CellTab.svelte` used for the data explorer. It might be good to resolve
-   * this duplication at some point. In the meantime, be mindful of propagating
-   * changes to both files as necessary.
-   */
-  import { _ } from 'svelte-i18n';
-
+  import CellInspector from '@mathesar/components/inspector/cell/CellInspector.svelte';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
-  import ActiveCellValue from './ActiveCellValue.svelte';
+  import { getSelectedCellData } from './cellModeUtils';
 
   const tabularData = getTabularDataStoreFromContext();
 
-  $: ({ selection } = $tabularData);
-  $: ({ activeCellId } = $selection);
+  $: ({ selection, recordsData, processedColumns } = $tabularData);
+  $: ({ recordSummaries, selectableRowsMap } = recordsData);
+  $: selectedCellData = getSelectedCellData(
+    $selection,
+    $selectableRowsMap,
+    $processedColumns,
+    $recordSummaries,
+  );
 </script>
 
-<div class="section-content">
-  {#if activeCellId}
-    <ActiveCellValue {activeCellId} />
-  {:else}
-    {$_('select_cell_view_properties')}
-  {/if}
-</div>
-
-<style>
-  .section-content {
-    padding: var(--size-x-small);
-  }
-</style>
+<CellInspector {selectedCellData} />
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/cell/cellModeUtils.ts b/mathesar_ui/src/systems/table-view/table-inspector/cell/cellModeUtils.ts
new file mode 100644
index 0000000000..870348eb0e
--- /dev/null
+++ b/mathesar_ui/src/systems/table-view/table-inspector/cell/cellModeUtils.ts
@@ -0,0 +1,35 @@
+import type { SelectedCellData } from '@mathesar/components/inspector/cell/cellInspectorUtils';
+import { parseCellId } from '@mathesar/components/sheet/cellIds';
+import type SheetSelection from '@mathesar/components/sheet/selection/SheetSelection';
+import type {
+  ProcessedColumns,
+  RecordSummariesForSheet,
+} from '@mathesar/stores/table-data';
+
+export function getSelectedCellData(
+  selection: SheetSelection,
+  selectableRowsMap: Map<string, Record<string, unknown>>,
+  processedColumns: ProcessedColumns,
+  recordSummaries: RecordSummariesForSheet,
+): SelectedCellData {
+  const { activeCellId } = selection;
+  const selectionData = {
+    cellCount: selection.cellIds.size,
+  };
+  if (activeCellId === undefined) {
+    return { selectionData };
+  }
+  const { rowId, columnId } = parseCellId(activeCellId);
+  const record = selectableRowsMap.get(rowId) ?? {};
+  const value = record[columnId];
+  const column = processedColumns.get(Number(columnId));
+  const recordSummary = recordSummaries.get(columnId)?.get(String(value));
+  return {
+    activeCellData: column && {
+      column,
+      value,
+      recordSummary,
+    },
+    selectionData,
+  };
+}

From ad9dd5eb78fb0596d5dd9b84413c8f9534a94acb Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Sun, 18 Feb 2024 12:56:15 -0500
Subject: [PATCH 0034/1141] Pass columnIdentifierKey via prop not import

This is necessary because the table page and Data Explorer use
different values (and types) here.
---
 .../sheet/cells/SheetColumnCreationCell.svelte       |  7 +++++--
 .../components/sheet/cells/SheetOriginCell.svelte    |  7 +++++--
 .../components/sheet/cells/SheetRowHeaderCell.svelte |  6 ++++--
 .../systems/data-explorer/result-pane/Results.svelte |  7 +++++--
 .../src/systems/table-view/header/Header.svelte      | 12 ++++++++----
 mathesar_ui/src/systems/table-view/row/Row.svelte    |  5 ++++-
 6 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/mathesar_ui/src/components/sheet/cells/SheetColumnCreationCell.svelte b/mathesar_ui/src/components/sheet/cells/SheetColumnCreationCell.svelte
index 482f2bf5f0..9ca66fbe19 100644
--- a/mathesar_ui/src/components/sheet/cells/SheetColumnCreationCell.svelte
+++ b/mathesar_ui/src/components/sheet/cells/SheetColumnCreationCell.svelte
@@ -1,8 +1,11 @@
 <script lang="ts">
-  import { ID_ADD_NEW_COLUMN } from '@mathesar/stores/table-data';
   import { getSheetCellStyle } from './sheetCellUtils';
 
-  const style = getSheetCellStyle(ID_ADD_NEW_COLUMN);
+  type ColumnIdentifierKey = $$Generic;
+
+  export let columnIdentifierKey: ColumnIdentifierKey;
+
+  $: style = getSheetCellStyle(columnIdentifierKey);
 </script>
 
 <div data-sheet-element="new-column-cell" style={$style}>
diff --git a/mathesar_ui/src/components/sheet/cells/SheetOriginCell.svelte b/mathesar_ui/src/components/sheet/cells/SheetOriginCell.svelte
index 8f1096d02d..7af9d9748b 100644
--- a/mathesar_ui/src/components/sheet/cells/SheetOriginCell.svelte
+++ b/mathesar_ui/src/components/sheet/cells/SheetOriginCell.svelte
@@ -1,8 +1,11 @@
 <script lang="ts">
-  import { ID_ROW_CONTROL_COLUMN } from '@mathesar/stores/table-data';
   import { getSheetCellStyle } from './sheetCellUtils';
 
-  const style = getSheetCellStyle(ID_ROW_CONTROL_COLUMN);
+  type ColumnIdentifierKey = $$Generic;
+
+  export let columnIdentifierKey: ColumnIdentifierKey;
+
+  $: style = getSheetCellStyle(columnIdentifierKey);
 </script>
 
 <div data-sheet-element="origin-cell" style={$style}>
diff --git a/mathesar_ui/src/components/sheet/cells/SheetRowHeaderCell.svelte b/mathesar_ui/src/components/sheet/cells/SheetRowHeaderCell.svelte
index b0df3b2a0a..bdf05fecf1 100644
--- a/mathesar_ui/src/components/sheet/cells/SheetRowHeaderCell.svelte
+++ b/mathesar_ui/src/components/sheet/cells/SheetRowHeaderCell.svelte
@@ -1,10 +1,12 @@
 <script lang="ts">
-  import { ID_ROW_CONTROL_COLUMN } from '@mathesar/stores/table-data';
   import { getSheetCellStyle } from './sheetCellUtils';
 
-  const style = getSheetCellStyle(ID_ROW_CONTROL_COLUMN);
+  type ColumnIdentifierKey = $$Generic;
 
   export let rowSelectionId: string;
+  export let columnIdentifierKey: ColumnIdentifierKey;
+
+  $: style = getSheetCellStyle(columnIdentifierKey);
 </script>
 
 <div
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
index bb5c7b3d9a..323a92279c 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
@@ -87,7 +87,7 @@
       usesVirtualList
     >
       <SheetHeader>
-        <SheetOriginCell />
+        <SheetOriginCell columnIdentifierKey={ID_ROW_CONTROL_COLUMN} />
         {#each columnList as processedQueryColumn (processedQueryColumn.id)}
           <ResultHeaderCell
             {processedQueryColumn}
@@ -110,7 +110,10 @@
                 {...htmlAttributes}
                 style="--cell-height:{rowHeightPx - 1}px;{styleString}"
               >
-                <SheetRowHeaderCell rowSelectionId={'TODO_3037'}>
+                <SheetRowHeaderCell
+                  rowSelectionId={'TODO_3037'}
+                  columnIdentifierKey={ID_ROW_CONTROL_COLUMN}
+                >
                   <CellBackground color="var(--cell-bg-color-header)" />
                   {$pagination.offset + item.index + 1}
                 </SheetRowHeaderCell>
diff --git a/mathesar_ui/src/systems/table-view/header/Header.svelte b/mathesar_ui/src/systems/table-view/header/Header.svelte
index df3c19d110..ad28034c9f 100644
--- a/mathesar_ui/src/systems/table-view/header/Header.svelte
+++ b/mathesar_ui/src/systems/table-view/header/Header.svelte
@@ -5,13 +5,17 @@
   import { ContextMenu } from '@mathesar/component-library';
   import {
     SheetCellResizer,
+    SheetColumnCreationCell,
     SheetColumnHeaderCell,
     SheetHeader,
-    SheetColumnCreationCell,
   } from '@mathesar/components/sheet';
   import SheetOriginCell from '@mathesar/components/sheet/cells/SheetOriginCell.svelte';
   import type { ProcessedColumn } from '@mathesar/stores/table-data';
-  import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
+  import {
+    ID_ADD_NEW_COLUMN,
+    ID_ROW_CONTROL_COLUMN,
+    getTabularDataStoreFromContext,
+  } from '@mathesar/stores/table-data';
   import { saveColumnOrder } from '@mathesar/stores/tables';
   import { Draggable, Droppable } from './drag-and-drop';
   import ColumnHeaderContextMenu from './header-cell/ColumnHeaderContextMenu.svelte';
@@ -92,7 +96,7 @@
 </script>
 
 <SheetHeader>
-  <SheetOriginCell>
+  <SheetOriginCell columnIdentifierKey={ID_ROW_CONTROL_COLUMN}>
     <Droppable
       on:drop={() => dropColumn()}
       on:dragover={(e) => e.preventDefault()}
@@ -130,7 +134,7 @@
   {/each}
 
   {#if hasNewColumnButton}
-    <SheetColumnCreationCell>
+    <SheetColumnCreationCell columnIdentifierKey={ID_ADD_NEW_COLUMN}>
       <NewColumnCell />
     </SheetColumnCreationCell>
   {/if}
diff --git a/mathesar_ui/src/systems/table-view/row/Row.svelte b/mathesar_ui/src/systems/table-view/row/Row.svelte
index cddf79d67c..dc2f228071 100644
--- a/mathesar_ui/src/systems/table-view/row/Row.svelte
+++ b/mathesar_ui/src/systems/table-view/row/Row.svelte
@@ -70,7 +70,10 @@
     style="--cell-height:{rowHeightPx - 1}px;{styleString}"
     on:mousedown={checkAndCreateEmptyRow}
   >
-    <SheetRowHeaderCell rowSelectionId={'TODO_3037'}>
+    <SheetRowHeaderCell
+      rowSelectionId={'TODO_3037'}
+      columnIdentifierKey={ID_ROW_CONTROL_COLUMN}
+    >
       {#if rowHasRecord(row)}
         <RowControl
           {primaryKeyColumnId}

From 602e972a3bd1aafc25cb98244e80603ee5dc920c Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Sun, 18 Feb 2024 13:16:38 -0500
Subject: [PATCH 0035/1141] Use common CellInspector component within DE

---
 .../inspector/cell/CellInspector.svelte       |  8 ---
 .../exploration-inspector/CellTab.svelte      | 67 -------------------
 .../ExplorationInspector.svelte               |  2 +-
 .../exploration-inspector/cell/CellTab.svelte | 16 +++++
 .../cell/cellTabUtils.ts                      | 25 +++++++
 5 files changed, 42 insertions(+), 76 deletions(-)
 delete mode 100644 mathesar_ui/src/systems/data-explorer/exploration-inspector/CellTab.svelte
 create mode 100644 mathesar_ui/src/systems/data-explorer/exploration-inspector/cell/CellTab.svelte
 create mode 100644 mathesar_ui/src/systems/data-explorer/exploration-inspector/cell/cellTabUtils.ts

diff --git a/mathesar_ui/src/components/inspector/cell/CellInspector.svelte b/mathesar_ui/src/components/inspector/cell/CellInspector.svelte
index f01da7a677..0e6c3e8ad0 100644
--- a/mathesar_ui/src/components/inspector/cell/CellInspector.svelte
+++ b/mathesar_ui/src/components/inspector/cell/CellInspector.svelte
@@ -1,12 +1,4 @@
 <script lang="ts">
-  /**
-   * @file
-   *
-   * NOTICE: There is some code duplication between this file and
-   * `CellTab.svelte` used for the data explorer. It might be good to resolve
-   * this duplication at some point. In the meantime, be mindful of propagating
-   * changes to both files as necessary.
-   */
   import { _ } from 'svelte-i18n';
 
   import type { SelectedCellData } from './cellInspectorUtils';
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/CellTab.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/CellTab.svelte
deleted file mode 100644
index d7ae18237a..0000000000
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/CellTab.svelte
+++ /dev/null
@@ -1,67 +0,0 @@
-<script lang="ts">
-  /**
-   * @file
-   *
-   * NOTICE: There is some code duplication between this file and
-   * `CellMode.svelte` used for the table view. It might be good to resolve this
-   * duplication at some point. In the meantime, be mindful of propagating
-   * changes to both files as necessary.
-   */
-  import { _ } from 'svelte-i18n';
-  import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
-  import { parseCellId } from '@mathesar/components/sheet/cellIds';
-  import QueryRunner, { getRowSelectionId } from '../QueryRunner';
-
-  export let queryHandler: QueryRunner;
-
-  $: ({ selection, processedColumns, rowsData } = queryHandler);
-  $: ({ rows } = $rowsData);
-  $: ({ activeCellId } = $selection);
-  $: cell = activeCellId ? parseCellId(activeCellId) : undefined;
-  $: columnId = cell?.columnId ?? '';
-  // TODO: Usage of `find` is not ideal for perf here. Would be nice to store
-  // rows in a map for faster lookup.
-  $: row = rows.find((r) => getRowSelectionId(r) === cell?.rowId);
-  $: cellValue = row?.record[columnId];
-  $: column = $processedColumns.get(columnId);
-</script>
-
-<div class="section-content" class:has-content={cellValue !== undefined}>
-  {#if cellValue !== undefined}
-    <section class="cell-content">
-      <header>{$_('content')}</header>
-      <div class="content">
-        {#if column}
-          <CellFabric
-            isIndependentOfSheet={true}
-            disabled={true}
-            columnFabric={column}
-            value={cellValue}
-          />
-        {/if}
-      </div>
-    </section>
-  {:else}
-    {$_('select_cell_view_properties')}
-  {/if}
-</div>
-
-<style lang="scss">
-  .section-content {
-    &.has-content {
-      padding: var(--size-x-small);
-    }
-    .cell-content {
-      header {
-        font-weight: 500;
-      }
-      .content {
-        white-space: pre-wrap;
-        border: 1px solid var(--slate-300);
-        padding: var(--size-xx-small);
-        border-radius: var(--border-radius-m);
-        margin-top: var(--size-x-small);
-      }
-    }
-  }
-</style>
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte
index 6ef0dd00e8..9c33275db2 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte
@@ -4,7 +4,7 @@
   import type QueryManager from '../QueryManager';
   import ExplorationTab from './ExplorationTab.svelte';
   import ColumnTab from './column-tab/ColumnTab.svelte';
-  import CellTab from './CellTab.svelte';
+  import CellTab from './cell/CellTab.svelte';
 
   export let queryHandler: QueryRunner | QueryManager;
   export let canEditMetadata: boolean;
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/cell/CellTab.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/cell/CellTab.svelte
new file mode 100644
index 0000000000..8f57fa461b
--- /dev/null
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/cell/CellTab.svelte
@@ -0,0 +1,16 @@
+<script lang="ts">
+  import CellInspector from '@mathesar/components/inspector/cell/CellInspector.svelte';
+  import type QueryRunner from '../../QueryRunner';
+  import { getSelectedCellData } from './cellTabUtils';
+
+  export let queryHandler: QueryRunner;
+
+  $: ({ selection, processedColumns, rowsData } = queryHandler);
+  $: selectedCellData = getSelectedCellData(
+    $selection,
+    $rowsData.rows,
+    $processedColumns,
+  );
+</script>
+
+<CellInspector {selectedCellData} />
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/cell/cellTabUtils.ts b/mathesar_ui/src/systems/data-explorer/exploration-inspector/cell/cellTabUtils.ts
new file mode 100644
index 0000000000..479a659136
--- /dev/null
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/cell/cellTabUtils.ts
@@ -0,0 +1,25 @@
+import type { SelectedCellData } from '@mathesar/components/inspector/cell/cellInspectorUtils';
+import { parseCellId } from '@mathesar/components/sheet/cellIds';
+import type SheetSelection from '@mathesar/components/sheet/selection/SheetSelection';
+import { getRowSelectionId, type QueryRow } from '../../QueryRunner';
+import type { ProcessedQueryOutputColumnMap } from '../../utils';
+
+export function getSelectedCellData(
+  selection: SheetSelection,
+  rows: QueryRow[],
+  processedColumns: ProcessedQueryOutputColumnMap,
+): SelectedCellData {
+  const { activeCellId } = selection;
+  const selectionData = { cellCount: selection.cellIds.size };
+  const fallback = { selectionData };
+  if (!activeCellId) return fallback;
+  const { rowId, columnId } = parseCellId(activeCellId);
+  // TODO: Usage of `find` is not ideal for perf here. Would be nice to store
+  // rows in a map for faster lookup.
+  const row = rows.find((r) => getRowSelectionId(r) === rowId);
+  if (!row) return fallback;
+  const value = row.record[columnId];
+  const column = processedColumns.get(columnId);
+  const activeCellData = column && { column, value };
+  return { activeCellData, selectionData };
+}

From 63b6dd90a0c274e0f37a402a7252784bfb76db84 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Sun, 18 Feb 2024 13:44:11 -0500
Subject: [PATCH 0036/1141] Pass selection into data explorer sheet

---
 mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
index 323a92279c..a1786e55df 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
@@ -85,6 +85,7 @@
       {columnWidths}
       {clipboardHandler}
       usesVirtualList
+      {selection}
     >
       <SheetHeader>
         <SheetOriginCell columnIdentifierKey={ID_ROW_CONTROL_COLUMN} />

From af35b896346e65b6690a332919535316fd1a2d42 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Sun, 18 Feb 2024 13:46:48 -0500
Subject: [PATCH 0037/1141] Re-enable copying data explorer cells

---
 .../src/systems/data-explorer/result-pane/Results.svelte    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
index a1786e55df..450825a910 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
@@ -46,10 +46,8 @@
       rowsMap: get(selectableRowsMap),
       columnsMap: get(processedColumns),
       recordSummaries: new ImmutableMap(),
-      // TODO_3037
-      selectedRowIds: new ImmutableSet(),
-      // TODO_3037
-      selectedColumnIds: new ImmutableSet(),
+      selectedRowIds: get(selection).rowIds,
+      selectedColumnIds: get(selection).columnIds,
     }),
     showToastInfo: toast.info,
   });

From 748134dcb3932cf39b88950b51304ef6d77c1658 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Sun, 18 Feb 2024 14:27:45 -0500
Subject: [PATCH 0038/1141] Reinstate row header selection in table page

---
 mathesar_ui/src/systems/table-view/row/Row.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mathesar_ui/src/systems/table-view/row/Row.svelte b/mathesar_ui/src/systems/table-view/row/Row.svelte
index dc2f228071..cacc964df4 100644
--- a/mathesar_ui/src/systems/table-view/row/Row.svelte
+++ b/mathesar_ui/src/systems/table-view/row/Row.svelte
@@ -39,6 +39,7 @@
   $: ({ pkColumn } = columnsDataStore);
   $: primaryKeyColumnId = $pkColumn?.id;
   $: rowKey = getRowKey(row, primaryKeyColumnId);
+  $: rowSelectionId = getRowSelectionId(row);
   $: creationStatus = $rowCreationStatus.get(rowKey)?.state;
   $: status = $rowStatus.get(rowKey);
   $: wholeRowState = status?.wholeRowState;
@@ -71,7 +72,7 @@
     on:mousedown={checkAndCreateEmptyRow}
   >
     <SheetRowHeaderCell
-      rowSelectionId={'TODO_3037'}
+      {rowSelectionId}
       columnIdentifierKey={ID_ROW_CONTROL_COLUMN}
     >
       {#if rowHasRecord(row)}

From 7fded1c2107089df475c265d6edb77a4079f0c19 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Sun, 18 Feb 2024 14:40:13 -0500
Subject: [PATCH 0039/1141] Reinstate row header selection in data explorer

---
 .../result-pane/ResultRowCell.svelte          |  5 ++--
 .../data-explorer/result-pane/Results.svelte  | 23 ++++++++++++++-----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
index 30f947fcee..30f10f7d2d 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
@@ -7,15 +7,16 @@
   import { makeCellId } from '@mathesar/components/sheet/cellIds';
   import type SheetSelection from '@mathesar/components/sheet/selection/SheetSelection';
   import { handleKeyboardEventOnCell } from '@mathesar/components/sheet/sheetKeyboardUtils';
-  import { getRowSelectionId, type QueryRow } from '../QueryRunner';
+  import type { QueryRow } from '../QueryRunner';
   import type { ProcessedQueryOutputColumn } from '../utils';
 
   export let column: ProcessedQueryOutputColumn;
   export let row: QueryRow | undefined;
+  export let rowSelectionId: string;
   export let recordRunState: RequestStatus['state'] | undefined;
   export let selection: Writable<SheetSelection>;
 
-  $: cellId = row && makeCellId(getRowSelectionId(row), column.id);
+  $: cellId = row && makeCellId(rowSelectionId, column.id);
 </script>
 
 <SheetDataCell
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
index 450825a910..ca067b624f 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
@@ -2,22 +2,23 @@
   import { _ } from 'svelte-i18n';
   import { get } from 'svelte/store';
 
-  import { ImmutableMap, ImmutableSet } from '@mathesar-component-library';
+  import { ImmutableMap } from '@mathesar-component-library';
   import CellBackground from '@mathesar/components/CellBackground.svelte';
   import PaginationGroup from '@mathesar/components/PaginationGroup.svelte';
   import {
     Sheet,
     SheetHeader,
-    SheetRowHeaderCell,
+    SheetOriginCell,
     SheetRow,
+    SheetRowHeaderCell,
     SheetVirtualRows,
-    SheetOriginCell,
   } from '@mathesar/components/sheet';
   import { SheetClipboardHandler } from '@mathesar/components/sheet/SheetClipboardHandler';
   import { rowHeaderWidthPx, rowHeightPx } from '@mathesar/geometry';
   import { toast } from '@mathesar/stores/toast';
   import type QueryManager from '../QueryManager';
   import type QueryRunner from '../QueryRunner';
+  import { getRowSelectionId } from '../QueryRunner';
   import QueryRefreshButton from './QueryRefreshButton.svelte';
   import QueryRunErrors from './QueryRunErrors.svelte';
   import ResultHeaderCell from './ResultHeaderCell.svelte';
@@ -65,6 +66,13 @@
     (recordRunState === 'success' || recordRunState === 'processing') &&
     !rows.length;
   $: sheetItemCount = showDummyGhostRow ? 1 : rows.length;
+
+  function getRow(index: number) {
+    // Type assertion is here to widen type because we don't have
+    // `noUncheckedIndexedAccess` enabled yet. See
+    // https://github.com/mathesar-foundation/mathesar/issues/1966
+    return rows[index] as (typeof rows)[0] | undefined;
+  }
 </script>
 
 <div data-identifier="query-run-result">
@@ -103,14 +111,16 @@
         let:items
       >
         {#each items as item (item.key)}
-          {#if rows[item.index] || showDummyGhostRow}
+          {@const row = getRow(item.index)}
+          {@const rowSelectionId = (row && getRowSelectionId(row)) ?? ''}
+          {#if row || showDummyGhostRow}
             <SheetRow style={item.style} let:htmlAttributes let:styleString>
               <div
                 {...htmlAttributes}
                 style="--cell-height:{rowHeightPx - 1}px;{styleString}"
               >
                 <SheetRowHeaderCell
-                  rowSelectionId={'TODO_3037'}
+                  {rowSelectionId}
                   columnIdentifierKey={ID_ROW_CONTROL_COLUMN}
                 >
                   <CellBackground color="var(--cell-bg-color-header)" />
@@ -119,7 +129,8 @@
 
                 {#each columnList as processedQueryColumn (processedQueryColumn.id)}
                   <ResultRowCell
-                    row={rows[item.index]}
+                    {row}
+                    {rowSelectionId}
                     column={processedQueryColumn}
                     {recordRunState}
                     {selection}

From a2ee62de85c03b7e6ee5e1978ad5fec1ca504618 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 4 Mar 2024 13:07:07 -0500
Subject: [PATCH 0040/1141] Reinstate deleting records

---
 mathesar_ui/src/stores/table-data/records.ts  | 31 ++++-----
 .../src/systems/data-explorer/QueryRunner.ts  |  6 +-
 .../data-explorer/result-pane/Results.svelte  |  3 +-
 .../src/systems/table-view/TableView.svelte   |  5 +-
 .../table-view/row/RowContextOptions.svelte   |  4 +-
 .../table-inspector/cell/cellModeUtils.ts     | 13 ++--
 .../table-inspector/record/RecordMode.svelte  |  5 +-
 .../table-inspector/record/RowActions.svelte  | 64 ++++++++-----------
 mathesar_ui/src/utils/iterUtils.ts            | 12 ++++
 9 files changed, 79 insertions(+), 64 deletions(-)

diff --git a/mathesar_ui/src/stores/table-data/records.ts b/mathesar_ui/src/stores/table-data/records.ts
index da90576fd9..25dd965a4d 100644
--- a/mathesar_ui/src/stores/table-data/records.ts
+++ b/mathesar_ui/src/stores/table-data/records.ts
@@ -302,8 +302,8 @@ export class RecordsData {
 
   error: Writable<string | undefined>;
 
-  /** Keys are row ids, values are records */
-  selectableRowsMap: Readable<Map<string, Record<string, unknown>>>;
+  /** Keys are row selection ids */
+  selectableRowsMap: Readable<Map<string, RecordRow>>;
 
   private promise: CancellablePromise<ApiRecordsResponse> | undefined;
 
@@ -364,7 +364,7 @@ export class RecordsData {
       [this.savedRecords, this.newRecords],
       ([savedRecords, newRecords]) => {
         const records = [...savedRecords, ...newRecords];
-        return new Map(records.map((r) => [getRowSelectionId(r), r.record]));
+        return new Map(records.map((r) => [getRowSelectionId(r), r]));
       },
     );
 
@@ -457,22 +457,23 @@ export class RecordsData {
     return undefined;
   }
 
-  async deleteSelected(selectedRowIndices: number[]): Promise<void> {
-    const recordRows = this.getRecordRows();
+  async deleteSelected(rowSelectionIds: Iterable<string>): Promise<void> {
+    const ids =
+      typeof rowSelectionIds === 'string' ? [rowSelectionIds] : rowSelectionIds;
     const pkColumn = get(this.columnsDataStore.pkColumn);
     const primaryKeysOfSavedRows: string[] = [];
     const identifiersOfUnsavedRows: string[] = [];
-    selectedRowIndices.forEach((index) => {
-      const row = recordRows[index];
-      if (row) {
-        const rowKey = getRowKey(row, pkColumn?.id);
-        if (pkColumn?.id && isDefinedNonNullable(row.record[pkColumn?.id])) {
-          primaryKeysOfSavedRows.push(rowKey);
-        } else {
-          identifiersOfUnsavedRows.push(rowKey);
-        }
+    const selectableRows = get(this.selectableRowsMap);
+    for (const rowId of ids) {
+      const row = selectableRows.get(rowId);
+      if (!row) continue;
+      const rowKey = getRowKey(row, pkColumn?.id);
+      if (pkColumn?.id && isDefinedNonNullable(row.record[pkColumn?.id])) {
+        primaryKeysOfSavedRows.push(rowKey);
+      } else {
+        identifiersOfUnsavedRows.push(rowKey);
       }
-    });
+    }
     const rowKeys = [...primaryKeysOfSavedRows, ...identifiersOfUnsavedRows];
 
     if (rowKeys.length === 0) {
diff --git a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
index 63a4cb6db0..baee9cb275 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
@@ -64,8 +64,8 @@ export default class QueryRunner {
     new ImmutableMap(),
   );
 
-  /** Keys are row ids, values are records */
-  selectableRowsMap: Readable<Map<string, Record<string, unknown>>>;
+  /** Keys are row selection ids */
+  selectableRowsMap: Readable<Map<string, QueryRow>>;
 
   selection: Writable<SheetSelection>;
 
@@ -108,7 +108,7 @@ export default class QueryRunner {
     void this.run();
     this.selectableRowsMap = derived(
       this.rowsData,
-      ({ rows }) => new Map(rows.map((r) => [getRowSelectionId(r), r.record])),
+      ({ rows }) => new Map(rows.map((r) => [getRowSelectionId(r), r])),
     );
 
     const plane = derived(
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
index ca067b624f..6c0ba4d5c2 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { map } from 'iter-tools';
   import { _ } from 'svelte-i18n';
   import { get } from 'svelte/store';
 
@@ -44,7 +45,7 @@
   $: ({ initial_columns } = $query);
   $: clipboardHandler = new SheetClipboardHandler({
     getCopyingContext: () => ({
-      rowsMap: get(selectableRowsMap),
+      rowsMap: new Map(map(([k, r]) => [k, r.record], get(selectableRowsMap))),
       columnsMap: get(processedColumns),
       recordSummaries: new ImmutableMap(),
       selectedRowIds: get(selection).rowIds,
diff --git a/mathesar_ui/src/systems/table-view/TableView.svelte b/mathesar_ui/src/systems/table-view/TableView.svelte
index 3f3dad227e..55f7822027 100644
--- a/mathesar_ui/src/systems/table-view/TableView.svelte
+++ b/mathesar_ui/src/systems/table-view/TableView.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { map } from 'iter-tools';
   import { get } from 'svelte/store';
 
   import { ImmutableMap } from '@mathesar-component-library';
@@ -49,7 +50,9 @@
     $tabularData);
   $: clipboardHandler = new SheetClipboardHandler({
     getCopyingContext: () => ({
-      rowsMap: get(recordsData.selectableRowsMap),
+      rowsMap: new Map(
+        map(([k, r]) => [k, r.record], get(recordsData.selectableRowsMap)),
+      ),
       columnsMap: stringifyMapKeys(get(processedColumns)),
       recordSummaries: get(recordsData.recordSummaries),
       selectedRowIds: get(selection).rowIds,
diff --git a/mathesar_ui/src/systems/table-view/row/RowContextOptions.svelte b/mathesar_ui/src/systems/table-view/row/RowContextOptions.svelte
index 654dbc82c2..d7035da953 100644
--- a/mathesar_ui/src/systems/table-view/row/RowContextOptions.svelte
+++ b/mathesar_ui/src/systems/table-view/row/RowContextOptions.svelte
@@ -17,6 +17,7 @@
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
+  import { getRowSelectionId } from '@mathesar/stores/table-data/records';
 
   export let row: RecordRow;
   export let recordPk: string;
@@ -37,14 +38,13 @@
 
   async function handleDeleteRecords() {
     if (rowHasRecord(row)) {
-      const selectedRowIndices = [Number(row.rowIndex)];
       void confirmDelete({
         identifierType: $_('record'),
         body: [
           $_('deleted_records_cannot_be_recovered', { values: { count: 1 } }),
           $_('are_you_sure_to_proceed'),
         ],
-        onProceed: () => recordsData.deleteSelected(selectedRowIndices),
+        onProceed: () => recordsData.deleteSelected(getRowSelectionId(row)),
         onError: (e) => toast.fromError(e),
         onSuccess: () =>
           toast.success({
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/cell/cellModeUtils.ts b/mathesar_ui/src/systems/table-view/table-inspector/cell/cellModeUtils.ts
index 870348eb0e..95de1213d9 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/cell/cellModeUtils.ts
+++ b/mathesar_ui/src/systems/table-view/table-inspector/cell/cellModeUtils.ts
@@ -1,14 +1,16 @@
+import { defined } from '@mathesar-component-library';
 import type { SelectedCellData } from '@mathesar/components/inspector/cell/cellInspectorUtils';
 import { parseCellId } from '@mathesar/components/sheet/cellIds';
 import type SheetSelection from '@mathesar/components/sheet/selection/SheetSelection';
 import type {
   ProcessedColumns,
+  RecordRow,
   RecordSummariesForSheet,
 } from '@mathesar/stores/table-data';
 
 export function getSelectedCellData(
   selection: SheetSelection,
-  selectableRowsMap: Map<string, Record<string, unknown>>,
+  selectableRowsMap: Map<string, RecordRow>,
   processedColumns: ProcessedColumns,
   recordSummaries: RecordSummariesForSheet,
 ): SelectedCellData {
@@ -20,10 +22,13 @@ export function getSelectedCellData(
     return { selectionData };
   }
   const { rowId, columnId } = parseCellId(activeCellId);
-  const record = selectableRowsMap.get(rowId) ?? {};
-  const value = record[columnId];
+  const row = selectableRowsMap.get(rowId);
+  const value = row?.record[columnId];
   const column = processedColumns.get(Number(columnId));
-  const recordSummary = recordSummaries.get(columnId)?.get(String(value));
+  const recordSummary = defined(
+    value,
+    (v) => recordSummaries.get(columnId)?.get(String(v)),
+  );
   return {
     activeCellData: column && {
       column,
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
index ad92a8261a..bdc8fa956a 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
@@ -18,7 +18,8 @@
     { database, schema },
     'canEditTableRecords',
   );
-  $: selectedRowCount = $selection.rowIds.size;
+  $: selectedRowIds = $selection.rowIds;
+  $: selectedRowCount = selectedRowIds.size;
 
   // TODO_3037 Need to calculate selectedRowIndices. This might be a deeper
   // problem. Seems like we might need access to the row index here instead of
@@ -39,7 +40,7 @@
       <CollapsibleHeader slot="header" title={$_('actions')} />
       <div slot="content" class="content-container">
         <RowActions
-          {selectedRowIndices}
+          {selectedRowIds}
           {recordsData}
           columnsDataStore={$tabularData.columnsDataStore}
           {canEditTableRecords}
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
index 4608a286e3..2a3acc3b46 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import {
     AnchorButton,
     Button,
     Icon,
+    ImmutableSet,
     iconExternalLink,
   } from '@mathesar-component-library';
   import { iconDeleteMajor, iconRecord } from '@mathesar/icons';
@@ -15,67 +17,57 @@
   } from '@mathesar/stores/table-data';
   import { getPkValueInRecord } from '@mathesar/stores/table-data/records';
   import { toast } from '@mathesar/stores/toast';
+  import { takeFirstAndOnly } from '@mathesar/utils/iterUtils';
 
-  export let selectedRowIndices: number[];
+  export let selectedRowIds: ImmutableSet<string>;
   export let recordsData: RecordsData;
   export let columnsDataStore: ColumnsDataStore;
   export let canEditTableRecords: boolean;
 
+  $: selectedRowCount = selectedRowIds.size;
+  $: ({ columns } = columnsDataStore);
+  $: ({ selectableRowsMap } = recordsData);
+  $: recordPageLink = (() => {
+    const id = takeFirstAndOnly(selectedRowIds);
+    if (!id) return undefined;
+    const row = $selectableRowsMap.get(id);
+    if (!row) return;
+    try {
+      const recordId = getPkValueInRecord(row.record, $columns);
+      return $storeToGetRecordPageUrl({ recordId });
+    } catch (e) {
+      return undefined;
+    }
+  })();
+  $: showDeleteRecordButton = canEditTableRecords;
+  $: showNullStateText = !showDeleteRecordButton && !recordPageLink;
+
   async function handleDeleteRecords() {
     void confirmDelete({
       identifierType: $_('multiple_records', {
-        values: { count: selectedRowIndices.length },
+        values: { count: selectedRowCount },
       }),
       body: [
         $_('deleted_records_cannot_be_recovered', {
-          values: { count: selectedRowIndices.length },
+          values: { count: selectedRowCount },
         }),
         $_('are_you_sure_to_proceed'),
       ],
-      onProceed: () => recordsData.deleteSelected(selectedRowIndices),
+      onProceed: () => recordsData.deleteSelected(selectedRowIds),
       onError: (e) => toast.fromError(e),
       onSuccess: () => {
         toast.success({
           title: $_('count_records_deleted_successfully', {
-            values: { count: selectedRowIndices.length },
+            values: { count: selectedRowCount },
           }),
         });
-        // // TODO_3037 verify that selection behaves okay after deleting records
-        // selection.resetSelection();
       },
     });
   }
-
-  $: ({ columns } = columnsDataStore);
-  $: recordPageLink = (() => {
-    const selectedRowIndex = selectedRowIndices[0];
-    const recordRow = recordsData.getRecordRows()[selectedRowIndex];
-
-    if (!recordRow) {
-      return '';
-    }
-
-    let recordId: string | number;
-    try {
-      recordId = getPkValueInRecord(recordRow.record, $columns);
-    } catch (e) {
-      return '';
-    }
-
-    return (
-      $storeToGetRecordPageUrl({
-        recordId,
-      }) || ''
-    );
-  })();
-
-  $: showOpenRecordLink = selectedRowIndices.length === 1 && recordPageLink;
-  $: showDeleteRecordButton = canEditTableRecords;
-  $: showNullStateText = !showDeleteRecordButton && !showOpenRecordLink;
 </script>
 
 <div class="actions-container">
-  {#if showOpenRecordLink}
+  {#if recordPageLink}
     <AnchorButton href={recordPageLink}>
       <div class="action-item">
         <div>
@@ -90,7 +82,7 @@
     <Button on:click={handleDeleteRecords}>
       <Icon {...iconDeleteMajor} />
       <span>
-        {$_('delete_records', { values: { count: selectedRowIndices.length } })}
+        {$_('delete_records', { values: { count: selectedRowCount } })}
       </span>
     </Button>
   {/if}
diff --git a/mathesar_ui/src/utils/iterUtils.ts b/mathesar_ui/src/utils/iterUtils.ts
index 36553b2d7d..805370b416 100644
--- a/mathesar_ui/src/utils/iterUtils.ts
+++ b/mathesar_ui/src/utils/iterUtils.ts
@@ -32,3 +32,15 @@ export function mapExactlyOne<T, Z, O, M>(
   }
   return p.whenMany;
 }
+
+/**
+ * If the iterable contains exactly one element, returns that element. Otherwise
+ * returns undefined.
+ */
+export function takeFirstAndOnly<T>(iterable: Iterable<T>): T | undefined {
+  return mapExactlyOne(iterable, {
+    whenZero: undefined,
+    whenOne: (v) => v,
+    whenMany: undefined,
+  });
+}

From 53b8317454870c960068257342b74fa5d2ddcdd7 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 4 Mar 2024 14:04:58 -0500
Subject: [PATCH 0041/1141] Fix checkbox toggle on click

---
 .../data-types/components/CellWrapper.svelte  |  2 ++
 .../components/checkbox/CheckboxCell.svelte   | 30 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
index 3f4c9ca1d1..e97c8f8646 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
@@ -106,7 +106,9 @@
   on:click
   on:dblclick
   on:mousedown
+  on:mouseup
   on:mouseenter
+  on:mouseleave
   on:keydown
   on:copy={handleCopy}
   on:focus={handleFocus}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/checkbox/CheckboxCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/checkbox/CheckboxCell.svelte
index d85f256b1f..a5f14189f0 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/checkbox/CheckboxCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/checkbox/CheckboxCell.svelte
@@ -17,7 +17,7 @@
   export let isIndependentOfSheet: $$Props['isIndependentOfSheet'];
 
   let cellRef: HTMLElement;
-  let isFirstActivated = false;
+  let shouldToggleOnMouseUp = false;
 
   $: valueComparisonOutcome = compareWholeValues(searchValue, value);
 
@@ -48,24 +48,20 @@
     }
   }
 
-  function checkAndToggle(e: Event) {
-    if (!disabled && isActive && e.target === cellRef && !isFirstActivated) {
+  function handleMouseDown() {
+    shouldToggleOnMouseUp = isActive;
+  }
+
+  function handleMouseLeave() {
+    shouldToggleOnMouseUp = false;
+  }
+
+  function handleMouseUp() {
+    if (!disabled && isActive && shouldToggleOnMouseUp) {
       value = !value;
       dispatchUpdate();
     }
-    isFirstActivated = false;
-    cellRef?.focus();
   }
-
-  // // TODO_3037: test checkbox cell thoroughly. The `isFirstActivated`
-  // // variable is no longer getting set. We need to figure out what to do to
-  // // handle this.
-  // function handleMouseDown() {
-  //   if (!isActive) {
-  //     isFirstActivated = true;
-  //     dispatch('activate');
-  //   }
-  // }
 </script>
 
 <CellWrapper
@@ -75,8 +71,10 @@
   {isIndependentOfSheet}
   {valueComparisonOutcome}
   on:mouseenter
+  on:mouseleave={handleMouseLeave}
   on:keydown={handleWrapperKeyDown}
-  on:click={checkAndToggle}
+  on:mousedown={handleMouseDown}
+  on:mouseup={handleMouseUp}
 >
   {#if value === undefined}
     <Default />

From c1fee48fdd18b6978ff8964e1e238b975c300bac Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 4 Mar 2024 14:20:03 -0500
Subject: [PATCH 0042/1141] Fix LinkedRecordCell launch on click

---
 .../components/linked-record/LinkedRecordCell.svelte   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordCell.svelte
index 9f71177829..df14de41f1 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordCell.svelte
@@ -79,11 +79,10 @@
     }
   }
 
-  // // TODO_3037: test and see if we need `wasActiveBeforeClick`
-  // function handleMouseDown() {
-  //   wasActiveBeforeClick = isActive;
-  //   dispatch('activate');
-  // }
+  function handleMouseDown() {
+    wasActiveBeforeClick = isActive;
+    dispatch('activate');
+  }
 
   function handleClick() {
     if (wasActiveBeforeClick) {
@@ -98,6 +97,7 @@
   {isIndependentOfSheet}
   on:mouseenter
   on:keydown={handleWrapperKeyDown}
+  on:mousedown={handleMouseDown}
   on:click={handleClick}
   on:dblclick={launchRecordSelector}
   hasPadding={false}

From 7bee2ed008c71941bf37bbf5b591294bf6c38f38 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 4 Mar 2024 14:27:09 -0500
Subject: [PATCH 0043/1141] Fix SingleSelectCell opening

---
 .../components/select/SingleSelectCell.svelte      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/select/SingleSelectCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/select/SingleSelectCell.svelte
index 2469775798..c9c70ea850 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/select/SingleSelectCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/select/SingleSelectCell.svelte
@@ -42,13 +42,12 @@
     isInitiallyActivated = false;
   }
 
-  // // TODO_3037 test an see how to fix `isInitiallyActivated` logic
-  // function handleMouseDown() {
-  //   if (!isActive) {
-  //     isInitiallyActivated = true;
-  //     dispatch('activate');
-  //   }
-  // }
+  function handleMouseDown() {
+    if (!isActive) {
+      isInitiallyActivated = true;
+      dispatch('activate');
+    }
+  }
 
   function handleKeyDown(
     e: KeyboardEvent,
@@ -115,6 +114,7 @@
     {isActive}
     {disabled}
     {isIndependentOfSheet}
+    on:mousedown={handleMouseDown}
     on:mouseenter
     on:click={() => checkAndToggle(api)}
     on:keydown={(e) => handleKeyDown(e, api, isOpen)}

From 16fdd6372014a3e2797f992e176049384b9b97c1 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 4 Mar 2024 15:25:20 -0500
Subject: [PATCH 0044/1141] Implement shift+click to select range

---
 mathesar_ui/src/components/sheet/Sheet.svelte | 29 ++++++++++++++----
 .../sheet/selection/selectionUtils.ts         |  6 ++--
 mathesar_ui/src/utils/pointerUtils.ts         | 30 +++++++++++++++++++
 3 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 mathesar_ui/src/utils/pointerUtils.ts

diff --git a/mathesar_ui/src/components/sheet/Sheet.svelte b/mathesar_ui/src/components/sheet/Sheet.svelte
index 92b876876e..0bf2344765 100644
--- a/mathesar_ui/src/components/sheet/Sheet.svelte
+++ b/mathesar_ui/src/components/sheet/Sheet.svelte
@@ -4,7 +4,12 @@
   import { ImmutableMap } from '@mathesar-component-library/types';
   import type { ClipboardHandler } from '@mathesar/stores/clipboard';
   import { getClipboardHandlerStoreFromContext } from '@mathesar/stores/clipboard';
-  import { beginSelection, findContainingSheetCell } from './selection';
+  import { getModifierKeyCombo } from '@mathesar/utils/pointerUtils';
+  import {
+    beginSelection,
+    findContainingSheetCell,
+    type SheetCellDetails,
+  } from './selection';
   import type SheetSelection from './selection/SheetSelection';
   import {
     calculateColumnStyleMapAndRowWidth,
@@ -122,13 +127,25 @@
 
   function handleMouseDown(e: MouseEvent) {
     if (!selection) return;
-    // TODO_3037:
-    // - handle mouse events with other buttons
-    // - handle Shift/Alt/Ctrl key modifiers
+
     const target = e.target as HTMLElement;
-    const startingCell = findContainingSheetCell(target);
+    const targetCell = findContainingSheetCell(target);
+    if (!targetCell) return;
+
+    const startingCell: SheetCellDetails | undefined = (() => {
+      const modifierKeyCombo = getModifierKeyCombo(e);
+      if (modifierKeyCombo === '') return targetCell;
+      if (modifierKeyCombo === 'Shift') {
+        if (!$selection) return undefined;
+        const { activeCellId } = $selection;
+        if (!activeCellId) return undefined;
+        return { type: 'data-cell', cellId: activeCellId };
+      }
+      return undefined;
+    })();
     if (!startingCell) return;
-    beginSelection({ selection, sheetElement, startingCell });
+
+    beginSelection({ selection, sheetElement, startingCell, targetCell });
   }
 </script>
 
diff --git a/mathesar_ui/src/components/sheet/selection/selectionUtils.ts b/mathesar_ui/src/components/sheet/selection/selectionUtils.ts
index 32558f0884..f79f894597 100644
--- a/mathesar_ui/src/components/sheet/selection/selectionUtils.ts
+++ b/mathesar_ui/src/components/sheet/selection/selectionUtils.ts
@@ -41,10 +41,12 @@ export function beginSelection({
   selection,
   sheetElement,
   startingCell,
+  targetCell,
 }: {
-  startingCell: SheetCellDetails;
   selection: Writable<SheetSelection>;
   sheetElement: HTMLElement;
+  startingCell: SheetCellDetails;
+  targetCell: SheetCellDetails;
 }) {
   let previousTarget: HTMLElement | undefined;
 
@@ -65,7 +67,7 @@ export function beginSelection({
     window.removeEventListener('mouseup', finish);
   }
 
-  drawToCell(startingCell);
+  drawToCell(targetCell);
   sheetElement.addEventListener('mousemove', drawToPoint);
   window.addEventListener('mouseup', finish);
 }
diff --git a/mathesar_ui/src/utils/pointerUtils.ts b/mathesar_ui/src/utils/pointerUtils.ts
new file mode 100644
index 0000000000..82db98c0a7
--- /dev/null
+++ b/mathesar_ui/src/utils/pointerUtils.ts
@@ -0,0 +1,30 @@
+type ModifierKeyCombo =
+  | ''
+  // 1 modifier
+  | 'Alt'
+  | 'Ctrl'
+  | 'Meta'
+  | 'Shift'
+  // 2 modifiers
+  | 'Alt+Ctrl'
+  | 'Alt+Meta'
+  | 'Alt+Shift'
+  | 'Ctrl+Meta'
+  | 'Ctrl+Shift'
+  | 'Meta+Shift'
+  // 3 modifiers
+  | 'Alt+Ctrl+Meta'
+  | 'Alt+Ctrl+Shift'
+  | 'Alt+Meta+Shift'
+  | 'Ctrl+Meta+Shift'
+  // 4 modifiers
+  | 'Alt+Ctrl+Meta+Shift';
+
+export function getModifierKeyCombo(e: MouseEvent) {
+  return [
+    ...(e.altKey ? ['Alt'] : []),
+    ...(e.ctrlKey ? ['Ctrl'] : []),
+    ...(e.metaKey ? ['Meta'] : []),
+    ...(e.shiftKey ? ['Shift'] : []),
+  ].join('+') as ModifierKeyCombo;
+}

From 610c138a3fd7921456749f236e60baee0f087f7d Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 4 Mar 2024 15:37:30 -0500
Subject: [PATCH 0045/1141] Order a table's processed columns sooner

---
 .../src/stores/table-data/tabularData.ts      | 44 +++++++++----------
 .../src/systems/table-view/TableView.svelte   |  7 +--
 2 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/mathesar_ui/src/stores/table-data/tabularData.ts b/mathesar_ui/src/stores/table-data/tabularData.ts
index a16572f80f..80700931a6 100644
--- a/mathesar_ui/src/stores/table-data/tabularData.ts
+++ b/mathesar_ui/src/stores/table-data/tabularData.ts
@@ -47,11 +47,8 @@ export class TabularData {
 
   columnsDataStore: ColumnsDataStore;
 
-  /** TODO_3037 eliminate `processedColumns` in favor of `orderedProcessedColumns` */
   processedColumns: ProcessedColumnsStore;
 
-  orderedProcessedColumns: ProcessedColumnsStore;
-
   constraintsDataStore: ConstraintsDataStore;
 
   recordsData: RecordsData;
@@ -96,35 +93,34 @@ export class TabularData {
       this.recordsData,
     );
 
+    this.table = props.table;
+
     this.processedColumns = derived(
       [this.columnsDataStore.columns, this.constraintsDataStore],
       ([columns, constraintsData]) =>
-        new Map(
-          columns.map((column, columnIndex) => [
-            column.id,
-            processColumn({
-              tableId: this.id,
-              column,
-              columnIndex,
-              constraints: constraintsData.constraints,
-              abstractTypeMap: props.abstractTypesMap,
-              hasEnhancedPrimaryKeyCell: props.hasEnhancedPrimaryKeyCell,
-            }),
-          ]),
+        orderProcessedColumns(
+          new Map(
+            columns.map((column, columnIndex) => [
+              column.id,
+              processColumn({
+                tableId: this.id,
+                column,
+                columnIndex,
+                constraints: constraintsData.constraints,
+                abstractTypeMap: props.abstractTypesMap,
+                hasEnhancedPrimaryKeyCell: props.hasEnhancedPrimaryKeyCell,
+              }),
+            ]),
+          ),
+          this.table,
         ),
     );
 
-    this.table = props.table;
-
-    this.orderedProcessedColumns = derived(this.processedColumns, (p) =>
-      orderProcessedColumns(p, this.table),
-    );
-
     const plane = derived(
-      [this.recordsData.selectableRowsMap, this.orderedProcessedColumns],
-      ([selectableRowsMap, orderedProcessedColumns]) => {
+      [this.recordsData.selectableRowsMap, this.processedColumns],
+      ([selectableRowsMap, processedColumns]) => {
         const rowIds = new Series([...selectableRowsMap.keys()]);
-        const columns = [...orderedProcessedColumns.values()];
+        const columns = [...processedColumns.values()];
         const columnIds = new Series(columns.map((c) => String(c.id)));
         return new Plane(rowIds, columnIds);
       },
diff --git a/mathesar_ui/src/systems/table-view/TableView.svelte b/mathesar_ui/src/systems/table-view/TableView.svelte
index 55f7822027..cb5052b530 100644
--- a/mathesar_ui/src/systems/table-view/TableView.svelte
+++ b/mathesar_ui/src/systems/table-view/TableView.svelte
@@ -22,7 +22,6 @@
   import { toast } from '@mathesar/stores/toast';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { stringifyMapKeys } from '@mathesar/utils/collectionUtils';
-  import { orderProcessedColumns } from '@mathesar/utils/tables';
   import Body from './Body.svelte';
   import Header from './header/Header.svelte';
   import StatusPane from './StatusPane.svelte';
@@ -72,13 +71,9 @@
    */
   $: supportsTableInspector = context === 'page';
   $: sheetColumns = (() => {
-    const orderedProcessedColumns = orderProcessedColumns(
-      $processedColumns,
-      table,
-    );
     const columns = [
       { column: { id: ID_ROW_CONTROL_COLUMN, name: 'ROW_CONTROL' } },
-      ...orderedProcessedColumns.values(),
+      ...$processedColumns.values(),
     ];
     if (hasNewColumnButton) {
       columns.push({ column: { id: ID_ADD_NEW_COLUMN, name: 'ADD_NEW' } });

From a8be26d442ed8e611ca25a46124b2275338754c0 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 20 Mar 2024 21:37:08 -0400
Subject: [PATCH 0046/1141] Clean up some dead code

---
 .../table-view/table-inspector/record/RecordMode.svelte      | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
index bdc8fa956a..5f6f4967ed 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
@@ -20,11 +20,6 @@
   );
   $: selectedRowIds = $selection.rowIds;
   $: selectedRowCount = selectedRowIds.size;
-
-  // TODO_3037 Need to calculate selectedRowIndices. This might be a deeper
-  // problem. Seems like we might need access to the row index here instead of
-  // the row identifier.
-  $: selectedRowIndices = [];
 </script>
 
 <div class="column-mode-container">

From 6c18123a8513493f8dc8eeecfdcf2d8a553ab5a9 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 20 Mar 2024 21:44:48 -0400
Subject: [PATCH 0047/1141] Remove TODO code comment

---
 .../column/column-extraction/ExtractColumnsModal.svelte          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
index b8dff19c08..7b482c9342 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
@@ -119,7 +119,6 @@
       // unmounting this component.
       return;
     }
-    // TODO_3037 test to verify that selected columns are updated
     const columnIds = _columns.map((c) => String(c.id));
     selection.update((s) => s.ofRowColumnIntersection(s.rowIds, columnIds));
   }

From 0f8cf9da299d2ab1a9fefa99d08a661c5dfd4222 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 20 Mar 2024 21:50:22 -0400
Subject: [PATCH 0048/1141] Improve code comments

---
 .../table-inspector/column/ColumnMode.svelte           | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
index 0685493d86..337206c2dd 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
@@ -22,12 +22,18 @@
   $: database = $currentDatabase;
   $: schema = $currentSchema;
   $: ({ processedColumns, selection } = $tabularData);
-  // TODO_3037 verify that table inspector shows selected columns
   $: selectedColumns = (() => {
     const ids = $selection.columnIds;
     const columns = [];
     for (const id of ids) {
-      // TODO_3037 add code comments explaining why this is necessary
+      // This is a  little annoying that we need to parse the id as a string to
+      // a number. The reason is tricky. The cell selection system uses strings
+      // as column ids because they're more general purpose and can work with
+      // the string-based ids that the data explorer uses. However the table
+      // page stores processed columns with numeric ids. We could avoid this
+      // parsing by either making the selection system generic over the id type
+      // (which would be a pain, ergonomically), or by using string-based ids
+      // for columns in the table page too (which would require refactoring).
       const parsedId = parseInt(id, 10);
       const column = $processedColumns.get(parsedId);
       if (column !== undefined) {

From 141d27ce3003138a0cf610a3da467f991f347f0e Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 4 Apr 2024 13:10:54 -0400
Subject: [PATCH 0049/1141] Fix positioning of new record message

---
 .../components/sheet/cells/SheetPositionableCell.svelte   | 8 ++++++++
 .../src/systems/table-view/row/NewRecordMessage.svelte    | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/mathesar_ui/src/components/sheet/cells/SheetPositionableCell.svelte b/mathesar_ui/src/components/sheet/cells/SheetPositionableCell.svelte
index 27b7806069..67c902a4e3 100644
--- a/mathesar_ui/src/components/sheet/cells/SheetPositionableCell.svelte
+++ b/mathesar_ui/src/components/sheet/cells/SheetPositionableCell.svelte
@@ -30,3 +30,11 @@
 <div data-sheet-element="positionable-cell" {style}>
   <slot />
 </div>
+
+<style>
+  [data-sheet-element='positionable-cell'] {
+    position: absolute;
+    top: 0;
+    height: 100%;
+  }
+</style>
diff --git a/mathesar_ui/src/systems/table-view/row/NewRecordMessage.svelte b/mathesar_ui/src/systems/table-view/row/NewRecordMessage.svelte
index cb73fbe93f..3d807219c0 100644
--- a/mathesar_ui/src/systems/table-view/row/NewRecordMessage.svelte
+++ b/mathesar_ui/src/systems/table-view/row/NewRecordMessage.svelte
@@ -17,9 +17,12 @@
 <style>
   .new-record-message {
     background: var(--sky-200);
+    position: absolute;
+    inset: 0;
     display: flex;
     align-items: center;
     font-size: var(--text-size-small);
     padding: 0 0.5rem;
+    min-width: max-content;
   }
 </style>

From e4f1ec50f63ee5c8799869069bd195609d919798 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 4 Apr 2024 13:11:29 -0400
Subject: [PATCH 0050/1141] Only render row control cell for rows with records

---
 mathesar_ui/src/systems/table-view/row/Row.svelte | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mathesar_ui/src/systems/table-view/row/Row.svelte b/mathesar_ui/src/systems/table-view/row/Row.svelte
index cacc964df4..f22f7d333e 100644
--- a/mathesar_ui/src/systems/table-view/row/Row.svelte
+++ b/mathesar_ui/src/systems/table-view/row/Row.svelte
@@ -71,11 +71,11 @@
     style="--cell-height:{rowHeightPx - 1}px;{styleString}"
     on:mousedown={checkAndCreateEmptyRow}
   >
-    <SheetRowHeaderCell
-      {rowSelectionId}
-      columnIdentifierKey={ID_ROW_CONTROL_COLUMN}
-    >
-      {#if rowHasRecord(row)}
+    {#if rowHasRecord(row)}
+      <SheetRowHeaderCell
+        {rowSelectionId}
+        columnIdentifierKey={ID_ROW_CONTROL_COLUMN}
+      >
         <RowControl
           {primaryKeyColumnId}
           {row}
@@ -87,8 +87,8 @@
         <ContextMenu>
           <RowContextOptions recordPk={rowKey} {recordsData} {row} />
         </ContextMenu>
-      {/if}
-    </SheetRowHeaderCell>
+      </SheetRowHeaderCell>
+    {/if}
 
     {#if isHelpTextRow(row)}
       <NewRecordMessage columnCount={$processedColumns.size} />

From 218c59bd48a4939468765cee484db725dcec8447 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 4 Apr 2024 14:44:39 -0400
Subject: [PATCH 0051/1141] Add new record row when clicking placeholder

---
 .../src/components/sheet/selection/Series.ts    | 11 +++++++++--
 .../sheet/selection/SheetSelection.ts           | 17 +++++++++++++++++
 .../src/stores/table-data/tabularData.ts        |  5 +++++
 .../src/systems/table-view/StatusPane.svelte    |  6 +-----
 .../src/systems/table-view/row/Row.svelte       | 13 ++++++-------
 5 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/mathesar_ui/src/components/sheet/selection/Series.ts b/mathesar_ui/src/components/sheet/selection/Series.ts
index b0e897aab3..c7654a8f29 100644
--- a/mathesar_ui/src/components/sheet/selection/Series.ts
+++ b/mathesar_ui/src/components/sheet/selection/Series.ts
@@ -53,12 +53,19 @@ export default class Series<Value> {
     return this.values.slice(startIndex, endIndex + 1);
   }
 
+  /**
+   * Get the value at a specific index.
+   */
+  at(index: number): Value | undefined {
+    return this.values[index];
+  }
+
   get first(): Value | undefined {
-    return this.values[0];
+    return this.at(0);
   }
 
   get last(): Value | undefined {
-    return this.values[this.values.length - 1];
+    return this.at(this.values.length - 1);
   }
 
   has(value: Value): boolean {
diff --git a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
index f177794704..c116f90b1c 100644
--- a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
+++ b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
@@ -232,6 +232,23 @@ export default class SheetSelection {
     return this.withBasis(basisFromDataCells([firstCellId]));
   }
 
+  /**
+   * @returns a new selection formed by selecting the one cell that we think
+   * users are most likely to want selected after choosing to add a new record.
+   *
+   * We use the last row because that's where we add new records. If there is
+   * only one column, then we select the first cell in that column. Otherwise,
+   * we select the cell in the second column (because we assume the first column
+   * is probably a PK column which can't accept data entry.)
+   */
+  ofNewRecordDataEntryCell(): SheetSelection {
+    const rowId = this.plane.rowIds.last;
+    if (!rowId) return this;
+    const columnId = this.plane.columnIds.at(1) ?? this.plane.columnIds.first;
+    if (!columnId) return this;
+    return this.ofOneCell(makeCellId(rowId, columnId));
+  }
+
   /**
    * @returns a new selection with all rows selected between (and including) the
    * provided rows.
diff --git a/mathesar_ui/src/stores/table-data/tabularData.ts b/mathesar_ui/src/stores/table-data/tabularData.ts
index 80700931a6..b54378caaf 100644
--- a/mathesar_ui/src/stores/table-data/tabularData.ts
+++ b/mathesar_ui/src/stores/table-data/tabularData.ts
@@ -215,6 +215,11 @@ export class TabularData {
     return this.refresh();
   }
 
+  addEmptyRecord() {
+    void this.recordsData.addEmptyRecord();
+    this.selection.update((s) => s.ofNewRecordDataEntryCell());
+  }
+
   destroy(): void {
     this.recordsData.destroy();
     this.constraintsDataStore.destroy();
diff --git a/mathesar_ui/src/systems/table-view/StatusPane.svelte b/mathesar_ui/src/systems/table-view/StatusPane.svelte
index 4edf76dbaf..b4cf4a8b7e 100644
--- a/mathesar_ui/src/systems/table-view/StatusPane.svelte
+++ b/mathesar_ui/src/systems/table-view/StatusPane.svelte
@@ -68,11 +68,7 @@
         disabled={$isLoading}
         size="medium"
         appearance="primary"
-        on:click={() => {
-          void recordsData.addEmptyRecord();
-          // // TODO_3037
-          // selection.selectAndActivateFirstDataEntryCellInLastRow();
-        }}
+        on:click={() => $tabularData.addEmptyRecord()}
       >
         <Icon {...iconAddNew} />
         <span>{$_('new_record')}</span>
diff --git a/mathesar_ui/src/systems/table-view/row/Row.svelte b/mathesar_ui/src/systems/table-view/row/Row.svelte
index f22f7d333e..ed31fd4b8d 100644
--- a/mathesar_ui/src/systems/table-view/row/Row.svelte
+++ b/mathesar_ui/src/systems/table-view/row/Row.svelte
@@ -48,12 +48,11 @@
   /** Including whole row errors and individual cell errors */
   $: hasAnyErrors = !!status?.errorsFromWholeRowAndCells?.length;
 
-  function checkAndCreateEmptyRow() {
-    // // TODO_3037
-    // if (isPlaceholderRow(row)) {
-    //   void recordsData.addEmptyRecord();
-    //   selection.selectAndActivateFirstDataEntryCellInLastRow();
-    // }
+  function handleMouseDown(e: MouseEvent) {
+    if (isPlaceholderRow(row)) {
+      $tabularData.addEmptyRecord();
+      e.stopPropagation(); // Prevents cell selection from starting
+    }
   }
 </script>
 
@@ -69,7 +68,7 @@
     class:is-add-placeholder={isPlaceholderRow(row)}
     {...htmlAttributes}
     style="--cell-height:{rowHeightPx - 1}px;{styleString}"
-    on:mousedown={checkAndCreateEmptyRow}
+    on:mousedown={handleMouseDown}
   >
     {#if rowHasRecord(row)}
       <SheetRowHeaderCell

From 89adabb230383d0de6012521d5fd74eba375455e Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 10 Apr 2024 10:47:44 -0400
Subject: [PATCH 0052/1141] Implement SheetSelectionStore

---
 .../sheet/selection/SheetSelectionStore.ts    | 66 ++++++++++++++++
 .../src/stores/PreventableEffectsStore.ts     | 76 +++++++++++++++++++
 .../src/stores/table-data/tabularData.ts      | 17 ++---
 .../src/systems/data-explorer/QueryRunner.ts  | 15 +---
 4 files changed, 151 insertions(+), 23 deletions(-)
 create mode 100644 mathesar_ui/src/components/sheet/selection/SheetSelectionStore.ts
 create mode 100644 mathesar_ui/src/stores/PreventableEffectsStore.ts

diff --git a/mathesar_ui/src/components/sheet/selection/SheetSelectionStore.ts b/mathesar_ui/src/components/sheet/selection/SheetSelectionStore.ts
new file mode 100644
index 0000000000..780e4ad684
--- /dev/null
+++ b/mathesar_ui/src/components/sheet/selection/SheetSelectionStore.ts
@@ -0,0 +1,66 @@
+import type { Readable, Writable } from 'svelte/store';
+
+import { EventHandler } from '@mathesar/component-library';
+import PreventableEffectsStore from '@mathesar/stores/PreventableEffectsStore';
+import type Plane from './Plane';
+import SheetSelection from './SheetSelection';
+
+export default class SheetSelectionStore
+  extends EventHandler<{
+    focus: void;
+  }>
+  implements Writable<SheetSelection>
+{
+  private selection: PreventableEffectsStore<SheetSelection, 'focus'>;
+
+  private cleanupFunctions: (() => void)[] = [];
+
+  constructor(plane: Readable<Plane>) {
+    super();
+    this.selection = new PreventableEffectsStore(new SheetSelection(), {
+      focus: () => this.focus(),
+    });
+    this.cleanupFunctions.push(
+      plane.subscribe((p) => this.selection.update((s) => s.forNewPlane(p))),
+    );
+  }
+
+  private focus(): void {
+    void this.dispatch('focus');
+  }
+
+  subscribe(run: (value: SheetSelection) => void): () => void {
+    return this.selection.subscribe(run);
+  }
+
+  update(getNewValue: (oldValue: SheetSelection) => SheetSelection): void {
+    this.selection.update(getNewValue);
+  }
+
+  /**
+   * Updates the selection while skipping the side effect of focusing the active
+   * cell.
+   */
+  updateWithoutFocus(
+    getNewValue: (oldValue: SheetSelection) => SheetSelection,
+  ): void {
+    this.selection.update(getNewValue, { prevent: ['focus'] });
+  }
+
+  set(value: SheetSelection): void {
+    this.selection.set(value);
+  }
+
+  /**
+   * Sets the selection while skipping the side effect of focusing the active
+   * cell.
+   */
+  setWithoutFocus(value: SheetSelection): void {
+    this.selection.update(() => value, { prevent: ['focus'] });
+  }
+
+  destroy(): void {
+    super.destroy();
+    this.cleanupFunctions.forEach((f) => f());
+  }
+}
diff --git a/mathesar_ui/src/stores/PreventableEffectsStore.ts b/mathesar_ui/src/stores/PreventableEffectsStore.ts
new file mode 100644
index 0000000000..109b33de66
--- /dev/null
+++ b/mathesar_ui/src/stores/PreventableEffectsStore.ts
@@ -0,0 +1,76 @@
+import { writable, type Writable } from 'svelte/store';
+
+interface Effect<Value, EffectNames> {
+  name: EffectNames;
+  run: (v: Value) => void;
+}
+
+/**
+ * This is a writable store that holds effects which run when the value changes.
+ * Unlike other effect mechanisms in Svelte, this store allows you to prevent
+ * certain effects from running when the value changes — and control over that
+ * prevention is delegated to the call site of the update.
+ *
+ * The use case for this store is when you have an imperative effect that you
+ * want to run _almost_ all the time. By default you want the effect to run. But
+ * for some cases (when you do a little extra work), then you can prevent the
+ * effect from running while performing an update.
+ *
+ * ## Example
+ *
+ * ```ts
+ * const store = new PreventableEffectsStore(0, {
+ *  log: (v) => console.log(v),
+ * });
+ *
+ * store.update((v) => v + 1); // logs 1
+ * store.update((v) => v + 1, { prevent: ['log'] }); // does not log
+ * ```
+ */
+export default class PreventableEffectsStore<
+  Value,
+  EffectNames extends string,
+> {
+  private value: Writable<Value>;
+
+  private effects: Effect<Value, EffectNames>[] = [];
+
+  constructor(
+    initialValue: Value,
+    effectMap: Record<EffectNames, (v: Value) => void>,
+  ) {
+    this.value = writable(initialValue);
+    this.effects = Object.entries(effectMap).map(([name, run]) => ({
+      name: name as EffectNames,
+      run: run as (v: Value) => void,
+    }));
+  }
+
+  private runEffects(
+    value: Value,
+    options: { prevent?: EffectNames[] } = {},
+  ): void {
+    this.effects
+      .filter(({ name }) => !options.prevent?.includes(name))
+      .forEach(({ run }) => run(value));
+  }
+
+  subscribe(run: (value: Value) => void): () => void {
+    return this.value.subscribe(run);
+  }
+
+  update(
+    getNewValue: (oldValue: Value) => Value,
+    options: { prevent?: EffectNames[] } = {},
+  ): void {
+    this.value.update((oldValue) => {
+      const newValue = getNewValue(oldValue);
+      this.runEffects(newValue, options);
+      return newValue;
+    });
+  }
+
+  set(value: Value): void {
+    this.value.set(value);
+  }
+}
diff --git a/mathesar_ui/src/stores/table-data/tabularData.ts b/mathesar_ui/src/stores/table-data/tabularData.ts
index b54378caaf..ebfa7c3156 100644
--- a/mathesar_ui/src/stores/table-data/tabularData.ts
+++ b/mathesar_ui/src/stores/table-data/tabularData.ts
@@ -7,7 +7,7 @@ import type { Column } from '@mathesar/api/types/tables/columns';
 import { States } from '@mathesar/api/utils/requestUtils';
 import Plane from '@mathesar/components/sheet/selection/Plane';
 import Series from '@mathesar/components/sheet/selection/Series';
-import SheetSelection from '@mathesar/components/sheet/selection/SheetSelection';
+import SheetSelectionStore from '@mathesar/components/sheet/selection/SheetSelectionStore';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
 import type { ShareConsumer } from '@mathesar/utils/shares';
 import { orderProcessedColumns } from '@mathesar/utils/tables';
@@ -57,12 +57,10 @@ export class TabularData {
 
   isLoading: Readable<boolean>;
 
-  selection: Writable<SheetSelection>;
+  selection: SheetSelectionStore;
 
   table: TableEntry;
 
-  private cleanupFunctions: (() => void)[] = [];
-
   shareConsumer?: ShareConsumer;
 
   constructor(props: TabularDataProps) {
@@ -122,16 +120,11 @@ export class TabularData {
         const rowIds = new Series([...selectableRowsMap.keys()]);
         const columns = [...processedColumns.values()];
         const columnIds = new Series(columns.map((c) => String(c.id)));
+        // TODO_3037 incorporate placeholder row into plane
         return new Plane(rowIds, columnIds);
       },
     );
-
-    // TODO_3037 add id of placeholder row to selection
-    this.selection = writable(new SheetSelection());
-
-    this.cleanupFunctions.push(
-      plane.subscribe((p) => this.selection.update((s) => s.forNewPlane(p))),
-    );
+    this.selection = new SheetSelectionStore(plane);
 
     this.isLoading = derived(
       [
@@ -224,7 +217,7 @@ export class TabularData {
     this.recordsData.destroy();
     this.constraintsDataStore.destroy();
     this.columnsDataStore.destroy();
-    this.cleanupFunctions.forEach((f) => f());
+    this.selection.destroy();
   }
 }
 
diff --git a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
index baee9cb275..51c100a931 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
@@ -12,7 +12,7 @@ import { ApiMultiError } from '@mathesar/api/utils/errors';
 import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
 import Plane from '@mathesar/components/sheet/selection/Plane';
 import Series from '@mathesar/components/sheet/selection/Series';
-import SheetSelection from '@mathesar/components/sheet/selection/SheetSelection';
+import SheetSelectionStore from '@mathesar/components/sheet/selection/SheetSelectionStore';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
 import { fetchQueryResults, runQuery } from '@mathesar/stores/queries';
 import Pagination from '@mathesar/utils/Pagination';
@@ -67,7 +67,7 @@ export default class QueryRunner {
   /** Keys are row selection ids */
   selectableRowsMap: Readable<Map<string, QueryRow>>;
 
-  selection: Writable<SheetSelection>;
+  selection: SheetSelectionStore;
 
   inspector: QueryInspector;
 
@@ -81,8 +81,6 @@ export default class QueryRunner {
 
   private shareConsumer?: ShareConsumer;
 
-  private cleanupFunctions: (() => void)[] = [];
-
   constructor({
     query,
     abstractTypeMap,
@@ -120,12 +118,7 @@ export default class QueryRunner {
         return new Plane(rowIds, columnIds);
       },
     );
-
-    this.selection = writable(new SheetSelection());
-
-    this.cleanupFunctions.push(
-      plane.subscribe((p) => this.selection.update((s) => s.forNewPlane(p))),
-    );
+    this.selection = new SheetSelectionStore(plane);
 
     this.inspector = new QueryInspector(this.query);
   }
@@ -279,6 +272,6 @@ export default class QueryRunner {
 
   destroy(): void {
     this.runPromise?.cancel();
-    this.cleanupFunctions.forEach((fn) => fn());
+    this.selection.destroy();
   }
 }

From 26a8c51d32f2afc3ca774e0453d5ca53318f9831 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 10 Apr 2024 10:53:37 -0400
Subject: [PATCH 0053/1141] Fix some linting errors

---
 .../components/inspector/cell/CellInspector.svelte   |  2 +-
 .../src/components/sheet/cells/SheetDataCell.svelte  | 12 ++++++------
 .../table-inspector/record/RowActions.svelte         |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mathesar_ui/src/components/inspector/cell/CellInspector.svelte b/mathesar_ui/src/components/inspector/cell/CellInspector.svelte
index 0e6c3e8ad0..7f205da4cd 100644
--- a/mathesar_ui/src/components/inspector/cell/CellInspector.svelte
+++ b/mathesar_ui/src/components/inspector/cell/CellInspector.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { SelectedCellData } from './cellInspectorUtils';
   import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
+  import type { SelectedCellData } from './cellInspectorUtils';
 
   export let selectedCellData: SelectedCellData;
 
diff --git a/mathesar_ui/src/components/sheet/cells/SheetDataCell.svelte b/mathesar_ui/src/components/sheet/cells/SheetDataCell.svelte
index 7a3c4a65c9..4b8b8a76ca 100644
--- a/mathesar_ui/src/components/sheet/cells/SheetDataCell.svelte
+++ b/mathesar_ui/src/components/sheet/cells/SheetDataCell.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
-  import type SheetSelection from '../selection/SheetSelection';
-
   import CellBackground from '@mathesar/components/CellBackground.svelte';
+  import type SheetSelection from '../selection/SheetSelection';
   import { getSheetCellStyle } from './sheetCellUtils';
 
   type SheetColumnIdentifierKey = $$Generic;
@@ -12,17 +11,18 @@
 
   $: style = getSheetCellStyle(columnIdentifierKey);
   $: ({ isActive, isSelected, hasSelectionBackground } = (() => {
-    if (!selection || !cellSelectionId)
+    if (!selection || !cellSelectionId) {
       return {
         isActive: false,
         isSelected: false,
         hasSelectionBackground: false,
       };
-    const isSelected = selection.cellIds.has(cellSelectionId);
+    }
+    const selected = selection.cellIds.has(cellSelectionId);
     return {
       isActive: selection.activeCellId === cellSelectionId,
-      isSelected: selection.cellIds.has(cellSelectionId),
-      hasSelectionBackground: isSelected && selection.cellIds.size > 1,
+      isSelected: selected,
+      hasSelectionBackground: selected && selection.cellIds.size > 1,
     };
   })());
 </script>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
index 2a3acc3b46..4c66583175 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
@@ -31,7 +31,7 @@
     const id = takeFirstAndOnly(selectedRowIds);
     if (!id) return undefined;
     const row = $selectableRowsMap.get(id);
-    if (!row) return;
+    if (!row) return undefined;
     try {
       const recordId = getPkValueInRecord(row.record, $columns);
       return $storeToGetRecordPageUrl({ recordId });

From 10f0aa283cadec7b18d1e6d955aee6f0b6740134 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 10 Apr 2024 10:39:23 -0400
Subject: [PATCH 0054/1141] Handle CellWrapper focus in pure CSS

---
 .../data-types/components/CellWrapper.svelte  | 24 +------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
index e97c8f8646..e51a0011d1 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
@@ -23,8 +23,6 @@
    */
   export let horizontalAlignment: HorizontalAlignment = 'left';
 
-  let isFocused = false;
-
   function shouldAutoFocus(
     _isActive: boolean,
     _mode: 'edit' | 'default',
@@ -60,23 +58,6 @@
   }
   $: void handleStateChange(isActive, mode);
 
-  function handleFocus() {
-    isFocused = true;
-    // Note: you might think we ought to automatically activate the cell at this
-    // point to ensure that we don't have any cells which are focused but not
-    // active. I tried this and it caused bugs with selecting columns and rows
-    // via header cells. I didn't want to spend time tracking them down because
-    // we are planning to refactor the cell selection logic soon anyway. It
-    // doesn't _seem_ like we have any code which focuses the cell without
-    // activating it, but it would be nice to eventually build a better
-    // guarantee into the codebase which prevents cells from being focused
-    // without being activated.
-  }
-
-  function handleBlur() {
-    isFocused = false;
-  }
-
   function handleCopy(e: ClipboardEvent) {
     if (e.target !== element) {
       // When the user copies text _within_ a cell (e.g. from within an input
@@ -93,7 +74,6 @@
 <div
   class="cell-wrapper"
   class:is-active={isActive}
-  class:is-focused={isFocused}
   class:disabled
   class:is-edit-mode={mode === 'edit'}
   class:truncate={multiLineTruncate && !isIndependentOfSheet}
@@ -111,8 +91,6 @@
   on:mouseleave
   on:keydown
   on:copy={handleCopy}
-  on:focus={handleFocus}
-  on:blur={handleBlur}
   tabindex={-1}
   {...$$restProps}
 >
@@ -146,7 +124,7 @@
       box-shadow: 0 0 0 2px var(--slate-300);
       border-radius: 2px;
 
-      &.is-focused {
+      &:focus {
         box-shadow: 0 0 0 2px var(--sky-700);
       }
     }

From bbd1e64362c0ff9d4082f6e770f720a6261c6c6e Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 10 Apr 2024 12:28:14 -0400
Subject: [PATCH 0055/1141] Improve cell focus behavior

---
 .../data-types/components/CellWrapper.svelte  | 48 +++++++------------
 mathesar_ui/src/components/sheet/Sheet.svelte | 22 +++++++--
 .../ExtractColumnsModal.svelte                |  4 +-
 3 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
index e51a0011d1..fe9f1e0ebe 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import type { ValueComparisonOutcome } from '@mathesar-component-library/types';
   import CellBackground from '@mathesar/components/CellBackground.svelte';
-  import { tick } from 'svelte';
   import type { HorizontalAlignment } from './typeDefinitions';
 
   export let element: HTMLElement | undefined = undefined;
@@ -23,40 +22,29 @@
    */
   export let horizontalAlignment: HorizontalAlignment = 'left';
 
-  function shouldAutoFocus(
-    _isActive: boolean,
-    _mode: 'edit' | 'default',
-  ): boolean {
-    if (!_isActive) {
-      // Don't auto-focus inactive cells
-      return false;
-    }
-    if (_mode === 'edit') {
-      // Don't auto-focus cells in edit mode
-      return false;
-    }
+  /**
+   * This function exists to ensure that the cell is focused after the user
+   * moves from edit mode to default mode via pressing Enter.
+   */
+  function autoFocus() {
     if (!element) {
       // Can't focus if we haven't mounted an element yet
-      return false;
+      return;
     }
-    if (element.contains(document.activeElement)) {
-      // Don't auto-focus if the cell contains another element that is already
-      // focused (e.g. an input).
-      return false;
+    if (!element.contains(document.activeElement)) {
+      // Only auto-focus when the cell contains another element that is already
+      // focused (e.g. an input). If the user moves from edit mode to default
+      // mode via clicking on some UI element outside sheet, then we _don't_
+      // want to focus the cell. We want to keep the focus on the other UI
+      // element that they clicked.
+      return;
     }
-    return true;
+    element.focus();
   }
 
-  async function handleStateChange(
-    _isActive: boolean,
-    _mode: 'edit' | 'default',
-  ) {
-    await tick();
-    if (shouldAutoFocus(_isActive, _mode)) {
-      element?.focus();
-    }
+  $: if (mode === 'default') {
+    autoFocus();
   }
-  $: void handleStateChange(isActive, mode);
 
   function handleCopy(e: ClipboardEvent) {
     if (e.target !== element) {
@@ -73,7 +61,6 @@
 
 <div
   class="cell-wrapper"
-  class:is-active={isActive}
   class:disabled
   class:is-edit-mode={mode === 'edit'}
   class:truncate={multiLineTruncate && !isIndependentOfSheet}
@@ -82,6 +69,7 @@
   class:exact-match={valueComparisonOutcome === 'exactMatch'}
   class:substring-match={valueComparisonOutcome === 'substringMatch'}
   class:no-match={valueComparisonOutcome === 'noMatch'}
+  data-active-cell={isActive ? '' : undefined}
   bind:this={element}
   on:click
   on:dblclick
@@ -120,7 +108,7 @@
       text-align: right;
     }
 
-    &.is-active {
+    &[data-active-cell] {
       box-shadow: 0 0 0 2px var(--slate-300);
       border-radius: 2px;
 
diff --git a/mathesar_ui/src/components/sheet/Sheet.svelte b/mathesar_ui/src/components/sheet/Sheet.svelte
index 0bf2344765..dde0f20681 100644
--- a/mathesar_ui/src/components/sheet/Sheet.svelte
+++ b/mathesar_ui/src/components/sheet/Sheet.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-  import { writable, type Writable } from 'svelte/store';
+  import { onMount, tick } from 'svelte';
+  import { writable } from 'svelte/store';
 
   import { ImmutableMap } from '@mathesar-component-library/types';
   import type { ClipboardHandler } from '@mathesar/stores/clipboard';
@@ -10,7 +11,7 @@
     findContainingSheetCell,
     type SheetCellDetails,
   } from './selection';
-  import type SheetSelection from './selection/SheetSelection';
+  import type SheetSelectionStore from './selection/SheetSelectionStore';
   import {
     calculateColumnStyleMapAndRowWidth,
     DEFAULT_COLUMN_WIDTH,
@@ -28,7 +29,7 @@
   export let hasBorder = false;
   export let hasPaddingRight = false;
   export let clipboardHandler: ClipboardHandler | undefined = undefined;
-  export let selection: Writable<SheetSelection> | undefined = undefined;
+  export let selection: SheetSelectionStore | undefined = undefined;
 
   export let getColumnIdentifier: (
     c: SheetColumnType,
@@ -145,8 +146,23 @@
     })();
     if (!startingCell) return;
 
+    // If we're selecting cells, then we need to prevent this mouse event from
+    // inadvertently setting clicked elements to become focused. If they get
+    // focused then there can be race conditions which (sometimes) prevent the
+    // active cell within the selection from becoming focused. For example, this
+    // problem can happen when clicking on column header cells to select all
+    // cells in the column.
+    e.preventDefault();
+
     beginSelection({ selection, sheetElement, startingCell, targetCell });
   }
+
+  async function focusActiveCell() {
+    await tick();
+    sheetElement.querySelector<HTMLElement>('[data-active-cell]')?.focus();
+  }
+
+  onMount(() => selection?.on('focus', focusActiveCell));
 </script>
 
 <div
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
index 7b482c9342..baa0145a3d 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
@@ -120,7 +120,9 @@
       return;
     }
     const columnIds = _columns.map((c) => String(c.id));
-    selection.update((s) => s.ofRowColumnIntersection(s.rowIds, columnIds));
+    selection.updateWithoutFocus((s) =>
+      s.ofRowColumnIntersection(s.rowIds, columnIds),
+    );
   }
   $: handleColumnsChange($columns);
 

From 894065a2cf68e1494c92466f189cc817fc7b7c4a Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 10 Apr 2024 12:52:20 -0400
Subject: [PATCH 0056/1141] Fix mousedown event on cell input element

---
 .../data-types/components/CellWrapper.svelte    | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
index fe9f1e0ebe..29594fe1d4 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
@@ -1,8 +1,12 @@
 <script lang="ts">
+  import { createEventDispatcher } from 'svelte';
+
   import type { ValueComparisonOutcome } from '@mathesar-component-library/types';
   import CellBackground from '@mathesar/components/CellBackground.svelte';
   import type { HorizontalAlignment } from './typeDefinitions';
 
+  const dispatch = createEventDispatcher();
+
   export let element: HTMLElement | undefined = undefined;
   export let isActive = false;
   export let disabled = false;
@@ -57,6 +61,17 @@
       e.stopPropagation();
     }
   }
+
+  function handleMouseDown(e: MouseEvent) {
+    if (mode === 'edit') {
+      // In edit mode we want to capture mousedown events and prevent them from
+      // propagating to the sheet where mousedown events are used to select
+      // cells. Without this call, clicking inside a cell input would cause the
+      // cell to exit edit mode.
+      e.stopPropagation();
+    }
+    dispatch('mousedown', e);
+  }
 </script>
 
 <div
@@ -73,7 +88,7 @@
   bind:this={element}
   on:click
   on:dblclick
-  on:mousedown
+  on:mousedown={handleMouseDown}
   on:mouseup
   on:mouseenter
   on:mouseleave

From 8ccb0a6c8cdb26abafd313dd8a8e86c461c8355c Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 10 Apr 2024 13:08:16 -0400
Subject: [PATCH 0057/1141] Prevent column resize from altering selection

---
 mathesar_ui/src/component-library/common/actions/slider.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mathesar_ui/src/component-library/common/actions/slider.ts b/mathesar_ui/src/component-library/common/actions/slider.ts
index 695a591db0..8a929d3b01 100644
--- a/mathesar_ui/src/component-library/common/actions/slider.ts
+++ b/mathesar_ui/src/component-library/common/actions/slider.ts
@@ -128,6 +128,8 @@ export default function slider(
   }
 
   function start(e: MouseEvent | TouchEvent) {
+    e.stopPropagation();
+    e.preventDefault();
     opts.onStart();
     startingValue = opts.getStartingValue();
     startingPosition = getPosition(e, opts.axis);

From 2dff73f8ca7f47b7b6f5ce54b729b5d1e362a7b7 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 10 Apr 2024 15:07:59 -0400
Subject: [PATCH 0058/1141] Improve parsing/serialization of cellId values

---
 mathesar_ui/src/components/sheet/cellIds.ts | 24 ++++++++-------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/mathesar_ui/src/components/sheet/cellIds.ts b/mathesar_ui/src/components/sheet/cellIds.ts
index fd6a263637..c39c1077d9 100644
--- a/mathesar_ui/src/components/sheet/cellIds.ts
+++ b/mathesar_ui/src/components/sheet/cellIds.ts
@@ -2,29 +2,23 @@ import { map } from 'iter-tools';
 
 import { cartesianProduct } from '@mathesar/utils/iterUtils';
 
-const CELL_ID_DELIMITER = '-';
-
-/**
- * We can serialize a cell id this way only because we're confident that the
- * rowId will never contain the delimiter. Some columnIds _do_ contain
- * delimiters (e.g. in the Data Explorer), but that's okay because we can still
- * separate the values based on the first delimiter.
- */
 export function makeCellId(rowId: string, columnId: string): string {
-  return `${rowId}${CELL_ID_DELIMITER}${columnId}`;
+  return JSON.stringify([rowId, columnId]);
 }
 
 export function parseCellId(cellId: string): {
   rowId: string;
   columnId: string;
 } {
-  const delimiterIndex = cellId.indexOf(CELL_ID_DELIMITER);
-  if (delimiterIndex === -1) {
-    throw new Error(`Unable to parse cell id without a delimiter: ${cellId}.`);
+  try {
+    const [rowId, columnId] = JSON.parse(cellId) as unknown[];
+    if (typeof rowId !== 'string' || typeof columnId !== 'string') {
+      throw new Error();
+    }
+    return { rowId, columnId };
+  } catch {
+    throw new Error(`Unable to parse cell id: ${cellId}.`);
   }
-  const rowId = cellId.slice(0, delimiterIndex);
-  const columnId = cellId.slice(delimiterIndex + 1);
-  return { rowId, columnId };
 }
 
 export function makeCells(

From 0938b6582bf5a5650b91a5f99987d3bf40c46478 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 10 Apr 2024 16:16:14 -0400
Subject: [PATCH 0059/1141] Add placeholder row to Plane

---
 mathesar_ui/src/stores/table-data/display.ts  | 31 +++++++++++++++----
 .../src/stores/table-data/tabularData.ts      | 11 ++++---
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/mathesar_ui/src/stores/table-data/display.ts b/mathesar_ui/src/stores/table-data/display.ts
index 0a969e23db..d4f98202ce 100644
--- a/mathesar_ui/src/stores/table-data/display.ts
+++ b/mathesar_ui/src/stores/table-data/display.ts
@@ -1,9 +1,10 @@
-import { writable, derived } from 'svelte/store';
-import type { Writable, Readable } from 'svelte/store';
+import type { Readable, Writable } from 'svelte/store';
+import { derived, writable } from 'svelte/store';
+
 import { WritableMap } from '@mathesar-component-library';
-import type { Meta } from './meta';
 import type { ColumnsDataStore } from './columns';
-import { type Row, type RecordsData, filterRecordRows } from './records';
+import type { Meta } from './meta';
+import { filterRecordRows, type RecordsData, type Row } from './records';
 
 // @deprecated
 export const DEFAULT_COLUMN_WIDTH = 160;
@@ -63,6 +64,8 @@ export class Display {
 
   displayableRecords: Readable<Row[]>;
 
+  placeholderRowId: Readable<string>;
+
   constructor(
     meta: Meta,
     columnsDataStore: ColumnsDataStore,
@@ -98,6 +101,9 @@ export class Display {
       ),
     );
 
+    const placeholderRowId = writable('');
+    this.placeholderRowId = placeholderRowId;
+
     const { savedRecordRowsWithGroupHeaders, newRecords } = this.recordsData;
     this.displayableRecords = derived(
       [savedRecordRowsWithGroupHeaders, newRecords],
@@ -120,11 +126,24 @@ export class Display {
             })
             .concat($newRecords);
         }
-        allRecords = allRecords.concat({
+        const placeholderRow = {
           ...this.recordsData.getNewEmptyRecord(),
           rowIndex: savedRecords.length + $newRecords.length,
           isAddPlaceholder: true,
-        });
+        };
+
+        // This is really hacky! We have a side effect (mutating state) within a
+        // derived store, which I don't like. I put this here during a large
+        // refactor of the cell selection code because the Plane needs to know
+        // the id of the placeholder row since cell selection behaves
+        // differently in the placeholder row. I think we have some major
+        // refactoring to do across all the code that handles "rows" and
+        // "records" and things like that. There is a ton of mess there and I
+        // didn't want to lump any of that refactoring into an already-large
+        // refactor.
+        placeholderRowId.set(placeholderRow.identifier);
+
+        allRecords = allRecords.concat(placeholderRow);
         return allRecords;
       },
     );
diff --git a/mathesar_ui/src/stores/table-data/tabularData.ts b/mathesar_ui/src/stores/table-data/tabularData.ts
index ebfa7c3156..22fa91bd52 100644
--- a/mathesar_ui/src/stores/table-data/tabularData.ts
+++ b/mathesar_ui/src/stores/table-data/tabularData.ts
@@ -115,13 +115,16 @@ export class TabularData {
     );
 
     const plane = derived(
-      [this.recordsData.selectableRowsMap, this.processedColumns],
-      ([selectableRowsMap, processedColumns]) => {
+      [
+        this.recordsData.selectableRowsMap,
+        this.processedColumns,
+        this.display.placeholderRowId,
+      ],
+      ([selectableRowsMap, processedColumns, placeholderRowId]) => {
         const rowIds = new Series([...selectableRowsMap.keys()]);
         const columns = [...processedColumns.values()];
         const columnIds = new Series(columns.map((c) => String(c.id)));
-        // TODO_3037 incorporate placeholder row into plane
-        return new Plane(rowIds, columnIds);
+        return new Plane(rowIds, columnIds, placeholderRowId);
       },
     );
     this.selection = new SheetSelectionStore(plane);

From 2f9cc960854f48ffc2efe60fa2fb0664334b41a8 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 10 Apr 2024 16:31:37 -0400
Subject: [PATCH 0060/1141] Allow typing into placeholder cells

---
 mathesar_ui/src/systems/table-view/row/Row.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mathesar_ui/src/systems/table-view/row/Row.svelte b/mathesar_ui/src/systems/table-view/row/Row.svelte
index ed31fd4b8d..4cbbd0820b 100644
--- a/mathesar_ui/src/systems/table-view/row/Row.svelte
+++ b/mathesar_ui/src/systems/table-view/row/Row.svelte
@@ -135,9 +135,9 @@
       cursor: pointer;
 
       :global(
-          [data-sheet-element='data-cell']:not(.is-active)
+          [data-sheet-element='data-cell']
             .cell-fabric
-            .cell-wrapper
+            .cell-wrapper:not(.is-edit-mode)
             > *
         ) {
         visibility: hidden;

From 659c9e210cfd601398d67b434be9024f50481d17 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 10 Apr 2024 21:38:58 -0400
Subject: [PATCH 0061/1141] Remove some dead code

---
 .../src/systems/table-view/TableView.svelte   | 30 ++++---------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/mathesar_ui/src/systems/table-view/TableView.svelte b/mathesar_ui/src/systems/table-view/TableView.svelte
index cb5052b530..64bc2cdb59 100644
--- a/mathesar_ui/src/systems/table-view/TableView.svelte
+++ b/mathesar_ui/src/systems/table-view/TableView.svelte
@@ -87,42 +87,22 @@
   ]);
   $: showTableInspector = $isTableInspectorVisible && supportsTableInspector;
 
-  function checkAndReinstateFocusOnActiveCell(e: Event) {
-    // // TODO_3037 Figure out what is actually broken without this code.
-    // //Better document why we need id.
-    //
-    // const target = e.target as HTMLElement;
-    // if (!target.closest('[data-sheet-element="data-cell"')) {
-    //   if ($activeCell) {
-    //     selection.focusCell(
-    //       // TODO make sure to use getRowSelectionId instead of rowIndex
-    //       { rowIndex: $activeCell.rowIndex },
-    //       { id: Number($activeCell.columnId) },
-    //     );
-    //   }
-    // }
-  }
-
-  // function selectAndActivateFirstCellOnTableLoad(
-  //   _isLoading: boolean,
-  //   _selection: TabularDataSelection,
-  //   _context: Context,
-  // ) {
+  // // TODO_3037
+  // function selectFirstCellOnTableLoad(_isLoading: boolean, _context: Context) {
   //   // We only activate the first cell on the page, not in the widget. Doing so
   //   // on the widget causes the cell to focus and the page to scroll down to
   //   // bring that element into view.
   //   if (_context !== 'widget' && !_isLoading) {
-  //     _selection.selectAndActivateFirstCellIfExists();
+  //     selection.update((s) => s.ofFirstDataCell());
   //   }
   // }
 
-  // // TODO_3037 Figure out what is actually broken without this code.
-  // $: void selectAndActivateFirstCellOnTableLoad($isLoading, selection, context);
+  // $: void selectFirstCellOnTableLoad($isLoading, context);
 </script>
 
 <div class="table-view">
   <WithTableInspector {context} {showTableInspector}>
-    <div class="sheet-area" on:click={checkAndReinstateFocusOnActiveCell}>
+    <div class="sheet-area">
       {#if $processedColumns.size}
         <Sheet
           {clipboardHandler}

From 2f0843c7498d7ef1941f788d387c9522b891f560 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 10 Apr 2024 21:52:14 -0400
Subject: [PATCH 0062/1141] Hide column resize handles during cell selection

---
 mathesar_ui/src/components/sheet/Sheet.svelte            | 9 ++++++++-
 mathesar_ui/src/components/sheet/SheetCellResizer.svelte | 8 +++++++-
 .../src/components/sheet/selection/selectionUtils.ts     | 4 ++++
 mathesar_ui/src/components/sheet/utils.ts                | 1 +
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/mathesar_ui/src/components/sheet/Sheet.svelte b/mathesar_ui/src/components/sheet/Sheet.svelte
index dde0f20681..d55728ca30 100644
--- a/mathesar_ui/src/components/sheet/Sheet.svelte
+++ b/mathesar_ui/src/components/sheet/Sheet.svelte
@@ -90,6 +90,7 @@
     horizontalScrollOffset: writable(horizontalScrollOffset),
     scrollOffset: writable(scrollOffset),
     paddingRight: writable(paddingRight),
+    selectionInProgress: writable(false),
   };
 
   // Setting these values in stores for reactivity in context
@@ -154,7 +155,13 @@
     // cells in the column.
     e.preventDefault();
 
-    beginSelection({ selection, sheetElement, startingCell, targetCell });
+    beginSelection({
+      selection,
+      sheetElement,
+      startingCell,
+      targetCell,
+      selectionInProgress: stores.selectionInProgress,
+    });
   }
 
   async function focusActiveCell() {
diff --git a/mathesar_ui/src/components/sheet/SheetCellResizer.svelte b/mathesar_ui/src/components/sheet/SheetCellResizer.svelte
index db09ee920f..e4c94fa140 100644
--- a/mathesar_ui/src/components/sheet/SheetCellResizer.svelte
+++ b/mathesar_ui/src/components/sheet/SheetCellResizer.svelte
@@ -4,16 +4,19 @@
 
   type SheetColumnIdentifierKey = $$Generic;
 
-  const { api } = getSheetContext<SheetColumnIdentifierKey>();
+  const { api, stores } = getSheetContext<SheetColumnIdentifierKey>();
 
   export let minColumnWidth = 50;
   export let columnIdentifierKey: SheetColumnIdentifierKey;
 
   let isResizing = false;
+
+  $: ({ selectionInProgress } = stores);
 </script>
 
 <div
   class="column-resizer"
+  class:selection-in-progress={$selectionInProgress}
   class:is-resizing={isResizing}
   use:slider={{
     getStartingValue: () => api.getColumnWidth(columnIdentifierKey),
@@ -53,4 +56,7 @@
   .column-resizer:not(:hover):not(.is-resizing) .indicator {
     display: none;
   }
+  .column-resizer.selection-in-progress {
+    display: none;
+  }
 </style>
diff --git a/mathesar_ui/src/components/sheet/selection/selectionUtils.ts b/mathesar_ui/src/components/sheet/selection/selectionUtils.ts
index f79f894597..b8a54af1ab 100644
--- a/mathesar_ui/src/components/sheet/selection/selectionUtils.ts
+++ b/mathesar_ui/src/components/sheet/selection/selectionUtils.ts
@@ -42,11 +42,13 @@ export function beginSelection({
   sheetElement,
   startingCell,
   targetCell,
+  selectionInProgress,
 }: {
   selection: Writable<SheetSelection>;
   sheetElement: HTMLElement;
   startingCell: SheetCellDetails;
   targetCell: SheetCellDetails;
+  selectionInProgress: Writable<boolean>;
 }) {
   let previousTarget: HTMLElement | undefined;
 
@@ -65,8 +67,10 @@ export function beginSelection({
   function finish() {
     sheetElement.removeEventListener('mousemove', drawToPoint);
     window.removeEventListener('mouseup', finish);
+    selectionInProgress.set(false);
   }
 
+  selectionInProgress.set(true);
   drawToCell(targetCell);
   sheetElement.addEventListener('mousemove', drawToPoint);
   window.addEventListener('mouseup', finish);
diff --git a/mathesar_ui/src/components/sheet/utils.ts b/mathesar_ui/src/components/sheet/utils.ts
index 4f3915d8d0..489f0cf1bc 100644
--- a/mathesar_ui/src/components/sheet/utils.ts
+++ b/mathesar_ui/src/components/sheet/utils.ts
@@ -15,6 +15,7 @@ export interface SheetContextStores<SheetColumnIdentifierKey> {
   horizontalScrollOffset: Readable<number>;
   scrollOffset: Readable<number>;
   paddingRight: Readable<number>;
+  selectionInProgress: Readable<boolean>;
 }
 
 export interface SheetContext<SheetColumnIdentifierKey> {

From d7f91d89a567df92a9d6a391af7a209ebdb9da38 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 10 Apr 2024 22:03:37 -0400
Subject: [PATCH 0063/1141] Use default cursor everywhere in sheet during
 selection

---
 mathesar_ui/src/components/sheet/Sheet.svelte | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/mathesar_ui/src/components/sheet/Sheet.svelte b/mathesar_ui/src/components/sheet/Sheet.svelte
index d55728ca30..1899d5aaaf 100644
--- a/mathesar_ui/src/components/sheet/Sheet.svelte
+++ b/mathesar_ui/src/components/sheet/Sheet.svelte
@@ -84,13 +84,14 @@
     },
   };
 
+  const selectionInProgress = writable(false);
   const stores = {
     columnStyleMap: writable(columnStyleMap),
     rowWidth: writable(rowWidth),
     horizontalScrollOffset: writable(horizontalScrollOffset),
     scrollOffset: writable(scrollOffset),
     paddingRight: writable(paddingRight),
-    selectionInProgress: writable(false),
+    selectionInProgress,
   };
 
   // Setting these values in stores for reactivity in context
@@ -160,7 +161,7 @@
       sheetElement,
       startingCell,
       targetCell,
-      selectionInProgress: stores.selectionInProgress,
+      selectionInProgress,
     });
   }
 
@@ -177,6 +178,7 @@
   class:has-border={hasBorder}
   class:uses-virtual-list={usesVirtualList}
   class:set-to-row-width={restrictWidthToRowWidth}
+  class:selection-in-progress={$selectionInProgress}
   {style}
   on:mousedown={handleMouseDown}
   on:focusin={enableClipboard}
@@ -229,5 +231,9 @@
     :global([data-sheet-element='data-row']) {
       transition: all 0.2s cubic-bezier(0, 0, 0.2, 1);
     }
+
+    &.selection-in-progress :global(*) {
+      cursor: default;
+    }
   }
 </style>

From 1557b559ab39924d1eac99a0c6daa5aa969ef30f Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 10 Apr 2024 22:16:13 -0400
Subject: [PATCH 0064/1141] Fix drag to re-order columns

---
 .../systems/table-view/header/Header.svelte   | 39 +++++++++----------
 .../header/drag-and-drop/Draggable.svelte     | 13 ++++---
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/mathesar_ui/src/systems/table-view/header/Header.svelte b/mathesar_ui/src/systems/table-view/header/Header.svelte
index ad28034c9f..11a7f77b41 100644
--- a/mathesar_ui/src/systems/table-view/header/Header.svelte
+++ b/mathesar_ui/src/systems/table-view/header/Header.svelte
@@ -108,28 +108,25 @@
   {#each [...$processedColumns] as [columnId, processedColumn] (columnId)}
     {@const isSelected = $selection.columnIds.has(String(columnId))}
     <SheetColumnHeaderCell columnIdentifierKey={columnId}>
-      <!-- TODO_3037: why is this div here? Can we get rid of it? -->
-      <div>
-        <Draggable
-          on:dragstart={() => dragColumn()}
-          column={processedColumn}
-          {selection}
+      <Draggable
+        on:dragstart={() => dragColumn()}
+        column={processedColumn}
+        {selection}
+      >
+        <Droppable
+          on:drop={() => dropColumn(processedColumn)}
+          on:dragover={(e) => e.preventDefault()}
+          {locationOfFirstDraggedColumn}
+          columnLocation={columnOrderString.indexOf(columnId.toString())}
+          {isSelected}
         >
-          <Droppable
-            on:drop={() => dropColumn(processedColumn)}
-            on:dragover={(e) => e.preventDefault()}
-            {locationOfFirstDraggedColumn}
-            columnLocation={columnOrderString.indexOf(columnId.toString())}
-            {isSelected}
-          >
-            <HeaderCell {processedColumn} {isSelected} />
-          </Droppable>
-        </Draggable>
-        <SheetCellResizer columnIdentifierKey={columnId} />
-        <ContextMenu>
-          <ColumnHeaderContextMenu {processedColumn} />
-        </ContextMenu>
-      </div>
+          <HeaderCell {processedColumn} {isSelected} />
+        </Droppable>
+      </Draggable>
+      <SheetCellResizer columnIdentifierKey={columnId} />
+      <ContextMenu>
+        <ColumnHeaderContextMenu {processedColumn} />
+      </ContextMenu>
     </SheetColumnHeaderCell>
   {/each}
 
diff --git a/mathesar_ui/src/systems/table-view/header/drag-and-drop/Draggable.svelte b/mathesar_ui/src/systems/table-view/header/drag-and-drop/Draggable.svelte
index 1347bd2f5a..0c46402caa 100644
--- a/mathesar_ui/src/systems/table-view/header/drag-and-drop/Draggable.svelte
+++ b/mathesar_ui/src/systems/table-view/header/drag-and-drop/Draggable.svelte
@@ -7,17 +7,18 @@
   export let selection: Writable<SheetSelection>;
   export let column: ProcessedColumn;
 
-  // // TODO_3037: Verify that we're not losing functionality here by removing
-  // `selectionInProgress` logic
-  //
-  // $: draggable = !selectionInProgress && selection &&
-  //   selection.isCompleteColumnSelected(column);
-
   $: draggable = $selection.fullySelectedColumnIds.has(String(column.id));
+
+  function handleMouseDown(event: MouseEvent) {
+    if (draggable) {
+      event.stopPropagation();
+    }
+  }
 </script>
 
 <div
   on:dragstart
+  on:mousedown={handleMouseDown}
   class="draggable"
   class:draggable_active={draggable}
   {draggable}

From b6374d1f987e89be27f30f070196e47dc5732138 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 10 Apr 2024 23:28:04 -0400
Subject: [PATCH 0065/1141] Auto-activate inspector tabs based on selection

---
 mathesar_ui/src/components/sheet/Sheet.svelte |  7 +++
 .../pages/exploration/ExplorationPage.svelte  | 13 +++-
 .../systems/data-explorer/DataExplorer.svelte |  8 ++-
 .../systems/data-explorer/QueryInspector.ts   | 10 ---
 .../src/systems/data-explorer/QueryRunner.ts  | 10 ---
 .../ExplorationInspector.svelte               | 13 +++-
 .../WithExplorationInspector.svelte           |  5 ++
 .../result-pane/ResultHeaderCell.svelte       |  3 -
 .../result-pane/ResultPane.svelte             | 11 +++-
 .../data-explorer/result-pane/Results.svelte  |  5 ++
 .../src/systems/table-view/TableView.svelte   |  6 +-
 .../table-inspector/TableInspector.svelte     | 63 +++++++------------
 .../table-inspector/WithTableInspector.svelte |  6 +-
 mathesar_ui/src/utils/MessageBus.ts           | 39 ++++++++++++
 14 files changed, 124 insertions(+), 75 deletions(-)
 create mode 100644 mathesar_ui/src/utils/MessageBus.ts

diff --git a/mathesar_ui/src/components/sheet/Sheet.svelte b/mathesar_ui/src/components/sheet/Sheet.svelte
index 1899d5aaaf..4a221044d1 100644
--- a/mathesar_ui/src/components/sheet/Sheet.svelte
+++ b/mathesar_ui/src/components/sheet/Sheet.svelte
@@ -5,6 +5,7 @@
   import { ImmutableMap } from '@mathesar-component-library/types';
   import type { ClipboardHandler } from '@mathesar/stores/clipboard';
   import { getClipboardHandlerStoreFromContext } from '@mathesar/stores/clipboard';
+  import type MessageBus from '@mathesar/utils/MessageBus';
   import { getModifierKeyCombo } from '@mathesar/utils/pointerUtils';
   import {
     beginSelection,
@@ -30,6 +31,8 @@
   export let hasPaddingRight = false;
   export let clipboardHandler: ClipboardHandler | undefined = undefined;
   export let selection: SheetSelectionStore | undefined = undefined;
+  export let cellSelectionStarted: MessageBus<SheetCellDetails> | undefined =
+    undefined;
 
   export let getColumnIdentifier: (
     c: SheetColumnType,
@@ -163,6 +166,10 @@
       targetCell,
       selectionInProgress,
     });
+
+    if (startingCell === targetCell) {
+      cellSelectionStarted?.send(targetCell);
+    }
   }
 
   async function focusActiveCell() {
diff --git a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
index b71566c299..17c6a4ac3e 100644
--- a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
+++ b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
@@ -1,8 +1,10 @@
 <script lang="ts">
-  import { router } from 'tinro';
   import { _ } from 'svelte-i18n';
+  import { router } from 'tinro';
+
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import type { QueryInstance } from '@mathesar/api/types/queries';
+  import type { SheetCellDetails } from '@mathesar/components/sheet/selection';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
@@ -14,10 +16,12 @@
     QueryRunner,
     WithExplorationInspector,
   } from '@mathesar/systems/data-explorer';
+  import MessageBus from '@mathesar/utils/MessageBus';
   import type { ShareConsumer } from '@mathesar/utils/shares';
   import Header from './Header.svelte';
 
   const userProfile = getUserProfileStoreFromContext();
+  const cellSelectionStarted = new MessageBus<SheetCellDetails>();
 
   export let database: Database;
   export let schema: SchemaEntry;
@@ -73,8 +77,13 @@
         queryHandler={queryRunner}
         {canEditMetadata}
         on:delete={gotoSchemaPage}
+        {cellSelectionStarted}
       >
-        <ExplorationResult queryHandler={queryRunner} isExplorationPage />
+        <ExplorationResult
+          queryHandler={queryRunner}
+          isExplorationPage
+          {cellSelectionStarted}
+        />
       </WithExplorationInspector>
     </div>
   {/if}
diff --git a/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte b/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte
index 787fbdf4d6..68ff18ac41 100644
--- a/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte
+++ b/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte
@@ -1,7 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import { Tutorial } from '@mathesar-component-library';
+  import type { SheetCellDetails } from '@mathesar/components/sheet/selection';
   import { queries } from '@mathesar/stores/queries';
+  import MessageBus from '@mathesar/utils/MessageBus';
   import ActionsPane from './ActionsPane.svelte';
   import type QueryManager from './QueryManager';
   import { WithExplorationInspector } from './exploration-inspector';
@@ -9,6 +12,8 @@
   import ResultPane from './result-pane/ResultPane.svelte';
   import type { ColumnWithLink } from './utils';
 
+  const cellSelectionStarted = new MessageBus<SheetCellDetails>();
+
   export let queryManager: QueryManager;
   export let linkCollapsibleOpenState: Record<ColumnWithLink['id'], boolean> =
     {};
@@ -58,9 +63,10 @@
             {isInspectorOpen}
             queryHandler={queryManager}
             {canEditMetadata}
+            {cellSelectionStarted}
             on:delete
           >
-            <ResultPane queryHandler={queryManager} />
+            <ResultPane queryHandler={queryManager} {cellSelectionStarted} />
           </WithExplorationInspector>
         {/if}
       </WithInputSidebar>
diff --git a/mathesar_ui/src/systems/data-explorer/QueryInspector.ts b/mathesar_ui/src/systems/data-explorer/QueryInspector.ts
index b99067a771..58117bc947 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryInspector.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryInspector.ts
@@ -32,14 +32,4 @@ export default class QueryInspector {
     });
     this.activeTab = writable(get(this.tabs)[0]);
   }
-
-  selectColumnTab() {
-    this.activeTab.set(
-      get(this.tabs).find((tab) => tab.id === 'inspect-column'),
-    );
-  }
-
-  selectCellTab() {
-    this.activeTab.set(get(this.tabs).find((tab) => tab.id === 'inspect-cell'));
-  }
 }
diff --git a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
index 51c100a931..27ce294143 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
@@ -3,7 +3,6 @@ import { derived, get, writable } from 'svelte/store';
 
 import { CancellablePromise, ImmutableMap } from '@mathesar-component-library';
 import type {
-  QueryColumnMetaData,
   QueryResultRecord,
   QueryResultsResponse,
   QueryRunResponse,
@@ -257,15 +256,6 @@ export default class QueryRunner {
     await this.run();
   }
 
-  selectColumn(alias: QueryColumnMetaData['alias']): void {
-    const processedColumn = get(this.processedColumns).get(alias);
-    if (!processedColumn) {
-      return;
-    }
-    this.selection.update((s) => s.ofOneColumn(processedColumn.id));
-    this.inspector.selectColumnTab();
-  }
-
   getQueryModel(): QueryModel {
     return get(this.query);
   }
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte
index 9c33275db2..fab09cb79e 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte
@@ -1,16 +1,25 @@
 <script lang="ts">
   import { TabContainer } from '@mathesar-component-library';
-  import type QueryRunner from '../QueryRunner';
+  import type { SheetCellDetails } from '@mathesar/components/sheet/selection';
+  import type MessageBus from '@mathesar/utils/MessageBus';
   import type QueryManager from '../QueryManager';
+  import type QueryRunner from '../QueryRunner';
   import ExplorationTab from './ExplorationTab.svelte';
-  import ColumnTab from './column-tab/ColumnTab.svelte';
   import CellTab from './cell/CellTab.svelte';
+  import ColumnTab from './column-tab/ColumnTab.svelte';
 
   export let queryHandler: QueryRunner | QueryManager;
   export let canEditMetadata: boolean;
+  export let cellSelectionStarted: MessageBus<SheetCellDetails> | undefined =
+    undefined;
 
   $: ({ inspector, query } = queryHandler);
   $: ({ tabs, activeTab } = inspector);
+  $: cellSelectionStarted?.listen((targetCell) => {
+    if (targetCell.type === 'column-header-cell') {
+      $activeTab = $tabs.find((tab) => tab.id === 'inspect-column');
+    }
+  });
 </script>
 
 <aside class="exploration-inspector">
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/WithExplorationInspector.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/WithExplorationInspector.svelte
index 3b8bbff579..09ea1c1513 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/WithExplorationInspector.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/WithExplorationInspector.svelte
@@ -1,13 +1,17 @@
 <script lang="ts">
   import { WithPanel } from '@mathesar-component-library';
+  import type { SheetCellDetails } from '@mathesar/components/sheet/selection';
   import { dataExplorerRightSidebarWidth } from '@mathesar/stores/localStorage';
   import type QueryManager from '@mathesar/systems/data-explorer/QueryManager';
   import type QueryRunner from '@mathesar/systems/data-explorer/QueryRunner';
+  import type MessageBus from '@mathesar/utils/MessageBus';
   import ExplorationInspector from './ExplorationInspector.svelte';
 
   export let isInspectorOpen: boolean;
   export let queryHandler: QueryRunner | QueryManager;
   export let canEditMetadata: boolean;
+  export let cellSelectionStarted: MessageBus<SheetCellDetails> | undefined =
+    undefined;
 </script>
 
 <WithPanel
@@ -21,6 +25,7 @@
     slot="panel"
     {queryHandler}
     {canEditMetadata}
+    {cellSelectionStarted}
     on:delete
   />
 </WithPanel>
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/ResultHeaderCell.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/ResultHeaderCell.svelte
index ba9855e119..ba46993a7f 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/ResultHeaderCell.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/ResultHeaderCell.svelte
@@ -21,9 +21,6 @@
   <Button
     appearance="plain"
     class="column-name-wrapper {isSelected ? 'selected' : ''}"
-    on:click={() => {
-      queryRunner.selectColumn(processedQueryColumn.column.alias);
-    }}
   >
     <!--
       TODO: Use a separate prop to identify column that isn't fetched yet
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/ResultPane.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/ResultPane.svelte
index e85a461662..8d5731b0c9 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/ResultPane.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/ResultPane.svelte
@@ -1,11 +1,16 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import type QueryRunner from '../QueryRunner';
+
+  import type { SheetCellDetails } from '@mathesar/components/sheet/selection';
+  import type MessageBus from '@mathesar/utils/MessageBus';
   import type QueryManager from '../QueryManager';
-  import Results from './Results.svelte';
+  import type QueryRunner from '../QueryRunner';
   import QueryRefreshButton from './QueryRefreshButton.svelte';
+  import Results from './Results.svelte';
 
   export let queryHandler: QueryRunner | QueryManager;
+  export let cellSelectionStarted: MessageBus<SheetCellDetails> | undefined =
+    undefined;
 </script>
 
 <section data-identifier="result">
@@ -15,7 +20,7 @@
       <QueryRefreshButton queryRunner={queryHandler} />
     </div>
   </header>
-  <Results {queryHandler} />
+  <Results {queryHandler} {cellSelectionStarted} />
 </section>
 
 <style lang="scss">
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
index 6c0ba4d5c2..793c266cf1 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
@@ -15,8 +15,10 @@
     SheetVirtualRows,
   } from '@mathesar/components/sheet';
   import { SheetClipboardHandler } from '@mathesar/components/sheet/SheetClipboardHandler';
+  import type { SheetCellDetails } from '@mathesar/components/sheet/selection';
   import { rowHeaderWidthPx, rowHeightPx } from '@mathesar/geometry';
   import { toast } from '@mathesar/stores/toast';
+  import type MessageBus from '@mathesar/utils/MessageBus';
   import type QueryManager from '../QueryManager';
   import type QueryRunner from '../QueryRunner';
   import { getRowSelectionId } from '../QueryRunner';
@@ -27,6 +29,8 @@
 
   export let queryHandler: QueryRunner | QueryManager;
   export let isExplorationPage = false;
+  export let cellSelectionStarted: MessageBus<SheetCellDetails> | undefined =
+    undefined;
 
   const ID_ROW_CONTROL_COLUMN = 'row-control';
   const columnWidths = new ImmutableMap([
@@ -93,6 +97,7 @@
       {clipboardHandler}
       usesVirtualList
       {selection}
+      {cellSelectionStarted}
     >
       <SheetHeader>
         <SheetOriginCell columnIdentifierKey={ID_ROW_CONTROL_COLUMN} />
diff --git a/mathesar_ui/src/systems/table-view/TableView.svelte b/mathesar_ui/src/systems/table-view/TableView.svelte
index 64bc2cdb59..2fcd2f8386 100644
--- a/mathesar_ui/src/systems/table-view/TableView.svelte
+++ b/mathesar_ui/src/systems/table-view/TableView.svelte
@@ -6,6 +6,7 @@
   import type { TableEntry } from '@mathesar/api/types/tables';
   import { Sheet } from '@mathesar/components/sheet';
   import { SheetClipboardHandler } from '@mathesar/components/sheet/SheetClipboardHandler';
+  import type { SheetCellDetails } from '@mathesar/components/sheet/selection';
   import { rowHeaderWidthPx } from '@mathesar/geometry';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
@@ -22,6 +23,7 @@
   import { toast } from '@mathesar/stores/toast';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { stringifyMapKeys } from '@mathesar/utils/collectionUtils';
+  import MessageBus from '@mathesar/utils/MessageBus';
   import Body from './Body.svelte';
   import Header from './header/Header.svelte';
   import StatusPane from './StatusPane.svelte';
@@ -31,6 +33,7 @@
 
   const tabularData = getTabularDataStoreFromContext();
   const userProfile = getUserProfileStoreFromContext();
+  const cellSelectionStarted = new MessageBus<SheetCellDetails>();
 
   $: database = $currentDatabase;
   $: schema = $currentSchema;
@@ -101,7 +104,7 @@
 </script>
 
 <div class="table-view">
-  <WithTableInspector {context} {showTableInspector}>
+  <WithTableInspector {context} {showTableInspector} {cellSelectionStarted}>
     <div class="sheet-area">
       {#if $processedColumns.size}
         <Sheet
@@ -109,6 +112,7 @@
           {columnWidths}
           {selection}
           {usesVirtualList}
+          {cellSelectionStarted}
           bind:horizontalScrollOffset={$horizontalScrollOffset}
           bind:scrollOffset={$scrollOffset}
           columns={sheetColumns}
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte b/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
index 1b6607b220..6e1c9291bd 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
@@ -1,54 +1,33 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import { TabContainer } from '@mathesar-component-library';
-  import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
-  import type { ComponentType } from 'svelte';
+  import type { SheetCellDetails } from '@mathesar/components/sheet/selection';
+  import type MessageBus from '@mathesar/utils/MessageBus';
+  import CellMode from './cell/CellMode.svelte';
   import ColumnMode from './column/ColumnMode.svelte';
   import RecordMode from './record/RecordMode.svelte';
-  import CellMode from './cell/CellMode.svelte';
-
   import TableMode from './table/TableMode.svelte';
 
-  type TabItem = { label: string; id: number; component: ComponentType };
-  const tabs: TabItem[] = [
-    {
-      label: $_('table'),
-      component: TableMode,
-      id: 1,
-    },
-    {
-      label: $_('column'),
-      component: ColumnMode,
-      id: 2,
-    },
-    {
-      label: $_('record'),
-      component: RecordMode,
-      id: 3,
-    },
-    {
-      label: $_('cell'),
-      component: CellMode,
-      id: 4,
-    },
-  ];
+  const tableTab = { label: $_('table'), component: TableMode, id: 1 };
+  const columnTab = { label: $_('column'), component: ColumnMode, id: 2 };
+  const recordTab = { label: $_('record'), component: RecordMode, id: 3 };
+  const cellTab = { label: $_('cell'), component: CellMode, id: 4 };
+  const tabs = [tableTab, columnTab, recordTab, cellTab];
 
-  let activeTab: TabItem;
+  export let cellSelectionStarted: MessageBus<SheetCellDetails> | undefined =
+    undefined;
 
-  // // TODO_3037 restore logic to select tab based on cell selection
-  // const tabularData = getTabularDataStoreFromContext();
-  // $: ({ selection } = $tabularData);
-  // $: ({ selectedCells } = selection);
-  // $: {
-  //   // Explicit dependency
-  //   $selectedCells;
-  //   if (selection.isAnyColumnCompletelySelected()) {
-  //     [, activeTab] = tabs;
-  //   }
-  //   if (selection.isAnyRowCompletelySelected()) {
-  //     [, , activeTab] = tabs;
-  //   }
-  // }
+  let activeTab: (typeof tabs)[number];
+
+  $: cellSelectionStarted?.listen((targetCell) => {
+    if (targetCell.type === 'column-header-cell') {
+      activeTab = columnTab;
+    }
+    if (targetCell.type === 'row-header-cell') {
+      activeTab = recordTab;
+    }
+  });
 </script>
 
 <div class="table-inspector">
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/WithTableInspector.svelte b/mathesar_ui/src/systems/table-view/table-inspector/WithTableInspector.svelte
index 3dc854f9ad..b3b3929236 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/WithTableInspector.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/WithTableInspector.svelte
@@ -1,10 +1,14 @@
 <script lang="ts">
   import { WithPanel } from '@mathesar-component-library';
+  import type { SheetCellDetails } from '@mathesar/components/sheet/selection';
   import { tableInspectorWidth } from '@mathesar/stores/localStorage';
+  import type MessageBus from '@mathesar/utils/MessageBus';
   import TableInspector from './TableInspector.svelte';
 
   export let context: 'page' | 'widget' | 'shared-consumer-page';
   export let showTableInspector: boolean;
+  export let cellSelectionStarted: MessageBus<SheetCellDetails> | undefined =
+    undefined;
 </script>
 
 {#if context === 'widget'}
@@ -21,6 +25,6 @@
     maxSizePx={600}
   >
     <slot />
-    <TableInspector slot="panel" />
+    <TableInspector slot="panel" {cellSelectionStarted} />
   </WithPanel>
 {/if}
diff --git a/mathesar_ui/src/utils/MessageBus.ts b/mathesar_ui/src/utils/MessageBus.ts
new file mode 100644
index 0000000000..af18bc9547
--- /dev/null
+++ b/mathesar_ui/src/utils/MessageBus.ts
@@ -0,0 +1,39 @@
+type Ignore = () => void;
+type Listen<Message> = (message: Message) => void;
+
+/**
+ * This is a simple message bus that allows sending messages with arbitrary
+ * payloads to listeners in a pub/sub fashion. It is useful for components that
+ * need to communicate with each other to perform actions imperatively.
+ *
+ * The `listen` method is similar to a Svelte store's `subscribe` method, and
+ * the `send` method is similar to a Svelte store's `set` method. We don't use
+ * Svelte stores for this implementation though because we want messages to be
+ * ephemeral. When a new listener is added, it should not receive messages that
+ * were sent before it was added. This is not possible with Svelte stores
+ * because the [store contract][1] stipulates:
+ *
+ * > This subscription function must be immediately and synchronously called
+ * > with the store's current value upon calling `.subscribe`.
+ *
+ * [1]:
+ * https://svelte.dev/docs#component-format-script-4-prefix-stores-with-$-to-access-their-values-store-contract
+ */
+export default class MessageBus<Message = void> {
+  private listeners: Set<Listen<Message>>;
+
+  constructor() {
+    this.listeners = new Set();
+  }
+
+  listen(listener: Listen<Message>): Ignore {
+    this.listeners.add(listener);
+    return () => {
+      this.listeners.delete(listener);
+    };
+  }
+
+  send(message: Message) {
+    this.listeners.forEach((l) => l(message));
+  }
+}

From e1c2c73693f2156be54d2ecdabcc9fbc0f26c92d Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 12 Apr 2024 17:29:30 +0800
Subject: [PATCH 0066/1141] remove demo docker build target

---
 Dockerfile | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 49f667b82a..d27d3b3a06 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -106,18 +106,6 @@ RUN rm -rf ./mathesar/tests ./db/tests
 RUN rm -rf ./docs
 
 
-#=========== STAGE: DEMO =====================================================#
-
-FROM common AS demo
-
-# Install prod requirements
-RUN pip install --no-cache-dir -r requirements-demo.txt
-
-EXPOSE 8000
-
-ENTRYPOINT ["./run.sh"]
-
-
 #=========== STAGE: PRODUCTION ===============================================#
 
 FROM common AS production

From 7d3f46eceba410353b7ede7c5e6c6761aa96e5a4 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 12 Apr 2024 17:33:33 +0800
Subject: [PATCH 0067/1141] remove demo mode from E2E Dockerfile, docs

---
 .env.example           | 2 --
 DEVELOPER_GUIDE.md     | 6 ------
 Dockerfile.integ-tests | 2 --
 3 files changed, 10 deletions(-)

diff --git a/.env.example b/.env.example
index f002e016f1..7e14bd67f4 100644
--- a/.env.example
+++ b/.env.example
@@ -1,4 +1,2 @@
 ALLOWED_HOSTS='.localhost, 127.0.0.1, [::1]'
 SECRET_KEY=2gr6ud88x=(p855_5nbj_+7^bw-iz&n7ldqv%94mjaecl+b9=4
-## Uncomment the setting below to put Mathesar in 'demo mode'
-# DJANGO_SETTINGS_MODULE=demo.settings
diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md
index bbd533d188..6e08bb8c30 100644
--- a/DEVELOPER_GUIDE.md
+++ b/DEVELOPER_GUIDE.md
@@ -216,12 +216,6 @@ If you'd like to manually push or pull translations, follow the instructions in
 
 1. Commit and push the changes to our repo.
 
-## Demo mode
-
-Mathesar can be run in "demo mode" to meet the specific needs of our [live demo site](https://demo.mathesar.org).
-
-See our [Live demo mode](./demo/README.md) guide for more information on enabling live demo mode locally
-
 
 ## Opening a shell in the container
 
diff --git a/Dockerfile.integ-tests b/Dockerfile.integ-tests
index ad04a97416..b9b2691270 100644
--- a/Dockerfile.integ-tests
+++ b/Dockerfile.integ-tests
@@ -129,11 +129,9 @@ WORKDIR /code/
 
 COPY requirements.txt .
 COPY requirements-dev.txt .
-COPY requirements-demo.txt .
 
 RUN pip install -r requirements.txt
 RUN pip install -r requirements-dev.txt
-RUN pip install -r requirements-demo.txt
 COPY . .
 
 RUN cd mathesar_ui && npm ci && npm run build

From 6f2f6daa847615f90f96e9f7c48b06747bdc90d2 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 12 Apr 2024 17:47:36 +0800
Subject: [PATCH 0068/1141] remove arxiv dependency, references

---
 demo/README.md                                |  47 --
 demo/apps.py                                  |  13 -
 demo/db_namer.py                              |  55 ---
 demo/install/arxiv_skeleton.py                |  62 ---
 demo/install/base.py                          |   3 -
 demo/install/datasets.py                      |  31 +-
 demo/install/explorations.py                  |   4 +-
 .../install/resources/arxiv_dataset_setup.sql | 289 ------------
 demo/install/resources/arxiv_papers.pickle    | Bin 413175 -> 0 bytes
 demo/management/__init__.py                   |   0
 demo/management/commands/__init__.py          |   0
 demo/management/commands/clean_stale_db.py    |  94 ----
 .../download_and_pickle_some_arxiv_data.py    |  17 -
 demo/management/commands/load_arxiv_data.py   | 418 ------------------
 .../commands/remove_arxiv_pairs_log.py        |  17 -
 .../commands/setup_demo_template_db.py        |  53 ---
 demo/middleware.py                            |  58 ---
 demo/settings.py                              |  27 --
 demo/tests/test_db_namer.py                   |  31 --
 demo/urls.py                                  |  22 -
 demo/utils.py                                 |  35 --
 mathesar/install.py                           |   8 -
 mathesar/views.py                             |   9 -
 requirements-demo.txt                         |   2 -
 requirements-dev.txt                          |   4 +-
 25 files changed, 6 insertions(+), 1293 deletions(-)
 delete mode 100644 demo/README.md
 delete mode 100644 demo/apps.py
 delete mode 100644 demo/db_namer.py
 delete mode 100644 demo/install/arxiv_skeleton.py
 delete mode 100644 demo/install/resources/arxiv_dataset_setup.sql
 delete mode 100644 demo/install/resources/arxiv_papers.pickle
 delete mode 100644 demo/management/__init__.py
 delete mode 100644 demo/management/commands/__init__.py
 delete mode 100644 demo/management/commands/clean_stale_db.py
 delete mode 100644 demo/management/commands/download_and_pickle_some_arxiv_data.py
 delete mode 100644 demo/management/commands/load_arxiv_data.py
 delete mode 100644 demo/management/commands/remove_arxiv_pairs_log.py
 delete mode 100644 demo/management/commands/setup_demo_template_db.py
 delete mode 100644 demo/middleware.py
 delete mode 100644 demo/settings.py
 delete mode 100644 demo/tests/test_db_namer.py
 delete mode 100644 demo/urls.py
 delete mode 100644 demo/utils.py
 delete mode 100644 requirements-demo.txt

diff --git a/demo/README.md b/demo/README.md
deleted file mode 100644
index da2197bcbc..0000000000
--- a/demo/README.md
+++ /dev/null
@@ -1,47 +0,0 @@
-# Demo mode
-
-This folder includes code related to enabling "demo mode" for Mathesar.
-
-When Mathesar is in demo mode it has the following special behavior:
-
-- A new database is created for every user session
-- A banner displays atop the UI
-- Analytics are enabled, sending data to the Mathesar team
-
-## Running
-
-To run Mathesar in demo mode locally, add the following to your local `.env` file:
-
-```
-DJANGO_SETTINGS_MODULE=demo.settings
-MATHESAR_LIVE_DEMO_USERNAME=admin
-MATHESAR_LIVE_DEMO_PASSWORD=password
-```
-
-`MATHESAR_LIVE_DEMO_USERNAME` and `MATHESAR_LIVE_DEMO_PASSWORD` are optional – if you set these, then the login credentials will be shown on the login page. If either is omitted, credentials will not be shown.
-
-If you've not yet created the template database, you'll have to run the Django management command for that:
-
-```
-docker exec mathesar_service_dev sh -c "python manage.py setup_demo_template_db"
-```
-
-That might require you to restart or [rebuild/recreate your docker compose environment](https://github.com/centerofci/mathesar/blob/develop/DEVELOPER_GUIDE.md#rebuilding-the-docker-images).
-
-## Details
-
-Below information is up-to-date as of time of writting (2023-07-05).
-
-### How demo datasets are defined
-
-The gist of it can be seen in [`load_datasets` function](https://github.com/centerofci/mathesar/blob/0d99ee984206a99c6743a319504a1d86621d71d5/demo/install/datasets.py#L18C11-L18C11). The [Arxiv dataset](https://github.com/centerofci/mathesar/blob/0d99ee984206a99c6743a319504a1d86621d71d5/demo/install/datasets.py#L73C18-L73C18) is special, however. It is regularly updated via a cron job, thus giving a demo of how Mathesar can share databases with other systems.
-
-### How each user gets a session and each session gets a database
-
-We use [Django middleware](https://github.com/centerofci/mathesar/blob/0d99ee984206a99c6743a319504a1d86621d71d5/demo/middleware.py#L19C19-L19C19) to intercept new guest sessions and perform the provisioning. Our intent is for each user to have his own database that will not be contaminated by other demo users.
-
-### How guest databases are provisioned (template database)
-
-When a new guest (demo user) is being provisioned, [we create a dedicated database for him, using Postgres' template databases feature](https://github.com/centerofci/mathesar/blob/0d99ee984206a99c6743a319504a1d86621d71d5/demo/install/base.py#L67C37-L67C37). Using a template database allows us to only have to copy it to create a new database with our demo datasets setup.
-
-The template database is setup [when our demo server is being provisioned by Ansible](https://github.com/centerofci/mathesar-ansible/blob/7a5db8bd13e86bbf191b4dd95e66cd138a512d36/roles/demo/tasks/main.yml#L39). [`setup_demo_template_db`](https://github.com/centerofci/mathesar/blob/0d99ee984206a99c6743a319504a1d86621d71d5/demo/management/commands/setup_demo_template_db.py#L11) is the Django management command that Ansible calls. The most interesting part of it is [loading the demo datasets](https://github.com/centerofci/mathesar/blob/0d99ee984206a99c6743a319504a1d86621d71d5/demo/install/datasets.py#L18).
diff --git a/demo/apps.py b/demo/apps.py
deleted file mode 100644
index f1b2468c81..0000000000
--- a/demo/apps.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from django.apps import AppConfig
-
-TEMPLATE_INITIALIZED = 'TEMPLATE_INITIALIZED'
-
-
-class DemoConfig(AppConfig):
-    """Initialization manager."""
-
-    name = "demo"
-
-    def ready(self):
-        """Perform initialization tasks."""
-        pass
diff --git a/demo/db_namer.py b/demo/db_namer.py
deleted file mode 100644
index 355a9f0346..0000000000
--- a/demo/db_namer.py
+++ /dev/null
@@ -1,55 +0,0 @@
-"""Utility function for generating database names from session ID cookies."""
-WORDS = [
-    'wax', 'wry', 'jet', 'end', 'web', 'elf', 'jam', 'key', 'ant', 'fin', 'top',
-    'ray', 'tan', 'box', 'saw', 'tie', 'spy', 'day', 'gym', 'fox', 'van', 'ear',
-    'hub', 'age', 'hot', 'pin', 'red', 'map', 'run', 'den', 'bay', 'gas', 'nut',
-    'toy', 'art', 'net', 'pea', 'yam', 'pet', 'hat', 'ivy', 'egg', 'log', 'mum',
-    'rat', 'owl', 'hen', 'dry', 'bar', 'cub', 'dew', 'sun', 'lip', 'pig', 'tin',
-    'mud', 'ox', 'wok', 'ink', 'ton', 'big', 'way', 'tax', 'amp', 'act', 'ice',
-    'far', 'low', 'air', 'cut', 'oak', 'yak', 'eel', 'gem', 'few', 'ski', 'law',
-    'sea', 'hip', 'bag', 'bug', 'shy', 'dot', 'dye', 'eye', 'jaw', 'rib', 'mat',
-    'fir', 'bit', 'son', 'cat', 'six', 'fly', 'car', 'tub', 'emu', 'elk', 'tv',
-    'sly', 'tip', 'fan', 'fur', 'yew', 'jay', 'bus', 'zoo', 'sky', 'elm', 'cry',
-    'bee', 'tar', 'awe', 'bat', 'kip', 'cod', 'oil', 'foe', 'pot', 'ash', 'gum',
-    'odd', 'icy', 'koi', 'bun', 'era', 'leo', 'lan', 'soy', 'paw', 'can', 'pan',
-    'jar', 'pen', 'may', 'tea', 'ten', 'asp', 'dog', 'cap', 'bed', 'fog', 'bow',
-    'cup', 'pie', 'cow', 'fig', 'boa'
-]
-
-MODULUS = len(WORDS)
-
-
-def get_name(
-        session_id,
-        chunk=2,
-        max_words=5,
-        join_val='_',
-        word_list=None,
-        modulus=None,
-):
-    """
-    Deterministically generate a name of the form word1_word2_word3_....
-
-    This is designed to work with Django sessionid cookie values, but
-    would theoretically work with any string value.
-
-    Given `session_id`, we convert it to hex, then get a sequence of
-    numbers by breaking the resulting value into hex strings of length
-    `chunk`, then converting each to a decimal integer modulo `modulus`.
-    Finally, we find an adjective corresponding to each integer by its
-    index in the given `adjectives` list, and join them with a terminal
-    string 'mathesar' using the given `join_val`.
-    """
-    hex_chunk = 2 * chunk
-    bytes_length = chunk * max_words
-    session_id = session_id or ''
-    modulus = modulus or MODULUS
-    word_list = word_list or WORDS
-    salt_gen = 'A'  # generates 'paw_paw_paw_...' after transformation
-    session_id += salt_gen * (bytes_length - len(session_id))
-    session_hex = bytes(session_id, 'utf-8').hex()
-    indices = (
-        int(session_hex[i:i + hex_chunk], 16) % modulus
-        for i in range(0, 2 * bytes_length, hex_chunk)
-    )
-    return join_val.join(word_list[i] for i in indices)
diff --git a/demo/install/arxiv_skeleton.py b/demo/install/arxiv_skeleton.py
deleted file mode 100644
index fe1af2e577..0000000000
--- a/demo/install/arxiv_skeleton.py
+++ /dev/null
@@ -1,62 +0,0 @@
-"""
-We load the arXiv data set by first setting up a skeleton defining the data
-model whenever a user starts a new demo, and then loading data into the data
-model via a cron job that runs a management command.
-"""
-
-import json
-from pathlib import Path
-
-from django.conf import settings
-from sqlalchemy import text
-from demo.install.base import ARXIV_SETUP_SQL
-
-
-def setup_and_register_schema_for_receiving_arxiv_data(
-    engine, schema_name='Latest Papers from arXiv'
-):
-    db_name, schema_name = _setup_arxiv_schema(engine, schema_name)
-    append_db_and_arxiv_schema_to_log(db_name, schema_name)
-
-
-def _make_sure_parent_directories_present(path_to_file):
-    path_to_file = Path(path_to_file)
-    parent_directory_of_file = path_to_file.parent
-    parent_directory_of_file.mkdir(parents=True, exist_ok=True)
-
-
-def append_db_and_arxiv_schema_to_log(db_name, schema_name):
-    path = get_arxiv_db_and_schema_log_path()
-    _make_sure_parent_directories_present(path)
-    if db_name == getattr(settings, 'MATHESAR_DEMO_TEMPLATE', None):
-        return
-    db_and_schema = [db_name, schema_name]
-    with open(path, 'a') as f:
-        json.dump(db_and_schema, f)
-        f.write('\n')
-
-
-def get_arxiv_db_and_schema_log_path():
-    return Path(settings.MATHESAR_DEMO_ARXIV_LOG_PATH).absolute()
-
-
-def _setup_arxiv_schema(engine, schema_name):
-    schema_description = (
-        "Regularly updated by a script that gets the 50 most recent Computer"
-        " Science research papers from arXiv and inserts it into this schema."
-    )
-    drop_schema_query = text(f'DROP SCHEMA IF EXISTS "{schema_name}" CASCADE;')
-    create_schema_query = text(f'CREATE SCHEMA "{schema_name}";')
-    set_search_path = text(f'SET search_path="{schema_name}";')
-    set_schema_comment_query = text(
-        f'COMMENT ON SCHEMA "{schema_name}"'
-        f'IS $escape_token${schema_description}$escape_token$;'
-    )
-    with engine.begin() as conn, open(ARXIV_SETUP_SQL) as f:
-        conn.execute(drop_schema_query)
-        conn.execute(create_schema_query)
-        conn.execute(set_search_path)
-        conn.execute(text(f.read()))
-        conn.execute(set_schema_comment_query)
-    db_name = engine.url.database
-    return db_name, schema_name
diff --git a/demo/install/base.py b/demo/install/base.py
index 24869ac382..f08d3586ac 100644
--- a/demo/install/base.py
+++ b/demo/install/base.py
@@ -16,12 +16,9 @@
 MOVIES_SQL_TABLES = os.path.join(RESOURCES, "movie_collection_tables.sql")
 MOVIES_SQL_FKS = os.path.join(RESOURCES, "movie_collection_fks.sql")
 MOVIES_CSV = os.path.join(RESOURCES, 'movies_csv')
-ARXIV_SETUP_SQL = os.path.join(RESOURCES, 'arxiv_dataset_setup.sql')
-ARXIV_PAPERS_PICKLE = os.path.join(RESOURCES, 'arxiv_papers.pickle')
 LIBRARY_MANAGEMENT = 'Library Management'
 MOVIE_COLLECTION = 'Movie Collection'
 MATHESAR_CON = 'Mathesar Con'
-ARXIV = 'Latest Papers from arXiv'
 
 
 def get_dj_schema_by_name(engine, name):
diff --git a/demo/install/datasets.py b/demo/install/datasets.py
index af8bcf84e2..2c2ebc7107 100644
--- a/demo/install/datasets.py
+++ b/demo/install/datasets.py
@@ -1,17 +1,12 @@
-"""This module contains functions to load datasets for the demo."""
+"""This module contains functions to load datasets for demo purposes."""
 import logging
 import pickle
 
 from sqlalchemy import text
 
-from demo.install.arxiv_skeleton import setup_and_register_schema_for_receiving_arxiv_data
 from demo.install.library_dataset import load_library_dataset
 from demo.install.movies_dataset import load_movies_dataset
-from demo.management.commands.load_arxiv_data import update_arxiv_schema
-from demo.install.base import (
-    MATHESAR_CON, DEVCON_DATASET,
-    ARXIV, ARXIV_PAPERS_PICKLE,
-)
+from demo.install.base import (MATHESAR_CON, DEVCON_DATASET,)
 
 
 def load_datasets(engine):
@@ -19,7 +14,6 @@ def load_datasets(engine):
     load_library_dataset(engine)
     load_movies_dataset(engine)
     _load_devcon_dataset(engine)
-    _load_arxiv_data_skeleton(engine)
 
 
 def _load_devcon_dataset(engine):
@@ -31,24 +25,3 @@ def _load_devcon_dataset(engine):
         conn.execute(create_schema_query)
         conn.execute(set_search_path)
         conn.execute(text(f.read()))
-
-
-def _load_arxiv_data_skeleton(engine):
-    schema_name = ARXIV
-    setup_and_register_schema_for_receiving_arxiv_data(engine, schema_name=schema_name)
-    _load_arxiv_dataset(engine, schema_name=schema_name)
-
-
-def _load_arxiv_dataset(engine, schema_name):
-    """
-    Defined separately, because this dataset does not need a dataset per-se; it's meant to be
-    updated via cron. We're preloading some data so that it doesn't start off empty.
-
-    Does not propogate if there's a failure.
-    """
-    try:
-        with open(ARXIV_PAPERS_PICKLE, 'rb') as f:
-            papers = pickle.load(f)
-            update_arxiv_schema(engine, schema_name, papers)
-    except Exception as e:
-        logging.error(e, exc_info=True)
diff --git a/demo/install/explorations.py b/demo/install/explorations.py
index 2d5ec929c4..be1c08aa9d 100644
--- a/demo/install/explorations.py
+++ b/demo/install/explorations.py
@@ -1,6 +1,6 @@
 """This module contains logic for creating premade explorations of demo data."""
 from demo.install.base import (
-    LIBRARY_MANAGEMENT, MATHESAR_CON, ARXIV,
+    LIBRARY_MANAGEMENT, MATHESAR_CON,
     get_dj_column_by_name, get_dj_schema_by_name, get_dj_table_by_name,
 )
 from mathesar.models.query import UIQuery
@@ -333,7 +333,7 @@ def _create_organizations_by_topic_view(engine):
 
 
 def _create_paper_authors_view(engine):
-    schema = get_dj_schema_by_name(engine, ARXIV)
+    schema = get_dj_schema_by_name(engine)
 
     papers = get_dj_table_by_name(schema, "Papers")
     pa_map = get_dj_table_by_name(schema, "Paper-Author Map")
diff --git a/demo/install/resources/arxiv_dataset_setup.sql b/demo/install/resources/arxiv_dataset_setup.sql
deleted file mode 100644
index df1f1bae77..0000000000
--- a/demo/install/resources/arxiv_dataset_setup.sql
+++ /dev/null
@@ -1,289 +0,0 @@
--- Authors
-
-CREATE TABLE "Authors" (
-    id SERIAL PRIMARY KEY,
-    "Name" text UNIQUE
-);
-
--- Categories
-
-CREATE TABLE "Categories" (
-    id text PRIMARY KEY,
-    "Name" text,
-    "Description" text
-);
-
--- Links
-
-CREATE TABLE "Links" (
-    id SERIAL PRIMARY KEY,
-    "URL" mathesar_types.uri UNIQUE,
-    "Purpose" text
-);
-
-COMMENT ON TABLE "Links" IS 'Links (URLs) associated with a given paper; each paper is expected to at least have a link to its PDF version.';
-
--- Papers
-
-CREATE TABLE "Papers" (
-    id SERIAL PRIMARY KEY,
-    "Title" text,
-    "Summary" text,
-    "Journal reference" text,
-    "Primary category" text references "Categories"(id),
-    "Updated" timestamp,
-    "Published" timestamp,
-    "Comment" text,
-    "DOI" text,
-    "arXiv URL" mathesar_types.uri UNIQUE
-);
-
-COMMENT ON TABLE "Papers" IS 'Academic papers sourced from the arXiv API.';
-
--- Paper-Author map table
-
-CREATE TABLE "Paper-Author Map" (
-  id SERIAL PRIMARY KEY,
-  paper_id int,
-  author_id int,
-  UNIQUE (paper_id, author_id),
-  CONSTRAINT fk_paper FOREIGN KEY(paper_id) REFERENCES "Papers"(id),
-  CONSTRAINT fk_author FOREIGN KEY(author_id) REFERENCES "Authors"(id)
-);
-
-COMMENT ON TABLE "Paper-Author Map" IS 'Maps papers to authors.';
-
--- Paper-Category map table
-
-CREATE TABLE "Paper-Category Map" (
-  id SERIAL PRIMARY KEY,
-  paper_id int,
-  category_id text,
-  UNIQUE (paper_id, category_id),
-  CONSTRAINT fk_paper FOREIGN KEY(paper_id) REFERENCES "Papers"(id),
-  CONSTRAINT fk_category FOREIGN KEY(category_id) REFERENCES "Categories"(id)
-);
-
-COMMENT ON TABLE "Paper-Category Map" IS 'Maps papers to categories.';
-
--- Paper-Link map table
-
-CREATE TABLE "Paper-Link Map" (
-  id SERIAL PRIMARY KEY,
-  paper_id int,
-  link_id int,
-  UNIQUE (paper_id, link_id),
-  CONSTRAINT fk_paper FOREIGN KEY(paper_id) REFERENCES "Papers"(id),
-  CONSTRAINT fk_link FOREIGN KEY(link_id) REFERENCES "Links"(id)
-);
-
-COMMENT ON TABLE "Paper-Link Map" IS 'Maps papers to links.';
-
--- Populate Categories with Computer Science information from https://arxiv.org/category_taxonomy
-
-INSERT INTO "Categories" (
-  id,
-  "Name",
-  "Description"
-)
-VALUES
-(
-  'cs.AI',
-  'Artificial Intelligence',
-  'Covers all areas of AI except Vision, Robotics, Machine Learning, Multiagent Systems, and Computation and Language (Natural Language Processing), which have separate subject areas. In particular, includes Expert Systems, Theorem Proving (although this may overlap with Logic in Computer Science), Knowledge Representation, Planning, and Uncertainty in AI. Roughly includes material in ACM Subject Classes I.2.0, I.2.1, I.2.3, I.2.4, I.2.8, and I.2.11.'
-),
-(
-  'cs.AR',
-  'Hardware Architecture',
-  'Covers systems organization and hardware architecture. Roughly includes material in ACM Subject Classes C.0, C.1, and C.5.'
-),
-(
-  'cs.CC',
-  'Computational Complexity',
-  'Covers models of computation, complexity classes, structural complexity, complexity tradeoffs, upper and lower bounds. Roughly includes material in ACM Subject Classes F.1 (computation by abstract devices), F.2.3 (tradeoffs among complexity measures), and F.4.3 (formal languages), although some material in formal languages may be more appropriate for Logic in Computer Science. Some material in F.2.1 and F.2.2, may also be appropriate here, but is more likely to have Data Structures and Algorithms as the primary subject area.'
-),
-(
-  'cs.CE',
-  'Computational Engineering, Finance, and Science',
-  'Covers applications of computer science to the mathematical modeling of complex systems in the fields of science, engineering, and finance. Papers here are interdisciplinary and applications-oriented, focusing on techniques and tools that enable challenging computational simulations to be performed, for which the use of supercomputers or distributed computing platforms is often required. Includes material in ACM Subject Classes J.2, J.3, and J.4 (economics).'
-),
-(
-  'cs.CG',
-  'Computational Geometry',
-  'Roughly includes material in ACM Subject Classes I.3.5 and F.2.2.'
-),
-(
-  'cs.CL',
-  'Computation and Language',
-  'Covers natural language processing. Roughly includes material in ACM Subject Class I.2.7. Note that work on artificial languages (programming languages, logics, formal systems) that does not explicitly address natural-language issues broadly construed (natural-language processing, computational linguistics, speech, text retrieval, etc.) is not appropriate for this area.'
-),
-(
-  'cs.CR',
-  'Cryptography and Security',
-  'Covers all areas of cryptography and security including authentication, public key cryptosytems, proof-carrying code, etc. Roughly includes material in ACM Subject Classes D.4.6 and E.3.'
-),
-(
-  'cs.CV',
-  'Computer Vision and Pattern Recognition',
-  'Covers image processing, computer vision, pattern recognition, and scene understanding. Roughly includes material in ACM Subject Classes I.2.10, I.4, and I.5.'
-),
-(
-  'cs.CY',
-  'Computers and Society',
-  'Covers impact of computers on society, computer ethics, information technology and public policy, legal aspects of computing, computers and education. Roughly includes material in ACM Subject Classes K.0, K.2, K.3, K.4, K.5, and K.7.'
-),
-(
-  'cs.DB',
-  'Databases',
-  'Covers database management, datamining, and data processing. Roughly includes material in ACM Subject Classes E.2, E.5, H.0, H.2, and J.1.'
-),
-(
-  'cs.DC',
-  'Distributed, Parallel, and Cluster Computing',
-  'Covers fault-tolerance, distributed algorithms, stabilility, parallel computation, and cluster computing. Roughly includes material in ACM Subject Classes C.1.2, C.1.4, C.2.4, D.1.3, D.4.5, D.4.7, E.1.'
-),
-(
-  'cs.DL',
-  'Digital Libraries',
-  'Covers all aspects of the digital library design and document and text creation. Note that there will be some overlap with Information Retrieval (which is a separate subject area). Roughly includes material in ACM Subject Classes H.3.5, H.3.6, H.3.7, I.7.'
-),
-(
-  'cs.DM',
-  'Discrete Mathematics',
-  'Covers combinatorics, graph theory, applications of probability. Roughly includes material in ACM Subject Classes G.2 and G.3.'
-),
-(
-  'cs.DS',
-  'Data Structures and Algorithms',
-  'Covers data structures and analysis of algorithms. Roughly includes material in ACM Subject Classes E.1, E.2, F.2.1, and F.2.2.'
-),
-(
-  'cs.ET',
-  'Emerging Technologies',
-  'Covers approaches to information processing (computing, communication, sensing) and bio-chemical analysis based on alternatives to silicon CMOS-based technologies, such as nanoscale electronic, photonic, spin-based, superconducting, mechanical, bio-chemical and quantum technologies (this list is not exclusive). Topics of interest include (1) building blocks for emerging technologies, their scalability and adoption in larger systems, including integration with traditional technologies, (2) modeling, design and optimization of novel devices and systems, (3) models of computation, algorithm design and programming for emerging technologies.'
-),
-(
-  'cs.FL',
-  'Formal Languages and Automata Theory',
-  'Covers automata theory, formal language theory, grammars, and combinatorics on words. This roughly corresponds to ACM Subject Classes F.1.1, and F.4.3. Papers dealing with computational complexity should go to cs.CC; papers dealing with logic should go to cs.LO.'
-),
-(
-  'cs.GL',
-  'General Literature',
-  'Covers introductory material, survey material, predictions of future trends, biographies, and miscellaneous computer-science related material. Roughly includes all of ACM Subject Class A, except it does not include conference proceedings (which will be listed in the appropriate subject area).'
-),
-(
-  'cs.GR',
-  'Graphics',
-  'Covers all aspects of computer graphics. Roughly includes material in all of ACM Subject Class I.3, except that I.3.5 is is likely to have Computational Geometry as the primary subject area.'
-),
-(
-  'cs.GT',
-  'Computer Science and Game Theory',
-  'Covers all theoretical and applied aspects at the intersection of computer science and game theory, including work in mechanism design, learning in games (which may overlap with Learning), foundations of agent modeling in games (which may overlap with Multiagent systems), coordination, specification and formal methods for non-cooperative computational environments. The area also deals with applications of game theory to areas such as electronic commerce.'
-),
-(
-  'cs.HC',
-  'Human-Computer Interaction',
-  'Covers human factors, user interfaces, and collaborative computing. Roughly includes material in ACM Subject Classes H.1.2 and all of H.5, except for H.5.1, which is more likely to have Multimedia as the primary subject area.'
-),
-(
-  'cs.IR',
-  'Information Retrieval',
-  'Covers indexing, dictionaries, retrieval, content and analysis. Roughly includes material in ACM Subject Classes H.3.0, H.3.1, H.3.2, H.3.3, and H.3.4.'
-),
-(
-  'cs.IT',
-  'Information Theory',
-  'Covers theoretical and experimental aspects of information theory and coding. Includes material in ACM Subject Class E.4 and intersects with H.1.1.'
-),
-(
-  'cs.LG',
-  'Machine Learning',
-  'Papers on all aspects of machine learning research (supervised, unsupervised, reinforcement learning, bandit problems, and so on) including also robustness, explanation, fairness, and methodology. cs.LG is also an appropriate primary category for applications of machine learning methods.'
-),
-(
-  'cs.LO',
-  'Logic in Computer Science',
-  'Covers all aspects of logic in computer science, including finite model theory, logics of programs, modal logic, and program verification. Programming language semantics should have Programming Languages as the primary subject area. Roughly includes material in ACM Subject Classes D.2.4, F.3.1, F.4.0, F.4.1, and F.4.2; some material in F.4.3 (formal languages) may also be appropriate here, although Computational Complexity is typically the more appropriate subject area.'
-),
-(
-  'cs.MA',
-  'Multiagent Systems',
-  'Covers multiagent systems, distributed artificial intelligence, intelligent agents, coordinated interactions. and practical applications. Roughly covers ACM Subject Class I.2.11.'
-),
-(
-  'cs.MM',
-  'Multimedia',
-  'Roughly includes material in ACM Subject Class H.5.1.'
-),
-(
-  'cs.MS',
-  'Mathematical Software',
-  'Roughly includes material in ACM Subject Class G.4.'
-),
-(
-  'cs.NA',
-  'Numerical Analysis',
-  'cs.NA is an alias for math.NA. Roughly includes material in ACM Subject Class G.1.'
-),
-(
-  'cs.NE',
-  'Neural and Evolutionary Computing',
-  'Covers neural networks, connectionism, genetic algorithms, artificial life, adaptive behavior. Roughly includes some material in ACM Subject Class C.1.3, I.2.6, I.5.'
-),
-(
-  'cs.NI',
-  'Networking and Internet Architecture',
-  'Covers all aspects of computer communication networks, including network architecture and design, network protocols, and internetwork standards (like TCP/IP). Also includes topics, such as web caching, that are directly relevant to Internet architecture and performance. Roughly includes all of ACM Subject Class C.2 except C.2.4, which is more likely to have Distributed, Parallel, and Cluster Computing as the primary subject area.'
-),
-(
-  'cs.OH',
-  'Other Computer Science',
-  'This is the classification to use for documents that do not fit anywhere else.'
-),
-(
-  'cs.OS',
-  'Operating Systems',
-  'Roughly includes material in ACM Subject Classes D.4.1, D.4.2., D.4.3, D.4.4, D.4.5, D.4.7, and D.4.9.'
-),
-(
-  'cs.PF',
-  'Performance',
-  'Covers performance measurement and evaluation, queueing, and simulation. Roughly includes material in ACM Subject Classes D.4.8 and K.6.2.'
-),
-(
-  'cs.PL',
-  'Programming Languages',
-  'Covers programming language semantics, language features, programming approaches (such as object-oriented programming, functional programming, logic programming). Also includes material on compilers oriented towards programming languages; other material on compilers may be more appropriate in Architecture (AR). Roughly includes material in ACM Subject Classes D.1 and D.3.'
-),
-(
-  'cs.RO',
-  'Robotics',
-  'Roughly includes material in ACM Subject Class I.2.9.'
-),
-(
-  'cs.SC',
-  'Symbolic Computation',
-  'Roughly includes material in ACM Subject Class I.1.'
-),
-(
-  'cs.SD',
-  'Sound',
-  'Covers all aspects of computing with sound, and sound as an information channel. Includes models of sound, analysis and synthesis, audio user interfaces, sonification of data, computer music, and sound signal processing. Includes ACM Subject Class H.5.5, and intersects with H.1.2, H.5.1, H.5.2, I.2.7, I.5.4, I.6.3, J.5, K.4.2.'
-),
-(
-  'cs.SE',
-  'Software Engineering',
-  'Covers design tools, software metrics, testing and debugging, programming environments, etc. Roughly includes material in all of ACM Subject Classes D.2, except that D.2.4 (program verification) should probably have Logics in Computer Science as the primary subject area.'
-),
-(
-  'cs.SI',
-  'Social and Information Networks',
-  'Covers the design, analysis, and modeling of social and information networks, including their applications for on-line information access, communication, and interaction, and their roles as datasets in the exploration of questions in these and other domains, including connections to the social and biological sciences. Analysis and modeling of such networks includes topics in ACM Subject classes F.2, G.2, G.3, H.2, and I.2; applications in computing include topics in H.3, H.4, and H.5; and applications at the interface of computing and other disciplines include topics in J.1--J.7. Papers on computer communication systems and network protocols (e.g. TCP/IP) are generally a closer fit to the Networking and Internet Architecture (cs.NI) category.'
-),
-(
-  'cs.SY',
-  'Systems and Control',
-  'cs.SY is an alias for eess.SY. This section includes theoretical and experimental research covering all facets of automatic control systems. The section is focused on methods of control system analysis and design using tools of modeling, simulation and optimization. Specific areas of research include nonlinear, distributed, adaptive, stochastic and robust control in addition to hybrid and discrete event systems. Application areas include automotive and aerospace control systems, network control, biological systems, multiagent and cooperative control, robotics, reinforcement learning, sensor networks, control of cyber-physical and energy-related systems, and control of computing systems.'
-);
diff --git a/demo/install/resources/arxiv_papers.pickle b/demo/install/resources/arxiv_papers.pickle
deleted file mode 100644
index bed7d365dc5ad6d6d2f9b7a2233cea5d371ccf1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 413175
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
Jbessw{{wSe_8|ZO

diff --git a/demo/management/__init__.py b/demo/management/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/demo/management/commands/__init__.py b/demo/management/commands/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/demo/management/commands/clean_stale_db.py b/demo/management/commands/clean_stale_db.py
deleted file mode 100644
index c8af856f7c..0000000000
--- a/demo/management/commands/clean_stale_db.py
+++ /dev/null
@@ -1,94 +0,0 @@
-from datetime import timedelta
-
-from django.conf import settings
-from django.core.management import BaseCommand
-from django.utils.timezone import now
-from sqlalchemy import text
-from sqlalchemy.exc import OperationalError
-
-from db import engine
-from db.metadata import get_empty_metadata
-from mathesar.models.base import Database
-from mathesar.state.django import reflect_db_objects
-
-
-class Command(BaseCommand):
-    help = 'Cleans up the stale database created during live demo'
-
-    def add_arguments(self, parser):
-        parser.add_argument(
-            '--force',
-            action='store_true',
-            help='Force delete a database even if it in use'
-        )
-        parser.add_argument(
-            '--max-days',
-            action='store',
-            type=int,
-            default=3,
-            help='A database is considered for deletion if it has existed for more than --max-days',
-        )
-
-    def handle(self, *args, **options):
-        drop_all_stale_databases(*args, **options)
-
-
-def drop_all_stale_databases(force=False, max_days=3, *args, **kwargs):
-    excluded_databases = [
-        settings.DATABASES["default"]["NAME"],
-        settings.DATABASES["mathesar_tables"]["NAME"],
-        getattr(settings, "MATHESAR_DEMO_TEMPLATE", None),
-        # Exclude Postgres default databases
-        'postgres',
-        'template0',
-        'template1'
-    ]
-    stale_databases = Database.objects.filter(created_at__lt=now() - timedelta(days=max_days))
-    deleted_databases = []
-    for database in stale_databases:
-        if database.name not in excluded_databases and database.deleted is False:
-            dropped = drop_mathesar_database(
-                database.name,
-                username=settings.DATABASES["default"]["USER"],
-                password=settings.DATABASES["default"]["PASSWORD"],
-                hostname=settings.DATABASES["default"]["HOST"],
-                root_database=settings.DATABASES["default"]["NAME"],
-                port=settings.DATABASES["default"]["PORT"],
-                force=force
-            )
-            if dropped:
-                deleted_databases.append(database.name)
-                database.delete()
-                reflect_db_objects(get_empty_metadata(), db_name=database.name)
-    return deleted_databases
-
-
-def drop_mathesar_database(
-        user_database, username, password, hostname, root_database, port, force=False
-):
-    user_db_engine = engine.create_future_engine(
-        username, password, hostname, user_database, port
-    )
-    try:
-        user_db_engine.connect()
-    except OperationalError:
-        # Non existent db object
-        user_db_engine.dispose()
-        return True
-    else:
-        try:
-            root_db_engine = engine.create_future_engine(
-                username, password, hostname, root_database, port,
-            )
-            with root_db_engine.connect() as conn:
-                conn.execution_options(isolation_level="AUTOCOMMIT")
-                delete_stmt = f"DROP DATABASE {user_database} {'WITH (FORCE)' if force else ''}"
-                conn.execute(text(delete_stmt))
-                # This database is not created using a config file,
-                # so their objects can be safety deleted
-                # as they won't be created again during reflection
-                return True
-        except OperationalError:
-            # Database is in use, ignore
-            pass
-    return False
diff --git a/demo/management/commands/download_and_pickle_some_arxiv_data.py b/demo/management/commands/download_and_pickle_some_arxiv_data.py
deleted file mode 100644
index 0a9fe91796..0000000000
--- a/demo/management/commands/download_and_pickle_some_arxiv_data.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import pickle
-from demo.install.base import ARXIV_PAPERS_PICKLE
-from django.core.management import BaseCommand
-from demo.management.commands.load_arxiv_data import download_arxiv_papers
-
-
-class Command(BaseCommand):
-    help = 'Downloads and pickles some Arxiv data, to be later preloaded together with the Arxiv dataset.'
-
-    def handle(self, *args, **options):
-        download_and_pickle_some_arxiv_data()
-
-
-def download_and_pickle_some_arxiv_data():
-    papers = download_arxiv_papers()
-    with open(ARXIV_PAPERS_PICKLE, 'wb') as f:
-        pickle.dump(papers, f)
diff --git a/demo/management/commands/load_arxiv_data.py b/demo/management/commands/load_arxiv_data.py
deleted file mode 100644
index 7b0728c6e6..0000000000
--- a/demo/management/commands/load_arxiv_data.py
+++ /dev/null
@@ -1,418 +0,0 @@
-import re
-import arxiv
-import json
-import logging
-from sqlalchemy import text
-
-from django.core.management import BaseCommand
-
-from demo.install.arxiv_skeleton import get_arxiv_db_and_schema_log_path
-from mathesar.database.base import create_mathesar_engine
-from mathesar.models.base import Database
-
-
-class Command(BaseCommand):
-    help = 'Refreshes the arXiv data set in all relevant DBs'
-
-    def handle(self, *args, **options):
-        update_our_arxiv_dbs()
-
-
-def update_our_arxiv_dbs():
-    """
-    Will log an error if db-schema log is missing or cannot be deserialized.
-    """
-    papers = download_arxiv_papers()
-    try:
-        db_schema_pairs = _get_logged_db_schema_pairs()
-    except Exception as e:
-        logging.error(e, exc_info=True)
-        return
-    for db_name, schema_name in db_schema_pairs:
-        db = Database.current_objects.get(name=db_name)
-        engine = create_mathesar_engine(db)
-        update_arxiv_schema(engine, schema_name, papers)
-        engine.dispose()
-
-
-def update_arxiv_schema(engine, schema_name, papers):
-    with engine.begin() as conn:
-        _set_search_path(conn, schema_name)
-        for paper in papers:
-            persist_paper(conn, paper)
-
-
-def download_arxiv_papers():
-    query_expression = _construct_arxiv_search_query_expression()
-    arxiv_search = arxiv.Search(
-        query=query_expression,
-        max_results=50,
-        sort_by=arxiv.SortCriterion.LastUpdatedDate
-    )
-    return list(arxiv_search.results())
-
-
-def _construct_arxiv_search_query_expression():
-    """
-    Meant to return papers that have the Computer Science Database category in their category set,
-    and don't have non-computer-science categories in their category set. That's because we only
-    have human-friendly names and descriptions for Computer Science categories.
-    """
-    query = "cat:cs.DB"
-    for non_cs_arxiv_cat in _non_cs_arxiv_categories:
-        query += f' ANDNOT cat:{non_cs_arxiv_cat}'
-    return query
-
-
-def _set_search_path(conn, schema_name):
-    set_search_path = text(f'SET search_path="{schema_name}";')
-    conn.execute(set_search_path)
-
-
-def persist_paper(conn, paper):
-    authors = [
-        author.name
-        for author
-        in paper.authors
-    ]
-    categories = [
-        category
-        for category
-        in paper.categories
-        if _is_category_in_arxiv_taxonomy(category)
-    ]
-    author_ids = _persist_values_to_single_value_table(
-        conn,
-        table_name="Authors",
-        column_name="Name",
-        values=authors
-    )
-    category_ids = _persist_values_to_single_value_table(
-        conn,
-        table_name="Categories",
-        column_name="id",
-        values=categories
-    )
-    links = paper.links
-    link_ids = _persist_links(conn, links)
-    paper_id = _persist_paper(conn, paper)
-    _persist_paper_mappings(
-        conn,
-        paper_id=paper_id,
-        table_name="Paper-Author Map",
-        column_name="author_id",
-        values=author_ids
-    )
-    _persist_paper_mappings(
-        conn,
-        paper_id=paper_id,
-        table_name="Paper-Category Map",
-        column_name="category_id",
-        values=category_ids
-    )
-    _persist_paper_mappings(
-        conn,
-        paper_id=paper_id,
-        table_name="Paper-Link Map",
-        column_name="link_id",
-        values=link_ids
-    )
-
-
-def _persist_paper(conn, paper):
-    """
-    See _persist_values_to_single_value_table docstring, for reason to use DO UPDATE below.
-    """
-    arxiv_url = paper.entry_id
-    updated = str(paper.updated)
-    published = str(paper.published)
-    title = paper.title
-    summary = paper.summary
-    comment = paper.comment
-    journal_reference = paper.journal_ref
-    doi = paper.doi
-    primary_category_id = _persist_primary_category(conn, paper)
-    insert_query = text(
-        f"""
-                INSERT INTO "Papers" (
-                    "arXiv URL",
-                    "Updated",
-                    "Published",
-                    "Title",
-                    "Summary",
-                    "Comment",
-                    "Journal reference",
-                    "DOI",
-                    "Primary category"
-                )
-                VALUES ({
-                    _value_list(
-                        _prep_value(arxiv_url),
-                        _prep_value(updated),
-                        _prep_value(published),
-                        _prep_value(title),
-                        _prep_value(summary),
-                        _prep_value(comment),
-                        _prep_value(journal_reference),
-                        _prep_value(doi),
-                        _prep_value(primary_category_id),
-                    )
-                })
-                ON CONFLICT ("arXiv URL")
-                DO UPDATE SET "DOI" = excluded."DOI"
-                RETURNING id
-            """
-    )
-    [paper_id], = conn.execute(insert_query)
-    return paper_id
-
-
-def _persist_primary_category(conn, paper):
-    primary_category = paper.primary_category
-    if _is_category_in_arxiv_taxonomy(primary_category):
-        resulting_ids = _persist_values_to_single_value_table(
-            conn,
-            table_name="Categories",
-            column_name="id",
-            values=[primary_category],
-        )
-        primary_category_id = resulting_ids.pop()
-        return primary_category_id
-
-
-def _value_list(*strs):
-    return ', '.join(strs)
-
-
-def _persist_links(
-    conn, links
-):
-    """
-    Derives the link's purpose (see _get_link_purpose), and adds that to the table as well.
-    """
-    table_name = "Links"
-    href_column_name = "URL"
-    purpose_column_name = "Purpose"
-    ids = set()
-    for link in links:
-        purpose = _get_link_purpose(link)
-        insert_query = text(
-            f"""
-                INSERT INTO "{table_name}" ("{href_column_name}", "{purpose_column_name}")
-                VALUES ({_prep_value(link.href)}, {_prep_value(purpose)})
-                ON CONFLICT ("{href_column_name}")
-                DO UPDATE SET "{href_column_name}" = excluded."{href_column_name}"
-                RETURNING id
-            """
-        )
-        [row_id], = conn.execute(insert_query)
-        ids.add(row_id)
-    return ids
-
-
-def _get_link_purpose(link):
-    purpose = "Other"
-    href = link.href
-    if href.startswith('http://arxiv.org/abs/'):
-        purpose = "Abstract"
-    elif href.startswith('http://arxiv.org/pdf/'):
-        purpose = "PDF version"
-    return purpose
-
-
-def _persist_values_to_single_value_table(
-    conn, table_name, column_name, values
-):
-    """
-    Note, we use a seemingly meaningless DO UPDATE, because, in constrast to DO
-    NOTHING, that makes the query's RETURNING work regardless of whether there was a
-    conflict. Otherwise, we would not receive an id if the record already exists.
-    """
-    ids = set()
-    for value in values:
-        insert_query = text(
-            f"""
-                INSERT INTO "{table_name}" ("{column_name}")
-                VALUES ({_prep_value(value)})
-                ON CONFLICT ("{column_name}")
-                DO UPDATE SET "{column_name}" = excluded."{column_name}"
-                RETURNING id
-            """
-        )
-        [row_id], = conn.execute(insert_query)
-        ids.add(row_id)
-    return ids
-
-
-def _is_category_in_arxiv_taxonomy(category_name):
-    """
-    Helps exclude categories not in arXiv category taxonomy [0].
-
-    Currently, we only have human-readable names and descriptions for CS categories, and we want
-    all categories we record to have those. Normally, excluding papers that have non-CS categories
-    would be enough (which we're doing by manipulating the arXiv API query string, but a paper
-    might also have categories that aren't in the arXiv taxonomy. This predicate is meant to detect
-    those non-arXiv categories.
-
-    [0] https://arxiv.org/category_taxonomy
-    """
-    is_cs_category = bool(
-        re.fullmatch(r"cs\.\w\w", category_name, flags=re.IGNORECASE)
-    )
-    is_non_cs_category = (category_name in _non_cs_arxiv_categories)
-    return is_cs_category or is_non_cs_category
-
-
-def _persist_paper_mappings(conn, table_name, paper_id, column_name, values):
-    for value in values:
-        insert_query = text(
-            f"""
-                INSERT INTO "{table_name}" (paper_id, {column_name})
-                VALUES ({
-                    _value_list(
-                        _prep_value(paper_id),
-                        _prep_value(value),
-                    )
-                })
-                ON CONFLICT DO NOTHING
-            """
-        )
-        conn.execute(insert_query)
-
-
-def _prep_value(s):
-    return f"$escape_token${s}$escape_token$" if s is not None else "NULL"
-
-
-def _get_logged_db_schema_pairs():
-    """
-    Note, deduplicates the resulting pairs.
-    """
-    db_schema_log_path = get_arxiv_db_and_schema_log_path()
-    with open(db_schema_log_path, 'r') as lines:
-        return set(
-            tuple(
-                json.loads(line)
-            )
-            for line
-            in lines
-        )
-
-
-_non_cs_arxiv_categories = {
-    'econ.EM',
-    'econ.GN',
-    'econ.TH',
-    'eess.AS',
-    'eess.IV',
-    'eess.SP',
-    'eess.SY',
-    'math.AC',
-    'math.AG',
-    'math.AP',
-    'math.AT',
-    'math.CA',
-    'math.CO',
-    'math.CT',
-    'math.CV',
-    'math.DG',
-    'math.DS',
-    'math.FA',
-    'math.GM',
-    'math.GN',
-    'math.GR',
-    'math.GT',
-    'math.HO',
-    'math.IT',
-    'math.KT',
-    'math.LO',
-    'math.MG',
-    'math.MP',
-    'math.NA',
-    'math.NT',
-    'math.OA',
-    'math.OC',
-    'math.PR',
-    'math.QA',
-    'math.RA',
-    'math.RT',
-    'math.SG',
-    'math.SP',
-    'math.ST',
-    'astro-ph.CO',
-    'astro-ph.EP',
-    'astro-ph.GA',
-    'astro-ph.HE',
-    'astro-ph.IM',
-    'astro-ph.SR',
-    'cond-mat.dis-nn',
-    'cond-mat.mes-hall',
-    'cond-mat.mtrl-sci',
-    'cond-mat.other',
-    'cond-mat.quant-gas',
-    'cond-mat.soft',
-    'cond-mat.stat-mech',
-    'cond-mat.str-el',
-    'cond-mat.supr-con',
-    'gr-qc',
-    'hep-ex',
-    'hep-lat',
-    'hep-ph',
-    'hep-th',
-    'math-ph',
-    'nlin.AO',
-    'nlin.CD',
-    'nlin.CG',
-    'nlin.PS',
-    'nlin.SI',
-    'nucl-ex',
-    'nucl-th',
-    'physics.acc-ph',
-    'physics.ao-ph',
-    'physics.app-ph',
-    'physics.atm-clus',
-    'physics.atom-ph',
-    'physics.bio-ph',
-    'physics.chem-ph',
-    'physics.class-ph',
-    'physics.comp-ph',
-    'physics.data-an',
-    'physics.ed-ph',
-    'physics.flu-dyn',
-    'physics.gen-ph',
-    'physics.geo-ph',
-    'physics.hist-ph',
-    'physics.ins-det',
-    'physics.med-ph',
-    'physics.optics',
-    'physics.plasm-ph',
-    'physics.pop-ph',
-    'physics.soc-ph',
-    'physics.space-ph',
-    'quant-ph',
-    'q-bio.BM',
-    'q-bio.CB',
-    'q-bio.GN',
-    'q-bio.MN',
-    'q-bio.NC',
-    'q-bio.OT',
-    'q-bio.PE',
-    'q-bio.QM',
-    'q-bio.SC',
-    'q-bio.TO',
-    'q-fin.CP',
-    'q-fin.EC',
-    'q-fin.GN',
-    'q-fin.MF',
-    'q-fin.PM',
-    'q-fin.PR',
-    'q-fin.RM',
-    'q-fin.ST',
-    'q-fin.TR',
-    'stat.AP',
-    'stat.CO',
-    'stat.ME',
-    'stat.ML',
-    'stat.OT',
-    'stat.TH',
-}
diff --git a/demo/management/commands/remove_arxiv_pairs_log.py b/demo/management/commands/remove_arxiv_pairs_log.py
deleted file mode 100644
index 067146de07..0000000000
--- a/demo/management/commands/remove_arxiv_pairs_log.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import os
-
-from django.core.management import BaseCommand
-
-from demo.install.arxiv_skeleton import get_arxiv_db_and_schema_log_path
-
-
-class Command(BaseCommand):
-    help = 'Cleans up the file defining arXiv data set DBs'
-
-    def handle(self, *args, **options):
-        remove_arxiv_db_and_schema_log()
-
-
-def remove_arxiv_db_and_schema_log():
-    """Remove the file defining arXiv data set DBs"""
-    os.remove(get_arxiv_db_and_schema_log_path())
diff --git a/demo/management/commands/setup_demo_template_db.py b/demo/management/commands/setup_demo_template_db.py
deleted file mode 100644
index c9b1ce20b7..0000000000
--- a/demo/management/commands/setup_demo_template_db.py
+++ /dev/null
@@ -1,53 +0,0 @@
-from sqlalchemy import text
-from sqlalchemy.exc import OperationalError
-from django.conf import settings
-from django.core.management import BaseCommand
-
-from db.install import install_mathesar
-from demo.install.datasets import load_datasets
-from mathesar.database.base import create_mathesar_engine
-from mathesar.models.base import Database
-
-
-class Command(BaseCommand):
-    help = 'Initialize the demo template database.'
-
-    def handle(self, *args, **options):
-        _setup_demo_template_db()
-
-
-def _setup_demo_template_db():
-    print("Initializing demo template database...")
-
-    template_db_name = settings.MATHESAR_DEMO_TEMPLATE
-    django_model = Database.create_from_settings_key("default")
-    root_engine = create_mathesar_engine(django_model)
-    with root_engine.connect() as conn:
-        conn.execution_options(isolation_level="AUTOCOMMIT")
-        conn.execute(text(f"DROP DATABASE IF EXISTS {template_db_name} WITH (FORCE)"))
-    root_engine.dispose()
-    db_model, _ = Database.current_objects.get_or_create(
-        name=template_db_name,
-        defaults={
-            'db_name': template_db_name,
-            'username': django_model.username,
-            'password': django_model.password,
-            'host': django_model.host,
-            'port': django_model.port
-        }
-    )
-    try:
-        install_mathesar(
-            database_name=template_db_name,
-            hostname=db_model.host,
-            username=db_model.username,
-            password=db_model.password,
-            port=db_model.port,
-            skip_confirm=True
-        )
-    except OperationalError as e:
-        db_model.delete()
-        raise e
-    user_engine = create_mathesar_engine(db_model)
-    load_datasets(user_engine)
-    user_engine.dispose()
diff --git a/demo/middleware.py b/demo/middleware.py
deleted file mode 100644
index 6dcd459dc6..0000000000
--- a/demo/middleware.py
+++ /dev/null
@@ -1,58 +0,0 @@
-"""This module adds a middleware for the Live Demo."""
-import logging
-
-from django.conf import settings
-
-from demo.db_namer import get_name
-from demo.utils import set_live_demo_db_name
-from demo.install.arxiv_skeleton import append_db_and_arxiv_schema_to_log
-from demo.install.base import ARXIV, create_demo_database
-from demo.install.custom_settings import customize_settings
-from demo.install.explorations import load_custom_explorations
-from mathesar.database.base import create_mathesar_engine
-from mathesar.models.base import Database
-from mathesar.state import reset_reflection
-
-
-logger = logging.getLogger(__name__)
-
-
-class LiveDemoModeMiddleware:
-    def __init__(self, get_response):
-        self.get_response = get_response
-
-    def __call__(self, request):
-        sessionid = request.COOKIES.get('sessionid', None)
-        db_name = get_name(str(sessionid))
-        database, created = Database.current_objects.get_or_create(
-            name=db_name,
-            defaults={
-                'db_name': db_name,
-                'username': settings.DATABASES['default']['USER'],
-                'password': settings.DATABASES['default']['PASSWORD'],
-                'host': settings.DATABASES['default']['HOST'],
-                'port': settings.DATABASES['default']['PORT']
-            }
-        )
-        if created:
-            create_demo_database(
-                db_name,
-                database.username,
-                database.password,
-                database.host,
-                settings.DATABASES['default']['NAME'],
-                database.port,
-                settings.MATHESAR_DEMO_TEMPLATE
-            )
-            append_db_and_arxiv_schema_to_log(db_name, ARXIV)
-            reset_reflection(db_name=db_name)
-            engine = create_mathesar_engine(database)
-            customize_settings(engine)
-            load_custom_explorations(engine)
-            engine.dispose()
-
-        logger.debug(f"Using database {db_name} for sessionid {sessionid}")
-        request = set_live_demo_db_name(request, db_name)
-
-        response = self.get_response(request)
-        return response
diff --git a/demo/settings.py b/demo/settings.py
deleted file mode 100644
index 6487340f17..0000000000
--- a/demo/settings.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from config.settings.common_settings import *  # noqa
-from decouple import config as decouple_config
-
-INSTALLED_APPS += [  # noqa
-    "demo",
-    "health_check",
-]
-
-MIDDLEWARE += [  # noqa
-    "demo.middleware.LiveDemoModeMiddleware",
-]
-
-
-SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
-
-MATHESAR_MODE = 'PRODUCTION'
-MATHESAR_LIVE_DEMO = True
-MATHESAR_LIVE_DEMO_USERNAME = decouple_config('MATHESAR_LIVE_DEMO_USERNAME', default=None)
-MATHESAR_LIVE_DEMO_PASSWORD = decouple_config('MATHESAR_LIVE_DEMO_PASSWORD', default=None)
-
-MATHESAR_DEMO_TEMPLATE = 'mathesar_demo_template'
-MATHESAR_DEMO_ARXIV_LOG_PATH = decouple_config(
-    'MATHESAR_DEMO_ARXIV_LOG_PATH',
-    default='/var/lib/mathesar/demo/arxiv_db_schema_log'
-)
-BASE_TEMPLATE_ADDITIONAL_SCRIPT_TEMPLATES += ['demo/analytics.html'] # noqa
-ROOT_URLCONF = "demo.urls"
diff --git a/demo/tests/test_db_namer.py b/demo/tests/test_db_namer.py
deleted file mode 100644
index 6d3f848277..0000000000
--- a/demo/tests/test_db_namer.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from demo.db_namer import get_name
-
-
-def test_db_namer_32char_sessionid_defaults():
-    name = get_name('abcdefghijklmnop0123456789ABCDEF')
-    assert name == 'far_ten_ink_soy_dew'
-
-
-def test_db_namer_0char_sessionid_defaults():
-    name = get_name('')
-    assert name == 'paw_paw_paw_paw_paw'
-
-
-def test_db_namer_none_sessionid_defaults():
-    name = get_name(None)
-    assert name == 'paw_paw_paw_paw_paw'
-
-
-def test_db_namer_a_sessionid_defaults():
-    name = get_name('a')
-    assert name == 'toy_paw_paw_paw_paw'
-
-
-def test_db_namer_0_sessionid_defaults():
-    name = get_name('0')
-    assert name == 'cut_paw_paw_paw_paw'
-
-
-def test_db_namer_9char_sessionid_defaults():
-    name = get_name('abcdefghi')
-    assert name == 'far_ten_ink_soy_fin'
diff --git a/demo/urls.py b/demo/urls.py
deleted file mode 100644
index 51edf8e1d9..0000000000
--- a/demo/urls.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from django.contrib.auth.decorators import login_required
-from django.urls import include, path, re_path
-from django.views.generic import RedirectView
-from rest_framework.decorators import api_view
-from rest_framework.exceptions import PermissionDenied
-
-from config import urls as root_urls
-
-
-@login_required
-@api_view(['POST'])
-def permission_denied(_, *args, **kwargs):
-    raise PermissionDenied()
-
-
-urlpatterns = [
-    re_path(r'^api/ui/v0/users/(?P<pk>[^/.]+)/password_reset/', permission_denied, name='password_reset'),
-    path('api/ui/v0/users/password_change/', permission_denied, name='password_change'),
-    path('auth/password_reset_confirm/', RedirectView.as_view(url='/'), name='password_reset'),
-    path(r'health/', include('health_check.urls')),
-    path('', include(root_urls)),
-]
diff --git a/demo/utils.py b/demo/utils.py
deleted file mode 100644
index af67af8e1d..0000000000
--- a/demo/utils.py
+++ /dev/null
@@ -1,35 +0,0 @@
-from django.conf import settings
-
-
-def get_is_live_demo_mode():
-    """
-    Will return true when in live demo mode.
-
-    We want some things to behave differently in demo mode, so sometimes we
-    explicitly check whether we're in it.
-    """
-    return getattr(settings, 'MATHESAR_LIVE_DEMO', False)
-
-
-def get_live_demo_db_name(request):
-    """
-    Retrieves the name of the database associated with this live demo session.
-
-    In live demo mode, our demo-specific middleware embeds the name of
-    the database generated for the user in the request object. This retrieves
-    that.
-    """
-    return request.GET.get('demo_database_name')
-
-
-def set_live_demo_db_name(request, db_name):
-    """
-    Embeds the db_name in the request object.
-
-    Meant to be used in live demo mode, where we want to keep track of which
-    generated database is assigned to a given session.
-    """
-    params = request.GET.copy()
-    params.update({'demo_database_name': db_name})
-    request.GET = params
-    return request
diff --git a/mathesar/install.py b/mathesar/install.py
index 466c0c982b..3efaa9bd00 100644
--- a/mathesar/install.py
+++ b/mathesar/install.py
@@ -37,14 +37,6 @@ def main(skip_static_collection=False):
             install_on_db_with_key(database_key, skip_confirm)
         except IntegrityError:
             continue
-    if getattr(settings, 'MATHESAR_LIVE_DEMO', False) is True:
-        management.call_command(
-            'createsuperuser',
-            '--no-input',
-            '--username', 'demo',
-            '--email', 'admin@example.com',
-        )
-        management.call_command('setup_demo_template_db')
 
 
 def install_on_db_with_key(database_key, skip_confirm):
diff --git a/mathesar/views.py b/mathesar/views.py
index fe9c87110d..812db81402 100644
--- a/mathesar/views.py
+++ b/mathesar/views.py
@@ -5,8 +5,6 @@
 from rest_framework.decorators import api_view
 from rest_framework.response import Response
 
-from demo.utils import get_is_live_demo_mode, get_live_demo_db_name
-
 from mathesar.api.db.permissions.database import DatabaseAccessPolicy
 from mathesar.api.db.permissions.query import QueryAccessPolicy
 from mathesar.api.db.permissions.schema import SchemaAccessPolicy
@@ -58,12 +56,6 @@ def _get_permissible_db_queryset(request):
         dbs_containing_permitted_schemas_qs = Database.objects.filter(schemas__in=permitted_schemas_qs, deleted=deleted)
         permitted_dbs_qs = permitted_dbs_qs | dbs_containing_permitted_schemas_qs
         permitted_dbs_qs = permitted_dbs_qs.distinct()
-        if get_is_live_demo_mode():
-            live_demo_db_name = get_live_demo_db_name(request)
-            if live_demo_db_name:
-                permitted_dbs_qs = permitted_dbs_qs.filter(name=live_demo_db_name)
-            else:
-                raise Exception('This should never happen')
         if deleted:
             failed_permitted_dbs_qs = permitted_dbs_qs
         else:
@@ -150,7 +142,6 @@ def get_base_data_all_routes(request, database=None, schema=None):
         'abstract_types': get_ui_type_list(request, database),
         'user': get_user_data(request),
         'is_authenticated': not request.user.is_anonymous,
-        'live_demo_mode': get_is_live_demo_mode(),
         'current_release_tag_name': __version__,
         'internal_db_connection': _get_internal_db_meta(),
     }
diff --git a/requirements-demo.txt b/requirements-demo.txt
deleted file mode 100644
index cb5f93b2ba..0000000000
--- a/requirements-demo.txt
+++ /dev/null
@@ -1,2 +0,0 @@
--r requirements.txt
-arxiv==1.4.2
diff --git a/requirements-dev.txt b/requirements-dev.txt
index ff159003d7..2b9a6f0641 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,4 +1,4 @@
--r requirements-demo.txt
+-r requirements.txt
 flake8==3.9.0
 ipython==8.10.0
 pytest==8.0.2
@@ -10,4 +10,4 @@ playwright==1.18.1
 pytest-playwright==0.2.3
 flake8-no-types==1.4.0
 mkdocs-material==8.5.11
-mkdocs-redirects==1.2.0
\ No newline at end of file
+mkdocs-redirects==1.2.0

From 6714fd54f59786ed69a348842df24d8981992454 Mon Sep 17 00:00:00 2001
From: hitenvidhani <vidhani.hiten2001@gmail.com>
Date: Sat, 13 Apr 2024 01:00:12 +0530
Subject: [PATCH 0069/1141] init

---
 DEVELOPER_GUIDE.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md
index bbd533d188..f9dc859f28 100644
--- a/DEVELOPER_GUIDE.md
+++ b/DEVELOPER_GUIDE.md
@@ -49,8 +49,23 @@ Before getting started with your code changes, read our [Contributor guide](./CO
 
 ## Loading sample data
 
+- Using a CSV File (limited visibility of features):
 For sample table data, you can create a new table in the UI using the `patents.csv` file found in `/mathesar/tests/data`.
 
+- Using Mathesar Data Playground (recommended):
+
+    1. Clone the `mathesar-data-playground` repo:
+    `git clone https://github.com/mathesar-foundation/mathesar-data-playground.git`
+
+    1. Load the data from sql by running:
+    `sudo docker exec -i mathesar_dev_db bash -c 'psql -U mathesar' < /path/to/your/cloned/repo/mathesar-data-playground/realistic_library_simulation/simulation_runs/simulation_run_20230106_00.sql
+    `
+    `
+    sudo docker exec -i mathesar_dev_db bash -c 'psql -U mathesar' < /path/to/your/cloned/repo/mathesar-data-playground/realistic_library_simulation/simulation_runs/simulation_run_20230106_00_checkouts.sql
+    `
+    1. [Sync]( https://docs.mathesar.org/user-guide/syncing-db/) these changes from the UI.
+
+
 <!-- TODO add more content about sample data -->
 
 ## API

From 7b3b17f33b535ae79ae023ce441dd8aa7ca6712d Mon Sep 17 00:00:00 2001
From: hitenvidhani <vidhani.hiten2001@gmail.com>
Date: Sat, 13 Apr 2024 01:05:06 +0530
Subject: [PATCH 0070/1141] Convert commands to Code Block

---
 DEVELOPER_GUIDE.md | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md
index f9dc859f28..f16a2dc44a 100644
--- a/DEVELOPER_GUIDE.md
+++ b/DEVELOPER_GUIDE.md
@@ -49,20 +49,23 @@ Before getting started with your code changes, read our [Contributor guide](./CO
 
 ## Loading sample data
 
-- Using a CSV File (limited visibility of features):
+1. Using a CSV File (limited visibility of features):
 For sample table data, you can create a new table in the UI using the `patents.csv` file found in `/mathesar/tests/data`.
 
-- Using Mathesar Data Playground (recommended):
+1. Using Mathesar Data Playground (recommended):
 
     1. Clone the `mathesar-data-playground` repo:
-    `git clone https://github.com/mathesar-foundation/mathesar-data-playground.git`
+    ```
+    git clone https://github.com/mathesar-foundation/mathesar-data-playground.git
+    ```
 
     1. Load the data from sql by running:
-    `sudo docker exec -i mathesar_dev_db bash -c 'psql -U mathesar' < /path/to/your/cloned/repo/mathesar-data-playground/realistic_library_simulation/simulation_runs/simulation_run_20230106_00.sql
-    `
-    `
+    ```
+    sudo docker exec -i mathesar_dev_db bash -c 'psql -U mathesar' < /path/to/your/cloned/repo/mathesar-data-playground/realistic_library_simulation/simulation_runs/simulation_run_20230106_00.sql
+    ```
+    ```
     sudo docker exec -i mathesar_dev_db bash -c 'psql -U mathesar' < /path/to/your/cloned/repo/mathesar-data-playground/realistic_library_simulation/simulation_runs/simulation_run_20230106_00_checkouts.sql
-    `
+    ```
     1. [Sync]( https://docs.mathesar.org/user-guide/syncing-db/) these changes from the UI.
 
 

From 5b702691ebe638ecfbc4cd48d300fafd4928774c Mon Sep 17 00:00:00 2001
From: hitenvidhani <vidhani.hiten2001@gmail.com>
Date: Sat, 13 Apr 2024 01:08:05 +0530
Subject: [PATCH 0071/1141] Numbering of steps

---
 DEVELOPER_GUIDE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md
index f16a2dc44a..bfa738a403 100644
--- a/DEVELOPER_GUIDE.md
+++ b/DEVELOPER_GUIDE.md
@@ -49,10 +49,10 @@ Before getting started with your code changes, read our [Contributor guide](./CO
 
 ## Loading sample data
 
-1. Using a CSV File (limited visibility of features):
+- Using a CSV File (limited visibility of features):
 For sample table data, you can create a new table in the UI using the `patents.csv` file found in `/mathesar/tests/data`.
 
-1. Using Mathesar Data Playground (recommended):
+- Using Mathesar Data Playground (recommended):
 
     1. Clone the `mathesar-data-playground` repo:
     ```

From 92c38d92b03e621ffc10ac5cb7ad474362030024 Mon Sep 17 00:00:00 2001
From: hitenvidhani <vidhani.hiten2001@gmail.com>
Date: Sat, 13 Apr 2024 01:15:30 +0530
Subject: [PATCH 0072/1141] Indentation

---
 DEVELOPER_GUIDE.md | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md
index bfa738a403..155f686a68 100644
--- a/DEVELOPER_GUIDE.md
+++ b/DEVELOPER_GUIDE.md
@@ -50,23 +50,24 @@ Before getting started with your code changes, read our [Contributor guide](./CO
 ## Loading sample data
 
 - Using a CSV File (limited visibility of features):
-For sample table data, you can create a new table in the UI using the `patents.csv` file found in `/mathesar/tests/data`.
+
+    For sample table data, you can create a new table in the UI using the `patents.csv` file found in `/mathesar/tests/data`.
 
 - Using Mathesar Data Playground (recommended):
 
     1. Clone the `mathesar-data-playground` repo:
-    ```
-    git clone https://github.com/mathesar-foundation/mathesar-data-playground.git
-    ```
-
-    1. Load the data from sql by running:
-    ```
-    sudo docker exec -i mathesar_dev_db bash -c 'psql -U mathesar' < /path/to/your/cloned/repo/mathesar-data-playground/realistic_library_simulation/simulation_runs/simulation_run_20230106_00.sql
-    ```
-    ```
-    sudo docker exec -i mathesar_dev_db bash -c 'psql -U mathesar' < /path/to/your/cloned/repo/mathesar-data-playground/realistic_library_simulation/simulation_runs/simulation_run_20230106_00_checkouts.sql
-    ```
-    1. [Sync]( https://docs.mathesar.org/user-guide/syncing-db/) these changes from the UI.
+        ```
+        git clone https://github.com/mathesar-foundation/mathesar-data-playground.git
+        ```
+
+    2. Load the data from sql by running:
+        ```
+        sudo docker exec -i mathesar_dev_db bash -c 'psql -U mathesar' < /path/to/your/cloned/repo/mathesar-data-playground/realistic_library_simulation/simulation_runs/simulation_run_20230106_00.sql
+        ```
+        ```
+        sudo docker exec -i mathesar_dev_db bash -c 'psql -U mathesar' < /path/to/your/cloned/repo/mathesar-data-playground/realistic_library_simulation/simulation_runs/simulation_run_20230106_00_checkouts.sql
+        ```
+    3. [Sync]( https://docs.mathesar.org/user-guide/syncing-db/) these changes from the UI.
 
 
 <!-- TODO add more content about sample data -->

From ac767a5d29a415e4803e5bf170dc8e3f5347c691 Mon Sep 17 00:00:00 2001
From: hitenvidhani <vidhani.hiten2001@gmail.com>
Date: Sat, 13 Apr 2024 02:15:12 +0530
Subject: [PATCH 0073/1141] init

---
 mathesar/api/ui/serializers/users.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/api/ui/serializers/users.py b/mathesar/api/ui/serializers/users.py
index 199c439ac4..91aadf069c 100644
--- a/mathesar/api/ui/serializers/users.py
+++ b/mathesar/api/ui/serializers/users.py
@@ -87,7 +87,7 @@ def update(self, instance, validated_data):
 
 
 class PasswordResetSerializer(MathesarErrorMessageMixin, serializers.Serializer):
-    password = serializers.CharField(write_only=True, required=True, validators=[validate_password])
+    password = serializers.CharField(write_only=True, required=True)
 
 
 class DatabaseRoleSerializer(MathesarErrorMessageMixin, serializers.ModelSerializer):

From ddf8712950f7adae70eb6db3b4bd536101a990e9 Mon Sep 17 00:00:00 2001
From: hitenvidhani <vidhani.hiten2001@gmail.com>
Date: Sat, 13 Apr 2024 03:04:09 +0530
Subject: [PATCH 0074/1141] fix validate

---
 mathesar/api/ui/serializers/users.py | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/mathesar/api/ui/serializers/users.py b/mathesar/api/ui/serializers/users.py
index 91aadf069c..18a09e71f5 100644
--- a/mathesar/api/ui/serializers/users.py
+++ b/mathesar/api/ui/serializers/users.py
@@ -1,6 +1,7 @@
 from django.contrib.auth.password_validation import validate_password
 from rest_access_policy import FieldAccessMixin, PermittedPkRelatedField
 from rest_framework import serializers
+import django.contrib.auth.password_validation as validators
 
 from mathesar.api.db.permissions.database import DatabaseAccessPolicy
 from mathesar.api.db.permissions.schema import SchemaAccessPolicy
@@ -71,9 +72,18 @@ def create(self, validated_data):
 
 
 class ChangePasswordSerializer(MathesarErrorMessageMixin, serializers.Serializer):
-    password = serializers.CharField(write_only=True, required=True, validators=[validate_password])
+    password = serializers.CharField(write_only=True, required=True)
     old_password = serializers.CharField(write_only=True, required=True)
 
+    def validate(self, data):
+        user = User(**data)
+        password = data.get('password')
+        errors = dict()
+        validators.validate_password(password=password, user=user)
+        if errors:
+            raise serializers.ValidationError(errors)
+        return super(ChangePasswordSerializer, self).validate(data)
+
     def validate_old_password(self, value):
         user = self.context['request'].user
         if user.check_password(value) is True:
@@ -89,6 +99,15 @@ def update(self, instance, validated_data):
 class PasswordResetSerializer(MathesarErrorMessageMixin, serializers.Serializer):
     password = serializers.CharField(write_only=True, required=True)
 
+    def validate(self, data):
+        user = User(**data)
+        password = data.get('password')
+        errors = dict()
+        validators.validate_password(password=password, user=user)
+        if errors:
+            raise serializers.ValidationError(errors)
+        return super(PasswordResetSerializer, self).validate(data)
+
 
 class DatabaseRoleSerializer(MathesarErrorMessageMixin, serializers.ModelSerializer):
     class Meta:

From e8b90757f2233492eecdcc41a08589019f99a19d Mon Sep 17 00:00:00 2001
From: hitenvidhani <vidhani.hiten2001@gmail.com>
Date: Sat, 13 Apr 2024 03:14:29 +0530
Subject: [PATCH 0075/1141] lint

---
 mathesar/api/ui/serializers/users.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mathesar/api/ui/serializers/users.py b/mathesar/api/ui/serializers/users.py
index 18a09e71f5..cb714ede51 100644
--- a/mathesar/api/ui/serializers/users.py
+++ b/mathesar/api/ui/serializers/users.py
@@ -1,4 +1,3 @@
-from django.contrib.auth.password_validation import validate_password
 from rest_access_policy import FieldAccessMixin, PermittedPkRelatedField
 from rest_framework import serializers
 import django.contrib.auth.password_validation as validators

From c1ca2e88706f0878d86eb68085bcfc809128c838 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 15 Apr 2024 11:50:53 +0800
Subject: [PATCH 0076/1141] remove uses of and references to demo code

---
 mathesar/views.py               | 17 +----------------
 pyproject.toml                  |  4 ++--
 release-scripts/build-debian.sh |  1 -
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/mathesar/views.py b/mathesar/views.py
index 812db81402..c418a2d4ab 100644
--- a/mathesar/views.py
+++ b/mathesar/views.py
@@ -41,12 +41,6 @@ def _get_permissible_db_queryset(request):
     Note, connections that a user is permitted to access is the union of those
     permitted by DatabaseAccessPolicy and those containing Schemas permitted by
     SchemaAccessPolicy.
-
-    Note, the live demo mode is an exception where the user is only permitted to
-    access the database generated for him. We treat that as a subset of the
-    connections the user can normally access, just in case someone finds a way
-    to manipulate how we define whether we're in demo mode and which db is a
-    user's demo db.
     """
     for deleted in (True, False):
         dbs_qs = Database.objects.filter(deleted=deleted)
@@ -180,16 +174,7 @@ def get_current_database(request, connection_id):
     if connection_id is not None:
         current_database = get_object_or_404(permitted_databases, id=connection_id)
     else:
-        request_database_name = get_live_demo_db_name(request)
-        try:
-            if request_database_name is not None:
-                # Try to get the database named specified in the request
-                current_database = permitted_databases.get(name=request_database_name)
-            else:
-                # Try to get the first database available
-                current_database = permitted_databases.order_by('id').first()
-        except Database.DoesNotExist:
-            current_database = None
+        current_database = None
     return current_database
 
 
diff --git a/pyproject.toml b/pyproject.toml
index c96070ba52..b28bfa252d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,5 +9,5 @@ min_confidence = 90
 "*" = ["*.sql", "*.json", "*.html", "*.js", "*.css", "*.svg", "*.txt"]
 [tool.setuptools.packages.find]
 where = ["."]  # list of folders that contain the packages (["."] by default)
-include = ["db*", "media*", "config*", "mathesar*", "demo*", "static*"]  # package names should match these glob patterns (["*"] by default)
-exclude = []  # exclude packages matching these glob patterns (empty by default)
\ No newline at end of file
+include = ["db*", "media*", "config*", "mathesar*", "static*"]  # package names should match these glob patterns (["*"] by default)
+exclude = []  # exclude packages matching these glob patterns (empty by default)
diff --git a/release-scripts/build-debian.sh b/release-scripts/build-debian.sh
index 8718027a15..b597f823a6 100644
--- a/release-scripts/build-debian.sh
+++ b/release-scripts/build-debian.sh
@@ -11,7 +11,6 @@ cp ../pyproject.toml build/pyproject.toml
 cp ../MANIFEST.in build/MANIFEST.in
 cp -r ../mathesar build/mathesar/
 cp -r ../static build/static/
-cp -r ../demo build/demo/
 cp -r ../config build/config/
 cp -r ../db build/db
 cp -r debian build/debian

From a76ed536504ff0603eb405ccad93a55783b79927 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 15 Apr 2024 11:58:33 +0800
Subject: [PATCH 0077/1141] remove unused demo pieces

---
 demo/install/custom_settings.py |  37 ---
 demo/install/dumpcsvs.py        |  40 ----
 demo/install/explorations.py    | 403 --------------------------------
 3 files changed, 480 deletions(-)
 delete mode 100644 demo/install/custom_settings.py
 delete mode 100644 demo/install/dumpcsvs.py
 delete mode 100644 demo/install/explorations.py

diff --git a/demo/install/custom_settings.py b/demo/install/custom_settings.py
deleted file mode 100644
index e079d5b0e1..0000000000
--- a/demo/install/custom_settings.py
+++ /dev/null
@@ -1,37 +0,0 @@
-"""This module contains logic for setting up custom display options."""
-from demo.install.base import (
-    LIBRARY_MANAGEMENT, MATHESAR_CON,
-    get_dj_column_by_name, get_dj_schema_by_name, get_dj_table_by_name,
-)
-from mathesar.models.base import PreviewColumnSettings
-
-
-def customize_settings(engine):
-    """Set preview settings so demo data looks good."""
-    _customize_library_preview_settings(engine)
-    _customize_devcon_preview_settings(engine)
-
-
-def _customize_library_preview_settings(engine):
-    schema = get_dj_schema_by_name(engine, LIBRARY_MANAGEMENT)
-    authors = get_dj_table_by_name(schema, 'Authors')
-    _set_first_and_last_names_preview(authors)
-    patrons = get_dj_table_by_name(schema, 'Patrons')
-    _set_first_and_last_names_preview(patrons)
-
-
-def _customize_devcon_preview_settings(engine):
-    schema = get_dj_schema_by_name(engine, MATHESAR_CON)
-    presenters = get_dj_table_by_name(schema, 'Speakers')
-    _set_first_and_last_names_preview(presenters)
-
-
-def _set_first_and_last_names_preview(table):
-    first_name = get_dj_column_by_name(table, 'First Name')
-    last_name = get_dj_column_by_name(table, 'Last Name')
-    template = f'{{{first_name.id}}} {{{last_name.id}}}'
-    new_preview_settings = PreviewColumnSettings.objects.create(
-        customized=True, template=template
-    )
-    table.settings.preview_settings = new_preview_settings
-    table.settings.save()
diff --git a/demo/install/dumpcsvs.py b/demo/install/dumpcsvs.py
deleted file mode 100644
index 23feb3daee..0000000000
--- a/demo/install/dumpcsvs.py
+++ /dev/null
@@ -1,40 +0,0 @@
-"""
-Dump data for all the tables of a provided schema to separate {table_name}.csv files
-with header as column names.
-
-Usage: python dumpcsvs.py
-"""
-import psycopg
-import csv
-
-DB_NAME = "mathesar"
-DB_USER = "mathesar"
-DB_PASSWORD = "mathesar"
-DB_HOST = "mathesar_dev_db"
-SCHEMA_NAME = "Movie Collection"
-
-conn = psycopg.connect(
-    dbname=DB_NAME,
-    user=DB_USER,
-    password=DB_PASSWORD,
-    host=DB_HOST,
-    port=5432
-)
-
-# get names of tables.
-tables = conn.execute(
-    f"SELECT table_name FROM information_schema.tables WHERE table_schema = '{SCHEMA_NAME}'"
-).fetchall()
-
-for table in tables:
-    table_name = table[0]
-    with open(f'{table_name}.csv', 'w', newline="") as csv_file:
-        csv_writer = csv.writer(csv_file)
-        columns = conn.execute(
-            f"""SELECT column_name FROM information_schema.columns WHERE
-            table_schema = '{SCHEMA_NAME}' AND table_name = '{table_name}';"""
-        ).fetchall()
-        columns = [column[0] for column in columns]
-        csv_writer.writerow(columns)
-        with conn.cursor().copy(f"""COPY "{SCHEMA_NAME}"."{table_name}" TO STDOUT""") as copy:
-            csv_writer.writerows(copy.rows())
diff --git a/demo/install/explorations.py b/demo/install/explorations.py
deleted file mode 100644
index be1c08aa9d..0000000000
--- a/demo/install/explorations.py
+++ /dev/null
@@ -1,403 +0,0 @@
-"""This module contains logic for creating premade explorations of demo data."""
-from demo.install.base import (
-    LIBRARY_MANAGEMENT, MATHESAR_CON,
-    get_dj_column_by_name, get_dj_schema_by_name, get_dj_table_by_name,
-)
-from mathesar.models.query import UIQuery
-
-
-def load_custom_explorations(engine):
-    """Create some premade explorations to look at demo data."""
-    _create_checkout_monthly_report(engine)
-    _create_overdue_books_report(engine)
-    _create_topics_by_organization_view(engine)
-    _create_organizations_by_topic_view(engine)
-    _create_paper_authors_view(engine)
-
-
-def _create_checkout_monthly_report(engine):
-    schema = get_dj_schema_by_name(engine, LIBRARY_MANAGEMENT)
-    checkouts = get_dj_table_by_name(schema, "Checkouts")
-    initial_columns = [
-        {
-            "id": get_dj_column_by_name(checkouts, "id").id,
-            "alias": "Checkouts_id",
-        },
-        {
-            "id": get_dj_column_by_name(checkouts, "Checkout Time").id,
-            "alias": "Checkouts_Checkout Time",
-        },
-    ]
-    transformations = [
-        {
-            "spec": {
-                "base_grouping_column": "Checkouts_Checkout Time",
-                "grouping_expressions": [
-                    {
-                        "preproc": "truncate_to_month",
-                        "input_alias": "Checkouts_Checkout Time",
-                        "output_alias": "Checkouts_Checkout Time_grouped"
-                    }
-                ],
-                "aggregation_expressions": [
-                    {
-                        "function": "count",
-                        "input_alias": "Checkouts_id",
-                        "output_alias": "Checkouts_id_agged"
-                    }
-                ]
-            },
-            "type": "summarize"
-        }
-    ]
-    display_names = {
-        "Checkouts_id": "Checkouts_id",
-        "Checkouts_id_agged": "Number of Checkouts",
-        "Checkouts_Checkout Time": "Checkouts_Checkout Time",
-        "Checkouts_Checkout Time_grouped": "Month"
-    }
-
-    UIQuery.objects.create(
-        name="Monthly Checkouts",
-        description="This report gives the number of checkouts each month.",
-        base_table=checkouts,
-        initial_columns=initial_columns,
-        transformations=transformations,
-        display_names=display_names,
-    )
-
-
-def _create_overdue_books_report(engine):
-    schema = get_dj_schema_by_name(engine, LIBRARY_MANAGEMENT)
-    books = get_dj_table_by_name(schema, "Books")
-    checkouts = get_dj_table_by_name(schema, "Checkouts")
-    items = get_dj_table_by_name(schema, "Items")
-    patrons = get_dj_table_by_name(schema, "Patrons")
-    initial_columns = [
-        {
-            "id": get_dj_column_by_name(patrons, "Email").id,
-            "alias": "Patrons_Email",
-            "jp_path": [
-                [
-                    get_dj_column_by_name(checkouts, "Patron").id,
-                    get_dj_column_by_name(patrons, "id").id
-                ],
-            ]
-        }, {
-            "id": get_dj_column_by_name(books, "Title").id,
-            "alias": "Books_Title",
-            "jp_path": [
-                [
-                    get_dj_column_by_name(checkouts, "Item").id,
-                    get_dj_column_by_name(items, "id").id,
-                ], [
-                    get_dj_column_by_name(items, "Book").id,
-                    get_dj_column_by_name(books, "id").id,
-                ]
-            ]
-        }, {
-            "id": get_dj_column_by_name(checkouts, "Due Date").id,
-            "alias": "Checkouts_Due Date"
-        }, {
-            "id": get_dj_column_by_name(checkouts, "Check In Time").id,
-            "alias": "Checkouts_Check In Time"
-        }, {
-            "id": get_dj_column_by_name(checkouts, "id").id,
-            "alias": "Checkouts_id"
-        },
-    ]
-    transformations = [
-        {
-            "spec": {
-                "lesser": [
-                    {"column_name": ["Checkouts_Due Date"]},
-                    {"literal": ["2023-01-20"]}
-                ]
-            },
-            "type": "filter"
-        }, {
-            "spec": {
-                "null": [
-                    {"column_name": ["Checkouts_Check In Time"]}
-                ]
-            },
-            "type": "filter"
-        }, {
-            "spec": [
-                "Checkouts_Due Date", "Checkouts_Check In Time", "Checkouts_id"
-            ],
-            "type": "hide"
-        }, {
-            "spec": {
-                "base_grouping_column": "Patrons_Email",
-                "grouping_expressions": [
-                    {
-                        "input_alias": "Patrons_Email",
-                        "output_alias": "Patrons_Email_grouped"
-                    }
-                ],
-                "aggregation_expressions": [
-                    {
-                        "function": "distinct_aggregate_to_array",
-                        "input_alias": "Books_Title",
-                        "output_alias": "Books_Title_agged"
-                    }
-                ]
-            },
-            "type": "summarize"
-        }
-    ]
-    display_names = {
-        "Books_Title": "Books_Title",
-        "Checkouts_id": "Checkouts_id",
-        "Patrons_Email": "Patrons_Email",
-        "Checkouts_Due Date": "Checkouts_Due Date",
-        "Checkouts_Check In Time": "Checkouts_Check In Time",
-        "Patrons_Email_grouped": "Patron Email",
-        "Books_Title_agged": "Overdue Books",
-    }
-    description = "This shows each patron's overdue books if they have any."
-
-    UIQuery.objects.create(
-        name="Overdue Book Report",
-        description=description,
-        base_table=checkouts,
-        initial_columns=initial_columns,
-        transformations=transformations,
-        display_names=display_names,
-    )
-
-
-def _create_topics_by_organization_view(engine):
-    schema = get_dj_schema_by_name(engine, MATHESAR_CON)
-
-    organizations = get_dj_table_by_name(schema, "Organizations")
-    speakers = get_dj_table_by_name(schema, "Speakers")
-    talks = get_dj_table_by_name(schema, "Talks")
-    topics = get_dj_table_by_name(schema, "Topics")
-    tt_map = get_dj_table_by_name(schema, "Talk Topic Map")
-
-    initial_columns = [
-        {
-            "id": get_dj_column_by_name(talks, "id").id,
-            "alias": "Talks_id"
-        }, {
-            "id": get_dj_column_by_name(topics, "Name").id,
-            "alias": "Topics_Name",
-            "jp_path": [
-                [
-                    get_dj_column_by_name(talks, "id").id,
-                    get_dj_column_by_name(tt_map, "Talk").id,
-                ], [
-                    get_dj_column_by_name(tt_map, "Topic").id,
-                    get_dj_column_by_name(topics, "id").id,
-                ]
-            ]
-        }, {
-            "id": get_dj_column_by_name(organizations, "Organization").id,
-            "alias": "Organizations_Organization",
-            "jp_path": [
-                [
-                    get_dj_column_by_name(talks, "Speaker").id,
-                    get_dj_column_by_name(speakers, "id").id,
-                ], [
-                    get_dj_column_by_name(speakers, "Organization").id,
-                    get_dj_column_by_name(organizations, "id").id,
-                ]
-            ]
-        }
-    ]
-    transformations = [
-        {
-            "spec": ["Talks_id"],
-            "type": "hide"
-        }, {
-            "spec": {
-                "base_grouping_column": "Organizations_Organization",
-                "grouping_expressions": [
-                    {
-                        "input_alias": "Organizations_Organization",
-                        "output_alias": "Organizations_Organization_grouped"
-                    }
-                ],
-                "aggregation_expressions": [
-                    {
-                        "function": "distinct_aggregate_to_array",
-                        "input_alias": "Topics_Name",
-                        "output_alias": "Topics_Name_agged"
-                    }
-                ]
-            },
-            "type": "summarize"
-        }
-    ]
-    display_names = {
-        "Talks_id": "Talks_id",
-        "Topics_Name": "Topics_Name",
-        "Topics_Name_agged": "Topics",
-        "Organizations_Organization": "Organizations_Organization",
-        "Organizations_Organization_grouped": "Organization"
-    }
-    description = "This gives a list of topics each organization is giving a talk about."
-
-    UIQuery.objects.create(
-        name="Topics by Organization",
-        description=description,
-        base_table=talks,
-        initial_columns=initial_columns,
-        transformations=transformations,
-        display_names=display_names,
-    )
-
-
-def _create_organizations_by_topic_view(engine):
-    schema = get_dj_schema_by_name(engine, MATHESAR_CON)
-
-    organizations = get_dj_table_by_name(schema, "Organizations")
-    speakers = get_dj_table_by_name(schema, "Speakers")
-    talks = get_dj_table_by_name(schema, "Talks")
-    topics = get_dj_table_by_name(schema, "Topics")
-    tt_map = get_dj_table_by_name(schema, "Talk Topic Map")
-
-    initial_columns = [
-        {
-            "id": get_dj_column_by_name(talks, "id").id,
-            "alias": "Talks_id"
-        }, {
-            "id": get_dj_column_by_name(topics, "Name").id,
-            "alias": "Topics_Name",
-            "jp_path": [
-                [
-                    get_dj_column_by_name(talks, "id").id,
-                    get_dj_column_by_name(tt_map, "Talk").id,
-                ], [
-                    get_dj_column_by_name(tt_map, "Topic").id,
-                    get_dj_column_by_name(topics, "id").id,
-                ]
-            ]
-        }, {
-            "id": get_dj_column_by_name(organizations, "Organization").id,
-            "alias": "Organizations_Organization",
-            "jp_path": [
-                [
-                    get_dj_column_by_name(talks, "Speaker").id,
-                    get_dj_column_by_name(speakers, "id").id,
-                ], [
-                    get_dj_column_by_name(speakers, "Organization").id,
-                    get_dj_column_by_name(organizations, "id").id,
-                ]
-            ]
-        }
-    ]
-    transformations = [
-        {
-            "spec": ["Talks_id"],
-            "type": "hide"
-        }, {
-            "spec": {
-                "base_grouping_column": "Topics_Name",
-                "grouping_expressions": [
-                    {
-                        "input_alias": "Topics_Name",
-                        "output_alias": "Topics_Name_grouped"
-                    }
-                ],
-                "aggregation_expressions": [
-                    {
-                        "function": "distinct_aggregate_to_array",
-                        "input_alias": "Organizations_Organization",
-                        "output_alias": "Organizations_Organization_agged"
-                    }
-                ]
-            },
-            "type": "summarize"
-        }
-    ]
-    display_names = {
-        "Talks_id": "Talks_id",
-        "Topics_Name": "Topics_Name",
-        "Topics_Name_grouped": "Topic",
-        "Organizations_Organization": "Organizations_Organization",
-        "Organizations_Organization_agged": "Organizations"
-    }
-    description = "This gives a list of organizations giving talks about each topic."
-
-    UIQuery.objects.create(
-        name="Organizations by Topic",
-        description=description,
-        base_table=talks,
-        initial_columns=initial_columns,
-        transformations=transformations,
-        display_names=display_names,
-    )
-
-
-def _create_paper_authors_view(engine):
-    schema = get_dj_schema_by_name(engine)
-
-    papers = get_dj_table_by_name(schema, "Papers")
-    pa_map = get_dj_table_by_name(schema, "Paper-Author Map")
-    authors = get_dj_table_by_name(schema, "Authors")
-    initial_columns = [
-        {
-            "id": get_dj_column_by_name(papers, "id").id,
-            "alias": "Papers_id"
-        }, {
-            "id": get_dj_column_by_name(papers, "Title").id,
-            "alias": "Papers_Title"
-        }, {
-            "id": get_dj_column_by_name(authors, "Name").id,
-            "alias": "Authors_Name",
-            "jp_path": [
-                [
-                    get_dj_column_by_name(papers, "id").id,
-                    get_dj_column_by_name(pa_map, "paper_id").id,
-                ], [
-                    get_dj_column_by_name(pa_map, "author_id").id,
-                    get_dj_column_by_name(authors, "id").id,
-                ]
-            ]
-        }
-    ]
-    transformations = [
-        {
-            "spec": {
-                "base_grouping_column": "Papers_id",
-                "grouping_expressions": [
-                    {
-                        "input_alias": "Papers_id",
-                        "output_alias": "Papers_id_grouped"
-                    }, {
-                        "input_alias": "Papers_Title",
-                        "output_alias": "Papers_Title_grouped"
-                    }
-                ],
-                "aggregation_expressions": [
-                    {
-                        "function": "distinct_aggregate_to_array",
-                        "input_alias": "Authors_Name",
-                        "output_alias": "Authors_Name_agged"
-                    }
-                ]
-            },
-            "type": "summarize"
-        }
-    ]
-    display_names = {
-        "Papers_id": "Papers_id",
-        "Authors_Name": "Authors_Name",
-        "Papers_Title": "Papers_Title",
-        "Papers_id_grouped": "Paper id",
-        "Authors_Name_agged": "Authors",
-        "Papers_Title_grouped": "Paper Title"
-    }
-    description = "This report gives the title of each paper, along with a list of its authors."
-
-    UIQuery.objects.create(
-        name="Paper Authors",
-        description=description,
-        base_table=papers,
-        initial_columns=initial_columns,
-        transformations=transformations,
-        display_names=display_names,
-    )

From 29c394cd93f47cff6ba17ded4376759c284643e4 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 15 Apr 2024 16:57:29 +0800
Subject: [PATCH 0078/1141] move still-needed demo code to new location

---
 demo/__init__.py                              |   1 -
 demo/install/__init__.py                      |   0
 demo/install/base.py                          |  69 --
 demo/install/datasets.py                      |  27 -
 demo/install/resources/devcon_dataset.sql     | 898 ------------------
 demo/templates/demo/analytics.html            |  11 -
 mathesar/examples/base.py                     |  14 +
 .../examples}/library_dataset.py              |   2 +-
 .../examples}/movies_dataset.py               |   4 +-
 .../resources/library_add_checkouts.sql       |   0
 .../resources/library_without_checkouts.sql   |   0
 .../resources/movie_collection_fks.sql        |   0
 .../resources/movie_collection_tables.sql     |   0
 .../resources/movies_csv/Departments.csv      |   0
 .../examples}/resources/movies_csv/Genres.csv |   0
 .../examples}/resources/movies_csv/Jobs.csv   |   0
 .../resources/movies_csv/Movie Cast Map.csv   |   0
 .../resources/movies_csv/Movie Crew Map.csv   |   0
 .../resources/movies_csv/Movie Genre Map.csv  |   0
 .../Movie Production Company Map.csv          |   0
 .../Movie Production Country Map.csv          |   0
 .../movies_csv/Movie Spoken Language Map.csv  |   0
 .../examples}/resources/movies_csv/Movies.csv |   0
 .../examples}/resources/movies_csv/People.csv |   0
 .../movies_csv/Production Companies.csv       |   0
 .../movies_csv/Production Countries.csv       |   0
 .../resources/movies_csv/Spoken Languages.csv |   0
 .../resources/movies_csv/Sub-Collections.csv  |   0
 mathesar/utils/connections.py                 |   4 +-
 29 files changed, 20 insertions(+), 1010 deletions(-)
 delete mode 100644 demo/__init__.py
 delete mode 100644 demo/install/__init__.py
 delete mode 100644 demo/install/base.py
 delete mode 100644 demo/install/datasets.py
 delete mode 100644 demo/install/resources/devcon_dataset.sql
 delete mode 100644 demo/templates/demo/analytics.html
 create mode 100644 mathesar/examples/base.py
 rename {demo/install => mathesar/examples}/library_dataset.py (93%)
 rename {demo/install => mathesar/examples}/movies_dataset.py (91%)
 rename {demo/install => mathesar/examples}/resources/library_add_checkouts.sql (100%)
 rename {demo/install => mathesar/examples}/resources/library_without_checkouts.sql (100%)
 rename {demo/install => mathesar/examples}/resources/movie_collection_fks.sql (100%)
 rename {demo/install => mathesar/examples}/resources/movie_collection_tables.sql (100%)
 rename {demo/install => mathesar/examples}/resources/movies_csv/Departments.csv (100%)
 rename {demo/install => mathesar/examples}/resources/movies_csv/Genres.csv (100%)
 rename {demo/install => mathesar/examples}/resources/movies_csv/Jobs.csv (100%)
 rename {demo/install => mathesar/examples}/resources/movies_csv/Movie Cast Map.csv (100%)
 rename {demo/install => mathesar/examples}/resources/movies_csv/Movie Crew Map.csv (100%)
 rename {demo/install => mathesar/examples}/resources/movies_csv/Movie Genre Map.csv (100%)
 rename {demo/install => mathesar/examples}/resources/movies_csv/Movie Production Company Map.csv (100%)
 rename {demo/install => mathesar/examples}/resources/movies_csv/Movie Production Country Map.csv (100%)
 rename {demo/install => mathesar/examples}/resources/movies_csv/Movie Spoken Language Map.csv (100%)
 rename {demo/install => mathesar/examples}/resources/movies_csv/Movies.csv (100%)
 rename {demo/install => mathesar/examples}/resources/movies_csv/People.csv (100%)
 rename {demo/install => mathesar/examples}/resources/movies_csv/Production Companies.csv (100%)
 rename {demo/install => mathesar/examples}/resources/movies_csv/Production Countries.csv (100%)
 rename {demo/install => mathesar/examples}/resources/movies_csv/Spoken Languages.csv (100%)
 rename {demo/install => mathesar/examples}/resources/movies_csv/Sub-Collections.csv (100%)

diff --git a/demo/__init__.py b/demo/__init__.py
deleted file mode 100644
index 50e072800f..0000000000
--- a/demo/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-default_app_config = 'demo.apps.DemoConfig'
diff --git a/demo/install/__init__.py b/demo/install/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/demo/install/base.py b/demo/install/base.py
deleted file mode 100644
index f08d3586ac..0000000000
--- a/demo/install/base.py
+++ /dev/null
@@ -1,69 +0,0 @@
-"""The demo.install namespace contains logic for setting up new demo instances."""
-import os
-
-from sqlalchemy import text
-from sqlalchemy.exc import OperationalError
-
-from db.engine import create_future_engine
-
-from mathesar.models.base import Table, Schema
-
-FILE_DIR = os.path.abspath(os.path.dirname(__file__))
-RESOURCES = os.path.join(FILE_DIR, "resources")
-LIBRARY_ONE = os.path.join(RESOURCES, "library_without_checkouts.sql")
-LIBRARY_TWO = os.path.join(RESOURCES, "library_add_checkouts.sql")
-DEVCON_DATASET = os.path.join(RESOURCES, "devcon_dataset.sql")
-MOVIES_SQL_TABLES = os.path.join(RESOURCES, "movie_collection_tables.sql")
-MOVIES_SQL_FKS = os.path.join(RESOURCES, "movie_collection_fks.sql")
-MOVIES_CSV = os.path.join(RESOURCES, 'movies_csv')
-LIBRARY_MANAGEMENT = 'Library Management'
-MOVIE_COLLECTION = 'Movie Collection'
-MATHESAR_CON = 'Mathesar Con'
-
-
-def get_dj_schema_by_name(engine, name):
-    """Find a schema with a given name in the given DB."""
-    db_name = engine.url.database
-    schemas = Schema.objects.filter(database__name=db_name)
-    for s in schemas:
-        if s.name == name:
-            return s
-
-
-def get_dj_table_by_name(schema, name):
-    """Find a table with a given name in the given schema."""
-    tables = Table.objects.filter(schema=schema)
-    for t in tables:
-        if t.name == name:
-            return t
-
-
-def get_dj_column_by_name(table, name):
-    """Find a column with a given name in the given table."""
-    columns = table.columns.all()
-    for c in columns:
-        if c.name == name:
-            return c
-
-
-def create_demo_database(
-        user_db, username, password, hostname, root_db, port, template_db
-):
-    """Create database, install Mathesar on it, add demo data."""
-    user_db_engine = create_future_engine(
-        username, password, hostname, user_db, port
-    )
-    try:
-        user_db_engine.connect()
-        user_db_engine.dispose()
-        print(f"Database {user_db} already exists! Skipping...")
-    except OperationalError:
-        root_db_engine = create_future_engine(
-            username, password, hostname, root_db, port,
-        )
-        with root_db_engine.connect() as conn:
-            conn.execution_options(isolation_level="AUTOCOMMIT")
-            conn.execute(text(f"CREATE DATABASE {user_db} TEMPLATE {template_db};"))
-        root_db_engine.dispose()
-        user_db_engine.dispose()
-        print(f"Created DB is {user_db}.")
diff --git a/demo/install/datasets.py b/demo/install/datasets.py
deleted file mode 100644
index 2c2ebc7107..0000000000
--- a/demo/install/datasets.py
+++ /dev/null
@@ -1,27 +0,0 @@
-"""This module contains functions to load datasets for demo purposes."""
-import logging
-import pickle
-
-from sqlalchemy import text
-
-from demo.install.library_dataset import load_library_dataset
-from demo.install.movies_dataset import load_movies_dataset
-from demo.install.base import (MATHESAR_CON, DEVCON_DATASET,)
-
-
-def load_datasets(engine):
-    """Load some SQL files with demo data to DB targeted by `engine`."""
-    load_library_dataset(engine)
-    load_movies_dataset(engine)
-    _load_devcon_dataset(engine)
-
-
-def _load_devcon_dataset(engine):
-    drop_schema_query = text(f"""DROP SCHEMA IF EXISTS "{MATHESAR_CON}" CASCADE;""")
-    create_schema_query = text(f"""CREATE SCHEMA "{MATHESAR_CON}";""")
-    set_search_path = text(f"""SET search_path="{MATHESAR_CON}";""")
-    with engine.begin() as conn, open(DEVCON_DATASET) as f:
-        conn.execute(drop_schema_query)
-        conn.execute(create_schema_query)
-        conn.execute(set_search_path)
-        conn.execute(text(f.read()))
diff --git a/demo/install/resources/devcon_dataset.sql b/demo/install/resources/devcon_dataset.sql
deleted file mode 100644
index 1e135bee47..0000000000
--- a/demo/install/resources/devcon_dataset.sql
+++ /dev/null
@@ -1,898 +0,0 @@
---
--- Name: Days; Type: TABLE; Schema: Mathesar Con; Owner: -
---
-
-CREATE TABLE "Days" (
-    id integer NOT NULL,
-    "Name" text,
-    "Date" date
-);
-
-
---
--- Name: Job Titles; Type: TABLE; Schema: Mathesar Con; Owner: -
---
-
-CREATE TABLE "Job Titles" (
-    id integer NOT NULL,
-    "Titles" text
-);
-
-
---
--- Name: Organizations; Type: TABLE; Schema: Mathesar Con; Owner: -
---
-
-CREATE TABLE "Organizations" (
-    id integer NOT NULL,
-    "Organization" text
-);
-
-
---
--- Name: Positions_id_seq; Type: SEQUENCE; Schema: Mathesar Con; Owner: -
---
-
-CREATE SEQUENCE "Positions_id_seq"
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: Positions_id_seq; Type: SEQUENCE OWNED BY; Schema: Mathesar Con; Owner: -
---
-
-ALTER SEQUENCE "Positions_id_seq" OWNED BY "Job Titles".id;
-
-
---
--- Name: Rooms; Type: TABLE; Schema: Mathesar Con; Owner: -
---
-
-CREATE TABLE "Rooms" (
-    id integer NOT NULL,
-    "Name" text NOT NULL,
-    "Capacity" numeric
-);
-
-
---
--- Name: Speakers; Type: TABLE; Schema: Mathesar Con; Owner: -
---
-
-CREATE TABLE "Speakers" (
-    id integer NOT NULL,
-    "First Name" text,
-    "Last Name" text,
-    "Email" mathesar_types.email NOT NULL,
-    "Bio" text,
-    "Job Title" integer,
-    "Organization" integer
-);
-
-
---
--- Name: Table 115_id_seq; Type: SEQUENCE; Schema: Mathesar Con; Owner: -
---
-
-CREATE SEQUENCE "Table 115_id_seq"
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: Table 115_id_seq; Type: SEQUENCE OWNED BY; Schema: Mathesar Con; Owner: -
---
-
-ALTER SEQUENCE "Table 115_id_seq" OWNED BY "Speakers".id;
-
-
---
--- Name: Table 117_id_seq; Type: SEQUENCE; Schema: Mathesar Con; Owner: -
---
-
-CREATE SEQUENCE "Table 117_id_seq"
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: Table 117_id_seq; Type: SEQUENCE OWNED BY; Schema: Mathesar Con; Owner: -
---
-
-ALTER SEQUENCE "Table 117_id_seq" OWNED BY "Rooms".id;
-
-
---
--- Name: Topics; Type: TABLE; Schema: Mathesar Con; Owner: -
---
-
-CREATE TABLE "Topics" (
-    id integer NOT NULL,
-    "Name" text
-);
-
-
---
--- Name: Table 118_id_seq; Type: SEQUENCE; Schema: Mathesar Con; Owner: -
---
-
-CREATE SEQUENCE "Table 118_id_seq"
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: Table 118_id_seq; Type: SEQUENCE OWNED BY; Schema: Mathesar Con; Owner: -
---
-
-ALTER SEQUENCE "Table 118_id_seq" OWNED BY "Topics".id;
-
-
---
--- Name: Table 119_id_seq; Type: SEQUENCE; Schema: Mathesar Con; Owner: -
---
-
-CREATE SEQUENCE "Table 119_id_seq"
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: Table 119_id_seq; Type: SEQUENCE OWNED BY; Schema: Mathesar Con; Owner: -
---
-
-ALTER SEQUENCE "Table 119_id_seq" OWNED BY "Days".id;
-
-
---
--- Name: Talks; Type: TABLE; Schema: Mathesar Con; Owner: -
---
-
-CREATE TABLE "Talks" (
-    id integer NOT NULL,
-    "Title" text,
-    "Day" integer,
-    "Room" integer,
-    "Speaker" integer,
-    "Abstract" text,
-    "Time Slot" integer,
-    "Track" integer
-);
-
-
---
--- Name: Table 120_id_seq; Type: SEQUENCE; Schema: Mathesar Con; Owner: -
---
-
-CREATE SEQUENCE "Table 120_id_seq"
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: Table 120_id_seq; Type: SEQUENCE OWNED BY; Schema: Mathesar Con; Owner: -
---
-
-ALTER SEQUENCE "Table 120_id_seq" OWNED BY "Talks".id;
-
-
---
--- Name: Table 67_id_seq; Type: SEQUENCE; Schema: Mathesar Con; Owner: -
---
-
-CREATE SEQUENCE "Table 67_id_seq"
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: Table 67_id_seq; Type: SEQUENCE OWNED BY; Schema: Mathesar Con; Owner: -
---
-
-ALTER SEQUENCE "Table 67_id_seq" OWNED BY "Organizations".id;
-
-
---
--- Name: Talk Topic Map; Type: TABLE; Schema: Mathesar Con; Owner: -
---
-
-CREATE TABLE "Talk Topic Map" (
-    id integer NOT NULL,
-    "Talk" integer,
-    "Topic" integer
-);
-
-
---
--- Name: Talk Topic Map_id_seq; Type: SEQUENCE; Schema: Mathesar Con; Owner: -
---
-
-CREATE SEQUENCE "Talk Topic Map_id_seq"
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: Talk Topic Map_id_seq; Type: SEQUENCE OWNED BY; Schema: Mathesar Con; Owner: -
---
-
-ALTER SEQUENCE "Talk Topic Map_id_seq" OWNED BY "Talk Topic Map".id;
-
-
---
--- Name: Time Slots; Type: TABLE; Schema: Mathesar Con; Owner: -
---
-
-CREATE TABLE "Time Slots" (
-    id integer NOT NULL,
-    "Slot" text NOT NULL
-);
-
-
---
--- Name: Time Slots_id_seq; Type: SEQUENCE; Schema: Mathesar Con; Owner: -
---
-
-CREATE SEQUENCE "Time Slots_id_seq"
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: Time Slots_id_seq; Type: SEQUENCE OWNED BY; Schema: Mathesar Con; Owner: -
---
-
-ALTER SEQUENCE "Time Slots_id_seq" OWNED BY "Time Slots".id;
-
-
---
--- Name: Tracks; Type: TABLE; Schema: Mathesar Con; Owner: -
---
-
-CREATE TABLE "Tracks" (
-    id integer NOT NULL,
-    "Name" text
-);
-
-
---
--- Name: Tracks_id_seq; Type: SEQUENCE; Schema: Mathesar Con; Owner: -
---
-
-CREATE SEQUENCE "Tracks_id_seq"
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: Tracks_id_seq; Type: SEQUENCE OWNED BY; Schema: Mathesar Con; Owner: -
---
-
-ALTER SEQUENCE "Tracks_id_seq" OWNED BY "Tracks".id;
-
-
---
--- Name: Days id; Type: DEFAULT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Days" ALTER COLUMN id SET DEFAULT nextval('"Table 119_id_seq"'::regclass);
-
-
---
--- Name: Job Titles id; Type: DEFAULT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Job Titles" ALTER COLUMN id SET DEFAULT nextval('"Positions_id_seq"'::regclass);
-
-
---
--- Name: Organizations id; Type: DEFAULT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Organizations" ALTER COLUMN id SET DEFAULT nextval('"Table 67_id_seq"'::regclass);
-
-
---
--- Name: Rooms id; Type: DEFAULT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Rooms" ALTER COLUMN id SET DEFAULT nextval('"Table 117_id_seq"'::regclass);
-
-
---
--- Name: Speakers id; Type: DEFAULT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Speakers" ALTER COLUMN id SET DEFAULT nextval('"Table 115_id_seq"'::regclass);
-
-
---
--- Name: Talk Topic Map id; Type: DEFAULT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Talk Topic Map" ALTER COLUMN id SET DEFAULT nextval('"Talk Topic Map_id_seq"'::regclass);
-
-
---
--- Name: Talks id; Type: DEFAULT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Talks" ALTER COLUMN id SET DEFAULT nextval('"Table 120_id_seq"'::regclass);
-
-
---
--- Name: Time Slots id; Type: DEFAULT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Time Slots" ALTER COLUMN id SET DEFAULT nextval('"Time Slots_id_seq"'::regclass);
-
-
---
--- Name: Topics id; Type: DEFAULT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Topics" ALTER COLUMN id SET DEFAULT nextval('"Table 118_id_seq"'::regclass);
-
-
---
--- Name: Tracks id; Type: DEFAULT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Tracks" ALTER COLUMN id SET DEFAULT nextval('"Tracks_id_seq"'::regclass);
-
-
---
--- Data for Name: Days; Type: TABLE DATA; Schema: Mathesar Con; Owner: -
---
-
-INSERT INTO "Days" (id, "Name", "Date") VALUES (1, 'Friday', '2023-01-20');
-INSERT INTO "Days" (id, "Name", "Date") VALUES (2, 'Saturday', '2023-01-21');
-INSERT INTO "Days" (id, "Name", "Date") VALUES (3, 'Sunday', '2023-01-22');
-
-
---
--- Data for Name: Job Titles; Type: TABLE DATA; Schema: Mathesar Con; Owner: -
---
-
-INSERT INTO "Job Titles" (id, "Titles") VALUES (1, 'Director of Technology');
-INSERT INTO "Job Titles" (id, "Titles") VALUES (3, 'Product Designer');
-INSERT INTO "Job Titles" (id, "Titles") VALUES (4, 'Product Manager');
-INSERT INTO "Job Titles" (id, "Titles") VALUES (5, 'User Advocate');
-INSERT INTO "Job Titles" (id, "Titles") VALUES (6, 'Store Manager');
-INSERT INTO "Job Titles" (id, "Titles") VALUES (7, 'Business Analyst');
-INSERT INTO "Job Titles" (id, "Titles") VALUES (8, 'Sysadmin');
-INSERT INTO "Job Titles" (id, "Titles") VALUES (9, 'Data Journalist');
-INSERT INTO "Job Titles" (id, "Titles") VALUES (10, 'Hospital Administrator');
-INSERT INTO "Job Titles" (id, "Titles") VALUES (11, 'Educator');
-INSERT INTO "Job Titles" (id, "Titles") VALUES (2, 'Software Engineer');
-INSERT INTO "Job Titles" (id, "Titles") VALUES (12, 'Data Coordinator');
-INSERT INTO "Job Titles" (id, "Titles") VALUES (13, 'Founder');
-
-
---
--- Data for Name: Organizations; Type: TABLE DATA; Schema: Mathesar Con; Owner: -
---
-
-INSERT INTO "Organizations" (id, "Organization") VALUES (1, 'Center of Complex Interventions(CCI)');
-INSERT INTO "Organizations" (id, "Organization") VALUES (3, 'PostgreSQL Global Development Group');
-INSERT INTO "Organizations" (id, "Organization") VALUES (2, 'Django Software Foundation');
-INSERT INTO "Organizations" (id, "Organization") VALUES (4, 'Svelte Foundation');
-INSERT INTO "Organizations" (id, "Organization") VALUES (5, 'Becker Group');
-INSERT INTO "Organizations" (id, "Organization") VALUES (6, 'Learning Equality');
-INSERT INTO "Organizations" (id, "Organization") VALUES (7, 'Harper Automotive');
-INSERT INTO "Organizations" (id, "Organization") VALUES (9, 'The Data Digest
-');
-INSERT INTO "Organizations" (id, "Organization") VALUES (10, 'Hope Medical Center');
-INSERT INTO "Organizations" (id, "Organization") VALUES (8, 'State of Palmchester');
-INSERT INTO "Organizations" (id, "Organization") VALUES (11, 'Fresh Basket');
-INSERT INTO "Organizations" (id, "Organization") VALUES (12, 'Data Dynamics');
-
-
---
--- Data for Name: Rooms; Type: TABLE DATA; Schema: Mathesar Con; Owner: -
---
-
-INSERT INTO "Rooms" (id, "Name", "Capacity") VALUES (1, 'Main Hall', 120);
-INSERT INTO "Rooms" (id, "Name", "Capacity") VALUES (2, '202A', 35);
-INSERT INTO "Rooms" (id, "Name", "Capacity") VALUES (3, '202B', 35);
-INSERT INTO "Rooms" (id, "Name", "Capacity") VALUES (4, '202C', 35);
-INSERT INTO "Rooms" (id, "Name", "Capacity") VALUES (5, '202D', 35);
-
-
---
--- Data for Name: Speakers; Type: TABLE DATA; Schema: Mathesar Con; Owner: -
---
-
-INSERT INTO "Speakers" (id, "First Name", "Last Name", "Email", "Bio", "Job Title", "Organization") VALUES (18, 'Edward', 'Bautista', 'edwardb@example.org', 'Edward is an experienced retail professional who has been the store manager for The Fresh Basket for the past 5 years. He has a passion for providing customers with high-quality, fresh, and healthy food options. Under his leadership, The Fresh Basket has become a well-known destination for those who are looking for a wide variety of fresh fruits, vegetables, and other products. He is always looking for ways to improve the store''s operations and customer experience, and has implemented various technology solutions to streamline the store''s processes and improve efficiency. Edward is excited to share his experiences and insights at the upcoming tech conference and hopes to learn from other industry professionals.', 6, 11);
-INSERT INTO "Speakers" (id, "First Name", "Last Name", "Email", "Bio", "Job Title", "Organization") VALUES (25, 'Ryan', 'Fisher', 'ryan.fisher@example.gov', 'Ryan Fisher is a data coordinator for the State of Palmchester, where he manages and analyzes data for various government departments. He has a strong background in data management, analysis and visualization, and he is a skilled professional in using various data management tools and software. Ryan is an expert in providing insights and recommendations based on data analysis to support decision-making processes. He has been working in the field for over 5 years and has a deep understanding of data privacy and security standards.', 12, 8);
-INSERT INTO "Speakers" (id, "First Name", "Last Name", "Email", "Bio", "Job Title", "Organization") VALUES (2, 'Sarah', 'Smith', 'sarah@example.org', 'Sarah is a designer with a focus on experimenting and iterating with different design processes. During her twelve-year career in tech, she has worked on various products at healthcare and enterprise software startups. She enjoys sharing her ideas and experience with people and helping them think creatively. Sarah is currently the product designer for the Mathesar project, which aims to help people collaborate, develop, and explore the potential of database technologies to meet the challenges of an increasingly complex world.', 3, 1);
-INSERT INTO "Speakers" (id, "First Name", "Last Name", "Email", "Bio", "Job Title", "Organization") VALUES (16, 'Daniel', 'Novak', 'novak.daniel@example.auto', 'Daniel is a project manager at Harper Automotive. He has a deep understanding of automotive industry and has been iinstrumental in implementing various technology solutions to improve the company''s operations, efficiency and productivity. He is an expert in project management methodologies and has a talent for leading cross-functional teams and coordinating with stakeholders to achieve project goals.', 4, 7);
-INSERT INTO "Speakers" (id, "First Name", "Last Name", "Email", "Bio", "Job Title", "Organization") VALUES (1, 'John', 'Davis', 'john@example.org', 'John is a highly experienced backend engineer with over 10 years of experience in building complex database systems. He is a key contributor to the Mathesar project and is responsible for designing and implementing the core architecture of the platform. John is passionate about making technology accessible to non-technical users and is dedicated to making Mathesar as user-friendly as possible.', 2, 1);
-INSERT INTO "Speakers" (id, "First Name", "Last Name", "Email", "Bio", "Job Title", "Organization") VALUES (6, 'Robert', 'Martinez', 'robert@example.org', 'Robert is a seasoned backend engineer with a strong background in software development. He is an expert in web development and has a deep understanding of the technologies that are used to build Mathesar. Robert is responsible for building the RESTful API of Mathesar, which allows for easy integration with other systems.', 2, 1);
-INSERT INTO "Speakers" (id, "First Name", "Last Name", "Email", "Bio", "Job Title", "Organization") VALUES (7, 'Joshua', 'Hernandez', 'joshua@example.org', 'Joshua is a frontend engineer with a background in computer science and a passion for user experience. Joshua has been working on Mathesar for over 2 years and is excited to see the project come to fruition. Joshua is dedicated to building an intuitive and user-friendly interface that makes it easy for anyone to work with databases, regardless of their technical knowledge. He is committed to using his skills and experience to create a user-friendly interface that is both functional and visually appealing.', 2, 1);
-INSERT INTO "Speakers" (id, "First Name", "Last Name", "Email", "Bio", "Job Title", "Organization") VALUES (8, 'Jacob', 'Lopez', 'jacob@example.org', 'Jacob is a backend developer with a passion for data science. He has a deep understanding of data structures and algorithms, and is an expert in Python programming. Jacob is responsible for building the data analytics and visualization features of Mathesar, which allows non-technical users to easily explore and understand their data. He is dedicated to making Mathesar a powerful tool for data-driven decision making.', 2, 1);
-INSERT INTO "Speakers" (id, "First Name", "Last Name", "Email", "Bio", "Job Title", "Organization") VALUES (4, 'David', 'Garcia', 'david@example.org', 'David is a skilled backend developer with a background in data engineering. He has a deep understanding of database systems and is an expert in SQL and noSQL databases. John is responsible for developing the data access layer of Mathesar, ensuring that it is optimized for performance and scalability.', 2, 1);
-INSERT INTO "Speakers" (id, "First Name", "Last Name", "Email", "Bio", "Job Title", "Organization") VALUES (3, 'Michael', 'Brown', 'michael@example.org', 'Michael is an experienced frontend engineer with a background in software development. Michael has a strong understanding of web technologies and is committed to building interfaces that are both functional and visually appealing. Michael is dedicated to building an intuitive and user-friendly interface that makes it easy for anyone to work with databases.', 2, 1);
-INSERT INTO "Speakers" (id, "First Name", "Last Name", "Email", "Bio", "Job Title", "Organization") VALUES (9, 'James', 'Rodriguez', 'james@example.org', 'James is a frontend engineer with a passion for creating intuitive and user-friendly interfaces. With over 5 years of experience in frontend development, James has a strong understanding of web technologies and a keen eye for design. James is dedicated to building a user-friendly interface that makes it easy for anyone to work with databases.', 2, 1);
-INSERT INTO "Speakers" (id, "First Name", "Last Name", "Email", "Bio", "Job Title", "Organization") VALUES (14, 'Bob', 'Johnson', 'bob@example.org', 'Bob is an engineer at the Postgresql Global Development Group. He specializes in implementing new features related to database management and has a strong background in SQL programming. Bob is dedicated to improving the overall performance and functionality of Postgresql databases, and is always looking for new ways to push the limits of what can be achieved with this powerful tool.', 2, 3);
-INSERT INTO "Speakers" (id, "First Name", "Last Name", "Email", "Bio", "Job Title", "Organization") VALUES (11, 'Amy', 'Miller', 'amymiller@example.org', 'Amy is a software engineer who has been working at the Django Software Foundation for over 5 years. She specializes in implementing new features and improving the overall performance of the Django web framework. Amy is passionate about open-source software and enjoys collaborating with other engineers to build better tools for developers.', 2, 2);
-INSERT INTO "Speakers" (id, "First Name", "Last Name", "Email", "Bio", "Job Title", "Organization") VALUES (15, 'Michael', 'Williams', 'michaelwill@example.org', 'Michael is an experienced software engineer at Svelte Foundation. He has been instrumental in implementing new features and improvements to the framework, making it more user-friendly and efficient.', 2, 4);
-INSERT INTO "Speakers" (id, "First Name", "Last Name", "Email", "Bio", "Job Title", "Organization") VALUES (21, 'Sean', 'Hernandez', 'sean@example.org', 'Sean is a passionate data journalist who has been working with the Data Digest for the past 3 years. As a data-driven weekly newsletter, the Data Digest is a platform that provides insights and analysis on the latest tech trends and developments. Sean''s extensive experience in data journalism, combined with his deep understanding of the tech industry, makes him the perfect fit for the Data Digest. Sean''s work has been recognized for its in-depth analysis and ability to make complex data easy to understand for the general audience. He is always looking for new ways to tell compelling stories through data, and he is constantly seeking new ways to make data more accessible to the public.', 9, 9);
-INSERT INTO "Speakers" (id, "First Name", "Last Name", "Email", "Bio", "Job Title", "Organization") VALUES (20, 'Patricia', 'Daniels', 'patricia@example.org', 'Patricia is a highly skilled and experienced system administrator who has been working at The Becker Group for the past 5 years. She specializes in the implementation and maintenance of complex IT systems and has a deep understanding of various operating systems, including Windows and Linux. Patricia has been responsible for the day-to-day operations of the IT infrastructure of the Becker Group and has played an instrumental role in ensuring the smooth and efficient functioning of the organization''s IT systems. ', 8, 5);
-INSERT INTO "Speakers" (id, "First Name", "Last Name", "Email", "Bio", "Job Title", "Organization") VALUES (24, 'Brandon', 'Peters', 'brandon@example.org', 'Brandon is an experienced educator and technology advocate who has been working with Learning Equality, a non-profit organization, for the past 5 years. He specializes in designing and implementing technology-based education programs for underprivileged communities. Brandon has a deep understanding of the challenges and opportunities of digital education and has been instrumental in creating digital resources and tools that enable children to learn in a fun and interactive way.  He is passionate about using technology to create a more inclusive and equitable world, and is always eager to share his knowledge and experience with others.', 11, 6);
-INSERT INTO "Speakers" (id, "First Name", "Last Name", "Email", "Bio", "Job Title", "Organization") VALUES (22, 'Caroline', 'Martin', 'caroline@example.org', 'Caroline is an experienced hospital administrator who currently works at the Hope Medical Center. She has over 10 years of experience in the healthcare industry, with a focus on managing and improving hospital operations. Caroline has a deep understanding of healthcare technology and has been instrumental in implementing new systems and processes at the Hope Medical Center to improve patient care and streamline operations. Caroline shares her knowledge and insights on how technology can be used to improve patient outcomes and hospital efficiency.', 10, 10);
-INSERT INTO "Speakers" (id, "First Name", "Last Name", "Email", "Bio", "Job Title", "Organization") VALUES (19, 'Collin', 'Gutierrez', 'collin@example.org', 'Collin is a highly skilled business analyst with a proven track record of delivering results. He has been working with the Becker Group for the past 5 years, where he has been responsible for analyzing and interpreting data to help the company make strategic business decisions.  He is a problem solver and a critical thinker who is always looking for ways to improve the company''s bottom line. Collin''s ability to think outside the box and his keen analytical skills make him a valuable asset to the Becker Group and the tech industry as a whole.', 7, 5);
-INSERT INTO "Speakers" (id, "First Name", "Last Name", "Email", "Bio", "Job Title", "Organization") VALUES (17, 'Kevin', 'Rivera', 'kev.riv@example.org', 'Kevin is a passionate user advocate with over 5 years of experience in the tech industry. He currently works for the Becker Group as a user advocate, where he helps to improve the user experience and ensure that the products and services offered by the company meet the needs of its customers. Kevin has a strong background in user research, user testing, and usability evaluation. He has a deep understanding of the user-centered design process and is skilled in conducting user research, analyzing data, and making recommendations for product improvements.', 5, 5);
-INSERT INTO "Speakers" (id, "First Name", "Last Name", "Email", "Bio", "Job Title", "Organization") VALUES (26, 'Christopher', 'Smith', 'chris.smith@example.org', 'Cristopher is a tech entrepreneur and the founder of a rapidly growing startup. He has a deep understanding of the software development process, under his leadership, his startup has grown to become one of the leading companies in the field of data analytics and development.', 13, 12);
-INSERT INTO "Speakers" (id, "First Name", "Last Name", "Email", "Bio", "Job Title", "Organization") VALUES (5, 'Emily', 'Johnson', 'emily@example.org', 'Emily is the Director of Technology at Mathesar, with a background in computer science and a passion for user experience, Emily is dedicated to making Mathesar''s user interface as intuitive and user-friendly as possible. She leads the development team and is constantly working to improve the software, making it easier for non-technical users to work with both existing and new databases without any prior knowledge of database concepts. Emily''s goal is to make Mathesar the go-to solution for anyone who needs to access and manage data without the need for technical expertise.', 1, 1);
-
-
---
--- Data for Name: Talk Topic Map; Type: TABLE DATA; Schema: Mathesar Con; Owner: -
---
-
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (1, 2, 2);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (26, 13, 7);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (2, 2, 1);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (3, 2, 9);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (27, 13, 6);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (4, 2, 3);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (5, 3, 5);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (6, 4, 6);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (7, 4, 7);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (28, 14, 8);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (8, 4, 5);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (29, 15, 7);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (9, 5, 1);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (10, 5, 9);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (11, 6, 7);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (30, 16, 7);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (12, 6, 6);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (31, 16, 9);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (13, 6, 9);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (14, 7, 7);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (32, 16, 1);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (15, 7, 3);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (33, 17, 1);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (16, 8, 5);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (17, 8, 4);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (34, 17, 7);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (18, 9, 3);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (35, 18, 1);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (19, 9, 1);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (36, 18, 3);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (20, 10, 2);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (37, 19, 4);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (21, 10, 9);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (22, 11, 4);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (38, 19, 5);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (23, 11, 5);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (24, 12, 4);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (25, 12, 5);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (69, 38, 9);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (39, 20, 7);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (40, 21, 9);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (70, 39, 8);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (41, 21, 2);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (71, 39, 9);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (43, 22, 9);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (72, 40, 8);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (42, 22, 2);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (73, 40, 9);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (44, 22, 7);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (45, 23, 7);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (74, 41, 7);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (46, 23, 3);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (47, 24, 8);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (75, 41, 8);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (48, 25, 7);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (49, 26, 7);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (50, 27, 7);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (51, 28, 8);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (52, 29, 9);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (53, 29, 2);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (54, 30, 7);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (55, 30, 9);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (56, 30, 8);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (57, 31, 8);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (58, 31, 9);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (59, 32, 7);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (60, 32, 9);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (61, 33, 7);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (62, 33, 3);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (63, 34, 7);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (64, 34, 3);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (65, 35, 8);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (66, 36, 8);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (67, 36, 9);
-INSERT INTO "Talk Topic Map" (id, "Talk", "Topic") VALUES (68, 37, 9);
-
-
---
--- Data for Name: Talks; Type: TABLE DATA; Schema: Mathesar Con; Owner: -
---
-
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (2, 'SQLAlchemy and Dynamic Defaults', 1, 2, 8, 'SQLAlchemy doesn''t support dynamic default values very well. In this talk, we explore options for how to both create and parse dynamic default values for database columns using SQLAlchemy.', 7, 3);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (5, 'Python for databases', 1, 2, 1, 'In this talk we explore a number of challenges and constraints encountered when using python to interact with a PostgreSQL DB.', 8, 3);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (17, 'PostgreSQL: The best SQL', 2, 1, 4, 'In this talk we will take a look at the current state of PostgreSQL, and explore its features which made it a natural fit for the Database System backing Mathesar.', 8, 3);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (30, 'Data Engineering and Mathesar', 3, 1, 6, 'In this talk, we take a look at data tools such as Apache Spark, and how you can integrate their use with the Mathesar UI.', 7, 3);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (31, 'Data Science and Mathesar', 3, 1, 4, 'In this talk, we will review some basics of data science, including key concepts. You will learn how these concepts can be implemented and used when working with Mathesar.', 1, 3);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (4, 'Exploring Data Visualization: Techniques and Tools', 1, 1, 9, 'In this talk, you will learn about different techniques and tools that you can use to create effective data visualizations. You will learn about different types of charts and graphs, and how to choose the right visualization for your data. You will also learn about tools like D3.js and Tableau, and how to use them to create interactive and engaging visualizations.', 7, 4);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (29, 'Building Modern Web Applications with Svelte.js', 2, 1, 7, 'In this talk, you will learn about Svelte.js, a modern JavaScript framework for building web applications. You will learn about the principles and philosophy behind Svelte, and how it differs from other frameworks. You will also learn about the core concepts and features of Svelte, and how to use them to build efficient and reactive applications.', 1, 4);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (18, 'Advanced Svelte.js Techniques: Animations, Server-Side Rendering, and More', 2, 2, 3, 'In this talk, you will learn about advanced techniques for using Svelte.js, such as animations, server-side rendering, and performance optimization. You will learn about different tools and libraries that you can use to extend the capabilities of Svelte, and how to apply these techniques in real-world projects. You will also learn about some of the trade-offs and considerations when using advanced Svelte techniques.', 7, 4);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (19, 'Integrating Svelte.js with Other Technologies', 2, 2, 9, 'In this talk, you will learn about how to integrate Svelte.js with other technologies such as APIs, databases, and front-end libraries. You will learn about different techniques and tools for connecting Svelte to external data sources and services, and how to build full-stack applications with Svelte. You will also learn about some of the considerations and challenges when integrating Svelte with other technologies.', 8, 4);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (33, 'Svelte.js Best Practices: Tips and Tricks', 3, 3, 7, 'In this talk, you will learn about best practices and tips and tricks for using Svelte.js. You will learn about techniques such as code organization, testing, and performance optimization, and how to apply them in your Svelte projects. You will also learn about some of the common pitfalls and mistakes to avoid when using Svelte.', 7, 4);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (16, 'Django and its use in Mathesar', 2, 1, 6, 'In this talk we will explore Django, how it''s used in Mathesar, and the pros/cons of the tool when solving our problems.', 7, 5);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (6, 'No-Code Data Analysis: Tools and Techniques', 1, 3, 2, 'In this talk, you will learn about different tools and techniques that you can use to perform data analysis without writing any code. You will learn about platforms like Excel, Google Sheets, and Mathesar, and how to use them to manipulate, analyze, and visualize data. You will also learn about some of the benefits and limitations of using no-code data analysis tools, and how to choose the right one for your needs.', 7, NULL);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (7, 'Integrating with No-Code tools', 1, 3, 8, 'In this talk, you will learn about different no-code tools, and how to integrate with them in the context of a Mathesar project.', 8, NULL);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (20, 'Designing for Data', 2, 3, 2, 'In this talk we discuss principles, approaches, and some challenges associated with designing a product for data input and analysis.', 7, NULL);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (1, 'The Mathesar Vision', 1, 1, 5, 'In this introduction and welcome, we discuss the vision of Mathesar, and why you should be excited to attend our exclusive conference.', 1, 6);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (21, 'Managing Engineers: a metaphorical approach', 2, 3, 5, 'When your cats are on a hot tin roof, should you herd them, skin them, or let them out of the bag? The roof is a deadline. The cats are engineers.', 8, 6);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (23, 'Retail Success with Mathesar: Boosting Sales and Enhancing the Customer Experience
-', 2, 4, 18, 'This talk will cover how businesses in the retail industry have used Mathesar to boost sales and improve customer experience, including how it has helped with data-driven decision-making, inventory management, and customer segmentation', 8, 1);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (32, 'Building APIs with Django Rest Framework', 3, 2, 1, 'In this talk, you will learn about how to use Django Rest Framework (DRF), a powerful Django extension for building APIs. You will learn about the features and architecture of DRF, and how to use it to build RESTful APIs for your Django projects. You will also learn about some of the best practices and tools for testing and documenting your APIs.', 7, 5);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (3, 'Optimizing Web Performance: Techniques and Tools', 1, 1, 3, 'In this talk, you will learn about different techniques and tools that you can use to optimize the performance of your web applications. You will learn about techniques such as code optimization, caching, and load balancing, as well as tools like performance monitoring and profiling.', 8, 4);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (15, 'The Mathesar Vision, part 2', 3, 1, 5, 'In this final talk of the last day, we look at how we think Mathesar will evolve over the coming months and years, and hope to inspire you with our direction!', 8, 6);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (9, 'Integrating Mathesar with other tools and platforms', 1, 4, 14, 'Discover how to use Mathesar in conjunction with other tools and platforms, including how to import and export data and use APIs to connect to other systems.
-', 8, 5);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (14, 'Taking Control of Your Finances with Mathesar', 1, 4, 19, 'I''ll be sharing my personal experience of how I used Mathesar to take control of my finances. I''ll show you how I use Mathesar to track my income and expenses, create custom reports and visualizations, and set financial goals. I''ll also show you how I use data models and custom queries to identify areas for improvement and make informed decisions about spending. I''ll share tips and tricks on how I use Mathesar to manage multiple income streams and expenses and how to budget and plan for financial goals like saving for retirement or buying a house. ', 9, 6);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (10, 'Mathesar for project management: Best practices', 1, 5, 16, 'This talk will explore how Mathesar can be used to manage projects, including how to set up custom explorations, track progress, and collaborate with team members.
-', 8, 1);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (39, 'Getting Started with Mathesar Server Administration', 3, 5, 20, 'In this talk, a Mathesar administrator will provide an overview of the process of installing and configuring a Mathesar server. Topics covered will include system requirements, installation options, initial setup, and best practices for maintaining and troubleshooting a Mathesar server. Attendees will learn how to set up a Mathesar server from scratch and will be prepared to address common issues and troubleshoot problems.', 8, 1);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (35, 'Building data models with Mathesar: A step-by-step guide', 3, 3, 5, 'Learn how to build complex data models using Mathesar, including how to define relationships between data, set up calculated fields, and build reports.', 1, 3);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (26, 'Opening Data to the Public: How City Government used Mathesar to increase transparency and citizen engagement', 2, 3, 25, 'In this talk, a representative from a city government will share how their organization has used Mathesar to increase transparency and citizen engagement by sharing data publicly. They will discuss how they used Mathesar to create an open data portal, making public data sets such as crime statistics, real estate transactions and public transportation schedules available to citizens. They will also share specific examples of how this data has been used by residents, researchers, and developers to improve the city and generate positive outcomes, such as reducing crime and improving public transportation.
-', 9, 6);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (22, 'Maximizing the Potential of Mathesar in Healthcare: Real-world Examples', 2, 4, 22, 'In this talk, we will present case studies on how businesses in the healthcare industry have used Mathesar to improve patient outcomes and streamline operations, including how it has helped with data management, analysis, and reporting.', 7, 1);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (36, 'Achieving Data-Driven Decision Making with Mathesar: My Experience', 3, 4, 19, 'Collin a business analyst at Becker Group, will share his experience using Mathesar to achieve data-driven decision making in their organization. He will discuss how he set up data models, organized data, performed analysis and how he was able to use insights to drive action and achieve the company''s goals.', 7, 3);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (25, 'Unlocking the Power of Data for Education: Our Experience at Education for All', 2, 5, 24, 'In this talk, an employee from Learning Equality, a nonprofit organization focused on improving access to education, will share how their organization has used Mathesar to unlock the power of data and drive progress towards their mission. They will discuss how Mathesar helped them to manage and analyze data on student performance, resources, and demographics, and how it enabled them to track progress, identify areas for improvement, and make data-driven decisions to support student success. They will provide specific examples of how Mathesar has been used to support their mission and the positive outcomes that have been achieved.', 1, 1);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (40, 'Investigating with Mathesar: How data journalists used Mathesar to analyze public data sets to uncover stories', 3, 4, 21, 'In this talk, data journalists will share how they used Mathesar to analyze public data sets to uncover stories and investigate important issues. They will discuss specific examples of how they used Mathesar to analyze data sets such as government spending, campaign contributions and crime statistics to uncover patterns and trends. They will also share specific examples of how the data was used to inform their reporting, and lead to stories that would have been otherwise hard to find or would have remained hidden. Attendees will learn how to use Mathesar to analyze and make sense of large, complex data sets to uncover important stories and investigate important issues.
-', 8, 3);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (8, 'Advanced data analysis with Mathesar: grouping, filters, and more', 1, 4, 16, 'Learn how to use Mathesar''s advanced data analysis features, including grouping, filters, and summarization, to uncover insights and trends in your data.', 7, 1);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (11, 'Migrating to Mathesar: Tips and considerations', 1, 5, 15, 'If you''re planning to switch to Mathesar from another database tool, this talk will cover best practices for migration, including how to transfer data, set up new models, and onboard users.', 9, 3);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (12, 'Advanced Mathesar Server Configuration and Management', 1, 2, 20, 'This talk will cover advanced topics for configuring and managing a Mathesar server, including performance tuning, security, and backup and recovery. It will also show how to access and use Mathesar''s API and command-line tools to automate and manage your Mathesar server. Attendees will learn how to optimize the performance of their Mathesar server, secure their data, and ensure that they can recover their data in the event of an emergency.', 9, 1);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (13, 'Organizing your Home Media with Mathesar: Creating Custom Data Models and Relationships
-', 1, 5, 14, 'In this talk, an experienced Mathesar user will share how they have used Mathesar to manage their home media collection, including movies, TV shows, and music. They will discuss how they used Mathesar to create custom data models and set up relationships between different media types, and demonstrate how to use Mathesar''s querying and reporting capabilities to easily find and organize media. They will also show how they used the data modeling and relationship features of Mathesar to create a collection of movie and TV series metadata, connected to their local media files. The talk will provide tips and tricks on how to organize and create data models that fit your media collection. Attendees will learn how to use Mathesar to organize their home media collections and unlock new ways to explore and enjoy their media.', 1, 3);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (27, 'Optimizing MMORPG Play with Mathesar: Tips and Tricks for Gamers', 2, 4, 17, 'In this talk, a dedicated MMORPG player will share how they use Mathesar to optimize their gameplay and gain a competitive edge. They will demonstrate how they use Mathesar to track and analyze their character''s statistics, inventory, and quest progress. They will also show how they use Mathesar to create custom reports and visualizations to monitor their performance, identify areas for improvement and plan strategies for their next steps in the game. Additionally, they will share how they use Mathesar to track and manage their guild''s resources and member''s information. They will provide tips and tricks on how to use Mathesar to make the most of your MMORPG experience, from character development to group management and from resource tracking to performance monitoring.', 9, NULL);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (28, 'Rapid App Prototyping with Mathesar: From Idea to MVP in No-Time', 2, 5, 26, 'I''ll be sharing my experience of how I used Mathesar to quickly prototype a new app idea without writing any code. I''ll show you how I used Mathesar''s data modeling and querying capabilities to create a functional prototype of the app, complete with a dynamic and interactive user interface. I''ll also discuss how I approached validating my prototype with potential users. ', 7, 5);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (41, 'Streamlining Grocery Planning and Recipe Tracking with Mathesar: A Mom''s Perspective', 3, 3, 22, 'A busy mom will share how she uses Mathesar to streamline her grocery planning and recipe tracking. She will demonstrate how she uses Mathesar to keep track of her family''s dietary restrictions, create shopping lists, and plan meals for the week. She will also show how she uses Mathesar to organize her recipes by categories, ingredients and dietary restrictions and how she uses it to plan and schedule her cooking routine, using the data provided by the data models and custom queries. She will also share how she uses Mathesar to track ingredients inventory and monitor expiration dates. ', 9, 6);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (37, 'Transforming Manufacturing with Mathesar: Using Predictive Analytics to Improve Productivity', 3, 4, 16, 'Daniel, the production manager at Harper Automotive, will share how his factory has been using Mathesar to increase productivity in an unusual way. He will discuss how they have been using predictive analytics to predict equipment failures and prevent downtime. By using Mathesar to analyze data from their machinery and monitoring systems, they were able to detect patterns indicating that equipment was likely to fail, and then schedule maintenance before it happened. As a result, they were able to reduce unplanned downtime and increase overall equipment availability, which led to a significant increase in productivity. Daniel will also share tips on how other factories, particularly in the automotive industry, can use Mathesar to implement similar predictive maintenance strategies and gain similar benefits.', 9, 1);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (24, 'Streamlining Emergency Response with Mathesar: Our Experience at Disaster Relief Fund', 2, 5, 22, 'In this talk, a representative from Disaster Relief Fund, a nonprofit organization focused on providing emergency response, will share their experience using Mathesar to increase efficiency and effectiveness in emergency response. They will discuss how Mathesar helped their organization to manage and analyze data on resources, logistics, and needs, and how it enabled them to make data-driven decisions to drive progress towards their mission of providing aid to affected communities. They will provide specific examples of how Mathesar has been utilized in emergency response operations and the positive outcomes it has helped achieve.', 9, 1);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (34, 'Collaborating with Mathesar: Tips and best practices', 3, 2, 11, 'This talk will cover best practices for collaborating with colleagues using Mathesar, including tips for organizing data, sharing explorations, and working together in real-time.', 8, 1);
-INSERT INTO "Talks" (id, "Title", "Day", "Room", "Speaker", "Abstract", "Time Slot", "Track") VALUES (38, 'Mastering Mathesar: Tips and Tricks for Setting Up and Configuring Your Database', 3, 5, 17, 'In this talk, an experienced Mathesar user will share tips and tricks for setting up and configuring a Mathesar database. They will cover topics such as data modeling, data entry, and query optimization, as well as best practices for creating effective reports and visualizations. Attendees will learn how to quickly and efficiently set up a Mathesar installation and start using it to gain insights from their data.', 7, 3);
-
-
---
--- Data for Name: Time Slots; Type: TABLE DATA; Schema: Mathesar Con; Owner: -
---
-
-INSERT INTO "Time Slots" (id, "Slot") VALUES (1, '08:00-10:00');
-INSERT INTO "Time Slots" (id, "Slot") VALUES (7, '13:00-15:00');
-INSERT INTO "Time Slots" (id, "Slot") VALUES (8, '15:30-17:30');
-INSERT INTO "Time Slots" (id, "Slot") VALUES (9, '10:30-12:30');
-
-
---
--- Data for Name: Topics; Type: TABLE DATA; Schema: Mathesar Con; Owner: -
---
-
-INSERT INTO "Topics" (id, "Name") VALUES (1, 'Python');
-INSERT INTO "Topics" (id, "Name") VALUES (2, 'SQL');
-INSERT INTO "Topics" (id, "Name") VALUES (3, 'Back End');
-INSERT INTO "Topics" (id, "Name") VALUES (4, 'Front End');
-INSERT INTO "Topics" (id, "Name") VALUES (5, 'Javascript');
-INSERT INTO "Topics" (id, "Name") VALUES (6, 'Design');
-INSERT INTO "Topics" (id, "Name") VALUES (7, 'Product');
-INSERT INTO "Topics" (id, "Name") VALUES (8, 'Management');
-INSERT INTO "Topics" (id, "Name") VALUES (9, 'Database');
-
-
---
--- Data for Name: Tracks; Type: TABLE DATA; Schema: Mathesar Con; Owner: -
---
-
-INSERT INTO "Tracks" (id, "Name") VALUES (3, 'Databases');
-INSERT INTO "Tracks" (id, "Name") VALUES (4, 'Front End');
-INSERT INTO "Tracks" (id, "Name") VALUES (5, 'Web Service');
-INSERT INTO "Tracks" (id, "Name") VALUES (1, 'Project Management');
-INSERT INTO "Tracks" (id, "Name") VALUES (6, 'Management');
-
-
---
--- Name: Positions_id_seq; Type: SEQUENCE SET; Schema: Mathesar Con; Owner: -
---
-
-SELECT pg_catalog.setval('"Positions_id_seq"', 13, true);
-
-
---
--- Name: Table 115_id_seq; Type: SEQUENCE SET; Schema: Mathesar Con; Owner: -
---
-
-SELECT pg_catalog.setval('"Table 115_id_seq"', 26, true);
-
-
---
--- Name: Table 117_id_seq; Type: SEQUENCE SET; Schema: Mathesar Con; Owner: -
---
-
-SELECT pg_catalog.setval('"Table 117_id_seq"', 5, true);
-
-
---
--- Name: Table 118_id_seq; Type: SEQUENCE SET; Schema: Mathesar Con; Owner: -
---
-
-SELECT pg_catalog.setval('"Table 118_id_seq"', 9, true);
-
-
---
--- Name: Table 119_id_seq; Type: SEQUENCE SET; Schema: Mathesar Con; Owner: -
---
-
-SELECT pg_catalog.setval('"Table 119_id_seq"', 3, true);
-
-
---
--- Name: Table 120_id_seq; Type: SEQUENCE SET; Schema: Mathesar Con; Owner: -
---
-
-SELECT pg_catalog.setval('"Table 120_id_seq"', 43, true);
-
-
---
--- Name: Table 67_id_seq; Type: SEQUENCE SET; Schema: Mathesar Con; Owner: -
---
-
-SELECT pg_catalog.setval('"Table 67_id_seq"', 12, true);
-
-
---
--- Name: Talk Topic Map_id_seq; Type: SEQUENCE SET; Schema: Mathesar Con; Owner: -
---
-
-SELECT pg_catalog.setval('"Talk Topic Map_id_seq"', 75, true);
-
-
---
--- Name: Time Slots_id_seq; Type: SEQUENCE SET; Schema: Mathesar Con; Owner: -
---
-
-SELECT pg_catalog.setval('"Time Slots_id_seq"', 9, true);
-
-
---
--- Name: Tracks_id_seq; Type: SEQUENCE SET; Schema: Mathesar Con; Owner: -
---
-
-SELECT pg_catalog.setval('"Tracks_id_seq"', 6, true);
-
-
---
--- Name: Job Titles Positions_pkey; Type: CONSTRAINT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Job Titles"
-    ADD CONSTRAINT "Positions_pkey" PRIMARY KEY (id);
-
-
---
--- Name: Speakers Presenters_Email_key; Type: CONSTRAINT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Speakers"
-    ADD CONSTRAINT "Presenters_Email_key" UNIQUE ("Email");
-
-
---
--- Name: Rooms Rooms_Name_key; Type: CONSTRAINT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Rooms"
-    ADD CONSTRAINT "Rooms_Name_key" UNIQUE ("Name");
-
-
---
--- Name: Speakers Table 115_pkey; Type: CONSTRAINT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Speakers"
-    ADD CONSTRAINT "Table 115_pkey" PRIMARY KEY (id);
-
-
---
--- Name: Rooms Table 117_pkey; Type: CONSTRAINT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Rooms"
-    ADD CONSTRAINT "Table 117_pkey" PRIMARY KEY (id);
-
-
---
--- Name: Topics Table 118_pkey; Type: CONSTRAINT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Topics"
-    ADD CONSTRAINT "Table 118_pkey" PRIMARY KEY (id);
-
-
---
--- Name: Days Table 119_pkey; Type: CONSTRAINT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Days"
-    ADD CONSTRAINT "Table 119_pkey" PRIMARY KEY (id);
-
-
---
--- Name: Talks Table 120_pkey; Type: CONSTRAINT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Talks"
-    ADD CONSTRAINT "Table 120_pkey" PRIMARY KEY (id);
-
-
---
--- Name: Organizations Table 67_pkey; Type: CONSTRAINT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Organizations"
-    ADD CONSTRAINT "Table 67_pkey" PRIMARY KEY (id);
-
-
---
--- Name: Talk Topic Map Talk Topic Map_Talk_key; Type: CONSTRAINT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Talk Topic Map"
-    ADD CONSTRAINT "Talk Topic Map_Talk_key" UNIQUE ("Talk", "Topic");
-
-
---
--- Name: Talk Topic Map Talk Topic Map_id_pkey; Type: CONSTRAINT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Talk Topic Map"
-    ADD CONSTRAINT "Talk Topic Map_id_pkey" PRIMARY KEY (id);
-
-
---
--- Name: Time Slots Time Slots_Time_key; Type: CONSTRAINT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Time Slots"
-    ADD CONSTRAINT "Time Slots_Time_key" UNIQUE ("Slot");
-
-
---
--- Name: Time Slots Time Slots_pkey; Type: CONSTRAINT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Time Slots"
-    ADD CONSTRAINT "Time Slots_pkey" PRIMARY KEY (id);
-
-
---
--- Name: Tracks Tracks_pkey; Type: CONSTRAINT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Tracks"
-    ADD CONSTRAINT "Tracks_pkey" PRIMARY KEY (id);
-
-
---
--- Name: Speakers Presenters_Organization_fkey; Type: FK CONSTRAINT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Speakers"
-    ADD CONSTRAINT "Presenters_Organization_fkey" FOREIGN KEY ("Organization") REFERENCES "Organizations"(id);
-
-
---
--- Name: Speakers Presenters_mathesar_temp_Position_fkey; Type: FK CONSTRAINT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Speakers"
-    ADD CONSTRAINT "Presenters_mathesar_temp_Position_fkey" FOREIGN KEY ("Job Title") REFERENCES "Job Titles"(id);
-
-
---
--- Name: Talk Topic Map Talk Topic Map_Talk_fkey; Type: FK CONSTRAINT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Talk Topic Map"
-    ADD CONSTRAINT "Talk Topic Map_Talk_fkey" FOREIGN KEY ("Talk") REFERENCES "Talks"(id);
-
-
---
--- Name: Talk Topic Map Talk Topic Map_Topic_fkey; Type: FK CONSTRAINT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Talk Topic Map"
-    ADD CONSTRAINT "Talk Topic Map_Topic_fkey" FOREIGN KEY ("Topic") REFERENCES "Topics"(id);
-
-
---
--- Name: Talks Talks_Day_fkey; Type: FK CONSTRAINT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Talks"
-    ADD CONSTRAINT "Talks_Day_fkey" FOREIGN KEY ("Day") REFERENCES "Days"(id);
-
-
---
--- Name: Talks Talks_Presenter_fkey; Type: FK CONSTRAINT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Talks"
-    ADD CONSTRAINT "Talks_Presenter_fkey" FOREIGN KEY ("Speaker") REFERENCES "Speakers"(id);
-
-
---
--- Name: Talks Talks_Room_fkey; Type: FK CONSTRAINT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Talks"
-    ADD CONSTRAINT "Talks_Room_fkey" FOREIGN KEY ("Room") REFERENCES "Rooms"(id);
-
-
---
--- Name: Talks Talks_Time Slot_fkey; Type: FK CONSTRAINT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Talks"
-    ADD CONSTRAINT "Talks_Time Slot_fkey" FOREIGN KEY ("Time Slot") REFERENCES "Time Slots"(id);
-
-
---
--- Name: Talks Talks_mathesar_temp_Track_fkey; Type: FK CONSTRAINT; Schema: Mathesar Con; Owner: -
---
-
-ALTER TABLE ONLY "Talks"
-    ADD CONSTRAINT "Talks_mathesar_temp_Track_fkey" FOREIGN KEY ("Track") REFERENCES "Tracks"(id);
-
-
---
--- PostgreSQL database dump complete
---
-
diff --git a/demo/templates/demo/analytics.html b/demo/templates/demo/analytics.html
deleted file mode 100644
index 1532f284e9..0000000000
--- a/demo/templates/demo/analytics.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<script async defer src="https://sa.mathesar.org/latest.js"></script>
-<script>
-    window.addEventListener("userAction", (e) => sa_event(e.detail.eventName, e.detail.metadata));
-</script>
-    <noscript>
-      <img
-        src="https://sa.mathesar.org/noscript.gif"
-        alt=""
-        referrerpolicy="no-referrer-when-downgrade"
-      />
-    </noscript>
\ No newline at end of file
diff --git a/mathesar/examples/base.py b/mathesar/examples/base.py
new file mode 100644
index 0000000000..a29da66f3c
--- /dev/null
+++ b/mathesar/examples/base.py
@@ -0,0 +1,14 @@
+"""Constants for use by the example dataset loaders."""
+import os
+
+FILE_DIR = os.path.abspath(os.path.dirname(__file__))
+RESOURCES = os.path.join(FILE_DIR, "resources")
+LIBRARY_ONE = os.path.join(RESOURCES, "library_without_checkouts.sql")
+LIBRARY_TWO = os.path.join(RESOURCES, "library_add_checkouts.sql")
+DEVCON_DATASET = os.path.join(RESOURCES, "devcon_dataset.sql")
+MOVIES_SQL_TABLES = os.path.join(RESOURCES, "movie_collection_tables.sql")
+MOVIES_SQL_FKS = os.path.join(RESOURCES, "movie_collection_fks.sql")
+MOVIES_CSV = os.path.join(RESOURCES, 'movies_csv')
+LIBRARY_MANAGEMENT = 'Library Management'
+MOVIE_COLLECTION = 'Movie Collection'
+MATHESAR_CON = 'Mathesar Con'
diff --git a/demo/install/library_dataset.py b/mathesar/examples/library_dataset.py
similarity index 93%
rename from demo/install/library_dataset.py
rename to mathesar/examples/library_dataset.py
index 14c1f39b32..1c04a52907 100644
--- a/demo/install/library_dataset.py
+++ b/mathesar/examples/library_dataset.py
@@ -1,7 +1,7 @@
 """This module contains functions to load the Library Management dataset."""
 
 from sqlalchemy import text
-from demo.install.base import LIBRARY_MANAGEMENT, LIBRARY_ONE, LIBRARY_TWO
+from mathesar.examples.base import LIBRARY_MANAGEMENT, LIBRARY_ONE, LIBRARY_TWO
 
 
 def load_library_dataset(engine, safe_mode=False):
diff --git a/demo/install/movies_dataset.py b/mathesar/examples/movies_dataset.py
similarity index 91%
rename from demo/install/movies_dataset.py
rename to mathesar/examples/movies_dataset.py
index b45c1dbeaa..bc87686831 100644
--- a/demo/install/movies_dataset.py
+++ b/mathesar/examples/movies_dataset.py
@@ -2,7 +2,9 @@
 import os
 from sqlalchemy import text
 
-from demo.install.base import MOVIE_COLLECTION, MOVIES_SQL_TABLES, MOVIES_CSV, MOVIES_SQL_FKS
+from mathesar.examples.base import (
+    MOVIE_COLLECTION, MOVIES_SQL_TABLES, MOVIES_CSV, MOVIES_SQL_FKS
+)
 
 
 def load_movies_dataset(engine, safe_mode=False):
diff --git a/demo/install/resources/library_add_checkouts.sql b/mathesar/examples/resources/library_add_checkouts.sql
similarity index 100%
rename from demo/install/resources/library_add_checkouts.sql
rename to mathesar/examples/resources/library_add_checkouts.sql
diff --git a/demo/install/resources/library_without_checkouts.sql b/mathesar/examples/resources/library_without_checkouts.sql
similarity index 100%
rename from demo/install/resources/library_without_checkouts.sql
rename to mathesar/examples/resources/library_without_checkouts.sql
diff --git a/demo/install/resources/movie_collection_fks.sql b/mathesar/examples/resources/movie_collection_fks.sql
similarity index 100%
rename from demo/install/resources/movie_collection_fks.sql
rename to mathesar/examples/resources/movie_collection_fks.sql
diff --git a/demo/install/resources/movie_collection_tables.sql b/mathesar/examples/resources/movie_collection_tables.sql
similarity index 100%
rename from demo/install/resources/movie_collection_tables.sql
rename to mathesar/examples/resources/movie_collection_tables.sql
diff --git a/demo/install/resources/movies_csv/Departments.csv b/mathesar/examples/resources/movies_csv/Departments.csv
similarity index 100%
rename from demo/install/resources/movies_csv/Departments.csv
rename to mathesar/examples/resources/movies_csv/Departments.csv
diff --git a/demo/install/resources/movies_csv/Genres.csv b/mathesar/examples/resources/movies_csv/Genres.csv
similarity index 100%
rename from demo/install/resources/movies_csv/Genres.csv
rename to mathesar/examples/resources/movies_csv/Genres.csv
diff --git a/demo/install/resources/movies_csv/Jobs.csv b/mathesar/examples/resources/movies_csv/Jobs.csv
similarity index 100%
rename from demo/install/resources/movies_csv/Jobs.csv
rename to mathesar/examples/resources/movies_csv/Jobs.csv
diff --git a/demo/install/resources/movies_csv/Movie Cast Map.csv b/mathesar/examples/resources/movies_csv/Movie Cast Map.csv
similarity index 100%
rename from demo/install/resources/movies_csv/Movie Cast Map.csv
rename to mathesar/examples/resources/movies_csv/Movie Cast Map.csv
diff --git a/demo/install/resources/movies_csv/Movie Crew Map.csv b/mathesar/examples/resources/movies_csv/Movie Crew Map.csv
similarity index 100%
rename from demo/install/resources/movies_csv/Movie Crew Map.csv
rename to mathesar/examples/resources/movies_csv/Movie Crew Map.csv
diff --git a/demo/install/resources/movies_csv/Movie Genre Map.csv b/mathesar/examples/resources/movies_csv/Movie Genre Map.csv
similarity index 100%
rename from demo/install/resources/movies_csv/Movie Genre Map.csv
rename to mathesar/examples/resources/movies_csv/Movie Genre Map.csv
diff --git a/demo/install/resources/movies_csv/Movie Production Company Map.csv b/mathesar/examples/resources/movies_csv/Movie Production Company Map.csv
similarity index 100%
rename from demo/install/resources/movies_csv/Movie Production Company Map.csv
rename to mathesar/examples/resources/movies_csv/Movie Production Company Map.csv
diff --git a/demo/install/resources/movies_csv/Movie Production Country Map.csv b/mathesar/examples/resources/movies_csv/Movie Production Country Map.csv
similarity index 100%
rename from demo/install/resources/movies_csv/Movie Production Country Map.csv
rename to mathesar/examples/resources/movies_csv/Movie Production Country Map.csv
diff --git a/demo/install/resources/movies_csv/Movie Spoken Language Map.csv b/mathesar/examples/resources/movies_csv/Movie Spoken Language Map.csv
similarity index 100%
rename from demo/install/resources/movies_csv/Movie Spoken Language Map.csv
rename to mathesar/examples/resources/movies_csv/Movie Spoken Language Map.csv
diff --git a/demo/install/resources/movies_csv/Movies.csv b/mathesar/examples/resources/movies_csv/Movies.csv
similarity index 100%
rename from demo/install/resources/movies_csv/Movies.csv
rename to mathesar/examples/resources/movies_csv/Movies.csv
diff --git a/demo/install/resources/movies_csv/People.csv b/mathesar/examples/resources/movies_csv/People.csv
similarity index 100%
rename from demo/install/resources/movies_csv/People.csv
rename to mathesar/examples/resources/movies_csv/People.csv
diff --git a/demo/install/resources/movies_csv/Production Companies.csv b/mathesar/examples/resources/movies_csv/Production Companies.csv
similarity index 100%
rename from demo/install/resources/movies_csv/Production Companies.csv
rename to mathesar/examples/resources/movies_csv/Production Companies.csv
diff --git a/demo/install/resources/movies_csv/Production Countries.csv b/mathesar/examples/resources/movies_csv/Production Countries.csv
similarity index 100%
rename from demo/install/resources/movies_csv/Production Countries.csv
rename to mathesar/examples/resources/movies_csv/Production Countries.csv
diff --git a/demo/install/resources/movies_csv/Spoken Languages.csv b/mathesar/examples/resources/movies_csv/Spoken Languages.csv
similarity index 100%
rename from demo/install/resources/movies_csv/Spoken Languages.csv
rename to mathesar/examples/resources/movies_csv/Spoken Languages.csv
diff --git a/demo/install/resources/movies_csv/Sub-Collections.csv b/mathesar/examples/resources/movies_csv/Sub-Collections.csv
similarity index 100%
rename from demo/install/resources/movies_csv/Sub-Collections.csv
rename to mathesar/examples/resources/movies_csv/Sub-Collections.csv
diff --git a/mathesar/utils/connections.py b/mathesar/utils/connections.py
index b13dde9387..507d95afc7 100644
--- a/mathesar/utils/connections.py
+++ b/mathesar/utils/connections.py
@@ -4,8 +4,8 @@
 from mathesar.models.base import Database
 from db import install, connection as dbconn
 from mathesar.state import reset_reflection
-from demo.install.library_dataset import load_library_dataset
-from demo.install.movies_dataset import load_movies_dataset
+from mathesar.examples.library_dataset import load_library_dataset
+from mathesar.examples.movies_dataset import load_movies_dataset
 
 
 class BadInstallationTarget(Exception):

From ca5ca5fbc3c10b75d76c4645c46021c784a4674a Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 15 Apr 2024 08:19:22 -0400
Subject: [PATCH 0079/1141] Remove front end code for live demo

---
 .../src/components/LiveDemoBanner.svelte      | 61 -------------------
 mathesar_ui/src/i18n/languages/en/dict.json   |  2 -
 mathesar_ui/src/i18n/languages/ja/dict.json   |  2 -
 mathesar_ui/src/icons/index.ts                |  2 -
 .../src/layouts/LayoutWithHeader.svelte       |  2 -
 mathesar_ui/src/utils/preloadData.ts          |  1 -
 6 files changed, 70 deletions(-)
 delete mode 100644 mathesar_ui/src/components/LiveDemoBanner.svelte

diff --git a/mathesar_ui/src/components/LiveDemoBanner.svelte b/mathesar_ui/src/components/LiveDemoBanner.svelte
deleted file mode 100644
index 1449dba815..0000000000
--- a/mathesar_ui/src/components/LiveDemoBanner.svelte
+++ /dev/null
@@ -1,61 +0,0 @@
-<script lang="ts">
-  import { _ } from 'svelte-i18n';
-  import { Help, Icon } from '@mathesar-component-library';
-  import { iconJoinEmailList, iconGoToMarketingSite } from '@mathesar/icons';
-  import { preloadCommonData } from '@mathesar/utils/preloadData';
-
-  const commonData = preloadCommonData();
-
-  $: liveDemo = !!commonData.live_demo_mode;
-</script>
-
-{#if liveDemo}
-  <div class="demo-banner">
-    <div class="side left">
-      <i>{$_('mathesar_demo_mode')}</i>
-      <Help>
-        {$_('mathesar_demo_mode_help')}
-      </Help>
-    </div>
-    <div class="side right">
-      <a href="https://mathesar.org/mailing-list.html" target="_blank">
-        <Icon {...iconJoinEmailList} />
-        {$_('join_email_list')}
-      </a>
-      <a href="http://mathesar.org" target="_blank">
-        <Icon {...iconGoToMarketingSite} />
-        Mathesar.org
-      </a>
-    </div>
-  </div>
-{/if}
-
-<style>
-  .demo-banner {
-    padding: 0 0.5rem;
-    color: var(--yellow-200);
-    /**
-     * TODO: Have a separate variable for this color
-     * Needs to come from Figma designs
-     */
-    background: #2d2508;
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-  }
-  .side {
-    margin: 0.5rem;
-  }
-  .right {
-    flex: 1 0 auto;
-    display: flex;
-    justify-content: flex-end;
-  }
-  a {
-    color: inherit;
-    text-decoration: none;
-  }
-  a + a {
-    margin-left: 1rem;
-  }
-</style>
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index b2c971b000..c2edf16583 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -291,8 +291,6 @@
   "many_to_one": "Many to One",
   "many_to_one_link_description": "Multiple [baseTable] records can link to the same [targetTable] record.",
   "mathesar": "Mathesar",
-  "mathesar_demo_mode": "Mathesar is in demo mode.",
-  "mathesar_demo_mode_help": "Each session has its own copy of demo data. Data will be deleted regularly.",
   "max_time_unit": "Max Time Unit",
   "milliseconds": "Milliseconds",
   "min_time_unit": "Min Time Unit",
diff --git a/mathesar_ui/src/i18n/languages/ja/dict.json b/mathesar_ui/src/i18n/languages/ja/dict.json
index ae36008f7e..74f499c883 100644
--- a/mathesar_ui/src/i18n/languages/ja/dict.json
+++ b/mathesar_ui/src/i18n/languages/ja/dict.json
@@ -291,8 +291,6 @@
   "many_to_one": "多対1",
   "many_to_one_link_description": "複数の[baseTable]の記録は同じ[targetTable]の記録にリンクすることができます。",
   "mathesar": "Mathesar",
-  "mathesar_demo_mode": "Mathesarはデモモードです。",
-  "mathesar_demo_mode_help": "各セッションには独自のデモデータのコピーがあります。データは定期的に削除されます。",
   "max_time_unit": "最大時間単位",
   "milliseconds": "ミリ秒",
   "min_time_unit": "最小時間単位",
diff --git a/mathesar_ui/src/icons/index.ts b/mathesar_ui/src/icons/index.ts
index da99f3d164..95e3a4de4f 100644
--- a/mathesar_ui/src/icons/index.ts
+++ b/mathesar_ui/src/icons/index.ts
@@ -112,10 +112,8 @@ export const iconDeleteMinor: IconProps = { data: faTimes };
 export const iconEdit: IconProps = { data: faPencilAlt };
 export const iconEditUser: IconProps = { data: faUserEdit };
 export const iconExpandRight: IconProps = { data: faChevronRight };
-export const iconGoToMarketingSite: IconProps = { data: faGlobe };
 export const iconImportData: IconProps = { data: faUpload };
 export const iconInferColumnType: IconProps = { data: faMicroscope };
-export const iconJoinEmailList: IconProps = { data: faEnvelope };
 export const iconMoreActions: IconProps = { data: faEllipsisV };
 export const iconMoveColumnsToNewLinkedTable = { data: faLink };
 export const iconMoveColumnsToExistingLinkedTable = { data: faLink };
diff --git a/mathesar_ui/src/layouts/LayoutWithHeader.svelte b/mathesar_ui/src/layouts/LayoutWithHeader.svelte
index d856ccf057..ea177b7701 100644
--- a/mathesar_ui/src/layouts/LayoutWithHeader.svelte
+++ b/mathesar_ui/src/layouts/LayoutWithHeader.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { makeStyleStringFromCssVariables } from '@mathesar-component-library';
   import AppHeader from '@mathesar/components/AppHeader.svelte';
-  import LiveDemoBanner from '@mathesar/components/LiveDemoBanner.svelte';
 
   export let fitViewport = false;
   export let restrictWidth = false;
@@ -14,7 +13,6 @@
 
 <div class="app-layout" class:fit-viewport={fitViewport} {style}>
   <div class="app-layout-header">
-    <LiveDemoBanner />
     <AppHeader />
   </div>
   <slot name="secondary-header" />
diff --git a/mathesar_ui/src/utils/preloadData.ts b/mathesar_ui/src/utils/preloadData.ts
index 4a628e6954..bbe3cecbce 100644
--- a/mathesar_ui/src/utils/preloadData.ts
+++ b/mathesar_ui/src/utils/preloadData.ts
@@ -20,7 +20,6 @@ export interface CommonData {
   current_schema: number | null;
   abstract_types: AbstractTypeResponse[];
   user: User;
-  live_demo_mode: boolean;
   current_release_tag_name: string;
   supported_languages: Record<string, string>;
   is_authenticated: boolean;

From d6ed011212ddc6cf712d19e876ea185c1d401fe6 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 8 Apr 2024 12:20:44 -0400
Subject: [PATCH 0080/1141] Move all frontend API code into "rest" subdir

---
 mathesar_ui/src/3rd-party-apis/github-releases.ts      |  2 +-
 mathesar_ui/src/api/{ => rest}/columns.ts              |  0
 mathesar_ui/src/api/{ => rest}/connections.ts          |  0
 mathesar_ui/src/api/{ => rest}/dataFiles.ts            |  0
 mathesar_ui/src/api/{ => rest}/queryShares.ts          |  0
 mathesar_ui/src/api/{ => rest}/reflect.ts              |  0
 mathesar_ui/src/api/{ => rest}/schemas.ts              |  0
 mathesar_ui/src/api/{ => rest}/shares.ts               |  0
 mathesar_ui/src/api/{ => rest}/tableShares.ts          |  0
 mathesar_ui/src/api/{ => rest}/types/dataFiles.ts      |  0
 mathesar_ui/src/api/{ => rest}/types/links.ts          |  0
 mathesar_ui/src/api/{ => rest}/types/queries.ts        |  6 +++---
 mathesar_ui/src/api/{ => rest}/types/tables.ts         |  2 +-
 mathesar_ui/src/api/{ => rest}/types/tables/columns.ts |  0
 .../src/api/{ => rest}/types/tables/constraints.ts     |  0
 .../src/api/{ => rest}/types/tables/joinable_tables.ts |  2 +-
 mathesar_ui/src/api/{ => rest}/types/tables/records.ts |  0
 .../src/api/{ => rest}/types/tables/split_table.ts     |  0
 mathesar_ui/src/api/{ => rest}/users.ts                |  0
 mathesar_ui/src/api/{ => rest}/utils/errorCodes.ts     |  0
 mathesar_ui/src/api/{ => rest}/utils/errors.ts         |  0
 mathesar_ui/src/api/{ => rest}/utils/recordUtils.ts    |  0
 mathesar_ui/src/api/{ => rest}/utils/requestUtils.ts   |  0
 mathesar_ui/src/components/ModificationStatus.svelte   |  2 +-
 mathesar_ui/src/components/QueryName.svelte            |  2 +-
 mathesar_ui/src/components/SelectTable.svelte          |  2 +-
 .../components/SelectTableWithinCurrentSchema.svelte   |  2 +-
 mathesar_ui/src/components/TableName.svelte            |  2 +-
 .../abstract-type-control/AbstractTypeControl.svelte   |  2 +-
 .../config-components/DurationConfiguration.svelte     |  2 +-
 .../src/components/abstract-type-control/utils.ts      |  2 +-
 .../breadcrumb/BreadcrumbRecordSelector.svelte         |  2 +-
 .../src/components/breadcrumb/DatabaseSelector.svelte  |  2 +-
 .../src/components/breadcrumb/EntitySelector.svelte    |  4 ++--
 .../src/components/breadcrumb/breadcrumbTypes.ts       |  4 ++--
 .../src/components/cell-fabric/data-types/boolean.ts   |  2 +-
 .../data-types/components/typeDefinitions.ts           |  4 ++--
 .../src/components/cell-fabric/data-types/date.ts      |  2 +-
 .../src/components/cell-fabric/data-types/datetime.ts  |  2 +-
 .../src/components/cell-fabric/data-types/duration.ts  |  2 +-
 .../src/components/cell-fabric/data-types/money.ts     |  2 +-
 .../src/components/cell-fabric/data-types/number.ts    |  2 +-
 .../src/components/cell-fabric/data-types/string.ts    |  2 +-
 .../src/components/cell-fabric/data-types/time.ts      |  2 +-
 mathesar_ui/src/components/cell-fabric/utils.ts        |  4 ++--
 mathesar_ui/src/components/column/types.ts             |  2 +-
 .../src/components/filter-entry/FilterEntry.svelte     |  2 +-
 mathesar_ui/src/components/filter-entry/utils.ts       |  2 +-
 mathesar_ui/src/components/form/form.ts                |  2 +-
 .../src/components/group-entry/GroupEntry.svelte       |  2 +-
 mathesar_ui/src/components/sort-entry/SortEntry.svelte |  2 +-
 mathesar_ui/src/pages/admin-users/NewUserPage.svelte   |  2 +-
 mathesar_ui/src/pages/connections/ConnectionRow.svelte |  2 +-
 .../src/pages/connections/ConnectionsPage.svelte       |  2 +-
 mathesar_ui/src/pages/database/DatabaseDetails.svelte  |  2 +-
 .../src/pages/database/DbAccessControlModal.svelte     |  2 +-
 .../src/pages/exploration/ExplorationPage.svelte       |  2 +-
 mathesar_ui/src/pages/exploration/Header.svelte        |  2 +-
 .../pages/exploration/ShareExplorationDropdown.svelte  |  4 ++--
 .../pages/import/preview/ImportPreviewContent.svelte   |  8 ++++----
 .../src/pages/import/preview/ImportPreviewPage.svelte  |  2 +-
 .../src/pages/import/preview/ImportPreviewSheet.svelte |  2 +-
 .../src/pages/import/preview/PreviewColumn.svelte      |  2 +-
 .../src/pages/import/preview/importPreviewPageUtils.ts |  8 ++++----
 .../src/pages/import/upload/DataFileInput.svelte       |  4 ++--
 .../src/pages/import/upload/ImportUploadPage.svelte    |  4 ++--
 mathesar_ui/src/pages/record/RecordPage.svelte         |  2 +-
 mathesar_ui/src/pages/record/RecordPageContent.svelte  |  8 ++++----
 mathesar_ui/src/pages/record/RecordStore.ts            |  6 +++---
 mathesar_ui/src/pages/record/TableWidget.svelte        |  4 ++--
 mathesar_ui/src/pages/record/Widgets.svelte            |  2 +-
 mathesar_ui/src/pages/schema/EditTable.svelte          |  2 +-
 mathesar_ui/src/pages/schema/ExplorationItem.svelte    |  2 +-
 mathesar_ui/src/pages/schema/ExplorationsList.svelte   |  2 +-
 .../src/pages/schema/SchemaAccessControlModal.svelte   |  2 +-
 mathesar_ui/src/pages/schema/SchemaExplorations.svelte |  2 +-
 mathesar_ui/src/pages/schema/SchemaOverview.svelte     |  6 +++---
 mathesar_ui/src/pages/schema/SchemaTables.svelte       |  2 +-
 mathesar_ui/src/pages/schema/TableCard.svelte          |  2 +-
 mathesar_ui/src/pages/schema/TablesList.svelte         |  2 +-
 mathesar_ui/src/pages/table/TablePage.svelte           |  2 +-
 mathesar_ui/src/routes/DataExplorerRoute.svelte        |  2 +-
 mathesar_ui/src/routes/DatabaseRoute.svelte            |  2 +-
 mathesar_ui/src/routes/RecordPageRoute.svelte          |  2 +-
 .../stores/abstract-types/operations/summarization.ts  |  2 +-
 mathesar_ui/src/stores/abstract-types/store.ts         |  4 ++--
 .../src/stores/abstract-types/type-configs/boolean.ts  |  2 +-
 .../type-configs/comboTypes/arrayFactory.ts            |  2 +-
 .../src/stores/abstract-types/type-configs/date.ts     |  2 +-
 .../src/stores/abstract-types/type-configs/datetime.ts |  2 +-
 .../src/stores/abstract-types/type-configs/duration.ts |  2 +-
 .../src/stores/abstract-types/type-configs/money.ts    |  2 +-
 .../src/stores/abstract-types/type-configs/number.ts   |  2 +-
 .../src/stores/abstract-types/type-configs/text.ts     |  2 +-
 .../src/stores/abstract-types/type-configs/time.ts     |  2 +-
 .../src/stores/abstract-types/type-configs/utils.ts    |  2 +-
 mathesar_ui/src/stores/abstract-types/types.ts         |  6 +++---
 mathesar_ui/src/stores/databases.ts                    |  2 +-
 mathesar_ui/src/stores/queries.ts                      |  6 +++---
 mathesar_ui/src/stores/schemas.ts                      |  6 +++---
 mathesar_ui/src/stores/table-data/TableStructure.ts    |  4 ++--
 .../src/stores/table-data/__tests__/utils.test.ts      |  2 +-
 mathesar_ui/src/stores/table-data/columns.ts           |  8 ++++----
 mathesar_ui/src/stores/table-data/constraints.ts       | 10 +++++-----
 mathesar_ui/src/stores/table-data/constraintsUtils.ts  |  4 ++--
 mathesar_ui/src/stores/table-data/filtering.ts         |  2 +-
 mathesar_ui/src/stores/table-data/grouping.ts          |  2 +-
 mathesar_ui/src/stores/table-data/meta.ts              |  2 +-
 mathesar_ui/src/stores/table-data/processedColumns.ts  |  6 +++---
 .../table-data/record-summaries/recordSummaryUtils.ts  |  2 +-
 mathesar_ui/src/stores/table-data/records.ts           |  8 ++++----
 mathesar_ui/src/stores/table-data/searchFuzzy.ts       |  2 +-
 mathesar_ui/src/stores/table-data/sorting.ts           |  2 +-
 mathesar_ui/src/stores/table-data/tabularData.ts       |  6 +++---
 mathesar_ui/src/stores/table-data/utils.ts             |  6 +++---
 mathesar_ui/src/stores/tables.ts                       | 10 +++++-----
 mathesar_ui/src/stores/userProfile.ts                  |  2 +-
 mathesar_ui/src/stores/users.ts                        |  4 ++--
 .../src/systems/connections/AddConnection.svelte       |  2 +-
 .../src/systems/connections/AddConnectionModal.svelte  |  2 +-
 .../systems/connections/DeleteConnectionModal.svelte   |  2 +-
 .../src/systems/connections/EditConnectionModal.svelte |  2 +-
 .../src/systems/connections/generalConnections.ts      |  2 +-
 .../src/systems/data-explorer/ActionsPane.svelte       |  2 +-
 .../data-explorer/QueryFilterTransformationModel.ts    |  2 +-
 .../data-explorer/QueryHideTransformationModel.ts      |  2 +-
 mathesar_ui/src/systems/data-explorer/QueryManager.ts  | 10 +++++-----
 mathesar_ui/src/systems/data-explorer/QueryModel.ts    |  2 +-
 mathesar_ui/src/systems/data-explorer/QueryRunner.ts   |  6 +++---
 .../data-explorer/QuerySortTransformationModel.ts      |  2 +-
 .../QuerySummarizationTransformationModel.ts           |  2 +-
 .../src/systems/data-explorer/__tests__/mockData.ts    |  2 +-
 .../exploration-inspector/ExplorationTab.svelte        |  2 +-
 .../transformations-pane/transformationUtils.ts        |  2 +-
 .../data-explorer/result-pane/QueryRunErrors.svelte    |  4 ++--
 .../data-explorer/result-pane/ResultRowCell.svelte     |  2 +-
 .../src/systems/data-explorer/urlSerializationUtils.ts |  6 +++---
 mathesar_ui/src/systems/data-explorer/utils.ts         |  8 ++++----
 .../record-selector/RecordSelectorContent.svelte       |  4 ++--
 .../record-selector/RecordSelectorController.ts        |  4 ++--
 .../RecordSelectorNavigationButton.svelte              |  2 +-
 .../systems/record-selector/RecordSelectorTable.svelte |  4 ++--
 .../src/systems/record-selector/recordSelectorUtils.ts |  4 ++--
 mathesar_ui/src/systems/shares/ShareEntity.svelte      |  6 +++---
 .../systems/table-view/ScrollAndResetHandler.svelte    |  2 +-
 mathesar_ui/src/systems/table-view/StatusPane.svelte   |  2 +-
 mathesar_ui/src/systems/table-view/TableView.svelte    |  2 +-
 .../systems/table-view/actions-pane/ActionsPane.svelte |  2 +-
 .../table-view/actions-pane/ShareTableDropdown.svelte  |  4 ++--
 .../record-operations/filter/Filter.svelte             |  2 +-
 .../record-operations/filter/FilterEntries.svelte      |  2 +-
 .../constraints/ConstraintCollapseHeader.svelte        |  2 +-
 .../constraints/ConstraintTypeSection.svelte           |  2 +-
 .../constraints/ForeignKeyConstraintDetails.svelte     |  6 +++---
 .../table-view/constraints/NewFkConstraint.svelte      |  2 +-
 .../table-view/constraints/TableConstraints.svelte     |  4 ++--
 .../src/systems/table-view/header/Header.svelte        |  2 +-
 .../systems/table-view/link-table/LinkTableForm.svelte |  6 +++---
 .../systems/table-view/link-table/LinkTablePill.svelte |  2 +-
 .../table-view/link-table/LinkTypeOption.svelte        |  2 +-
 .../src/systems/table-view/link-table/NewColumn.svelte |  2 +-
 .../table-view/link-table/SelectLinkType.svelte        |  2 +-
 .../systems/table-view/link-table/linkTableUtils.ts    |  2 +-
 .../systems/table-view/row/GroupHeaderCellValue.svelte |  2 +-
 mathesar_ui/src/systems/table-view/row/RowCell.svelte  |  4 ++--
 .../table-inspector/column/ColumnFormatting.svelte     |  2 +-
 .../table-inspector/column/SetDefaultValue.svelte      |  2 +-
 .../column/column-extraction/columnExtractionTypes.ts  |  4 ++--
 .../column/column-extraction/columnExtractionUtils.ts  |  4 ++--
 .../table-inspector/record-summary/AppendColumn.svelte |  2 +-
 .../record-summary/FkRecordSummaryConfig.svelte        |  2 +-
 .../record-summary/RecordSummaryConfig.svelte          |  2 +-
 .../record-summary/TemplateInput.svelte                |  2 +-
 .../record-summary/recordSummaryTemplateUtils.ts       |  2 +-
 .../table-view/table-inspector/table/links/utils.ts    |  2 +-
 .../users-and-permissions/AccessControlRow.svelte      |  2 +-
 .../users-and-permissions/AccessControlView.svelte     |  2 +-
 .../users-and-permissions/PasswordChangeForm.svelte    |  2 +-
 .../users-and-permissions/UserDetailsForm.svelte       |  4 ++--
 mathesar_ui/src/utils/__tests__/api.test.ts            |  2 +-
 mathesar_ui/src/utils/columnUtils.ts                   |  2 +-
 .../src/utils/date-time/DateTimeSpecification.ts       |  2 +-
 mathesar_ui/src/utils/duration/DurationFormatter.ts    |  2 +-
 .../src/utils/duration/DurationSpecification.ts        |  2 +-
 mathesar_ui/src/utils/permissions.ts                   |  2 +-
 mathesar_ui/src/utils/preloadData.ts                   |  8 ++++----
 mathesar_ui/src/utils/tables.ts                        |  2 +-
 187 files changed, 252 insertions(+), 252 deletions(-)
 rename mathesar_ui/src/api/{ => rest}/columns.ts (100%)
 rename mathesar_ui/src/api/{ => rest}/connections.ts (100%)
 rename mathesar_ui/src/api/{ => rest}/dataFiles.ts (100%)
 rename mathesar_ui/src/api/{ => rest}/queryShares.ts (100%)
 rename mathesar_ui/src/api/{ => rest}/reflect.ts (100%)
 rename mathesar_ui/src/api/{ => rest}/schemas.ts (100%)
 rename mathesar_ui/src/api/{ => rest}/shares.ts (100%)
 rename mathesar_ui/src/api/{ => rest}/tableShares.ts (100%)
 rename mathesar_ui/src/api/{ => rest}/types/dataFiles.ts (100%)
 rename mathesar_ui/src/api/{ => rest}/types/links.ts (100%)
 rename mathesar_ui/src/api/{ => rest}/types/queries.ts (95%)
 rename mathesar_ui/src/api/{ => rest}/types/tables.ts (91%)
 rename mathesar_ui/src/api/{ => rest}/types/tables/columns.ts (100%)
 rename mathesar_ui/src/api/{ => rest}/types/tables/constraints.ts (100%)
 rename mathesar_ui/src/api/{ => rest}/types/tables/joinable_tables.ts (91%)
 rename mathesar_ui/src/api/{ => rest}/types/tables/records.ts (100%)
 rename mathesar_ui/src/api/{ => rest}/types/tables/split_table.ts (100%)
 rename mathesar_ui/src/api/{ => rest}/users.ts (100%)
 rename mathesar_ui/src/api/{ => rest}/utils/errorCodes.ts (100%)
 rename mathesar_ui/src/api/{ => rest}/utils/errors.ts (100%)
 rename mathesar_ui/src/api/{ => rest}/utils/recordUtils.ts (100%)
 rename mathesar_ui/src/api/{ => rest}/utils/requestUtils.ts (100%)

diff --git a/mathesar_ui/src/3rd-party-apis/github-releases.ts b/mathesar_ui/src/3rd-party-apis/github-releases.ts
index 739a5103f8..00f4cdd5fa 100644
--- a/mathesar_ui/src/3rd-party-apis/github-releases.ts
+++ b/mathesar_ui/src/3rd-party-apis/github-releases.ts
@@ -1,4 +1,4 @@
-import { getExternalApi } from '@mathesar/api/utils/requestUtils';
+import { getExternalApi } from '@mathesar/api/rest/utils/requestUtils';
 
 /**
  * GitHub's REST API gives way more info than we have here. See [docs][1]. But
diff --git a/mathesar_ui/src/api/columns.ts b/mathesar_ui/src/api/rest/columns.ts
similarity index 100%
rename from mathesar_ui/src/api/columns.ts
rename to mathesar_ui/src/api/rest/columns.ts
diff --git a/mathesar_ui/src/api/connections.ts b/mathesar_ui/src/api/rest/connections.ts
similarity index 100%
rename from mathesar_ui/src/api/connections.ts
rename to mathesar_ui/src/api/rest/connections.ts
diff --git a/mathesar_ui/src/api/dataFiles.ts b/mathesar_ui/src/api/rest/dataFiles.ts
similarity index 100%
rename from mathesar_ui/src/api/dataFiles.ts
rename to mathesar_ui/src/api/rest/dataFiles.ts
diff --git a/mathesar_ui/src/api/queryShares.ts b/mathesar_ui/src/api/rest/queryShares.ts
similarity index 100%
rename from mathesar_ui/src/api/queryShares.ts
rename to mathesar_ui/src/api/rest/queryShares.ts
diff --git a/mathesar_ui/src/api/reflect.ts b/mathesar_ui/src/api/rest/reflect.ts
similarity index 100%
rename from mathesar_ui/src/api/reflect.ts
rename to mathesar_ui/src/api/rest/reflect.ts
diff --git a/mathesar_ui/src/api/schemas.ts b/mathesar_ui/src/api/rest/schemas.ts
similarity index 100%
rename from mathesar_ui/src/api/schemas.ts
rename to mathesar_ui/src/api/rest/schemas.ts
diff --git a/mathesar_ui/src/api/shares.ts b/mathesar_ui/src/api/rest/shares.ts
similarity index 100%
rename from mathesar_ui/src/api/shares.ts
rename to mathesar_ui/src/api/rest/shares.ts
diff --git a/mathesar_ui/src/api/tableShares.ts b/mathesar_ui/src/api/rest/tableShares.ts
similarity index 100%
rename from mathesar_ui/src/api/tableShares.ts
rename to mathesar_ui/src/api/rest/tableShares.ts
diff --git a/mathesar_ui/src/api/types/dataFiles.ts b/mathesar_ui/src/api/rest/types/dataFiles.ts
similarity index 100%
rename from mathesar_ui/src/api/types/dataFiles.ts
rename to mathesar_ui/src/api/rest/types/dataFiles.ts
diff --git a/mathesar_ui/src/api/types/links.ts b/mathesar_ui/src/api/rest/types/links.ts
similarity index 100%
rename from mathesar_ui/src/api/types/links.ts
rename to mathesar_ui/src/api/rest/types/links.ts
diff --git a/mathesar_ui/src/api/types/queries.ts b/mathesar_ui/src/api/rest/types/queries.ts
similarity index 95%
rename from mathesar_ui/src/api/types/queries.ts
rename to mathesar_ui/src/api/rest/types/queries.ts
index 970ddf45f3..d6f4c8a468 100644
--- a/mathesar_ui/src/api/types/queries.ts
+++ b/mathesar_ui/src/api/rest/types/queries.ts
@@ -1,6 +1,6 @@
-import type { PaginatedResponse } from '@mathesar/api/utils/requestUtils';
-import type { Column } from '@mathesar/api/types/tables/columns';
-import type { JpPath } from '@mathesar/api/types/tables/joinable_tables';
+import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type { JpPath } from '@mathesar/api/rest/types/tables/joinable_tables';
 import type { SchemaEntry } from '@mathesar/AppTypes';
 
 export type QueryColumnAlias = string;
diff --git a/mathesar_ui/src/api/types/tables.ts b/mathesar_ui/src/api/rest/types/tables.ts
similarity index 91%
rename from mathesar_ui/src/api/types/tables.ts
rename to mathesar_ui/src/api/rest/types/tables.ts
index df3324cfb2..f399b5bed0 100644
--- a/mathesar_ui/src/api/types/tables.ts
+++ b/mathesar_ui/src/api/rest/types/tables.ts
@@ -1,4 +1,4 @@
-import type { PaginatedResponse } from '@mathesar/api/utils/requestUtils';
+import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
 import type { Column } from './tables/columns';
 
 export type MinimalColumnDetails = Pick<
diff --git a/mathesar_ui/src/api/types/tables/columns.ts b/mathesar_ui/src/api/rest/types/tables/columns.ts
similarity index 100%
rename from mathesar_ui/src/api/types/tables/columns.ts
rename to mathesar_ui/src/api/rest/types/tables/columns.ts
diff --git a/mathesar_ui/src/api/types/tables/constraints.ts b/mathesar_ui/src/api/rest/types/tables/constraints.ts
similarity index 100%
rename from mathesar_ui/src/api/types/tables/constraints.ts
rename to mathesar_ui/src/api/rest/types/tables/constraints.ts
diff --git a/mathesar_ui/src/api/types/tables/joinable_tables.ts b/mathesar_ui/src/api/rest/types/tables/joinable_tables.ts
similarity index 91%
rename from mathesar_ui/src/api/types/tables/joinable_tables.ts
rename to mathesar_ui/src/api/rest/types/tables/joinable_tables.ts
index 48aa077f45..c2592281f1 100644
--- a/mathesar_ui/src/api/types/tables/joinable_tables.ts
+++ b/mathesar_ui/src/api/rest/types/tables/joinable_tables.ts
@@ -4,7 +4,7 @@
  * endpoint: /api/db/v0/tables/<table_id>/joinable_tables/
  */
 
-import type { TableEntry } from '@mathesar/api/types/tables';
+import type { TableEntry } from '@mathesar/api/rest/types/tables';
 import type { Column } from './columns';
 
 type ForeignKeyId = number;
diff --git a/mathesar_ui/src/api/types/tables/records.ts b/mathesar_ui/src/api/rest/types/tables/records.ts
similarity index 100%
rename from mathesar_ui/src/api/types/tables/records.ts
rename to mathesar_ui/src/api/rest/types/tables/records.ts
diff --git a/mathesar_ui/src/api/types/tables/split_table.ts b/mathesar_ui/src/api/rest/types/tables/split_table.ts
similarity index 100%
rename from mathesar_ui/src/api/types/tables/split_table.ts
rename to mathesar_ui/src/api/rest/types/tables/split_table.ts
diff --git a/mathesar_ui/src/api/users.ts b/mathesar_ui/src/api/rest/users.ts
similarity index 100%
rename from mathesar_ui/src/api/users.ts
rename to mathesar_ui/src/api/rest/users.ts
diff --git a/mathesar_ui/src/api/utils/errorCodes.ts b/mathesar_ui/src/api/rest/utils/errorCodes.ts
similarity index 100%
rename from mathesar_ui/src/api/utils/errorCodes.ts
rename to mathesar_ui/src/api/rest/utils/errorCodes.ts
diff --git a/mathesar_ui/src/api/utils/errors.ts b/mathesar_ui/src/api/rest/utils/errors.ts
similarity index 100%
rename from mathesar_ui/src/api/utils/errors.ts
rename to mathesar_ui/src/api/rest/utils/errors.ts
diff --git a/mathesar_ui/src/api/utils/recordUtils.ts b/mathesar_ui/src/api/rest/utils/recordUtils.ts
similarity index 100%
rename from mathesar_ui/src/api/utils/recordUtils.ts
rename to mathesar_ui/src/api/rest/utils/recordUtils.ts
diff --git a/mathesar_ui/src/api/utils/requestUtils.ts b/mathesar_ui/src/api/rest/utils/requestUtils.ts
similarity index 100%
rename from mathesar_ui/src/api/utils/requestUtils.ts
rename to mathesar_ui/src/api/rest/utils/requestUtils.ts
diff --git a/mathesar_ui/src/components/ModificationStatus.svelte b/mathesar_ui/src/components/ModificationStatus.svelte
index bfaeb1bd5e..bc7e403a60 100644
--- a/mathesar_ui/src/components/ModificationStatus.svelte
+++ b/mathesar_ui/src/components/ModificationStatus.svelte
@@ -2,7 +2,7 @@
   import { onDestroy } from 'svelte';
   import { _ } from 'svelte-i18n';
   import { fade } from 'svelte/transition';
-  import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
+  import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
   import StatusIndicator from './StatusIndicator.svelte';
 
   let incomingRequestState: RequestStatus['state'] | undefined;
diff --git a/mathesar_ui/src/components/QueryName.svelte b/mathesar_ui/src/components/QueryName.svelte
index b2d164acda..fd1d125e5c 100644
--- a/mathesar_ui/src/components/QueryName.svelte
+++ b/mathesar_ui/src/components/QueryName.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { QueryInstance } from '@mathesar/api/types/queries';
+  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import { iconExploration } from '@mathesar/icons';
   import NameWithIcon from './NameWithIcon.svelte';
 
diff --git a/mathesar_ui/src/components/SelectTable.svelte b/mathesar_ui/src/components/SelectTable.svelte
index 6bfcdb5037..34f61bda1b 100644
--- a/mathesar_ui/src/components/SelectTable.svelte
+++ b/mathesar_ui/src/components/SelectTable.svelte
@@ -2,7 +2,7 @@
   import { _ } from 'svelte-i18n';
   import { Select } from '@mathesar-component-library';
   import type { SelectProps } from '@mathesar-component-library/types';
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import TableName from './TableName.svelte';
 
   type $$Events = Select<TableEntry | undefined>['$$events_def'];
diff --git a/mathesar_ui/src/components/SelectTableWithinCurrentSchema.svelte b/mathesar_ui/src/components/SelectTableWithinCurrentSchema.svelte
index 4409f81971..7582455a67 100644
--- a/mathesar_ui/src/components/SelectTableWithinCurrentSchema.svelte
+++ b/mathesar_ui/src/components/SelectTableWithinCurrentSchema.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import { importVerifiedTables } from '@mathesar/stores/tables';
   import type { SelectProps } from '@mathesar-component-library/types';
   import SelectTable from './SelectTable.svelte';
diff --git a/mathesar_ui/src/components/TableName.svelte b/mathesar_ui/src/components/TableName.svelte
index 3b8af8a2e0..ef1cea020b 100644
--- a/mathesar_ui/src/components/TableName.svelte
+++ b/mathesar_ui/src/components/TableName.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import type { ComponentProps } from 'svelte';
 
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import { isTableImportConfirmationRequired } from '@mathesar/utils/tables';
   import { iconTable } from '@mathesar/icons';
   import NameWithIcon from './NameWithIcon.svelte';
diff --git a/mathesar_ui/src/components/abstract-type-control/AbstractTypeControl.svelte b/mathesar_ui/src/components/abstract-type-control/AbstractTypeControl.svelte
index 730414790b..3659c19b29 100644
--- a/mathesar_ui/src/components/abstract-type-control/AbstractTypeControl.svelte
+++ b/mathesar_ui/src/components/abstract-type-control/AbstractTypeControl.svelte
@@ -6,7 +6,7 @@
     CancelOrProceedButtonPair,
   } from '@mathesar-component-library';
   import { toast } from '@mathesar/stores/toast';
-  import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
+  import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
   import {
     type ColumnWithAbstractType,
     type ColumnTypeOptionsSaveArgs,
diff --git a/mathesar_ui/src/components/abstract-type-control/config-components/DurationConfiguration.svelte b/mathesar_ui/src/components/abstract-type-control/config-components/DurationConfiguration.svelte
index c3e76bb7f8..679077e752 100644
--- a/mathesar_ui/src/components/abstract-type-control/config-components/DurationConfiguration.svelte
+++ b/mathesar_ui/src/components/abstract-type-control/config-components/DurationConfiguration.svelte
@@ -2,7 +2,7 @@
   import type { Writable } from 'svelte/store';
   import { _ } from 'svelte-i18n';
   import { LabeledInput, Select } from '@mathesar-component-library';
-  import type { DurationUnit } from '@mathesar/api/types/tables/columns';
+  import type { DurationUnit } from '@mathesar/api/rest/types/tables/columns';
   import type { DurationConfig } from '@mathesar/utils/duration/types';
   import type { FormValues } from '@mathesar-component-library/types';
   import { DurationSpecification } from '@mathesar/utils/duration';
diff --git a/mathesar_ui/src/components/abstract-type-control/utils.ts b/mathesar_ui/src/components/abstract-type-control/utils.ts
index ea6bb0f43b..59a8edacbd 100644
--- a/mathesar_ui/src/components/abstract-type-control/utils.ts
+++ b/mathesar_ui/src/components/abstract-type-control/utils.ts
@@ -6,7 +6,7 @@ import type {
   AbstractTypeDbConfig,
   AbstractTypeDisplayConfig,
 } from '@mathesar/stores/abstract-types/types';
-import type { Column } from '@mathesar/api/types/tables/columns';
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import { readable } from 'svelte/store';
 import DurationConfiguration from './config-components/DurationConfiguration.svelte';
 
diff --git a/mathesar_ui/src/components/breadcrumb/BreadcrumbRecordSelector.svelte b/mathesar_ui/src/components/breadcrumb/BreadcrumbRecordSelector.svelte
index 74f22c5287..858f291e21 100644
--- a/mathesar_ui/src/components/breadcrumb/BreadcrumbRecordSelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/BreadcrumbRecordSelector.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { Button, iconSearch, Icon } from '@mathesar-component-library';
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import { iconExpandRight } from '@mathesar/icons';
   import { getRecordSelectorFromContext } from '@mathesar/systems/record-selector/RecordSelectorController';
 
diff --git a/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte b/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
index 8dffc34b7d..a753afbc25 100644
--- a/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import type { Connection } from '@mathesar/api/connections';
+  import type { Connection } from '@mathesar/api/rest/connections';
   import { iconDatabase, iconConnection } from '@mathesar/icons';
   import { getDatabasePageUrl, CONNECTIONS_URL } from '@mathesar/routes/urls';
   import { connectionsStore } from '@mathesar/stores/databases';
diff --git a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
index 99f493cfb7..9424e912a8 100644
--- a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
@@ -5,12 +5,12 @@
     currentTableId,
     tables as tablesStore,
   } from '@mathesar/stores/tables';
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import { getExplorationPageUrl } from '@mathesar/routes/urls';
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import { iconTable } from '@mathesar/icons';
   import { queries as queriesStore } from '@mathesar/stores/queries';
-  import type { QueryInstance } from '@mathesar/api/types/queries';
+  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import { getLinkForTableItem } from '@mathesar/utils/tables';
   import BreadcrumbSelector from './BreadcrumbSelector.svelte';
   import type {
diff --git a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
index d2af321f76..66ac54f1a3 100644
--- a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
+++ b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
@@ -1,5 +1,5 @@
-import type { QueryInstance } from '@mathesar/api/types/queries';
-import type { TableEntry } from '@mathesar/api/types/tables';
+import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+import type { TableEntry } from '@mathesar/api/rest/types/tables';
 import type { Database, SchemaEntry } from '@mathesar/AppTypes';
 import type {
   ComponentAndProps,
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/boolean.ts b/mathesar_ui/src/components/cell-fabric/data-types/boolean.ts
index bb11b277ab..5976381526 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/boolean.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/boolean.ts
@@ -1,4 +1,4 @@
-import type { BooleanDisplayOptions } from '@mathesar/api/types/tables/columns';
+import type { BooleanDisplayOptions } from '@mathesar/api/rest/types/tables/columns';
 import type {
   ComponentAndProps,
   SelectProps,
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts b/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts
index 5e3269c103..ee8b5caf49 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts
@@ -6,8 +6,8 @@ import type {
 } from '@mathesar-component-library/types';
 import type { DBObjectEntry } from '@mathesar/AppTypes';
 import type { DateTimeFormatter } from '@mathesar/utils/date-time/types';
-import type { Column } from '@mathesar/api/types/tables/columns';
-import type { FkConstraint } from '@mathesar/api/types/tables/constraints';
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type { FkConstraint } from '@mathesar/api/rest/types/tables/constraints';
 
 export type CellColumnLike = Pick<
   Column,
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/date.ts b/mathesar_ui/src/components/cell-fabric/data-types/date.ts
index 83a3f433ab..9eccdc8daa 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/date.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/date.ts
@@ -1,5 +1,5 @@
 import { isDefinedNonNullable } from '@mathesar-component-library';
-import type { DateDisplayOptions } from '@mathesar/api/types/tables/columns';
+import type { DateDisplayOptions } from '@mathesar/api/rest/types/tables/columns';
 import type { ComponentAndProps } from '@mathesar-component-library/types';
 import {
   DateTimeFormatter,
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/datetime.ts b/mathesar_ui/src/components/cell-fabric/data-types/datetime.ts
index 637e9a3c0d..9b2a85db94 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/datetime.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/datetime.ts
@@ -1,5 +1,5 @@
 import { isDefinedNonNullable } from '@mathesar-component-library';
-import type { TimeStampDisplayOptions } from '@mathesar/api/types/tables/columns';
+import type { TimeStampDisplayOptions } from '@mathesar/api/rest/types/tables/columns';
 import type { ComponentAndProps } from '@mathesar-component-library/types';
 import {
   DateTimeFormatter,
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/duration.ts b/mathesar_ui/src/components/cell-fabric/data-types/duration.ts
index e774a5c8d1..059d9da6cb 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/duration.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/duration.ts
@@ -6,7 +6,7 @@ import type {
   ComponentAndProps,
   FormattedInputProps,
 } from '@mathesar-component-library/types';
-import type { DurationDisplayOptions } from '@mathesar/api/types/tables/columns';
+import type { DurationDisplayOptions } from '@mathesar/api/rest/types/tables/columns';
 import {
   DurationFormatter,
   DurationSpecification,
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/money.ts b/mathesar_ui/src/components/cell-fabric/data-types/money.ts
index 579bde82f6..052cf9a51a 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/money.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/money.ts
@@ -5,7 +5,7 @@ import {
 import type {
   MoneyColumn,
   NumberFormat,
-} from '@mathesar/api/types/tables/columns';
+} from '@mathesar/api/rest/types/tables/columns';
 import type { ComponentAndProps } from '@mathesar-component-library/types';
 import MoneyCell from './components/money/MoneyCell.svelte';
 import MoneyCellInput from './components/money/MoneyCellInput.svelte';
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/number.ts b/mathesar_ui/src/components/cell-fabric/data-types/number.ts
index 061ec97a9e..a2cbb8c1d6 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/number.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/number.ts
@@ -7,7 +7,7 @@ import type {
   NumberColumn,
   NumberDisplayOptions,
   NumberFormat,
-} from '@mathesar/api/types/tables/columns';
+} from '@mathesar/api/rest/types/tables/columns';
 import NumberCell from './components/number/NumberCell.svelte';
 import NumberCellInput from './components/number/NumberCellInput.svelte';
 import type { NumberCellExternalProps } from './components/typeDefinitions';
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/string.ts b/mathesar_ui/src/components/cell-fabric/data-types/string.ts
index 67c714f089..682398f95b 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/string.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/string.ts
@@ -3,7 +3,7 @@ import type {
   ComponentAndProps,
   TextInputProps,
 } from '@mathesar-component-library/types';
-import type { TextTypeOptions } from '@mathesar/api/types/tables/columns';
+import type { TextTypeOptions } from '@mathesar/api/rest/types/tables/columns';
 import GrowableTextArea from '@mathesar/components/GrowableTextArea.svelte';
 import TextAreaCell from './components/textarea/TextAreaCell.svelte';
 import TextBoxCell from './components/textbox/TextBoxCell.svelte';
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/time.ts b/mathesar_ui/src/components/cell-fabric/data-types/time.ts
index ff5b62d0c4..1b43bfdab0 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/time.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/time.ts
@@ -1,5 +1,5 @@
 import { isDefinedNonNullable } from '@mathesar-component-library';
-import type { TimeDisplayOptions } from '@mathesar/api/types/tables/columns';
+import type { TimeDisplayOptions } from '@mathesar/api/rest/types/tables/columns';
 import type { ComponentAndProps } from '@mathesar-component-library/types';
 import {
   DateTimeFormatter,
diff --git a/mathesar_ui/src/components/cell-fabric/utils.ts b/mathesar_ui/src/components/cell-fabric/utils.ts
index 7c59438599..24a2175e7d 100644
--- a/mathesar_ui/src/components/cell-fabric/utils.ts
+++ b/mathesar_ui/src/components/cell-fabric/utils.ts
@@ -1,6 +1,6 @@
 import type { ComponentAndProps } from '@mathesar-component-library/types';
-import type { TableEntry } from '@mathesar/api/types/tables';
-import type { Column } from '@mathesar/api/types/tables/columns';
+import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { CellInfo } from '@mathesar/stores/abstract-types/types';
 import type { RecordSummariesForSheet } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
 import DataTypes from './data-types';
diff --git a/mathesar_ui/src/components/column/types.ts b/mathesar_ui/src/components/column/types.ts
index f6f3725829..d0bbb4d988 100644
--- a/mathesar_ui/src/components/column/types.ts
+++ b/mathesar_ui/src/components/column/types.ts
@@ -1,5 +1,5 @@
 import type { CellColumnLike } from '@mathesar/components/cell-fabric/data-types/typeDefinitions';
-import type { ConstraintType } from '@mathesar/api/types/tables/constraints';
+import type { ConstraintType } from '@mathesar/api/rest/types/tables/constraints';
 
 // Since the ColumnName component is being used
 // in Tables, Queries & DataImport and many more in the future
diff --git a/mathesar_ui/src/components/filter-entry/FilterEntry.svelte b/mathesar_ui/src/components/filter-entry/FilterEntry.svelte
index 18378c19ab..035ac211d5 100644
--- a/mathesar_ui/src/components/filter-entry/FilterEntry.svelte
+++ b/mathesar_ui/src/components/filter-entry/FilterEntry.svelte
@@ -20,7 +20,7 @@
   import type RecordSummaryStore from '@mathesar/stores/table-data/record-summaries/RecordSummaryStore';
   import type { RecordSummariesForColumn } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
   import type { ReadableMapLike } from '@mathesar/typeUtils';
-  import type { ConstraintType } from '@mathesar/api/types/tables/constraints';
+  import type { ConstraintType } from '@mathesar/api/rest/types/tables/constraints';
   import type { FilterEntryColumnLike } from './types';
   import { FILTER_INPUT_CLASS, validateFilterEntry } from './utils';
 
diff --git a/mathesar_ui/src/components/filter-entry/utils.ts b/mathesar_ui/src/components/filter-entry/utils.ts
index 6d1b7b1818..eecc13a27d 100644
--- a/mathesar_ui/src/components/filter-entry/utils.ts
+++ b/mathesar_ui/src/components/filter-entry/utils.ts
@@ -1,4 +1,4 @@
-import type { FkConstraint } from '@mathesar/api/types/tables/constraints';
+import type { FkConstraint } from '@mathesar/api/rest/types/tables/constraints';
 import { isDefinedNonNullable } from '@mathesar-component-library';
 import {
   getEqualityFiltersForAbstractType,
diff --git a/mathesar_ui/src/components/form/form.ts b/mathesar_ui/src/components/form/form.ts
index 6b7ce7ace3..d327769b45 100644
--- a/mathesar_ui/src/components/form/form.ts
+++ b/mathesar_ui/src/components/form/form.ts
@@ -4,7 +4,7 @@ import {
   unite,
   withSideChannelSubscriptions,
 } from '@mathesar-component-library';
-import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
+import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import {
   comboErrorsKey,
   disabledKey,
diff --git a/mathesar_ui/src/components/group-entry/GroupEntry.svelte b/mathesar_ui/src/components/group-entry/GroupEntry.svelte
index 8a5bc28c08..3e0a32e10b 100644
--- a/mathesar_ui/src/components/group-entry/GroupEntry.svelte
+++ b/mathesar_ui/src/components/group-entry/GroupEntry.svelte
@@ -10,7 +10,7 @@
   import { iconDeleteMajor } from '@mathesar/icons';
   import type { ReadableMapLike } from '@mathesar/typeUtils';
   import ColumnName from '@mathesar/components/column/ColumnName.svelte';
-  import type { ConstraintType } from '@mathesar/api/types/tables/constraints';
+  import type { ConstraintType } from '@mathesar/api/rest/types/tables/constraints';
   import type { GroupEntryColumnLike } from './types';
 
   type T = $$Generic;
diff --git a/mathesar_ui/src/components/sort-entry/SortEntry.svelte b/mathesar_ui/src/components/sort-entry/SortEntry.svelte
index 740c22d485..8e9a17dd01 100644
--- a/mathesar_ui/src/components/sort-entry/SortEntry.svelte
+++ b/mathesar_ui/src/components/sort-entry/SortEntry.svelte
@@ -10,7 +10,7 @@
   import ColumnName from '@mathesar/components/column/ColumnName.svelte';
   import { iconDeleteMajor } from '@mathesar/icons';
   import type { ReadableMapLike } from '@mathesar/typeUtils';
-  import type { ConstraintType } from '@mathesar/api/types/tables/constraints';
+  import type { ConstraintType } from '@mathesar/api/rest/types/tables/constraints';
   import {
     type SortDirection,
     allowedSortDirections,
diff --git a/mathesar_ui/src/pages/admin-users/NewUserPage.svelte b/mathesar_ui/src/pages/admin-users/NewUserPage.svelte
index 92a8583004..0e91cc7d1a 100644
--- a/mathesar_ui/src/pages/admin-users/NewUserPage.svelte
+++ b/mathesar_ui/src/pages/admin-users/NewUserPage.svelte
@@ -2,7 +2,7 @@
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
   import { Icon } from '@mathesar-component-library';
-  import type { User } from '@mathesar/api/users';
+  import type { User } from '@mathesar/api/rest/users';
   import { iconAddUser } from '@mathesar/icons';
   import {
     getEditUsersPageUrl,
diff --git a/mathesar_ui/src/pages/connections/ConnectionRow.svelte b/mathesar_ui/src/pages/connections/ConnectionRow.svelte
index 83f5406aa6..ee7d11e3da 100644
--- a/mathesar_ui/src/pages/connections/ConnectionRow.svelte
+++ b/mathesar_ui/src/pages/connections/ConnectionRow.svelte
@@ -8,7 +8,7 @@
     EditConnectionModal,
     DeleteConnectionModal,
   } from '@mathesar/systems/connections';
-  import type { Connection } from '@mathesar/api/connections';
+  import type { Connection } from '@mathesar/api/rest/connections';
   import { getDatabasePageUrl } from '@mathesar/routes/urls';
   import { iconConnection } from '@mathesar/icons';
 
diff --git a/mathesar_ui/src/pages/connections/ConnectionsPage.svelte b/mathesar_ui/src/pages/connections/ConnectionsPage.svelte
index 7f04574d60..6f6b4893de 100644
--- a/mathesar_ui/src/pages/connections/ConnectionsPage.svelte
+++ b/mathesar_ui/src/pages/connections/ConnectionsPage.svelte
@@ -2,7 +2,7 @@
   import { _ } from 'svelte-i18n';
 
   import { Button, Icon } from '@mathesar-component-library';
-  import type { Connection } from '@mathesar/api/connections';
+  import type { Connection } from '@mathesar/api/rest/connections';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import { iconAddNew } from '@mathesar/icons';
diff --git a/mathesar_ui/src/pages/database/DatabaseDetails.svelte b/mathesar_ui/src/pages/database/DatabaseDetails.svelte
index 26dceef43f..64426e4955 100644
--- a/mathesar_ui/src/pages/database/DatabaseDetails.svelte
+++ b/mathesar_ui/src/pages/database/DatabaseDetails.svelte
@@ -7,7 +7,7 @@
     DropdownMenu,
     ButtonMenuItem,
   } from '@mathesar-component-library';
-  import { reflectApi } from '@mathesar/api/reflect';
+  import { reflectApi } from '@mathesar/api/rest/reflect';
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import AppSecondaryHeader from '@mathesar/components/AppSecondaryHeader.svelte';
   import {
diff --git a/mathesar_ui/src/pages/database/DbAccessControlModal.svelte b/mathesar_ui/src/pages/database/DbAccessControlModal.svelte
index 3657c8bd58..6b61056f53 100644
--- a/mathesar_ui/src/pages/database/DbAccessControlModal.svelte
+++ b/mathesar_ui/src/pages/database/DbAccessControlModal.svelte
@@ -11,7 +11,7 @@
     setUsersStoreInContext,
     type UserModel,
   } from '@mathesar/stores/users';
-  import type { UserRole } from '@mathesar/api/users';
+  import type { UserRole } from '@mathesar/api/rest/users';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { AccessControlView } from '@mathesar/systems/users-and-permissions';
   import type { ObjectRoleMap } from '@mathesar/utils/permissions';
diff --git a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
index b71566c299..32f9caba58 100644
--- a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
+++ b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
@@ -2,7 +2,7 @@
   import { router } from 'tinro';
   import { _ } from 'svelte-i18n';
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
-  import type { QueryInstance } from '@mathesar/api/types/queries';
+  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
diff --git a/mathesar_ui/src/pages/exploration/Header.svelte b/mathesar_ui/src/pages/exploration/Header.svelte
index 6c5d771269..f6ce17ed7b 100644
--- a/mathesar_ui/src/pages/exploration/Header.svelte
+++ b/mathesar_ui/src/pages/exploration/Header.svelte
@@ -4,7 +4,7 @@
   import { Button, Icon } from '@mathesar-component-library';
   import EntityPageHeader from '@mathesar/components/EntityPageHeader.svelte';
   import { iconExploration, iconInspector } from '@mathesar/icons';
-  import type { QueryInstance } from '@mathesar/api/types/queries';
+  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import { getExplorationEditorPageUrl } from '@mathesar/routes/urls';
   import ShareExplorationDropdown from './ShareExplorationDropdown.svelte';
 
diff --git a/mathesar_ui/src/pages/exploration/ShareExplorationDropdown.svelte b/mathesar_ui/src/pages/exploration/ShareExplorationDropdown.svelte
index e584925e1e..fc4068d7b2 100644
--- a/mathesar_ui/src/pages/exploration/ShareExplorationDropdown.svelte
+++ b/mathesar_ui/src/pages/exploration/ShareExplorationDropdown.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
   import { iconShare } from '@mathesar/icons';
-  import type { QueryInstance } from '@mathesar/api/types/queries';
+  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import { Dropdown, Icon } from '@mathesar-component-library';
   import ShareEntity from '@mathesar/systems/shares/ShareEntity.svelte';
-  import queryShareApi from '@mathesar/api/queryShares';
+  import queryShareApi from '@mathesar/api/rest/queryShares';
   import { getSharedExplorationPageUrl } from '@mathesar/routes/urls';
 
   export let id: QueryInstance['id'];
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index 2c01712646..fdeb3e329a 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -6,10 +6,10 @@
     Spinner,
   } from '@mathesar-component-library';
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
-  import { columnsApi } from '@mathesar/api/columns';
-  import type { DataFile } from '@mathesar/api/types/dataFiles';
-  import type { TableEntry } from '@mathesar/api/types/tables';
-  import type { Column } from '@mathesar/api/types/tables/columns';
+  import { columnsApi } from '@mathesar/api/rest/columns';
+  import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Column } from '@mathesar/api/rest/types/tables/columns';
   import {
     Field,
     FieldLayout,
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
index 3fe72614b9..dc1e48eaf4 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
@@ -3,7 +3,7 @@
   import { _ } from 'svelte-i18n';
   import { Spinner } from '@mathesar-component-library';
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
-  import { dataFilesApi } from '@mathesar/api/dataFiles';
+  import { dataFilesApi } from '@mathesar/api/rest/dataFiles';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { getTablePageUrl } from '@mathesar/routes/urls';
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewSheet.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewSheet.svelte
index dec9363708..8311481db8 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewSheet.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewSheet.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Column } from '@mathesar/api/types/tables/columns';
+  import type { Column } from '@mathesar/api/rest/types/tables/columns';
   import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
   import {
     Sheet,
diff --git a/mathesar_ui/src/pages/import/preview/PreviewColumn.svelte b/mathesar_ui/src/pages/import/preview/PreviewColumn.svelte
index 5777e8f21f..1531b95907 100644
--- a/mathesar_ui/src/pages/import/preview/PreviewColumn.svelte
+++ b/mathesar_ui/src/pages/import/preview/PreviewColumn.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { Dropdown, TextInput, Checkbox } from '@mathesar-component-library';
-  import type { Column } from '@mathesar/api/types/tables/columns';
+  import type { Column } from '@mathesar/api/rest/types/tables/columns';
   import { AbstractTypeControl } from '@mathesar/components/abstract-type-control';
   import type { AbstractType } from '@mathesar/stores/abstract-types/types';
   import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
diff --git a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
index a031ad9f00..3308f98ec0 100644
--- a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
+++ b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
@@ -1,11 +1,11 @@
 import type { Database, SchemaEntry } from '@mathesar/AppTypes';
-import { dataFilesApi } from '@mathesar/api/dataFiles';
-import type { DataFile } from '@mathesar/api/types/dataFiles';
+import { dataFilesApi } from '@mathesar/api/rest/dataFiles';
+import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
 import type {
   MinimalColumnDetails,
   TableEntry,
-} from '@mathesar/api/types/tables';
-import type { Column } from '@mathesar/api/types/tables/columns';
+} from '@mathesar/api/rest/types/tables';
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import { getCellCap } from '@mathesar/components/cell-fabric/utils';
 import AsyncStore from '@mathesar/stores/AsyncStore';
 import { getAbstractTypeForDbType } from '@mathesar/stores/abstract-types';
diff --git a/mathesar_ui/src/pages/import/upload/DataFileInput.svelte b/mathesar_ui/src/pages/import/upload/DataFileInput.svelte
index 0ffddc356f..23fc48359f 100644
--- a/mathesar_ui/src/pages/import/upload/DataFileInput.svelte
+++ b/mathesar_ui/src/pages/import/upload/DataFileInput.svelte
@@ -10,8 +10,8 @@
     FileUpload,
     FileUploadAddDetail,
   } from '@mathesar-component-library/types';
-  import { dataFilesApi as api } from '@mathesar/api/dataFiles';
-  import type { UploadCompletionOpts } from '@mathesar/api/utils/requestUtils';
+  import { dataFilesApi as api } from '@mathesar/api/rest/dataFiles';
+  import type { UploadCompletionOpts } from '@mathesar/api/rest/utils/requestUtils';
   import { toast } from '@mathesar/stores/toast';
 
   /**
diff --git a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
index b951c0a45d..5f553cdb6a 100644
--- a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
+++ b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
@@ -8,8 +8,8 @@
   } from '@mathesar-component-library';
   import type { IconProps } from '@mathesar-component-library/types';
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
-  import { dataFilesApi } from '@mathesar/api/dataFiles';
-  import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
+  import { dataFilesApi } from '@mathesar/api/rest/dataFiles';
+  import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
   import Spinner from '@mathesar/component-library/spinner/Spinner.svelte';
   import DocsLink from '@mathesar/components/DocsLink.svelte';
   import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
diff --git a/mathesar_ui/src/pages/record/RecordPage.svelte b/mathesar_ui/src/pages/record/RecordPage.svelte
index b92cd9f816..2fd3143948 100644
--- a/mathesar_ui/src/pages/record/RecordPage.svelte
+++ b/mathesar_ui/src/pages/record/RecordPage.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
diff --git a/mathesar_ui/src/pages/record/RecordPageContent.svelte b/mathesar_ui/src/pages/record/RecordPageContent.svelte
index 4fb4f971a9..39475660e2 100644
--- a/mathesar_ui/src/pages/record/RecordPageContent.svelte
+++ b/mathesar_ui/src/pages/record/RecordPageContent.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import type { TableEntry } from '@mathesar/api/types/tables';
-  import type { JoinableTablesResult } from '@mathesar/api/types/tables/joinable_tables';
-  import { getDetailedRecordsErrors } from '@mathesar/api/utils/recordUtils';
-  import { getAPI } from '@mathesar/api/utils/requestUtils';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
+  import { getDetailedRecordsErrors } from '@mathesar/api/rest/utils/recordUtils';
+  import { getAPI } from '@mathesar/api/rest/utils/requestUtils';
   import {
     FormSubmit,
     makeForm,
diff --git a/mathesar_ui/src/pages/record/RecordStore.ts b/mathesar_ui/src/pages/record/RecordStore.ts
index 160393ce69..fb3aa57b0a 100644
--- a/mathesar_ui/src/pages/record/RecordStore.ts
+++ b/mathesar_ui/src/pages/record/RecordStore.ts
@@ -1,7 +1,7 @@
 import { derived, writable, type Readable } from 'svelte/store';
 
-import type { TableEntry } from '@mathesar/api/types/tables';
-import type { Response as ApiResponse } from '@mathesar/api/types/tables/records';
+import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Response as ApiResponse } from '@mathesar/api/rest/types/tables/records';
 import { WritableMap } from '@mathesar/component-library';
 import {
   renderTransitiveRecordSummary,
@@ -12,7 +12,7 @@ import {
   getAPI,
   patchAPI,
   type RequestStatus,
-} from '@mathesar/api/utils/requestUtils';
+} from '@mathesar/api/rest/utils/requestUtils';
 import { getErrorMessage } from '@mathesar/utils/errors';
 import RecordSummaryStore from '@mathesar/stores/table-data/record-summaries/RecordSummaryStore';
 
diff --git a/mathesar_ui/src/pages/record/TableWidget.svelte b/mathesar_ui/src/pages/record/TableWidget.svelte
index 0c14580e81..0662ff1edb 100644
--- a/mathesar_ui/src/pages/record/TableWidget.svelte
+++ b/mathesar_ui/src/pages/record/TableWidget.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import type { TableEntry } from '@mathesar/api/types/tables';
-  import type { Column } from '@mathesar/api/types/tables/columns';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Column } from '@mathesar/api/rest/types/tables/columns';
   import TableName from '@mathesar/components/TableName.svelte';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
   import {
diff --git a/mathesar_ui/src/pages/record/Widgets.svelte b/mathesar_ui/src/pages/record/Widgets.svelte
index 07492bbbcb..3ee77992ca 100644
--- a/mathesar_ui/src/pages/record/Widgets.svelte
+++ b/mathesar_ui/src/pages/record/Widgets.svelte
@@ -4,7 +4,7 @@
   import type {
     JoinableTable,
     JoinableTablesResult,
-  } from '@mathesar/api/types/tables/joinable_tables';
+  } from '@mathesar/api/rest/types/tables/joinable_tables';
   import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import { iconRecord } from '@mathesar/icons';
diff --git a/mathesar_ui/src/pages/schema/EditTable.svelte b/mathesar_ui/src/pages/schema/EditTable.svelte
index 3d714f1775..287d6a756d 100644
--- a/mathesar_ui/src/pages/schema/EditTable.svelte
+++ b/mathesar_ui/src/pages/schema/EditTable.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import type { ModalController } from '@mathesar-component-library';
   import EditTableHoc from '@mathesar/components/EditTableHOC.svelte';
   import Identifier from '@mathesar/components/Identifier.svelte';
diff --git a/mathesar_ui/src/pages/schema/ExplorationItem.svelte b/mathesar_ui/src/pages/schema/ExplorationItem.svelte
index 51b627a5c2..5a7758171f 100644
--- a/mathesar_ui/src/pages/schema/ExplorationItem.svelte
+++ b/mathesar_ui/src/pages/schema/ExplorationItem.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import type { QueryInstance } from '@mathesar/api/types/queries';
+  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import { Icon } from '@mathesar-component-library';
   import TableName from '@mathesar/components/TableName.svelte';
   import { iconExploration } from '@mathesar/icons';
diff --git a/mathesar_ui/src/pages/schema/ExplorationsList.svelte b/mathesar_ui/src/pages/schema/ExplorationsList.svelte
index d770e80b3d..74259bfbf5 100644
--- a/mathesar_ui/src/pages/schema/ExplorationsList.svelte
+++ b/mathesar_ui/src/pages/schema/ExplorationsList.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import type { QueryInstance } from '@mathesar/api/types/queries';
+  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import { iconExploration } from '@mathesar/icons';
   import ExplorationItem from './ExplorationItem.svelte';
diff --git a/mathesar_ui/src/pages/schema/SchemaAccessControlModal.svelte b/mathesar_ui/src/pages/schema/SchemaAccessControlModal.svelte
index 6cfefbfa3a..9d98ec5be0 100644
--- a/mathesar_ui/src/pages/schema/SchemaAccessControlModal.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaAccessControlModal.svelte
@@ -11,7 +11,7 @@
     setUsersStoreInContext,
     type UserModel,
   } from '@mathesar/stores/users';
-  import type { UserRole } from '@mathesar/api/users';
+  import type { UserRole } from '@mathesar/api/rest/users';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { AccessControlView } from '@mathesar/systems/users-and-permissions';
   import type { ObjectRoleMap } from '@mathesar/utils/permissions';
diff --git a/mathesar_ui/src/pages/schema/SchemaExplorations.svelte b/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
index d64abb12e9..fa60216e22 100644
--- a/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
@@ -3,7 +3,7 @@
   import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import { AnchorButton } from '@mathesar-component-library';
-  import type { QueryInstance } from '@mathesar/api/types/queries';
+  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import ExplorationsList from './ExplorationsList.svelte';
diff --git a/mathesar_ui/src/pages/schema/SchemaOverview.svelte b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
index 109b8684b5..3c541b383b 100644
--- a/mathesar_ui/src/pages/schema/SchemaOverview.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import type { QueryInstance } from '@mathesar/api/types/queries';
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import { AnchorButton, Button } from '@mathesar-component-library';
   import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
-  import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
+  import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { iconRefresh } from '@mathesar/icons';
   import { refetchQueriesForSchema } from '@mathesar/stores/queries';
diff --git a/mathesar_ui/src/pages/schema/SchemaTables.svelte b/mathesar_ui/src/pages/schema/SchemaTables.svelte
index 47d2cbccac..9126aa29c6 100644
--- a/mathesar_ui/src/pages/schema/SchemaTables.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaTables.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
diff --git a/mathesar_ui/src/pages/schema/TableCard.svelte b/mathesar_ui/src/pages/schema/TableCard.svelte
index a13697aaee..ca7315ea42 100644
--- a/mathesar_ui/src/pages/schema/TableCard.svelte
+++ b/mathesar_ui/src/pages/schema/TableCard.svelte
@@ -6,7 +6,7 @@
     Icon,
     Truncate,
   } from '@mathesar-component-library';
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import LinkMenuItem from '@mathesar/component-library/menu/LinkMenuItem.svelte';
   import TableName from '@mathesar/components/TableName.svelte';
diff --git a/mathesar_ui/src/pages/schema/TablesList.svelte b/mathesar_ui/src/pages/schema/TablesList.svelte
index b99b674d51..8007e90d83 100644
--- a/mathesar_ui/src/pages/schema/TablesList.svelte
+++ b/mathesar_ui/src/pages/schema/TablesList.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import { iconTable } from '@mathesar/icons';
   import EmptyEntity from './EmptyEntity.svelte';
diff --git a/mathesar_ui/src/pages/table/TablePage.svelte b/mathesar_ui/src/pages/table/TablePage.svelte
index f554941a9f..050ec81961 100644
--- a/mathesar_ui/src/pages/table/TablePage.svelte
+++ b/mathesar_ui/src/pages/table/TablePage.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { router } from 'tinro';
 
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
   import {
     setTabularDataStoreInContext,
diff --git a/mathesar_ui/src/routes/DataExplorerRoute.svelte b/mathesar_ui/src/routes/DataExplorerRoute.svelte
index f8f7e31dd7..83b4bab9b8 100644
--- a/mathesar_ui/src/routes/DataExplorerRoute.svelte
+++ b/mathesar_ui/src/routes/DataExplorerRoute.svelte
@@ -10,7 +10,7 @@
   import { getQuery } from '@mathesar/stores/queries';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
   import type { CancellablePromise } from '@mathesar/component-library';
-  import type { QueryInstance } from '@mathesar/api/types/queries';
+  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import type { UnsavedQueryInstance } from '@mathesar/stores/queries';
   import DataExplorerPage from '@mathesar/pages/data-explorer/DataExplorerPage.svelte';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
diff --git a/mathesar_ui/src/routes/DatabaseRoute.svelte b/mathesar_ui/src/routes/DatabaseRoute.svelte
index 7c4cc61d30..1399e452ba 100644
--- a/mathesar_ui/src/routes/DatabaseRoute.svelte
+++ b/mathesar_ui/src/routes/DatabaseRoute.svelte
@@ -7,7 +7,7 @@
   import DatabasePage from '@mathesar/pages/database/DatabasePage.svelte';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import { connectionsStore } from '@mathesar/stores/databases';
-  import type { Connection } from '@mathesar/api/connections';
+  import type { Connection } from '@mathesar/api/rest/connections';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import SchemaRoute from './SchemaRoute.svelte';
 
diff --git a/mathesar_ui/src/routes/RecordPageRoute.svelte b/mathesar_ui/src/routes/RecordPageRoute.svelte
index eecccf3d51..8ff5c86a9c 100644
--- a/mathesar_ui/src/routes/RecordPageRoute.svelte
+++ b/mathesar_ui/src/routes/RecordPageRoute.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import RecordPage from '@mathesar/pages/record/RecordPage.svelte';
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import RecordStore from '@mathesar/pages/record/RecordStore';
 
diff --git a/mathesar_ui/src/stores/abstract-types/operations/summarization.ts b/mathesar_ui/src/stores/abstract-types/operations/summarization.ts
index 49df55096b..04094d83bf 100644
--- a/mathesar_ui/src/stores/abstract-types/operations/summarization.ts
+++ b/mathesar_ui/src/stores/abstract-types/operations/summarization.ts
@@ -1,4 +1,4 @@
-import { querySummarizationFunctionIds } from '@mathesar/api/types/queries';
+import { querySummarizationFunctionIds } from '@mathesar/api/rest/types/queries';
 import { abstractTypeCategory } from '../constants';
 import type {
   AbstractTypeCategoryIdentifier,
diff --git a/mathesar_ui/src/stores/abstract-types/store.ts b/mathesar_ui/src/stores/abstract-types/store.ts
index dd9a6e05d7..2020d6d28d 100644
--- a/mathesar_ui/src/stores/abstract-types/store.ts
+++ b/mathesar_ui/src/stores/abstract-types/store.ts
@@ -2,8 +2,8 @@ import type { Readable, Unsubscriber, Writable } from 'svelte/store';
 import { derived, get, writable } from 'svelte/store';
 
 import type { CancellablePromise } from '@mathesar-component-library';
-import type { Connection } from '@mathesar/api/connections';
-import { States, getAPI } from '@mathesar/api/utils/requestUtils';
+import type { Connection } from '@mathesar/api/rest/connections';
+import { States, getAPI } from '@mathesar/api/rest/utils/requestUtils';
 import { currentDatabase } from '@mathesar/stores/databases';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import { constructAbstractTypeMapFromResponse } from './abstractTypeCategories';
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/boolean.ts b/mathesar_ui/src/stores/abstract-types/type-configs/boolean.ts
index 035c01c62f..5d5a7c865f 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/boolean.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/boolean.ts
@@ -2,7 +2,7 @@ import type { FormValues } from '@mathesar-component-library/types';
 import type {
   BooleanDisplayOptions,
   Column,
-} from '@mathesar/api/types/tables/columns';
+} from '@mathesar/api/rest/types/tables/columns';
 import { iconUiTypeBoolean } from '@mathesar/icons';
 import type {
   AbstractTypeConfigForm,
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/comboTypes/arrayFactory.ts b/mathesar_ui/src/stores/abstract-types/type-configs/comboTypes/arrayFactory.ts
index b68df4ca3a..f1e8f7c11d 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/comboTypes/arrayFactory.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/comboTypes/arrayFactory.ts
@@ -1,5 +1,5 @@
 import { iconUiTypeArray } from '@mathesar/icons';
-import type { ArrayTypeOptions } from '@mathesar/api/types/tables/columns';
+import type { ArrayTypeOptions } from '@mathesar/api/rest/types/tables/columns';
 import type { AbstractTypeConfigurationFactory } from '../../types';
 import { getAbstractTypeForDbType } from '../../utils';
 
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/date.ts b/mathesar_ui/src/stores/abstract-types/type-configs/date.ts
index ee4e933afc..6086746ef1 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/date.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/date.ts
@@ -3,7 +3,7 @@ import type {
   DateDisplayOptions,
   DateFormat,
   Column,
-} from '@mathesar/api/types/tables/columns';
+} from '@mathesar/api/rest/types/tables/columns';
 import { iconUiTypeDate } from '@mathesar/icons';
 import type {
   AbstractTypeConfigForm,
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/datetime.ts b/mathesar_ui/src/stores/abstract-types/type-configs/datetime.ts
index a5a603bf77..88a30ea5e6 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/datetime.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/datetime.ts
@@ -4,7 +4,7 @@ import type {
   TimeFormat,
   DateFormat,
   Column,
-} from '@mathesar/api/types/tables/columns';
+} from '@mathesar/api/rest/types/tables/columns';
 import { iconUiTypeDateTime } from '@mathesar/icons';
 import type {
   AbstractTypeDbConfig,
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/duration.ts b/mathesar_ui/src/stores/abstract-types/type-configs/duration.ts
index a4b7237471..616b7ed5a5 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/duration.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/duration.ts
@@ -2,7 +2,7 @@ import type { FormValues } from '@mathesar-component-library/types';
 import type {
   DurationDisplayOptions,
   Column,
-} from '@mathesar/api/types/tables/columns';
+} from '@mathesar/api/rest/types/tables/columns';
 import { iconUiTypeDuration } from '@mathesar/icons';
 import { DurationSpecification } from '@mathesar/utils/duration';
 import type {
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/money.ts b/mathesar_ui/src/stores/abstract-types/type-configs/money.ts
index e3e40c65f2..cc990f048f 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/money.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/money.ts
@@ -2,7 +2,7 @@ import type {
   MoneyDisplayOptions,
   NumberFormat,
   Column,
-} from '@mathesar/api/types/tables/columns';
+} from '@mathesar/api/rest/types/tables/columns';
 import type { FormValues } from '@mathesar-component-library/types';
 import { iconUiTypeMoney } from '@mathesar/icons';
 import type {
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/number.ts b/mathesar_ui/src/stores/abstract-types/type-configs/number.ts
index 670a6a6ddf..c64b43ffa9 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/number.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/number.ts
@@ -2,7 +2,7 @@ import type {
   NumberDisplayOptions,
   NumberFormat,
   Column,
-} from '@mathesar/api/types/tables/columns';
+} from '@mathesar/api/rest/types/tables/columns';
 import type { FormValues } from '@mathesar-component-library/types';
 import type { DbType } from '@mathesar/AppTypes';
 import { iconUiTypeNumber } from '@mathesar/icons';
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/text.ts b/mathesar_ui/src/stores/abstract-types/type-configs/text.ts
index 67c1174cea..702822bc09 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/text.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/text.ts
@@ -1,7 +1,7 @@
 import type { FormValues } from '@mathesar-component-library/types';
 
 import type { DbType } from '@mathesar/AppTypes';
-import type { Column } from '@mathesar/api/types/tables/columns';
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import { iconUiTypeText } from '@mathesar/icons';
 import type {
   AbstractTypeConfigForm,
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/time.ts b/mathesar_ui/src/stores/abstract-types/type-configs/time.ts
index 3a29f6362f..4924c3dafa 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/time.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/time.ts
@@ -3,7 +3,7 @@ import type {
   TimeDisplayOptions,
   TimeFormat,
   Column,
-} from '@mathesar/api/types/tables/columns';
+} from '@mathesar/api/rest/types/tables/columns';
 import { iconUiTypeTime } from '@mathesar/icons';
 import type {
   AbstractTypeDbConfig,
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/utils.ts b/mathesar_ui/src/stores/abstract-types/type-configs/utils.ts
index f9be6a5022..e01f60f4f1 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/utils.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/utils.ts
@@ -2,7 +2,7 @@ import { dayjs } from '@mathesar-component-library';
 import type {
   DateFormat,
   TimeFormat,
-} from '@mathesar/api/types/tables/columns';
+} from '@mathesar/api/rest/types/tables/columns';
 import { DateTimeSpecification } from '@mathesar/utils/date-time';
 
 export function getDateFormatOptions(): Record<DateFormat, { label: string }> {
diff --git a/mathesar_ui/src/stores/abstract-types/types.ts b/mathesar_ui/src/stores/abstract-types/types.ts
index 0c45df4d67..8770702b74 100644
--- a/mathesar_ui/src/stores/abstract-types/types.ts
+++ b/mathesar_ui/src/stores/abstract-types/types.ts
@@ -5,9 +5,9 @@ import type {
   IconProps,
 } from '@mathesar-component-library/types';
 import type { DbType } from '@mathesar/AppTypes';
-import type { QuerySummarizationFunctionId } from '@mathesar/api/types/queries';
-import type { Column } from '@mathesar/api/types/tables/columns';
-import type { States } from '@mathesar/api/utils/requestUtils';
+import type { QuerySummarizationFunctionId } from '@mathesar/api/rest/types/queries';
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type { States } from '@mathesar/api/rest/utils/requestUtils';
 import type { CellDataType } from '@mathesar/components/cell-fabric/data-types/typeDefinitions';
 import type { abstractTypeCategory } from './constants';
 
diff --git a/mathesar_ui/src/stores/databases.ts b/mathesar_ui/src/stores/databases.ts
index d0817b89cb..3e9344bc22 100644
--- a/mathesar_ui/src/stores/databases.ts
+++ b/mathesar_ui/src/stores/databases.ts
@@ -12,7 +12,7 @@ import connectionsApi, {
   type CreateFromScratchProps,
   type CreateWithNewUserProps,
   type UpdatableConnectionProperties,
-} from '@mathesar/api/connections';
+} from '@mathesar/api/rest/connections';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import type { MakeWritablePropertiesReadable } from '@mathesar/utils/typeUtils';
 
diff --git a/mathesar_ui/src/stores/queries.ts b/mathesar_ui/src/stores/queries.ts
index 8c9c85595f..439719906c 100644
--- a/mathesar_ui/src/stores/queries.ts
+++ b/mathesar_ui/src/stores/queries.ts
@@ -40,11 +40,11 @@ import {
   postAPI,
   putAPI,
   addQueryParamsToUrl,
-} from '@mathesar/api/utils/requestUtils';
+} from '@mathesar/api/rest/utils/requestUtils';
 import type {
   RequestStatus,
   PaginatedResponse,
-} from '@mathesar/api/utils/requestUtils';
+} from '@mathesar/api/rest/utils/requestUtils';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import CacheManager from '@mathesar/utils/CacheManager';
 import type { SchemaEntry } from '@mathesar/AppTypes';
@@ -54,7 +54,7 @@ import type {
   QueryRunRequest,
   QueryRunResponse,
   QueryResultsResponse,
-} from '@mathesar/api/types/queries';
+} from '@mathesar/api/rest/types/queries';
 import { CancellablePromise } from '@mathesar-component-library';
 import { SHARED_LINK_UUID_QUERY_PARAM } from '@mathesar/utils/shares';
 
diff --git a/mathesar_ui/src/stores/schemas.ts b/mathesar_ui/src/stores/schemas.ts
index c327f1f7da..3844cfb829 100644
--- a/mathesar_ui/src/stores/schemas.ts
+++ b/mathesar_ui/src/stores/schemas.ts
@@ -5,9 +5,9 @@ import { preloadCommonData } from '@mathesar/utils/preloadData';
 import type {
   PaginatedResponse,
   RequestStatus,
-} from '@mathesar/api/utils/requestUtils';
-import schemasApi from '@mathesar/api/schemas';
-import type { Connection } from '@mathesar/api/connections';
+} from '@mathesar/api/rest/utils/requestUtils';
+import schemasApi from '@mathesar/api/rest/schemas';
+import type { Connection } from '@mathesar/api/rest/connections';
 
 import type { SchemaEntry, SchemaResponse } from '@mathesar/AppTypes';
 import type { CancellablePromise } from '@mathesar-component-library';
diff --git a/mathesar_ui/src/stores/table-data/TableStructure.ts b/mathesar_ui/src/stores/table-data/TableStructure.ts
index cf2554f21f..c58693f047 100644
--- a/mathesar_ui/src/stores/table-data/TableStructure.ts
+++ b/mathesar_ui/src/stores/table-data/TableStructure.ts
@@ -3,8 +3,8 @@ import { derived } from 'svelte/store';
 
 import type { DBObjectEntry } from '@mathesar/AppTypes';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
-import { States } from '@mathesar/api/utils/requestUtils';
-import type { Column } from '@mathesar/api/types/tables/columns';
+import { States } from '@mathesar/api/rest/utils/requestUtils';
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import { ColumnsDataStore } from './columns';
 import type { ConstraintsData } from './constraints';
 import { ConstraintsDataStore } from './constraints';
diff --git a/mathesar_ui/src/stores/table-data/__tests__/utils.test.ts b/mathesar_ui/src/stores/table-data/__tests__/utils.test.ts
index 8133958c31..f0ca94a9ad 100644
--- a/mathesar_ui/src/stores/table-data/__tests__/utils.test.ts
+++ b/mathesar_ui/src/stores/table-data/__tests__/utils.test.ts
@@ -1,5 +1,5 @@
 import { ImmutableMap } from '@mathesar/component-library';
-import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
+import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import type { RowStatus } from '../meta';
 import type { CellKey, RowKey } from '../utils';
 import { ROW_HAS_CELL_ERROR_MSG, getRowStatus } from '../utils';
diff --git a/mathesar_ui/src/stores/table-data/columns.ts b/mathesar_ui/src/stores/table-data/columns.ts
index 5e0f41f872..e91aeeec01 100644
--- a/mathesar_ui/src/stores/table-data/columns.ts
+++ b/mathesar_ui/src/stores/table-data/columns.ts
@@ -1,22 +1,22 @@
 import { type Readable, derived, writable } from 'svelte/store';
-import type { TableEntry } from '@mathesar/api/types/tables';
+import type { TableEntry } from '@mathesar/api/rest/types/tables';
 import {
   type CancellablePromise,
   EventHandler,
   WritableSet,
 } from '@mathesar-component-library';
-import type { Column } from '@mathesar/api/types/tables/columns';
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type {
   PaginatedResponse,
   RequestStatus,
-} from '@mathesar/api/utils/requestUtils';
+} from '@mathesar/api/rest/utils/requestUtils';
 import {
   deleteAPI,
   getAPI,
   patchAPI,
   postAPI,
   addQueryParamsToUrl,
-} from '@mathesar/api/utils/requestUtils';
+} from '@mathesar/api/rest/utils/requestUtils';
 import { getErrorMessage } from '@mathesar/utils/errors';
 import type { ShareConsumer } from '@mathesar/utils/shares';
 
diff --git a/mathesar_ui/src/stores/table-data/constraints.ts b/mathesar_ui/src/stores/table-data/constraints.ts
index 2a392761d0..7f2fa277fe 100644
--- a/mathesar_ui/src/stores/table-data/constraints.ts
+++ b/mathesar_ui/src/stores/table-data/constraints.ts
@@ -5,7 +5,7 @@ import {
   postAPI,
   States,
   addQueryParamsToUrl,
-} from '@mathesar/api/utils/requestUtils';
+} from '@mathesar/api/rest/utils/requestUtils';
 import type {
   Writable,
   Updater,
@@ -13,11 +13,11 @@ import type {
   Unsubscriber,
   Readable,
 } from 'svelte/store';
-import type { PaginatedResponse } from '@mathesar/api/utils/requestUtils';
+import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
 import type { CancellablePromise } from '@mathesar-component-library';
-import type { TableEntry } from '@mathesar/api/types/tables';
-import type { Constraint as ApiConstraint } from '@mathesar/api/types/tables/constraints';
-import type { Column } from '@mathesar/api/types/tables/columns';
+import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Constraint as ApiConstraint } from '@mathesar/api/rest/types/tables/constraints';
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { ShareConsumer } from '@mathesar/utils/shares';
 
 /**
diff --git a/mathesar_ui/src/stores/table-data/constraintsUtils.ts b/mathesar_ui/src/stores/table-data/constraintsUtils.ts
index 5118774051..536ecc74a4 100644
--- a/mathesar_ui/src/stores/table-data/constraintsUtils.ts
+++ b/mathesar_ui/src/stores/table-data/constraintsUtils.ts
@@ -1,8 +1,8 @@
 import type {
   Constraint,
   FkConstraint,
-} from '@mathesar/api/types/tables/constraints';
-import type { Column } from '@mathesar/api/types/tables/columns';
+} from '@mathesar/api/rest/types/tables/constraints';
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
 
 export function constraintIsFk(c: Constraint): c is FkConstraint {
   return c.type === 'foreignkey';
diff --git a/mathesar_ui/src/stores/table-data/filtering.ts b/mathesar_ui/src/stores/table-data/filtering.ts
index 50fbf335ac..3ec733bd62 100644
--- a/mathesar_ui/src/stores/table-data/filtering.ts
+++ b/mathesar_ui/src/stores/table-data/filtering.ts
@@ -3,7 +3,7 @@ import type {
   GetRequestParams,
   FilterCondition,
   FilterConditionParams,
-} from '@mathesar/api/types/tables/records';
+} from '@mathesar/api/rest/types/tables/records';
 
 export interface FilterEntry {
   readonly columnId: number;
diff --git a/mathesar_ui/src/stores/table-data/grouping.ts b/mathesar_ui/src/stores/table-data/grouping.ts
index 934c183b46..193cb8f810 100644
--- a/mathesar_ui/src/stores/table-data/grouping.ts
+++ b/mathesar_ui/src/stores/table-data/grouping.ts
@@ -1,4 +1,4 @@
-import type { GetRequestParams } from '@mathesar/api/types/tables/records';
+import type { GetRequestParams } from '@mathesar/api/rest/types/tables/records';
 import { isDefinedNonNullable } from '@mathesar/component-library';
 
 export interface GroupEntry {
diff --git a/mathesar_ui/src/stores/table-data/meta.ts b/mathesar_ui/src/stores/table-data/meta.ts
index e61fd5b9ea..2a269b1930 100644
--- a/mathesar_ui/src/stores/table-data/meta.ts
+++ b/mathesar_ui/src/stores/table-data/meta.ts
@@ -6,7 +6,7 @@ import {
   ImmutableSet,
   WritableMap,
 } from '@mathesar-component-library';
-import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
+import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import type { TersePagination } from '@mathesar/utils/Pagination';
 import Pagination from '@mathesar/utils/Pagination';
 import Url64 from '@mathesar/utils/Url64';
diff --git a/mathesar_ui/src/stores/table-data/processedColumns.ts b/mathesar_ui/src/stores/table-data/processedColumns.ts
index a863bd58cb..c88aa4ae9e 100644
--- a/mathesar_ui/src/stores/table-data/processedColumns.ts
+++ b/mathesar_ui/src/stores/table-data/processedColumns.ts
@@ -1,7 +1,7 @@
 import type { ComponentAndProps } from '@mathesar-component-library/types';
-import type { TableEntry } from '@mathesar/api/types/tables';
-import type { Column } from '@mathesar/api/types/tables/columns';
-import type { Constraint } from '@mathesar/api/types/tables/constraints';
+import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type { Constraint } from '@mathesar/api/rest/types/tables/constraints';
 import type { CellColumnFabric } from '@mathesar/components/cell-fabric/types';
 import {
   getCellCap,
diff --git a/mathesar_ui/src/stores/table-data/record-summaries/recordSummaryUtils.ts b/mathesar_ui/src/stores/table-data/record-summaries/recordSummaryUtils.ts
index fc153ef851..89095ab100 100644
--- a/mathesar_ui/src/stores/table-data/record-summaries/recordSummaryUtils.ts
+++ b/mathesar_ui/src/stores/table-data/record-summaries/recordSummaryUtils.ts
@@ -2,7 +2,7 @@ import { ImmutableMap } from '@mathesar-component-library';
 import type {
   ApiDataForRecordSummariesInFkColumn,
   ApiRecordSummaryInputData,
-} from '@mathesar/api/types/tables/records';
+} from '@mathesar/api/rest/types/tables/records';
 import { escapeHtml } from '@mathesar/utils/stringUtils';
 
 /** A generalized type that can be used for Map or ImmutableMap or others. */
diff --git a/mathesar_ui/src/stores/table-data/records.ts b/mathesar_ui/src/stores/table-data/records.ts
index d02b2e8733..30243572ad 100644
--- a/mathesar_ui/src/stores/table-data/records.ts
+++ b/mathesar_ui/src/stores/table-data/records.ts
@@ -12,8 +12,8 @@ import {
   isDefinedNonNullable,
   type CancellablePromise,
 } from '@mathesar-component-library';
-import type { TableEntry } from '@mathesar/api/types/tables';
-import type { Column } from '@mathesar/api/types/tables/columns';
+import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type {
   GetRequestParams as ApiGetRequestParams,
   Group as ApiGroup,
@@ -21,7 +21,7 @@ import type {
   Result as ApiRecord,
   Response as ApiRecordsResponse,
   GroupingMode,
-} from '@mathesar/api/types/tables/records';
+} from '@mathesar/api/rest/types/tables/records';
 import {
   States,
   deleteAPI,
@@ -29,7 +29,7 @@ import {
   patchAPI,
   postAPI,
   getQueryStringFromParams,
-} from '@mathesar/api/utils/requestUtils';
+} from '@mathesar/api/rest/utils/requestUtils';
 import type Pagination from '@mathesar/utils/Pagination';
 import { getErrorMessage } from '@mathesar/utils/errors';
 import { pluralize } from '@mathesar/utils/languageUtils';
diff --git a/mathesar_ui/src/stores/table-data/searchFuzzy.ts b/mathesar_ui/src/stores/table-data/searchFuzzy.ts
index a50e7766df..411f9b6f5c 100644
--- a/mathesar_ui/src/stores/table-data/searchFuzzy.ts
+++ b/mathesar_ui/src/stores/table-data/searchFuzzy.ts
@@ -1,4 +1,4 @@
-import type { GetRequestParams } from '@mathesar/api/types/tables/records';
+import type { GetRequestParams } from '@mathesar/api/rest/types/tables/records';
 import { ImmutableMap } from '@mathesar/component-library';
 
 /**
diff --git a/mathesar_ui/src/stores/table-data/sorting.ts b/mathesar_ui/src/stores/table-data/sorting.ts
index b98a33d9b9..198444baaa 100644
--- a/mathesar_ui/src/stores/table-data/sorting.ts
+++ b/mathesar_ui/src/stores/table-data/sorting.ts
@@ -7,7 +7,7 @@ import type {
   SortDirection as ApiSortDirection,
   SortingEntry as ApiSortingEntry,
   GetRequestParams,
-} from '@mathesar/api/types/tables/records';
+} from '@mathesar/api/rest/types/tables/records';
 import type { Grouping } from './grouping';
 
 function sortDirectionIsValid(d: string): boolean {
diff --git a/mathesar_ui/src/stores/table-data/tabularData.ts b/mathesar_ui/src/stores/table-data/tabularData.ts
index bd0e5989a5..45f5e159c1 100644
--- a/mathesar_ui/src/stores/table-data/tabularData.ts
+++ b/mathesar_ui/src/stores/table-data/tabularData.ts
@@ -7,10 +7,10 @@ import {
   type Writable,
 } from 'svelte/store';
 import type { DBObjectEntry } from '@mathesar/AppTypes';
-import type { TableEntry } from '@mathesar/api/types/tables';
+import type { TableEntry } from '@mathesar/api/rest/types/tables';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
-import { States } from '@mathesar/api/utils/requestUtils';
-import type { Column } from '@mathesar/api/types/tables/columns';
+import { States } from '@mathesar/api/rest/utils/requestUtils';
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import { SheetSelection } from '@mathesar/components/sheet';
 import { getColumnOrder } from '@mathesar/utils/tables';
 import type { ShareConsumer } from '@mathesar/utils/shares';
diff --git a/mathesar_ui/src/stores/table-data/utils.ts b/mathesar_ui/src/stores/table-data/utils.ts
index a7c0f08d75..5a2ebe4989 100644
--- a/mathesar_ui/src/stores/table-data/utils.ts
+++ b/mathesar_ui/src/stores/table-data/utils.ts
@@ -4,9 +4,9 @@ import {
   ImmutableSet,
   WritableMap,
 } from '@mathesar-component-library';
-import type { Column } from '@mathesar/api/types/tables/columns';
-import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
-import { getMostImportantRequestStatusState } from '@mathesar/api/utils/requestUtils';
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+import { getMostImportantRequestStatusState } from '@mathesar/api/rest/utils/requestUtils';
 import type { RowStatus } from './meta';
 import type { RecordRow } from './records';
 
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index 9a438901e3..f438163bff 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -23,26 +23,26 @@ import {
 import type {
   MinimalColumnDetails,
   TableEntry,
-} from '@mathesar/api/types/tables';
+} from '@mathesar/api/rest/types/tables';
 import type {
   SplitTableRequest,
   SplitTableResponse,
-} from '@mathesar/api/types/tables/split_table';
+} from '@mathesar/api/rest/types/tables/split_table';
 import type { DBObjectEntry, Database, SchemaEntry } from '@mathesar/AppTypes';
 import { invalidIf } from '@mathesar/components/form';
 import type {
   PaginatedResponse,
   RequestStatus,
-} from '@mathesar/api/utils/requestUtils';
+} from '@mathesar/api/rest/utils/requestUtils';
 import {
   deleteAPI,
   getAPI,
   patchAPI,
   postAPI,
-} from '@mathesar/api/utils/requestUtils';
+} from '@mathesar/api/rest/utils/requestUtils';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import { isTableImportConfirmationRequired } from '@mathesar/utils/tables';
-import type { JoinableTablesResult } from '@mathesar/api/types/tables/joinable_tables';
+import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
 import type { AtLeastOne } from '@mathesar/typeUtils';
 import { currentSchemaId, addCountToSchemaNumTables } from './schemas';
 
diff --git a/mathesar_ui/src/stores/userProfile.ts b/mathesar_ui/src/stores/userProfile.ts
index 8ef270c9cc..bccca8acd3 100644
--- a/mathesar_ui/src/stores/userProfile.ts
+++ b/mathesar_ui/src/stores/userProfile.ts
@@ -1,7 +1,7 @@
 import { setContext, getContext } from 'svelte';
 import { writable, type Writable } from 'svelte/store';
 
-import type { User } from '@mathesar/api/users';
+import type { User } from '@mathesar/api/rest/users';
 import { UserModel } from './users';
 
 const contextKey = Symbol('UserProfileStore');
diff --git a/mathesar_ui/src/stores/users.ts b/mathesar_ui/src/stores/users.ts
index 4057c14a6f..20ef68ca6c 100644
--- a/mathesar_ui/src/stores/users.ts
+++ b/mathesar_ui/src/stores/users.ts
@@ -8,8 +8,8 @@ import userApi, {
   type DatabaseRole,
   type SchemaRole,
   type UserRole,
-} from '@mathesar/api/users';
-import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
+} from '@mathesar/api/rest/users';
+import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { getErrorMessage } from '@mathesar/utils/errors';
 import type { MakeWritablePropertiesReadable } from '@mathesar/utils/typeUtils';
 import type { Database, SchemaEntry } from '@mathesar/AppTypes';
diff --git a/mathesar_ui/src/systems/connections/AddConnection.svelte b/mathesar_ui/src/systems/connections/AddConnection.svelte
index ff2e2fc892..4d24dd613a 100644
--- a/mathesar_ui/src/systems/connections/AddConnection.svelte
+++ b/mathesar_ui/src/systems/connections/AddConnection.svelte
@@ -15,7 +15,7 @@
     type CommonCreationProps,
     type Connection,
     type SampleDataSchemaIdentifier,
-  } from '@mathesar/api/connections';
+  } from '@mathesar/api/rest/connections';
   import Checkbox from '@mathesar/component-library/checkbox/Checkbox.svelte';
   import LabeledInput from '@mathesar/component-library/labeled-input/LabeledInput.svelte';
   import Select from '@mathesar/component-library/select/Select.svelte';
diff --git a/mathesar_ui/src/systems/connections/AddConnectionModal.svelte b/mathesar_ui/src/systems/connections/AddConnectionModal.svelte
index 6bcd2671c9..ff190ae2d0 100644
--- a/mathesar_ui/src/systems/connections/AddConnectionModal.svelte
+++ b/mathesar_ui/src/systems/connections/AddConnectionModal.svelte
@@ -6,7 +6,7 @@
     ControlledModal,
     type ModalController,
   } from '@mathesar-component-library';
-  import type { Connection } from '@mathesar/api/connections';
+  import type { Connection } from '@mathesar/api/rest/connections';
   import { getDatabasePageUrl } from '@mathesar/routes/urls';
   import AddConnection from './AddConnection.svelte';
 
diff --git a/mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte b/mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte
index 1fbe0c6caa..fb4335b0ac 100644
--- a/mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte
+++ b/mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte
@@ -12,7 +12,7 @@
   import Identifier from '@mathesar/components/Identifier.svelte';
   import RichText from '@mathesar/components/rich-text/RichText.svelte';
   import WarningBox from '@mathesar/components/message-boxes/WarningBox.svelte';
-  import type { Connection } from '@mathesar/api/connections';
+  import type { Connection } from '@mathesar/api/rest/connections';
   import {
     connectionHasUniqueDatabaseReference,
     connectionsStore,
diff --git a/mathesar_ui/src/systems/connections/EditConnectionModal.svelte b/mathesar_ui/src/systems/connections/EditConnectionModal.svelte
index 6c8bb1b5cd..ebcae681f9 100644
--- a/mathesar_ui/src/systems/connections/EditConnectionModal.svelte
+++ b/mathesar_ui/src/systems/connections/EditConnectionModal.svelte
@@ -8,7 +8,7 @@
     PasswordInput,
     type ModalController,
   } from '@mathesar-component-library';
-  import type { Connection } from '@mathesar/api/connections';
+  import type { Connection } from '@mathesar/api/rest/connections';
   import Checkbox from '@mathesar/component-library/checkbox/Checkbox.svelte';
   import TextInput from '@mathesar/component-library/text-input/TextInput.svelte';
   import Identifier from '@mathesar/components/Identifier.svelte';
diff --git a/mathesar_ui/src/systems/connections/generalConnections.ts b/mathesar_ui/src/systems/connections/generalConnections.ts
index 11b46f4b04..6530992bda 100644
--- a/mathesar_ui/src/systems/connections/generalConnections.ts
+++ b/mathesar_ui/src/systems/connections/generalConnections.ts
@@ -4,7 +4,7 @@ import { derived, type Readable } from 'svelte/store';
 import type {
   Connection,
   ConnectionReference,
-} from '@mathesar/api/connections';
+} from '@mathesar/api/rest/connections';
 import { connectionsStore } from '@mathesar/stores/databases';
 import {
   preloadCommonData,
diff --git a/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte b/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
index 6c10c27a85..86155fb7a5 100644
--- a/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
+++ b/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
@@ -17,7 +17,7 @@
     iconInspector,
     iconExploration,
   } from '@mathesar/icons';
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import { tables as tablesDataStore } from '@mathesar/stores/tables';
   import TableName from '@mathesar/components/TableName.svelte';
   import SelectTableWithinCurrentSchema from '@mathesar/components/SelectTableWithinCurrentSchema.svelte';
diff --git a/mathesar_ui/src/systems/data-explorer/QueryFilterTransformationModel.ts b/mathesar_ui/src/systems/data-explorer/QueryFilterTransformationModel.ts
index dcb4a935d4..2a04e65b01 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryFilterTransformationModel.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryFilterTransformationModel.ts
@@ -1,6 +1,6 @@
 import { _ } from 'svelte-i18n';
 import { get } from 'svelte/store';
-import type { QueryInstanceFilterTransformation } from '@mathesar/api/types/queries';
+import type { QueryInstanceFilterTransformation } from '@mathesar/api/rest/types/queries';
 import { getLimitedFilterInformationById } from '@mathesar/stores/abstract-types';
 import { validateFilterEntry } from '@mathesar/components/filter-entry';
 
diff --git a/mathesar_ui/src/systems/data-explorer/QueryHideTransformationModel.ts b/mathesar_ui/src/systems/data-explorer/QueryHideTransformationModel.ts
index 5b9b84ffe3..5cebcd9e42 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryHideTransformationModel.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryHideTransformationModel.ts
@@ -1,6 +1,6 @@
 import { _ } from 'svelte-i18n';
 import { get } from 'svelte/store';
-import type { QueryInstanceHideTransformation } from '@mathesar/api/types/queries';
+import type { QueryInstanceHideTransformation } from '@mathesar/api/rest/types/queries';
 
 export interface QueryHideTransformationEntry {
   columnAliases: string[];
diff --git a/mathesar_ui/src/systems/data-explorer/QueryManager.ts b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
index 2dc636e51d..e6cef2e250 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryManager.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
@@ -2,15 +2,15 @@ import { get, writable } from 'svelte/store';
 import type { Writable } from 'svelte/store';
 import { _ } from 'svelte-i18n';
 import type { CancellablePromise } from '@mathesar-component-library';
-import { getAPI } from '@mathesar/api/utils/requestUtils';
-import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
+import { getAPI } from '@mathesar/api/rest/utils/requestUtils';
+import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import CacheManager from '@mathesar/utils/CacheManager';
 import type {
   QueryInstance,
   QueryRunResponse,
-} from '@mathesar/api/types/queries';
-import type { TableEntry } from '@mathesar/api/types/tables';
-import type { JoinableTablesResult } from '@mathesar/api/types/tables/joinable_tables';
+} from '@mathesar/api/rest/types/queries';
+import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
 import { createQuery, putQuery } from '@mathesar/stores/queries';
 import { getTable } from '@mathesar/stores/tables';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
diff --git a/mathesar_ui/src/systems/data-explorer/QueryModel.ts b/mathesar_ui/src/systems/data-explorer/QueryModel.ts
index abd68e0148..502cab3deb 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryModel.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryModel.ts
@@ -3,7 +3,7 @@ import type {
   QueryInstanceTransformation,
   QueryInstance,
   QueryRunRequest,
-} from '@mathesar/api/types/queries';
+} from '@mathesar/api/rest/types/queries';
 import { MissingExhaustiveConditionError } from '@mathesar/utils/errors';
 import type { UnsavedQueryInstance } from '@mathesar/stores/queries';
 import QueryFilterTransformationModel from './QueryFilterTransformationModel';
diff --git a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
index 72fc06027f..a3b43c4cec 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
@@ -1,7 +1,7 @@
 import { get, writable } from 'svelte/store';
 import type { Writable } from 'svelte/store';
-import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
-import { ApiMultiError } from '@mathesar/api/utils/errors';
+import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+import { ApiMultiError } from '@mathesar/api/rest/utils/errors';
 import { ImmutableMap, CancellablePromise } from '@mathesar-component-library';
 import Pagination from '@mathesar/utils/Pagination';
 import type {
@@ -9,7 +9,7 @@ import type {
   QueryRunResponse,
   QueryResultsResponse,
   QueryColumnMetaData,
-} from '@mathesar/api/types/queries';
+} from '@mathesar/api/rest/types/queries';
 import { runQuery, fetchQueryResults } from '@mathesar/stores/queries';
 import { SheetSelection } from '@mathesar/components/sheet';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
diff --git a/mathesar_ui/src/systems/data-explorer/QuerySortTransformationModel.ts b/mathesar_ui/src/systems/data-explorer/QuerySortTransformationModel.ts
index e153da067d..2c02f82e4f 100644
--- a/mathesar_ui/src/systems/data-explorer/QuerySortTransformationModel.ts
+++ b/mathesar_ui/src/systems/data-explorer/QuerySortTransformationModel.ts
@@ -1,6 +1,6 @@
 import { _ } from 'svelte-i18n';
 import { get } from 'svelte/store';
-import type { QueryInstanceSortTransformation } from '@mathesar/api/types/queries';
+import type { QueryInstanceSortTransformation } from '@mathesar/api/rest/types/queries';
 import type { SortDirection } from '@mathesar/components/sort-entry/utils';
 
 export interface QuerySortTransformationEntry {
diff --git a/mathesar_ui/src/systems/data-explorer/QuerySummarizationTransformationModel.ts b/mathesar_ui/src/systems/data-explorer/QuerySummarizationTransformationModel.ts
index df67cfc491..c49c48a6d3 100644
--- a/mathesar_ui/src/systems/data-explorer/QuerySummarizationTransformationModel.ts
+++ b/mathesar_ui/src/systems/data-explorer/QuerySummarizationTransformationModel.ts
@@ -4,7 +4,7 @@ import { ImmutableMap } from '@mathesar-component-library';
 import type {
   QueryInstanceSummarizationTransformation,
   QuerySummarizationFunctionId,
-} from '@mathesar/api/types/queries';
+} from '@mathesar/api/rest/types/queries';
 
 export interface QuerySummarizationAggregationEntry {
   inputAlias: string;
diff --git a/mathesar_ui/src/systems/data-explorer/__tests__/mockData.ts b/mathesar_ui/src/systems/data-explorer/__tests__/mockData.ts
index 37bfd61b05..6d66195cf3 100644
--- a/mathesar_ui/src/systems/data-explorer/__tests__/mockData.ts
+++ b/mathesar_ui/src/systems/data-explorer/__tests__/mockData.ts
@@ -1,4 +1,4 @@
-import type { JoinableTablesResult } from '@mathesar/api/types/tables/joinable_tables';
+import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
 
 export const ItemsTableId = 75;
 export const CheckoutsPkColumnId = 216;
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte
index 7a858cad0c..df94f617de 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte
@@ -11,7 +11,7 @@
     Icon,
   } from '@mathesar-component-library';
   import { iconDeleteMajor } from '@mathesar/icons';
-  import type { QueryInstance } from '@mathesar/api/types/queries';
+  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import { queries, putQuery, deleteQuery } from '@mathesar/stores/queries';
   import { confirmDelete } from '@mathesar/stores/confirmation';
   import { getAvailableName } from '@mathesar/utils/db';
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/transformationUtils.ts b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/transformationUtils.ts
index 8fd08bb118..17264427d3 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/transformationUtils.ts
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/transformationUtils.ts
@@ -1,4 +1,4 @@
-import type { QueryInstanceInitialColumn } from '@mathesar/api/types/queries';
+import type { QueryInstanceInitialColumn } from '@mathesar/api/rest/types/queries';
 import {
   getProcessedOutputColumns,
   type ProcessedQueryResultColumnMap,
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/QueryRunErrors.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/QueryRunErrors.svelte
index b95bb4c979..11b082d719 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/QueryRunErrors.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/QueryRunErrors.svelte
@@ -2,8 +2,8 @@
   import { _ } from 'svelte-i18n';
   import { Button, hasProperty } from '@mathesar-component-library';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
-  import { ApiMultiError } from '@mathesar/api/utils/errors';
-  import { QUERY_CONTAINS_DELETED_COLUMN } from '@mathesar/api/utils/errorCodes';
+  import { ApiMultiError } from '@mathesar/api/rest/utils/errors';
+  import { QUERY_CONTAINS_DELETED_COLUMN } from '@mathesar/api/rest/utils/errorCodes';
   import { getExplorationEditorPageUrl } from '@mathesar/routes/urls';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
index 1fd0244cd5..de2bdf240e 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
@@ -7,7 +7,7 @@
     isCellSelected,
   } from '@mathesar/components/sheet';
   import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
-  import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
+  import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
   import type { QueryRow, QuerySheetSelection } from '../QueryRunner';
   import type { ProcessedQueryOutputColumn } from '../utils';
   import type QueryInspector from '../QueryInspector';
diff --git a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
index 552ce36932..6b8ca6f04a 100644
--- a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
+++ b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
@@ -1,10 +1,10 @@
 import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
-import type { TableEntry } from '@mathesar/api/types/tables';
-import type { Column } from '@mathesar/api/types/tables/columns';
+import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { UnsavedQueryInstance } from '@mathesar/stores/queries';
 import type { TerseGrouping } from '@mathesar/stores/table-data';
 import Url64 from '@mathesar/utils/Url64';
-import type { QueryInstanceSummarizationTransformation } from '@mathesar/api/types/queries';
+import type { QueryInstanceSummarizationTransformation } from '@mathesar/api/rest/types/queries';
 
 type TerseSummarizedColumn = Pick<Column, 'id' | 'name'>;
 type BaseTable = Pick<TableEntry, 'id' | 'name'>;
diff --git a/mathesar_ui/src/systems/data-explorer/utils.ts b/mathesar_ui/src/systems/data-explorer/utils.ts
index f9ce895d4b..57183883e9 100644
--- a/mathesar_ui/src/systems/data-explorer/utils.ts
+++ b/mathesar_ui/src/systems/data-explorer/utils.ts
@@ -6,7 +6,7 @@ import type {
   QueryRunResponse,
   QueryInitialColumnSource,
   QueryGeneratedColumnSource,
-} from '@mathesar/api/types/queries';
+} from '@mathesar/api/rest/types/queries';
 import {
   getAbstractTypeForDbType,
   getFiltersForAbstractType,
@@ -26,12 +26,12 @@ import {
   getInitialInputValue,
 } from '@mathesar/components/cell-fabric/utils';
 import type { CellColumnFabric } from '@mathesar/components/cell-fabric/types';
-import type { TableEntry } from '@mathesar/api/types/tables';
+import type { TableEntry } from '@mathesar/api/rest/types/tables';
 import type {
   JpPath,
   JoinableTablesResult,
-} from '@mathesar/api/types/tables/joinable_tables';
-import type { Column } from '@mathesar/api/types/tables/columns';
+} from '@mathesar/api/rest/types/tables/joinable_tables';
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type QueryModel from './QueryModel';
 
 type ProcessedQueryResultColumnSource =
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
index af88ceb5e0..8d55f608d5 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
@@ -2,8 +2,8 @@
   import { router } from 'tinro';
   import { _ } from 'svelte-i18n';
   import { Button, Icon, Spinner } from '@mathesar-component-library';
-  import type { Response as ApiRecordsResponse } from '@mathesar/api/types/tables/records';
-  import { postAPI, States } from '@mathesar/api/utils/requestUtils';
+  import type { Response as ApiRecordsResponse } from '@mathesar/api/rest/types/tables/records';
+  import { postAPI, States } from '@mathesar/api/rest/utils/requestUtils';
   import { iconAddNew } from '@mathesar/icons';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorController.ts b/mathesar_ui/src/systems/record-selector/RecordSelectorController.ts
index 22f503f8c2..150838305d 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorController.ts
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorController.ts
@@ -1,9 +1,9 @@
 import { getContext, setContext } from 'svelte';
 import { writable } from 'svelte/store';
 
-import type { Column } from '@mathesar/api/types/tables/columns';
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { DBObjectEntry } from '@mathesar/AppTypes';
-import type { Result as ApiRecord } from '@mathesar/api/types/tables/records';
+import type { Result as ApiRecord } from '@mathesar/api/rest/types/tables/records';
 import type { RecordSelectorPurpose } from './recordSelectorUtils';
 
 interface RecordSelectorControllerProps {
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorNavigationButton.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorNavigationButton.svelte
index 102a59ec59..6f8d1a6bde 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorNavigationButton.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorNavigationButton.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import { Icon } from '@mathesar/component-library';
   import { iconSelectRecord } from '@mathesar/icons';
   import { getRecordSelectorFromContext } from './RecordSelectorController';
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
index 55398549a9..d409961f8c 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
@@ -2,7 +2,7 @@
   import { onMount, tick } from 'svelte';
 
   import { ImmutableSet } from '@mathesar-component-library';
-  import type { Column } from '@mathesar/api/types/tables/columns';
+  import type { Column } from '@mathesar/api/rest/types/tables/columns';
   import { storeToGetRecordPageUrl } from '@mathesar/stores/storeBasedUrls';
   import {
     constraintIsFk,
@@ -15,7 +15,7 @@
     renderTransitiveRecordSummary,
   } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
   import { tables } from '@mathesar/stores/tables';
-  import { States } from '@mathesar/api/utils/requestUtils';
+  import { States } from '@mathesar/api/rest/utils/requestUtils';
   import overflowObserver, {
     makeOverflowDetails,
   } from '@mathesar/utils/overflowObserver';
diff --git a/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts b/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts
index a942c80431..3c897c4c7c 100644
--- a/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts
+++ b/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts
@@ -1,5 +1,5 @@
-import type { TableEntry } from '@mathesar/api/types/tables';
-import type { Column } from '@mathesar/api/types/tables/columns';
+import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
 
 /**
  * - 'dataEntry' - each row is a button that submits the recordId via a Promise.
diff --git a/mathesar_ui/src/systems/shares/ShareEntity.svelte b/mathesar_ui/src/systems/shares/ShareEntity.svelte
index 327c771a5f..4038e2cce9 100644
--- a/mathesar_ui/src/systems/shares/ShareEntity.svelte
+++ b/mathesar_ui/src/systems/shares/ShareEntity.svelte
@@ -10,9 +10,9 @@
     Icon,
     type AccompanyingElements,
   } from '@mathesar-component-library';
-  import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
-  import type { ShareApi, Share } from '@mathesar/api/shares';
-  import { getApiErrorMessages } from '@mathesar/api/utils/errors';
+  import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+  import type { ShareApi, Share } from '@mathesar/api/rest/shares';
+  import { getApiErrorMessages } from '@mathesar/api/rest/utils/errors';
   import {
     iconCopyMajor,
     iconAddNew,
diff --git a/mathesar_ui/src/systems/table-view/ScrollAndResetHandler.svelte b/mathesar_ui/src/systems/table-view/ScrollAndResetHandler.svelte
index 0777441d2a..838a6a0a1c 100644
--- a/mathesar_ui/src/systems/table-view/ScrollAndResetHandler.svelte
+++ b/mathesar_ui/src/systems/table-view/ScrollAndResetHandler.svelte
@@ -9,7 +9,7 @@
   } from '@mathesar/stores/table-data';
   import type { SheetVirtualRowsApi } from '@mathesar/components/sheet/types';
   import type Pagination from '@mathesar/utils/Pagination';
-  import type { States } from '@mathesar/api/utils/requestUtils';
+  import type { States } from '@mathesar/api/rest/utils/requestUtils';
 
   const tabularData = getTabularDataStoreFromContext();
 
diff --git a/mathesar_ui/src/systems/table-view/StatusPane.svelte b/mathesar_ui/src/systems/table-view/StatusPane.svelte
index 8853dce66a..5601f9c385 100644
--- a/mathesar_ui/src/systems/table-view/StatusPane.svelte
+++ b/mathesar_ui/src/systems/table-view/StatusPane.svelte
@@ -5,7 +5,7 @@
     Button,
     Icon,
   } from '@mathesar-component-library';
-  import { States } from '@mathesar/api/utils/requestUtils';
+  import { States } from '@mathesar/api/rest/utils/requestUtils';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import PaginationGroup from '@mathesar/components/PaginationGroup.svelte';
   import RefreshButton from '@mathesar/components/RefreshButton.svelte';
diff --git a/mathesar_ui/src/systems/table-view/TableView.svelte b/mathesar_ui/src/systems/table-view/TableView.svelte
index 431f1b7659..8fd7b0f642 100644
--- a/mathesar_ui/src/systems/table-view/TableView.svelte
+++ b/mathesar_ui/src/systems/table-view/TableView.svelte
@@ -16,7 +16,7 @@
   import { toast } from '@mathesar/stores/toast';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { orderProcessedColumns } from '@mathesar/utils/tables';
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import Body from './Body.svelte';
   import Header from './header/Header.svelte';
   import StatusPane from './StatusPane.svelte';
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte b/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
index e7eb8132c3..6c8dafa835 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
   import { Button, Icon } from '@mathesar-component-library';
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import EntityPageHeader from '@mathesar/components/EntityPageHeader.svelte';
   import ModificationStatus from '@mathesar/components/ModificationStatus.svelte';
   import { iconInspector, iconTable } from '@mathesar/icons';
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/ShareTableDropdown.svelte b/mathesar_ui/src/systems/table-view/actions-pane/ShareTableDropdown.svelte
index 60c40a829c..87965ed0b7 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/ShareTableDropdown.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/ShareTableDropdown.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
   import { iconShare } from '@mathesar/icons';
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import { Dropdown, Icon } from '@mathesar-component-library';
   import ShareEntity from '@mathesar/systems/shares/ShareEntity.svelte';
-  import tableShareApi from '@mathesar/api/tableShares';
+  import tableShareApi from '@mathesar/api/rest/tableShares';
   import { getSharedTablePageUrl } from '@mathesar/routes/urls';
 
   export let id: TableEntry['id'];
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/Filter.svelte b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/Filter.svelte
index 2c5a16f7b1..6582c4c4e8 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/Filter.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/Filter.svelte
@@ -4,7 +4,7 @@
   import { writable, type Writable } from 'svelte/store';
   import { _ } from 'svelte-i18n';
   import { Button, Icon } from '@mathesar-component-library';
-  import type { FilterCombination } from '@mathesar/api/types/tables/records';
+  import type { FilterCombination } from '@mathesar/api/rest/types/tables/records';
   import type { LinkedRecordInputElement } from '@mathesar/components/cell-fabric/data-types/components/linked-record/LinkedRecordUtils';
   import { validateFilterEntry } from '@mathesar/components/filter-entry';
   import { FILTER_INPUT_CLASS } from '@mathesar/components/filter-entry/utils';
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterEntries.svelte b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterEntries.svelte
index 37f2a29e5e..e2a601bef8 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterEntries.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterEntries.svelte
@@ -8,7 +8,7 @@
     type FilterEntry,
     type ProcessedColumns,
   } from '@mathesar/stores/table-data';
-  import type { FilterCombination } from '@mathesar/api/types/tables/records';
+  import type { FilterCombination } from '@mathesar/api/rest/types/tables/records';
   import { FilterEntry as FilterEntryComponent } from '@mathesar/components/filter-entry';
   import { getColumnConstraintTypeByColumnId } from '@mathesar/utils/columnUtils';
   import type RecordSummaryStore from '@mathesar/stores/table-data/record-summaries/RecordSummaryStore';
diff --git a/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte b/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte
index 1bea5d4ac6..ef114b3eeb 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Constraint } from '@mathesar/api/types/tables/constraints';
+  import type { Constraint } from '@mathesar/api/rest/types/tables/constraints';
   import ColumnName from '@mathesar/components/column/ColumnName.svelte';
 
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
diff --git a/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte b/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
index fb351eb199..eea6bc3ad7 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import type { ConstraintType } from '@mathesar/api/types/tables/constraints';
+  import type { ConstraintType } from '@mathesar/api/rest/types/tables/constraints';
   import { Button, Collapsible, Help, Icon } from '@mathesar/component-library';
   import type { Constraint } from '@mathesar/stores/table-data';
   import { iconDeleteMajor } from '@mathesar/icons';
diff --git a/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte b/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
index a5deeb8710..8e786f10eb 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
@@ -3,9 +3,9 @@
   import TableName from '@mathesar/components/TableName.svelte';
   import type { Constraint } from '@mathesar/stores/table-data';
   import { tables } from '@mathesar/stores/tables';
-  import type { PaginatedResponse } from '@mathesar/api/utils/requestUtils';
-  import { getAPI } from '@mathesar/api/utils/requestUtils';
-  import type { Column } from '@mathesar/api/types/tables/columns';
+  import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
+  import { getAPI } from '@mathesar/api/rest/utils/requestUtils';
+  import type { Column } from '@mathesar/api/rest/types/tables/columns';
   import { Icon, iconError, Spinner } from '@mathesar/component-library';
   import ColumnName from '@mathesar/components/column/ColumnName.svelte';
 
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
index 6e0f6e7477..c81e4def1c 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
@@ -5,7 +5,7 @@
     RadioGroup,
     Spinner,
   } from '@mathesar-component-library';
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import {
     FormSubmit,
     makeForm,
diff --git a/mathesar_ui/src/systems/table-view/constraints/TableConstraints.svelte b/mathesar_ui/src/systems/table-view/constraints/TableConstraints.svelte
index 2c81940254..88c73e8458 100644
--- a/mathesar_ui/src/systems/table-view/constraints/TableConstraints.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/TableConstraints.svelte
@@ -5,8 +5,8 @@
     getTabularDataStoreFromContext,
     type Constraint,
   } from '@mathesar/stores/table-data';
-  import { States } from '@mathesar/api/utils/requestUtils';
-  import type { ConstraintType } from '@mathesar/api/types/tables/constraints';
+  import { States } from '@mathesar/api/rest/utils/requestUtils';
+  import type { ConstraintType } from '@mathesar/api/rest/types/tables/constraints';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
diff --git a/mathesar_ui/src/systems/table-view/header/Header.svelte b/mathesar_ui/src/systems/table-view/header/Header.svelte
index e70a5574fd..b2c614f00c 100644
--- a/mathesar_ui/src/systems/table-view/header/Header.svelte
+++ b/mathesar_ui/src/systems/table-view/header/Header.svelte
@@ -12,7 +12,7 @@
   } from '@mathesar/components/sheet';
   import type { ProcessedColumn } from '@mathesar/stores/table-data';
   import { saveColumnOrder } from '@mathesar/stores/tables';
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import { ContextMenu } from '@mathesar/component-library';
   import HeaderCell from './header-cell/HeaderCell.svelte';
   import NewColumnCell from './new-column-cell/NewColumnCell.svelte';
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index e72609da9c..b51d61b318 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -4,9 +4,9 @@
     ensureReadable,
     portalToWindowFooter,
   } from '@mathesar-component-library';
-  import type { LinksPostRequest } from '@mathesar/api/types/links';
-  import type { TableEntry } from '@mathesar/api/types/tables';
-  import { postAPI } from '@mathesar/api/utils/requestUtils';
+  import type { LinksPostRequest } from '@mathesar/api/rest/types/links';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import { postAPI } from '@mathesar/api/rest/utils/requestUtils';
   import SelectTable from '@mathesar/components/SelectTable.svelte';
   import {
     Field,
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTablePill.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTablePill.svelte
index cf13ee90c4..c53ca57f80 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTablePill.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTablePill.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import TableName from '@mathesar/components/TableName.svelte';
 
   export let table: Pick<TableEntry, 'name'>;
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte
index fc44404464..8650d3f50e 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { Label, Radio } from '@mathesar-component-library';
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import type { FieldStore } from '@mathesar/components/form';
   import { assertExhaustive } from '@mathesar/utils/typeUtils';
   import { _ } from 'svelte-i18n';
diff --git a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
index 328546e1ed..42fbfd146e 100644
--- a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import { Spinner } from '@mathesar-component-library';
   import { Field, type FieldStore } from '@mathesar/components/form';
   import { RichText } from '@mathesar/components/rich-text';
diff --git a/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte b/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
index c76ac47455..f2591de98b 100644
--- a/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import type { FieldStore } from '@mathesar/components/form';
   import FieldErrors from '@mathesar/components/form/FieldErrors.svelte';
   import FieldLayout from '@mathesar/components/form/FieldLayout.svelte';
diff --git a/mathesar_ui/src/systems/table-view/link-table/linkTableUtils.ts b/mathesar_ui/src/systems/table-view/link-table/linkTableUtils.ts
index 5e2df073e3..1ffdb70403 100644
--- a/mathesar_ui/src/systems/table-view/link-table/linkTableUtils.ts
+++ b/mathesar_ui/src/systems/table-view/link-table/linkTableUtils.ts
@@ -1,6 +1,6 @@
 import { get } from 'svelte/store';
 import { _ } from 'svelte-i18n';
-import type { TableEntry } from '@mathesar/api/types/tables';
+import type { TableEntry } from '@mathesar/api/rest/types/tables';
 import { invalidIf } from '@mathesar/components/form';
 import { getAvailableName } from '@mathesar/utils/db';
 
diff --git a/mathesar_ui/src/systems/table-view/row/GroupHeaderCellValue.svelte b/mathesar_ui/src/systems/table-view/row/GroupHeaderCellValue.svelte
index e42d92ea4f..bb36f90a3b 100644
--- a/mathesar_ui/src/systems/table-view/row/GroupHeaderCellValue.svelte
+++ b/mathesar_ui/src/systems/table-view/row/GroupHeaderCellValue.svelte
@@ -2,7 +2,7 @@
   import type { ProcessedColumn } from '@mathesar/stores/table-data';
   import CellValue from '@mathesar/components/CellValue.svelte';
   import type { RecordSummariesForSheet } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
-  import type { ResultValue } from '@mathesar/api/types/tables/records';
+  import type { ResultValue } from '@mathesar/api/rest/types/tables/records';
   import LinkedRecord from '@mathesar/components/LinkedRecord.svelte';
   import { storeToGetRecordPageUrl } from '@mathesar/stores/storeBasedUrls';
 
diff --git a/mathesar_ui/src/systems/table-view/row/RowCell.svelte b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
index abdd12147c..ac8b183b65 100644
--- a/mathesar_ui/src/systems/table-view/row/RowCell.svelte
+++ b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
@@ -10,8 +10,8 @@
     MenuHeading,
     WritableMap,
   } from '@mathesar-component-library';
-  import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
-  import { States } from '@mathesar/api/utils/requestUtils';
+  import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+  import { States } from '@mathesar/api/rest/utils/requestUtils';
   import CellBackground from '@mathesar/components/CellBackground.svelte';
   import Identifier from '@mathesar/components/Identifier.svelte';
   import Null from '@mathesar/components/Null.svelte';
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte
index 07d041e2a6..1499902d15 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
+  import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
   import { createValidationContext } from '@mathesar/component-library';
   import CancelOrProceedButtonPair from '@mathesar/component-library/cancel-or-proceed-button-pair/CancelOrProceedButtonPair.svelte';
   import AbstractTypeDisplayOptions from '@mathesar/components/abstract-type-control/AbstractTypeDisplayOptions.svelte';
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte
index 257fce8a4f..a67ec1f88d 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import type { RequestStatus } from '@mathesar/api/utils/requestUtils';
+  import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
   import {
     CancelOrProceedButtonPair,
     LabeledInput,
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionTypes.ts b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionTypes.ts
index 7c7f5b32df..0611fc54b4 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionTypes.ts
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionTypes.ts
@@ -1,5 +1,5 @@
-import type { TableEntry } from '@mathesar/api/types/tables';
-import type { FkConstraint } from '@mathesar/api/types/tables/constraints';
+import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { FkConstraint } from '@mathesar/api/rest/types/tables/constraints';
 import type { ProcessedColumn } from '@mathesar/stores/table-data';
 
 export type ColumnExtractionTargetType = 'newTable' | 'existingTable';
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts
index ed0ce5354a..c822c9058e 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts
@@ -1,7 +1,7 @@
 import { _ } from 'svelte-i18n';
 import { get } from 'svelte/store';
-import type { TableEntry } from '@mathesar/api/types/tables';
-import type { FkConstraint } from '@mathesar/api/types/tables/constraints';
+import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { FkConstraint } from '@mathesar/api/rest/types/tables/constraints';
 import { isDefinedNonNullable } from '@mathesar/component-library';
 import {
   type ValidationOutcome,
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/AppendColumn.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/AppendColumn.svelte
index 539f1efc6a..ad08d6ce67 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/AppendColumn.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/AppendColumn.svelte
@@ -2,7 +2,7 @@
   import { _ } from 'svelte-i18n';
   import { ButtonMenuItem, DropdownMenu } from '@mathesar-component-library';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
-  import type { Column } from '@mathesar/api/types/tables/columns';
+  import type { Column } from '@mathesar/api/rest/types/tables/columns';
   import { iconAddNew, iconConstraint, iconTableLink } from '@mathesar/icons';
   import {
     getColumnIconProps,
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
index 11bd7c63fc..19f64ad5ce 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import { Meta, TabularData } from '@mathesar/stores/table-data';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
   import RecordSummaryConfig from '@mathesar/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte';
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
index 6a82e8f946..5f340861ba 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
   import { RadioGroup, Spinner } from '@mathesar-component-library';
-  import type { TableEntry } from '@mathesar/api/types/tables';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import {
     FormSubmit,
     makeForm,
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/TemplateInput.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/TemplateInput.svelte
index a0b28305f8..298548924a 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/TemplateInput.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/TemplateInput.svelte
@@ -2,7 +2,7 @@
   import type { ComponentProps } from 'svelte';
 
   import { FormattedInput } from '@mathesar-component-library';
-  import type { Column } from '@mathesar/api/types/tables/columns';
+  import type { Column } from '@mathesar/api/rest/types/tables/columns';
   import TemplateInputFormatter from './TemplateInputFormatter';
   import AppendColumn from './AppendColumn.svelte';
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/recordSummaryTemplateUtils.ts b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/recordSummaryTemplateUtils.ts
index d0b3c98477..01f5c4624e 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/recordSummaryTemplateUtils.ts
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/recordSummaryTemplateUtils.ts
@@ -1,6 +1,6 @@
 import { get } from 'svelte/store';
 import { _ } from 'svelte-i18n';
-import type { Column } from '@mathesar/api/types/tables/columns';
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import { validIf, type ValidationFn } from '@mathesar/components/form';
 
 export type ColumnLike = Pick<Column, 'id' | 'name'>;
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/links/utils.ts b/mathesar_ui/src/systems/table-view/table-inspector/table/links/utils.ts
index ac1d3eb29d..a8f23049ea 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/links/utils.ts
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/links/utils.ts
@@ -1,4 +1,4 @@
-import type { JoinableTablesResult } from '@mathesar/api/types/tables/joinable_tables';
+import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
 import type { ProcessedColumn } from '@mathesar/stores/table-data';
 import { MissingExhaustiveConditionError } from '@mathesar/utils/errors';
 
diff --git a/mathesar_ui/src/systems/users-and-permissions/AccessControlRow.svelte b/mathesar_ui/src/systems/users-and-permissions/AccessControlRow.svelte
index 6b052f1e3a..3fbfdfd3a3 100644
--- a/mathesar_ui/src/systems/users-and-permissions/AccessControlRow.svelte
+++ b/mathesar_ui/src/systems/users-and-permissions/AccessControlRow.svelte
@@ -15,7 +15,7 @@
     iconSchema,
   } from '@mathesar/icons';
   import type { UserModel } from '@mathesar/stores/users';
-  import type { UserRole } from '@mathesar/api/users';
+  import type { UserRole } from '@mathesar/api/rest/users';
   import {
     getDisplayNameForRole,
     getDescriptionForRole,
diff --git a/mathesar_ui/src/systems/users-and-permissions/AccessControlView.svelte b/mathesar_ui/src/systems/users-and-permissions/AccessControlView.svelte
index b7143e90b8..20521f7719 100644
--- a/mathesar_ui/src/systems/users-and-permissions/AccessControlView.svelte
+++ b/mathesar_ui/src/systems/users-and-permissions/AccessControlView.svelte
@@ -9,7 +9,7 @@
     Help,
   } from '@mathesar-component-library';
   import { iconAddNew } from '@mathesar/icons';
-  import type { UserRole } from '@mathesar/api/users';
+  import type { UserRole } from '@mathesar/api/rest/users';
   import {
     getDisplayNameForRole,
     type ObjectRoleMap,
diff --git a/mathesar_ui/src/systems/users-and-permissions/PasswordChangeForm.svelte b/mathesar_ui/src/systems/users-and-permissions/PasswordChangeForm.svelte
index 8fd5a1392c..bfb0ce5386 100644
--- a/mathesar_ui/src/systems/users-and-permissions/PasswordChangeForm.svelte
+++ b/mathesar_ui/src/systems/users-and-permissions/PasswordChangeForm.svelte
@@ -13,7 +13,7 @@
     comboMustBeEqual,
   } from '@mathesar/components/form';
   import { iconSave } from '@mathesar/icons';
-  import userApi, { type User } from '@mathesar/api/users';
+  import userApi, { type User } from '@mathesar/api/rest/users';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import WarningBox from '@mathesar/components/message-boxes/WarningBox.svelte';
   import GridFormInputRow from '@mathesar/components/form/GridFormInputRow.svelte';
diff --git a/mathesar_ui/src/systems/users-and-permissions/UserDetailsForm.svelte b/mathesar_ui/src/systems/users-and-permissions/UserDetailsForm.svelte
index f599b55564..b46e03b9c8 100644
--- a/mathesar_ui/src/systems/users-and-permissions/UserDetailsForm.svelte
+++ b/mathesar_ui/src/systems/users-and-permissions/UserDetailsForm.svelte
@@ -7,8 +7,8 @@
     TextInput,
     hasProperty,
   } from '@mathesar-component-library';
-  import userApi, { type User } from '@mathesar/api/users';
-  import { extractDetailedFieldBasedErrors } from '@mathesar/api/utils/errors';
+  import userApi, { type User } from '@mathesar/api/rest/users';
+  import { extractDetailedFieldBasedErrors } from '@mathesar/api/rest/utils/errors';
   import {
     FormSubmit,
     isEmail,
diff --git a/mathesar_ui/src/utils/__tests__/api.test.ts b/mathesar_ui/src/utils/__tests__/api.test.ts
index 371998775d..ca868cb9a0 100644
--- a/mathesar_ui/src/utils/__tests__/api.test.ts
+++ b/mathesar_ui/src/utils/__tests__/api.test.ts
@@ -1,4 +1,4 @@
-import { getMostImportantRequestStatusState } from '../../api/utils/requestUtils';
+import { getMostImportantRequestStatusState } from '@mathesar/api/rest/utils/requestUtils';
 
 test('getMostImportantRequestStatusState', () => {
   expect(
diff --git a/mathesar_ui/src/utils/columnUtils.ts b/mathesar_ui/src/utils/columnUtils.ts
index 16ce6fdb7e..f6f3460ad9 100644
--- a/mathesar_ui/src/utils/columnUtils.ts
+++ b/mathesar_ui/src/utils/columnUtils.ts
@@ -1,7 +1,7 @@
 import { get } from 'svelte/store';
 
 import type { IconProps } from '@mathesar-component-library/types';
-import type { TableEntry } from '@mathesar/api/types/tables';
+import type { TableEntry } from '@mathesar/api/rest/types/tables';
 import type { DisplayColumn } from '@mathesar/components/column/types';
 import { uniqueWith, type ValidationFn } from '@mathesar/components/form';
 import { iconConstraint, iconTableLink } from '@mathesar/icons';
diff --git a/mathesar_ui/src/utils/date-time/DateTimeSpecification.ts b/mathesar_ui/src/utils/date-time/DateTimeSpecification.ts
index 70a5c3fa25..4c86a4c74f 100644
--- a/mathesar_ui/src/utils/date-time/DateTimeSpecification.ts
+++ b/mathesar_ui/src/utils/date-time/DateTimeSpecification.ts
@@ -2,7 +2,7 @@ import { dayjs } from '@mathesar-component-library';
 import type {
   DateFormat,
   TimeFormat,
-} from '@mathesar/api/types/tables/columns';
+} from '@mathesar/api/rest/types/tables/columns';
 
 interface DateConfig {
   type: 'date';
diff --git a/mathesar_ui/src/utils/duration/DurationFormatter.ts b/mathesar_ui/src/utils/duration/DurationFormatter.ts
index 734ba0bdc2..58fd3842be 100644
--- a/mathesar_ui/src/utils/duration/DurationFormatter.ts
+++ b/mathesar_ui/src/utils/duration/DurationFormatter.ts
@@ -4,7 +4,7 @@ import type {
   InputFormatter,
   ParseResult,
 } from '@mathesar-component-library/types';
-import type { DurationUnit } from '@mathesar/api/types/tables/columns';
+import type { DurationUnit } from '@mathesar/api/rest/types/tables/columns';
 import type DurationSpecification from './DurationSpecification';
 
 const FLOAT_REGEX = /^((\.?\d+)|(\d+(\.\d+)?))$/;
diff --git a/mathesar_ui/src/utils/duration/DurationSpecification.ts b/mathesar_ui/src/utils/duration/DurationSpecification.ts
index 177511ece9..8f3cacfe44 100644
--- a/mathesar_ui/src/utils/duration/DurationSpecification.ts
+++ b/mathesar_ui/src/utils/duration/DurationSpecification.ts
@@ -1,4 +1,4 @@
-import type { DurationUnit } from '@mathesar/api/types/tables/columns';
+import type { DurationUnit } from '@mathesar/api/rest/types/tables/columns';
 
 export interface DurationConfig {
   max: DurationUnit;
diff --git a/mathesar_ui/src/utils/permissions.ts b/mathesar_ui/src/utils/permissions.ts
index 2e3c03eb60..d422b4c8e9 100644
--- a/mathesar_ui/src/utils/permissions.ts
+++ b/mathesar_ui/src/utils/permissions.ts
@@ -1,6 +1,6 @@
 import { get } from 'svelte/store';
 import { _ } from 'svelte-i18n';
-import type { UserRole } from '@mathesar/api/users';
+import type { UserRole } from '@mathesar/api/rest/users';
 import { MissingExhaustiveConditionError } from '@mathesar/utils/errors';
 
 /**
diff --git a/mathesar_ui/src/utils/preloadData.ts b/mathesar_ui/src/utils/preloadData.ts
index 4a628e6954..4edc858a28 100644
--- a/mathesar_ui/src/utils/preloadData.ts
+++ b/mathesar_ui/src/utils/preloadData.ts
@@ -1,8 +1,8 @@
 import type { SchemaResponse, AbstractTypeResponse } from '@mathesar/AppTypes';
-import type { TableEntry } from '@mathesar/api/types/tables';
-import type { QueryInstance } from '@mathesar/api/types/queries';
-import type { Connection } from '@mathesar/api/connections';
-import type { User } from '@mathesar/api/users';
+import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+import type { Connection } from '@mathesar/api/rest/connections';
+import type { User } from '@mathesar/api/rest/users';
 
 export interface CommonData {
   connections: Connection[];
diff --git a/mathesar_ui/src/utils/tables.ts b/mathesar_ui/src/utils/tables.ts
index 42e5c04a63..fb8f80de21 100644
--- a/mathesar_ui/src/utils/tables.ts
+++ b/mathesar_ui/src/utils/tables.ts
@@ -1,4 +1,4 @@
-import type { TableEntry } from '@mathesar/api/types/tables';
+import type { TableEntry } from '@mathesar/api/rest/types/tables';
 import type { ProcessedColumn } from '@mathesar/stores/table-data';
 import {
   getImportPreviewPageUrl,

From 4239f6c681cf4b9723c229d6cc891741428a360c Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 16 Apr 2024 16:35:45 +0800
Subject: [PATCH 0081/1141] remove demo flags and template previously used by
 frontend

---
 config/context_processors.py                |  3 --
 mathesar/examples/movies_dataset.py         |  2 +-
 mathesar/templates/mathesar/login_base.html | 35 ---------------------
 3 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/config/context_processors.py b/config/context_processors.py
index 85d6fa80a7..39dc562e9b 100644
--- a/config/context_processors.py
+++ b/config/context_processors.py
@@ -14,9 +14,6 @@ def frontend_settings(request):
     frontend_settings = {
         'development_mode': development_mode,
         'manifest_data': manifest_data,
-        'live_demo_mode': getattr(settings, 'MATHESAR_LIVE_DEMO', False),
-        'live_demo_username': getattr(settings, 'MATHESAR_LIVE_DEMO_USERNAME', None),
-        'live_demo_password': getattr(settings, 'MATHESAR_LIVE_DEMO_PASSWORD', None),
         'display_language': display_language,
         'include_i18n_fallback': display_language != fallback_language,
     }
diff --git a/mathesar/examples/movies_dataset.py b/mathesar/examples/movies_dataset.py
index bc87686831..854a3d80c4 100644
--- a/mathesar/examples/movies_dataset.py
+++ b/mathesar/examples/movies_dataset.py
@@ -9,7 +9,7 @@
 
 def load_movies_dataset(engine, safe_mode=False):
     """
-    Load the movie demo data set.
+    Load the movie example data set.
 
     Args:
         engine: an SQLAlchemy engine defining the connection to load data into.
diff --git a/mathesar/templates/mathesar/login_base.html b/mathesar/templates/mathesar/login_base.html
index 3f24e64c22..8d324afddf 100644
--- a/mathesar/templates/mathesar/login_base.html
+++ b/mathesar/templates/mathesar/login_base.html
@@ -112,41 +112,6 @@
     <img src="{% static 'images/red-logo-with-text.svg' %}" alt="Mathesar Logo" class="align-center"/>
   </div>
 
-  {% if live_demo_mode %}
-    <div class="unsupported-device">
-      <div class="warning-icon">⚠️</div>
-      <p class="title">{% translate "Unsupported Screen Size" %}</p>
-      <p>
-      {% translate "Mathesar is a spreadsheet-like application with a rich UI that does not yet function well on screens this small. Improved support for mobile devices is on our" %}
-        
-        <a href="https://mathesar.org/roadmap.html" target="_blank">
-          {% translate "roadmap" %}
-        </a>.
-      </p>
-      <p>
-      {% translate "You can still use this demo site, but some features may not work correctly. We encourage you to try Mathesar on a device with a larger screen." %}
-    </p>
-    </div>
-    <div class="tutorial align-center">
-      <div class="header">
-        <strong>{% translate "Live Demo Mode" %}</strong>
-      </div>
-      <div class="body">
-      {% translate "Mathesar's live demo is available to anyone to try out." %}
-        
-        {% if live_demo_username and live_demo_password %}
-          {% translate "Use the following credentials to login" %}:
-          <ul>
-            <li>{% translate "Username" %}: <strong>{{live_demo_username}}</strong></li>
-            <li>{% translate "Password" %}: <strong>{{live_demo_password}}</strong></li>
-          </ul>
-        {% endif %}
-
-        {% translate "Keep in mind that the data in the live demo is reset regularly." %}
-      </div>
-    </div>
-  {% endif %}
-
   <div class="login-card align-center">
     <h1>{% block h1 %} {% endblock %}</h1>
     {% block box_content %} {% endblock %}

From 0b54a679e6beda5549ff607e6a3dc53f50553768 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 16 Apr 2024 16:57:30 +0800
Subject: [PATCH 0082/1141] remove drf-spectacular dependency

---
 config/settings/common_settings.py | 13 -------------
 requirements.txt                   |  1 -
 2 files changed, 14 deletions(-)

diff --git a/config/settings/common_settings.py b/config/settings/common_settings.py
index 930482cbfa..251797af41 100644
--- a/config/settings/common_settings.py
+++ b/config/settings/common_settings.py
@@ -42,7 +42,6 @@ def pipe_delim(pipe_string):
     "rest_framework",
     "django_filters",
     "django_property_filter",
-    "drf_spectacular",
     "modernrpc",
     "mathesar",
 ]
@@ -207,18 +206,6 @@ def pipe_delim(pipe_string):
     'TEST_REQUEST_DEFAULT_FORMAT': 'json',
     'EXCEPTION_HANDLER':
         'mathesar.exception_handlers.mathesar_exception_handler',
-    'DEFAULT_SCHEMA_CLASS': 'drf_spectacular.openapi.AutoSchema'
-}
-SPECTACULAR_SETTINGS = {
-    'TITLE': 'Mathesar API',
-    'DESCRIPTION': '',
-    'VERSION': '1.0.0',
-    'SERVE_INCLUDE_SCHEMA': False,
-    'PREPROCESSING_HOOKS': ['config.settings.openapi.custom_preprocessing_hook'],
-    'POSTPROCESSING_HOOKS': [
-        'config.settings.openapi.remove_url_prefix_hook',
-    ],
-    # OTHER SETTINGS
 }
 FRIENDLY_ERRORS = {
     'FIELD_ERRORS': {
diff --git a/requirements.txt b/requirements.txt
index d29b11845c..6c686c71a9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -26,7 +26,6 @@ SQLAlchemy-Utils==0.38.2
 thefuzz==0.19.0
 whitenoise==6.4.0
 gunicorn==20.1.0
-drf-spectacular==0.26.2
 pandas==2.0.2
 openpyxl==3.1.2
 pyxlsb==1.0.10

From 43d69fcc94d4fb2d95102cd9b92bafead4742306 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 16 Apr 2024 16:58:09 +0800
Subject: [PATCH 0083/1141] remove OpenAPI schema

---
 schema.yml | 3568 ----------------------------------------------------
 1 file changed, 3568 deletions(-)
 delete mode 100644 schema.yml

diff --git a/schema.yml b/schema.yml
deleted file mode 100644
index 4c2adff1fb..0000000000
--- a/schema.yml
+++ /dev/null
@@ -1,3568 +0,0 @@
-openapi: 3.0.3
-info:
-  title: Mathesar API
-  version: 1.0.0
-paths:
-  /api/db/v0/data_files/:
-    get:
-      operationId: data_files_list
-      parameters:
-      - in: query
-        name: database
-        schema:
-          type: array
-          items:
-            type: string
-        description: Multiple values may be separated by commas.
-        explode: false
-        style: form
-      - name: limit
-        required: false
-        in: query
-        description: Number of results to return per page.
-        schema:
-          type: integer
-      - in: query
-        name: name
-        schema:
-          type: array
-          items:
-            type: string
-        description: Multiple values may be separated by commas.
-        explode: false
-        style: form
-      - name: offset
-        required: false
-        in: query
-        description: The initial index from which to return the results.
-        schema:
-          type: integer
-      - in: query
-        name: sort_by
-        schema:
-          type: array
-          items:
-            type: string
-            enum:
-            - -id
-            - -name
-            - id
-            - name
-        description: |-
-          Sort By
-
-          * `id` - Id
-          * `-id` - Id (descending)
-          * `name` - Name
-          * `-name` - Name (descending)
-        explode: false
-        style: form
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/PaginatedDataFileList'
-          description: ''
-    post:
-      operationId: data_files_create
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/DataFile'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/DataFile'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/DataFile'
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '201':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/DataFile'
-          description: ''
-  /api/db/v0/data_files/{id}/:
-    get:
-      operationId: data_files_retrieve
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this data file.
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/DataFile'
-          description: ''
-    patch:
-      operationId: data_files_partial_update
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this data file.
-        required: true
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/PatchedDataFile'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/PatchedDataFile'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/PatchedDataFile'
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/DataFile'
-          description: ''
-  /api/db/v0/databases/:
-    get:
-      operationId: databases_list
-      parameters:
-      - in: query
-        name: deleted
-        schema:
-          type: boolean
-      - name: limit
-        required: false
-        in: query
-        description: Number of results to return per page.
-        schema:
-          type: integer
-      - name: offset
-        required: false
-        in: query
-        description: The initial index from which to return the results.
-        schema:
-          type: integer
-      - in: query
-        name: sort_by
-        schema:
-          type: array
-          items:
-            type: string
-            enum:
-            - -id
-            - -name
-            - id
-            - name
-        description: |-
-          Sort By
-
-          * `id` - Id
-          * `-id` - Id (descending)
-          * `name` - Name
-          * `-name` - Name (descending)
-        explode: false
-        style: form
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/PaginatedDatabaseList'
-          description: ''
-    post:
-      operationId: databases_create
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Database'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/Database'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/Database'
-        required: true
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '201':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Database'
-          description: ''
-  /api/db/v0/databases/{id}/:
-    get:
-      operationId: databases_retrieve
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this database.
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Database'
-          description: ''
-    put:
-      operationId: databases_update
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this database.
-        required: true
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Database'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/Database'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/Database'
-        required: true
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Database'
-          description: ''
-    patch:
-      operationId: databases_partial_update
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this database.
-        required: true
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/PatchedDatabase'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/PatchedDatabase'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/PatchedDatabase'
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Database'
-          description: ''
-    delete:
-      operationId: databases_destroy
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this database.
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '204':
-          description: No response body
-  /api/db/v0/databases/{id}/functions/:
-    get:
-      operationId: databases_functions_retrieve
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this database.
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Database'
-          description: ''
-  /api/db/v0/databases/{id}/types/:
-    get:
-      operationId: databases_types_retrieve
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this database.
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Database'
-          description: ''
-  /api/db/v0/links/:
-    post:
-      operationId: links_create
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/LinksMapping'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/LinksMapping'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/LinksMapping'
-        required: true
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '201':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/LinksMapping'
-          description: ''
-  /api/db/v0/queries/:
-    get:
-      operationId: queries_list
-      parameters:
-      - in: query
-        name: database
-        schema:
-          type: array
-          items:
-            type: string
-        description: Multiple values may be separated by commas.
-        explode: false
-        style: form
-      - name: limit
-        required: false
-        in: query
-        description: Number of results to return per page.
-        schema:
-          type: integer
-      - in: query
-        name: name
-        schema:
-          type: array
-          items:
-            type: string
-        description: Multiple values may be separated by commas.
-        explode: false
-        style: form
-      - name: offset
-        required: false
-        in: query
-        description: The initial index from which to return the results.
-        schema:
-          type: integer
-      - in: query
-        name: sort_by
-        schema:
-          type: array
-          items:
-            type: string
-            enum:
-            - -id
-            - -name
-            - id
-            - name
-        description: |-
-          Sort By
-
-          * `id` - Id
-          * `-id` - Id (descending)
-          * `name` - Name
-          * `-name` - Name (descending)
-        explode: false
-        style: form
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      - {}
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/PaginatedQueryList'
-          description: ''
-    post:
-      operationId: queries_create
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Query'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/Query'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/Query'
-        required: true
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '201':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Query'
-          description: ''
-  /api/db/v0/queries/{id}/:
-    get:
-      operationId: queries_retrieve
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this ui query.
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      - {}
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Query'
-          description: ''
-    put:
-      operationId: queries_update
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this ui query.
-        required: true
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Query'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/Query'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/Query'
-        required: true
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Query'
-          description: ''
-    patch:
-      operationId: queries_partial_update
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this ui query.
-        required: true
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/PatchedQuery'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/PatchedQuery'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/PatchedQuery'
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Query'
-          description: ''
-    delete:
-      operationId: queries_destroy
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this ui query.
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '204':
-          description: No response body
-  /api/db/v0/queries/{id}/columns/:
-    get:
-      operationId: queries_columns_retrieve
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this ui query.
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      - {}
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Query'
-          description: ''
-  /api/db/v0/queries/{id}/records/:
-    get:
-      operationId: queries_records_retrieve
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this ui query.
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      - {}
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Query'
-          description: ''
-  /api/db/v0/queries/{id}/results/:
-    get:
-      operationId: queries_results_retrieve
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this ui query.
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      - {}
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Query'
-          description: ''
-  /api/db/v0/queries/run/:
-    post:
-      operationId: queries_run_create
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Query'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/Query'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/Query'
-        required: true
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Query'
-          description: ''
-  /api/db/v0/schemas/:
-    get:
-      operationId: schemas_list
-      parameters:
-      - in: query
-        name: database
-        schema:
-          type: array
-          items:
-            type: string
-        description: Multiple values may be separated by commas.
-        explode: false
-        style: form
-      - name: limit
-        required: false
-        in: query
-        description: Number of results to return per page.
-        schema:
-          type: integer
-      - in: query
-        name: name
-        schema:
-          type: array
-          items:
-            type: string
-        description: Multiple values may be separated by commas.
-        explode: false
-        style: form
-      - name: offset
-        required: false
-        in: query
-        description: The initial index from which to return the results.
-        schema:
-          type: integer
-      - in: query
-        name: sort_by
-        schema:
-          type: array
-          items:
-            type: string
-            enum:
-            - -id
-            - -name
-            - id
-            - name
-        description: |-
-          Sort By
-
-          * `id` - Id
-          * `-id` - Id (descending)
-          * `name` - Name
-          * `-name` - Name (descending)
-        explode: false
-        style: form
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/PaginatedSchemaList'
-          description: ''
-    post:
-      operationId: schemas_create
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Schema'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/Schema'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/Schema'
-        required: true
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '201':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Schema'
-          description: ''
-  /api/db/v0/schemas/{id}/:
-    get:
-      operationId: schemas_retrieve
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this schema.
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Schema'
-          description: ''
-    patch:
-      operationId: schemas_partial_update
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this schema.
-        required: true
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/PatchedSchema'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/PatchedSchema'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/PatchedSchema'
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Schema'
-          description: ''
-    delete:
-      operationId: schemas_destroy
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this schema.
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '204':
-          description: No response body
-  /api/db/v0/schemas/{id}/dependents/:
-    get:
-      operationId: schemas_dependents_retrieve
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this schema.
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Schema'
-          description: ''
-  /api/db/v0/tables/:
-    get:
-      operationId: tables_list
-      parameters:
-      - in: query
-        name: created_after
-        schema:
-          type: string
-          format: date-time
-      - in: query
-        name: created_at
-        schema:
-          type: string
-          format: date-time
-      - in: query
-        name: created_before
-        schema:
-          type: string
-          format: date-time
-      - in: query
-        name: database
-        schema:
-          type: array
-          items:
-            type: string
-        description: Multiple values may be separated by commas.
-        explode: false
-        style: form
-      - in: query
-        name: import_verified
-        schema:
-          type: boolean
-      - name: limit
-        required: false
-        in: query
-        description: Number of results to return per page.
-        schema:
-          type: integer
-      - in: query
-        name: name
-        schema:
-          type: array
-          items:
-            type: string
-        description: Multiple values may be separated by commas.
-        explode: false
-        style: form
-      - in: query
-        name: not_imported
-        schema:
-          type: boolean
-      - name: offset
-        required: false
-        in: query
-        description: The initial index from which to return the results.
-        schema:
-          type: integer
-      - in: query
-        name: schema
-        schema:
-          type: integer
-      - in: query
-        name: sort_by
-        schema:
-          type: array
-          items:
-            type: string
-            enum:
-            - -id
-            - -name
-            - id
-            - name
-        description: |-
-          Sort By
-
-          * `id` - Id
-          * `-id` - Id (descending)
-          * `name` - Name
-          * `-name` - Name (descending)
-        explode: false
-        style: form
-      - in: query
-        name: updated_after
-        schema:
-          type: string
-          format: date-time
-      - in: query
-        name: updated_at
-        schema:
-          type: string
-          format: date-time
-      - in: query
-        name: updated_before
-        schema:
-          type: string
-          format: date-time
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      - {}
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/PaginatedTableList'
-          description: ''
-    post:
-      operationId: tables_create
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Table'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/Table'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/Table'
-        required: true
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '201':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Table'
-          description: ''
-  /api/db/v0/tables/{id}/:
-    get:
-      operationId: tables_retrieve
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this table.
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      - {}
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Table'
-          description: ''
-    patch:
-      operationId: tables_partial_update
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this table.
-        required: true
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/PatchedTable'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/PatchedTable'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/PatchedTable'
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Table'
-          description: ''
-    delete:
-      operationId: tables_destroy
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this table.
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '204':
-          description: No response body
-  /api/db/v0/tables/{id}/dependents/:
-    get:
-      operationId: tables_dependents_retrieve
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this table.
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      - {}
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Table'
-          description: ''
-  /api/db/v0/tables/{id}/existing_import/:
-    post:
-      operationId: tables_existing_import_create
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this table.
-        required: true
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Table'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/Table'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/Table'
-        required: true
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Table'
-          description: ''
-  /api/db/v0/tables/{id}/joinable_tables/:
-    get:
-      operationId: tables_joinable_tables_retrieve
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this table.
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      - {}
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Table'
-          description: ''
-  /api/db/v0/tables/{id}/map_imported_columns/:
-    post:
-      operationId: tables_map_imported_columns_create
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this table.
-        required: true
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Table'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/Table'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/Table'
-        required: true
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Table'
-          description: ''
-  /api/db/v0/tables/{id}/move_columns/:
-    post:
-      operationId: tables_move_columns_create
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this table.
-        required: true
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Table'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/Table'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/Table'
-        required: true
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Table'
-          description: ''
-  /api/db/v0/tables/{id}/previews/:
-    post:
-      operationId: tables_previews_create
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this table.
-        required: true
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Table'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/Table'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/Table'
-        required: true
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Table'
-          description: ''
-  /api/db/v0/tables/{id}/split_table/:
-    post:
-      operationId: tables_split_table_create
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this table.
-        required: true
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Table'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/Table'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/Table'
-        required: true
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Table'
-          description: ''
-  /api/db/v0/tables/{id}/type_suggestions/:
-    get:
-      operationId: tables_type_suggestions_retrieve
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this table.
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      - {}
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Table'
-          description: ''
-  /api/db/v0/tables/{id}/ui_dependents/:
-    get:
-      operationId: tables_ui_dependents_retrieve
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this table.
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      - {}
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Table'
-          description: ''
-  /api/db/v0/tables/{table_pk}/columns/:
-    get:
-      operationId: tables_columns_list
-      parameters:
-      - name: limit
-        required: false
-        in: query
-        description: Number of results to return per page.
-        schema:
-          type: integer
-      - name: offset
-        required: false
-        in: query
-        description: The initial index from which to return the results.
-        schema:
-          type: integer
-      - name: ordering
-        required: false
-        in: query
-        description: Which field to use when ordering the results.
-        schema:
-          type: string
-      - in: path
-        name: table_pk
-        schema:
-          type: string
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      - {}
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/PaginatedColumnList'
-          description: ''
-    post:
-      operationId: tables_columns_create
-      parameters:
-      - in: path
-        name: table_pk
-        schema:
-          type: string
-        required: true
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Column'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/Column'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/Column'
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '201':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Column'
-          description: ''
-  /api/db/v0/tables/{table_pk}/columns/{id}/:
-    get:
-      operationId: tables_columns_retrieve
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: string
-        required: true
-      - in: path
-        name: table_pk
-        schema:
-          type: string
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      - {}
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Column'
-          description: ''
-    put:
-      operationId: tables_columns_update
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: string
-        required: true
-      - in: path
-        name: table_pk
-        schema:
-          type: string
-        required: true
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Column'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/Column'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/Column'
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Column'
-          description: ''
-    patch:
-      operationId: tables_columns_partial_update
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: string
-        required: true
-      - in: path
-        name: table_pk
-        schema:
-          type: string
-        required: true
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/PatchedColumn'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/PatchedColumn'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/PatchedColumn'
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Column'
-          description: ''
-    delete:
-      operationId: tables_columns_destroy
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: string
-        required: true
-      - in: path
-        name: table_pk
-        schema:
-          type: string
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '204':
-          description: No response body
-  /api/db/v0/tables/{table_pk}/columns/{id}/dependents/:
-    get:
-      operationId: tables_columns_dependents_retrieve
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: string
-        required: true
-      - in: path
-        name: table_pk
-        schema:
-          type: string
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      - {}
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Column'
-          description: ''
-  /api/db/v0/tables/{table_pk}/constraints/:
-    get:
-      operationId: tables_constraints_list
-      parameters:
-      - name: limit
-        required: false
-        in: query
-        description: Number of results to return per page.
-        schema:
-          type: integer
-      - name: offset
-        required: false
-        in: query
-        description: The initial index from which to return the results.
-        schema:
-          type: integer
-      - name: ordering
-        required: false
-        in: query
-        description: Which field to use when ordering the results.
-        schema:
-          type: string
-      - in: path
-        name: table_pk
-        schema:
-          type: string
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      - {}
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/PaginatedConstraintList'
-          description: ''
-    post:
-      operationId: tables_constraints_create
-      parameters:
-      - in: path
-        name: table_pk
-        schema:
-          type: string
-        required: true
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Constraint'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/Constraint'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/Constraint'
-        required: true
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '201':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Constraint'
-          description: ''
-  /api/db/v0/tables/{table_pk}/constraints/{id}/:
-    get:
-      operationId: tables_constraints_retrieve
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: string
-        required: true
-      - in: path
-        name: table_pk
-        schema:
-          type: string
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      - {}
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Constraint'
-          description: ''
-    delete:
-      operationId: tables_constraints_destroy
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: string
-        required: true
-      - in: path
-        name: table_pk
-        schema:
-          type: string
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '204':
-          description: No response body
-  /api/db/v0/tables/{table_pk}/records/:
-    get:
-      operationId: tables_records_retrieve
-      parameters:
-      - in: path
-        name: table_pk
-        schema:
-          type: string
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      - {}
-      responses:
-        '200':
-          description: No response body
-    post:
-      operationId: tables_records_create
-      parameters:
-      - in: path
-        name: table_pk
-        schema:
-          type: string
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '201':
-          description: No response body
-  /api/db/v0/tables/{table_pk}/records/{id}/:
-    get:
-      operationId: tables_records_retrieve_2
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this table.
-        required: true
-      - in: path
-        name: table_pk
-        schema:
-          type: string
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      - {}
-      responses:
-        '200':
-          description: No response body
-    patch:
-      operationId: tables_records_partial_update
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this table.
-        required: true
-      - in: path
-        name: table_pk
-        schema:
-          type: string
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          description: No response body
-    delete:
-      operationId: tables_records_destroy
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this table.
-        required: true
-      - in: path
-        name: table_pk
-        schema:
-          type: string
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '204':
-          description: No response body
-  /api/db/v0/tables/{table_pk}/settings/:
-    get:
-      operationId: tables_settings_list
-      parameters:
-      - name: limit
-        required: false
-        in: query
-        description: Number of results to return per page.
-        schema:
-          type: integer
-      - name: offset
-        required: false
-        in: query
-        description: The initial index from which to return the results.
-        schema:
-          type: integer
-      - name: ordering
-        required: false
-        in: query
-        description: Which field to use when ordering the results.
-        schema:
-          type: string
-      - in: path
-        name: table_pk
-        schema:
-          type: string
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/PaginatedTableSettingsList'
-          description: ''
-    post:
-      operationId: tables_settings_create
-      parameters:
-      - in: path
-        name: table_pk
-        schema:
-          type: string
-        required: true
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/TableSettings'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/TableSettings'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/TableSettings'
-        required: true
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '201':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/TableSettings'
-          description: ''
-  /api/db/v0/tables/{table_pk}/settings/{id}/:
-    get:
-      operationId: tables_settings_retrieve
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: string
-        required: true
-      - in: path
-        name: table_pk
-        schema:
-          type: string
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/TableSettings'
-          description: ''
-    put:
-      operationId: tables_settings_update
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: string
-        required: true
-      - in: path
-        name: table_pk
-        schema:
-          type: string
-        required: true
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/TableSettings'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/TableSettings'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/TableSettings'
-        required: true
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/TableSettings'
-          description: ''
-    patch:
-      operationId: tables_settings_partial_update
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: string
-        required: true
-      - in: path
-        name: table_pk
-        schema:
-          type: string
-        required: true
-      tags:
-      - db
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/PatchedTableSettings'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/PatchedTableSettings'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/PatchedTableSettings'
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/TableSettings'
-          description: ''
-    delete:
-      operationId: tables_settings_destroy
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: string
-        required: true
-      - in: path
-        name: table_pk
-        schema:
-          type: string
-        required: true
-      tags:
-      - db
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '204':
-          description: No response body
-  /api/ui/v0/database_roles/:
-    get:
-      operationId: database_roles_list
-      parameters:
-      - name: limit
-        required: false
-        in: query
-        description: Number of results to return per page.
-        schema:
-          type: integer
-      - name: offset
-        required: false
-        in: query
-        description: The initial index from which to return the results.
-        schema:
-          type: integer
-      - name: ordering
-        required: false
-        in: query
-        description: Which field to use when ordering the results.
-        schema:
-          type: string
-      tags:
-      - ui
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/PaginatedDatabaseRoleList'
-          description: ''
-    post:
-      operationId: database_roles_create
-      tags:
-      - ui
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/DatabaseRole'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/DatabaseRole'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/DatabaseRole'
-        required: true
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '201':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/DatabaseRole'
-          description: ''
-  /api/ui/v0/database_roles/{id}/:
-    get:
-      operationId: database_roles_retrieve
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this database role.
-        required: true
-      tags:
-      - ui
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/DatabaseRole'
-          description: ''
-    put:
-      operationId: database_roles_update
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this database role.
-        required: true
-      tags:
-      - ui
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/DatabaseRole'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/DatabaseRole'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/DatabaseRole'
-        required: true
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/DatabaseRole'
-          description: ''
-    patch:
-      operationId: database_roles_partial_update
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this database role.
-        required: true
-      tags:
-      - ui
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/PatchedDatabaseRole'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/PatchedDatabaseRole'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/PatchedDatabaseRole'
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/DatabaseRole'
-          description: ''
-    delete:
-      operationId: database_roles_destroy
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this database role.
-        required: true
-      tags:
-      - ui
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '204':
-          description: No response body
-  /api/ui/v0/databases/:
-    get:
-      operationId: databases_list_2
-      parameters:
-      - in: query
-        name: deleted
-        schema:
-          type: boolean
-      - name: limit
-        required: false
-        in: query
-        description: Number of results to return per page.
-        schema:
-          type: integer
-      - name: offset
-        required: false
-        in: query
-        description: The initial index from which to return the results.
-        schema:
-          type: integer
-      - in: query
-        name: sort_by
-        schema:
-          type: array
-          items:
-            type: string
-            enum:
-            - -id
-            - -name
-            - id
-            - name
-        description: |-
-          Sort By
-
-          * `id` - Id
-          * `-id` - Id (descending)
-          * `name` - Name
-          * `-name` - Name (descending)
-        explode: false
-        style: form
-      tags:
-      - ui
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/PaginatedDatabaseList'
-          description: ''
-  /api/ui/v0/databases/{id}/:
-    get:
-      operationId: databases_retrieve_2
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this database.
-        required: true
-      tags:
-      - ui
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Database'
-          description: ''
-  /api/ui/v0/databases/{id}/filters/:
-    get:
-      operationId: databases_filters_retrieve
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this database.
-        required: true
-      tags:
-      - ui
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Database'
-          description: ''
-  /api/ui/v0/databases/{id}/types/:
-    get:
-      operationId: databases_types_retrieve_2
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this database.
-        required: true
-      tags:
-      - ui
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Database'
-          description: ''
-  /api/ui/v0/users/:
-    get:
-      operationId: users_list
-      parameters:
-      - name: limit
-        required: false
-        in: query
-        description: Number of results to return per page.
-        schema:
-          type: integer
-      - name: offset
-        required: false
-        in: query
-        description: The initial index from which to return the results.
-        schema:
-          type: integer
-      - name: ordering
-        required: false
-        in: query
-        description: Which field to use when ordering the results.
-        schema:
-          type: string
-      tags:
-      - ui
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/PaginatedUserList'
-          description: ''
-    post:
-      operationId: users_create
-      tags:
-      - ui
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/User'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/User'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/User'
-        required: true
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '201':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/User'
-          description: ''
-  /api/ui/v0/users/{id}/:
-    get:
-      operationId: users_retrieve
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this user.
-        required: true
-      tags:
-      - ui
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/User'
-          description: ''
-    put:
-      operationId: users_update
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this user.
-        required: true
-      tags:
-      - ui
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/User'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/User'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/User'
-        required: true
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/User'
-          description: ''
-    patch:
-      operationId: users_partial_update
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this user.
-        required: true
-      tags:
-      - ui
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/PatchedUser'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/PatchedUser'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/PatchedUser'
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/User'
-          description: ''
-    delete:
-      operationId: users_destroy
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this user.
-        required: true
-      tags:
-      - ui
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '204':
-          description: No response body
-  /api/ui/v0/users/{id}/password_reset/:
-    post:
-      operationId: users_password_reset_create
-      parameters:
-      - in: path
-        name: id
-        schema:
-          type: integer
-        description: A unique integer value identifying this user.
-        required: true
-      tags:
-      - ui
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/User'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/User'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/User'
-        required: true
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/User'
-          description: ''
-  /api/ui/v0/users/password_change/:
-    post:
-      operationId: users_password_change_create
-      tags:
-      - ui
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/User'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/User'
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/User'
-        required: true
-      security:
-      - tokenAuth: []
-      - cookieAuth: []
-      responses:
-        '200':
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/User'
-          description: ''
-components:
-  schemas:
-    Column:
-      type: object
-      properties:
-        id:
-          type: integer
-        name:
-          type: string
-        type:
-          type: string
-        type_options:
-          allOf:
-          - $ref: '#/components/schemas/TypeOption'
-          nullable: true
-        nullable:
-          type: boolean
-          default: true
-        primary_key:
-          type: boolean
-          default: false
-        source_column:
-          type: integer
-          writeOnly: true
-        copy_source_data:
-          type: boolean
-          writeOnly: true
-          default: true
-        copy_source_constraints:
-          type: boolean
-          writeOnly: true
-          default: true
-        valid_target_types:
-          type: string
-          readOnly: true
-        default:
-          allOf:
-          - $ref: '#/components/schemas/ColumnDefault'
-          nullable: true
-        has_dependents:
-          type: string
-          readOnly: true
-        description:
-          type: string
-          nullable: true
-      required:
-      - has_dependents
-      - valid_target_types
-    ColumnDefault:
-      type: object
-      properties:
-        value:
-          type: string
-        is_dynamic:
-          type: boolean
-          readOnly: true
-      required:
-      - is_dynamic
-      - value
-    Constraint:
-      type: object
-      description: |-
-        This serializer mixin is helpful in serializing polymorphic models,
-        by switching to correct serializer based on the mapping field value.
-      properties:
-        id:
-          type: integer
-          readOnly: true
-        created_at:
-          type: string
-          format: date-time
-          readOnly: true
-        updated_at:
-          type: string
-          format: date-time
-          readOnly: true
-        oid:
-          type: integer
-          maximum: 2147483647
-          minimum: -2147483648
-        table:
-          type: integer
-      required:
-      - created_at
-      - id
-      - oid
-      - table
-      - updated_at
-    DataFile:
-      type: object
-      properties:
-        id:
-          type: integer
-          readOnly: true
-        file:
-          type: string
-          format: uri
-        table_imported_to:
-          type: integer
-          readOnly: true
-        user:
-          type: integer
-          readOnly: true
-        header:
-          type: boolean
-          default: true
-        delimiter:
-          type: string
-          maxLength: 1
-        escapechar:
-          type: string
-          maxLength: 1
-        quotechar:
-          type: string
-          maxLength: 1
-        paste:
-          type: string
-        url:
-          type: string
-          format: uri
-        created_from:
-          enum:
-          - FILE
-          - PASTE
-          - URL
-          type: string
-          description: |-
-            * `FILE` - File
-            * `PASTE` - Paste
-            * `URL` - Url
-          readOnly: true
-        max_level:
-          type: integer
-          maximum: 2147483647
-          minimum: -2147483648
-        sheet_index:
-          type: integer
-          maximum: 2147483647
-          minimum: -2147483648
-      required:
-      - created_from
-      - id
-      - table_imported_to
-      - user
-    Database:
-      type: object
-      properties:
-        id:
-          type: integer
-          readOnly: true
-        name:
-          type: string
-          maxLength: 128
-        db_name:
-          type: string
-          maxLength: 128
-        deleted:
-          type: boolean
-          readOnly: true
-        editable:
-          type: boolean
-          readOnly: true
-        supported_types_url:
-          type: string
-          readOnly: true
-        username:
-          type: string
-          maxLength: 255
-        password:
-          type: string
-          writeOnly: true
-          maxLength: 255
-        host:
-          type: string
-          maxLength: 255
-        port:
-          type: integer
-          maximum: 2147483647
-          minimum: -2147483648
-      required:
-      - db_name
-      - deleted
-      - editable
-      - host
-      - id
-      - name
-      - password
-      - port
-      - supported_types_url
-      - username
-    DatabaseRole:
-      type: object
-      properties:
-        id:
-          type: integer
-          readOnly: true
-        user:
-          type: integer
-        database:
-          type: integer
-        role:
-          enum:
-          - manager
-          - editor
-          - viewer
-          type: string
-          description: |-
-            * `manager` - Manager
-            * `editor` - Editor
-            * `viewer` - Viewer
-      required:
-      - database
-      - id
-      - role
-      - user
-    LinksMapping:
-      type: object
-      description: |-
-        This serializer mixin is helpful in serializing polymorphic models,
-        by switching to correct serializer based on the mapping field value.
-      properties:
-        link_type:
-          type: string
-      required:
-      - link_type
-    NestedDatabaseRole:
-      type: object
-      properties:
-        id:
-          type: integer
-          readOnly: true
-        database:
-          type: integer
-        role:
-          enum:
-          - manager
-          - editor
-          - viewer
-          type: string
-          description: |-
-            * `manager` - Manager
-            * `editor` - Editor
-            * `viewer` - Viewer
-      required:
-      - database
-      - id
-      - role
-    NestedSchemaRole:
-      type: object
-      properties:
-        id:
-          type: integer
-          readOnly: true
-        schema:
-          type: integer
-        role:
-          enum:
-          - manager
-          - editor
-          - viewer
-          type: string
-          description: |-
-            * `manager` - Manager
-            * `editor` - Editor
-            * `viewer` - Viewer
-      required:
-      - id
-      - role
-      - schema
-    PaginatedColumnList:
-      type: object
-      properties:
-        count:
-          type: integer
-          example: 123
-        next:
-          type: string
-          nullable: true
-          format: uri
-          example: http://api.example.org/accounts/?offset=400&limit=100
-        previous:
-          type: string
-          nullable: true
-          format: uri
-          example: http://api.example.org/accounts/?offset=200&limit=100
-        results:
-          type: array
-          items:
-            $ref: '#/components/schemas/Column'
-    PaginatedConstraintList:
-      type: object
-      properties:
-        count:
-          type: integer
-          example: 123
-        next:
-          type: string
-          nullable: true
-          format: uri
-          example: http://api.example.org/accounts/?offset=400&limit=100
-        previous:
-          type: string
-          nullable: true
-          format: uri
-          example: http://api.example.org/accounts/?offset=200&limit=100
-        results:
-          type: array
-          items:
-            $ref: '#/components/schemas/Constraint'
-    PaginatedDataFileList:
-      type: object
-      properties:
-        count:
-          type: integer
-          example: 123
-        next:
-          type: string
-          nullable: true
-          format: uri
-          example: http://api.example.org/accounts/?offset=400&limit=100
-        previous:
-          type: string
-          nullable: true
-          format: uri
-          example: http://api.example.org/accounts/?offset=200&limit=100
-        results:
-          type: array
-          items:
-            $ref: '#/components/schemas/DataFile'
-    PaginatedDatabaseList:
-      type: object
-      properties:
-        count:
-          type: integer
-          example: 123
-        next:
-          type: string
-          nullable: true
-          format: uri
-          example: http://api.example.org/accounts/?offset=400&limit=100
-        previous:
-          type: string
-          nullable: true
-          format: uri
-          example: http://api.example.org/accounts/?offset=200&limit=100
-        results:
-          type: array
-          items:
-            $ref: '#/components/schemas/Database'
-    PaginatedDatabaseRoleList:
-      type: object
-      properties:
-        count:
-          type: integer
-          example: 123
-        next:
-          type: string
-          nullable: true
-          format: uri
-          example: http://api.example.org/accounts/?offset=400&limit=100
-        previous:
-          type: string
-          nullable: true
-          format: uri
-          example: http://api.example.org/accounts/?offset=200&limit=100
-        results:
-          type: array
-          items:
-            $ref: '#/components/schemas/DatabaseRole'
-    PaginatedQueryList:
-      type: object
-      properties:
-        count:
-          type: integer
-          example: 123
-        next:
-          type: string
-          nullable: true
-          format: uri
-          example: http://api.example.org/accounts/?offset=400&limit=100
-        previous:
-          type: string
-          nullable: true
-          format: uri
-          example: http://api.example.org/accounts/?offset=200&limit=100
-        results:
-          type: array
-          items:
-            $ref: '#/components/schemas/Query'
-    PaginatedSchemaList:
-      type: object
-      properties:
-        count:
-          type: integer
-          example: 123
-        next:
-          type: string
-          nullable: true
-          format: uri
-          example: http://api.example.org/accounts/?offset=400&limit=100
-        previous:
-          type: string
-          nullable: true
-          format: uri
-          example: http://api.example.org/accounts/?offset=200&limit=100
-        results:
-          type: array
-          items:
-            $ref: '#/components/schemas/Schema'
-    PaginatedTableList:
-      type: object
-      properties:
-        count:
-          type: integer
-          example: 123
-        next:
-          type: string
-          nullable: true
-          format: uri
-          example: http://api.example.org/accounts/?offset=400&limit=100
-        previous:
-          type: string
-          nullable: true
-          format: uri
-          example: http://api.example.org/accounts/?offset=200&limit=100
-        results:
-          type: array
-          items:
-            $ref: '#/components/schemas/Table'
-    PaginatedTableSettingsList:
-      type: object
-      properties:
-        count:
-          type: integer
-          example: 123
-        next:
-          type: string
-          nullable: true
-          format: uri
-          example: http://api.example.org/accounts/?offset=400&limit=100
-        previous:
-          type: string
-          nullable: true
-          format: uri
-          example: http://api.example.org/accounts/?offset=200&limit=100
-        results:
-          type: array
-          items:
-            $ref: '#/components/schemas/TableSettings'
-    PaginatedUserList:
-      type: object
-      properties:
-        count:
-          type: integer
-          example: 123
-        next:
-          type: string
-          nullable: true
-          format: uri
-          example: http://api.example.org/accounts/?offset=400&limit=100
-        previous:
-          type: string
-          nullable: true
-          format: uri
-          example: http://api.example.org/accounts/?offset=200&limit=100
-        results:
-          type: array
-          items:
-            $ref: '#/components/schemas/User'
-    PatchedColumn:
-      type: object
-      properties:
-        id:
-          type: integer
-        name:
-          type: string
-        type:
-          type: string
-        type_options:
-          allOf:
-          - $ref: '#/components/schemas/TypeOption'
-          nullable: true
-        nullable:
-          type: boolean
-          default: true
-        primary_key:
-          type: boolean
-          default: false
-        source_column:
-          type: integer
-          writeOnly: true
-        copy_source_data:
-          type: boolean
-          writeOnly: true
-          default: true
-        copy_source_constraints:
-          type: boolean
-          writeOnly: true
-          default: true
-        valid_target_types:
-          type: string
-          readOnly: true
-        default:
-          allOf:
-          - $ref: '#/components/schemas/ColumnDefault'
-          nullable: true
-        has_dependents:
-          type: string
-          readOnly: true
-        description:
-          type: string
-          nullable: true
-    PatchedDataFile:
-      type: object
-      properties:
-        id:
-          type: integer
-          readOnly: true
-        file:
-          type: string
-          format: uri
-        table_imported_to:
-          type: integer
-          readOnly: true
-        user:
-          type: integer
-          readOnly: true
-        header:
-          type: boolean
-          default: true
-        delimiter:
-          type: string
-          maxLength: 1
-        escapechar:
-          type: string
-          maxLength: 1
-        quotechar:
-          type: string
-          maxLength: 1
-        paste:
-          type: string
-        url:
-          type: string
-          format: uri
-        created_from:
-          enum:
-          - FILE
-          - PASTE
-          - URL
-          type: string
-          description: |-
-            * `FILE` - File
-            * `PASTE` - Paste
-            * `URL` - Url
-          readOnly: true
-        max_level:
-          type: integer
-          maximum: 2147483647
-          minimum: -2147483648
-        sheet_index:
-          type: integer
-          maximum: 2147483647
-          minimum: -2147483648
-    PatchedDatabase:
-      type: object
-      properties:
-        id:
-          type: integer
-          readOnly: true
-        name:
-          type: string
-          maxLength: 128
-        db_name:
-          type: string
-          maxLength: 128
-        deleted:
-          type: boolean
-          readOnly: true
-        editable:
-          type: boolean
-          readOnly: true
-        supported_types_url:
-          type: string
-          readOnly: true
-        username:
-          type: string
-          maxLength: 255
-        password:
-          type: string
-          writeOnly: true
-          maxLength: 255
-        host:
-          type: string
-          maxLength: 255
-        port:
-          type: integer
-          maximum: 2147483647
-          minimum: -2147483648
-    PatchedDatabaseRole:
-      type: object
-      properties:
-        id:
-          type: integer
-          readOnly: true
-        user:
-          type: integer
-        database:
-          type: integer
-        role:
-          enum:
-          - manager
-          - editor
-          - viewer
-          type: string
-          description: |-
-            * `manager` - Manager
-            * `editor` - Editor
-            * `viewer` - Viewer
-    PatchedQuery:
-      type: object
-      properties:
-        id:
-          type: integer
-          readOnly: true
-        schema:
-          type: string
-          readOnly: true
-        base_table:
-          type: integer
-        results_url:
-          type: string
-          readOnly: true
-        records_url:
-          type: string
-          readOnly: true
-        columns_url:
-          type: string
-          readOnly: true
-        created_at:
-          type: string
-          format: date-time
-          readOnly: true
-        updated_at:
-          type: string
-          format: date-time
-          readOnly: true
-        name:
-          type: string
-          maxLength: 128
-        description:
-          type: string
-          nullable: true
-        initial_columns:
-          type: object
-          additionalProperties: {}
-        transformations:
-          type: object
-          additionalProperties: {}
-          nullable: true
-        display_options:
-          type: object
-          additionalProperties: {}
-          nullable: true
-        display_names:
-          type: object
-          additionalProperties: {}
-          nullable: true
-    PatchedSchema:
-      type: object
-      properties:
-        id:
-          type: integer
-          readOnly: true
-        name:
-          type: string
-        database:
-          type: string
-        has_dependents:
-          type: string
-          readOnly: true
-        description:
-          type: string
-          nullable: true
-        num_tables:
-          type: string
-          readOnly: true
-        num_queries:
-          type: string
-          readOnly: true
-    PatchedTable:
-      type: object
-      properties:
-        id:
-          type: integer
-          readOnly: true
-        name:
-          type: string
-          default: ''
-        import_target:
-          type: integer
-          nullable: true
-        schema:
-          type: integer
-        created_at:
-          type: string
-          format: date-time
-          readOnly: true
-        updated_at:
-          type: string
-          format: date-time
-          readOnly: true
-        import_verified:
-          type: boolean
-          nullable: true
-        columns:
-          type: array
-          items:
-            $ref: '#/components/schemas/SimpleColumn'
-        records_url:
-          type: string
-          readOnly: true
-        constraints_url:
-          type: string
-          readOnly: true
-        columns_url:
-          type: string
-          readOnly: true
-        joinable_tables_url:
-          type: string
-          readOnly: true
-        type_suggestions_url:
-          type: string
-          readOnly: true
-        previews_url:
-          type: string
-          readOnly: true
-        data_files:
-          type: array
-          items:
-            type: integer
-        has_dependents:
-          type: string
-          readOnly: true
-        dependents_url:
-          type: string
-          readOnly: true
-        settings:
-          allOf:
-          - $ref: '#/components/schemas/TableSettings'
-          readOnly: true
-        description:
-          type: string
-          nullable: true
-    PatchedTableSettings:
-      type: object
-      properties:
-        id:
-          type: integer
-          readOnly: true
-        preview_settings:
-          $ref: '#/components/schemas/PreviewColumn'
-        column_order:
-          type: array
-          items:
-            type: integer
-    PatchedUser:
-      type: object
-      properties:
-        id:
-          type: integer
-          readOnly: true
-        full_name:
-          type: string
-          nullable: true
-          maxLength: 255
-        short_name:
-          type: string
-          nullable: true
-          maxLength: 255
-        username:
-          type: string
-          description: Required. 150 characters or fewer. Letters, digits and @/./+/-/_
-            only.
-          pattern: ^[\w.@+-]+$
-          maxLength: 150
-        password:
-          type: string
-          writeOnly: true
-          maxLength: 128
-        is_superuser:
-          type: boolean
-          title: Superuser status
-          description: Designates that this user has all permissions without explicitly
-            assigning them.
-        database_roles:
-          type: array
-          items:
-            $ref: '#/components/schemas/NestedDatabaseRole'
-        schema_roles:
-          type: array
-          items:
-            $ref: '#/components/schemas/NestedSchemaRole'
-        display_language:
-          type: string
-          maxLength: 30
-    PreviewColumn:
-      type: object
-      properties:
-        customized:
-          type: boolean
-          default: true
-        template:
-          type: string
-      required:
-      - template
-    Query:
-      type: object
-      properties:
-        id:
-          type: integer
-          readOnly: true
-        schema:
-          type: string
-          readOnly: true
-        base_table:
-          type: integer
-        results_url:
-          type: string
-          readOnly: true
-        records_url:
-          type: string
-          readOnly: true
-        columns_url:
-          type: string
-          readOnly: true
-        created_at:
-          type: string
-          format: date-time
-          readOnly: true
-        updated_at:
-          type: string
-          format: date-time
-          readOnly: true
-        name:
-          type: string
-          maxLength: 128
-        description:
-          type: string
-          nullable: true
-        initial_columns:
-          type: object
-          additionalProperties: {}
-        transformations:
-          type: object
-          additionalProperties: {}
-          nullable: true
-        display_options:
-          type: object
-          additionalProperties: {}
-          nullable: true
-        display_names:
-          type: object
-          additionalProperties: {}
-          nullable: true
-      required:
-      - base_table
-      - columns_url
-      - created_at
-      - id
-      - initial_columns
-      - name
-      - records_url
-      - results_url
-      - schema
-      - updated_at
-    Schema:
-      type: object
-      properties:
-        id:
-          type: integer
-          readOnly: true
-        name:
-          type: string
-        database:
-          type: string
-        has_dependents:
-          type: string
-          readOnly: true
-        description:
-          type: string
-          nullable: true
-        num_tables:
-          type: string
-          readOnly: true
-        num_queries:
-          type: string
-          readOnly: true
-      required:
-      - database
-      - has_dependents
-      - id
-      - name
-      - num_queries
-      - num_tables
-    SimpleColumn:
-      type: object
-      properties:
-        id:
-          type: integer
-        name:
-          type: string
-        type:
-          type: string
-        type_options:
-          allOf:
-          - $ref: '#/components/schemas/TypeOption'
-          nullable: true
-      required:
-      - name
-      - type
-    Table:
-      type: object
-      properties:
-        id:
-          type: integer
-          readOnly: true
-        name:
-          type: string
-          default: ''
-        import_target:
-          type: integer
-          nullable: true
-        schema:
-          type: integer
-        created_at:
-          type: string
-          format: date-time
-          readOnly: true
-        updated_at:
-          type: string
-          format: date-time
-          readOnly: true
-        import_verified:
-          type: boolean
-          nullable: true
-        columns:
-          type: array
-          items:
-            $ref: '#/components/schemas/SimpleColumn'
-        records_url:
-          type: string
-          readOnly: true
-        constraints_url:
-          type: string
-          readOnly: true
-        columns_url:
-          type: string
-          readOnly: true
-        joinable_tables_url:
-          type: string
-          readOnly: true
-        type_suggestions_url:
-          type: string
-          readOnly: true
-        previews_url:
-          type: string
-          readOnly: true
-        data_files:
-          type: array
-          items:
-            type: integer
-        has_dependents:
-          type: string
-          readOnly: true
-        dependents_url:
-          type: string
-          readOnly: true
-        settings:
-          allOf:
-          - $ref: '#/components/schemas/TableSettings'
-          readOnly: true
-        description:
-          type: string
-          nullable: true
-      required:
-      - columns_url
-      - constraints_url
-      - created_at
-      - dependents_url
-      - has_dependents
-      - id
-      - joinable_tables_url
-      - previews_url
-      - records_url
-      - schema
-      - settings
-      - type_suggestions_url
-      - updated_at
-    TableSettings:
-      type: object
-      properties:
-        id:
-          type: integer
-          readOnly: true
-        preview_settings:
-          $ref: '#/components/schemas/PreviewColumn'
-        column_order:
-          type: array
-          items:
-            type: integer
-      required:
-      - column_order
-      - id
-      - preview_settings
-    TypeOption:
-      type: object
-      properties:
-        length:
-          type: integer
-        precision:
-          type: integer
-        scale:
-          type: integer
-        fields:
-          type: string
-    User:
-      type: object
-      properties:
-        id:
-          type: integer
-          readOnly: true
-        full_name:
-          type: string
-          nullable: true
-          maxLength: 255
-        short_name:
-          type: string
-          nullable: true
-          maxLength: 255
-        username:
-          type: string
-          description: Required. 150 characters or fewer. Letters, digits and @/./+/-/_
-            only.
-          pattern: ^[\w.@+-]+$
-          maxLength: 150
-        password:
-          type: string
-          writeOnly: true
-          maxLength: 128
-        is_superuser:
-          type: boolean
-          title: Superuser status
-          description: Designates that this user has all permissions without explicitly
-            assigning them.
-        database_roles:
-          type: array
-          items:
-            $ref: '#/components/schemas/NestedDatabaseRole'
-        schema_roles:
-          type: array
-          items:
-            $ref: '#/components/schemas/NestedSchemaRole'
-        display_language:
-          type: string
-          maxLength: 30
-      required:
-      - id
-      - password
-      - username
-  securitySchemes:
-    cookieAuth:
-      type: apiKey
-      in: cookie
-      name: sessionid
-    tokenAuth:
-      type: apiKey
-      in: header
-      name: Authorization
-      description: Token-based authentication with required prefix "Token"

From d1bc2db6c750496eeafb117f6b9c342d20defd6f Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 16 Apr 2024 17:08:10 +0800
Subject: [PATCH 0084/1141] remove OpenAPI settings and README instructions

---
 config/settings/openapi.py | 28 ----------------------------
 mathesar/api/README.md     |  7 -------
 2 files changed, 35 deletions(-)
 delete mode 100644 config/settings/openapi.py

diff --git a/config/settings/openapi.py b/config/settings/openapi.py
deleted file mode 100644
index 85a1cd0ca5..0000000000
--- a/config/settings/openapi.py
+++ /dev/null
@@ -1,28 +0,0 @@
-def custom_preprocessing_hook(endpoints):
-    prefixes = [
-        "/api/db/v0/databases/",
-        "/api/db/v0/data_files/",
-        "/api/db/v0/schemas/",
-        "/api/db/v0/tables/",
-        "/api/db/v0/links/",
-        "/api/db/v0/queries/",
-        "/api/ui/v0/databases/",
-        "/api/ui/v0/users/",
-        "/api/ui/v0/database_roles/"
-    ]
-    filtered = [(path, path_regex, method, callback) for path, path_regex, method, callback in endpoints if any(path.startswith(prefix) for prefix in prefixes)]
-    return filtered
-
-
-def remove_url_prefix_hook(result, **kwargs):
-    # Remove namespace and version URL prefix from the operation Id of the generated API schema
-    for path, path_info in result['paths'].items():
-        for method, operation in path_info.items():
-            operation_id = operation.get('operationId')
-            if operation_id:
-                if path.startswith('/api/db/v0/'):
-                    operation['operationId'] = operation_id.replace('db_v0_', '')
-                elif path.startswith('/api/ui/v0/'):
-                    operation['operationId'] = operation_id.replace('ui_v0_', '')
-
-    return result
diff --git a/mathesar/api/README.md b/mathesar/api/README.md
index 95f4252e36..3084a65ade 100644
--- a/mathesar/api/README.md
+++ b/mathesar/api/README.md
@@ -22,10 +22,3 @@ If you prefer a non-browser tool for API development, you'll have to:
 1. Extract the key, value pair for the cookie named `sessionid` using dev tools.
 1. submit that cookie with each request until it expires.
 1. Repeat as necessary (e.g., when the cookie expires).
-
-## Generate the OpenAPI spec
-
-To generate the OpenAPI spec file in YAML format,run the following command in the respective environment:
-```bash
-python manage.py spectacular --color --file schema.yml
-```

From ae61ca24d397067cbd80e68f888a2a6c533f9a48 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 17 Apr 2024 07:50:57 +0800
Subject: [PATCH 0085/1141] remove demo-related translations

---
 translations/en/LC_MESSAGES/django.po | 18 ------------------
 translations/ja/LC_MESSAGES/django.po | 19 -------------------
 2 files changed, 37 deletions(-)

diff --git a/translations/en/LC_MESSAGES/django.po b/translations/en/LC_MESSAGES/django.po
index 2dc34f7402..d20372e284 100644
--- a/translations/en/LC_MESSAGES/django.po
+++ b/translations/en/LC_MESSAGES/django.po
@@ -40,20 +40,6 @@ msgstr ""
 msgid "roadmap"
 msgstr ""
 
-#: mathesar/templates/mathesar/login_base.html:127
-msgid ""
-"You can still use this demo site, but some features may not work correctly. "
-"We encourage you to try Mathesar on a device with a larger screen."
-msgstr ""
-
-#: mathesar/templates/mathesar/login_base.html:132
-msgid "Live Demo Mode"
-msgstr ""
-
-#: mathesar/templates/mathesar/login_base.html:135
-msgid "Mathesar's live demo is available to anyone to try out."
-msgstr ""
-
 #: mathesar/templates/mathesar/login_base.html:138
 msgid "Use the following credentials to login"
 msgstr ""
@@ -70,10 +56,6 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: mathesar/templates/mathesar/login_base.html:145
-msgid "Keep in mind that the data in the live demo is reset regularly."
-msgstr ""
-
 #: mathesar/templates/registration/login.html:3
 msgid "Logging In..."
 msgstr ""
diff --git a/translations/ja/LC_MESSAGES/django.po b/translations/ja/LC_MESSAGES/django.po
index 71b6fb7687..501e89cfdb 100644
--- a/translations/ja/LC_MESSAGES/django.po
+++ b/translations/ja/LC_MESSAGES/django.po
@@ -45,21 +45,6 @@ msgstr ""
 msgid "roadmap"
 msgstr "ロードマップ"
 
-#: mathesar/templates/mathesar/login_base.html:127
-msgid ""
-"You can still use this demo site, but some features may not work correctly. "
-"We encourage you to try Mathesar on a device with a larger screen."
-msgstr ""
-"このデモサイトは引き続きご利用いただけますが、一部の機能が正しく動作しない場合があります。より大きな画面のデバイスでMathesarをお試しいただくようお勧めします。"
-
-#: mathesar/templates/mathesar/login_base.html:132
-msgid "Live Demo Mode"
-msgstr "ライブデモモード"
-
-#: mathesar/templates/mathesar/login_base.html:135
-msgid "Mathesar's live demo is available to anyone to try out."
-msgstr "Mathesarのライブデモは、どなたでもお試しいただけます。"
-
 #: mathesar/templates/mathesar/login_base.html:138
 msgid "Use the following credentials to login"
 msgstr "次の認証情報を使用してログインする"
@@ -76,10 +61,6 @@ msgstr "ユーザー名"
 msgid "Password"
 msgstr "パスワード"
 
-#: mathesar/templates/mathesar/login_base.html:145
-msgid "Keep in mind that the data in the live demo is reset regularly."
-msgstr "ライブデモのデータは定期的にリセットされることに注意してください。"
-
 #: mathesar/templates/registration/login.html:3
 msgid "Logging In..."
 msgstr "ログイン中..."

From f60c484b55f9c2dcf1447a7907e8d2b7e90eb6ee Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 17 Apr 2024 16:51:00 +0800
Subject: [PATCH 0086/1141] remove release scripts directory

---
 release-scripts/__init__.py              |  0
 release-scripts/build-debian.sh          | 19 ---------
 release-scripts/debian/build_virtualenv  | 53 ------------------------
 release-scripts/debian/changelog         |  5 ---
 release-scripts/debian/control           | 30 --------------
 release-scripts/debian/mathesar.postinst | 37 -----------------
 release-scripts/debian/mathesar.service  | 13 ------
 release-scripts/debian/rules             | 44 --------------------
 8 files changed, 201 deletions(-)
 delete mode 100644 release-scripts/__init__.py
 delete mode 100644 release-scripts/build-debian.sh
 delete mode 100755 release-scripts/debian/build_virtualenv
 delete mode 100644 release-scripts/debian/changelog
 delete mode 100644 release-scripts/debian/control
 delete mode 100644 release-scripts/debian/mathesar.postinst
 delete mode 100644 release-scripts/debian/mathesar.service
 delete mode 100755 release-scripts/debian/rules

diff --git a/release-scripts/__init__.py b/release-scripts/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/release-scripts/build-debian.sh b/release-scripts/build-debian.sh
deleted file mode 100644
index b597f823a6..0000000000
--- a/release-scripts/build-debian.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-# The script to build the Debian package
-
-set -ex
-
-sudo rm -f -r build
-mkdir -p build
-cp ../requirements.txt build/requirements.txt
-cp ../pyproject.toml build/pyproject.toml
-cp ../MANIFEST.in build/MANIFEST.in
-cp -r ../mathesar build/mathesar/
-cp -r ../static build/static/
-cp -r ../config build/config/
-cp -r ../db build/db
-cp -r debian build/debian
-cd build
-
-dpkg-buildpackage -us -uc
diff --git a/release-scripts/debian/build_virtualenv b/release-scripts/debian/build_virtualenv
deleted file mode 100755
index c9d7a8ecca..0000000000
--- a/release-scripts/debian/build_virtualenv
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-#
-# runs dh_virtualenv to build the virtualenv in the build directory
-
-set -e
-
-export DH_VIRTUALENV_INSTALL_ROOT=/opt/venvs
-
-# make sure that the virtualenv links to the specific version of python, by
-# dereferencing the python3 symlink.
-#
-# Otherwise, if somebody tries to install (say) the stretch package on buster,
-# they will get a confusing error about "No module named 'mathesar'", because
-# python won't look in the right directory. At least this way, the error will
-# be a *bit* more obvious.
-#
-SNAKE=$(readlink -e /usr/bin/python3)
-
-# try to set the CFLAGS so any compiled C extensions are compiled with the most
-# generic as possible x64 instructions, so that compiling it on a new Intel chip
-# doesn't enable features not available on older ones or AMD.
-#
-
-case $(dpkg-architecture -q DEB_HOST_ARCH) in
-    amd64)
-        export CFLAGS=-march=x86-64
-        ;;
-esac
-
-dh_virtualenv
-
-PACKAGE_BUILD_DIR="$(pwd)/debian/mathesar"
-VIRTUALENV_DIR="${PACKAGE_BUILD_DIR}${DH_VIRTUALENV_INSTALL_ROOT}/mathesar"
-TARGET_PYTHON="${VIRTUALENV_DIR}/bin/python"
-
-# add a dependency on the right version of python to substvars.
-PYPKG=$(basename "$SNAKE")
-echo "mathesar:pydepends=$PYPKG" >> debian/mathesar.substvars
-
-
-# add a couple of triggers.  This is needed so that dh-virtualenv can rebuild
-# the venv when the system python changes (see
-# https://dh-virtualenv.readthedocs.io/en/latest/tutorial.html#step-2-set-up-packaging-for-your-project)
-#
-# we do it here rather than the more conventional way of just adding it to
-# debian/mathesar.triggers, because we need to add a trigger on the
-# right version of python.
-cat >>"debian/.debhelper/generated/mathesar/triggers" <<EOF
-# triggers for dh-virtualenv
-interest-noawait $SNAKE
-interest dh-virtualenv-interpreter-update
-
-EOF
\ No newline at end of file
diff --git a/release-scripts/debian/changelog b/release-scripts/debian/changelog
deleted file mode 100644
index a1bae3f4ba..0000000000
--- a/release-scripts/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-mathesar (0.1.4) stable; urgency=medium
-
-  * New Mathesar release 0.1.4.
-
- -- Mathesar team <hello@mathesar.org>  Thu, 18 Jan 2024 15:41:00 +0000
diff --git a/release-scripts/debian/control b/release-scripts/debian/control
deleted file mode 100644
index f1bab110a0..0000000000
--- a/release-scripts/debian/control
+++ /dev/null
@@ -1,30 +0,0 @@
-Source: mathesar
-Section: contrib/python
-Priority: optional
-Maintainer: Mathesar Team <hello@mathesar.org>
-Build-Depends:
- debhelper-compat (= 12),
- dh-virtualenv (>= 1.1),
- libsystemd-dev,
- libpq-dev,
- libicu-dev,
- pkg-config,
- lsb-release,
- python3-dev,
- python3,
- python3-setuptools,
- python3-pip,
- python3-venv,
- tar,
-Standards-Version: 3.9.8
-Homepage: https://github.com/centerofci/mathesar/
-
-Package: mathesar
-Architecture: any
-Provides: mathesar
-Pre-Depends: dpkg (>= 1.16.1)
-Depends:
- debconf,
- python3-distutils,
- ${shlibs:Depends}
-Description: Web application providing an intuitive user experience to databases.
\ No newline at end of file
diff --git a/release-scripts/debian/mathesar.postinst b/release-scripts/debian/mathesar.postinst
deleted file mode 100644
index e63e0b1450..0000000000
--- a/release-scripts/debian/mathesar.postinst
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh -e
-
-DATADIRECTORY="/var/lib/mathesar"
-CONFIGFILE="/etc/mathesar/.env"
-USER="mathesar"
-
-case "$1" in
-  configure|reconfigure)
-    # generate config files with defaults if they don't exist
-    mkdir -p "$DATADIRECTORY"
-    mkdir -p "/etc/mathesar/"
-    if [ ! -e "$CONFIGFILE" ]; then
-        secret_key=$(base64 /dev/urandom | head -c50)iu
-        cat > "$CONFIGFILE" <<EOF
-# This file is autogenerated, and will be recreated on upgrade if it is deleted.
-# Any changes you make will be preserved.
-SECRET_KEY='$secret_key'
-DJANGO_DATABASE_URL=postgres://mathesar:mathesar@localhost:5432/mathesar_django
-MATHESAR_DATABASES=(mathesar_tables|postgresql://mathesar:mathesar@localhost:5432/mathesar)
-ALLOWED_HOSTS='.localhost, 127.0.0.1'
-MEDIA_ROOT='$DATADIRECTORY/.media'
-EOF
-    fi
-    if ! getent passwd $USER >/dev/null; then
-      adduser --quiet --system --group --no-create-home --home /var/lib/mathesar $USER
-    fi
-    for DIR in /var/lib/mathesar /var/log/mathesar ; do
-      if ! dpkg-statoverride --list --quiet $DIR >/dev/null; then
-        dpkg-statoverride --force-statoverride-add --quiet --update --add $USER "$(id -gn $USER)" 0755 $DIR
-      fi
-    done
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/release-scripts/debian/mathesar.service b/release-scripts/debian/mathesar.service
deleted file mode 100644
index 621a9989f1..0000000000
--- a/release-scripts/debian/mathesar.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=gunicorn daemon
-After=network.target network-online.target
-Requires=network-online.target
-
-[Service]
-Type=notify
-User=mathesar
-EnvironmentFile=/etc/mathesar/.env
-ExecStart=/opt/venvs/mathesar/bin/python -m mathesar.start
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file
diff --git a/release-scripts/debian/rules b/release-scripts/debian/rules
deleted file mode 100755
index ee82e64587..0000000000
--- a/release-scripts/debian/rules
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/make -f
-#
-# Build Debian package using https://github.com/spotify/dh-virtualenv
-#
-
-# assume we only have one package
-PACKAGE_NAME:=`dh_listpackages`
-
-override_dh_installsystemd:
-	dh_installsystemd --name=mathesar
-
-# we don't really want to strip the symbols from our object files.
-override_dh_strip:
-
-override_dh_auto_configure:
-
-# many libraries pulled from PyPI have allocatable sections after
-# non-allocatable ones on which dwz errors out. For those without the issue the
-# gains are only marginal
-override_dh_dwz:
-
-# dh_shlibdeps calls dpkg-shlibdeps, which finds all the binary files
-# (executables and shared libs) in the package, and looks for the shared
-# libraries that they depend on. It then adds a dependency on the package that
-# contains that library to the package.
-#
-# We make two modifications to that process...
-#
-override_dh_shlibdeps:
-	dh_shlibdeps \
-	     -X site-packages/numpy.libs \
-         -X site-packages/psycopg_binary.libs \
-         -X site-packages/psycopg2_binary.libs
-override_dh_virtualenv:
-	./debian/build_virtualenv
-
-override_dh_builddeb:
-        # force the compression to xzip, to stop dpkg-deb on impish defaulting to zstd
-        # (which requires reprepro 5.3.0-1.3, which is currently only in 'experimental' in Debian:
-        # https://metadata.ftp-master.debian.org/changelogs/main/r/reprepro/reprepro_5.3.0-1.3_changelog)
-	dh_builddeb -- -Zxz
-
-%:
-	dh $@ --with python-virtualenv
\ No newline at end of file

From 26ec5c58c1fc49d6f50220b361e1aaa8d9f4a4d0 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 17 Apr 2024 17:15:08 +0800
Subject: [PATCH 0087/1141] remove build helping pieces

---
 MANIFEST.in       | 1 -
 mathesar/start.py | 7 -------
 pyproject.toml    | 9 ---------
 3 files changed, 17 deletions(-)
 delete mode 100644 MANIFEST.in
 delete mode 100644 mathesar/start.py

diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index cf8c9939f0..0000000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1 +0,0 @@
-recursive-include static *
\ No newline at end of file
diff --git a/mathesar/start.py b/mathesar/start.py
deleted file mode 100644
index 6ebc452983..0000000000
--- a/mathesar/start.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import sys
-import gunicorn.app.wsgiapp as wsgi
-from mathesar.install import main as run_install
-# This is just a simple way to supply args to gunicorn
-sys.argv = [".", "config.wsgi", "--bind=0.0.0.0:8000"]
-run_install(skip_static_collection=True)
-wsgi.run()
diff --git a/pyproject.toml b/pyproject.toml
index b28bfa252d..03ff059ee8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,13 +1,4 @@
-[project]
-name = "Mathesar"
-version = "0.1.6"
 [tool.vulture]
 exclude = ["mathesar/migrations"]
 ignore_names = ["go_to_patents_data_table", "go_to_all_types_table", "go_to_table_with_numbers_in_text", "admin_user"]
 min_confidence = 90
-[tool.setuptools.package-data]
-"*" = ["*.sql", "*.json", "*.html", "*.js", "*.css", "*.svg", "*.txt"]
-[tool.setuptools.packages.find]
-where = ["."]  # list of folders that contain the packages (["."] by default)
-include = ["db*", "media*", "config*", "mathesar*", "static*"]  # package names should match these glob patterns (["*"] by default)
-exclude = []  # exclude packages matching these glob patterns (empty by default)

From c44af45ce5268a0d78d3a8aedc5de665f7a28ade Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 17 Apr 2024 17:26:08 +0800
Subject: [PATCH 0088/1141] remove 'common' build target from Dockerfile

---
 Dockerfile | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d27d3b3a06..3e836d05d0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -87,9 +87,9 @@ EXPOSE 8000 3000 6006
 ENTRYPOINT ["./dev-run.sh"]
 
 
-#=========== STAGE: COMMON ===================================================#
+#=========== STAGE: PRODUCTION ===============================================#
 
-from base as common
+from base as production
 
 # Install prod requirements
 RUN pip install --no-cache-dir -r requirements-prod.txt
@@ -105,11 +105,6 @@ RUN rm -rf ./mathesar_ui
 RUN rm -rf ./mathesar/tests ./db/tests
 RUN rm -rf ./docs
 
-
-#=========== STAGE: PRODUCTION ===============================================#
-
-FROM common AS production
-
 EXPOSE 8000
 
 ENTRYPOINT ["./run.sh"]

From 32932d5fa5b48699af732ef9a7e14d09ddd0dac4 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 17 Apr 2024 17:56:13 +0800
Subject: [PATCH 0089/1141] remove debian build instructions

---
 DEVELOPER_GUIDE.md | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md
index 6e08bb8c30..98794bf6c9 100644
--- a/DEVELOPER_GUIDE.md
+++ b/DEVELOPER_GUIDE.md
@@ -230,37 +230,6 @@ If you'd like to manually push or pull translations, follow the instructions in
     ```
     docker exec -it mathesar_dev_db psql -U mathesar
     ```
-
-
-## Building Debian package
-
-- On a Debian machine, install the following dependencies
-    
-    ```
-    sudo apt install debhelper-compat dh-virtualenv libsystemd-dev libpq-dev libicu-dev pkg-config lsb-release python3-dev python3 python3-setuptools python3-pip python3-venv tar
-    ```
-- Setup Mathesar build environment.
-   This step is useful only when testing locally is needed for building static files and for collecting them. We won't have a need for this step while using the build service as it will be using the source code from release assets which will contain these static files
-
-
-- Install Python and Nodejs preferably on a Linux machine
-- Run the following commands to set up the environment
-
-    ```
-    python3 -m venv ./mathesar-venv
-    source ./mathesar-venv/bin/activate
-    pip install -r requirements.txt
-    sudo npm install -g npm-force-resolutions
-    cd mathesar_ui && npm install --unsafe-perm && npm run build
-    cd ..
-    python manage.py collectstatic
-    ```
-  
-- From the mathesar directory, run the build script to generate the debian package
-  
-    ```
-    cd release-scripts && source build-debian.sh
-    ```
  
 ## Troubleshooting
 

From 4d2e2d5516492136fdba3ea31d3651dc985bba4f Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 17 Apr 2024 16:55:16 +0530
Subject: [PATCH 0090/1141] remove setup dir

---
 setup/__init__.py             |  0
 setup/secret_key_generator.py | 13 -------------
 2 files changed, 13 deletions(-)
 delete mode 100644 setup/__init__.py
 delete mode 100644 setup/secret_key_generator.py

diff --git a/setup/__init__.py b/setup/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/setup/secret_key_generator.py b/setup/secret_key_generator.py
deleted file mode 100644
index 7912758eb2..0000000000
--- a/setup/secret_key_generator.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import secrets
-
-
-def generate_secretkey():
-    secret_key = secrets.token_urlsafe()
-    # TODO Add documentation link
-    documentation_link = "<Add documentation link>"
-    print(f"Please follow the instructions in {documentation_link} to add the below secret key to the application")
-    print(f"Secret Key: {secret_key}")
-
-
-if __name__ == "__main__":
-    generate_secretkey()

From 492672f00b7b5b334c8b300e05e9ec8652c1766e Mon Sep 17 00:00:00 2001
From: Hiten Vidhani <60215053+hitenvidhani@users.noreply.github.com>
Date: Wed, 17 Apr 2024 17:48:32 +0530
Subject: [PATCH 0091/1141] Fix test_user_api.py

---
 mathesar/tests/api/test_user_api.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mathesar/tests/api/test_user_api.py b/mathesar/tests/api/test_user_api.py
index 9c210d3bd9..0e091957cd 100644
--- a/mathesar/tests/api/test_user_api.py
+++ b/mathesar/tests/api/test_user_api.py
@@ -63,8 +63,7 @@ def test_user_password_reset_non_superuser(client_bob, user_bob):
 def test_user_password_change(client_bob, user_bob):
     new_password = 'new_password'
     data = {
-        'password': new_password,
-        'old_password': 'password'
+        'password': new_password
     }
     response = client_bob.post('/api/ui/v0/users/password_change/', data=data)
     assert response.status_code == 200

From 0b1925b9aa2b468028dbee36edcbd65092fdd897 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Apr 2024 12:33:49 +0000
Subject: [PATCH 0092/1141] Bump gunicorn from 20.1.0 to 22.0.0

Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.1.0 to 22.0.0.
- [Release notes](https://github.com/benoitc/gunicorn/releases)
- [Commits](https://github.com/benoitc/gunicorn/compare/20.1.0...22.0.0)

---
updated-dependencies:
- dependency-name: gunicorn
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 6c686c71a9..1d54d8a505 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -25,7 +25,7 @@ responses==0.22.0
 SQLAlchemy-Utils==0.38.2
 thefuzz==0.19.0
 whitenoise==6.4.0
-gunicorn==20.1.0
+gunicorn==22.0.0
 pandas==2.0.2
 openpyxl==3.1.2
 pyxlsb==1.0.10

From 3b446c76b7d1f045def7a26b755b2f6276da1861 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 17 Apr 2024 19:31:16 +0530
Subject: [PATCH 0093/1141] rearrange imports in test_errors_codes.py

---
 mathesar/tests/rpc/exceptions/test_error_codes.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mathesar/tests/rpc/exceptions/test_error_codes.py b/mathesar/tests/rpc/exceptions/test_error_codes.py
index 66d6babb72..a50f01b521 100644
--- a/mathesar/tests/rpc/exceptions/test_error_codes.py
+++ b/mathesar/tests/rpc/exceptions/test_error_codes.py
@@ -1,12 +1,12 @@
-from http.client import CannotSendRequest
+import pytest
 
-from django.core.exceptions import FieldDoesNotExist
 from psycopg.errors import BadCopyFileFormat
-import pytest
+from django.core.exceptions import FieldDoesNotExist
+from mathesar.utils.connections import BadInstallationTarget
+from db.functions.exceptions import UnknownDBFunctionID
 from sqlalchemy.exc import IntegrityError
+from http.client import CannotSendRequest
 
-from db.functions.exceptions import UnknownDBFunctionID
-from mathesar.utils.connections import BadInstallationTarget
 import mathesar.rpc.exceptions.error_codes as err_codes
 
 

From b87c5106a3b3444e7077bf2a608bad38499e3faa Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 17 Apr 2024 10:14:36 -0400
Subject: [PATCH 0094/1141] Begin packages directory

---
 mathesar_ui/src/packages/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 mathesar_ui/src/packages/README.md

diff --git a/mathesar_ui/src/packages/README.md b/mathesar_ui/src/packages/README.md
new file mode 100644
index 0000000000..9ed9ad23d1
--- /dev/null
+++ b/mathesar_ui/src/packages/README.md
@@ -0,0 +1,9 @@
+# Packages
+
+This directory contains general-purpose packages which could (theoretically) be used outside of Mathesar.
+
+- **Currently**: code in these packages uses ESM imports to reference code
+
+- **In the future**: we want to convert our entire Mathesar repository to a monorepo and transform these packages into actual npm packages. They wouldn't necessarily be _published_ on npm, but they'd become self-contained at that point, unable to import/export at the ESM level, but only at the package level.
+
+Until then, this directory serves as a sort of staging ground to help make that transition easier.

From 83ba2deee0c78968253799888ed88841548977bf Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 17 Apr 2024 11:00:06 -0400
Subject: [PATCH 0095/1141] Add json-rpc-client-builder package

---
 .../json-rpc-client-builder/INTERNALS.md      |  19 +++
 .../packages/json-rpc-client-builder/LICENSE  |  21 +++
 .../json-rpc-client-builder/README.md         |  62 ++++++++
 .../json-rpc-client-builder/RpcError.ts       |  66 +++++++++
 .../json-rpc-client-builder/builder.ts        |  54 +++++++
 .../packages/json-rpc-client-builder/index.ts |   9 ++
 .../json-rpc-client-builder/requests.ts       | 138 ++++++++++++++++++
 7 files changed, 369 insertions(+)
 create mode 100644 mathesar_ui/src/packages/json-rpc-client-builder/INTERNALS.md
 create mode 100644 mathesar_ui/src/packages/json-rpc-client-builder/LICENSE
 create mode 100644 mathesar_ui/src/packages/json-rpc-client-builder/README.md
 create mode 100644 mathesar_ui/src/packages/json-rpc-client-builder/RpcError.ts
 create mode 100644 mathesar_ui/src/packages/json-rpc-client-builder/builder.ts
 create mode 100644 mathesar_ui/src/packages/json-rpc-client-builder/index.ts
 create mode 100644 mathesar_ui/src/packages/json-rpc-client-builder/requests.ts

diff --git a/mathesar_ui/src/packages/json-rpc-client-builder/INTERNALS.md b/mathesar_ui/src/packages/json-rpc-client-builder/INTERNALS.md
new file mode 100644
index 0000000000..68a0e902dd
--- /dev/null
+++ b/mathesar_ui/src/packages/json-rpc-client-builder/INTERNALS.md
@@ -0,0 +1,19 @@
+# Internal details of json-rpc-client-builder
+
+This document describes how the code in this package works, because there's some weird magic happening here! The `json-rpc-client-builder` package encapsulates all of this magic so that consumers needn't worry about it. But from _within_ the package there is some TypeScript trickery. That trickery exists for the purpose of provide an ergonomic means for consumers to define and call their API methods.
+
+Here's what's happening...
+
+- When calling `buildRpcApi`, consumers of this package define the structure of their API by creating passing an object to the `methodTree` prop. That object is a _value_ — not a type.
+
+- Within that `methodTree` object, package consumers use the `rpcMethodTypeContainer` function to indicate an RPC method at that position in the tree. When doing so, they define the input and output types for the API method. In TypeScript land, those types get tacked on to these leaf nodes of the method tree, but in a rather strange way... The `rpcMethodTypeContainer` function just returns an empty array (as a value), but it _types_ that value using a tuple type to represent the runtime input/output of the RPC method. This means the return value from `rpcMethodTypeContainer` is intentionally in disagreement with the return _type_ from that function.
+
+- When `buildRpcApi` runs, it discards the empty arrays, putting the actual API request in their place. Fancy TS types make this all work out in the end (so long as the API actually behaves the way it is specified).
+
+Why this approach?
+
+- This was the best way I came up with to make an API that's really ergonomic to define and use.
+
+- You might think that we could give consumers a better function to use instead of `rpcMethodTypeContainer` — one that returns a `RpcRequest` factory. Then we wouldn't need a builder function like `buildRpcApi`. But the problem here is the method names (and namespacing). Any function placed at the leaves of the tree won't be able to see the trunk and branches. And I didn't want to require consumers to specify the method names redundantly.
+
+- I think this approach is okay because we don't expect package consumers to ever utilize the return value of `rpcMethodTypeContainer` outside of `buildRpcApi` which understands this weirdness.
diff --git a/mathesar_ui/src/packages/json-rpc-client-builder/LICENSE b/mathesar_ui/src/packages/json-rpc-client-builder/LICENSE
new file mode 100644
index 0000000000..ddf685f590
--- /dev/null
+++ b/mathesar_ui/src/packages/json-rpc-client-builder/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Mathesar Foundation Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/mathesar_ui/src/packages/json-rpc-client-builder/README.md b/mathesar_ui/src/packages/json-rpc-client-builder/README.md
new file mode 100644
index 0000000000..b26b1b56d0
--- /dev/null
+++ b/mathesar_ui/src/packages/json-rpc-client-builder/README.md
@@ -0,0 +1,62 @@
+# JSON-RPC Client Builder
+
+This is a simple library that allows you to generate a client for an external API which conforms to the [JSON-RPC](https://www.jsonrpc.org/) spec (version 2.0).
+
+## Example
+
+### Defining your API
+
+```ts
+import { buildRpcApi, rpcMethodTypeContainer } from 'json-rpc-client-builder';
+
+export const api = buildRpcApi({
+  endpoint: '/api/rpc/v0/',
+  getHeaders: () => ({ 'X-CSRFToken': Cookies.get('csrftoken') }),
+  methodTree: {
+
+    spacecrafts: {
+      get: rpcMethodTypeContainer<
+        {
+          id: number,
+        },
+        Spacecraft,
+      >();
+      list: rpcMethodTypeContainer<
+        {
+          universe_id: number,
+          is_active: boolean,
+        },
+        Spacecraft,
+      >();
+    }
+
+  },
+});
+```
+
+This will model a JSON-RPC API with two namespaced methods `spacecrafts.get` and `spacecrafts.list`. You can create arbitrarily deep method trees to model deeply-namespaced RPC methods.
+
+### Calling the API
+
+A non-batched call looks like:
+
+```ts
+/** @type {RpcRequest<Spacecraft>>} */
+const request = api.spacecrafts.get({ id: 42 });
+
+/** @type {CancellablePromise<Spacecraft>} */
+const promise = request.run();
+
+/** @type {Spacecraft} */
+const spacecraft = await promise; // Might throw!
+```
+
+A batched call looks like:
+
+```ts
+/** @type {[RpcResponse<Spacecraft>, RpcResponse<Voyage>]} */
+const [spacecraftResult, voyageResult] = await batchSend(
+  api.spacecrafts.get({ id: 42 }),
+  api.voyages.get({ id: 100 }),
+);
+```
diff --git a/mathesar_ui/src/packages/json-rpc-client-builder/RpcError.ts b/mathesar_ui/src/packages/json-rpc-client-builder/RpcError.ts
new file mode 100644
index 0000000000..8e4b1bc4cd
--- /dev/null
+++ b/mathesar_ui/src/packages/json-rpc-client-builder/RpcError.ts
@@ -0,0 +1,66 @@
+import { hasProperty, hasStringProperty } from '@mathesar-component-library';
+
+// TODO: create and document specific error codes instead of using a fallback
+const FALLBACK_ERROR_CODE = 0;
+
+export class RpcError extends Error {
+  status = 'error' as const;
+
+  code: number;
+
+  data?: unknown;
+
+  constructor(p: { message: string; code: number; data?: unknown }) {
+    super(p.message);
+    this.code = p.code;
+    this.data = p.data;
+  }
+
+  /**
+   * This static method does its best to extract the error message, code, and
+   * data out of whatever you give it.
+   */
+  static fromAnything(value: unknown): RpcError {
+    // This is so we can handle creating RpcError instances from various types
+    // of errors that might be thrown, e.g. from fetch if there's a network
+    // problem.
+    if (value instanceof Error) {
+      return new RpcError({
+        code: FALLBACK_ERROR_CODE,
+        message: value.message,
+      });
+    }
+
+    // If our HTTP request succeeded (status 200) and we've received a valid
+    // response object conforming to the JSON-RPC spec, then this is the place
+    // where we handle the standard JSON-RPC error object within that response.
+    if (hasProperty(value, 'error')) {
+      return RpcError.fromAnything(value.error);
+    }
+
+    const message = (() => {
+      if (hasStringProperty(value, 'message')) {
+        return value.message;
+      }
+      if (typeof value === 'string') {
+        return value;
+      }
+      if (
+        hasProperty(value, 'toString') &&
+        typeof value.toString === 'function'
+      ) {
+        return String(value.toString());
+      }
+      return JSON.stringify(value);
+    })();
+
+    const code =
+      hasProperty(value, 'code') && typeof value.code === 'number'
+        ? value.code
+        : FALLBACK_ERROR_CODE;
+
+    const data = hasProperty(value, 'data') ? value.data : undefined;
+
+    return new RpcError({ code, message, data });
+  }
+}
diff --git a/mathesar_ui/src/packages/json-rpc-client-builder/builder.ts b/mathesar_ui/src/packages/json-rpc-client-builder/builder.ts
new file mode 100644
index 0000000000..3f99677346
--- /dev/null
+++ b/mathesar_ui/src/packages/json-rpc-client-builder/builder.ts
@@ -0,0 +1,54 @@
+import { RpcRequest } from './requests';
+
+type MethodTypeContainer<Params, Result> = [Params, Result];
+type MethodTree = { [key: string]: MethodTreeNode };
+type MethodTreeNode = MethodTree | MethodTypeContainer<unknown, unknown>;
+type Api<Node extends MethodTreeNode> = Node extends MethodTypeContainer<
+  infer Params,
+  infer Result
+>
+  ? (params: Params) => RpcRequest<Result>
+  : Node extends MethodTree
+    ? { [MethodName in keyof Node]: Api<Node[MethodName]> }
+    : never;
+
+function nodeIsMethod(
+  node: MethodTreeNode,
+): node is MethodTypeContainer<unknown, unknown> {
+  return Array.isArray(node);
+}
+
+export function rpcMethodTypeContainer<P, R>(): MethodTypeContainer<P, R> {
+  // There is dark magic happening here! 🧙‍♂️ See INTERNALS.md for details.
+  return [] as unknown as MethodTypeContainer<P, R>;
+}
+
+function handleNode<Node extends MethodTreeNode>(
+  path: string[],
+  endpoint: string,
+  getHeaders: () => Record<string, string | undefined>,
+  node: Node,
+) {
+  if (nodeIsMethod(node)) {
+    return (params: unknown) =>
+      new RpcRequest({ path, endpoint, params, getHeaders });
+  }
+  const transformedTree: Record<string, unknown> = {};
+  for (const [pathSegment, branch] of Object.entries<MethodTreeNode>(node)) {
+    transformedTree[pathSegment] = handleNode(
+      [...path, pathSegment],
+      endpoint,
+      getHeaders,
+      branch,
+    );
+  }
+  return transformedTree;
+}
+
+export function buildRpcApi<Tree extends MethodTree>(p: {
+  endpoint: string;
+  getHeaders: () => Record<string, string | undefined>;
+  methodTree: Tree;
+}): Api<Tree> {
+  return handleNode([], p.endpoint, p.getHeaders, p.methodTree) as Api<Tree>;
+}
diff --git a/mathesar_ui/src/packages/json-rpc-client-builder/index.ts b/mathesar_ui/src/packages/json-rpc-client-builder/index.ts
new file mode 100644
index 0000000000..066c9206d9
--- /dev/null
+++ b/mathesar_ui/src/packages/json-rpc-client-builder/index.ts
@@ -0,0 +1,9 @@
+export { type RpcError } from './RpcError';
+export { buildRpcApi, rpcMethodTypeContainer } from './builder';
+export {
+  batchSend,
+  type RpcBatchResponse,
+  type RpcRequest,
+  type RpcResponse,
+  type RpcResult,
+} from './requests';
diff --git a/mathesar_ui/src/packages/json-rpc-client-builder/requests.ts b/mathesar_ui/src/packages/json-rpc-client-builder/requests.ts
new file mode 100644
index 0000000000..3afa088a44
--- /dev/null
+++ b/mathesar_ui/src/packages/json-rpc-client-builder/requests.ts
@@ -0,0 +1,138 @@
+import { CancellablePromise, hasProperty } from '@mathesar-component-library';
+import { RpcError } from './RpcError';
+
+const METHOD_PATH_SEPARATOR = '.';
+const jsonrpc = '2.0';
+
+export interface RpcResult<T> {
+  status: 'ok';
+  value: T;
+}
+
+export type RpcResponse<T> = RpcResult<T> | RpcError;
+
+function cancellableFetch(
+  input: Parameters<typeof fetch>[0],
+  init: Parameters<typeof fetch>[1] = {},
+): CancellablePromise<Response> {
+  const controller = new AbortController();
+  return new CancellablePromise<Response>(
+    (resolve, reject) =>
+      void fetch(input, { ...init, signal: controller.signal })
+        .then(resolve)
+        .catch(reject),
+    () => controller.abort(),
+  );
+}
+
+function makeRpcResponse<T = unknown>(value: unknown): RpcResponse<T> {
+  if (hasProperty(value, 'result')) {
+    const response: RpcResult<T> = {
+      status: 'ok',
+      value: value.result as T,
+    };
+    return response;
+  }
+  return RpcError.fromAnything(value);
+}
+
+function send<T>(request: RpcRequest<T>): CancellablePromise<RpcResponse<T>> {
+  const fetch = cancellableFetch(request.endpoint, {
+    method: 'POST',
+    headers: {
+      ...request.getHeaders(),
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify({
+      jsonrpc,
+      id: 0,
+      method: request.method,
+      params: request.params,
+    }),
+  });
+  return new CancellablePromise(
+    (resolve) =>
+      void fetch
+        .then(
+          (response) => response.json(),
+          // If the fetch promise rejects (e.g. for a network connection error),
+          // we still want to _resolve_ the returned promise (instead of
+          // _rejecting_ it). This way all error-handling is done consistently
+          // by using the two variants of RpcResponse.
+          (rejectionReason) => resolve(RpcError.fromAnything(rejectionReason)),
+        )
+        .then((json) => resolve(makeRpcResponse(json))),
+    () => fetch.cancel(),
+  );
+}
+
+export type GetHeaders = () => Record<string, string | undefined>;
+
+export class RpcRequest<T> {
+  endpoint: string;
+
+  /** The full namespaced path to the method name */
+  path: string[];
+
+  params: unknown;
+
+  getHeaders: GetHeaders;
+
+  constructor(p: {
+    endpoint: string;
+    path: string[];
+    params: unknown;
+    getHeaders: GetHeaders;
+  }) {
+    this.endpoint = p.endpoint;
+    this.path = p.path;
+    this.params = p.params;
+    this.getHeaders = p.getHeaders;
+  }
+
+  get method() {
+    return this.path.join(METHOD_PATH_SEPARATOR);
+  }
+
+  /**
+   * The simplest, most common way to run an API request.
+   *
+   * @throws `ApiError` when awaited if any errors are encountered.
+   */
+  run(): CancellablePromise<T> {
+    const responsePromise = this.send();
+    return new CancellablePromise(
+      (resolve, reject) =>
+        void responsePromise.then(
+          (rpcResponse) =>
+            rpcResponse.status === 'ok'
+              ? resolve(rpcResponse.value)
+              : reject(rpcResponse),
+          (error) => reject(RpcError.fromAnything(error)),
+        ),
+      () => responsePromise.cancel(),
+    );
+  }
+
+  /**
+   * Provides more fine-grained control instead of `run` by returning
+   * ApiResult which can be type-narrowed manually.
+   *
+   * Will not reject or throw errors.
+   */
+  send(): CancellablePromise<RpcResponse<T>> {
+    return send(this);
+  }
+}
+
+export type RpcBatchResponse<T extends RpcRequest<unknown>[]> =
+  CancellablePromise<{
+    [K in keyof T]: T[K] extends RpcRequest<infer R> ? RpcResponse<R> : never;
+  }>;
+
+export function batchSend<T extends RpcRequest<unknown>[]>(
+  ...requests: T
+): RpcBatchResponse<T> {
+  // TODO implement batch sending
+  throw new Error('Not implemented');
+}

From cf84740cc6f3ee9dea90a2bb831f0e4015c76d2c Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 17 Apr 2024 11:02:26 -0400
Subject: [PATCH 0096/1141] Define Mathesar's RPC API for connections

---
 mathesar_ui/src/api/rpc/connections.ts | 50 ++++++++++++++++++++++++++
 mathesar_ui/src/api/rpc/index.ts       | 13 +++++++
 2 files changed, 63 insertions(+)
 create mode 100644 mathesar_ui/src/api/rpc/connections.ts
 create mode 100644 mathesar_ui/src/api/rpc/index.ts

diff --git a/mathesar_ui/src/api/rpc/connections.ts b/mathesar_ui/src/api/rpc/connections.ts
new file mode 100644
index 0000000000..b3102afda5
--- /dev/null
+++ b/mathesar_ui/src/api/rpc/connections.ts
@@ -0,0 +1,50 @@
+import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
+
+export const sampleDataOptions = [
+  'library_management',
+  'movie_collection',
+] as const;
+
+export type SampleDataSchemaIdentifier = (typeof sampleDataOptions)[number];
+
+export interface Connection {
+  id: number;
+  nickname: string;
+  database: string;
+  username: string;
+  host: string;
+  port: number;
+}
+
+export const connections = {
+  add_from_known_connection: rpcMethodTypeContainer<
+    {
+      nickname: Connection['nickname'];
+      database: Connection['database'];
+      /** When true, create a new database if needed. Defaults to False. */
+      create_db?: boolean;
+      /**
+       * When present, reuse the credentials from a known connection. When
+       * omitted, use the credentials from the internal DB server.
+       */
+      connection_id?: Connection['id'];
+      /** Sample data to load. Defaults to none. */
+      sample_data?: SampleDataSchemaIdentifier[];
+    },
+    Connection
+  >(),
+
+  add_from_scratch: rpcMethodTypeContainer<
+    {
+      nickname: Connection['nickname'];
+      database: Connection['database'];
+      user: Connection['username'];
+      password: string;
+      host: Connection['host'];
+      port: Connection['port'];
+      /** Sample data to load. Defaults to none. */
+      sample_data?: SampleDataSchemaIdentifier[];
+    },
+    Connection
+  >(),
+};
diff --git a/mathesar_ui/src/api/rpc/index.ts b/mathesar_ui/src/api/rpc/index.ts
new file mode 100644
index 0000000000..a2259be005
--- /dev/null
+++ b/mathesar_ui/src/api/rpc/index.ts
@@ -0,0 +1,13 @@
+import Cookies from 'js-cookie';
+
+import { buildRpcApi } from '@mathesar/packages/json-rpc-client-builder';
+import { connections } from './connections';
+
+/** Mathesar's JSON-RPC API */
+export const api = buildRpcApi({
+  endpoint: '/api/rpc/v0/',
+  getHeaders: () => ({ 'X-CSRFToken': Cookies.get('csrftoken') }),
+  methodTree: {
+    connections,
+  },
+});

From 70affa3d21b3d00465bf6f353fef5c0869fef6f9 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 17 Apr 2024 11:04:02 -0400
Subject: [PATCH 0097/1141] Replace two REST endpoints with RPC API

---
 mathesar_ui/src/stores/databases.ts           | 17 +++++++----
 .../systems/connections/AddConnection.svelte  | 29 +++++++++++--------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/mathesar_ui/src/stores/databases.ts b/mathesar_ui/src/stores/databases.ts
index 3e9344bc22..115ae1a912 100644
--- a/mathesar_ui/src/stores/databases.ts
+++ b/mathesar_ui/src/stores/databases.ts
@@ -8,11 +8,10 @@ import {
 } from '@mathesar-component-library';
 import connectionsApi, {
   type Connection,
-  type CreateFromKnownConnectionProps,
-  type CreateFromScratchProps,
   type CreateWithNewUserProps,
   type UpdatableConnectionProperties,
 } from '@mathesar/api/rest/connections';
+import { api } from '@mathesar/api/rpc';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import type { MakeWritablePropertiesReadable } from '@mathesar/utils/typeUtils';
 
@@ -73,14 +72,20 @@ class ConnectionsStore {
     this.unsortedConnections.set(connection.id, connection);
   }
 
-  async createFromKnownConnection(props: CreateFromKnownConnectionProps) {
-    const connection = await connectionsApi.createFromKnownConnection(props);
+  async createFromKnownConnection(
+    props: Parameters<typeof api.connections.add_from_known_connection>[0],
+  ) {
+    const connection = await api.connections
+      .add_from_known_connection(props)
+      .run();
     this.addConnection(connection);
     return connection;
   }
 
-  async createFromScratch(props: CreateFromScratchProps) {
-    const connection = await connectionsApi.createFromScratch(props);
+  async createFromScratch(
+    props: Parameters<typeof api.connections.add_from_scratch>[0],
+  ) {
+    const connection = await api.connections.add_from_scratch(props).run();
     this.addConnection(connection);
     return connection;
   }
diff --git a/mathesar_ui/src/systems/connections/AddConnection.svelte b/mathesar_ui/src/systems/connections/AddConnection.svelte
index 4d24dd613a..b96098343a 100644
--- a/mathesar_ui/src/systems/connections/AddConnection.svelte
+++ b/mathesar_ui/src/systems/connections/AddConnection.svelte
@@ -130,22 +130,27 @@
       if (!connection) {
         throw new Error('Bug: $connectionToReuse is undefined');
       }
+      const connectionReference = getConnectionReference(connection);
+      const connectionId =
+        connectionReference.connection_type === 'user_database'
+          ? connectionReference.id
+          : undefined;
       return connectionsStore.createFromKnownConnection({
-        ...commonProps,
-        credentials: {
-          connection: getConnectionReference(connection),
-        },
-        create_database: $createDatabase,
+        database: commonProps.database_name,
+        nickname: commonProps.nickname,
+        sample_data: commonProps.sample_data,
+        connection_id: connectionId,
+        create_db: $createDatabase,
       });
     }
     return connectionsStore.createFromScratch({
-      ...commonProps,
-      credentials: {
-        host: $host,
-        port: String($port),
-        user: $user,
-        password: $password,
-      },
+      database: commonProps.database_name,
+      nickname: commonProps.nickname,
+      sample_data: commonProps.sample_data,
+      host: $host,
+      port: $port,
+      user: $user,
+      password: $password,
     });
   }
 

From c0d2f4185c34b321a13b70524e7a3947d5e980b0 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 17 Apr 2024 11:05:37 -0400
Subject: [PATCH 0098/1141] Clean up unused REST client code

---
 mathesar_ui/src/api/rest/connections.ts | 35 -------------------------
 1 file changed, 35 deletions(-)

diff --git a/mathesar_ui/src/api/rest/connections.ts b/mathesar_ui/src/api/rest/connections.ts
index 8f36a2550b..2ce58de7d6 100644
--- a/mathesar_ui/src/api/rest/connections.ts
+++ b/mathesar_ui/src/api/rest/connections.ts
@@ -45,29 +45,6 @@ export interface CommonCreationProps {
   nickname: string;
 }
 
-export interface CreateFromKnownConnectionProps extends CommonCreationProps {
-  credentials: { connection: ConnectionReference };
-  create_database: boolean;
-}
-
-/**
- * The `create_database` field is not present on this variant because we do not
- * support creating the database in this case. The reason for this restriction
- * is that we need a valid connection to an existing database in order to first
- * create one. In theory, we could ask the user to supply such a connection but
- * Sean and Brent deemed that approach to add too much additional complexity to
- * the UI to justify its inclusion. We predict that if someone already has a
- * PostgreSQL user, they are likely to already have a PostgreSQL database too.
- */
-export interface CreateFromScratchProps extends CommonCreationProps {
-  credentials: {
-    user: string;
-    password: string;
-    host: string;
-    port: string;
-  };
-}
-
 export interface CreateWithNewUserProps extends CommonCreationProps {
   credentials: {
     create_user_via: ConnectionReference;
@@ -77,16 +54,6 @@ export interface CreateWithNewUserProps extends CommonCreationProps {
   create_database: boolean;
 }
 
-function createFromKnownConnection(props: CreateFromKnownConnectionProps) {
-  const url = '/api/ui/v0/connections/create_from_known_connection/';
-  return postAPI<Connection>(url, props);
-}
-
-function createFromScratch(props: CreateFromScratchProps) {
-  const url = '/api/ui/v0/connections/create_from_scratch/';
-  return postAPI<Connection>(url, props);
-}
-
 function createWithNewUser(props: CreateWithNewUserProps) {
   const url = '/api/ui/v0/connections/create_with_new_user/';
   return postAPI<Connection>(url, props);
@@ -116,8 +83,6 @@ function deleteConnection(
 
 export default {
   list,
-  createFromKnownConnection,
-  createFromScratch,
   createWithNewUser,
   update,
   delete: deleteConnection,

From fe7f221e6d9c8428105ac7ebb1cabd504193a031 Mon Sep 17 00:00:00 2001
From: hitenvidhani <vidhani.hiten2001@gmail.com>
Date: Thu, 18 Apr 2024 00:57:04 +0530
Subject: [PATCH 0099/1141] fix test

---
 mathesar/api/ui/serializers/users.py | 28 +++++++++-------------------
 mathesar/tests/api/test_user_api.py  |  6 ++++--
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/mathesar/api/ui/serializers/users.py b/mathesar/api/ui/serializers/users.py
index cb714ede51..948f09fcec 100644
--- a/mathesar/api/ui/serializers/users.py
+++ b/mathesar/api/ui/serializers/users.py
@@ -1,3 +1,4 @@
+from django.contrib.auth.password_validation import validate_password
 from rest_access_policy import FieldAccessMixin, PermittedPkRelatedField
 from rest_framework import serializers
 import django.contrib.auth.password_validation as validators
@@ -74,21 +75,19 @@ class ChangePasswordSerializer(MathesarErrorMessageMixin, serializers.Serializer
     password = serializers.CharField(write_only=True, required=True)
     old_password = serializers.CharField(write_only=True, required=True)
 
-    def validate(self, data):
-        user = User(**data)
-        password = data.get('password')
-        errors = dict()
-        validators.validate_password(password=password, user=user)
-        if errors:
-            raise serializers.ValidationError(errors)
-        return super(ChangePasswordSerializer, self).validate(data)
-
     def validate_old_password(self, value):
         user = self.context['request'].user
         if user.check_password(value) is True:
-            return value
+           return value 
         raise IncorrectOldPassword(field='old_password')
 
+    def validate_password(self, value):
+        try:
+            validate_password(value)
+        except serializers.ValidationError as exc:
+            raise serializers.ValidationError(str(exc))
+        return value
+
     def update(self, instance, validated_data):
         instance.set_password(validated_data['password'])
         instance.save()
@@ -98,15 +97,6 @@ def update(self, instance, validated_data):
 class PasswordResetSerializer(MathesarErrorMessageMixin, serializers.Serializer):
     password = serializers.CharField(write_only=True, required=True)
 
-    def validate(self, data):
-        user = User(**data)
-        password = data.get('password')
-        errors = dict()
-        validators.validate_password(password=password, user=user)
-        if errors:
-            raise serializers.ValidationError(errors)
-        return super(PasswordResetSerializer, self).validate(data)
-
 
 class DatabaseRoleSerializer(MathesarErrorMessageMixin, serializers.ModelSerializer):
     class Meta:
diff --git a/mathesar/tests/api/test_user_api.py b/mathesar/tests/api/test_user_api.py
index 0e091957cd..82ee072fe0 100644
--- a/mathesar/tests/api/test_user_api.py
+++ b/mathesar/tests/api/test_user_api.py
@@ -61,9 +61,11 @@ def test_user_password_reset_non_superuser(client_bob, user_bob):
 
 
 def test_user_password_change(client_bob, user_bob):
-    new_password = 'new_password'
+    new_password = 'NewPass0!'
+    old_password = 'password'
     data = {
-        'password': new_password
+        'password': 'NewPass0!',
+        'old_password': old_password
     }
     response = client_bob.post('/api/ui/v0/users/password_change/', data=data)
     assert response.status_code == 200

From ab69b487f5bb45d5ea94b173c08a10f12406a80f Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 18 Apr 2024 00:58:06 +0530
Subject: [PATCH 0100/1141] add tests for rpc exception decorator

---
 .../rpc/exceptions/test_error_handler.py      | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 mathesar/tests/rpc/exceptions/test_error_handler.py

diff --git a/mathesar/tests/rpc/exceptions/test_error_handler.py b/mathesar/tests/rpc/exceptions/test_error_handler.py
new file mode 100644
index 0000000000..f701131343
--- /dev/null
+++ b/mathesar/tests/rpc/exceptions/test_error_handler.py
@@ -0,0 +1,37 @@
+import pytest
+
+from modernrpc.exceptions import RPCException
+from psycopg.errors import BadCopyFileFormat
+from django.core.exceptions import FieldDoesNotExist
+from mathesar.utils.connections import BadInstallationTarget
+from db.functions.exceptions import UnknownDBFunctionID
+from http.client import CannotSendRequest
+
+from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+
+
+@handle_rpc_exceptions
+def fake_func(exception):
+    raise exception
+
+
+@pytest.mark.parametrize(
+    "example_err,expect_code", [
+        (AssertionError, -31002),
+        (BadCopyFileFormat, -30009),
+        (FieldDoesNotExist, -29030),
+        (BadInstallationTarget, -28002),
+        (UnknownDBFunctionID, -27024),
+        (CannotSendRequest, -25031),
+    ]
+)
+def test_handle_rpc_exceptions(example_err, expect_code):
+    """
+    Tests whether a function wrapped by `handle_rpc_exceptions` always raises a `RPCException`
+    for any given exception raised inside the function.
+    """
+    with pytest.raises(RPCException) as rpc_exception:
+        fake_func(example_err)
+    assert hasattr(fake_func, '__wrapped__')
+    assert example_err.__name__ in rpc_exception.value.args[0]
+    assert str(expect_code) in rpc_exception.value.args[0]

From fa4201c09e3cba7b057403c2994ce9bd261196f8 Mon Sep 17 00:00:00 2001
From: hitenvidhani <vidhani.hiten2001@gmail.com>
Date: Thu, 18 Apr 2024 01:00:42 +0530
Subject: [PATCH 0101/1141] fix lint

---
 mathesar/api/ui/serializers/users.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mathesar/api/ui/serializers/users.py b/mathesar/api/ui/serializers/users.py
index 948f09fcec..308d7d3a49 100644
--- a/mathesar/api/ui/serializers/users.py
+++ b/mathesar/api/ui/serializers/users.py
@@ -1,7 +1,6 @@
 from django.contrib.auth.password_validation import validate_password
 from rest_access_policy import FieldAccessMixin, PermittedPkRelatedField
 from rest_framework import serializers
-import django.contrib.auth.password_validation as validators
 
 from mathesar.api.db.permissions.database import DatabaseAccessPolicy
 from mathesar.api.db.permissions.schema import SchemaAccessPolicy

From 15badf9acfb8fb4dd962f297bf6772ae52b85855 Mon Sep 17 00:00:00 2001
From: hitenvidhani <vidhani.hiten2001@gmail.com>
Date: Thu, 18 Apr 2024 01:02:58 +0530
Subject: [PATCH 0102/1141] Lint

---
 mathesar/api/ui/serializers/users.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/api/ui/serializers/users.py b/mathesar/api/ui/serializers/users.py
index 308d7d3a49..a8d363f707 100644
--- a/mathesar/api/ui/serializers/users.py
+++ b/mathesar/api/ui/serializers/users.py
@@ -77,7 +77,7 @@ class ChangePasswordSerializer(MathesarErrorMessageMixin, serializers.Serializer
     def validate_old_password(self, value):
         user = self.context['request'].user
         if user.check_password(value) is True:
-           return value 
+            return value
         raise IncorrectOldPassword(field='old_password')
 
     def validate_password(self, value):

From a188a5631245c8987b6e4c46732cd77bca6bbd9c Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 17 Apr 2024 20:17:15 -0400
Subject: [PATCH 0103/1141] Set active cell to first-clicked when
 drag-selecting

---
 mathesar_ui/src/components/sheet/selection/SheetSelection.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
index c116f90b1c..0c9725d1c0 100644
--- a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
+++ b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
@@ -262,6 +262,7 @@ export default class SheetSelection {
     return this.withBasis(
       basisFromDataCells(
         this.plane.dataCellsInFlexibleRowRange(rowIdA, rowIdB),
+        makeCellId(rowIdA, this.plane.columnIds.first ?? ''),
       ),
     );
   }
@@ -271,9 +272,10 @@ export default class SheetSelection {
    * provided columnIds, inclusive.
    */
   ofColumnRange(columnIdA: string, columnIdB: string): SheetSelection {
-    const newBasis = this.plane.hasResultRows
+    const newBasis = this.plane.rowIds.first
       ? basisFromDataCells(
           this.plane.dataCellsInColumnRange(columnIdA, columnIdB),
+          makeCellId(this.plane.rowIds.first, columnIdA),
         )
       : basisFromEmptyColumns(this.plane.columnIds.range(columnIdA, columnIdB));
     return this.withBasis(newBasis);
@@ -303,6 +305,7 @@ export default class SheetSelection {
     return this.withBasis(
       basisFromDataCells(
         this.plane.dataCellsInFlexibleCellRange(cellIdA, cellIdB),
+        cellIdA,
       ),
     );
   }

From f003faea812ddc1410187f9d079ff1744de87c5b Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 17 Apr 2024 21:00:38 -0400
Subject: [PATCH 0104/1141] Don't show text selection cursor on row header
 cells

---
 mathesar_ui/src/components/sheet/cells/SheetRowHeaderCell.svelte | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mathesar_ui/src/components/sheet/cells/SheetRowHeaderCell.svelte b/mathesar_ui/src/components/sheet/cells/SheetRowHeaderCell.svelte
index bdf05fecf1..2409c6a1e3 100644
--- a/mathesar_ui/src/components/sheet/cells/SheetRowHeaderCell.svelte
+++ b/mathesar_ui/src/components/sheet/cells/SheetRowHeaderCell.svelte
@@ -32,5 +32,6 @@
     font-size: var(--text-size-x-small);
     padding: 0 1.5rem;
     color: var(--color-text-muted);
+    cursor: default;
   }
 </style>

From 832e17550e2eca014ddbf46914afacf04aa0059c Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 17 Apr 2024 21:02:37 -0400
Subject: [PATCH 0105/1141] Show row header selection bg in Data Explorer

---
 .../src/systems/data-explorer/result-pane/Results.svelte     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
index 793c266cf1..05c08ec9fe 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
@@ -119,6 +119,7 @@
         {#each items as item (item.key)}
           {@const row = getRow(item.index)}
           {@const rowSelectionId = (row && getRowSelectionId(row)) ?? ''}
+          {@const isSelected = $selection.rowIds.has(rowSelectionId)}
           {#if row || showDummyGhostRow}
             <SheetRow style={item.style} let:htmlAttributes let:styleString>
               <div
@@ -130,6 +131,10 @@
                   columnIdentifierKey={ID_ROW_CONTROL_COLUMN}
                 >
                   <CellBackground color="var(--cell-bg-color-header)" />
+                  <CellBackground
+                    when={isSelected}
+                    color="var(--cell-bg-color-row-selected)"
+                  />
                   {$pagination.offset + item.index + 1}
                 </SheetRowHeaderCell>
 

From 115485d73718117df2f794e6064aadfc6df3be35 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 18 Apr 2024 15:01:39 +0800
Subject: [PATCH 0106/1141] add initial db connection getting stub

---
 db/connection.py          | 15 +++++++++++++++
 mathesar/database/base.py | 17 +++++++++++++++++
 mathesar/rpc/utils.py     | 13 +++++++++++++
 3 files changed, 45 insertions(+)
 create mode 100644 mathesar/rpc/utils.py

diff --git a/db/connection.py b/db/connection.py
index 2b546256d3..5af890107f 100644
--- a/db/connection.py
+++ b/db/connection.py
@@ -40,6 +40,21 @@ def execute_msar_func_with_psycopg2_conn(conn, func_name, *args):
     return conn.execute(stmt)
 
 
+def exec_msar_func(conn, func_name, *args):
+    """
+    Execute an msar function using a psycopg (3) connection.
+
+    Args:
+        conn: a psycopg connection
+        func_name: The unqualified msar_function name (danger; not sanitized)
+        *args: The list of parameters to pass
+    """
+    # Returns a cursor
+    return conn.execute(
+        f"SELECT msar.{func_name}({','.join(['%s']*len(args))})", args
+    )
+
+
 def load_file_with_engine(engine, file_handle):
     """Run an SQL script from a file, using psycopg."""
     conn_str = str(engine.url)
diff --git a/mathesar/database/base.py b/mathesar/database/base.py
index d6384d3d76..c07552be26 100644
--- a/mathesar/database/base.py
+++ b/mathesar/database/base.py
@@ -1,3 +1,4 @@
+import psycopg
 from db import engine
 
 
@@ -18,3 +19,19 @@ def _get_credentials_for_db_model(db_model):
         database=db_model.db_name,
         port=db_model.port,
     )
+
+
+def get_psycopg_connection(db_model):
+    """
+    Get a psycopg connection, given a Database model.
+
+    Args:
+        db_model: The Django model corresponding to the Database.
+    """
+    return psycopg.connect(
+        host=db_model.host,
+        port=db_model.port,
+        dbname=db_model.db_name,
+        user=db_model.username,
+        password=db_model.password,
+    )
diff --git a/mathesar/rpc/utils.py b/mathesar/rpc/utils.py
new file mode 100644
index 0000000000..7bc33919d0
--- /dev/null
+++ b/mathesar/rpc/utils.py
@@ -0,0 +1,13 @@
+from mathesar.database.base import get_psycopg_connection
+from mathesar.models.base import Database
+
+
+def connect(db_id):
+    """
+    Return a psycopg connection, given a Database model id.
+
+    Args:
+        db_id: The Django id corresponding to the Database.
+    """
+    db_model = Database.current_objects.get(id=db_id)
+    return get_psycopg_connection(db_model)

From 7e7bd4c50a8821feebbc11b7b60c52fbc42549d3 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 19 Apr 2024 19:36:13 +0530
Subject: [PATCH 0107/1141] remove e2e infra

---
 .../run-e2e-integ-tests.yml.disabled          |  59 --------
 Dockerfile.integ-tests                        | 139 ------------------
 2 files changed, 198 deletions(-)
 delete mode 100644 .github/workflows/run-e2e-integ-tests.yml.disabled
 delete mode 100644 Dockerfile.integ-tests

diff --git a/.github/workflows/run-e2e-integ-tests.yml.disabled b/.github/workflows/run-e2e-integ-tests.yml.disabled
deleted file mode 100644
index 3184153f4e..0000000000
--- a/.github/workflows/run-e2e-integ-tests.yml.disabled
+++ /dev/null
@@ -1,59 +0,0 @@
-name: Run E2E integration tests
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    # We only want to run on external PRs, since internal PRs are covered by "push"
-    # This prevents this from running twice on internal PRs
-    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
-    steps:
-      - uses: actions/checkout@v2
-
-      # In this step, this action saves a list of existing images,
-      # the cache is created without them in the post run.
-      # It also restores the cache if it exists.
-      - uses: satackey/action-docker-layer-caching@v0.0.11
-        # Ignore the failure of a step and avoid terminating the job.
-        continue-on-error: true
-        with:
-          key: mathesar-docker-cache-integ-tests-{hash}
-          restore-keys: |
-            mathesar-docker-cache-e2e-tests-
-
-      - name: Copy env file
-        run: cp .env.example .env
-
-      - name: Use integ test dockerfile
-        run: rm Dockerfile && mv Dockerfile.integ-tests Dockerfile
-
-      # The code is checked out under uid 1001 - reset this to 1000 for the
-      # container to run tests successfully
-      - name: Fix permissions
-        run: sudo chown -R 1000:1000 .
-
-      - name: Build the stack
-        run: docker-compose up --build -d
-
-      - name: Sleep for 60 seconds
-        run: sleep 60s
-        shell: bash
-
-      # TODO: This needs to be handled inside the tests
-      - name: Run migrations
-        run: docker exec mathesar_service python manage.py migrate
-
-      - name: Run type installation
-        run: docker exec mathesar_service python install.py --skip-confirm
-
-      - name: Build front end
-        run: docker exec -w /code/mathesar_ui mathesar_service npx vite build
-
-      - name: Run integ tests with pytest
-        run: docker exec mathesar_service pytest --browser chromium --browser webkit --browser firefox --video="on" --output="./videos/" mathesar/tests/integration/ -n0
-
-      - uses: actions/upload-artifact@v2
-        if: ${{ failure() || success() }}
-        with:
-          name: Recordings
-          path: ${{ github.workspace }}/videos/
diff --git a/Dockerfile.integ-tests b/Dockerfile.integ-tests
deleted file mode 100644
index b9b2691270..0000000000
--- a/Dockerfile.integ-tests
+++ /dev/null
@@ -1,139 +0,0 @@
-FROM buildpack-deps:focal
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-# Install python
-# Some of this is ported from docker file for python-3.9:
-# https://github.com/docker-library/python/blob/33751272d8171cece37c59180c049ab77cf9c837/3.9/buster/Dockerfile
-
-# ensure local python is preferred over distribution python
-ENV PATH /usr/local/bin:$PATH
-
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
-# Download node source
-ENV NODE_MAJOR 18
-
-RUN apt-get update
-RUN apt-get install -y ca-certificates curl gnupg
-RUN mkdir -p /etc/apt/keyrings
-RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
-
-RUN apt-get update
-RUN apt-get install nodejs -y
-
-# extra dependencies (over what buildpack-deps already includes)
-RUN apt-get update && apt-get install -y --no-install-recommends \
-		libbluetooth-dev \
-		tk-dev \
-		uuid-dev \
-        sudo \
-        nodejs \
-	&& rm -rf /var/lib/apt/lists/*
-
-ENV GPG_KEY E3FF2839C048B25C084DEBE9B26995E310250568
-ENV PYTHON_VERSION 3.9.8
-
-RUN set -ex \
-	\
-	&& wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
-	&& wget -O python.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \
-	&& export GNUPGHOME="$(mktemp -d)" \
-	&& gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$GPG_KEY" \
-	&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
-	&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
-	&& rm -rf "$GNUPGHOME" python.tar.xz.asc \
-	&& mkdir -p /usr/src/python \
-	&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
-	&& rm python.tar.xz \
-	\
-	&& cd /usr/src/python \
-	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
-	&& ./configure \
-		--build="$gnuArch" \
-		--enable-loadable-sqlite-extensions \
-		--enable-optimizations \
-		--enable-option-checking=fatal \
-		--enable-shared \
-		--with-system-expat \
-		--with-system-ffi \
-		--without-ensurepip \
-	&& make -j "$(nproc)" \
-	&& make install \
-	&& rm -rf /usr/src/python \
-	\
-	&& find /usr/local -depth \
-		\( \
-			\( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
-			-o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
-		\) -exec rm -rf '{}' + \
-	\
-	&& ldconfig \
-	\
-	&& python3 --version
-
-# make some useful symlinks that are expected to exist
-RUN cd /usr/local/bin \
-	&& ln -s idle3 idle \
-	&& ln -s pydoc3 pydoc \
-	&& ln -s python3 python \
-	&& ln -s python3-config python-config
-
-# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 21.2.4
-# https://github.com/docker-library/python/issues/365
-ENV PYTHON_SETUPTOOLS_VERSION 57.5.0
-# https://github.com/pypa/get-pip
-ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/d781367b97acf0ece7e9e304bf281e99b618bf10/public/get-pip.py
-ENV PYTHON_GET_PIP_SHA256 01249aa3e58ffb3e1686b7141b4e9aac4d398ef4ac3012ed9dff8dd9f685ffe0
-
-RUN set -ex; \
-	\
-	wget -O get-pip.py "$PYTHON_GET_PIP_URL"; \
-	echo "$PYTHON_GET_PIP_SHA256 *get-pip.py" | sha256sum --check --strict -; \
-	\
-	python get-pip.py \
-		--disable-pip-version-check \
-		--no-cache-dir \
-		"pip==$PYTHON_PIP_VERSION" \
-		"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
-	; \
-	pip --version; \
-	\
-	find /usr/local -depth \
-		\( \
-			\( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
-			-o \
-			\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
-		\) -exec rm -rf '{}' +; \
-	rm -f get-pip.py
-
-ENV PYTHONUNBUFFERED=1
-ENV DOCKERIZE_VERSION v0.6.1
-
-# Install dockerize
-RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
-    && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
-    && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
-
-RUN pip install playwright==1.18.2
-RUN pip install pytest-playwright==0.2.3
-RUN playwright install
-RUN playwright install-deps
-
-# Change work directory
-WORKDIR /code/
-
-COPY requirements.txt .
-COPY requirements-dev.txt .
-
-RUN pip install -r requirements.txt
-RUN pip install -r requirements-dev.txt
-COPY . .
-
-RUN cd mathesar_ui && npm ci && npm run build
-
-EXPOSE 8000 3000 6006

From 54056ab706872ab6993bb6bd9c2b56a93f42310a Mon Sep 17 00:00:00 2001
From: hitenvidhani <vidhani.hiten2001@gmail.com>
Date: Sat, 20 Apr 2024 00:17:46 +0530
Subject: [PATCH 0108/1141] Add new test, resolve comments

---
 mathesar/api/ui/serializers/users.py |  5 +++--
 mathesar/tests/api/test_user_api.py  | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/mathesar/api/ui/serializers/users.py b/mathesar/api/ui/serializers/users.py
index a8d363f707..80501c9c51 100644
--- a/mathesar/api/ui/serializers/users.py
+++ b/mathesar/api/ui/serializers/users.py
@@ -1,4 +1,5 @@
 from django.contrib.auth.password_validation import validate_password
+from django.core.exceptions import ValidationError as DjangoValidationError
 from rest_access_policy import FieldAccessMixin, PermittedPkRelatedField
 from rest_framework import serializers
 
@@ -83,8 +84,8 @@ def validate_old_password(self, value):
     def validate_password(self, value):
         try:
             validate_password(value)
-        except serializers.ValidationError as exc:
-            raise serializers.ValidationError(str(exc))
+        except DjangoValidationError as exc:
+            raise DjangoValidationError(str(exc))
         return value
 
     def update(self, instance, validated_data):
diff --git a/mathesar/tests/api/test_user_api.py b/mathesar/tests/api/test_user_api.py
index 82ee072fe0..d655022188 100644
--- a/mathesar/tests/api/test_user_api.py
+++ b/mathesar/tests/api/test_user_api.py
@@ -64,7 +64,7 @@ def test_user_password_change(client_bob, user_bob):
     new_password = 'NewPass0!'
     old_password = 'password'
     data = {
-        'password': 'NewPass0!',
+        'password': new_password,
         'old_password': old_password
     }
     response = client_bob.post('/api/ui/v0/users/password_change/', data=data)
@@ -73,6 +73,19 @@ def test_user_password_change(client_bob, user_bob):
     assert user_bob.check_password(new_password) is True
 
 
+def test_user_password_change_invalid(client_bob, user_bob):
+    new_password = 'new_pwd'
+    old_password = 'password'
+    data = {
+        'password': new_password,
+        'old_password': old_password
+    }
+    response = client_bob.post('/api/ui/v0/users/password_change/', data=data)
+    assert response.status_code == 400
+    user_bob.refresh_from_db()
+    assert user_bob.check_password(new_password) is False
+
+
 def test_diff_user_detail_as_non_superuser(client_bob, admin_user):
     response = client_bob.get(f'/api/ui/v0/users/{admin_user.id}/')
     response_data = response.json()

From 51ce60ae5dc0f0b0d61deac5909d7f5745dcc179 Mon Sep 17 00:00:00 2001
From: hitenvidhani <vidhani.hiten2001@gmail.com>
Date: Sat, 20 Apr 2024 19:43:45 +0530
Subject: [PATCH 0109/1141] init

---
 mathesar_ui/.eslintrc.cjs                     |   17 +
 mathesar_ui/package-lock.json                 | 1771 +++++++++--------
 mathesar_ui/package.json                      |    6 +-
 .../TransformationsPane.svelte                |   18 +-
 4 files changed, 957 insertions(+), 855 deletions(-)

diff --git a/mathesar_ui/.eslintrc.cjs b/mathesar_ui/.eslintrc.cjs
index 45062d0242..c7f97069fc 100644
--- a/mathesar_ui/.eslintrc.cjs
+++ b/mathesar_ui/.eslintrc.cjs
@@ -6,6 +6,7 @@ module.exports = {
     'dist',
     'index.html',
     'src/**/*.stories.svelte',
+    '*.cjs',
   ],
   parserOptions: {
     tsconfigRootDir: __dirname,
@@ -22,6 +23,9 @@ module.exports = {
     'plugin:@typescript-eslint/recommended-requiring-type-checking',
     'plugin:svelte/recommended',
     'plugin:svelte/prettier',
+    'plugin:import/errors',
+		'plugin:import/warnings',
+    'plugin:import/typescript'
   ],
   rules: {
     'import/no-extraneous-dependencies': ['error', { devDependencies: true }],
@@ -44,6 +48,19 @@ module.exports = {
     'no-restricted-syntax': 0,
     '@typescript-eslint/require-await': 'off',
     'class-methods-use-this': 'off',
+    "no-multiple-empty-lines": 1,
+    'import/order': [
+			'warn',
+			{
+				alphabetize: {
+					order: 'asc',
+          orderImportKind:'asc',
+					caseInsensitive: true
+				},
+				'newlines-between': 'always',
+        'groups': ['builtin', 'external', 'internal', ['parent', 'sibling'], 'index'],
+			}
+		]
   },
   overrides: [
     {
diff --git a/mathesar_ui/package-lock.json b/mathesar_ui/package-lock.json
index f3e4191d31..c475073dd1 100644
--- a/mathesar_ui/package-lock.json
+++ b/mathesar_ui/package-lock.json
@@ -38,9 +38,9 @@
         "eslint-config-prettier": "^8.5.0",
         "eslint-import-resolver-typescript": "^3.5.1",
         "eslint-plugin-eslint-comments": "^3.2.0",
-        "eslint-plugin-import": "^2.26.0",
+        "eslint-plugin-import": "^2.29.1",
         "eslint-plugin-promise": "^6.0.1",
-        "eslint-plugin-svelte": "^2.35.1",
+        "eslint-plugin-svelte": "^2.37.0",
         "jsdom": "^20.0.0",
         "postcss": "^8.4.16",
         "prettier": "^3.1.0",
@@ -1264,9 +1264,9 @@
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
       "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
@@ -1424,23 +1424,6 @@
         }
       }
     },
-    "node_modules/@sveltejs/vite-plugin-svelte/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@sveltejs/vite-plugin-svelte/node_modules/kleur": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
@@ -1682,7 +1665,7 @@
     "node_modules/@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
       "dev": true
     },
     "node_modules/@types/node": {
@@ -1768,23 +1751,6 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
@@ -1907,32 +1873,6 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
     "node_modules/@typescript-eslint/parser/node_modules/fast-glob": {
       "version": "3.2.12",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
@@ -2046,23 +1986,6 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@typescript-eslint/types": {
       "version": "5.38.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.38.0.tgz",
@@ -2103,23 +2026,6 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/fast-glob": {
       "version": "3.2.12",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
@@ -2287,23 +2193,6 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@typescript-eslint/utils/node_modules/eslint-utils": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
@@ -2331,15 +2220,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
     "node_modules/@typescript-eslint/utils/node_modules/fast-glob": {
       "version": "3.2.12",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
@@ -2577,6 +2457,42 @@
         "node": ">=6.0"
       }
     },
+    "node_modules/array-buffer-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
+      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "is-array-buffer": "^3.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
+      "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
@@ -2586,6 +2502,84 @@
         "node": ">=8"
       }
     },
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
+      "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
+      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
+      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/arraybuffer.prototype.slice": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
+      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.2.1",
+        "get-intrinsic": "^1.2.3",
+        "is-array-buffer": "^3.0.4",
+        "is-shared-array-buffer": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/assertion-error": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
@@ -2601,6 +2595,21 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
       "dev": true
     },
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+      "dev": true,
+      "dependencies": {
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -2694,13 +2703,19 @@
       "dev": true
     },
     "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
       "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2988,15 +3003,66 @@
         "node": ">=12"
       }
     },
+    "node_modules/data-view-buffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
+      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
+      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/dayjs": {
       "version": "1.11.5",
       "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.5.tgz",
       "integrity": "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA=="
     },
     "node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -3049,17 +3115,20 @@
       }
     },
     "node_modules/define-data-property": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz",
-      "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.2.1",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/define-lazy-prop": {
@@ -3174,13 +3243,120 @@
       "optional": true,
       "peer": true
     },
-    "node_modules/es-shim-unscopables": {
+    "node_modules/es-abstract": {
+      "version": "1.23.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
+      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.3",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "data-view-buffer": "^1.0.1",
+        "data-view-byte-length": "^1.0.1",
+        "data-view-byte-offset": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-set-tostringtag": "^2.0.3",
+        "es-to-primitive": "^1.2.1",
+        "function.prototype.name": "^1.1.6",
+        "get-intrinsic": "^1.2.4",
+        "get-symbol-description": "^1.0.2",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.0.3",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.0.7",
+        "is-array-buffer": "^3.0.4",
+        "is-callable": "^1.2.7",
+        "is-data-view": "^1.0.1",
+        "is-negative-zero": "^2.0.3",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.3",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.13",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.13.1",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.5",
+        "regexp.prototype.flags": "^1.5.2",
+        "safe-array-concat": "^1.1.2",
+        "safe-regex-test": "^1.0.3",
+        "string.prototype.trim": "^1.2.9",
+        "string.prototype.trimend": "^1.0.8",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.2",
+        "typed-array-byte-length": "^1.0.1",
+        "typed-array-byte-offset": "^1.0.2",
+        "typed-array-length": "^1.0.6",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.15"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-define-property": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
       "dev": true,
       "dependencies": {
-        "has": "^1.0.3"
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
+      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.4",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
+      "dev": true,
+      "dependencies": {
+        "hasown": "^2.0.0"
       }
     },
     "node_modules/es-to-primitive": {
@@ -3792,10 +3968,13 @@
       }
     },
     "node_modules/eslint-compat-utils": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.1.2.tgz",
-      "integrity": "sha512-Jia4JDldWnFNIru1Ehx1H5s9/yxiRHY/TimCuUc0jNexew3cF1gI6CYZil1ociakfWO3rRqFjl1mskBblB3RYg==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.5.0.tgz",
+      "integrity": "sha512-dc6Y8tzEcSYZMHa+CMPLi/hyo1FzNeonbhJL7Ol0ccuKQkwopJcJBA9YL/xmMTLU1eKigXo9vj9nALElWYSowg==",
       "dev": true,
+      "dependencies": {
+        "semver": "^7.5.4"
+      },
       "engines": {
         "node": ">=12"
       },
@@ -3822,124 +4001,6 @@
         "eslint-plugin-import": "^2.25.2"
       }
     },
-    "node_modules/eslint-config-airbnb-base/node_modules/es-abstract": {
-      "version": "1.20.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.2.tgz",
-      "integrity": "sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.2",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.2",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base/node_modules/es-abstract/node_modules/object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base/node_modules/function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base/node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base/node_modules/is-callable": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.6.tgz",
-      "integrity": "sha512-krO72EO2NptOGAX2KYyqbP9vYMlNAXdB53rq6f8LXY6RY7JdSR/3BD6wLUlPHSAesmY9vstNrjvqGaCiRK/91Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base/node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base/node_modules/object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/eslint-config-airbnb-base/node_modules/object.entries": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
@@ -3963,49 +4024,6 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/eslint-config-airbnb-base/node_modules/string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base/node_modules/string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base/node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/eslint-config-airbnb-typescript": {
       "version": "17.0.0",
       "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-17.0.0.tgz",
@@ -4034,13 +4052,14 @@
       }
     },
     "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
       "dev": true,
       "dependencies": {
         "debug": "^3.2.7",
-        "resolve": "^1.20.0"
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
       }
     },
     "node_modules/eslint-import-resolver-node/node_modules/debug": {
@@ -4077,23 +4096,6 @@
         "eslint-plugin-import": "*"
       }
     },
-    "node_modules/eslint-import-resolver-typescript/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/eslint-import-resolver-typescript/node_modules/enhanced-resolve": {
       "version": "5.10.0",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz",
@@ -4151,18 +4153,6 @@
         "node": ">= 4"
       }
     },
-    "node_modules/eslint-import-resolver-typescript/node_modules/is-core-module": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
-      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/eslint-import-resolver-typescript/node_modules/is-glob": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -4197,9 +4187,9 @@
       }
     },
     "node_modules/eslint-module-utils": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
-      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz",
+      "integrity": "sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==",
       "dev": true,
       "dependencies": {
         "debug": "^3.2.7"
@@ -4251,24 +4241,28 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
+      "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
       "dev": true,
       "dependencies": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
+        "array-includes": "^3.1.7",
+        "array.prototype.findlastindex": "^1.2.3",
+        "array.prototype.flat": "^1.3.2",
+        "array.prototype.flatmap": "^1.3.2",
+        "debug": "^3.2.7",
         "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.3",
-        "has": "^1.0.3",
-        "is-core-module": "^2.8.1",
+        "eslint-import-resolver-node": "^0.3.9",
+        "eslint-module-utils": "^2.8.0",
+        "hasown": "^2.0.0",
+        "is-core-module": "^2.13.1",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
-        "object.values": "^1.1.5",
-        "resolve": "^1.22.0",
-        "tsconfig-paths": "^3.14.1"
+        "object.fromentries": "^2.0.7",
+        "object.groupby": "^1.0.1",
+        "object.values": "^1.1.7",
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.15.0"
       },
       "engines": {
         "node": ">=4"
@@ -4277,50 +4271,13 @@
         "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/array-includes": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
-      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5",
-        "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/array.prototype.flat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
       "dependencies": {
-        "ms": "2.0.0"
+        "ms": "^2.1.1"
       }
     },
     "node_modules/eslint-plugin-import/node_modules/doctrine": {
@@ -4335,94 +4292,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/es-abstract": {
-      "version": "1.20.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.2.tgz",
-      "integrity": "sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.2",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.2",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/is-callable": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.6.tgz",
-      "integrity": "sha512-krO72EO2NptOGAX2KYyqbP9vYMlNAXdB53rq6f8LXY6RY7JdSR/3BD6wLUlPHSAesmY9vstNrjvqGaCiRK/91Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/is-core-module": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
-      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/eslint-plugin-import/node_modules/is-glob": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -4435,21 +4304,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/eslint-plugin-import/node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -4462,126 +4316,13 @@
         "node": "*"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/eslint-plugin-import/node_modules/object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+    "node_modules/eslint-plugin-import/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
       "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "semver": "bin/semver.js"
       }
     },
     "node_modules/eslint-plugin-promise": {
@@ -4597,23 +4338,23 @@
       }
     },
     "node_modules/eslint-plugin-svelte": {
-      "version": "2.35.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-svelte/-/eslint-plugin-svelte-2.35.1.tgz",
-      "integrity": "sha512-IF8TpLnROSGy98Z3NrsKXWDSCbNY2ReHDcrYTuXZMbfX7VmESISR78TWgO9zdg4Dht1X8coub5jKwHzP0ExRug==",
+      "version": "2.37.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-svelte/-/eslint-plugin-svelte-2.37.0.tgz",
+      "integrity": "sha512-H/2Gz7agYHEMEEzRuLYuCmAIdjuBnbhFG9hOK0yCdSBvvJGJMkjo+lR6j67OIvLOavgp4L7zA5LnDKi8WqdPhQ==",
       "dev": true,
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14",
-        "debug": "^4.3.1",
-        "eslint-compat-utils": "^0.1.2",
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@jridgewell/sourcemap-codec": "^1.4.15",
+        "debug": "^4.3.4",
+        "eslint-compat-utils": "^0.5.0",
         "esutils": "^2.0.3",
-        "known-css-properties": "^0.29.0",
-        "postcss": "^8.4.5",
+        "known-css-properties": "^0.30.0",
+        "postcss": "^8.4.38",
         "postcss-load-config": "^3.1.4",
         "postcss-safe-parser": "^6.0.0",
-        "postcss-selector-parser": "^6.0.11",
-        "semver": "^7.5.3",
-        "svelte-eslint-parser": ">=0.33.0 <1.0.0"
+        "postcss-selector-parser": "^6.0.16",
+        "semver": "^7.6.0",
+        "svelte-eslint-parser": ">=0.34.0 <1.0.0"
       },
       "engines": {
         "node": "^14.17.0 || >=16.0.0"
@@ -4622,8 +4363,8 @@
         "url": "https://github.com/sponsors/ota-meshi"
       },
       "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0-0",
-        "svelte": "^3.37.0 || ^4.0.0"
+        "eslint": "^7.0.0 || ^8.0.0-0 || ^9.0.0-0",
+        "svelte": "^3.37.0 || ^4.0.0 || ^5.0.0-next.95"
       },
       "peerDependenciesMeta": {
         "svelte": {
@@ -4645,12 +4386,15 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/eslint/node_modules/argparse": {
@@ -4711,15 +4455,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
     "node_modules/eslint/node_modules/estraverse": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
@@ -4965,14 +4700,14 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
-      "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
       "dependencies": {
-        "acorn": "^8.8.0",
+        "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
+        "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4982,9 +4717,9 @@
       }
     },
     "node_modules/espree/node_modules/acorn": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
+      "version": "8.11.3",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
+      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -5002,15 +4737,6 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
     "node_modules/esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
@@ -5262,6 +4988,15 @@
       "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
       "dev": true
     },
+    "node_modules/for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.3"
+      }
+    },
     "node_modules/form-data": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
@@ -5297,10 +5032,31 @@
       }
     },
     "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/function.prototype.name": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "functions-have-names": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/functions-have-names": {
       "version": "1.2.3",
@@ -5332,28 +5088,33 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
       "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3"
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+        "call-bind": "^1.0.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5414,6 +5175,21 @@
         "node": ">=4"
       }
     },
+    "node_modules/globalthis": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
+      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/globalyzer": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.0.tgz",
@@ -5448,16 +5224,13 @@
       "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
       "dev": true
     },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+    "node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
       "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/has-flag": {
@@ -5470,21 +5243,21 @@
       }
     },
     "node_modules/has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.1.1"
+        "es-define-property": "^1.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -5506,12 +5279,12 @@
       }
     },
     "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dev": true,
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "has-symbols": "^1.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5520,6 +5293,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/html-encoding-sniffer": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
@@ -5616,13 +5401,13 @@
       "dev": true
     },
     "node_modules/internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
+      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "hasown": "^2.0.0",
         "side-channel": "^1.0.4"
       },
       "engines": {
@@ -5640,11 +5425,30 @@
         "tslib": "^2.4.0"
       }
     },
+    "node_modules/is-array-buffer": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
+      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-bigint": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz",
-      "integrity": "sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
       "dev": true,
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -5662,12 +5466,13 @@
       }
     },
     "node_modules/is-boolean-object": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz",
-      "integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.0"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5677,9 +5482,9 @@
       }
     },
     "node_modules/is-callable": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -5689,12 +5494,27 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.3.0.tgz",
-      "integrity": "sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw==",
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+      "dev": true,
+      "dependencies": {
+        "hasown": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-data-view": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
+      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
       "dev": true,
       "dependencies": {
-        "has": "^1.0.3"
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -5749,9 +5569,9 @@
       }
     },
     "node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -5770,10 +5590,13 @@
       }
     },
     "node_modules/is-number-object": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz",
-      "integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
       "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -5809,22 +5632,28 @@
       }
     },
     "node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bind": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-string": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
-      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
       "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -5847,6 +5676,21 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-typed-array": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
+      "dev": true,
+      "dependencies": {
+        "which-typed-array": "^1.1.14"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-weakref": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
@@ -5871,6 +5715,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -6212,9 +6062,9 @@
       "dev": true
     },
     "node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
       "dev": true,
       "dependencies": {
         "minimist": "^1.2.0"
@@ -6224,9 +6074,9 @@
       }
     },
     "node_modules/known-css-properties": {
-      "version": "0.29.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.29.0.tgz",
-      "integrity": "sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==",
+      "version": "0.30.0",
+      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.30.0.tgz",
+      "integrity": "sha512-VSWXYUnsPu9+WYKkfmJyLKtIvaRJi1kXUqVmBACORXZQxT5oZDsoZ2vQP+bQFDnWtpI/4eq3MLoRMjI2fnLzTQ==",
       "dev": true
     },
     "node_modules/levn": {
@@ -6496,9 +6346,9 @@
       "dev": true
     },
     "node_modules/object-inspect": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
-      "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
       "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -6514,14 +6364,14 @@
       }
     },
     "node_modules/object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
+      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "has-symbols": "^1.0.3",
         "object-keys": "^1.1.1"
       },
       "engines": {
@@ -6531,6 +6381,55 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/object.fromentries": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
+      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.groupby": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
+      "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
+      "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -6634,10 +6533,19 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/possible-typed-array-names": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
+      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/postcss": {
-      "version": "8.4.32",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz",
-      "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==",
+      "version": "8.4.38",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
+      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
       "dev": true,
       "funding": [
         {
@@ -6656,7 +6564,7 @@
       "dependencies": {
         "nanoid": "^3.3.7",
         "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
+        "source-map-js": "^1.2.0"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -6734,9 +6642,9 @@
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.0.13",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
-      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
+      "version": "6.0.16",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz",
+      "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==",
       "dev": true,
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -6752,15 +6660,6 @@
       "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
       "dev": true
     },
-    "node_modules/postcss/node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -6920,14 +6819,15 @@
       "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
-      "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
+      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "set-function-name": "^2.0.0"
+        "call-bind": "^1.0.6",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "set-function-name": "^2.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6943,13 +6843,17 @@
       "dev": true
     },
     "node_modules/resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
       "dev": true,
       "dependencies": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -7038,6 +6942,24 @@
         "node": ">=6"
       }
     },
+    "node_modules/safe-array-concat": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
+      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "get-intrinsic": "^1.2.4",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -7046,6 +6968,23 @@
       "optional": true,
       "peer": true
     },
+    "node_modules/safe-regex-test": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
+      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-regex": "^1.1.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -7118,9 +7057,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -7132,15 +7071,33 @@
         "node": ">=10"
       }
     },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/set-function-name": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
-      "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
       "dev": true,
       "dependencies": {
-        "define-data-property": "^1.0.1",
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
         "functions-have-names": "^1.2.3",
-        "has-property-descriptors": "^1.0.0"
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7168,14 +7125,18 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -7206,9 +7167,9 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz",
-      "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -7242,10 +7203,59 @@
         "node": ">=8"
       }
     },
+    "node_modules/string.prototype.trim": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
+      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.0",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
+      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
       "dev": true,
       "engines": {
         "node": ">=4"
@@ -7388,16 +7398,16 @@
       "dev": true
     },
     "node_modules/svelte-eslint-parser": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/svelte-eslint-parser/-/svelte-eslint-parser-0.33.1.tgz",
-      "integrity": "sha512-vo7xPGTlKBGdLH8T5L64FipvTrqv3OQRx9d2z5X05KKZDlF4rQk8KViZO4flKERY+5BiVdOh7zZ7JGJWo5P0uA==",
+      "version": "0.34.1",
+      "resolved": "https://registry.npmjs.org/svelte-eslint-parser/-/svelte-eslint-parser-0.34.1.tgz",
+      "integrity": "sha512-9+uLA1pqI9AZioKVGJzYYmlOZWxfoCXSbAM9iaNm7H01XlYlzRTtJfZgl9o3StQGN41PfGJIbkKkfk3e/pHFfA==",
       "dev": true,
       "dependencies": {
-        "eslint-scope": "^7.0.0",
-        "eslint-visitor-keys": "^3.0.0",
-        "espree": "^9.0.0",
-        "postcss": "^8.4.29",
-        "postcss-scss": "^4.0.8"
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
+        "postcss": "^8.4.38",
+        "postcss-scss": "^4.0.9"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -7406,7 +7416,7 @@
         "url": "https://github.com/sponsors/ota-meshi"
       },
       "peerDependencies": {
-        "svelte": "^3.37.0 || ^4.0.0"
+        "svelte": "^3.37.0 || ^4.0.0 || ^5.0.0-next.94"
       },
       "peerDependenciesMeta": {
         "svelte": {
@@ -7776,6 +7786,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/tsconfig-paths": {
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
     "node_modules/tslib": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
@@ -7840,6 +7862,79 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/typed-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/typed-array-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
+      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-byte-offset": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
+      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-length": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
+      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13",
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/typescript": {
       "version": "4.8.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.3.tgz",
@@ -7853,6 +7948,21 @@
         "node": ">=4.2.0"
       }
     },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/universalify": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
@@ -7968,35 +8078,6 @@
         }
       }
     },
-    "node_modules/vite/node_modules/is-core-module": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
-      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/vite/node_modules/resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/vitest": {
       "version": "0.23.4",
       "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.23.4.tgz",
@@ -8049,23 +8130,6 @@
         }
       }
     },
-    "node_modules/vitest/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/w3c-hr-time": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
@@ -8152,6 +8216,25 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/which-typed-array": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
+      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
diff --git a/mathesar_ui/package.json b/mathesar_ui/package.json
index 67eff9d45c..2583006db6 100644
--- a/mathesar_ui/package.json
+++ b/mathesar_ui/package.json
@@ -5,7 +5,7 @@
     "dev": "vite",
     "format": "prettier --write .",
     "check-format": "prettier --check .",
-    "lint": "eslint .",
+    "lint": "eslint --fix ",
     "typecheck": "svelte-check --tsconfig tsconfig.json --threshold warning .",
     "build": "vite build",
     "test": "vitest",
@@ -29,9 +29,9 @@
     "eslint-config-prettier": "^8.5.0",
     "eslint-import-resolver-typescript": "^3.5.1",
     "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-promise": "^6.0.1",
-    "eslint-plugin-svelte": "^2.35.1",
+    "eslint-plugin-svelte": "^2.37.0",
     "jsdom": "^20.0.0",
     "postcss": "^8.4.16",
     "prettier": "^3.1.0",
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/TransformationsPane.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/TransformationsPane.svelte
index 748bd9db6e..96b61e9e76 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/TransformationsPane.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/TransformationsPane.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
+  import { iconAddNew, iconDeleteMajor } from '@mathesar/icons';
   import {
     Button,
     Icon,
@@ -8,18 +10,18 @@
     ImmutableMap,
     Collapsible,
   } from '@mathesar-component-library';
-  import { iconAddNew, iconDeleteMajor } from '@mathesar/icons';
-  import type QueryManager from '../../QueryManager';
+
   import FilterTransformation from './FilterTransformation.svelte';
-  import QueryFilterTransformationModel from '../../QueryFilterTransformationModel';
-  import { calcAllowedColumnsPerTransformation } from './transformationUtils';
-  import QuerySummarizationTransformationModel from '../../QuerySummarizationTransformationModel';
-  import SummarizationTransformation from './summarization/SummarizationTransformation.svelte';
   import HideTransformation from './HideTransformation.svelte';
-  import QueryHideTransformationModel from '../../QueryHideTransformationModel';
   import SortTransformation from './SortTransformation.svelte';
-  import QuerySortTransformationModel from '../../QuerySortTransformationModel';
+  import SummarizationTransformation from './summarization/SummarizationTransformation.svelte';
+  import { calcAllowedColumnsPerTransformation } from './transformationUtils';
+  import QueryFilterTransformationModel from '../../QueryFilterTransformationModel';
+  import QueryHideTransformationModel from '../../QueryHideTransformationModel';
+  import type QueryManager from '../../QueryManager';
   import type { QueryTransformationModel } from '../../QueryModel';
+  import QuerySortTransformationModel from '../../QuerySortTransformationModel';
+  import QuerySummarizationTransformationModel from '../../QuerySummarizationTransformationModel';
 
   export let queryManager: QueryManager;
 

From e802f22c5b713caae939c5893c7ee292432a9a06 Mon Sep 17 00:00:00 2001
From: hitenvidhani <vidhani.hiten2001@gmail.com>
Date: Sun, 21 Apr 2024 00:33:41 +0530
Subject: [PATCH 0110/1141] Sort named imports

---
 mathesar_ui/.eslintrc.cjs                                 | 8 +++++++-
 .../transformations-pane/TransformationsPane.svelte       | 6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/mathesar_ui/.eslintrc.cjs b/mathesar_ui/.eslintrc.cjs
index c7f97069fc..b926321ba9 100644
--- a/mathesar_ui/.eslintrc.cjs
+++ b/mathesar_ui/.eslintrc.cjs
@@ -60,7 +60,13 @@ module.exports = {
 				'newlines-between': 'always',
         'groups': ['builtin', 'external', 'internal', ['parent', 'sibling'], 'index'],
 			}
-		]
+		],
+    'sort-imports': [
+      'warn',
+      {
+        'ignoreDeclarationSort': true,
+      }
+    ],
   },
   overrides: [
     {
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/TransformationsPane.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/TransformationsPane.svelte
index 96b61e9e76..e5c61b70de 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/TransformationsPane.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/TransformationsPane.svelte
@@ -4,11 +4,11 @@
   import { iconAddNew, iconDeleteMajor } from '@mathesar/icons';
   import {
     Button,
-    Icon,
-    DropdownMenu,
     ButtonMenuItem,
-    ImmutableMap,
     Collapsible,
+    DropdownMenu,
+    Icon,
+    ImmutableMap,
   } from '@mathesar-component-library';
 
   import FilterTransformation from './FilterTransformation.svelte';

From 98a3315d42617da6f743f92f95450e68896671ab Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Mon, 22 Apr 2024 16:46:59 +0530
Subject: [PATCH 0111/1141] raise caught exception and remove typecast

---
 mathesar/api/ui/serializers/users.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mathesar/api/ui/serializers/users.py b/mathesar/api/ui/serializers/users.py
index 80501c9c51..250cfa9005 100644
--- a/mathesar/api/ui/serializers/users.py
+++ b/mathesar/api/ui/serializers/users.py
@@ -84,8 +84,8 @@ def validate_old_password(self, value):
     def validate_password(self, value):
         try:
             validate_password(value)
-        except DjangoValidationError as exc:
-            raise DjangoValidationError(str(exc))
+        except DjangoValidationError as e:
+            raise e
         return value
 
     def update(self, instance, validated_data):

From 518b7e15d09096a700d73be315f028d8acef0f96 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 25 Apr 2024 16:35:17 +0800
Subject: [PATCH 0112/1141] first pass at functions to build the type_options
 JSON

---
 db/sql/0_msar.sql | 77 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

diff --git a/db/sql/0_msar.sql b/db/sql/0_msar.sql
index e16bf53246..65a7db3f1b 100644
--- a/db/sql/0_msar.sql
+++ b/db/sql/0_msar.sql
@@ -468,6 +468,83 @@ AND attrelid = msar.get_relation_oid(sch_name, rel_name);
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION
+msar.get_interval_fields(typ_mod integer) RETURNS text AS $$/*
+Return the string giving the fields for an interval typmod integer.
+
+This logic is ported from the relevant PostgreSQL source code, reimplemented in SQL. See:
+https://doxygen.postgresql.org/backend_2utils_2adt_2timestamp_8c.html
+
+Args:
+  typ_mod: The atttypmod from the pg_attribute table. Should be valid for the interval type.
+*/
+SELECT CASE (typ_mod >> 16 & 32767)
+  WHEN 1 << 2 THEN 'year'
+  WHEN 1 << 1 THEN 'month'
+  WHEN 1 << 3 THEN 'day'
+  WHEN 1 << 10 THEN 'hour'
+  WHEN 1 << 11 THEN 'minute'
+  WHEN 1 << 12 THEN 'second'
+  WHEN (1 << 2) | (1 << 1) THEN 'year to month'
+  WHEN (1 << 3) | (1 << 10) THEN 'day to hour'
+  WHEN (1 << 3) | (1 << 10) | (1 << 11) THEN 'day to minute'
+  WHEN (1 << 3) | (1 << 10) | (1 << 11) | (1 << 12) THEN 'day to second'
+  WHEN (1 << 10) | (1 << 11) THEN 'hour to minute'
+  WHEN (1 << 10) | (1 << 11) | (1 << 12) THEN 'hour to second'
+  WHEN (1 << 11) | (1 << 12) THEN 'minute to second'
+END;
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.get_type_options(typ_id oid, typ_mod integer, typ_ndims integer) RETURNS jsonb AS $$/*
+Return the type options calculated from a type, typmod pair.
+
+This function uses a number of hard-coded constants.
+
+Args:
+  typ_id: The OID of the type.
+  typ_mod: The integer corresponding to the type options; see pg_attribute catalog table.
+*/
+SELECT CASE
+  -- Columns with no type options store -1 in the atttypmod column.
+  WHEN typ_id = 'numeric'::regtype::oid OR typ_id='numeric[]'::regtype::oid THEN
+    jsonb_build_object(
+      -- This calculation is modified from the relevant PostgreSQL source code. See
+      -- https://doxygen.postgresql.org/backend_2utils_2adt_2numeric_8c.html
+      'precision', ((nullif(typ_mod, -1) - 4) >> 16) & 65535,
+      -- This calculation is also from the source code.
+      'scale', (((nullif(typ_mod, -1) - 4) & 2047) # 1024) - 1024
+    )
+  WHEN typ_id = 'interval'::regtype::oid OR typ_id = '_interval'::regtype::oid THEN
+    jsonb_build_object(
+      'precision', NULLIF(typ_mod & 65535, 65535),
+      'fields', msar.get_interval_fields(typ_mod)
+    )
+  WHEN ARRAY[typ_id] <@ ARRAY[
+      'bpchar'::regtype::oid, 'varchar'::regtype::oid,
+      '_bpchar'::regtype::oid, '_varchar'::regtype::oid
+  ] THEN
+    jsonb_build_object(
+      'length', nullif(typ_mod, -1) - 4
+    )
+  WHEN ARRAY[typ_id] <@ ARRAY[
+      'bit'::regtype::oid, 'varbit'::regtype::oid,
+      '_bit'::regtype::oid, '_varbit'::regtype::oid,
+      'time'::regtype::oid, 'timetz'::regtype::oid,
+      '_time'::regtype::oid, '_timetz'::regtype::oid,
+      'timestamp'::regtype::oid, 'timestamptz'::regtype::oid,
+      '_timestamp'::regtype::oid, '_timestamptz'::regtype::oid
+  ] THEN
+    -- For all these types, the typmod is equal to the precision.
+    jsonb_build_object(
+      'precision', nullif(typ_mod, -1)
+    )
+  ELSE jsonb_build_object()
+END || jsonb_build_object('array', typ_ndims>0);
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
 CREATE OR REPLACE FUNCTION msar.column_exists(tab_id oid, col_name text) RETURNS boolean AS $$/*
 Return true if the given column exists in the table, false otherwise.
 */

From 95a170286957c9edd17d6bff227f392fd2c06bd3 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 25 Apr 2024 11:03:57 -0400
Subject: [PATCH 0113/1141] Fix reactivity regression with data explorer rows

---
 .../systems/data-explorer/result-pane/Results.svelte   | 10 ++--------
 mathesar_ui/src/utils/typeUtils.ts                     |  8 ++++++++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
index 05c08ec9fe..e78d0dea73 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
@@ -19,6 +19,7 @@
   import { rowHeaderWidthPx, rowHeightPx } from '@mathesar/geometry';
   import { toast } from '@mathesar/stores/toast';
   import type MessageBus from '@mathesar/utils/MessageBus';
+  import { arrayIndex } from '@mathesar/utils/typeUtils';
   import type QueryManager from '../QueryManager';
   import type QueryRunner from '../QueryRunner';
   import { getRowSelectionId } from '../QueryRunner';
@@ -71,13 +72,6 @@
     (recordRunState === 'success' || recordRunState === 'processing') &&
     !rows.length;
   $: sheetItemCount = showDummyGhostRow ? 1 : rows.length;
-
-  function getRow(index: number) {
-    // Type assertion is here to widen type because we don't have
-    // `noUncheckedIndexedAccess` enabled yet. See
-    // https://github.com/mathesar-foundation/mathesar/issues/1966
-    return rows[index] as (typeof rows)[0] | undefined;
-  }
 </script>
 
 <div data-identifier="query-run-result">
@@ -117,7 +111,7 @@
         let:items
       >
         {#each items as item (item.key)}
-          {@const row = getRow(item.index)}
+          {@const row = arrayIndex(rows, item.index)}
           {@const rowSelectionId = (row && getRowSelectionId(row)) ?? ''}
           {@const isSelected = $selection.rowIds.has(rowSelectionId)}
           {#if row || showDummyGhostRow}
diff --git a/mathesar_ui/src/utils/typeUtils.ts b/mathesar_ui/src/utils/typeUtils.ts
index ecfa1c7053..23fb9fbe92 100644
--- a/mathesar_ui/src/utils/typeUtils.ts
+++ b/mathesar_ui/src/utils/typeUtils.ts
@@ -22,3 +22,11 @@ type ChangeWritableToReadable<T> = T extends Writable<infer U>
 export type MakeWritablePropertiesReadable<T> = {
   [P in keyof T]: ChangeWritableToReadable<T[P]>;
 };
+
+/**
+ * This function exists because we don't have `noUncheckedIndexedAccess` enabled
+ * yet. See https://github.com/mathesar-foundation/mathesar/issues/1966
+ */
+export function arrayIndex<T>(a: T[], i: number): T | undefined {
+  return a[i];
+}

From 97c51bc660031b393a7b78c2d678b31cac66fbb1 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 25 Apr 2024 12:25:22 -0400
Subject: [PATCH 0114/1141] Don't set dummy rows in records store during fetch

---
 mathesar_ui/src/stores/table-data/records.ts | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/mathesar_ui/src/stores/table-data/records.ts b/mathesar_ui/src/stores/table-data/records.ts
index 25dd965a4d..d842dc7811 100644
--- a/mathesar_ui/src/stores/table-data/records.ts
+++ b/mathesar_ui/src/stores/table-data/records.ts
@@ -381,26 +381,6 @@ export class RecordsData {
     this.promise?.cancel();
     const { offset } = get(this.meta.pagination);
 
-    this.savedRecordRowsWithGroupHeaders.update((existingData) => {
-      let data = [...existingData];
-      data.length = Math.min(data.length, get(this.meta.pagination).size);
-
-      let index = -1;
-      data = data.map((entry) => {
-        index += 1;
-        if (!retainExistingRows || !entry) {
-          return {
-            state: 'loading',
-            identifier: generateRowIdentifier('dummy', offset, index),
-            rowIndex: index,
-            record: {},
-          };
-        }
-        return entry;
-      });
-
-      return data;
-    });
     this.error.set(undefined);
     if (!retainExistingRows) {
       this.state.set(States.Loading);

From e0b543909260f09f839963b425df5760ac036695 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 25 Apr 2024 12:40:32 -0400
Subject: [PATCH 0115/1141] Improve code readability of fetch options

---
 mathesar_ui/src/stores/table-data/records.ts | 28 +++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/mathesar_ui/src/stores/table-data/records.ts b/mathesar_ui/src/stores/table-data/records.ts
index d842dc7811..e0a37291dc 100644
--- a/mathesar_ui/src/stores/table-data/records.ts
+++ b/mathesar_ui/src/stores/table-data/records.ts
@@ -376,15 +376,31 @@ export class RecordsData {
   }
 
   async fetch(
-    retainExistingRows = false,
+    opts: {
+      clearNewRecords?: boolean;
+      setLoadingState?: boolean;
+      clearMetaStatuses?: boolean;
+    } = {},
   ): Promise<TableRecordsData | undefined> {
+    const options = {
+      clearNewRecords: true,
+      setLoadingState: true,
+      clearMetaStatuses: true,
+      ...opts,
+    };
+
     this.promise?.cancel();
     const { offset } = get(this.meta.pagination);
 
     this.error.set(undefined);
-    if (!retainExistingRows) {
-      this.state.set(States.Loading);
+
+    if (options.clearNewRecords) {
       this.newRecords.set([]);
+    }
+    if (options.setLoadingState) {
+      this.state.set(States.Loading);
+    }
+    if (options.clearMetaStatuses) {
       this.meta.clearAllStatusesAndErrors();
     }
 
@@ -513,7 +529,11 @@ export class RecordsData {
     // flag instead of just re-fetching the records immediately after deleting
     // the saved records.
     if (shouldReFetchRecords) {
-      await this.fetch(true);
+      await this.fetch({
+        clearMetaStatuses: false,
+        clearNewRecords: false,
+        setLoadingState: false,
+      });
     }
 
     this.meta.rowCreationStatus.delete(Array.from(savedRecordKeys, String));

From 6cb7ba089879c5f03a8dcc16772ba8e64c049074 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 26 Apr 2024 13:00:12 +0800
Subject: [PATCH 0116/1141] add column info getting function and utils

---
 db/sql/0_msar.sql | 65 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/db/sql/0_msar.sql b/db/sql/0_msar.sql
index 65a7db3f1b..5c7b4249a4 100644
--- a/db/sql/0_msar.sql
+++ b/db/sql/0_msar.sql
@@ -545,6 +545,71 @@ END || jsonb_build_object('array', typ_ndims>0);
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION msar.get_valid_target_type_strings(typ_id oid) RETURNS jsonb AS $$/*
+TODO
+*/
+SELECT jsonb_agg(prorettype::regtype::text)
+FROM pg_proc
+WHERE
+  pronamespace='mathesar_types'::regnamespace::oid
+  AND proargtypes[0]=typ_id
+  AND left(proname, 5) = 'cast_';
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION msar.has_dependents(rel_id oid, att_id smallint) RETURNS boolean AS $$/*
+Return a boolean according to whether the column identified by the given oid, attnum pair is
+referenced (i.e., would dropping that column require CASCADE?).
+
+Args:
+  rel_id: The relation of the attribute.
+  att_id: The attnum of the attribute in the relation.
+*/
+SELECT EXISTS (
+  SELECT 1 FROM pg_depend WHERE refobjid=rel_id AND refobjsubid=att_id AND deptype='n'
+);
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION msar.get_column_info(tab_id regclass) RETURNS jsonb AS $$/*
+TODO
+*/
+SELECT jsonb_agg(
+  jsonb_build_object(
+    'id', attnum,
+    'name', attname,
+    'type', rtrim(atttypid::regtype::text, '[]'),
+    'type_options', msar.get_type_options(atttypid, atttypmod, attndims),
+    'nullable', NOT attnotnull,
+    'primary_key', COALESCE(pgi.indisprimary, false),
+    'valid_target_types', msar.get_valid_target_type_strings(atttypid),
+    'default',
+    nullif(
+      jsonb_strip_nulls(
+        jsonb_build_object(
+          'value',
+          CASE
+            WHEN attidentity='' THEN pg_get_expr(adbin, tab_id)
+            ELSE 'identity'
+          END,
+          'is_dynamic', msar.is_default_possibly_dynamic(tab_id, attnum)
+        )
+      ),
+      jsonb_build_object()
+    ),
+    'has_dependents', msar.has_dependents(tab_id, attnum),
+    'description', msar.col_description(tab_id, attnum)
+  )
+)
+FROM pg_attribute pga
+  LEFT JOIN pg_index pgi ON pga.attrelid=pgi.indrelid AND pga.attnum=ANY(pgi.indkey)
+  LEFT JOIN pg_attrdef pgd ON pga.attrelid=pgd.adrelid AND pga.attnum=pgd.adnum
+WHERE pga.attrelid=tab_id AND pga.attnum > 0 and NOT attisdropped;
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
+
+
 CREATE OR REPLACE FUNCTION msar.column_exists(tab_id oid, col_name text) RETURNS boolean AS $$/*
 Return true if the given column exists in the table, false otherwise.
 */

From 96338c7b21a2691567416667368e6e9dd28668f3 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 26 Apr 2024 14:17:57 +0800
Subject: [PATCH 0117/1141] use different style to denote arrays, clean up code

---
 db/sql/0_msar.sql | 72 +++++++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 37 deletions(-)

diff --git a/db/sql/0_msar.sql b/db/sql/0_msar.sql
index 5c7b4249a4..1ac1f87986 100644
--- a/db/sql/0_msar.sql
+++ b/db/sql/0_msar.sql
@@ -506,42 +506,40 @@ Args:
   typ_id: The OID of the type.
   typ_mod: The integer corresponding to the type options; see pg_attribute catalog table.
 */
-SELECT CASE
-  -- Columns with no type options store -1 in the atttypmod column.
-  WHEN typ_id = 'numeric'::regtype::oid OR typ_id='numeric[]'::regtype::oid THEN
-    jsonb_build_object(
-      -- This calculation is modified from the relevant PostgreSQL source code. See
-      -- https://doxygen.postgresql.org/backend_2utils_2adt_2numeric_8c.html
-      'precision', ((nullif(typ_mod, -1) - 4) >> 16) & 65535,
-      -- This calculation is also from the source code.
-      'scale', (((nullif(typ_mod, -1) - 4) & 2047) # 1024) - 1024
-    )
-  WHEN typ_id = 'interval'::regtype::oid OR typ_id = '_interval'::regtype::oid THEN
-    jsonb_build_object(
-      'precision', NULLIF(typ_mod & 65535, 65535),
-      'fields', msar.get_interval_fields(typ_mod)
-    )
-  WHEN ARRAY[typ_id] <@ ARRAY[
-      'bpchar'::regtype::oid, 'varchar'::regtype::oid,
-      '_bpchar'::regtype::oid, '_varchar'::regtype::oid
-  ] THEN
-    jsonb_build_object(
-      'length', nullif(typ_mod, -1) - 4
-    )
-  WHEN ARRAY[typ_id] <@ ARRAY[
-      'bit'::regtype::oid, 'varbit'::regtype::oid,
-      '_bit'::regtype::oid, '_varbit'::regtype::oid,
-      'time'::regtype::oid, 'timetz'::regtype::oid,
-      '_time'::regtype::oid, '_timetz'::regtype::oid,
-      'timestamp'::regtype::oid, 'timestamptz'::regtype::oid,
-      '_timestamp'::regtype::oid, '_timestamptz'::regtype::oid
-  ] THEN
-    -- For all these types, the typmod is equal to the precision.
-    jsonb_build_object(
-      'precision', nullif(typ_mod, -1)
-    )
-  ELSE jsonb_build_object()
-END || jsonb_build_object('array', typ_ndims>0);
+SELECT nullif(
+  CASE
+    WHEN typ_id = ANY('{numeric, _numeric}'::regtype[]) THEN
+      jsonb_build_object(
+        -- This calculation is modified from the relevant PostgreSQL source code. See
+        -- https://doxygen.postgresql.org/backend_2utils_2adt_2numeric_8c.html
+        'precision', ((nullif(typ_mod, -1) - 4) >> 16) & 65535,
+        -- This calculation is also from the source code.
+        'scale', (((nullif(typ_mod, -1) - 4) & 2047) # 1024) - 1024
+      )
+    WHEN typ_id = ANY('{interval, _interval}'::regtype[]) THEN
+      jsonb_build_object(
+        'precision', nullif(typ_mod & 65535, 65535),
+        'fields', msar.get_interval_fields(typ_mod)
+      )
+    WHEN typ_id = ANY('{bpchar, _bpchar, varchar, _varchar}'::regtype[]) THEN
+      jsonb_build_object('length', nullif(typ_mod, -1) - 4)
+    WHEN typ_id = ANY(
+      '{bit, varbit, time, timetz, timestamp, timestamptz}'::regtype[]
+      || '{_bit, _varbit, _time, _timetz, _timestamp, _timestamptz}'::regtype[]
+    ) THEN
+      -- For all these types, the typmod is equal to the precision.
+      jsonb_build_object(
+        'precision', nullif(typ_mod, -1)
+      )
+    ELSE jsonb_build_object()
+  END
+  || CASE
+    WHEN typ_ndims>0 THEN
+      jsonb_build_object('item_type', typ_id::regtype)
+    ELSE '{}'
+  END,
+  '{}'
+)
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
@@ -578,7 +576,7 @@ SELECT jsonb_agg(
   jsonb_build_object(
     'id', attnum,
     'name', attname,
-    'type', rtrim(atttypid::regtype::text, '[]'),
+    'type', CASE WHEN attndims>0 THEN '_array' ELSE atttypid::regtype::text END,
     'type_options', msar.get_type_options(atttypid, atttypmod, attndims),
     'nullable', NOT attnotnull,
     'primary_key', COALESCE(pgi.indisprimary, false),

From 0fe1df98307f7659766ad1364ba38d68cee0075f Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 26 Apr 2024 12:46:55 -0400
Subject: [PATCH 0118/1141] Loosen coupling between cause/effect of selection
 and inspector-tab-switch

---
 mathesar_ui/src/components/sheet/Sheet.svelte |  6 +-
 .../pages/exploration/ExplorationPage.svelte  | 10 +--
 .../systems/data-explorer/DataExplorer.svelte |  7 +--
 .../systems/data-explorer/QueryInspector.ts   | 61 ++++++++++++++-----
 .../ExplorationInspector.svelte               | 25 ++++----
 .../WithExplorationInspector.svelte           |  5 --
 .../input-sidebar/InputSidebar.svelte         |  8 ++-
 .../result-pane/ResultPane.svelte             |  6 +-
 .../data-explorer/result-pane/Results.svelte  | 11 ++--
 .../src/systems/table-view/TableView.svelte   | 27 +++++---
 .../table-inspector/TableInspector.svelte     | 50 +++++++--------
 .../table-inspector/WithTableInspector.svelte | 10 +--
 mathesar_ui/src/utils/MessageBus.ts           | 39 ------------
 13 files changed, 120 insertions(+), 145 deletions(-)
 delete mode 100644 mathesar_ui/src/utils/MessageBus.ts

diff --git a/mathesar_ui/src/components/sheet/Sheet.svelte b/mathesar_ui/src/components/sheet/Sheet.svelte
index 4a221044d1..3248dbbb4a 100644
--- a/mathesar_ui/src/components/sheet/Sheet.svelte
+++ b/mathesar_ui/src/components/sheet/Sheet.svelte
@@ -5,7 +5,6 @@
   import { ImmutableMap } from '@mathesar-component-library/types';
   import type { ClipboardHandler } from '@mathesar/stores/clipboard';
   import { getClipboardHandlerStoreFromContext } from '@mathesar/stores/clipboard';
-  import type MessageBus from '@mathesar/utils/MessageBus';
   import { getModifierKeyCombo } from '@mathesar/utils/pointerUtils';
   import {
     beginSelection,
@@ -31,8 +30,7 @@
   export let hasPaddingRight = false;
   export let clipboardHandler: ClipboardHandler | undefined = undefined;
   export let selection: SheetSelectionStore | undefined = undefined;
-  export let cellSelectionStarted: MessageBus<SheetCellDetails> | undefined =
-    undefined;
+  export let onCellSelectionStart: (c: SheetCellDetails) => void = () => {};
 
   export let getColumnIdentifier: (
     c: SheetColumnType,
@@ -168,7 +166,7 @@
     });
 
     if (startingCell === targetCell) {
-      cellSelectionStarted?.send(targetCell);
+      onCellSelectionStart(targetCell);
     }
   }
 
diff --git a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
index 17c6a4ac3e..fd9e32a930 100644
--- a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
+++ b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
@@ -4,7 +4,6 @@
 
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import type { QueryInstance } from '@mathesar/api/types/queries';
-  import type { SheetCellDetails } from '@mathesar/components/sheet/selection';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
@@ -16,12 +15,10 @@
     QueryRunner,
     WithExplorationInspector,
   } from '@mathesar/systems/data-explorer';
-  import MessageBus from '@mathesar/utils/MessageBus';
   import type { ShareConsumer } from '@mathesar/utils/shares';
   import Header from './Header.svelte';
 
   const userProfile = getUserProfileStoreFromContext();
-  const cellSelectionStarted = new MessageBus<SheetCellDetails>();
 
   export let database: Database;
   export let schema: SchemaEntry;
@@ -77,13 +74,8 @@
         queryHandler={queryRunner}
         {canEditMetadata}
         on:delete={gotoSchemaPage}
-        {cellSelectionStarted}
       >
-        <ExplorationResult
-          queryHandler={queryRunner}
-          isExplorationPage
-          {cellSelectionStarted}
-        />
+        <ExplorationResult queryHandler={queryRunner} isExplorationPage />
       </WithExplorationInspector>
     </div>
   {/if}
diff --git a/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte b/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte
index 68ff18ac41..96710d4d00 100644
--- a/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte
+++ b/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte
@@ -2,9 +2,7 @@
   import { _ } from 'svelte-i18n';
 
   import { Tutorial } from '@mathesar-component-library';
-  import type { SheetCellDetails } from '@mathesar/components/sheet/selection';
   import { queries } from '@mathesar/stores/queries';
-  import MessageBus from '@mathesar/utils/MessageBus';
   import ActionsPane from './ActionsPane.svelte';
   import type QueryManager from './QueryManager';
   import { WithExplorationInspector } from './exploration-inspector';
@@ -12,8 +10,6 @@
   import ResultPane from './result-pane/ResultPane.svelte';
   import type { ColumnWithLink } from './utils';
 
-  const cellSelectionStarted = new MessageBus<SheetCellDetails>();
-
   export let queryManager: QueryManager;
   export let linkCollapsibleOpenState: Record<ColumnWithLink['id'], boolean> =
     {};
@@ -63,10 +59,9 @@
             {isInspectorOpen}
             queryHandler={queryManager}
             {canEditMetadata}
-            {cellSelectionStarted}
             on:delete
           >
-            <ResultPane queryHandler={queryManager} {cellSelectionStarted} />
+            <ResultPane queryHandler={queryManager} />
           </WithExplorationInspector>
         {/if}
       </WithInputSidebar>
diff --git a/mathesar_ui/src/systems/data-explorer/QueryInspector.ts b/mathesar_ui/src/systems/data-explorer/QueryInspector.ts
index 58117bc947..ad2ad00372 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryInspector.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryInspector.ts
@@ -6,30 +6,59 @@ import {
   type Writable,
 } from 'svelte/store';
 import { _ } from 'svelte-i18n';
+
 import type { Tab } from '@mathesar-component-library/types';
 import type QueryModel from './QueryModel';
 
+/**
+ * This is a function instead of a const because we can't run `get(_)` at the
+ * top level since i18n isn't initialized at build time.
+ */
+function makeTabMap() {
+  return {
+    exploration: { label: get(_)('exploration') },
+    column: { label: get(_)('column') },
+    cell: { label: get(_)('cell') },
+  };
+}
+
+export interface ExplorationInspectorTab extends Tab {
+  id: keyof ReturnType<typeof makeTabMap>;
+  label: string;
+}
+
+function makeTab([id, { label }]: [string, { label: string }]) {
+  return { id, label } as ExplorationInspectorTab;
+}
+
+function makeTabList(tabMap: Record<string, { label: string }>) {
+  return Object.entries(tabMap).map(makeTab);
+}
+
 export default class QueryInspector {
-  tabs: Readable<Tab[]>;
+  tabs: Readable<ExplorationInspectorTab[]>;
 
-  activeTab: Writable<Tab | undefined>;
+  activeTabId: Writable<ExplorationInspectorTab['id']>;
+
+  activeTab: Readable<ExplorationInspectorTab>;
 
   constructor(query: Writable<QueryModel>) {
-    const generalTabs: Tab[] = [
-      { id: 'inspect-column', label: get(_)('column') },
-      { id: 'inspect-cell', label: get(_)('cell') },
-    ];
-    const tabsWhenQueryIsSaved: Tab[] = [
-      { id: 'inspect-exploration', label: get(_)('exploration') },
-      ...generalTabs,
-    ];
-
-    this.tabs = derived(query, ($query) => {
-      if ($query.isSaved()) {
-        return tabsWhenQueryIsSaved;
+    const tabMap = makeTabMap();
+    this.tabs = derived(query, (q) => {
+      if (q.isSaved()) {
+        return makeTabList(tabMap);
       }
-      return generalTabs;
+      const { exploration, ...unsavedExplorationTabMap } = tabMap;
+      return makeTabList(unsavedExplorationTabMap);
     });
-    this.activeTab = writable(get(this.tabs)[0]);
+    const firstTabId = get(this.tabs)[0].id;
+    this.activeTabId = writable(firstTabId);
+    this.activeTab = derived(this.activeTabId, (id) =>
+      makeTab([id, tabMap[id]]),
+    );
+  }
+
+  activate(tabId: ExplorationInspectorTab['id']) {
+    this.activeTabId.set(tabId);
   }
 }
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte
index fab09cb79e..c60ec2fef6 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { TabContainer } from '@mathesar-component-library';
-  import type { SheetCellDetails } from '@mathesar/components/sheet/selection';
-  import type MessageBus from '@mathesar/utils/MessageBus';
+  import type { Tab } from '@mathesar/component-library/types';
+  import type { ExplorationInspectorTab } from '../QueryInspector';
   import type QueryManager from '../QueryManager';
   import type QueryRunner from '../QueryRunner';
   import ExplorationTab from './ExplorationTab.svelte';
@@ -10,27 +10,26 @@
 
   export let queryHandler: QueryRunner | QueryManager;
   export let canEditMetadata: boolean;
-  export let cellSelectionStarted: MessageBus<SheetCellDetails> | undefined =
-    undefined;
 
   $: ({ inspector, query } = queryHandler);
   $: ({ tabs, activeTab } = inspector);
-  $: cellSelectionStarted?.listen((targetCell) => {
-    if (targetCell.type === 'column-header-cell') {
-      $activeTab = $tabs.find((tab) => tab.id === 'inspect-column');
-    }
-  });
+
+  function handleTabSelected(e: CustomEvent<{ tab: Tab }>) {
+    const tab = e.detail.tab as ExplorationInspectorTab;
+    inspector.activate(tab.id);
+  }
 </script>
 
 <aside class="exploration-inspector">
   <TabContainer
     tabStyle="compact"
     tabs={$tabs}
-    bind:activeTab={$activeTab}
+    activeTab={$activeTab}
     fillTabWidth
     fillContainerHeight
+    on:tabSelected={handleTabSelected}
   >
-    {#if $activeTab?.id === 'inspect-exploration'}
+    {#if $activeTab.id === 'exploration'}
       <ExplorationTab
         {queryHandler}
         name={$query.name}
@@ -38,9 +37,9 @@
         {canEditMetadata}
         on:delete
       />
-    {:else if $activeTab?.id === 'inspect-column'}
+    {:else if $activeTab.id === 'column'}
       <ColumnTab {queryHandler} />
-    {:else if $activeTab?.id === 'inspect-cell'}
+    {:else if $activeTab.id === 'cell'}
       <CellTab {queryHandler} />
     {/if}
   </TabContainer>
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/WithExplorationInspector.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/WithExplorationInspector.svelte
index 09ea1c1513..3b8bbff579 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/WithExplorationInspector.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/WithExplorationInspector.svelte
@@ -1,17 +1,13 @@
 <script lang="ts">
   import { WithPanel } from '@mathesar-component-library';
-  import type { SheetCellDetails } from '@mathesar/components/sheet/selection';
   import { dataExplorerRightSidebarWidth } from '@mathesar/stores/localStorage';
   import type QueryManager from '@mathesar/systems/data-explorer/QueryManager';
   import type QueryRunner from '@mathesar/systems/data-explorer/QueryRunner';
-  import type MessageBus from '@mathesar/utils/MessageBus';
   import ExplorationInspector from './ExplorationInspector.svelte';
 
   export let isInspectorOpen: boolean;
   export let queryHandler: QueryRunner | QueryManager;
   export let canEditMetadata: boolean;
-  export let cellSelectionStarted: MessageBus<SheetCellDetails> | undefined =
-    undefined;
 </script>
 
 <WithPanel
@@ -25,7 +21,6 @@
     slot="panel"
     {queryHandler}
     {canEditMetadata}
-    {cellSelectionStarted}
     on:delete
   />
 </WithPanel>
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/InputSidebar.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/InputSidebar.svelte
index 87ba93f72a..6108d472ea 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/InputSidebar.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/InputSidebar.svelte
@@ -14,7 +14,13 @@
   export let linkCollapsibleOpenState: Record<ColumnWithLink['id'], boolean> =
     {};
 
-  $: ({ query, state, confirmationNeededForMultipleResults } = queryManager);
+  $: ({
+    query,
+    state,
+    confirmationNeededForMultipleResults,
+    inspector,
+    selection,
+  } = queryManager);
   $: ({ inputColumnsFetchState } = $state);
 
   const tabs = [
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/ResultPane.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/ResultPane.svelte
index 8d5731b0c9..938d209eb6 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/ResultPane.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/ResultPane.svelte
@@ -1,16 +1,12 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { SheetCellDetails } from '@mathesar/components/sheet/selection';
-  import type MessageBus from '@mathesar/utils/MessageBus';
   import type QueryManager from '../QueryManager';
   import type QueryRunner from '../QueryRunner';
   import QueryRefreshButton from './QueryRefreshButton.svelte';
   import Results from './Results.svelte';
 
   export let queryHandler: QueryRunner | QueryManager;
-  export let cellSelectionStarted: MessageBus<SheetCellDetails> | undefined =
-    undefined;
 </script>
 
 <section data-identifier="result">
@@ -20,7 +16,7 @@
       <QueryRefreshButton queryRunner={queryHandler} />
     </div>
   </header>
-  <Results {queryHandler} {cellSelectionStarted} />
+  <Results {queryHandler} />
 </section>
 
 <style lang="scss">
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
index e78d0dea73..a026092b3b 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
@@ -15,10 +15,8 @@
     SheetVirtualRows,
   } from '@mathesar/components/sheet';
   import { SheetClipboardHandler } from '@mathesar/components/sheet/SheetClipboardHandler';
-  import type { SheetCellDetails } from '@mathesar/components/sheet/selection';
   import { rowHeaderWidthPx, rowHeightPx } from '@mathesar/geometry';
   import { toast } from '@mathesar/stores/toast';
-  import type MessageBus from '@mathesar/utils/MessageBus';
   import { arrayIndex } from '@mathesar/utils/typeUtils';
   import type QueryManager from '../QueryManager';
   import type QueryRunner from '../QueryRunner';
@@ -30,8 +28,6 @@
 
   export let queryHandler: QueryRunner | QueryManager;
   export let isExplorationPage = false;
-  export let cellSelectionStarted: MessageBus<SheetCellDetails> | undefined =
-    undefined;
 
   const ID_ROW_CONTROL_COLUMN = 'row-control';
   const columnWidths = new ImmutableMap([
@@ -46,6 +42,7 @@
     pagination,
     runState,
     selection,
+    inspector,
   } = queryHandler);
   $: ({ initial_columns } = $query);
   $: clipboardHandler = new SheetClipboardHandler({
@@ -91,7 +88,11 @@
       {clipboardHandler}
       usesVirtualList
       {selection}
-      {cellSelectionStarted}
+      onCellSelectionStart={(cell) => {
+        if (cell.type === 'column-header-cell') {
+          inspector.activate('column');
+        }
+      }}
     >
       <SheetHeader>
         <SheetOriginCell columnIdentifierKey={ID_ROW_CONTROL_COLUMN} />
diff --git a/mathesar_ui/src/systems/table-view/TableView.svelte b/mathesar_ui/src/systems/table-view/TableView.svelte
index 2fcd2f8386..827ab5b52c 100644
--- a/mathesar_ui/src/systems/table-view/TableView.svelte
+++ b/mathesar_ui/src/systems/table-view/TableView.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
   import { map } from 'iter-tools';
+  import type { ComponentProps } from 'svelte';
   import { get } from 'svelte/store';
 
   import { ImmutableMap } from '@mathesar-component-library';
   import type { TableEntry } from '@mathesar/api/types/tables';
   import { Sheet } from '@mathesar/components/sheet';
   import { SheetClipboardHandler } from '@mathesar/components/sheet/SheetClipboardHandler';
-  import type { SheetCellDetails } from '@mathesar/components/sheet/selection';
   import { rowHeaderWidthPx } from '@mathesar/geometry';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
@@ -14,16 +14,10 @@
     getTabularDataStoreFromContext,
     ID_ADD_NEW_COLUMN,
     ID_ROW_CONTROL_COLUMN,
-    type ProcessedColumn,
   } from '@mathesar/stores/table-data';
-  import {
-    getRowSelectionId,
-    type RecordRow,
-  } from '@mathesar/stores/table-data/records';
   import { toast } from '@mathesar/stores/toast';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { stringifyMapKeys } from '@mathesar/utils/collectionUtils';
-  import MessageBus from '@mathesar/utils/MessageBus';
   import Body from './Body.svelte';
   import Header from './header/Header.svelte';
   import StatusPane from './StatusPane.svelte';
@@ -33,7 +27,6 @@
 
   const tabularData = getTabularDataStoreFromContext();
   const userProfile = getUserProfileStoreFromContext();
-  const cellSelectionStarted = new MessageBus<SheetCellDetails>();
 
   $: database = $currentDatabase;
   $: schema = $currentSchema;
@@ -45,6 +38,9 @@
   export let context: Context = 'page';
   export let table: Pick<TableEntry, 'id' | 'settings' | 'schema'>;
 
+  let tableInspectorTab: ComponentProps<WithTableInspector>['activeTabId'] =
+    'table';
+
   $: usesVirtualList = context !== 'widget';
   $: allowsDdlOperations = context !== 'widget' && canExecuteDDL;
   $: sheetHasBorder = context === 'widget';
@@ -104,7 +100,11 @@
 </script>
 
 <div class="table-view">
-  <WithTableInspector {context} {showTableInspector} {cellSelectionStarted}>
+  <WithTableInspector
+    {context}
+    {showTableInspector}
+    bind:activeTabId={tableInspectorTab}
+  >
     <div class="sheet-area">
       {#if $processedColumns.size}
         <Sheet
@@ -112,7 +112,14 @@
           {columnWidths}
           {selection}
           {usesVirtualList}
-          {cellSelectionStarted}
+          onCellSelectionStart={(cell) => {
+            if (cell.type === 'column-header-cell') {
+              tableInspectorTab = 'column';
+            }
+            if (cell.type === 'row-header-cell') {
+              tableInspectorTab = 'record';
+            }
+          }}
           bind:horizontalScrollOffset={$horizontalScrollOffset}
           bind:scrollOffset={$scrollOffset}
           columns={sheetColumns}
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte b/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
index 6e1c9291bd..c883f59ff7 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
@@ -1,50 +1,46 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import { TabContainer } from '@mathesar-component-library';
-  import type { SheetCellDetails } from '@mathesar/components/sheet/selection';
-  import type MessageBus from '@mathesar/utils/MessageBus';
+  import { TabContainer, defined } from '@mathesar-component-library';
+  import type { Tab } from '@mathesar/component-library/types';
   import CellMode from './cell/CellMode.svelte';
   import ColumnMode from './column/ColumnMode.svelte';
   import RecordMode from './record/RecordMode.svelte';
   import TableMode from './table/TableMode.svelte';
 
-  const tableTab = { label: $_('table'), component: TableMode, id: 1 };
-  const columnTab = { label: $_('column'), component: ColumnMode, id: 2 };
-  const recordTab = { label: $_('record'), component: RecordMode, id: 3 };
-  const cellTab = { label: $_('cell'), component: CellMode, id: 4 };
-  const tabs = [tableTab, columnTab, recordTab, cellTab];
+  const tabMap = {
+    table: { label: $_('table'), component: TableMode },
+    column: { label: $_('column'), component: ColumnMode },
+    record: { label: $_('record'), component: RecordMode },
+    cell: { label: $_('cell'), component: CellMode },
+  };
 
-  export let cellSelectionStarted: MessageBus<SheetCellDetails> | undefined =
-    undefined;
+  type TableInspectorTabId = keyof typeof tabMap;
 
-  let activeTab: (typeof tabs)[number];
+  export let activeTabId: TableInspectorTabId | undefined;
 
-  $: cellSelectionStarted?.listen((targetCell) => {
-    if (targetCell.type === 'column-header-cell') {
-      activeTab = columnTab;
-    }
-    if (targetCell.type === 'row-header-cell') {
-      activeTab = recordTab;
-    }
-  });
+  $: tabs = Object.entries(tabMap).map(([id, tab]) => ({ id, ...tab }));
+  $: activeTab = defined(activeTabId, (id) => tabMap[id]);
+
+  function handleTabSelected(e: CustomEvent<{ tab: Tab }>) {
+    activeTabId = e.detail.tab.id as TableInspectorTabId;
+  }
 </script>
 
 <div class="table-inspector">
   <TabContainer
-    bind:activeTab
+    {activeTab}
     {tabs}
     tabStyle="compact"
     fillContainerHeight
     fillTabWidth
+    on:tabSelected={handleTabSelected}
   >
-    <slot>
-      {#if activeTab}
-        <div class="tabs-container">
-          <svelte:component this={activeTab.component} />
-        </div>
-      {/if}
-    </slot>
+    {#if activeTab}
+      <div class="tabs-container">
+        <svelte:component this={activeTab.component} />
+      </div>
+    {/if}
   </TabContainer>
 </div>
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/WithTableInspector.svelte b/mathesar_ui/src/systems/table-view/table-inspector/WithTableInspector.svelte
index b3b3929236..80bf96f635 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/WithTableInspector.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/WithTableInspector.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
   import { WithPanel } from '@mathesar-component-library';
-  import type { SheetCellDetails } from '@mathesar/components/sheet/selection';
   import { tableInspectorWidth } from '@mathesar/stores/localStorage';
-  import type MessageBus from '@mathesar/utils/MessageBus';
   import TableInspector from './TableInspector.svelte';
+  import type { ComponentProps } from 'svelte';
 
   export let context: 'page' | 'widget' | 'shared-consumer-page';
   export let showTableInspector: boolean;
-  export let cellSelectionStarted: MessageBus<SheetCellDetails> | undefined =
-    undefined;
+  export let activeTabId:
+    | ComponentProps<TableInspector>['activeTabId']
+    | undefined = undefined;
 </script>
 
 {#if context === 'widget'}
@@ -25,6 +25,6 @@
     maxSizePx={600}
   >
     <slot />
-    <TableInspector slot="panel" {cellSelectionStarted} />
+    <TableInspector slot="panel" bind:activeTabId />
   </WithPanel>
 {/if}
diff --git a/mathesar_ui/src/utils/MessageBus.ts b/mathesar_ui/src/utils/MessageBus.ts
deleted file mode 100644
index af18bc9547..0000000000
--- a/mathesar_ui/src/utils/MessageBus.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-type Ignore = () => void;
-type Listen<Message> = (message: Message) => void;
-
-/**
- * This is a simple message bus that allows sending messages with arbitrary
- * payloads to listeners in a pub/sub fashion. It is useful for components that
- * need to communicate with each other to perform actions imperatively.
- *
- * The `listen` method is similar to a Svelte store's `subscribe` method, and
- * the `send` method is similar to a Svelte store's `set` method. We don't use
- * Svelte stores for this implementation though because we want messages to be
- * ephemeral. When a new listener is added, it should not receive messages that
- * were sent before it was added. This is not possible with Svelte stores
- * because the [store contract][1] stipulates:
- *
- * > This subscription function must be immediately and synchronously called
- * > with the store's current value upon calling `.subscribe`.
- *
- * [1]:
- * https://svelte.dev/docs#component-format-script-4-prefix-stores-with-$-to-access-their-values-store-contract
- */
-export default class MessageBus<Message = void> {
-  private listeners: Set<Listen<Message>>;
-
-  constructor() {
-    this.listeners = new Set();
-  }
-
-  listen(listener: Listen<Message>): Ignore {
-    this.listeners.add(listener);
-    return () => {
-      this.listeners.delete(listener);
-    };
-  }
-
-  send(message: Message) {
-    this.listeners.forEach((l) => l(message));
-  }
-}

From a2825a35146007b4f2cf9f2f44c9be821b6938f1 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 26 Apr 2024 12:52:21 -0400
Subject: [PATCH 0119/1141] Fix activation of column tab when adding columns to
 exploration

---
 mathesar_ui/src/systems/data-explorer/QueryRunner.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
index 27ce294143..1556e22886 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
@@ -3,6 +3,7 @@ import { derived, get, writable } from 'svelte/store';
 
 import { CancellablePromise, ImmutableMap } from '@mathesar-component-library';
 import type {
+  QueryColumnMetaData,
   QueryResultRecord,
   QueryResultsResponse,
   QueryRunResponse,
@@ -256,6 +257,15 @@ export default class QueryRunner {
     await this.run();
   }
 
+  selectColumn(alias: QueryColumnMetaData['alias']): void {
+    const processedColumn = get(this.processedColumns).get(alias);
+    if (!processedColumn) {
+      return;
+    }
+    this.selection.update((s) => s.ofOneColumn(processedColumn.id));
+    this.inspector.activate('column');
+  }
+
   getQueryModel(): QueryModel {
     return get(this.query);
   }

From 6797efa4c2c513b64b90ded1717111c3b4dbf114 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 26 Apr 2024 13:27:25 -0400
Subject: [PATCH 0120/1141] Activate and focus first data cell on table load

---
 mathesar_ui/src/components/sheet/Sheet.svelte | 17 ++++++-----
 mathesar_ui/src/components/sheet/utils.ts     |  4 +++
 mathesar_ui/src/pages/table/TablePage.svelte  | 30 +++++++++++++++----
 .../src/systems/table-view/TableView.svelte   |  5 ++--
 4 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/mathesar_ui/src/components/sheet/Sheet.svelte b/mathesar_ui/src/components/sheet/Sheet.svelte
index 3248dbbb4a..73a6764435 100644
--- a/mathesar_ui/src/components/sheet/Sheet.svelte
+++ b/mathesar_ui/src/components/sheet/Sheet.svelte
@@ -15,6 +15,7 @@
   import {
     calculateColumnStyleMapAndRowWidth,
     DEFAULT_COLUMN_WIDTH,
+    focusActiveCell,
     setSheetContext,
   } from './utils';
 
@@ -44,7 +45,7 @@
   export let columnWidths: ImmutableMap<SheetColumnIdentifierKey, number> =
     new ImmutableMap();
 
-  let sheetElement: HTMLElement;
+  export let sheetElement: HTMLElement | undefined = undefined;
 
   $: ({ columnStyleMap, rowWidth } = calculateColumnStyleMapAndRowWidth(
     columns,
@@ -131,6 +132,7 @@
 
   function handleMouseDown(e: MouseEvent) {
     if (!selection) return;
+    if (!sheetElement) return;
 
     const target = e.target as HTMLElement;
     const targetCell = findContainingSheetCell(target);
@@ -170,12 +172,13 @@
     }
   }
 
-  async function focusActiveCell() {
-    await tick();
-    sheetElement.querySelector<HTMLElement>('[data-active-cell]')?.focus();
-  }
-
-  onMount(() => selection?.on('focus', focusActiveCell));
+  onMount(() =>
+    selection?.on('focus', async () => {
+      if (!sheetElement) return;
+      await tick();
+      focusActiveCell(sheetElement);
+    }),
+  );
 </script>
 
 <div
diff --git a/mathesar_ui/src/components/sheet/utils.ts b/mathesar_ui/src/components/sheet/utils.ts
index 489f0cf1bc..93b5074599 100644
--- a/mathesar_ui/src/components/sheet/utils.ts
+++ b/mathesar_ui/src/components/sheet/utils.ts
@@ -74,3 +74,7 @@ export function getSheetContext<
 >(): SheetContext<SheetColumnIdentifierKey> {
   return getContext(SHEET_CONTEXT_KEY);
 }
+
+export function focusActiveCell(sheetElement: HTMLElement): void {
+  sheetElement?.querySelector<HTMLElement>('[data-active-cell]')?.focus();
+}
diff --git a/mathesar_ui/src/pages/table/TablePage.svelte b/mathesar_ui/src/pages/table/TablePage.svelte
index f554941a9f..4995d2565e 100644
--- a/mathesar_ui/src/pages/table/TablePage.svelte
+++ b/mathesar_ui/src/pages/table/TablePage.svelte
@@ -1,17 +1,19 @@
 <script lang="ts">
+  import { tick } from 'svelte';
   import { router } from 'tinro';
 
   import type { TableEntry } from '@mathesar/api/types/tables';
+  import { focusActiveCell } from '@mathesar/components/sheet/utils';
+  import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
+  import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
   import {
-    setTabularDataStoreInContext,
-    TabularData,
     Meta,
+    TabularData,
+    setTabularDataStoreInContext,
   } from '@mathesar/stores/table-data';
   import TableView from '@mathesar/systems/table-view/TableView.svelte';
   import ActionsPane from '@mathesar/systems/table-view/actions-pane/ActionsPane.svelte';
-  import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
-  import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import type { ShareConsumer } from '@mathesar/utils/shares';
   import { setNewImperativeFilterControllerInContext } from './ImperativeFilterController';
 
@@ -27,6 +29,8 @@
   export let table: TableEntry;
   export let shareConsumer: ShareConsumer | undefined = undefined;
 
+  let sheetElement: HTMLElement;
+
   $: abstractTypesMap = $currentDbAbstractTypes.data;
   $: ({ query } = $router);
   $: meta = Meta.fromSerialization(query[metaSerializationQueryKey] ?? '');
@@ -37,10 +41,26 @@
     table,
     shareConsumer,
   });
+  $: ({ isLoading, selection } = tabularData);
   $: tabularDataStore.set(tabularData);
   let context: 'shared-consumer-page' | 'page' = 'page';
   $: context = shareConsumer ? 'shared-consumer-page' : 'page';
 
+  async function activateFirstDataCell() {
+    selection.updateWithoutFocus((s) => s.ofFirstDataCell());
+    // Don't steal focus if the user has already focused on another UI element
+    // while the table data is loading.
+    if (document.activeElement === document.body) {
+      await tick();
+      focusActiveCell(sheetElement);
+    }
+  }
+  let hasInitialized = false;
+  $: if (!hasInitialized && !$isLoading) {
+    hasInitialized = true;
+    void activateFirstDataCell();
+  }
+
   function handleMetaSerializationChange(s: string) {
     router.location.query.set(metaSerializationQueryKey, s);
   }
@@ -53,7 +73,7 @@
 <LayoutWithHeader fitViewport restrictWidth={false}>
   <div class="table-page">
     <ActionsPane {table} {context} />
-    <TableView {table} {context} />
+    <TableView {table} {context} bind:sheetElement />
   </div>
 </LayoutWithHeader>
 
diff --git a/mathesar_ui/src/systems/table-view/TableView.svelte b/mathesar_ui/src/systems/table-view/TableView.svelte
index 827ab5b52c..f0868ff261 100644
--- a/mathesar_ui/src/systems/table-view/TableView.svelte
+++ b/mathesar_ui/src/systems/table-view/TableView.svelte
@@ -37,6 +37,7 @@
 
   export let context: Context = 'page';
   export let table: Pick<TableEntry, 'id' | 'settings' | 'schema'>;
+  export let sheetElement: HTMLElement | undefined = undefined;
 
   let tableInspectorTab: ComponentProps<WithTableInspector>['activeTabId'] =
     'table';
@@ -44,8 +45,7 @@
   $: usesVirtualList = context !== 'widget';
   $: allowsDdlOperations = context !== 'widget' && canExecuteDDL;
   $: sheetHasBorder = context === 'widget';
-  $: ({ processedColumns, display, isLoading, selection, recordsData } =
-    $tabularData);
+  $: ({ processedColumns, display, selection, recordsData } = $tabularData);
   $: clipboardHandler = new SheetClipboardHandler({
     getCopyingContext: () => ({
       rowsMap: new Map(
@@ -127,6 +127,7 @@
           hasBorder={sheetHasBorder}
           hasPaddingRight
           restrictWidthToRowWidth={!usesVirtualList}
+          bind:sheetElement
         >
           <Header {hasNewColumnButton} {columnOrder} {table} />
           <Body {usesVirtualList} />

From 0317a268880be32278b9abddcd411e42d1f91eef Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 26 Apr 2024 13:35:37 -0400
Subject: [PATCH 0121/1141] Fix linting problems

---
 .../src/systems/connections/DeleteConnectionModal.svelte  | 7 +++----
 .../data-explorer/input-sidebar/InputSidebar.svelte       | 8 +-------
 .../table-view/table-inspector/WithTableInspector.svelte  | 3 ++-
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte b/mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte
index 1fbe0c6caa..85456342cc 100644
--- a/mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte
+++ b/mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte
@@ -1,18 +1,17 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
+
   import {
+    CancelOrProceedButtonPair,
     Checkbox,
     ControlledModal,
     LabeledInput,
     ModalController,
-    CancelOrProceedButtonPair,
   } from '@mathesar-component-library';
-  import DocsLink from '@mathesar/components/DocsLink.svelte';
+  import type { Connection } from '@mathesar/api/connections';
   import Identifier from '@mathesar/components/Identifier.svelte';
   import RichText from '@mathesar/components/rich-text/RichText.svelte';
-  import WarningBox from '@mathesar/components/message-boxes/WarningBox.svelte';
-  import type { Connection } from '@mathesar/api/connections';
   import {
     connectionHasUniqueDatabaseReference,
     connectionsStore,
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/InputSidebar.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/InputSidebar.svelte
index 6108d472ea..87ba93f72a 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/InputSidebar.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/InputSidebar.svelte
@@ -14,13 +14,7 @@
   export let linkCollapsibleOpenState: Record<ColumnWithLink['id'], boolean> =
     {};
 
-  $: ({
-    query,
-    state,
-    confirmationNeededForMultipleResults,
-    inspector,
-    selection,
-  } = queryManager);
+  $: ({ query, state, confirmationNeededForMultipleResults } = queryManager);
   $: ({ inputColumnsFetchState } = $state);
 
   const tabs = [
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/WithTableInspector.svelte b/mathesar_ui/src/systems/table-view/table-inspector/WithTableInspector.svelte
index 80bf96f635..63747bba3a 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/WithTableInspector.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/WithTableInspector.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
+  import type { ComponentProps } from 'svelte';
+
   import { WithPanel } from '@mathesar-component-library';
   import { tableInspectorWidth } from '@mathesar/stores/localStorage';
   import TableInspector from './TableInspector.svelte';
-  import type { ComponentProps } from 'svelte';
 
   export let context: 'page' | 'widget' | 'shared-consumer-page';
   export let showTableInspector: boolean;

From 6325be593092c5440bfc20148170614d78df2c54 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 26 Apr 2024 23:27:18 -0400
Subject: [PATCH 0122/1141] Improve logic within `forNewPlane`

---
 .../src/components/sheet/selection/Series.ts  | 12 +++++-
 .../sheet/selection/SheetSelection.ts         | 35 ++++++++++-------
 .../sheet/selection/selectionUtils.ts         | 38 +++++++++++++++++++
 3 files changed, 71 insertions(+), 14 deletions(-)

diff --git a/mathesar_ui/src/components/sheet/selection/Series.ts b/mathesar_ui/src/components/sheet/selection/Series.ts
index c7654a8f29..3eaaebf54b 100644
--- a/mathesar_ui/src/components/sheet/selection/Series.ts
+++ b/mathesar_ui/src/components/sheet/selection/Series.ts
@@ -24,7 +24,7 @@ export default class Series<Value> {
     }
   }
 
-  private getIndex(value: Value): number | undefined {
+  getIndex(value: Value): number | undefined {
     return this.indexLookup.get(value);
   }
 
@@ -89,10 +89,20 @@ export default class Series<Value> {
     return findBest(comparator, (v) => this.getIndex(v) ?? 0, validValues);
   }
 
+  /**
+   * Of all the supplied values, return the value that is the lowest as ordered
+   * within the series. If no such value is present, then `undefined` will
+   * be returned.
+   */
   min(values: Iterable<Value>): Value | undefined {
     return this.best(values, firstLowest);
   }
 
+  /**
+   * Of all the supplied values, return the value that is the highest as ordered
+   * within the series. If no such value is present, then `undefined` will be
+   * returned.
+   */
   max(values: Iterable<Value>): Value | undefined {
     return this.best(values, firstHighest);
   }
diff --git a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
index 0c9725d1c0..b20a27be64 100644
--- a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
+++ b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
@@ -6,7 +6,10 @@ import { assertExhaustive } from '@mathesar/utils/typeUtils';
 import { makeCellId, makeCells, parseCellId } from '../cellIds';
 import { Direction, getColumnOffset } from './Direction';
 import Plane from './Plane';
-import type { SheetCellDetails } from './selectionUtils';
+import {
+  fitSelectedValuesToSeriesTransformation,
+  type SheetCellDetails,
+} from './selectionUtils';
 
 /**
  * - `'dataCells'` means that the selection contains data cells. This is by far
@@ -373,35 +376,41 @@ export default class SheetSelection {
 
   /**
    * @returns a new selection that fits within the provided plane. This is
-   * useful when a column is deleted, reordered, or inserted.
+   * relevant when paginating or when rows/columns are deleted/reordered/inserted.
    */
   forNewPlane(newPlane: Plane): SheetSelection {
     if (this.basis.type === 'dataCells') {
       if (!newPlane.hasResultRows) {
         return new SheetSelection(newPlane, basisFromZeroEmptyColumns());
       }
-      const minColumnId = newPlane.columnIds.min(this.basis.columnIds);
-      const maxColumnId = newPlane.columnIds.max(this.basis.columnIds);
-      const minRowId = newPlane.rowIds.min(this.basis.rowIds);
-      const maxRowId = newPlane.rowIds.max(this.basis.rowIds);
+
+      const [minRowId, maxRowId] = fitSelectedValuesToSeriesTransformation(
+        this.basis.rowIds,
+        this.plane.rowIds,
+        newPlane.rowIds,
+      );
+      const [minColumnId, maxColumnId] =
+        fitSelectedValuesToSeriesTransformation(
+          this.basis.columnIds,
+          this.plane.columnIds,
+          newPlane.columnIds,
+        );
       if (
-        minColumnId === undefined ||
-        maxColumnId === undefined ||
         minRowId === undefined ||
-        maxRowId === undefined
+        maxRowId === undefined ||
+        minColumnId === undefined ||
+        maxColumnId === undefined
       ) {
-        // TODO: in some cases maybe we can be smarter here. Instead of
-        // returning an empty selection, we could try to return a selection of
-        // the same dimensions that is placed as close as possible to the
-        // original selection.
         return new SheetSelection(newPlane);
       }
+
       const cellIds = newPlane.dataCellsInFlexibleRowColumnRange(
         minRowId,
         maxRowId,
         minColumnId,
         maxColumnId,
       );
+      // TODO set active cell
       return new SheetSelection(newPlane, basisFromDataCells(cellIds));
     }
 
diff --git a/mathesar_ui/src/components/sheet/selection/selectionUtils.ts b/mathesar_ui/src/components/sheet/selection/selectionUtils.ts
index b8a54af1ab..9be1ba7b4b 100644
--- a/mathesar_ui/src/components/sheet/selection/selectionUtils.ts
+++ b/mathesar_ui/src/components/sheet/selection/selectionUtils.ts
@@ -1,5 +1,7 @@
 import type { Writable } from 'svelte/store';
 
+import { defined, type ImmutableSet } from '@mathesar-component-library';
+import type Series from './Series';
 import type SheetSelection from './SheetSelection';
 
 export type SheetCellDetails =
@@ -75,3 +77,39 @@ export function beginSelection({
   sheetElement.addEventListener('mousemove', drawToPoint);
   window.addEventListener('mouseup', finish);
 }
+
+function positive(n: number): number {
+  return Math.max(0, n);
+}
+
+/**
+ * Given a set of (contiguous) selected values within a series, this function
+ * will formulate a new set of selected values to fit within a new series such
+ * that the starting index and width of the selection are preserved to the best
+ * extent possible.
+ *
+ * @return A tuple containing the starting and ending values of the new
+ * selection.
+ */
+export function fitSelectedValuesToSeriesTransformation<T>(
+  selectedValues: ImmutableSet<T>,
+  oldSeries: Series<T>,
+  newSeries: Series<T>,
+): [T, T] {
+  const matchingMin = newSeries.min(selectedValues);
+  const matchingMax = newSeries.max(selectedValues);
+  if (matchingMin !== undefined && matchingMax !== undefined) {
+    return [matchingMin, matchingMax];
+  }
+
+  const width = Math.min(selectedValues.size, newSeries.length);
+  const oldStartingIndex =
+    defined(oldSeries.min(selectedValues), (v) => oldSeries.getIndex(v)) ?? 0;
+  const indexReduction = positive(
+    oldStartingIndex + width - 1 - newSeries.length,
+  );
+  const newStartingIndex = positive(oldStartingIndex - indexReduction);
+  const newStartingValue = newSeries.at(newStartingIndex) as T;
+  const newEndingValue = newSeries.at(newStartingIndex + width - 1) as T;
+  return [newStartingValue, newEndingValue];
+}

From f4f4eeb8bb2a71945aadb316359f943489ed857f Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Sat, 27 Apr 2024 15:10:55 -0400
Subject: [PATCH 0123/1141] Small comment cleanup

---
 .../src/components/sheet/selection/SheetSelection.ts     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
index b20a27be64..942a97b688 100644
--- a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
+++ b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
@@ -104,13 +104,13 @@ function getFullySelectedColumnIds(
 ): ImmutableSet<string> {
   if (basis.type === 'dataCells') {
     // The logic within this branch is somewhat complex because:
-    // - We want to suppor non-rectangular selections.
+    // - We might want to support non-rectangular selections someday.
     // - For performance, we want to avoid iterating over all the selected
     //   cells.
 
-    const selctedRowCount = basis.rowIds.size;
+    const selectedRowCount = basis.rowIds.size;
     const availableRowCount = plane.rowIds.length;
-    if (selctedRowCount < availableRowCount) {
+    if (selectedRowCount < availableRowCount) {
       // Performance heuristic. If the number of selected rows is less than the
       // total number of rows, we can assume that no column exist in which all
       // rows are selected.
@@ -131,7 +131,8 @@ function getFullySelectedColumnIds(
     // This is the worst-case scenario, performance-wise, which is why we try to
     // return early before hitting this branch. This case will only happen when
     // we have a mix of fully selected columns and partially selected columns.
-    // This case should be rare because most selections are rectangular.
+    // This case should be rare because most (maybe all?) selections are
+    // rectangular.
     const countSelectedCellsPerColumn = new Map<string, number>();
     for (const cellId of basis.cellIds) {
       const { columnId } = parseCellId(cellId);

From adf17b1766ca352c4d65a568ea51e8d63c506345 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Sat, 27 Apr 2024 20:16:45 -0400
Subject: [PATCH 0124/1141] Reorganize some code

---
 .../sheet/selection/SheetSelection.ts         | 96 ++-----------------
 .../src/components/sheet/selection/basis.ts   | 95 ++++++++++++++++++
 2 files changed, 104 insertions(+), 87 deletions(-)
 create mode 100644 mathesar_ui/src/components/sheet/selection/basis.ts

diff --git a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
index 942a97b688..378d295dbd 100644
--- a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
+++ b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
@@ -6,98 +6,20 @@ import { assertExhaustive } from '@mathesar/utils/typeUtils';
 import { makeCellId, makeCells, parseCellId } from '../cellIds';
 import { Direction, getColumnOffset } from './Direction';
 import Plane from './Plane';
+import {
+  basisFromDataCells,
+  basisFromEmptyColumns,
+  basisFromOneDataCell,
+  basisFromPlaceholderCell,
+  basisFromZeroEmptyColumns,
+  emptyBasis,
+  type Basis,
+} from './basis';
 import {
   fitSelectedValuesToSeriesTransformation,
   type SheetCellDetails,
 } from './selectionUtils';
 
-/**
- * - `'dataCells'` means that the selection contains data cells. This is by far
- *   the most common type of selection basis.
- *
- * - `'emptyColumns'` is used when the sheet has no rows. In this case we still
- *   want to allow the user to select columns, so we use this basis.
- *
- * - `'placeholderCell'` is used when the user is selecting a cell in the
- *   placeholder row. This is a special case because we don't want to allow the
- *   user to select multiple cells in the placeholder row, and we also don't
- *   want to allow selections that include cells in data rows _and_ the
- *   placeholder row.
- *
- * - `'empty'` is used when no cells are selected. We try to avoid this state,
- *   but we also allow for it because it makes it easier to construct selection
- *   instances if we don't already have the full plane data.
- */
-type BasisType = 'dataCells' | 'emptyColumns' | 'placeholderCell' | 'empty';
-
-/**
- * This type stores data about "which cells are selected", with some redundancy
- * for efficient and consistent lookup across different kinds of selections.
- *
- * Due to the redundant nature of some properties on this type, you should be
- * sure to only instantiate Basis using the utility functions below. This will
- * ensure that the data is always valid.
- */
-interface Basis {
-  readonly type: BasisType;
-  readonly activeCellId: string | undefined;
-  readonly cellIds: ImmutableSet<string>;
-  readonly rowIds: ImmutableSet<string>;
-  readonly columnIds: ImmutableSet<string>;
-}
-
-function basisFromDataCells(
-  cellIds: Iterable<string>,
-  activeCellId?: string,
-): Basis {
-  const parsedCells = [...cellIds].map(parseCellId);
-  return {
-    type: 'dataCells',
-    activeCellId: activeCellId ?? first(cellIds),
-    cellIds: new ImmutableSet(cellIds),
-    columnIds: new ImmutableSet(parsedCells.map((cellId) => cellId.columnId)),
-    rowIds: new ImmutableSet(parsedCells.map((cellId) => cellId.rowId)),
-  };
-}
-
-function basisFromOneDataCell(cellId: string): Basis {
-  return basisFromDataCells([cellId], cellId);
-}
-
-function basisFromEmptyColumns(columnIds: Iterable<string>): Basis {
-  return {
-    type: 'emptyColumns',
-    activeCellId: undefined,
-    cellIds: new ImmutableSet(),
-    columnIds: new ImmutableSet(columnIds),
-    rowIds: new ImmutableSet(),
-  };
-}
-
-function basisFromZeroEmptyColumns(): Basis {
-  return basisFromEmptyColumns([]);
-}
-
-function basisFromPlaceholderCell(activeCellId: string): Basis {
-  return {
-    type: 'placeholderCell',
-    activeCellId,
-    cellIds: new ImmutableSet([activeCellId]),
-    columnIds: new ImmutableSet([parseCellId(activeCellId).columnId]),
-    rowIds: new ImmutableSet(),
-  };
-}
-
-function emptyBasis(): Basis {
-  return {
-    type: 'empty',
-    activeCellId: undefined,
-    cellIds: new ImmutableSet(),
-    columnIds: new ImmutableSet(),
-    rowIds: new ImmutableSet(),
-  };
-}
-
 function getFullySelectedColumnIds(
   plane: Plane,
   basis: Basis,
diff --git a/mathesar_ui/src/components/sheet/selection/basis.ts b/mathesar_ui/src/components/sheet/selection/basis.ts
new file mode 100644
index 0000000000..deda98b794
--- /dev/null
+++ b/mathesar_ui/src/components/sheet/selection/basis.ts
@@ -0,0 +1,95 @@
+import { first } from 'iter-tools';
+
+import { ImmutableSet } from '@mathesar/component-library';
+import { parseCellId } from '../cellIds';
+
+/**
+ * - `'dataCells'` means that the selection contains data cells. This is by far
+ *   the most common type of selection basis.
+ *
+ * - `'emptyColumns'` is used when the sheet has no rows. In this case we still
+ *   want to allow the user to select columns, so we use this basis.
+ *
+ * - `'placeholderCell'` is used when the user is selecting a cell in the
+ *   placeholder row. This is a special case because we don't want to allow the
+ *   user to select multiple cells in the placeholder row, and we also don't
+ *   want to allow selections that include cells in data rows _and_ the
+ *   placeholder row.
+ *
+ * - `'empty'` is used when no cells are selected. We try to avoid this state,
+ *   but we also allow for it because it makes it easier to construct selection
+ *   instances if we don't already have the full plane data.
+ */
+export type BasisType =
+  | 'dataCells'
+  | 'emptyColumns'
+  | 'placeholderCell'
+  | 'empty';
+
+/**
+ * This type stores data about "which cells are selected", with some redundancy
+ * for efficient and consistent lookup across different kinds of selections.
+ *
+ * Due to the redundant nature of some properties on this type, you should be
+ * sure to only instantiate Basis using the utility functions below. This will
+ * ensure that the data is always valid.
+ */
+export interface Basis {
+  readonly type: BasisType;
+  readonly activeCellId: string | undefined;
+  readonly cellIds: ImmutableSet<string>;
+  readonly rowIds: ImmutableSet<string>;
+  readonly columnIds: ImmutableSet<string>;
+}
+
+export function basisFromDataCells(
+  cellIds: Iterable<string>,
+  activeCellId?: string,
+): Basis {
+  const parsedCells = [...cellIds].map(parseCellId);
+  return {
+    type: 'dataCells',
+    activeCellId: activeCellId ?? first(cellIds),
+    cellIds: new ImmutableSet(cellIds),
+    columnIds: new ImmutableSet(parsedCells.map((cellId) => cellId.columnId)),
+    rowIds: new ImmutableSet(parsedCells.map((cellId) => cellId.rowId)),
+  };
+}
+
+export function basisFromOneDataCell(cellId: string): Basis {
+  return basisFromDataCells([cellId], cellId);
+}
+
+export function basisFromEmptyColumns(columnIds: Iterable<string>): Basis {
+  return {
+    type: 'emptyColumns',
+    activeCellId: undefined,
+    cellIds: new ImmutableSet(),
+    columnIds: new ImmutableSet(columnIds),
+    rowIds: new ImmutableSet(),
+  };
+}
+
+export function basisFromZeroEmptyColumns(): Basis {
+  return basisFromEmptyColumns([]);
+}
+
+export function basisFromPlaceholderCell(activeCellId: string): Basis {
+  return {
+    type: 'placeholderCell',
+    activeCellId,
+    cellIds: new ImmutableSet([activeCellId]),
+    columnIds: new ImmutableSet([parseCellId(activeCellId).columnId]),
+    rowIds: new ImmutableSet(),
+  };
+}
+
+export function emptyBasis(): Basis {
+  return {
+    type: 'empty',
+    activeCellId: undefined,
+    cellIds: new ImmutableSet(),
+    columnIds: new ImmutableSet(),
+    rowIds: new ImmutableSet(),
+  };
+}

From aa211acf995cbd7273cc392c131265eb77cd79f2 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Sat, 27 Apr 2024 20:27:41 -0400
Subject: [PATCH 0125/1141] Show loading indicator cell skeletons in record
 selector

---
 .../src/systems/record-selector/RecordSelectorDataCell.svelte  | 3 ++-
 .../src/systems/record-selector/RecordSelectorTable.svelte     | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorDataCell.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorDataCell.svelte
index b4357c0050..e30072d9c8 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorDataCell.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorDataCell.svelte
@@ -15,6 +15,7 @@
   export let processedColumn: ProcessedColumn;
   export let recordSummaries: RecordSummaryStore;
   export let searchFuzzy: Writable<SearchFuzzy>;
+  export let isLoading = false;
 
   $: ({ column } = processedColumn);
   $: searchValue = $searchFuzzy.get(column.id);
@@ -30,7 +31,7 @@
     {value}
     {recordSummary}
     disabled
-    showAsSkeleton={!rowHasSavedRecord(row)}
+    showAsSkeleton={!rowHasSavedRecord(row) || isLoading}
     {searchValue}
     showTruncationPopover
   />
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
index 55398549a9..2ac0cefb30 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
@@ -289,6 +289,7 @@
                 {processedColumn}
                 {recordSummaries}
                 {searchFuzzy}
+                isLoading={recordsDataIsLoading}
               />
             {/each}
           </RecordSelectorDataRow>

From dfe5bfc657bfb42642565da42865c615f657cfc1 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Sat, 27 Apr 2024 20:46:50 -0400
Subject: [PATCH 0126/1141] Ensure active cell falls within selected cells

---
 .../src/components/sheet/selection/basis.ts   | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/mathesar_ui/src/components/sheet/selection/basis.ts b/mathesar_ui/src/components/sheet/selection/basis.ts
index deda98b794..2d53f663e2 100644
--- a/mathesar_ui/src/components/sheet/selection/basis.ts
+++ b/mathesar_ui/src/components/sheet/selection/basis.ts
@@ -43,14 +43,24 @@ export interface Basis {
 }
 
 export function basisFromDataCells(
-  cellIds: Iterable<string>,
-  activeCellId?: string,
+  _cellIds: Iterable<string>,
+  _activeCellId?: string,
 ): Basis {
-  const parsedCells = [...cellIds].map(parseCellId);
+  const parsedCells = [..._cellIds].map(parseCellId);
+  const cellIds = new ImmutableSet(_cellIds);
+  const activeCellId = (() => {
+    if (_activeCellId === undefined) {
+      return first(_cellIds);
+    }
+    if (cellIds.has(_activeCellId)) {
+      return _activeCellId;
+    }
+    return first(_cellIds);
+  })();
   return {
     type: 'dataCells',
-    activeCellId: activeCellId ?? first(cellIds),
-    cellIds: new ImmutableSet(cellIds),
+    activeCellId,
+    cellIds,
     columnIds: new ImmutableSet(parsedCells.map((cellId) => cellId.columnId)),
     rowIds: new ImmutableSet(parsedCells.map((cellId) => cellId.rowId)),
   };

From 8d3399575bd557f633a8e0b690302be7d0068602 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Sat, 27 Apr 2024 21:17:13 -0400
Subject: [PATCH 0127/1141] Improve retention of active cell

---
 .../src/components/sheet/selection/SheetSelection.ts       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
index 378d295dbd..a61b2e6a82 100644
--- a/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
+++ b/mathesar_ui/src/components/sheet/selection/SheetSelection.ts
@@ -333,8 +333,11 @@ export default class SheetSelection {
         minColumnId,
         maxColumnId,
       );
-      // TODO set active cell
-      return new SheetSelection(newPlane, basisFromDataCells(cellIds));
+
+      return new SheetSelection(
+        newPlane,
+        basisFromDataCells(cellIds, this.activeCellId),
+      );
     }
 
     if (this.basis.type === 'emptyColumns') {

From 6ee7724eb51509a9d5089084267f0c78f4b7fad6 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Sun, 28 Apr 2024 10:35:08 -0400
Subject: [PATCH 0128/1141] Remove dead code comments

---
 mathesar_ui/src/systems/table-view/TableView.svelte | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/mathesar_ui/src/systems/table-view/TableView.svelte b/mathesar_ui/src/systems/table-view/TableView.svelte
index f0868ff261..ec6217feac 100644
--- a/mathesar_ui/src/systems/table-view/TableView.svelte
+++ b/mathesar_ui/src/systems/table-view/TableView.svelte
@@ -85,18 +85,6 @@
     [ID_ADD_NEW_COLUMN, 32],
   ]);
   $: showTableInspector = $isTableInspectorVisible && supportsTableInspector;
-
-  // // TODO_3037
-  // function selectFirstCellOnTableLoad(_isLoading: boolean, _context: Context) {
-  //   // We only activate the first cell on the page, not in the widget. Doing so
-  //   // on the widget causes the cell to focus and the page to scroll down to
-  //   // bring that element into view.
-  //   if (_context !== 'widget' && !_isLoading) {
-  //     selection.update((s) => s.ofFirstDataCell());
-  //   }
-  // }
-
-  // $: void selectFirstCellOnTableLoad($isLoading, context);
 </script>
 
 <div class="table-view">

From 2904112f3cd7c56a9be67be347747780f457d9c0 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 29 Apr 2024 15:58:08 +0800
Subject: [PATCH 0129/1141] add/improve docstrings of column info getter SQL
 functions

---
 db/sql/0_msar.sql | 52 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/db/sql/0_msar.sql b/db/sql/0_msar.sql
index 1ac1f87986..ce97fc16c2 100644
--- a/db/sql/0_msar.sql
+++ b/db/sql/0_msar.sql
@@ -472,7 +472,8 @@ CREATE OR REPLACE FUNCTION
 msar.get_interval_fields(typ_mod integer) RETURNS text AS $$/*
 Return the string giving the fields for an interval typmod integer.
 
-This logic is ported from the relevant PostgreSQL source code, reimplemented in SQL. See:
+This logic is ported from the relevant PostgreSQL source code, reimplemented in SQL. See the
+`intervaltypmodout` function at
 https://doxygen.postgresql.org/backend_2utils_2adt_2timestamp_8c.html
 
 Args:
@@ -497,23 +498,31 @@ $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-msar.get_type_options(typ_id oid, typ_mod integer, typ_ndims integer) RETURNS jsonb AS $$/*
+msar.get_type_options(typ_id regtype, typ_mod integer, typ_ndims integer) RETURNS jsonb AS $$/*
 Return the type options calculated from a type, typmod pair.
 
-This function uses a number of hard-coded constants.
+This function uses a number of hard-coded constants. The form of the returned object is determined
+by the input type, but the keys will be a subset of:
+  precision: the precision of a numeric or interval type. See PostgreSQL docs for details.
+  scale: the scale of a numeric type
+  fields: See PostgreSQL documentation of the `interval` type.
+  length: Applies to "text" types where the user can specify the length.
+  item_type: Gives the type of array members for array-types
 
 Args:
-  typ_id: The OID of the type.
+  typ_id: an OID or valid type representing string will work here.
   typ_mod: The integer corresponding to the type options; see pg_attribute catalog table.
+  typ_ndims: Used to determine whether the type is actually an array without an extra join.
 */
 SELECT nullif(
   CASE
     WHEN typ_id = ANY('{numeric, _numeric}'::regtype[]) THEN
       jsonb_build_object(
-        -- This calculation is modified from the relevant PostgreSQL source code. See
+        -- This calculation is modified from the relevant PostgreSQL source code. See the function
+        -- numeric_typmod_precision(int32) at
         -- https://doxygen.postgresql.org/backend_2utils_2adt_2numeric_8c.html
         'precision', ((nullif(typ_mod, -1) - 4) >> 16) & 65535,
-        -- This calculation is also from the source code.
+        -- This calculation is from numeric_typmod_scale(int32) at the same location
         'scale', (((nullif(typ_mod, -1) - 4) & 2047) # 1024) - 1024
       )
     WHEN typ_id = ANY('{interval, _interval}'::regtype[]) THEN
@@ -522,6 +531,7 @@ SELECT nullif(
         'fields', msar.get_interval_fields(typ_mod)
       )
     WHEN typ_id = ANY('{bpchar, _bpchar, varchar, _varchar}'::regtype[]) THEN
+      -- For char and varchar types, the typemod is equal to 4 more than the set length.
       jsonb_build_object('length', nullif(typ_mod, -1) - 4)
     WHEN typ_id = ANY(
       '{bit, varbit, time, timetz, timestamp, timestamptz}'::regtype[]
@@ -543,8 +553,11 @@ SELECT nullif(
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
-CREATE OR REPLACE FUNCTION msar.get_valid_target_type_strings(typ_id oid) RETURNS jsonb AS $$/*
-TODO
+CREATE OR REPLACE FUNCTION msar.get_valid_target_type_strings(typ_id regtype) RETURNS jsonb AS $$/*
+Given a source type, return the target types for which Mathesar provides a casting function.
+
+Args:
+  typ_id: The type we're casting from.
 */
 SELECT jsonb_agg(prorettype::regtype::text)
 FROM pg_proc
@@ -570,7 +583,26 @@ $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION msar.get_column_info(tab_id regclass) RETURNS jsonb AS $$/*
-TODO
+Given a table identifier, return an array of objects describing the columns of the table.
+
+Each returned JSON object in the array will have the form:
+  {
+    "id": <int>,
+    "name": <str>,
+    "type": <str>,
+    "type_options": <obj>,
+    "nullable": <bool>,
+    "primary_key": <bool>,
+    "valid_target_types": [<str>, <str>, ..., <str>]
+    "default": {"value": <str>, "is_dynamic": <bool>},
+    "has_dependents": <bool>,
+    "description": <str>
+  }
+
+The `type_options` object is described in the docstring of `msar.get_type_options`. The `default`
+object has the keys:
+  value: A string giving the value (as an SQL expression) of the default.
+  is_dynamic: A boolean giving whether the default is (likely to be) dynamic.
 */
 SELECT jsonb_agg(
   jsonb_build_object(
@@ -606,8 +638,6 @@ WHERE pga.attrelid=tab_id AND pga.attnum > 0 and NOT attisdropped;
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
-
-
 CREATE OR REPLACE FUNCTION msar.column_exists(tab_id oid, col_name text) RETURNS boolean AS $$/*
 Return true if the given column exists in the table, false otherwise.
 */

From 66ff45c3efcfd0ceb267ed78397ba0311204b183 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 29 Apr 2024 17:06:13 +0800
Subject: [PATCH 0130/1141] remove dependency on mathesar_types existing

---
 db/sql/0_msar.sql | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/db/sql/0_msar.sql b/db/sql/0_msar.sql
index ce97fc16c2..b3b2ff66fb 100644
--- a/db/sql/0_msar.sql
+++ b/db/sql/0_msar.sql
@@ -131,6 +131,23 @@ Wraps the `?` jsonb operator for improved readability.
 $$ LANGUAGE plpgsql;
 
 
+CREATE OR REPLACE FUNCTION msar.schema_exists(schema_name text) RETURNS boolean AS $$/*
+Return true if the given schema exists in the current database, false otherwise.
+*/
+SELECT EXISTS (SELECT 1 FROM pg_namespace WHERE nspname=schema_name);
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION __msar.get_schema_oid(sch_name text) RETURNS oid AS $$/*
+Return the OID of a schema, if it can be diretly found from a name.
+
+Args :
+  sch_name: The name of the schema.
+*/
+SELECT CASE WHEN msar.schema_exists(sch_name) THEN sch_name::regnamespace::oid END;
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
 CREATE OR REPLACE FUNCTION __msar.get_schema_name(sch_id oid) RETURNS TEXT AS $$/*
 Return the name for a given schema, quoted as appropriate.
 
@@ -559,10 +576,11 @@ Given a source type, return the target types for which Mathesar provides a casti
 Args:
   typ_id: The type we're casting from.
 */
+
 SELECT jsonb_agg(prorettype::regtype::text)
 FROM pg_proc
 WHERE
-  pronamespace='mathesar_types'::regnamespace::oid
+  pronamespace=__msar.get_schema_oid('mathesar_types')
   AND proargtypes[0]=typ_id
   AND left(proname, 5) = 'cast_';
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
@@ -645,13 +663,6 @@ SELECT EXISTS (SELECT 1 FROM pg_attribute WHERE attrelid=tab_id AND attname=col_
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
-CREATE OR REPLACE FUNCTION msar.schema_exists(schema_name text) RETURNS boolean AS $$/*
-Return true if the given schema exists in the current database, false otherwise.
-*/
-SELECT EXISTS (SELECT 1 FROM pg_namespace WHERE nspname=schema_name);
-$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
-
-
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 -- ROLE MANIPULATION FUNCTIONS

From c2e9df5c022ae9028900edfdee5faafcbe342536 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 29 Apr 2024 17:38:49 +0800
Subject: [PATCH 0131/1141] add SQL tests for interval field builder

---
 db/sql/test_0_msar.sql | 78 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/db/sql/test_0_msar.sql b/db/sql/test_0_msar.sql
index e21f4712f6..3bff3ac770 100644
--- a/db/sql/test_0_msar.sql
+++ b/db/sql/test_0_msar.sql
@@ -2079,3 +2079,81 @@ BEGIN
   RETURN NEXT schema_privs_are ('__msar', 'Ro"\bert''); DROP SCHEMA public;', ARRAY['USAGE']);
 END;
 $$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION setup_interval_fields() RETURNS SETOF TEXT AS $$
+BEGIN
+CREATE TABLE manytypes (
+    id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
+    ivl_plain interval,
+    ivl_yr interval year,
+    ivl_mo interval month,
+    ivl_dy interval day,
+    ivl_hr interval hour,
+    ivl_mi interval minute,
+    ivl_se interval second,
+    ivl_ye_mo interval year to month,
+    ivl_dy_hr interval day to hour,
+    ivl_dy_mi interval day to minute,
+    ivl_dy_se interval day to second,
+    ivl_hr_mi interval hour to minute,
+    ivl_hr_se interval hour to second,
+    ivl_mi_se interval minute to second,
+    ivl_se_0 interval second(0),
+    ivl_se_3 interval second(3),
+    ivl_se_6 interval second(6),
+    ivl_dy_se0 interval day to second(0),
+    ivl_dy_se3 interval day to second(3),
+    ivl_dy_se6 interval day to second(6),
+    ivl_hr_se0 interval hour to second(0),
+    ivl_hr_se3 interval hour to second(3),
+    ivl_hr_se6 interval hour to second(6),
+    ivl_mi_se0 interval minute to second(0),
+    ivl_mi_se3 interval minute to second(3),
+    ivl_mi_se6 interval minute to second(6)
+);
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_get_interval_fields() RETURNS SETOF TEXT AS $$
+BEGIN
+  RETURN NEXT results_eq(
+    $h$
+    SELECT msar.get_interval_fields(atttypmod)
+    FROM pg_attribute
+    WHERE attrelid='manytypes'::regclass AND atttypid='interval'::regtype
+    ORDER BY attnum;
+    $h$,
+    $w$
+    VALUES
+      (NULL),
+      ('year'),
+      ('month'),
+      ('day'),
+      ('hour'),
+      ('minute'),
+      ('second'),
+      ('year to month'),
+      ('day to hour'),
+      ('day to minute'),
+      ('day to second'),
+      ('hour to minute'),
+      ('hour to second'),
+      ('minute to second'),
+      ('second'),
+      ('second'),
+      ('second'),
+      ('day to second'),
+      ('day to second'),
+      ('day to second'),
+      ('hour to second'),
+      ('hour to second'),
+      ('hour to second'),
+      ('minute to second'),
+      ('minute to second'),
+      ('minute to second')
+    $w$
+  );
+END;
+$$ LANGUAGE plpgsql;

From a6c2983b81e00a87f60153a35b62fede32a56155 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 29 Apr 2024 18:24:47 +0800
Subject: [PATCH 0132/1141] test get_type_options function, fix bug

---
 db/sql/0_msar.sql      |  3 +-
 db/sql/test_0_msar.sql | 73 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/db/sql/0_msar.sql b/db/sql/0_msar.sql
index b3b2ff66fb..45590aa3c4 100644
--- a/db/sql/0_msar.sql
+++ b/db/sql/0_msar.sql
@@ -562,7 +562,8 @@ SELECT nullif(
   END
   || CASE
     WHEN typ_ndims>0 THEN
-      jsonb_build_object('item_type', typ_id::regtype)
+      -- This string wrangling is debatably dubious, but avoids a slow join.
+      jsonb_build_object('item_type', rtrim(typ_id::regtype::text, '[]'))
     ELSE '{}'
   END,
   '{}'
diff --git a/db/sql/test_0_msar.sql b/db/sql/test_0_msar.sql
index 3bff3ac770..6e9bebdf65 100644
--- a/db/sql/test_0_msar.sql
+++ b/db/sql/test_0_msar.sql
@@ -2110,7 +2110,15 @@ CREATE TABLE manytypes (
     ivl_hr_se6 interval hour to second(6),
     ivl_mi_se0 interval minute to second(0),
     ivl_mi_se3 interval minute to second(3),
-    ivl_mi_se6 interval minute to second(6)
+    ivl_mi_se6 interval minute to second(6),
+    -- Below here is less throrough, more ad-hoc
+    ivl_plain_arr interval[],
+    ivl_mi_se6_arr interval minute to second(6)[],
+    num_plain numeric,
+    num_8 numeric(8),
+    num_17_2 numeric(17, 2),
+    num_plain_arr numeric[],
+    num_17_2_arr numeric(17, 2)[]
 );
 END;
 $$ LANGUAGE plpgsql;
@@ -2157,3 +2165,66 @@ BEGIN
   );
 END;
 $$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_get_type_options() RETURNS SETOF TEXT AS $$
+BEGIN
+  RETURN NEXT is(msar.get_type_options(atttypid, atttypmod, attndims), NULL)
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='id';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"fields": null, "precision": null}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='ivl_plain';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"fields": "day to second", "precision": null}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='ivl_dy_se';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"fields": "second", "precision": 3}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='ivl_se_3';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"fields": "hour to second", "precision": 0}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='ivl_hr_se_0';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"fields": null, "precision": null, "item_type": "interval"}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='ivl_plain_arr';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"fields": "minute to second", "precision": 6, "item_type": "interval"}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='ivl_mi_se6_arr';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"precision": null, "scale": null}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='num_plain';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"precision": 8, "scale": 0}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='num_8';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"precision": 17, "scale": 2}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='num_17_2';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"precision": null, "scale": null, "item_type": "numeric"}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='num_plain_arr';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"precision": 17, "scale": 2, "item_type": "numeric"}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='num_17_2_arr';
+END;
+$$ LANGUAGE plpgsql;

From 274b5056add4f68f395f3d80d2c3249b0a6216ec Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 29 Apr 2024 11:18:29 -0400
Subject: [PATCH 0133/1141] Fix failing tests

---
 .../sheet/selection/__tests__/Plane.test.ts   | 62 ++++++++++---------
 .../components/sheet/tests/cellIds.test.ts    | 27 --------
 2 files changed, 32 insertions(+), 57 deletions(-)
 delete mode 100644 mathesar_ui/src/components/sheet/tests/cellIds.test.ts

diff --git a/mathesar_ui/src/components/sheet/selection/__tests__/Plane.test.ts b/mathesar_ui/src/components/sheet/selection/__tests__/Plane.test.ts
index dd6b89500c..e601653a4a 100644
--- a/mathesar_ui/src/components/sheet/selection/__tests__/Plane.test.ts
+++ b/mathesar_ui/src/components/sheet/selection/__tests__/Plane.test.ts
@@ -6,53 +6,55 @@ test('Plane with placeholder row', () => {
   const p = new Plane(
     new Series(['r1', 'r2', 'r3', 'r4']),
     new Series(['c1', 'c2', 'c3', 'c4']),
-    'PL',
+    'PH',
   );
 
   expect([...p.allDataCells()]).toEqual([
-    'r1-c1',
-    'r1-c2',
-    'r1-c3',
-    'r1-c4',
-    'r2-c1',
-    'r2-c2',
-    'r2-c3',
-    'r2-c4',
-    'r3-c1',
-    'r3-c2',
-    'r3-c3',
-    'r3-c4',
-    'r4-c1',
-    'r4-c2',
-    'r4-c3',
-    'r4-c4',
+    '["r1","c1"]',
+    '["r1","c2"]',
+    '["r1","c3"]',
+    '["r1","c4"]',
+    '["r2","c1"]',
+    '["r2","c2"]',
+    '["r2","c3"]',
+    '["r2","c4"]',
+    '["r3","c1"]',
+    '["r3","c2"]',
+    '["r3","c3"]',
+    '["r3","c4"]',
+    '["r4","c1"]',
+    '["r4","c2"]',
+    '["r4","c3"]',
+    '["r4","c4"]',
   ]);
 
   expect([...p.dataCellsInFlexibleRowRange('r1', 'r2')].length).toBe(8);
   expect([...p.dataCellsInFlexibleRowRange('r1', 'r3')].length).toBe(12);
   expect([...p.dataCellsInFlexibleRowRange('r3', 'r4')].length).toBe(8);
-  expect([...p.dataCellsInFlexibleRowRange('r3', 'PL')].length).toBe(8);
-  expect([...p.dataCellsInFlexibleRowRange('PL', 'PL')]).toEqual([
-    'r4-c1',
-    'r4-c2',
-    'r4-c3',
-    'r4-c4',
+  expect([...p.dataCellsInFlexibleRowRange('r3', 'PH')].length).toBe(8);
+  expect([...p.dataCellsInFlexibleRowRange('PH', 'PH')]).toEqual([
+    '["r4","c1"]',
+    '["r4","c2"]',
+    '["r4","c3"]',
+    '["r4","c4"]',
   ]);
 
   expect([...p.dataCellsInColumnRange('c1', 'c2')].length).toBe(8);
   expect([...p.dataCellsInColumnRange('c1', 'c3')].length).toBe(12);
 
-  expect(p.getAdjacentCell('r4-c4', Direction.Up)).toEqual({
+  expect(p.getAdjacentCell('["r4","c4"]', Direction.Up)).toEqual({
     type: 'dataCell',
-    cellId: 'r3-c4',
+    cellId: '["r3","c4"]',
   });
-  expect(p.getAdjacentCell('r4-c4', Direction.Right)).toEqual({ type: 'none' });
-  expect(p.getAdjacentCell('r4-c4', Direction.Down)).toEqual({
+  expect(p.getAdjacentCell('["r4","c4"]', Direction.Right)).toEqual({
+    type: 'none',
+  });
+  expect(p.getAdjacentCell('["r4","c4"]', Direction.Down)).toEqual({
     type: 'placeholderCell',
-    cellId: 'PL-c4',
+    cellId: '["PH","c4"]',
   });
-  expect(p.getAdjacentCell('r4-c4', Direction.Left)).toEqual({
+  expect(p.getAdjacentCell('["r4","c4"]', Direction.Left)).toEqual({
     type: 'dataCell',
-    cellId: 'r4-c3',
+    cellId: '["r4","c3"]',
   });
 });
diff --git a/mathesar_ui/src/components/sheet/tests/cellIds.test.ts b/mathesar_ui/src/components/sheet/tests/cellIds.test.ts
deleted file mode 100644
index a4c8702b66..0000000000
--- a/mathesar_ui/src/components/sheet/tests/cellIds.test.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { parseCellId } from '../cellIds';
-
-test.each(
-  // prettier-ignore
-  [
-  // cellId    , rowId , columnId
-    ['a-b'     , 'a'   , 'b'    ],
-    ['a-b-c'   , 'a'   , 'b-c'  ],
-    ['a--b'    , 'a'   , '-b'   ],
-    [' a - b ' , ' a ' , ' b '  ],
-    ['-'       , ''    , ''     ],
-    [' - '     , ' '   , ' '    ],
-    ['--'      , ''    , '-'    ],
-    ['-a-b'    , ''    , 'a-b'  ],
-    ['a-'      , 'a'   , ''     ],
-  ],
-)('parseCellId success %#', (cellId, rowId, columnId) => {
-  const result = parseCellId(cellId);
-  expect(result.rowId).toBe(rowId);
-  expect(result.columnId).toBe(columnId);
-});
-
-test.each([[''], ['foobar']])('parseCellId failure %#', (cellId) => {
-  expect(() => {
-    parseCellId(cellId);
-  }).toThrow();
-});

From cee460bfe79fe089e8164880295db0219662d028 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 30 Apr 2024 09:48:17 +0800
Subject: [PATCH 0134/1141] add tests for textual type options

---
 db/sql/test_0_msar.sql | 47 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/db/sql/test_0_msar.sql b/db/sql/test_0_msar.sql
index 6e9bebdf65..6325ec1d7b 100644
--- a/db/sql/test_0_msar.sql
+++ b/db/sql/test_0_msar.sql
@@ -2085,6 +2085,7 @@ CREATE OR REPLACE FUNCTION setup_interval_fields() RETURNS SETOF TEXT AS $$
 BEGIN
 CREATE TABLE manytypes (
     id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
+    -- To fend off likely typos, we check many combinations of field and precision settings.
     ivl_plain interval,
     ivl_yr interval year,
     ivl_mo interval month,
@@ -2113,12 +2114,19 @@ CREATE TABLE manytypes (
     ivl_mi_se6 interval minute to second(6),
     -- Below here is less throrough, more ad-hoc
     ivl_plain_arr interval[],
-    ivl_mi_se6_arr interval minute to second(6)[],
+    ivl_mi_se6_arr interval minute to second(6)[2][2],
     num_plain numeric,
     num_8 numeric(8),
     num_17_2 numeric(17, 2),
     num_plain_arr numeric[],
-    num_17_2_arr numeric(17, 2)[]
+    num_17_2_arr numeric(17, 2)[],
+    var_plain varchar,
+    var_16 varchar(16),
+    var_255 varchar(255),
+    cha_1 character,
+    cha_20 character(20),
+    var_16_arr varchar(16)[],
+    cha_20_arr character(20)[][]
 );
 END;
 $$ LANGUAGE plpgsql;
@@ -2226,5 +2234,40 @@ BEGIN
     '{"precision": 17, "scale": 2, "item_type": "numeric"}'::jsonb
   )
   FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='num_17_2_arr';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"length": null}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='var_plain';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"length": 16}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='var_16';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"length": 255}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='var_255';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"length": 1}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='cha_1';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"length": 20}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='cha_20';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"length": 16, "item_type": "character varying"}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='var_16_arr';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"length": 20, "item_type": "character"}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='cha_20_arr';
 END;
 $$ LANGUAGE plpgsql;

From 1d465b8c82aaa069e4bde67285af587f67b4ab55 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 30 Apr 2024 10:30:51 +0800
Subject: [PATCH 0135/1141] move some setup functions into callers for
 efficiency

---
 db/sql/test_0_msar.sql | 137 ++++++++++++++++++++++++++---------------
 1 file changed, 89 insertions(+), 48 deletions(-)

diff --git a/db/sql/test_0_msar.sql b/db/sql/test_0_msar.sql
index 6325ec1d7b..c5cecb832c 100644
--- a/db/sql/test_0_msar.sql
+++ b/db/sql/test_0_msar.sql
@@ -3,7 +3,7 @@ CREATE EXTENSION IF NOT EXISTS pgtap;
 
 -- msar.drop_columns -------------------------------------------------------------------------------
 
-CREATE OR REPLACE FUNCTION setup_drop_columns() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION __setup_drop_columns() RETURNS SETOF TEXT AS $$
 BEGIN
   CREATE TABLE atable (dodrop1 integer, dodrop2 integer, dontdrop text);
 END;
@@ -14,6 +14,7 @@ CREATE OR REPLACE FUNCTION test_drop_columns_oid() RETURNS SETOF TEXT AS $$
 DECLARE
   rel_id oid;
 BEGIN
+  PERFORM __setup_drop_columns();
   rel_id := 'atable'::regclass::oid;
   PERFORM msar.drop_columns(rel_id, 1, 2);
   RETURN NEXT has_column(
@@ -31,6 +32,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_drop_columns_names() RETURNS SETOF TEXT AS $$
 BEGIN
+  PERFORM __setup_drop_columns();
   PERFORM msar.drop_columns('public', 'atable', 'dodrop1', 'dodrop2');
   RETURN NEXT has_column(
     'atable', 'dontdrop', 'Dropper keeps correct columns'
@@ -47,7 +49,7 @@ $$ LANGUAGE plpgsql;
 
 -- msar.drop_table ---------------------------------------------------------------------------------
 
-CREATE OR REPLACE FUNCTION setup_drop_tables() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION __setup_drop_tables() RETURNS SETOF TEXT AS $$
 BEGIN
   CREATE TABLE dropme (id SERIAL PRIMARY KEY, col1 integer);
 END;
@@ -57,6 +59,7 @@ CREATE OR REPLACE FUNCTION test_drop_table_oid() RETURNS SETOF TEXT AS $$
 DECLARE
   rel_id oid;
 BEGIN
+  PERFORM __setup_drop_tables();
   rel_id := 'dropme'::regclass::oid;
   PERFORM msar.drop_table(tab_id => rel_id, cascade_ => false, if_exists => false);
   RETURN NEXT hasnt_table('dropme', 'Drops table');
@@ -68,6 +71,7 @@ CREATE OR REPLACE FUNCTION test_drop_table_oid_if_exists() RETURNS SETOF TEXT AS
 DECLARE
   rel_id oid;
 BEGIN
+  PERFORM __setup_drop_tables();
   rel_id := 'dropme'::regclass::oid;
   PERFORM msar.drop_table(tab_id => rel_id, cascade_ => false, if_exists => true);
   RETURN NEXT hasnt_table('dropme', 'Drops table with IF EXISTS');
@@ -79,6 +83,7 @@ CREATE OR REPLACE FUNCTION test_drop_table_oid_restricted_fkey() RETURNS SETOF T
 DECLARE
   rel_id oid;
 BEGIN
+  PERFORM __setup_drop_tables();
   rel_id := 'dropme'::regclass::oid;
   CREATE TABLE
     dependent (id SERIAL PRIMARY KEY, col1 integer REFERENCES dropme);
@@ -96,6 +101,7 @@ CREATE OR REPLACE FUNCTION test_drop_table_oid_cascade_fkey() RETURNS SETOF TEXT
 DECLARE
   rel_id oid;
 BEGIN
+  PERFORM __setup_drop_tables();
   rel_id := 'dropme'::regclass::oid;
   CREATE TABLE
     dependent (id SERIAL PRIMARY KEY, col1 integer REFERENCES dropme);
@@ -107,6 +113,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_drop_table_name() RETURNS SETOF TEXT AS $$
 BEGIN
+  PERFORM __setup_drop_tables();
   PERFORM msar.drop_table(
     sch_name => 'public',
     tab_name => 'dropme',
@@ -120,6 +127,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_drop_table_name_missing_if_exists() RETURNS SETOF TEXT AS $$
 BEGIN
+  PERFORM __setup_drop_tables();
   PERFORM msar.drop_table(
     sch_name => 'public',
     tab_name => 'dropmenew',
@@ -201,7 +209,7 @@ $f$ LANGUAGE plpgsql;
 
 -- msar.add_columns --------------------------------------------------------------------------------
 
-CREATE OR REPLACE FUNCTION setup_add_columns() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION __setup_add_columns() RETURNS SETOF TEXT AS $$
 BEGIN
   CREATE TABLE add_col_testable (id serial primary key, col1 integer, col2 varchar);
 END;
@@ -215,6 +223,7 @@ DECLARE
       {"name": "tcol", "type": {"name": "text"}, "not_null": true, "default": "my super default"}
     ]$j$;
 BEGIN
+  PERFORM __setup_add_columns();
   RETURN NEXT is(
     msar.add_columns('add_col_testable'::regclass::oid, col_create_arr), '{4}'::smallint[]
   );
@@ -233,6 +242,7 @@ default value. The name should be "Column <n>", where <n> is the attnum of the a
 DECLARE
   col_create_arr jsonb := '[{"type": {"name": "text"}}]';
 BEGIN
+  PERFORM __setup_add_columns();
   PERFORM msar.add_columns('add_col_testable'::regclass::oid, col_create_arr);
   RETURN NEXT col_is_null('add_col_testable', 'Column 4');
   RETURN NEXT col_type_is('add_col_testable', 'Column 4', 'text');
@@ -245,10 +255,12 @@ CREATE OR REPLACE FUNCTION test_add_columns_comment() RETURNS SETOF TEXT AS $f$
 DECLARE
   col_name text := 'tcol';
   description text := 'Some; comment with a semicolon';
-  tab_id integer := 'add_col_testable'::regclass::oid;
+  tab_id integer;
   col_id integer;
   col_create_arr jsonb;
 BEGIN
+  PERFORM __setup_add_columns();
+  tab_id := 'add_col_testable'::regclass::oid;
   col_create_arr := format('[{"name": "%s", "description": "%s"}]', col_name, description);
   PERFORM msar.add_columns(tab_id, col_create_arr);
   col_id := msar.get_attnum(tab_id, col_name);
@@ -268,6 +280,7 @@ default value. The name should be "Column <n>", where <n> is the attnum of the a
 DECLARE
   col_create_arr jsonb := '[{"type": {"name": "text"}}, {"type": {"name": "numeric"}}]';
 BEGIN
+  PERFORM __setup_add_columns();
   RETURN NEXT is(
     msar.add_columns('add_col_testable'::regclass::oid, col_create_arr), '{4, 5}'::smallint[]
   );
@@ -281,6 +294,7 @@ CREATE OR REPLACE FUNCTION test_add_columns_numeric_def() RETURNS SETOF TEXT AS
 DECLARE
   col_create_arr jsonb := '[{"type": {"name": "numeric"}, "default": 3.14159}]';
 BEGIN
+  PERFORM __setup_add_columns();
   PERFORM msar.add_columns('add_col_testable'::regclass::oid, col_create_arr);
   RETURN NEXT col_type_is('add_col_testable', 'Column 4', 'numeric');
   RETURN NEXT col_default_is('add_col_testable', 'Column 4', 3.14159);
@@ -292,6 +306,7 @@ CREATE OR REPLACE FUNCTION test_add_columns_numeric_prec() RETURNS SETOF TEXT AS
 DECLARE
   col_create_arr jsonb := '[{"type": {"name": "numeric", "options": {"precision": 3}}}]';
 BEGIN
+  PERFORM __setup_add_columns();
   PERFORM msar.add_columns('add_col_testable'::regclass::oid, col_create_arr);
   RETURN NEXT col_type_is('add_col_testable', 'Column 4', 'numeric(3,0)');
 END;
@@ -304,6 +319,7 @@ DECLARE
     {"type": {"name": "numeric", "options": {"precision": 3, "scale": 2}}}
   ]$j$;
 BEGIN
+  PERFORM __setup_add_columns();
   PERFORM msar.add_columns('add_col_testable'::regclass::oid, col_create_arr);
   RETURN NEXT col_type_is('add_col_testable', 'Column 4', 'numeric(3,2)');
 END;
@@ -314,6 +330,7 @@ CREATE OR REPLACE FUNCTION test_add_columns_caps_numeric() RETURNS SETOF TEXT AS
 DECLARE
   col_create_arr jsonb := '[{"type": {"name": "NUMERIC"}}]';
 BEGIN
+  PERFORM __setup_add_columns();
   PERFORM msar.add_columns('add_col_testable'::regclass::oid, col_create_arr);
   RETURN NEXT col_type_is('add_col_testable', 'Column 4', 'numeric');
 END;
@@ -324,6 +341,7 @@ CREATE OR REPLACE FUNCTION test_add_columns_varchar_length() RETURNS SETOF TEXT
 DECLARE
   col_create_arr jsonb := '[{"type": {"name": "varchar", "options": {"length": 128}}}]';
 BEGIN
+  PERFORM __setup_add_columns();
   PERFORM msar.add_columns('add_col_testable'::regclass::oid, col_create_arr);
   RETURN NEXT col_type_is('add_col_testable', 'Column 4', 'character varying(128)');
 END;
@@ -333,45 +351,48 @@ CREATE OR REPLACE FUNCTION test_add_columns_interval_precision() RETURNS SETOF T
 DECLARE
   col_create_arr jsonb := '[{"type": {"name": "interval", "options": {"precision": 6}}}]';
 BEGIN
+  PERFORM __setup_add_columns();
   PERFORM msar.add_columns('add_col_testable'::regclass::oid, col_create_arr);
   RETURN NEXT col_type_is('add_col_testable', 'Column 4', 'interval(6)');
 END;
 $f$ LANGUAGE plpgsql;
 
 
--- upstream pgTAP bug: https://github.com/theory/pgtap/issues/315
--- CREATE OR REPLACE FUNCTION test_add_columns_interval_fields() RETURNS SETOF TEXT AS $f$
--- DECLARE
---   col_create_arr jsonb := '[{"type": {"name": "interval", "options": {"fields": "year"}}}]';
--- BEGIN
---   PERFORM msar.add_columns('add_col_testable'::regclass::oid, col_create_arr);
---   RETURN NEXT col_type_is('add_col_testable', 'Column 4', 'interval year');
--- END;
--- $f$ LANGUAGE plpgsql;
---
---
--- CREATE OR REPLACE FUNCTION test_add_columns_interval_fields_prec() RETURNS SETOF TEXT AS $f$
--- DECLARE
---   col_create_arr jsonb := $j$
---     [{"type": {"name": "interval", "options": {"fields": "second", "precision": 3}}}]
---   $j$;
--- BEGIN
---   PERFORM msar.add_columns('add_col_testable'::regclass::oid, col_create_arr);
---   RETURN NEXT col_type_is('add_col_testable', 'Column 4', 'interval second(3)');
--- END;
--- $f$ LANGUAGE plpgsql;
---
---
--- CREATE OR REPLACE FUNCTION test_add_columns_timestamp_prec() RETURNS SETOF TEXT AS $f$
--- DECLARE
---   col_create_arr jsonb := $j$
---     [{"type": {"name": "timestamp", "options": {"precision": 3}}}]
---   $j$;
--- BEGIN
---   PERFORM msar.add_columns('add_col_testable'::regclass::oid, col_create_arr);
---   RETURN NEXT col_type_is('add_col_testable', 'Column 4', 'timestamp(3) without time zone');
--- END;
--- $f$ LANGUAGE plpgsql;
+CREATE OR REPLACE FUNCTION test_add_columns_interval_fields() RETURNS SETOF TEXT AS $f$
+DECLARE
+  col_create_arr jsonb := '[{"type": {"name": "interval", "options": {"fields": "year"}}}]';
+BEGIN
+  PERFORM __setup_add_columns();
+  PERFORM msar.add_columns('add_col_testable'::regclass::oid, col_create_arr);
+  RETURN NEXT col_type_is('add_col_testable', 'Column 4', 'interval year');
+END;
+$f$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_add_columns_interval_fields_prec() RETURNS SETOF TEXT AS $f$
+DECLARE
+  col_create_arr jsonb := $j$
+    [{"type": {"name": "interval", "options": {"fields": "second", "precision": 3}}}]
+  $j$;
+BEGIN
+  PERFORM __setup_add_columns();
+  PERFORM msar.add_columns('add_col_testable'::regclass::oid, col_create_arr);
+  RETURN NEXT col_type_is('add_col_testable', 'Column 4', 'interval second(3)');
+END;
+$f$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_add_columns_timestamp_prec() RETURNS SETOF TEXT AS $f$
+DECLARE
+  col_create_arr jsonb := $j$
+    [{"type": {"name": "timestamp", "options": {"precision": 3}}}]
+  $j$;
+BEGIN
+  PERFORM __setup_add_columns();
+  PERFORM msar.add_columns('add_col_testable'::regclass::oid, col_create_arr);
+  RETURN NEXT col_type_is('add_col_testable', 'Column 4', 'timestamp(3) without time zone');
+END;
+$f$ LANGUAGE plpgsql;
 
 
 CREATE OR REPLACE FUNCTION test_add_columns_timestamp_raw_default() RETURNS SETOF TEXT AS $f$
@@ -381,6 +402,7 @@ This test will fail if the default is being sanitized, but will succeed if it's
 DECLARE
   col_create_arr jsonb := '[{"type": {"name": "timestamp"}, "default": "now()::timestamp"}]';
 BEGIN
+  PERFORM __setup_add_columns();
   PERFORM msar.add_columns('add_col_testable'::regclass::oid, col_create_arr, raw_default => true);
   RETURN NEXT col_type_is('add_col_testable', 'Column 4', 'timestamp without time zone');
   RETURN NEXT col_default_is(
@@ -401,6 +423,7 @@ DECLARE
     [{"type": {"name": "text"}, "default": "null; drop table add_col_testable"}]
   $j$;
 BEGIN
+  PERFORM __setup_add_columns();
   PERFORM msar.add_columns('add_col_testable'::regclass::oid, col_create_arr, raw_default => false);
   RETURN NEXT has_table('add_col_testable');
 END;
@@ -409,6 +432,7 @@ $f$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_add_columns_errors() RETURNS SETOF TEXT AS $f$
 BEGIN
+  PERFORM __setup_add_columns();
   RETURN NEXT throws_ok(
     format(
       'SELECT msar.add_columns(tab_id => %s, col_defs => ''%s'');',
@@ -436,7 +460,7 @@ $f$ LANGUAGE plpgsql;
 
 -- msar.copy_column --------------------------------------------------------------------------------
 
-CREATE OR REPLACE FUNCTION setup_copy_column() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION __setup_copy_column() RETURNS SETOF TEXT AS $$
 BEGIN
   CREATE TABLE copy_coltest (
     id SERIAL PRIMARY KEY,
@@ -460,6 +484,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_copy_column_copies_unique() RETURNS SETOF TEXT AS $f$
 BEGIN
+  PERFORM __setup_copy_column();
   PERFORM msar.copy_column(
     'copy_coltest'::regclass::oid, 2::smallint, 'col1 supercopy', true, true
   );
@@ -481,6 +506,7 @@ $f$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_copy_column_copies_unique_and_nnull() RETURNS SETOF TEXT AS $f$
 BEGIN
+  PERFORM __setup_copy_column();
   PERFORM msar.copy_column(
     'copy_coltest'::regclass::oid, 3::smallint, null, true, true
   );
@@ -502,6 +528,7 @@ $f$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_copy_column_false_copy_data_and_con() RETURNS SETOF TEXT AS $f$
 BEGIN
+  PERFORM __setup_copy_column();
   PERFORM msar.copy_column(
     'copy_coltest'::regclass::oid, 3::smallint, null, false, false
   );
@@ -518,6 +545,7 @@ $f$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_copy_column_num_options_static_default() RETURNS SETOF TEXT AS $f$
 BEGIN
+  PERFORM __setup_copy_column();
   PERFORM msar.copy_column(
     'copy_coltest'::regclass::oid, 4::smallint, null, true, false
   );
@@ -534,6 +562,7 @@ $f$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_copy_column_nullable_dynamic_default() RETURNS SETOF TEXT AS $f$
 BEGIN
+  PERFORM __setup_copy_column();
   PERFORM msar.copy_column(
     'copy_coltest'::regclass::oid, 5::smallint, null, true, false
   );
@@ -546,6 +575,7 @@ $f$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_copy_column_non_null_dynamic_default() RETURNS SETOF TEXT AS $f$
 BEGIN
+  PERFORM __setup_copy_column();
   PERFORM msar.copy_column(
     'copy_coltest'::regclass::oid, 6::smallint, null, true, true
   );
@@ -556,19 +586,20 @@ END;
 $f$ LANGUAGE plpgsql;
 
 
--- upstream pgTAP bug: https://github.com/theory/pgtap/issues/315
--- CREATE OR REPLACE FUNCTION test_copy_column_interval_notation() RETURNS SETOF TEXT AS $f$
--- BEGIN
---   PERFORM msar.copy_column(
---     'copy_coltest'::regclass::oid, 7::smallint, null, false, false
---   );
---   RETURN NEXT col_type_is('copy_coltest', 'col6 1', 'interval second(3)');
--- END;
--- $f$ LANGUAGE plpgsql;
+CREATE OR REPLACE FUNCTION test_copy_column_interval_notation() RETURNS SETOF TEXT AS $f$
+BEGIN
+  PERFORM __setup_copy_column();
+  PERFORM msar.copy_column(
+    'copy_coltest'::regclass::oid, 7::smallint, null, false, false
+  );
+  RETURN NEXT col_type_is('copy_coltest', 'col6 1', 'interval second(3)');
+END;
+$f$ LANGUAGE plpgsql;
 
 
 CREATE OR REPLACE FUNCTION test_copy_column_space_name() RETURNS SETOF TEXT AS $f$
 BEGIN
+  PERFORM __setup_copy_column();
   PERFORM msar.copy_column(
     'copy_coltest'::regclass::oid, 8::smallint, null, false, false
   );
@@ -579,6 +610,7 @@ $f$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_copy_column_pkey() RETURNS SETOF TEXT AS $f$
 BEGIN
+  PERFORM __setup_copy_column();
   PERFORM msar.copy_column(
     'copy_coltest'::regclass::oid, 1::smallint, null, true, true
   );
@@ -595,6 +627,7 @@ $f$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_copy_column_increment_name() RETURNS SETOF TEXT AS $f$
 BEGIN
+  PERFORM __setup_copy_column();
   PERFORM msar.copy_column(
     'copy_coltest'::regclass::oid, 2::smallint, null, true, true
   );
@@ -608,7 +641,7 @@ $f$ LANGUAGE plpgsql;
 
 -- msar.add_constraints ----------------------------------------------------------------------------
 
-CREATE OR REPLACE FUNCTION setup_add_pkey() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION __setup_add_pkey() RETURNS SETOF TEXT AS $$
 BEGIN
   CREATE TABLE add_pkeytest (col1 serial, col2 serial, col3 text);
   INSERT INTO add_pkeytest (col1, col2, col3) VALUES
@@ -631,6 +664,7 @@ DECLARE
   created_name text;
   deferrable_ boolean;
 BEGIN
+  PERFORM __setup_add_pkey();
   PERFORM msar.add_constraints('add_pkeytest'::regclass::oid, con_create_arr);
   RETURN NEXT col_is_pk('add_pkeytest', 'col1');
   created_name := conname FROM pg_constraint
@@ -647,6 +681,7 @@ DECLARE
   con_create_arr jsonb := '[{"type": "p", "columns": [1]}]';
   created_name text;
 BEGIN
+  PERFORM __setup_add_pkey();
   PERFORM msar.add_constraints('add_pkeytest'::regclass::oid, con_create_arr);
   RETURN NEXT col_is_pk('add_pkeytest', 'col1');
   created_name := conname FROM pg_constraint
@@ -661,6 +696,7 @@ DECLARE
   con_create_arr jsonb := '[{"type": "p", "columns": [1, 2]}]';
   created_name text;
 BEGIN
+  PERFORM __setup_add_pkey();
   PERFORM msar.add_constraints('add_pkeytest'::regclass::oid, con_create_arr);
   RETURN NEXT col_is_pk('add_pkeytest', ARRAY['col1', 'col2']);
   created_name := conname FROM pg_constraint
@@ -674,6 +710,7 @@ CREATE OR REPLACE FUNCTION test_add_constraint_pkey_tab_name_singlecol() RETURNS
 DECLARE
   con_create_arr jsonb := '[{"type": "p", "columns": [1]}]';
 BEGIN
+  PERFORM __setup_add_pkey();
   PERFORM msar.add_constraints('public', 'add_pkeytest', con_create_arr);
   RETURN NEXT col_is_pk('add_pkeytest', 'col1');
 END;
@@ -684,6 +721,7 @@ CREATE OR REPLACE FUNCTION test_add_constraint_pkey_col_name_singlecol() RETURNS
 DECLARE
   con_create_arr jsonb := '[{"type": "p", "columns": ["col1"]}]';
 BEGIN
+  PERFORM __setup_add_pkey();
   PERFORM msar.add_constraints('add_pkeytest'::regclass::oid, con_create_arr);
   RETURN NEXT col_is_pk('add_pkeytest', 'col1');
 END;
@@ -694,6 +732,7 @@ CREATE OR REPLACE FUNCTION test_add_constraint_pkey_col_name_multicol() RETURNS
 DECLARE
   con_create_arr jsonb := '[{"type": "p", "columns": ["col1", "col2"]}]';
 BEGIN
+  PERFORM __setup_add_pkey();
   PERFORM msar.add_constraints('add_pkeytest'::regclass::oid, con_create_arr);
   RETURN NEXT col_is_pk('add_pkeytest', ARRAY['col1', 'col2']);
 END;
@@ -704,6 +743,7 @@ CREATE OR REPLACE FUNCTION test_add_constraint_pkey_col_mix_multicol() RETURNS S
 DECLARE
   con_create_arr jsonb := '[{"type": "p", "columns": [1, "col2"]}]';
 BEGIN
+  PERFORM __setup_add_pkey();
   PERFORM msar.add_constraints('add_pkeytest'::regclass::oid, con_create_arr);
   RETURN NEXT col_is_pk('add_pkeytest', ARRAY['col1', 'col2']);
 END;
@@ -954,6 +994,7 @@ CREATE OR REPLACE FUNCTION test_add_constraint_errors() RETURNS SETOF TEXT AS $f
 DECLARE
   con_create_arr jsonb := '[{"type": "p", "columns": [7]}]'::jsonb;
 BEGIN
+  PERFORM __setup_add_pkey();
   RETURN NEXT throws_ok(
     format(
       'SELECT msar.add_constraints(%s, ''%s'');',

From fd3077e40e03d9a718fa14f88f04b08f01627104 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 30 Apr 2024 13:36:10 +0800
Subject: [PATCH 0136/1141] move remaining setup functions into callers for
 efficiency

---
 db/sql/test_0_msar.sql | 88 +++++++++++++++++++++++++++++++-----------
 1 file changed, 66 insertions(+), 22 deletions(-)

diff --git a/db/sql/test_0_msar.sql b/db/sql/test_0_msar.sql
index c5cecb832c..a4683f3d1b 100644
--- a/db/sql/test_0_msar.sql
+++ b/db/sql/test_0_msar.sql
@@ -750,7 +750,7 @@ END;
 $f$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION setup_add_fkey() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION __setup_add_fkey() RETURNS SETOF TEXT AS $$
 BEGIN
   CREATE TABLE add_fk_users (id serial primary key, fname TEXT, lname TEXT, phoneno TEXT);
   INSERT INTO add_fk_users (fname, lname, phoneno) VALUES
@@ -776,6 +776,7 @@ CREATE OR REPLACE FUNCTION test_add_constraint_fkey_id_fullspec() RETURNS SETOF
 DECLARE
   con_create_arr jsonb;
 BEGIN
+  PERFORM __setup_add_fkey();
   con_create_arr := format(
     $j$[
       {
@@ -809,6 +810,7 @@ CREATE OR REPLACE FUNCTION fkey_options_eq("char", "char", "char") RETURNS TEXT
 DECLARE
   con_create_arr jsonb;
 BEGIN
+  PERFORM __setup_add_fkey();
   con_create_arr := format(
     $j$[
       {
@@ -847,7 +849,7 @@ $f$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_add_constraints_fkey_opts_aas() RETURNS SETOF TEXT AS $f$
 BEGIN
-  RETURN NEXT fkey_options_eq('a', 'a', 's');
+  PERFORM fkey_options_eq('a', 'a', 's');
   RETURN NEXT fk_ok(
     'public', 'add_fk_comments', 'user_id', 'public', 'add_fk_users', 'id'
   );
@@ -857,7 +859,7 @@ $f$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_add_constraints_fkey_opts_arf() RETURNS SETOF TEXT AS $f$
 BEGIN
-  RETURN NEXT fkey_options_eq('a', 'r', 'f');
+  PERFORM fkey_options_eq('a', 'r', 'f');
   RETURN NEXT fk_ok(
     'public', 'add_fk_comments', 'user_id', 'public', 'add_fk_users', 'id'
   );
@@ -867,7 +869,7 @@ $f$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_add_constraints_fkey_opts_rrf() RETURNS SETOF TEXT AS $f$
 BEGIN
-  RETURN NEXT fkey_options_eq('r', 'r', 'f');
+  PERFORM fkey_options_eq('r', 'r', 'f');
   RETURN NEXT fk_ok(
     'public', 'add_fk_comments', 'user_id', 'public', 'add_fk_users', 'id'
   );
@@ -877,7 +879,7 @@ $f$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_add_constraints_fkey_opts_rrf() RETURNS SETOF TEXT AS $f$
 BEGIN
-  RETURN NEXT fkey_options_eq('r', 'r', 'f');
+  PERFORM fkey_options_eq('r', 'r', 'f');
   RETURN NEXT fk_ok(
     'public', 'add_fk_comments', 'user_id', 'public', 'add_fk_users', 'id'
   );
@@ -887,7 +889,7 @@ $f$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_add_constraints_fkey_opts_ccf() RETURNS SETOF TEXT AS $f$
 BEGIN
-  RETURN NEXT fkey_options_eq('c', 'c', 'f');
+  PERFORM fkey_options_eq('c', 'c', 'f');
   RETURN NEXT fk_ok(
     'public', 'add_fk_comments', 'user_id', 'public', 'add_fk_users', 'id'
   );
@@ -897,7 +899,7 @@ $f$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_add_constraints_fkey_opts_nnf() RETURNS SETOF TEXT AS $f$
 BEGIN
-  RETURN NEXT fkey_options_eq('n', 'n', 'f');
+  PERFORM fkey_options_eq('n', 'n', 'f');
   RETURN NEXT fk_ok(
     'public', 'add_fk_comments', 'user_id', 'public', 'add_fk_users', 'id'
   );
@@ -907,7 +909,7 @@ $f$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_add_constraints_fkey_opts_ddf() RETURNS SETOF TEXT AS $f$
 BEGIN
-  RETURN NEXT fkey_options_eq('d', 'd', 'f');
+  PERFORM fkey_options_eq('d', 'd', 'f');
   RETURN NEXT fk_ok(
     'public', 'add_fk_comments', 'user_id', 'public', 'add_fk_users', 'id'
   );
@@ -915,7 +917,7 @@ END;
 $f$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION setup_add_unique() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION __setup_add_unique() RETURNS SETOF TEXT AS $$
 BEGIN
   CREATE TABLE add_unique_con (id serial primary key, col1 integer, col2 integer, col3 integer);
   INSERT INTO add_unique_con (col1, col2, col3) VALUES
@@ -930,6 +932,7 @@ CREATE OR REPLACE FUNCTION  test_add_constraints_unique_single() RETURNS SETOF T
 DECLARE
   con_create_arr jsonb := '[{"name": "myuniqcons", "type": "u", "columns": [2]}]';
 BEGIN
+  PERFORM __setup_add_unique();
   PERFORM msar.add_constraints('add_unique_con'::regclass::oid, con_create_arr);
   RETURN NEXT col_is_unique('add_unique_con', ARRAY['col1']);
 END;
@@ -940,6 +943,7 @@ CREATE OR REPLACE FUNCTION  test_add_constraints_unique_multicol() RETURNS SETOF
 DECLARE
   con_create_arr jsonb := '[{"name": "myuniqcons", "type": "u", "columns": [2, 3]}]';
 BEGIN
+  PERFORM __setup_add_unique();
   PERFORM msar.add_constraints('add_unique_con'::regclass::oid, con_create_arr);
   RETURN NEXT col_is_unique('add_unique_con', ARRAY['col1', 'col2']);
 END;
@@ -951,6 +955,7 @@ DECLARE
   con_create_arr jsonb := '[{"name": "myuniqcons", "type": "u", "columns": [2]}]';
   con_create_arr2 jsonb := '[{"name": "myuniqcons", "type": "u", "columns": [3]}]';
 BEGIN
+  PERFORM __setup_add_unique();
   PERFORM msar.add_constraints('add_unique_con'::regclass::oid, con_create_arr);
   RETURN NEXT throws_ok(
     format(
@@ -964,7 +969,7 @@ END;
 $f$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION setup_copy_unique() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION __setup_copy_unique() RETURNS SETOF TEXT AS $$
 BEGIN
   CREATE TABLE copy_unique_con
     (id serial primary key, col1 integer, col2 integer, col3 integer, col4 integer);
@@ -981,6 +986,7 @@ CREATE OR REPLACE FUNCTION test_copy_constraint() RETURNS SETOF TEXT AS $f$
 DECLARE
   orig_oid oid;
 BEGIN
+  PERFORM __setup_copy_unique();
   orig_oid := oid
     FROM pg_constraint
     WHERE conrelid='copy_unique_con'::regclass::oid AND conname='olduniqcon';
@@ -1039,7 +1045,7 @@ $f$ LANGUAGE plpgsql;
 
 -- msar.drop_constraint ---------------------------------------------------------------------------
 
-CREATE OR REPLACE FUNCTION setup_drop_constraint() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION __setup_drop_constraint() RETURNS SETOF TEXT AS $$
 BEGIN
   CREATE TABLE category(
     id serial primary key,
@@ -1059,6 +1065,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_drop_constraint() RETURNS SETOF TEXT AS $$
 BEGIN
+  PERFORM __setup_drop_constraint();
   PERFORM msar.drop_constraint(
     sch_name => 'public',
     tab_name => 'category',
@@ -1082,6 +1089,7 @@ DECLARE
   uq_cat_oid oid;
   fk_cat_oid oid;
 BEGIN
+  PERFORM __setup_drop_constraint();
   uq_cat_oid := oid FROM pg_constraint WHERE conname='uq_cat';
   fk_cat_oid := oid FROM pg_constraint WHERE conname='fk_cat';
   PERFORM msar.drop_constraint(
@@ -1102,7 +1110,7 @@ $$ LANGUAGE plpgsql;
 
 -- msar.create_link -------------------------------------------------------------------------------
 
-CREATE OR REPLACE FUNCTION setup_link_tables() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION __setup_link_tables() RETURNS SETOF TEXT AS $$
 BEGIN
   CREATE TABLE actors (id SERIAL PRIMARY KEY, actor_name text);
   INSERT INTO actors(actor_name) VALUES 
@@ -1124,6 +1132,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_create_many_to_one_link() RETURNS SETOF TEXT AS $$
 BEGIN
+  PERFORM __setup_link_tables();
   PERFORM msar.create_many_to_one_link(
     frel_id => 'actors'::regclass::oid,
     rel_id => 'movies'::regclass::oid,
@@ -1138,6 +1147,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_create_one_to_one_link() RETURNS SETOF TEXT AS $$
 BEGIN
+  PERFORM __setup_link_tables();
   PERFORM msar.create_many_to_one_link(
     frel_id => 'actors'::regclass::oid,
     rel_id => 'movies'::regclass::oid,
@@ -1154,6 +1164,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_create_many_to_many_link() RETURNS SETOF TEXT AS $$
 BEGIN
+  PERFORM __setup_link_tables();
   PERFORM msar.create_many_to_many_link(
     sch_id => 'public'::regnamespace::oid,
     tab_name => 'movies_actors',
@@ -1184,7 +1195,7 @@ END;
 $$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION setup_drop_schema() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION __setup_drop_schema() RETURNS SETOF TEXT AS $$
 BEGIN
   CREATE SCHEMA drop_test_schema;
 END;
@@ -1193,6 +1204,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_drop_schema_if_exists_false() RETURNS SETOF TEXT AS $$
 BEGIN
+  PERFORM __setup_drop_schema();
   PERFORM msar.drop_schema(
     sch_name => 'drop_test_schema', 
     cascade_ => false, 
@@ -1217,6 +1229,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_drop_schema_if_exists_true() RETURNS SETOF TEXT AS $$
 BEGIN
+  PERFORM __setup_drop_schema();
   PERFORM msar.drop_schema(
     sch_name => 'drop_test_schema',
     cascade_ => false,
@@ -1239,6 +1252,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_drop_schema_using_oid() RETURNS SETOF TEXT AS $$
 BEGIN
+  PERFORM __setup_drop_schema();
   PERFORM msar.drop_schema(
     sch_id => 'drop_test_schema'::regnamespace::oid,
     cascade_ => false,
@@ -1249,7 +1263,7 @@ END;
 $$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION setup_schema_with_dependent_obj() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION __setup_schema_with_dependent_obj() RETURNS SETOF TEXT AS $$
 BEGIN
   CREATE SCHEMA schema1;
   CREATE TABLE schema1.actors (
@@ -1262,6 +1276,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_drop_schema_cascade() RETURNS SETOF TEXT AS $$
 BEGIN
+  PERFORM __setup_schema_with_dependent_obj();
   PERFORM msar.drop_schema(
     sch_name => 'schema1',
     cascade_ => true,
@@ -1274,6 +1289,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_drop_schema_restricted() RETURNS SETOF TEXT AS $$
 BEGIN
+  PERFORM __setup_schema_with_dependent_obj();
   RETURN NEXT throws_ok(
     format(
       'SELECT msar.drop_schema(
@@ -1290,7 +1306,7 @@ END;
 $$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION setup_alter_schema() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION __setup_alter_schema() RETURNS SETOF TEXT AS $$
 BEGIN
   CREATE SCHEMA alter_me;
 END;
@@ -1299,6 +1315,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_rename_schema() RETURNS SETOF TEXT AS $$
 BEGIN
+  PERFORM __setup_alter_schema();
   PERFORM msar.rename_schema(
     old_sch_name => 'alter_me',
     new_sch_name => 'altered'
@@ -1311,6 +1328,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_rename_schema_using_oid() RETURNS SETOF TEXT AS $$
 BEGIN
+  PERFORM __setup_alter_schema();
   PERFORM msar.rename_schema(
     sch_id => 'alter_me'::regnamespace::oid,
     new_sch_name => 'altered'
@@ -1323,6 +1341,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_comment_on_schema() RETURNS SETOF TEXT AS $$
 BEGIN
+  PERFORM __setup_alter_schema();
   PERFORM msar.comment_on_schema(
     sch_name => 'alter_me',
     comment_ => 'test comment'
@@ -1334,7 +1353,7 @@ $$ LANGUAGE plpgsql;
 
 -- msar.alter_table
 
-CREATE OR REPLACE FUNCTION setup_alter_table() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION __setup_alter_table() RETURNS SETOF TEXT AS $$
 BEGIN
   CREATE TABLE alter_this_table(id INT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, col1 TEXT);
 END;
@@ -1343,6 +1362,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_rename_table() RETURNS SETOF TEXT AS $$
 BEGIN
+  PERFORM __setup_alter_table();
   PERFORM msar.rename_table(
     sch_name =>'public',
     old_tab_name => 'alter_this_table',
@@ -1356,6 +1376,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_rename_table_using_oid() RETURNS SETOF TEXT AS $$
 BEGIN
+  PERFORM __setup_alter_table();
   PERFORM msar.rename_table(
     tab_id => 'alter_this_table'::regclass::oid,
     new_tab_name => 'renamed_table'
@@ -1368,6 +1389,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_comment_on_table() RETURNS SETOF TEXT AS $$
 BEGIN
+  PERFORM __setup_alter_table();
   PERFORM msar.comment_on_table(
     sch_name =>'public',
     tab_name => 'alter_this_table',
@@ -1380,6 +1402,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_comment_on_table_using_oid() RETURNS SETOF TEXT AS $$
 BEGIN
+  PERFORM __setup_alter_table();
   PERFORM msar.comment_on_table(
     tab_id => 'alter_this_table'::regclass::oid,
     comment_ => 'This is a comment!'
@@ -1391,7 +1414,7 @@ $$ LANGUAGE plpgsql;
 
 -- msar.add_mathesar_table
 
-CREATE OR REPLACE FUNCTION setup_create_table() RETURNS SETOF TEXT AS $f$
+CREATE OR REPLACE FUNCTION __setup_create_table() RETURNS SETOF TEXT AS $f$
 BEGIN
   CREATE SCHEMA tab_create_schema;
 END;
@@ -1400,6 +1423,7 @@ $f$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_add_mathesar_table_minimal_id_col() RETURNS SETOF TEXT AS $f$
 BEGIN
+  PERFORM __setup_create_table();
   PERFORM msar.add_mathesar_table(
     'tab_create_schema'::regnamespace::oid, 'anewtable', null, null, null
   );
@@ -1421,6 +1445,7 @@ CREATE OR REPLACE FUNCTION test_add_mathesar_table_badname() RETURNS SETOF TEXT
 DECLARE
   badname text := $b$M"new"'dsf' \t"$b$;
 BEGIN
+  PERFORM __setup_create_table();
   PERFORM msar.add_mathesar_table(
     'tab_create_schema'::regnamespace::oid, badname, null, null, null
   );
@@ -1437,6 +1462,7 @@ DECLARE
     {"type": {"name": "varchar", "options": {"length": 128}}}
   ]$j$;
 BEGIN
+  PERFORM __setup_create_table();
   PERFORM msar.add_mathesar_table(
     'tab_create_schema'::regnamespace::oid,
     'cols_table',
@@ -1460,6 +1486,7 @@ CREATE OR REPLACE FUNCTION test_add_mathesar_table_comment() RETURNS SETOF TEXT
 DECLARE
   comment_ text := $c$my "Super;";'; DROP SCHEMA tab_create_schema;'$c$;
 BEGIN
+  PERFORM __setup_create_table();
   PERFORM msar.add_mathesar_table(
     'tab_create_schema'::regnamespace::oid, 'cols_table', null, null, comment_
   );
@@ -1475,7 +1502,7 @@ END;
 $f$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION setup_column_alter() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION __setup_column_alter() RETURNS SETOF TEXT AS $$
 BEGIN
   CREATE TABLE col_alters (
     id integer GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
@@ -1501,6 +1528,7 @@ development, and runs quickly.
 DECLARE
   tab_id oid;
 BEGIN
+  PERFORM __setup_column_alter();
   tab_id := 'col_alters'::regclass::oid;
   RETURN NEXT is(msar.process_col_alter_jsonb(tab_id, '[{"attnum": 2}]'), null);
   RETURN NEXT is(msar.process_col_alter_jsonb(tab_id, '[{"attnum": 2, "name": "blah"}]'), null);
@@ -1513,6 +1541,7 @@ CREATE OR REPLACE FUNCTION test_alter_columns_single_name() RETURNS SETOF TEXT A
 DECLARE
   col_alters_jsonb jsonb := '[{"attnum": 2, "name": "blah"}]';
 BEGIN
+  PERFORM __setup_column_alter();
   RETURN NEXT is(msar.alter_columns('col_alters'::regclass::oid, col_alters_jsonb), ARRAY[2]);
   RETURN NEXT columns_are(
     'col_alters',
@@ -1529,6 +1558,7 @@ DECLARE
     {"attnum": 4, "name": "nospace"}
   ]$j$;
 BEGIN
+  PERFORM __setup_column_alter();
   RETURN NEXT is(msar.alter_columns('col_alters'::regclass::oid, col_alters_jsonb), ARRAY[2, 4]);
   RETURN NEXT columns_are(
     'col_alters',
@@ -1546,6 +1576,7 @@ DECLARE
     {"attnum": 4, "type": {"name": "integer"}}
   ]$j$;
 BEGIN
+  PERFORM __setup_column_alter();
   RETURN NEXT is(msar.alter_columns('col_alters'::regclass::oid, col_alters_jsonb), ARRAY[2, 3, 4]);
   RETURN NEXT col_type_is('col_alters', 'col1', 'character varying(48)');
   RETURN NEXT col_type_is('col_alters', 'col2', 'integer');
@@ -1561,6 +1592,7 @@ DECLARE
     {"attnum": 5, "type": {"options": {"precision": 4}}}
   ]$j$;
 BEGIN
+  PERFORM __setup_column_alter();
   RETURN NEXT is(msar.alter_columns('col_alters'::regclass::oid, col_alters_jsonb), ARRAY[5]);
   RETURN NEXT col_type_is('col_alters', 'col_opts', 'numeric(4,0)');
 END;
@@ -1574,6 +1606,7 @@ DECLARE
     {"attnum": 5, "delete": true}
   ]$j$;
 BEGIN
+  PERFORM __setup_column_alter();
   RETURN NEXT is(msar.alter_columns('col_alters'::regclass::oid, col_alters_jsonb), ARRAY[2, 5]);
   RETURN NEXT columns_are('col_alters', ARRAY['id', 'col2', 'Col sp', 'coltim']);
 END;
@@ -1587,6 +1620,7 @@ DECLARE
     {"attnum": 5, "not_null": true}
   ]$j$;
 BEGIN
+  PERFORM __setup_column_alter();
   RETURN NEXT is(msar.alter_columns('col_alters'::regclass::oid, col_alters_jsonb), ARRAY[2, 5]);
   RETURN NEXT col_is_null('col_alters', 'col1');
   RETURN NEXT col_not_null('col_alters', 'col_opts');
@@ -1601,6 +1635,7 @@ DECLARE
     {"attnum": 6, "type": {"name": "date"}}
   ]$j$;
 BEGIN
+  PERFORM __setup_column_alter();
   RETURN NEXT is(msar.alter_columns('col_alters'::regclass::oid, col_alters_jsonb), ARRAY[3, 6]);
   RETURN NEXT col_default_is('col_alters', 'col2', '5');
   RETURN NEXT col_default_is('col_alters', 'coltim', '(now())::date');
@@ -1615,6 +1650,7 @@ DECLARE
     {"attnum": 6, "type": {"name": "date"}, "default": null}
   ]$j$;
 BEGIN
+  PERFORM __setup_column_alter();
   RETURN NEXT is(msar.alter_columns('col_alters'::regclass::oid, col_alters_jsonb), ARRAY[3, 6]);
   RETURN NEXT col_hasnt_default('col_alters', 'col2');
   RETURN NEXT col_hasnt_default('col_alters', 'coltim');
@@ -1631,6 +1667,7 @@ DECLARE
     {"attnum": 6, "type": {"name": "text"}, "default": "test12"}
   ]$j$;
 BEGIN
+  PERFORM __setup_column_alter();
   RETURN NEXT is(
     msar.alter_columns('col_alters'::regclass::oid, col_alters_jsonb),
     ARRAY[2, 3, 5, 6]
@@ -1659,6 +1696,7 @@ DECLARE
     {"attnum": 6, "name": "timecol", "not_null": true}
   ]$j$;
 BEGIN
+  PERFORM __setup_column_alter();
   RETURN NEXT is(
     msar.alter_columns('col_alters'::regclass::oid, col_alters_jsonb), ARRAY[2, 3, 4, 5, 6]
   );
@@ -1722,6 +1760,7 @@ DECLARE
     }
   ]$j$;
 BEGIN
+  PERFORM __setup_column_alter();
   RETURN NEXT is(msar.col_description('col_alters'::regclass::oid, 2), NULL);
   PERFORM msar.alter_columns('col_alters'::regclass::oid, change1);
   RETURN NEXT is(msar.col_description('col_alters'::regclass::oid, 2), 'change1col2description');
@@ -1737,7 +1776,7 @@ END;
 $$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION setup_roster() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION __setup_roster() RETURNS SETOF TEXT AS $$
 BEGIN
 CREATE TABLE "Roster" (
     id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
@@ -2006,6 +2045,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_extract_columns_data() RETURNS SETOF TEXT AS $f$
 BEGIN
+  PERFORM __setup_roster();
   CREATE TABLE roster_snapshot AS SELECT * FROM "Roster" ORDER BY id;
   PERFORM msar.extract_columns_from_table('"Roster"'::regclass::oid, ARRAY[3, 4], 'Teachers', null);
   RETURN NEXT columns_are('Teachers', ARRAY['id', 'Teacher', 'Teacher Email']);
@@ -2039,7 +2079,7 @@ END;
 $f$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION setup_extract_fkey_cols() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION __setup_extract_fkey_cols() RETURNS SETOF TEXT AS $$
 BEGIN
 CREATE TABLE "Referent" (
     id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
@@ -2059,6 +2099,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_extract_columns_keeps_fkey() RETURNS SETOF TEXT AS $f$
 BEGIN
+  PERFORM __setup_extract_fkey_cols();
   PERFORM msar.extract_columns_from_table(
     '"Referrer"'::regclass::oid, ARRAY[3, 5], 'Classes', 'Class'
   );
@@ -2071,7 +2112,7 @@ END;
 $f$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION setup_dynamic_defaults() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION __setup_dynamic_defaults() RETURNS SETOF TEXT AS $$
 BEGIN
   CREATE TABLE defaults_test (
     id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
@@ -2089,6 +2130,7 @@ CREATE OR REPLACE FUNCTION test_is_possibly_dynamic() RETURNS SETOF TEXT AS $$
 DECLARE
   tab_id oid;
 BEGIN
+  PERFORM __setup_dynamic_defaults();
   tab_id := 'defaults_test'::regclass::oid;
   RETURN NEXT is(msar.is_default_possibly_dynamic(tab_id, 1), true);
   RETURN NEXT is(msar.is_default_possibly_dynamic(tab_id, 2), false);
@@ -2122,7 +2164,7 @@ END;
 $$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION setup_interval_fields() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION __setup_manytypes() RETURNS SETOF TEXT AS $$
 BEGIN
 CREATE TABLE manytypes (
     id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
@@ -2175,6 +2217,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_get_interval_fields() RETURNS SETOF TEXT AS $$
 BEGIN
+  PERFORM __setup_manytypes();
   RETURN NEXT results_eq(
     $h$
     SELECT msar.get_interval_fields(atttypmod)
@@ -2218,6 +2261,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_get_type_options() RETURNS SETOF TEXT AS $$
 BEGIN
+  PERFORM __setup_manytypes();
   RETURN NEXT is(msar.get_type_options(atttypid, atttypmod, attndims), NULL)
   FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='id';
   RETURN NEXT is(

From d44c0b8a760886262e85b0e5e6f5e72aa7399589 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 30 Apr 2024 15:10:19 +0800
Subject: [PATCH 0137/1141] add get_column_info test

---
 db/sql/test_0_msar.sql | 213 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 212 insertions(+), 1 deletion(-)

diff --git a/db/sql/test_0_msar.sql b/db/sql/test_0_msar.sql
index a4683f3d1b..40c2d7c5ab 100644
--- a/db/sql/test_0_msar.sql
+++ b/db/sql/test_0_msar.sql
@@ -2164,6 +2164,8 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+-- msar.get_column_info (and related) --------------------------------------------------------------
+
 CREATE OR REPLACE FUNCTION __setup_manytypes() RETURNS SETOF TEXT AS $$
 BEGIN
 CREATE TABLE manytypes (
@@ -2209,7 +2211,13 @@ CREATE TABLE manytypes (
     cha_1 character,
     cha_20 character(20),
     var_16_arr varchar(16)[],
-    cha_20_arr character(20)[][]
+    cha_20_arr character(20)[][],
+    bit_8 bit(8),
+    vbt_8 varbit(8),
+    tim_2 time(2),
+    ttz_3 timetz(3),
+    tsp_4 timestamp(4),
+    tsz_5 timestamptz(5)
 );
 END;
 $$ LANGUAGE plpgsql;
@@ -2354,5 +2362,208 @@ BEGIN
     '{"length": 20, "item_type": "character"}'::jsonb
   )
   FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='cha_20_arr';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"precision": 8}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='bit_8';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"precision": 8}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='vbt_8';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"precision": 2}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='tim_2';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"precision": 3}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='ttz_3';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"precision": 4}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='tsp_4';
+  RETURN NEXT is(
+    msar.get_type_options(atttypid, atttypmod, attndims),
+    '{"precision": 5}'::jsonb
+  )
+  FROM pg_attribute WHERE attrelid='manytypes'::regclass AND attname='tsz_5';
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION __setup_cast_functions() RETURNS SETOF TEXT AS $$
+BEGIN
+  CREATE SCHEMA mathesar_types;
+  CREATE FUNCTION mathesar_types.cast_to_numeric(text) RETURNS numeric AS 'SELECT 5' LANGUAGE SQL;
+  CREATE FUNCTION mathesar_types.cast_to_text(text) RETURNS text AS 'SELECT ''5''' LANGUAGE SQL;
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_get_valid_target_type_strings() RETURNS SETOF TEXT AS $$
+BEGIN
+  PERFORM __setup_cast_functions();
+  RETURN NEXT is(msar.get_valid_target_type_strings('text'), '["numeric", "text"]'::jsonb);
+  RETURN NEXT is(
+    msar.get_valid_target_type_strings('text'::regtype::oid), '["numeric", "text"]'::jsonb
+  );
+  RETURN NEXT is(msar.get_valid_target_type_strings('interval'), NULL);
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_has_dependents() RETURNS SETOF TEXT AS $$
+BEGIN
+  PERFORM __setup_extract_fkey_cols();
+  RETURN NEXT is(msar.has_dependents('"Referent"'::regclass::oid, 1::smallint), true);
+  RETURN NEXT is(msar.has_dependents('"Referent"'::regclass::oid, 2::smallint), false);
+  RETURN NEXT is(msar.has_dependents('"Referrer"'::regclass::oid, 1::smallint), false);
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION __setup_get_column_info() RETURNS SETOF TEXT AS $$
+BEGIN
+  PERFORM __setup_cast_functions();
+  CREATE TABLE column_variety (
+    id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
+    num_plain numeric NOT NULL,
+    var_128 varchar(128),
+    txt text DEFAULT 'abc',
+    tst timestamp DEFAULT NOW(),
+    int_arr integer[4][3],
+    num_opt_arr numeric(15, 10)[]
+  );
+  COMMENT ON COLUMN column_variety.txt IS 'A super comment ;';
+  CREATE TABLE needs_cv (
+    id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
+    cv_id integer REFERENCES column_variety(id)
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_get_column_info() RETURNS SETOF TEXT AS $$
+BEGIN
+  PERFORM __setup_get_column_info();
+  RETURN NEXT is(
+    msar.get_column_info('column_variety'),
+    $j$[
+      {
+        "id": 1,
+        "name": "id",
+        "type": "integer",
+        "default": {
+          "value": "identity",
+          "is_dynamic": true
+        },
+        "nullable": false,
+        "description": null,
+        "primary_key": true,
+        "type_options": null,
+        "has_dependents": true,
+        "valid_target_types": null
+      },
+      {
+        "id": 2,
+        "name": "num_plain",
+        "type": "numeric",
+        "default": null,
+        "nullable": false,
+        "description": null,
+        "primary_key": false,
+        "type_options": {
+          "scale": null,
+          "precision": null
+        },
+        "has_dependents": false,
+        "valid_target_types": null
+      },
+      {
+        "id": 3,
+        "name": "var_128",
+        "type": "character varying",
+        "default": null,
+        "nullable": true,
+        "description": null,
+        "primary_key": false,
+        "type_options": {
+          "length": 128
+        },
+        "has_dependents": false,
+        "valid_target_types": null
+      },
+      {
+        "id": 4,
+        "name": "txt",
+        "type": "text",
+        "default": {
+          "value": "'abc'::text",
+          "is_dynamic": false
+        },
+        "nullable": true,
+        "description": "A super comment ;",
+        "primary_key": false,
+        "type_options": null,
+        "has_dependents": false,
+        "valid_target_types": [
+          "numeric",
+          "text"
+        ]
+      },
+      {
+        "id": 5,
+        "name": "tst",
+        "type": "timestamp without time zone",
+        "default": {
+          "value": "now()",
+          "is_dynamic": true
+        },
+        "nullable": true,
+        "description": null,
+        "primary_key": false,
+        "type_options": {
+          "precision": null
+        },
+        "has_dependents": false,
+        "valid_target_types": null
+      },
+      {
+        "id": 6,
+        "name": "int_arr",
+        "type": "_array",
+        "default": null,
+        "nullable": true,
+        "description": null,
+        "primary_key": false,
+        "type_options": {
+          "item_type": "integer"
+        },
+        "has_dependents": false,
+        "valid_target_types": null
+      },
+      {
+        "id": 7,
+        "name": "num_opt_arr",
+        "type": "_array",
+        "default": null,
+        "nullable": true,
+        "description": null,
+        "primary_key": false,
+        "type_options": {
+          "scale": 10,
+          "item_type": "numeric",
+          "precision": 15
+        },
+        "has_dependents": false,
+        "valid_target_types": null
+      }
+    ]$j$::jsonb
+  );
 END;
 $$ LANGUAGE plpgsql;

From 313d21fea190db179ead9389a2384545c22ac8be Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 30 Apr 2024 18:17:40 +0530
Subject: [PATCH 0138/1141] resolve merge conflict for #3539

---
 pyproject.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pyproject.toml b/pyproject.toml
index 03ff059ee8..424ba722f5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,3 +1,6 @@
+[project]
+name = "Mathesar"
+version = "0.1.6"
 [tool.vulture]
 exclude = ["mathesar/migrations"]
 ignore_names = ["go_to_patents_data_table", "go_to_all_types_table", "go_to_table_with_numbers_in_text", "admin_user"]

From 71d407156563c109397b594c03706e1f564d0722 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 30 Apr 2024 18:32:08 +0530
Subject: [PATCH 0139/1141] restore pyproject.toml

---
 pyproject.toml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pyproject.toml b/pyproject.toml
index 424ba722f5..c96070ba52 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,3 +5,9 @@ version = "0.1.6"
 exclude = ["mathesar/migrations"]
 ignore_names = ["go_to_patents_data_table", "go_to_all_types_table", "go_to_table_with_numbers_in_text", "admin_user"]
 min_confidence = 90
+[tool.setuptools.package-data]
+"*" = ["*.sql", "*.json", "*.html", "*.js", "*.css", "*.svg", "*.txt"]
+[tool.setuptools.packages.find]
+where = ["."]  # list of folders that contain the packages (["."] by default)
+include = ["db*", "media*", "config*", "mathesar*", "demo*", "static*"]  # package names should match these glob patterns (["*"] by default)
+exclude = []  # exclude packages matching these glob patterns (empty by default)
\ No newline at end of file

From 31829ae3991842874d0969bd2b6ca398e6ea0c80 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 2 May 2024 16:13:33 +0800
Subject: [PATCH 0140/1141] add column info getter in python layer

---
 db/columns/operations/select.py | 39 ++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/db/columns/operations/select.py b/db/columns/operations/select.py
index d1b22aba6d..8426090dee 100644
--- a/db/columns/operations/select.py
+++ b/db/columns/operations/select.py
@@ -3,11 +3,48 @@
 from sqlalchemy import and_, asc, cast, select, text, exists, Identity
 
 from db.columns.exceptions import DynamicDefaultWarning
-from db.connection import execute_msar_func_with_engine
+from db.connection import execute_msar_func_with_engine, exec_msar_func
 from db.tables.operations.select import reflect_table_from_oid
 from db.utils import execute_statement, get_pg_catalog_table
 
 
+def get_column_info_for_table(table, conn):
+    """
+    Return a list of dictionaries desrcibing the columns of the table.
+
+    The `table` can be given as either a "qualified name", or an OID.
+    The OID is the preferred identifier, since it's much more robust.
+
+    The returned list contains dictionaries of the following form:
+
+        {
+            "id": <int>,
+            "name": <str>,
+            "type": <str>,
+            "type_options": {
+                "precision": <int>,
+                "scale": <int>,
+                "fields": <str>,
+                "length": <int>,
+                "item_type": <str>,
+            },
+            "nullable": <bool>,
+            "primary_key": <bool>,
+            "valid_target_types": [<str>, <str>, ..., <str>]
+            "default": {"value": <str>, "is_dynamic": <bool>},
+            "has_dependents": <bool>,
+            "description": <str>
+        }
+
+    The fields of the "type_options" dictionary are all optional,
+    depending on the "type" value.
+
+    Args:
+        table: The table for which we want column info.
+    """
+    return exec_msar_func(conn, 'get_column_info', table).fetchone()[0]
+
+
 def get_column_description(oid, attnum, engine):
     cursor = execute_msar_func_with_engine(engine, 'col_description', oid, attnum)
     row = cursor.fetchone()

From 993ee06e6f844530fab771bc74b1df8b74048bc1 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 2 May 2024 16:49:24 +0800
Subject: [PATCH 0141/1141] wire column info getter up to RPC endpoint

---
 config/settings/common_settings.py |  3 ++-
 mathesar/rpc/columns.py            | 35 ++++++++++++++++++++++++++++++
 mathesar/utils/columns.py          | 12 ++++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 mathesar/rpc/columns.py
 create mode 100644 mathesar/utils/columns.py

diff --git a/config/settings/common_settings.py b/config/settings/common_settings.py
index 251797af41..7b8ab40d58 100644
--- a/config/settings/common_settings.py
+++ b/config/settings/common_settings.py
@@ -65,7 +65,8 @@ def pipe_delim(pipe_string):
 ROOT_URLCONF = "config.urls"
 
 MODERNRPC_METHODS_MODULES = [
-    'mathesar.rpc.connections'
+    'mathesar.rpc.connections',
+    'mathesar.rpc.columns'
 ]
 
 TEMPLATES = [
diff --git a/mathesar/rpc/columns.py b/mathesar/rpc/columns.py
new file mode 100644
index 0000000000..6db73658a7
--- /dev/null
+++ b/mathesar/rpc/columns.py
@@ -0,0 +1,35 @@
+"""
+Classes and functions exposed to the RPC endpoint for managing table columns.
+"""
+from modernrpc.core import rpc_method
+from modernrpc.auth.basic import http_basic_auth_login_required
+
+from db.columns.operations.select import get_column_info_for_table
+from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+from mathesar.rpc.utils import connect
+from mathesar.utils.columns import get_display_options
+
+@rpc_method(name='columns.list')
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def list(*, table_oid: int, database_id: int):
+    """
+    List columns for a table, with information about each.
+
+    Also return display options for each column, if they're defined.
+
+    Args:
+        table_oid: Identity of the table in the user's database.
+        database_id: The Django model id of the database containing the table.
+
+    Returns:
+        A list of column details, and a separate list of display options.
+    """
+    with connect(database_id) as conn:
+        column_info = get_column_info_for_table(table_oid, conn)
+    attnums = [col['id'] for col in column_info]
+    display_options = get_display_options(table_oid, attnums)
+    return {
+        "column_info": column_info,
+        "display_options": display_options
+    }
diff --git a/mathesar/utils/columns.py b/mathesar/utils/columns.py
new file mode 100644
index 0000000000..d6fb4b0cad
--- /dev/null
+++ b/mathesar/utils/columns.py
@@ -0,0 +1,12 @@
+from mathesar.models.base import Column
+
+
+# This should be replaced once we have the ColumnMetadata model sorted out.
+def get_display_options(table_oid, attnums):
+    return [
+        {"id": c.attnum} | c.display_options
+        for c in Column.current_objects.filter(
+            table__oid=table_oid, attnum__in=attnums
+        )
+        if c.display_options is not None
+    ]

From 784276cf5ab911eb131b253552e18e4afc10e252 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 3 May 2024 15:31:53 +0800
Subject: [PATCH 0142/1141] remove valid_target_types as it should go somewhere
 global

---
 db/sql/0_msar.sql      |  2 --
 db/sql/test_0_msar.sql | 24 +++++++-----------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/db/sql/0_msar.sql b/db/sql/0_msar.sql
index 45590aa3c4..8abac5ea2d 100644
--- a/db/sql/0_msar.sql
+++ b/db/sql/0_msar.sql
@@ -612,7 +612,6 @@ Each returned JSON object in the array will have the form:
     "type_options": <obj>,
     "nullable": <bool>,
     "primary_key": <bool>,
-    "valid_target_types": [<str>, <str>, ..., <str>]
     "default": {"value": <str>, "is_dynamic": <bool>},
     "has_dependents": <bool>,
     "description": <str>
@@ -631,7 +630,6 @@ SELECT jsonb_agg(
     'type_options', msar.get_type_options(atttypid, atttypmod, attndims),
     'nullable', NOT attnotnull,
     'primary_key', COALESCE(pgi.indisprimary, false),
-    'valid_target_types', msar.get_valid_target_type_strings(atttypid),
     'default',
     nullif(
       jsonb_strip_nulls(
diff --git a/db/sql/test_0_msar.sql b/db/sql/test_0_msar.sql
index 40c2d7c5ab..f9d1b30317 100644
--- a/db/sql/test_0_msar.sql
+++ b/db/sql/test_0_msar.sql
@@ -2466,8 +2466,7 @@ BEGIN
         "description": null,
         "primary_key": true,
         "type_options": null,
-        "has_dependents": true,
-        "valid_target_types": null
+        "has_dependents": true
       },
       {
         "id": 2,
@@ -2481,8 +2480,7 @@ BEGIN
           "scale": null,
           "precision": null
         },
-        "has_dependents": false,
-        "valid_target_types": null
+        "has_dependents": false
       },
       {
         "id": 3,
@@ -2495,8 +2493,7 @@ BEGIN
         "type_options": {
           "length": 128
         },
-        "has_dependents": false,
-        "valid_target_types": null
+        "has_dependents": false
       },
       {
         "id": 4,
@@ -2510,11 +2507,7 @@ BEGIN
         "description": "A super comment ;",
         "primary_key": false,
         "type_options": null,
-        "has_dependents": false,
-        "valid_target_types": [
-          "numeric",
-          "text"
-        ]
+        "has_dependents": false
       },
       {
         "id": 5,
@@ -2530,8 +2523,7 @@ BEGIN
         "type_options": {
           "precision": null
         },
-        "has_dependents": false,
-        "valid_target_types": null
+        "has_dependents": false
       },
       {
         "id": 6,
@@ -2544,8 +2536,7 @@ BEGIN
         "type_options": {
           "item_type": "integer"
         },
-        "has_dependents": false,
-        "valid_target_types": null
+        "has_dependents": false
       },
       {
         "id": 7,
@@ -2560,8 +2551,7 @@ BEGIN
           "item_type": "numeric",
           "precision": 15
         },
-        "has_dependents": false,
-        "valid_target_types": null
+        "has_dependents": false
       }
     ]$j$::jsonb
   );

From 77ed3791383d620622d0b052f3fed60280bd2bda Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 3 May 2024 15:32:29 +0800
Subject: [PATCH 0143/1141] fix typo in docstring

---
 db/columns/operations/select.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/columns/operations/select.py b/db/columns/operations/select.py
index 8426090dee..a79e63e1c8 100644
--- a/db/columns/operations/select.py
+++ b/db/columns/operations/select.py
@@ -10,7 +10,7 @@
 
 def get_column_info_for_table(table, conn):
     """
-    Return a list of dictionaries desrcibing the columns of the table.
+    Return a list of dictionaries describing the columns of the table.
 
     The `table` can be given as either a "qualified name", or an OID.
     The OID is the preferred identifier, since it's much more robust.

From b2f15acc8ed9f61da2e95c638c0b5b11ee33c893 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 3 May 2024 15:34:01 +0800
Subject: [PATCH 0144/1141] add class to validate and describe column info
 response

---
 docs/docs/api/rpc.md    |  8 ++++++++
 mathesar/rpc/columns.py | 30 +++++++++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 53ca6293d6..8f4230eea9 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -46,6 +46,14 @@ To use an RPC function:
       - add_from_scratch
       - DBModelReturn
 
+---
+
+::: mathesar.rpc.columns
+    options:
+      members:
+      - list
+      - ColumnInfo
+
 ## Responses
 
 ### Success
diff --git a/mathesar/rpc/columns.py b/mathesar/rpc/columns.py
index 6db73658a7..f5a91fc5fc 100644
--- a/mathesar/rpc/columns.py
+++ b/mathesar/rpc/columns.py
@@ -1,6 +1,8 @@
 """
 Classes and functions exposed to the RPC endpoint for managing table columns.
 """
+from typing import TypedDict
+
 from modernrpc.core import rpc_method
 from modernrpc.auth.basic import http_basic_auth_login_required
 
@@ -9,6 +11,28 @@
 from mathesar.rpc.utils import connect
 from mathesar.utils.columns import get_display_options
 
+
+class ColumnInfo(TypedDict):
+    """
+    Information about a column.
+
+    Attributes:
+        id (int): The `attnum` of the column in the table.
+        name (str): The name of the column.
+        type (str): The type of the column on the database.
+        type_options (dict): The options applied to the column type.
+        nullable (bool): Whether or not the column is nullable.
+        primary_key (bool): Whether the column is in the primary key.
+        default (dict): The default value and whether it's dynamic.
+        has_dependents (bool): Whether the column has dependent objects.
+        description (str): The description of the column.
+    """
+
+    @classmethod
+    def from_column_info_json(cls, col_info):
+        return cls(**col_info)
+
+
 @rpc_method(name='columns.list')
 @http_basic_auth_login_required
 @handle_rpc_exceptions
@@ -25,8 +49,12 @@ def list(*, table_oid: int, database_id: int):
     Returns:
         A list of column details, and a separate list of display options.
     """
+    # TODO Add user as arg for connect and get_display_options
     with connect(database_id) as conn:
-        column_info = get_column_info_for_table(table_oid, conn)
+        column_info = [
+            ColumnInfo.from_column_info_json(col)
+            for col in get_column_info_for_table(table_oid, conn)
+        ]
     attnums = [col['id'] for col in column_info]
     display_options = get_display_options(table_oid, attnums)
     return {

From 2c15a07b9a78ff1235defca8703dd48f1d923d42 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 3 May 2024 15:37:22 +0800
Subject: [PATCH 0145/1141] stub out permissions checks

---
 mathesar/models/users.py |  3 +++
 mathesar/rpc/columns.py  | 14 +++++++++-----
 mathesar/rpc/utils.py    |  3 ++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/mathesar/models/users.py b/mathesar/models/users.py
index 9e3fcbe86a..e1b77a8161 100644
--- a/mathesar/models/users.py
+++ b/mathesar/models/users.py
@@ -17,6 +17,9 @@ class User(AbstractUser):
     password_change_needed = models.BooleanField(default=False)
     display_language = models.CharField(max_length=30, blank=True, default='en')
 
+    def metadata_privileges(self, database_id):
+        return 'read write'
+
 
 class Role(models.TextChoices):
     MANAGER = 'manager', 'Manager'
diff --git a/mathesar/rpc/columns.py b/mathesar/rpc/columns.py
index f5a91fc5fc..fa89cba65e 100644
--- a/mathesar/rpc/columns.py
+++ b/mathesar/rpc/columns.py
@@ -3,7 +3,7 @@
 """
 from typing import TypedDict
 
-from modernrpc.core import rpc_method
+from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from db.columns.operations.select import get_column_info_for_table
@@ -36,7 +36,7 @@ def from_column_info_json(cls, col_info):
 @rpc_method(name='columns.list')
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def list(*, table_oid: int, database_id: int):
+def list(*, table_oid: int, database_id: int, **kwargs):
     """
     List columns for a table, with information about each.
 
@@ -50,13 +50,17 @@ def list(*, table_oid: int, database_id: int):
         A list of column details, and a separate list of display options.
     """
     # TODO Add user as arg for connect and get_display_options
-    with connect(database_id) as conn:
+    request = kwargs.get(REQUEST_KEY)
+    with connect(database_id, request.user) as conn:
         column_info = [
             ColumnInfo.from_column_info_json(col)
             for col in get_column_info_for_table(table_oid, conn)
         ]
-    attnums = [col['id'] for col in column_info]
-    display_options = get_display_options(table_oid, attnums)
+    if request.user.metadata_privileges(database_id) is not None:
+        attnums = [col['id'] for col in column_info]
+        display_options = get_display_options(table_oid, attnums)
+    else:
+        display_options = None
     return {
         "column_info": column_info,
         "display_options": display_options
diff --git a/mathesar/rpc/utils.py b/mathesar/rpc/utils.py
index 7bc33919d0..4ae3a0dc4e 100644
--- a/mathesar/rpc/utils.py
+++ b/mathesar/rpc/utils.py
@@ -2,12 +2,13 @@
 from mathesar.models.base import Database
 
 
-def connect(db_id):
+def connect(db_id, user):
     """
     Return a psycopg connection, given a Database model id.
 
     Args:
         db_id: The Django id corresponding to the Database.
     """
+    print("User is: ", user)
     db_model = Database.current_objects.get(id=db_id)
     return get_psycopg_connection(db_model)

From c397bf96a7574a5349a59ea024700db5ad2ae4c3 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 3 May 2024 19:44:47 +0530
Subject: [PATCH 0146/1141] remove nonsensical cast_to_email and cast_to_uri
 functions

---
 db/types/categories.py      | 2 --
 db/types/operations/cast.py | 6 ------
 2 files changed, 8 deletions(-)

diff --git a/db/types/categories.py b/db/types/categories.py
index 6ed67db101..5110d0a49d 100644
--- a/db/types/categories.py
+++ b/db/types/categories.py
@@ -10,8 +10,6 @@
     *STRING_TYPES,
     PostgresType.CHAR,
     PostgresType.NAME,
-    MathesarCustomType.URI,
-    MathesarCustomType.EMAIL,
 })
 
 INTEGER_TYPES = frozenset({
diff --git a/db/types/operations/cast.py b/db/types/operations/cast.py
index 039dcc6171..dc46191395 100644
--- a/db/types/operations/cast.py
+++ b/db/types/operations/cast.py
@@ -44,7 +44,6 @@ def get_column_cast_expression(column, target_type, engine, type_options=None):
 
 def install_all_casts(engine):
     create_boolean_casts(engine)
-    create_date_casts(engine)
     create_decimal_number_casts(engine)
     create_email_casts(engine)
     create_integer_casts(engine)
@@ -64,11 +63,6 @@ def create_boolean_casts(engine):
     create_cast_functions(PostgresType.BOOLEAN, type_body_map, engine)
 
 
-def create_date_casts(engine):
-    type_body_map = _get_date_type_body_map()
-    create_cast_functions(PostgresType.DATE, type_body_map, engine)
-
-
 def create_json_casts(engine):
     json_types = categories.JSON_TYPES
     for db_type in json_types:

From fd7c341e762a2516b646b0338030a5315f15c00b Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Sun, 5 May 2024 17:05:34 +0530
Subject: [PATCH 0147/1141] revert pyproject.toml

---
 pyproject.toml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index d04204525f..03ff059ee8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,13 +1,4 @@
-[project]
-name = "Mathesar"
-version = "0.1.7"
 [tool.vulture]
 exclude = ["mathesar/migrations"]
 ignore_names = ["go_to_patents_data_table", "go_to_all_types_table", "go_to_table_with_numbers_in_text", "admin_user"]
 min_confidence = 90
-[tool.setuptools.package-data]
-"*" = ["*.sql", "*.json", "*.html", "*.js", "*.css", "*.svg", "*.txt"]
-[tool.setuptools.packages.find]
-where = ["."]  # list of folders that contain the packages (["."] by default)
-include = ["db*", "media*", "config*", "mathesar*", "demo*", "static*"]  # package names should match these glob patterns (["*"] by default)
-exclude = []  # exclude packages matching these glob patterns (empty by default)
\ No newline at end of file

From 45f3994d2982bbdbf8361ada4b6deefa3e2b48cd Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 6 May 2024 15:44:42 +0800
Subject: [PATCH 0148/1141] add classes to specify type options and defaults

---
 docs/docs/api/rpc.md    |   2 +
 mathesar/rpc/columns.py | 103 ++++++++++++++++++++++++++++++++++------
 2 files changed, 91 insertions(+), 14 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 8f4230eea9..deffab54b5 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -53,6 +53,8 @@ To use an RPC function:
       members:
       - list
       - ColumnInfo
+      - TypeOptions
+      - ColumnDefault
 
 ## Responses
 
diff --git a/mathesar/rpc/columns.py b/mathesar/rpc/columns.py
index fa89cba65e..387a905d4e 100644
--- a/mathesar/rpc/columns.py
+++ b/mathesar/rpc/columns.py
@@ -12,28 +12,104 @@
 from mathesar.utils.columns import get_display_options
 
 
+class TypeOptions(TypedDict, total=False):
+    """
+    Options applied to a type. All attributes are optional.
+
+    Take special care with the difference between numeric and date/time
+    types w.r.t. precision. The attribute has a different meaning
+    depending on the type to which it's being applied.
+
+    Attributes:
+        precision: For numeric types, the number of significant digits.
+                   For date/time types, the number of fractional digits.
+        scale: For numeric types, the number of fractional digits.
+        fields: Which time fields are stored. See Postgres docs.
+        length: The maximum length of a character-type field.
+        item_type: The member type for arrays.
+    """
+    precision: int
+    scale: int
+    fields: str
+    length: int
+    item_type: str
+
+    @classmethod
+    def from_dict(cls, type_options):
+        if type_options is not None:
+            # All keys are optional, but we want to validate the keys
+            # we actually return.
+            all_keys = dict(
+                precision=type_options.get("precision"),
+                scale=type_options.get("scale"),
+                fields=type_options.get("fields"),
+                length=type_options.get("length"),
+                item_type=type_options.get("item_type"),
+            )
+            return cls(**{k: v for k, v in all_keys.items() if v is not None})
+
+
+class ColumnDefault(TypedDict):
+    """
+    A dictionary describing the default value for a column.
+
+    Attributes:
+        value: An SQL expression giving the default value.
+        is_dynamic: Whether the `value` is possibly dynamic.
+    """
+    value: str
+    is_dynamic: bool
+
+    @classmethod
+    def from_dict(cls, col_default):
+        if col_default is not None:
+            return cls(
+                value=col_default["value"],
+                is_dynamic=col_default["is_dynamic"],
+            )
+
+
 class ColumnInfo(TypedDict):
     """
     Information about a column.
 
     Attributes:
-        id (int): The `attnum` of the column in the table.
-        name (str): The name of the column.
-        type (str): The type of the column on the database.
-        type_options (dict): The options applied to the column type.
-        nullable (bool): Whether or not the column is nullable.
-        primary_key (bool): Whether the column is in the primary key.
-        default (dict): The default value and whether it's dynamic.
-        has_dependents (bool): Whether the column has dependent objects.
-        description (str): The description of the column.
+        id: The `attnum` of the column in the table.
+        name: The name of the column.
+        type: The type of the column on the database.
+        type_options: The options applied to the column type.
+        nullable: Whether or not the column is nullable.
+        primary_key: Whether the column is in the primary key.
+        default: The default value and whether it's dynamic.
+        has_dependents: Whether the column has dependent objects.
+        description: The description of the column.
     """
+    id: int
+    name: str
+    type: str
+    type_options: TypeOptions
+    nullable: bool
+    primary_key: bool
+    default: ColumnDefault
+    has_dependents: bool
+    description: str
 
     @classmethod
-    def from_column_info_json(cls, col_info):
-        return cls(**col_info)
+    def from_dict(cls, col_info):
+        return cls(
+            id=col_info["id"],
+            name=col_info["name"],
+            type=col_info["type"],
+            type_options=TypeOptions.from_dict(col_info.get("type_options")),
+            nullable=col_info["nullable"],
+            primary_key=col_info["primary_key"],
+            default=ColumnDefault.from_dict(col_info.get("default")),
+            has_dependents=col_info["has_dependents"],
+            description=col_info.get("description")
+        )
 
 
-@rpc_method(name='columns.list')
+@rpc_method(name="columns.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
 def list(*, table_oid: int, database_id: int, **kwargs):
@@ -49,11 +125,10 @@ def list(*, table_oid: int, database_id: int, **kwargs):
     Returns:
         A list of column details, and a separate list of display options.
     """
-    # TODO Add user as arg for connect and get_display_options
     request = kwargs.get(REQUEST_KEY)
     with connect(database_id, request.user) as conn:
         column_info = [
-            ColumnInfo.from_column_info_json(col)
+            ColumnInfo.from_dict(col)
             for col in get_column_info_for_table(table_oid, conn)
         ]
     if request.user.metadata_privileges(database_id) is not None:

From 41ff1b27729958c94b34d50a6b57604ff8d54058 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 6 May 2024 16:20:48 +0800
Subject: [PATCH 0149/1141] add class describing return value overall

---
 docs/docs/api/rpc.md    |  3 ++-
 mathesar/rpc/columns.py | 26 +++++++++++++++++++-------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index deffab54b5..12097fb5b1 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -51,7 +51,8 @@ To use an RPC function:
 ::: mathesar.rpc.columns
     options:
       members:
-      - list
+      - list_
+      - ColumnListReturn
       - ColumnInfo
       - TypeOptions
       - ColumnDefault
diff --git a/mathesar/rpc/columns.py b/mathesar/rpc/columns.py
index 387a905d4e..d5bbaf8bd5 100644
--- a/mathesar/rpc/columns.py
+++ b/mathesar/rpc/columns.py
@@ -109,18 +109,30 @@ def from_dict(cls, col_info):
         )
 
 
+class ColumnListReturn(TypedDict):
+    """
+    Information about the columns of a table.
+
+    Attributes:
+        column_info: Column information from the user's database.
+        display_options: Display metadata managed by Mathesar.
+    """
+    column_info: list[ColumnInfo]
+    display_options: list[dict]
+
+
 @rpc_method(name="columns.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def list(*, table_oid: int, database_id: int, **kwargs):
+def list_(*, table_oid: int, database_id: int, **kwargs):
     """
-    List columns for a table, with information about each.
+    List information about columns for a table. Exposed as `list`.
 
     Also return display options for each column, if they're defined.
 
     Args:
         table_oid: Identity of the table in the user's database.
-        database_id: The Django model id of the database containing the table.
+        database_id: The Django id of the database containing the table.
 
     Returns:
         A list of column details, and a separate list of display options.
@@ -136,7 +148,7 @@ def list(*, table_oid: int, database_id: int, **kwargs):
         display_options = get_display_options(table_oid, attnums)
     else:
         display_options = None
-    return {
-        "column_info": column_info,
-        "display_options": display_options
-    }
+    return ColumnListReturn(
+        column_info=column_info,
+        display_options=display_options,
+    )

From 4f585cdf8bd35fd1dd7fefb569e0423a391fc332 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 6 May 2024 23:35:36 +0800
Subject: [PATCH 0150/1141] add tests for wiring of RPC functions

---
 mathesar/rpc/columns.py              |  2 +
 mathesar/rpc/exceptions/handlers.py  |  1 +
 mathesar/tests/rpc/test_endpoints.py | 89 ++++++++++++++++++++--------
 3 files changed, 67 insertions(+), 25 deletions(-)

diff --git a/mathesar/rpc/columns.py b/mathesar/rpc/columns.py
index d5bbaf8bd5..159a1fc4e6 100644
--- a/mathesar/rpc/columns.py
+++ b/mathesar/rpc/columns.py
@@ -145,6 +145,8 @@ def list_(*, table_oid: int, database_id: int, **kwargs):
         ]
     if request.user.metadata_privileges(database_id) is not None:
         attnums = [col['id'] for col in column_info]
+        # TODO Use TypedDict spec pattern (above) for display_options once we
+        # have that model defined.
         display_options = get_display_options(table_oid, attnums)
     else:
         display_options = None
diff --git a/mathesar/rpc/exceptions/handlers.py b/mathesar/rpc/exceptions/handlers.py
index 1a45d38d25..a385bac318 100644
--- a/mathesar/rpc/exceptions/handlers.py
+++ b/mathesar/rpc/exceptions/handlers.py
@@ -8,6 +8,7 @@
 
 def handle_rpc_exceptions(f):
     """Wrap a function to process any Exception raised."""
+    f.rpc_exceptions_handled = True
     @wraps(f)
     def safe_func(*args, **kwargs):
         try:
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 45cc870158..3767e80211 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -1,31 +1,70 @@
-from importlib import import_module
-
-
-def test_rpc_endpoint_consistency_with_function_names(
-    live_server,
-    admin_client
-):
-    """
-    Tests whether the names of registered RPC endpoints align with the
-    corresponding Python methods.
-
-    Fixtures:
-        live_server(pytest-django): Provides the url for django testing server.
-        admin_client(pytest-django): Provides a client logged in as a superuser.
-    """
-    list_methods = admin_client.post(
-        path=f'{live_server.url}/api/rpc/v0/',
+"""
+This file tests wiring between the RPC endpoint and functions.
+
+Fixtures:
+    live_server(pytest-django): Provides the url for django testing server.
+    admin_client(pytest-django): Provides a client logged in as a superuser.
+"""
+import pytest
+from modernrpc.core import Protocol
+from modernrpc.auth import user_is_authenticated, user_is_superuser
+
+from mathesar.rpc import columns
+from mathesar.rpc import connections
+
+
+exposed_functions = [
+    "columns.list",
+    "connections.add_from_known_connection",
+    "connections.add_from_scratch",
+]
+
+
+def test_rpc_endpoint_expected_methods(live_server, admin_client):
+    """Smoketest checks that we have exposed the expected methods."""
+    all_methods = admin_client.post(
+        path=f"{live_server.url}/api/rpc/v0/",
         data={
             "id": 1,
             "method": "system.listMethods",
             "jsonrpc": "2.0"
         },
         content_type="application/json"
-    )
-    methods = list_methods.json()['result']
-    for method in methods:
-        if not method.startswith('system.'):
-            module_name, function_name = method.split('.')
-            mod = import_module(f"mathesar.rpc.{module_name}")
-            assert hasattr(mod, function_name)
-            assert callable(getattr(mod, function_name))
+    ).json()["result"]
+    mathesar_methods = [m for m in all_methods if not m.startswith("system.")]
+    expect_methods = [
+        "columns.list",
+        "connections.add_from_known_connection",
+        "connections.add_from_scratch",
+    ]
+    assert sorted(mathesar_methods) == expect_methods
+
+
+@pytest.mark.parametrize(
+    "func,exposed_name,auth_pred_params",
+    [
+        (
+            columns.list_,
+            "columns.list",
+            [user_is_authenticated]
+        ),
+        (
+            connections.add_from_known_connection,
+            "connections.add_from_known_connection",
+            [user_is_superuser]
+        ),
+        (
+            connections.add_from_scratch,
+            "connections.add_from_scratch",
+            [user_is_superuser]
+        )
+    ]
+)
+def test_correctly_exposed(func, exposed_name, auth_pred_params):
+    """Tests to make sure every RPC function is correctly wired up."""
+    # Make sure we didn't typo the function names for the endpoint.
+    assert func.modernrpc_enabled is True
+    assert func.modernrpc_name == exposed_name
+    # Make sure other decorators are set as expected.
+    assert func.rpc_exceptions_handled is True
+    assert func.modernrpc_auth_predicates_params == [auth_pred_params]

From 3a5a3946a1e32d3d462d326ff51b5de041b2847d Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 7 May 2024 13:57:50 +0800
Subject: [PATCH 0151/1141] move permission check to display_option function

---
 mathesar/rpc/columns.py   | 53 ++++++++++++++++++++-------------------
 mathesar/utils/columns.py | 20 +++++++++------
 2 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/mathesar/rpc/columns.py b/mathesar/rpc/columns.py
index 159a1fc4e6..d8a0f66dce 100644
--- a/mathesar/rpc/columns.py
+++ b/mathesar/rpc/columns.py
@@ -9,7 +9,7 @@
 from db.columns.operations.select import get_column_info_for_table
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
-from mathesar.utils.columns import get_display_options
+from mathesar.utils.columns import get_raw_display_options
 
 
 class TypeOptions(TypedDict, total=False):
@@ -36,17 +36,20 @@ class TypeOptions(TypedDict, total=False):
 
     @classmethod
     def from_dict(cls, type_options):
-        if type_options is not None:
-            # All keys are optional, but we want to validate the keys
-            # we actually return.
-            all_keys = dict(
-                precision=type_options.get("precision"),
-                scale=type_options.get("scale"),
-                fields=type_options.get("fields"),
-                length=type_options.get("length"),
-                item_type=type_options.get("item_type"),
-            )
-            return cls(**{k: v for k, v in all_keys.items() if v is not None})
+        if type_options is None:
+            return
+        # All keys are optional, but we want to validate the keys we
+        # actually return.
+        all_keys = dict(
+            precision=type_options.get("precision"),
+            scale=type_options.get("scale"),
+            fields=type_options.get("fields"),
+            length=type_options.get("length"),
+            item_type=type_options.get("item_type"),
+        )
+        reduced_keys = {k: v for k, v in all_keys.items() if v is not None}
+        if reduced_keys != {}:
+            return cls(**reduced_keys)
 
 
 class ColumnDefault(TypedDict):
@@ -124,7 +127,7 @@ class ColumnListReturn(TypedDict):
 @rpc_method(name="columns.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def list_(*, table_oid: int, database_id: int, **kwargs):
+def list_(*, table_oid: int, database_id: int, **kwargs) -> ColumnListReturn:
     """
     List information about columns for a table. Exposed as `list`.
 
@@ -137,19 +140,17 @@ def list_(*, table_oid: int, database_id: int, **kwargs):
     Returns:
         A list of column details, and a separate list of display options.
     """
-    request = kwargs.get(REQUEST_KEY)
-    with connect(database_id, request.user) as conn:
-        column_info = [
-            ColumnInfo.from_dict(col)
-            for col in get_column_info_for_table(table_oid, conn)
-        ]
-    if request.user.metadata_privileges(database_id) is not None:
-        attnums = [col['id'] for col in column_info]
-        # TODO Use TypedDict spec pattern (above) for display_options once we
-        # have that model defined.
-        display_options = get_display_options(table_oid, attnums)
-    else:
-        display_options = None
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        raw_column_info = get_column_info_for_table(table_oid, conn)
+    column_info, attnums = tuple(
+        zip(
+            *[(ColumnInfo.from_dict(col), col['id']) for col in raw_column_info]
+        )
+    )
+    display_options = get_raw_display_options(
+        database_id, table_oid, attnums, user
+    )
     return ColumnListReturn(
         column_info=column_info,
         display_options=display_options,
diff --git a/mathesar/utils/columns.py b/mathesar/utils/columns.py
index d6fb4b0cad..eb742ade68 100644
--- a/mathesar/utils/columns.py
+++ b/mathesar/utils/columns.py
@@ -2,11 +2,15 @@
 
 
 # This should be replaced once we have the ColumnMetadata model sorted out.
-def get_display_options(table_oid, attnums):
-    return [
-        {"id": c.attnum} | c.display_options
-        for c in Column.current_objects.filter(
-            table__oid=table_oid, attnum__in=attnums
-        )
-        if c.display_options is not None
-    ]
+def get_raw_display_options(database_id, table_oid, attnums, user):
+    """Get display options for the columns from Django."""
+    if user.metadata_privileges(database_id) is not None:
+        return [
+            {"id": c.attnum} | c.display_options
+            for c in Column.current_objects.filter(
+                    table__schema__database__id=database_id,
+                    table__oid=table_oid,
+                    attnum__in=attnums
+            )
+            if c.display_options is not None
+        ]

From b7c91d136316a08c342c97b85c19aa52e1ec6581 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 7 May 2024 14:00:36 +0800
Subject: [PATCH 0152/1141] add test for column lister RPC function

---
 mathesar/tests/rpc/test_columns.py | 155 +++++++++++++++++++++++++++++
 1 file changed, 155 insertions(+)
 create mode 100644 mathesar/tests/rpc/test_columns.py

diff --git a/mathesar/tests/rpc/test_columns.py b/mathesar/tests/rpc/test_columns.py
new file mode 100644
index 0000000000..113b84a751
--- /dev/null
+++ b/mathesar/tests/rpc/test_columns.py
@@ -0,0 +1,155 @@
+from contextlib import contextmanager
+
+from mathesar.rpc import columns
+from mathesar.models.users import User
+
+
+def test_columns_list(rf, monkeypatch):
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username='alice', password='pass1234')
+    table_oid = 23457
+    database_id = 2
+
+    @contextmanager
+    def mock_connect(_database_id, user):
+        if _database_id == 2 and user.username == 'alice':
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_column_info(_table_oid, conn):
+        if _table_oid != table_oid:
+            raise AssertionError('incorrect parameters passed')
+        return [
+            {
+                'id': 1, 'name': 'id', 'type': 'integer',
+                'default': {'value': 'identity', 'is_dynamic': True},
+                'nullable': False, 'description': None, 'primary_key': True,
+                'type_options': None,
+                'has_dependents': True
+            }, {
+                'id': 2, 'name': 'numcol', 'type': 'numeric',
+                'default': {'value': "'8'::numeric", 'is_dynamic': False},
+                'nullable': True, 'description': None, 'primary_key': False,
+                'type_options': {'scale': None, 'precision': None},
+                'has_dependents': False
+            }, {
+                'id': 4, 'name': 'numcolmod', 'type': 'numeric',
+                'default': None,
+                'nullable': True, 'description': None, 'primary_key': False,
+                'type_options': {'scale': 3, 'precision': 5},
+                'has_dependents': False
+            }, {
+                'id': 6, 'name': 'numarr', 'type': '_array',
+                'default': None,
+                'nullable': True,
+                'description': 'a numeric array column',
+                'primary_key': False,
+                'type_options': {'scale': 2, 'item_type': 'numeric', 'precision': 8},
+                'has_dependents': False
+            }, {
+                'id': 8, 'name': 'ivlcolmod', 'type': 'interval',
+                'default': None,
+                'nullable': True, 'description': None, 'primary_key': False,
+                'type_options': {'fields': 'day to second', 'precision': 3},
+                'has_dependents': False
+            }, {
+                'id': 10, 'name': 'arrcol', 'type': '_array',
+                'default': None,
+                'nullable': True, 'description': None, 'primary_key': False,
+                'type_options': {'item_type': 'text'},
+                'has_dependents': False
+            }, {
+                'id': 12, 'name': 'vccol', 'type': 'character varying',
+                'default': None,
+                'nullable': True, 'description': None, 'primary_key': False,
+                'type_options': {'length': 123},
+                'has_dependents': False
+            },
+        ]
+
+    def mock_display_options(_database_id, _table_oid, attnums, user):
+        if (
+                database_id != 2
+                or table_oid != 23457
+                or attnums != (1, 2, 4, 6, 8, 10, 12)
+                or user.username != 'alice'
+        ):
+            raise AssertionError("incorrect parameters passed")
+        return [
+            {
+                'id': 4,
+                'use_grouping': 'true',
+                'number_format': 'english',
+                'show_as_percentage': False,
+                'maximum_fraction_digits': 2,
+                'minimum_fraction_digits': 2
+            }
+        ]
+    monkeypatch.setattr(columns, 'connect', mock_connect)
+    monkeypatch.setattr(columns, 'get_column_info_for_table', mock_column_info)
+    monkeypatch.setattr(columns, 'get_raw_display_options', mock_display_options)
+    expect_col_list = {
+        'column_info': (
+            {
+                'id': 1, 'name': 'id', 'type': 'integer',
+                'default': {'value': 'identity', 'is_dynamic': True},
+                'nullable': False, 'description': None, 'primary_key': True,
+                'type_options': None,
+                'has_dependents': True
+            }, {
+                'id': 2, 'name': 'numcol', 'type': 'numeric',
+                'default': {'value': "'8'::numeric", 'is_dynamic': False},
+                'nullable': True, 'description': None, 'primary_key': False,
+                'type_options': None,
+                'has_dependents': False
+            }, {
+                'id': 4, 'name': 'numcolmod', 'type': 'numeric',
+                'default': None,
+                'nullable': True, 'description': None, 'primary_key': False,
+                'type_options': {'scale': 3, 'precision': 5},
+                'has_dependents': False
+            }, {
+                'id': 6, 'name': 'numarr', 'type': '_array',
+                'default': None,
+                'nullable': True,
+                'description': 'a numeric array column',
+                'primary_key': False,
+                'type_options': {'scale': 2, 'item_type': 'numeric', 'precision': 8},
+                'has_dependents': False
+            }, {
+                'id': 8, 'name': 'ivlcolmod', 'type': 'interval',
+                'default': None,
+                'nullable': True, 'description': None, 'primary_key': False,
+                'type_options': {'fields': 'day to second', 'precision': 3},
+                'has_dependents': False
+            }, {
+                'id': 10, 'name': 'arrcol', 'type': '_array',
+                'default': None,
+                'nullable': True, 'description': None, 'primary_key': False,
+                'type_options': {'item_type': 'text'},
+                'has_dependents': False
+            }, {
+                'id': 12, 'name': 'vccol', 'type': 'character varying',
+                'default': None,
+                'nullable': True, 'description': None, 'primary_key': False,
+                'type_options': {'length': 123},
+                'has_dependents': False
+            }
+        ),
+        'display_options': [
+            {
+                'id': 4,
+                'use_grouping': 'true',
+                'number_format': 'english',
+                'show_as_percentage': False,
+                'maximum_fraction_digits': 2,
+                'minimum_fraction_digits': 2
+            }
+        ]
+    }
+    actual_col_list = columns.list_(table_oid=23457, database_id=2, request=request)
+    assert actual_col_list == expect_col_list

From 68b5ce01318d9992a15b2a26fb681f342677a07c Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 7 May 2024 14:00:58 +0800
Subject: [PATCH 0153/1141] fix linting issues

---
 mathesar/rpc/exceptions/handlers.py  | 1 +
 mathesar/tests/rpc/test_endpoints.py | 1 -
 mathesar/utils/columns.py            | 6 +++---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mathesar/rpc/exceptions/handlers.py b/mathesar/rpc/exceptions/handlers.py
index a385bac318..62203230f8 100644
--- a/mathesar/rpc/exceptions/handlers.py
+++ b/mathesar/rpc/exceptions/handlers.py
@@ -9,6 +9,7 @@
 def handle_rpc_exceptions(f):
     """Wrap a function to process any Exception raised."""
     f.rpc_exceptions_handled = True
+
     @wraps(f)
     def safe_func(*args, **kwargs):
         try:
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 3767e80211..41841079b1 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -6,7 +6,6 @@
     admin_client(pytest-django): Provides a client logged in as a superuser.
 """
 import pytest
-from modernrpc.core import Protocol
 from modernrpc.auth import user_is_authenticated, user_is_superuser
 
 from mathesar.rpc import columns
diff --git a/mathesar/utils/columns.py b/mathesar/utils/columns.py
index eb742ade68..b172d63203 100644
--- a/mathesar/utils/columns.py
+++ b/mathesar/utils/columns.py
@@ -8,9 +8,9 @@ def get_raw_display_options(database_id, table_oid, attnums, user):
         return [
             {"id": c.attnum} | c.display_options
             for c in Column.current_objects.filter(
-                    table__schema__database__id=database_id,
-                    table__oid=table_oid,
-                    attnum__in=attnums
+                table__schema__database__id=database_id,
+                table__oid=table_oid,
+                attnum__in=attnums
             )
             if c.display_options is not None
         ]

From 9278b6f2f220216340194069b609b8f086a2b5e8 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 7 May 2024 15:34:54 +0800
Subject: [PATCH 0154/1141] reduce test scope, improve focus

---
 mathesar/tests/rpc/test_columns.py | 46 +++++++-----------------------
 1 file changed, 11 insertions(+), 35 deletions(-)

diff --git a/mathesar/tests/rpc/test_columns.py b/mathesar/tests/rpc/test_columns.py
index 113b84a751..e2ecce34f3 100644
--- a/mathesar/tests/rpc/test_columns.py
+++ b/mathesar/tests/rpc/test_columns.py
@@ -33,7 +33,9 @@ def mock_column_info(_table_oid, conn):
             }, {
                 'id': 2, 'name': 'numcol', 'type': 'numeric',
                 'default': {'value': "'8'::numeric", 'is_dynamic': False},
-                'nullable': True, 'description': None, 'primary_key': False,
+                'nullable': True,
+                'description': 'My super numeric column',
+                'primary_key': False,
                 'type_options': {'scale': None, 'precision': None},
                 'has_dependents': False
             }, {
@@ -42,31 +44,17 @@ def mock_column_info(_table_oid, conn):
                 'nullable': True, 'description': None, 'primary_key': False,
                 'type_options': {'scale': 3, 'precision': 5},
                 'has_dependents': False
-            }, {
-                'id': 6, 'name': 'numarr', 'type': '_array',
-                'default': None,
-                'nullable': True,
-                'description': 'a numeric array column',
-                'primary_key': False,
-                'type_options': {'scale': 2, 'item_type': 'numeric', 'precision': 8},
-                'has_dependents': False
             }, {
                 'id': 8, 'name': 'ivlcolmod', 'type': 'interval',
                 'default': None,
                 'nullable': True, 'description': None, 'primary_key': False,
-                'type_options': {'fields': 'day to second', 'precision': 3},
+                'type_options': {'fields': 'day to second'},
                 'has_dependents': False
             }, {
                 'id': 10, 'name': 'arrcol', 'type': '_array',
                 'default': None,
                 'nullable': True, 'description': None, 'primary_key': False,
-                'type_options': {'item_type': 'text'},
-                'has_dependents': False
-            }, {
-                'id': 12, 'name': 'vccol', 'type': 'character varying',
-                'default': None,
-                'nullable': True, 'description': None, 'primary_key': False,
-                'type_options': {'length': 123},
+                'type_options': {'item_type': 'character varying', 'length': 3},
                 'has_dependents': False
             },
         ]
@@ -75,7 +63,7 @@ def mock_display_options(_database_id, _table_oid, attnums, user):
         if (
                 database_id != 2
                 or table_oid != 23457
-                or attnums != (1, 2, 4, 6, 8, 10, 12)
+                or attnums != (1, 2, 4, 8, 10)
                 or user.username != 'alice'
         ):
             raise AssertionError("incorrect parameters passed")
@@ -103,7 +91,9 @@ def mock_display_options(_database_id, _table_oid, attnums, user):
             }, {
                 'id': 2, 'name': 'numcol', 'type': 'numeric',
                 'default': {'value': "'8'::numeric", 'is_dynamic': False},
-                'nullable': True, 'description': None, 'primary_key': False,
+                'nullable': True,
+                'description': 'My super numeric column',
+                'primary_key': False,
                 'type_options': None,
                 'has_dependents': False
             }, {
@@ -112,31 +102,17 @@ def mock_display_options(_database_id, _table_oid, attnums, user):
                 'nullable': True, 'description': None, 'primary_key': False,
                 'type_options': {'scale': 3, 'precision': 5},
                 'has_dependents': False
-            }, {
-                'id': 6, 'name': 'numarr', 'type': '_array',
-                'default': None,
-                'nullable': True,
-                'description': 'a numeric array column',
-                'primary_key': False,
-                'type_options': {'scale': 2, 'item_type': 'numeric', 'precision': 8},
-                'has_dependents': False
             }, {
                 'id': 8, 'name': 'ivlcolmod', 'type': 'interval',
                 'default': None,
                 'nullable': True, 'description': None, 'primary_key': False,
-                'type_options': {'fields': 'day to second', 'precision': 3},
+                'type_options': {'fields': 'day to second'},
                 'has_dependents': False
             }, {
                 'id': 10, 'name': 'arrcol', 'type': '_array',
                 'default': None,
                 'nullable': True, 'description': None, 'primary_key': False,
-                'type_options': {'item_type': 'text'},
-                'has_dependents': False
-            }, {
-                'id': 12, 'name': 'vccol', 'type': 'character varying',
-                'default': None,
-                'nullable': True, 'description': None, 'primary_key': False,
-                'type_options': {'length': 123},
+                'type_options': {'item_type': 'character varying', 'length': 3},
                 'has_dependents': False
             }
         ),

From 847ded497e54fb55ffa7be390a97e15312866e5e Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 7 May 2024 15:56:40 +0800
Subject: [PATCH 0155/1141] add test for wiring of column info getter to DB

---
 db/tests/columns/operations/test_select.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/db/tests/columns/operations/test_select.py b/db/tests/columns/operations/test_select.py
index 242a8e6847..44c995766f 100644
--- a/db/tests/columns/operations/test_select.py
+++ b/db/tests/columns/operations/test_select.py
@@ -1,9 +1,11 @@
+from unittest.mock import patch
 import warnings
 import pytest
 from sqlalchemy import (
     String, Integer, Column, Table, MetaData, DateTime, func
 )
 from db.columns.exceptions import DynamicDefaultWarning
+from db.columns.operations import select as col_select
 from db.columns.operations.select import (
     get_column_attnum_from_name, get_column_default,
     get_column_name_from_attnum, get_columns_attnum_from_names,
@@ -13,6 +15,14 @@
 from db.metadata import get_empty_metadata
 
 
+def test_get_column_info_for_table():
+    with patch.object(col_select, 'exec_msar_func') as mock_exec:
+        mock_exec.return_value.fetchone = lambda: ('a', 'b')
+        result = col_select.get_column_info_for_table('table', 'conn')
+    mock_exec.assert_called_once_with('conn', 'get_column_info', 'table')
+    assert result == 'a'
+
+
 def test_get_attnum_from_name(engine_with_schema):
     engine, schema = engine_with_schema
     table_name = "table_with_columns"

From a4cefb1b647e652788326bfd538dbd235b5d9084 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 7 May 2024 12:25:03 -0400
Subject: [PATCH 0156/1141] Adjust eslint settings

---
 mathesar_ui/.eslintrc.cjs | 41 +++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/mathesar_ui/.eslintrc.cjs b/mathesar_ui/.eslintrc.cjs
index b926321ba9..2ec3f77086 100644
--- a/mathesar_ui/.eslintrc.cjs
+++ b/mathesar_ui/.eslintrc.cjs
@@ -24,8 +24,8 @@ module.exports = {
     'plugin:svelte/recommended',
     'plugin:svelte/prettier',
     'plugin:import/errors',
-		'plugin:import/warnings',
-    'plugin:import/typescript'
+    'plugin:import/warnings',
+    'plugin:import/typescript',
   ],
   rules: {
     'import/no-extraneous-dependencies': ['error', { devDependencies: true }],
@@ -48,24 +48,31 @@ module.exports = {
     'no-restricted-syntax': 0,
     '@typescript-eslint/require-await': 'off',
     'class-methods-use-this': 'off',
-    "no-multiple-empty-lines": 1,
+    'no-multiple-empty-lines': 1,
     'import/order': [
-			'warn',
-			{
-				alphabetize: {
-					order: 'asc',
-          orderImportKind:'asc',
-					caseInsensitive: true
-				},
-				'newlines-between': 'always',
-        'groups': ['builtin', 'external', 'internal', ['parent', 'sibling'], 'index'],
-			}
-		],
+      'error',
+      {
+        alphabetize: {
+          order: 'asc',
+          orderImportKind: 'asc',
+          caseInsensitive: true,
+        },
+        'newlines-between': 'always',
+        groups: [
+          'builtin',
+          'external',
+          'internal',
+          'parent',
+          'sibling',
+          'index',
+        ],
+      },
+    ],
     'sort-imports': [
-      'warn',
+      'error',
       {
-        'ignoreDeclarationSort': true,
-      }
+        ignoreDeclarationSort: true,
+      },
     ],
   },
   overrides: [

From fca4a09f75d4e1610e56373b2e3d346a6059e16b Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 7 May 2024 09:20:36 -0400
Subject: [PATCH 0157/1141] Use a separate command for fixing lint problems

---
 mathesar_ui/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mathesar_ui/package.json b/mathesar_ui/package.json
index 2583006db6..e2dae02a4c 100644
--- a/mathesar_ui/package.json
+++ b/mathesar_ui/package.json
@@ -5,7 +5,8 @@
     "dev": "vite",
     "format": "prettier --write .",
     "check-format": "prettier --check .",
-    "lint": "eslint --fix ",
+    "lint": "eslint .",
+    "lint-fix": "eslint --fix .",
     "typecheck": "svelte-check --tsconfig tsconfig.json --threshold warning .",
     "build": "vite build",
     "test": "vitest",

From f8a92d301bc7b3bdded5ce19df21e95ffdf06856 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 7 May 2024 12:26:59 -0400
Subject: [PATCH 0158/1141] Reformat imports in TransformationPane.svelte

---
 .../transformations-pane/TransformationsPane.svelte   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/TransformationsPane.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/TransformationsPane.svelte
index e5c61b70de..ea680e2733 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/TransformationsPane.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/TransformationsPane.svelte
@@ -11,11 +11,6 @@
     ImmutableMap,
   } from '@mathesar-component-library';
 
-  import FilterTransformation from './FilterTransformation.svelte';
-  import HideTransformation from './HideTransformation.svelte';
-  import SortTransformation from './SortTransformation.svelte';
-  import SummarizationTransformation from './summarization/SummarizationTransformation.svelte';
-  import { calcAllowedColumnsPerTransformation } from './transformationUtils';
   import QueryFilterTransformationModel from '../../QueryFilterTransformationModel';
   import QueryHideTransformationModel from '../../QueryHideTransformationModel';
   import type QueryManager from '../../QueryManager';
@@ -23,6 +18,12 @@
   import QuerySortTransformationModel from '../../QuerySortTransformationModel';
   import QuerySummarizationTransformationModel from '../../QuerySummarizationTransformationModel';
 
+  import FilterTransformation from './FilterTransformation.svelte';
+  import HideTransformation from './HideTransformation.svelte';
+  import SortTransformation from './SortTransformation.svelte';
+  import SummarizationTransformation from './summarization/SummarizationTransformation.svelte';
+  import { calcAllowedColumnsPerTransformation } from './transformationUtils';
+
   export let queryManager: QueryManager;
 
   $: ({ query, processedColumns, columnsMetaData } = queryManager);

From 0acd85cd2787c9ce5c766649c606bf3189eafa29 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 7 May 2024 12:21:56 -0400
Subject: [PATCH 0159/1141] Document import sorting with ESLint

---
 mathesar_ui/README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/mathesar_ui/README.md b/mathesar_ui/README.md
index d9ce471ebc..c3f4199744 100644
--- a/mathesar_ui/README.md
+++ b/mathesar_ui/README.md
@@ -95,6 +95,16 @@ We use [ESLint](https://eslint.org/) to help spot more complex issues within cod
   docker exec -it -w /code/mathesar_ui mathesar_service_dev npx eslint src/App.svelte
   ```
 
+### Auto-fixing linting errors
+
+ESLint can fix some errors automatically. In particular, we rely on ESLint to auto-sort our JavaScript import statements, so if you don't auto-fix your linting errors before submitting a PR, you're likely to get some CI errors in your PR which complain about out-of-order import statements.
+
+- Auto-fix all possible linting errors:
+
+  ```
+  docker exec -it -w /code/mathesar_ui mathesar_service_dev npm run lint-fix
+  ```
+
 ## Testing
 
 ### Integration tests

From f751b57470ece6c35815c4d58dc1be803f1da366 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 7 May 2024 12:52:05 -0400
Subject: [PATCH 0160/1141] Auto-fix import order issues in all files

---
 mathesar_ui/src/App.svelte                    |  8 ++--
 mathesar_ui/src/AppContext.svelte             | 15 +++---
 mathesar_ui/src/api/rest/columns.ts           |  2 +-
 mathesar_ui/src/api/rest/connections.ts       |  2 +-
 mathesar_ui/src/api/rest/dataFiles.ts         |  3 +-
 mathesar_ui/src/api/rest/queryShares.ts       |  4 +-
 mathesar_ui/src/api/rest/schemas.ts           |  7 +--
 mathesar_ui/src/api/rest/shares.ts            |  4 +-
 mathesar_ui/src/api/rest/tableShares.ts       |  4 +-
 mathesar_ui/src/api/rest/types/queries.ts     |  2 +-
 mathesar_ui/src/api/rest/types/tables.ts      |  1 +
 .../api/rest/types/tables/joinable_tables.ts  |  1 +
 mathesar_ui/src/api/rest/users.ts             |  3 +-
 mathesar_ui/src/api/rest/utils/errors.ts      |  4 +-
 mathesar_ui/src/api/rest/utils/recordUtils.ts |  5 +-
 .../src/api/rest/utils/requestUtils.ts        |  1 +
 mathesar_ui/src/api/rpc/index.ts              |  1 +
 .../button/__meta__/Button.test.ts            |  4 +-
 .../CancelOrProceedButtonPair.svelte          |  5 +-
 .../checkbox-group/CheckboxGroup.svelte       |  1 +
 .../checkbox/Checkbox.svelte                  |  1 +
 .../collapsible/Collapsible.svelte            |  2 +-
 .../common/actions/clickOffBounds.ts          |  4 +-
 .../common/actions/popper.ts                  |  2 +-
 .../common/base-components/BaseInput.svelte   |  6 ++-
 .../src/component-library/common/icons.ts     | 29 +++++------
 .../common/utils/ReductionStore.ts            |  3 +-
 .../common/utils/WritableMap.ts               |  5 +-
 .../common/utils/WritableSet.ts               |  5 +-
 .../__tests__/CancellablePromise.test.ts      |  1 +
 .../utils/__tests__/ruleExecutor.test.ts      |  2 +-
 .../common/utils/__tests__/storeUtils.test.ts |  1 +
 .../common/utils/contextValidationUtil.ts     |  4 +-
 .../common/utils/formatUtils.ts               |  1 +
 .../common/utils/storeUtils.ts                |  2 +-
 .../common/utils/styleUtils.ts                |  1 +
 .../confirmation/Confirmation.svelte          |  2 +
 .../confirmation/ConfirmationController.ts    |  3 +-
 .../context-menu/ContextMenu.svelte           |  8 ++--
 .../data-type-based-input/BooleanInput.svelte |  1 +
 .../DataTypeBasedInput.svelte                 |  5 +-
 .../data-type-based-input/EnumInput.svelte    | 13 ++---
 .../data-type-based-input/StringInput.svelte  |  3 +-
 .../data-type-based-input/utils.ts            |  2 +-
 .../date-time-picker/DatePicker.svelte        |  3 +-
 .../InlineDateTimePicker.svelte               |  7 ++-
 .../debounce/Debounce.svelte                  |  1 +
 .../dropdown-menu/DropdownMenu.svelte         |  2 +-
 .../dropdown/AccompanyingElements.ts          |  2 +-
 .../dropdown/AttachableDropdown.svelte        | 10 ++--
 .../dropdown/Dropdown.svelte                  |  5 +-
 .../fieldset-group/FieldsetGroup.svelte       |  1 +
 .../file-upload/FileUpload.svelte             |  1 +
 .../form-builder/FormBuilder.svelte           |  1 +
 .../form-builder/FormElement.svelte           |  6 +--
 .../form-builder/FormInput.svelte             |  5 +-
 .../component-library/form-builder/If.svelte  |  2 +-
 .../form-builder/Switch.svelte                |  2 +-
 .../__meta__/FormBuilderStory.svelte          |  2 +-
 .../form-builder/__meta__/formFactory.test.ts |  1 +
 .../form-builder/formFactory.ts               |  9 ++--
 .../component-library/form-builder/types.ts   |  1 +
 .../formatted-input/FormattedInput.svelte     |  3 +-
 .../src/component-library/help/Help.svelte    |  4 +-
 .../icon/__meta__/Icon.test.ts                |  3 +-
 .../input-group/__meta__/InputGroup.test.ts   |  1 +
 .../__meta__/InputGroupTest.svelte            |  1 +
 .../label/LabelController.ts                  |  3 +-
 .../labeled-input/LabeledInput.svelte         |  1 +
 .../component-library/list-box/ListBox.svelte | 12 +++--
 .../list-box/ListBoxOptions.svelte            |  4 +-
 .../list-box/ListBoxTypes.ts                  |  1 +
 .../match-highlighter/MatchHighlighter.svelte |  2 +-
 .../__tests__/matchHighlighterUtils.test.ts   |  2 +-
 .../matchHighlighterUtils.ts                  |  1 +
 .../menu/ButtonMenuItem.svelte                |  6 ++-
 .../menu/CheckboxMenuItem.svelte              |  7 +--
 .../menu/LinkMenuItem.svelte                  |  3 +-
 .../src/component-library/menu/Menu.svelte    |  1 +
 .../component-library/menu/MenuController.ts  |  2 +-
 .../menu/MenuItemContents.svelte              |  1 +
 .../modal/ControlledModal.svelte              |  2 +-
 .../modal/IndependentModal.svelte             |  2 +-
 .../modal/ModalController.ts                  |  3 +-
 .../modal/ModalMultiplexer.ts                 |  5 +-
 .../multi-select/MultiSelect.svelte           |  3 +-
 .../notification/Notification.svelte          |  3 +-
 .../number-input/NumberInput.svelte           |  3 +-
 .../number-input/NumberInputTypes.ts          |  1 +
 .../StringifiedNumberInput.svelte             |  3 +-
 .../__tests__/NumberInput.test.ts             |  1 +
 .../AbstractNumberFormatter.ts                |  3 +-
 .../number-formatter/NumberFormatter.ts       |  1 +
 .../StringifiedNumberFormatter.ts             |  1 +
 .../__tests__/NumberFormatter.test.ts         |  2 +-
 .../__tests__/cleaners.test.ts                |  6 +--
 .../number-input/number-formatter/cleaners.ts |  1 +
 .../number-formatter/formatter.ts             |  2 +-
 .../number-input/number-formatter/parsers.ts  |  3 +-
 .../pagination/Pagination.svelte              | 10 ++--
 .../password-input/PasswordInput.svelte       |  1 +
 .../radio-group/RadioGroup.svelte             |  2 +-
 .../src/component-library/radio/Radio.svelte  |  1 +
 .../component-library/render/Render.svelte    |  1 +
 .../component-library/select/Select.svelte    |  9 ++--
 .../select/__meta__/Select.test.ts            |  3 +-
 .../selection-list/SelectionList.svelte       |  6 ++-
 .../skeleton/__meta__/Skeleton.test.ts        |  1 +
 .../spinner-button/SpinnerButton.svelte       |  5 +-
 .../StringOrComponent.svelte                  |  2 +-
 .../src/component-library/tabs/Tab.svelte     |  1 +
 .../tabs/TabContainer.svelte                  |  1 +
 .../text-area/TextArea.svelte                 |  3 +-
 .../text-input/TextInput.svelte               |  1 +
 .../text-input/TextInputTypes.ts              |  1 +
 .../text-input/TextInputWithPrefix.svelte     |  1 +
 .../text-input/__meta__/TextInput.test.ts     |  1 +
 .../toast/ToastController.ts                  | 15 +++---
 .../component-library/toast/ToastItem.svelte  |  5 +-
 .../toast/ToastPresenter.svelte               |  3 +-
 .../__meta__/ToastStoryCustomItem.svelte      |  1 +
 .../toast/__meta__/ToastStoryHighLevel.svelte |  2 +
 .../toast/__meta__/ToastStoryLowLevel.svelte  |  7 +--
 .../tooltip/TooltipAction.ts                  |  1 +
 .../src/component-library/tree/Tree.svelte    | 15 +++---
 .../component-library/tree/TreeItem.svelte    |  3 +-
 .../component-library/window/Window.svelte    |  2 +-
 .../with-panel/WithPanel.svelte               |  2 +-
 mathesar_ui/src/components/AppHeader.svelte   | 30 ++++++------
 .../src/components/AppSecondaryHeader.svelte  |  1 +
 mathesar_ui/src/components/CellValue.svelte   |  1 +
 .../src/components/DatabaseName.svelte        |  1 +
 .../src/components/EditTableHOC.svelte        |  3 +-
 .../components/EditableTextWithActions.svelte |  7 +--
 .../src/components/GrowableTextArea.svelte    |  1 +
 .../src/components/LinkedRecord.svelte        |  4 +-
 .../src/components/ModificationStatus.svelte  |  4 +-
 .../NameAndDescInputModalForm.svelte          |  5 +-
 .../src/components/OnPageFilterBar.svelte     |  5 +-
 .../src/components/PaginationGroup.svelte     |  3 +-
 mathesar_ui/src/components/QueryName.svelte   |  1 +
 .../src/components/RecordPageLink.svelte      |  3 +-
 .../src/components/RefreshButton.svelte       |  3 +-
 mathesar_ui/src/components/SchemaName.svelte  |  1 +
 .../components/SelectProcessedColumn.svelte   |  3 +-
 .../components/SelectProcessedColumns.svelte  |  3 +-
 mathesar_ui/src/components/SelectTable.svelte |  4 +-
 .../SelectTableWithinCurrentSchema.svelte     |  1 +
 .../src/components/StatusIndicator.svelte     |  2 +-
 mathesar_ui/src/components/TableName.svelte   |  3 +-
 .../AbstractTypeControl.svelte                | 18 ++++---
 .../AbstractTypeDBOptions.svelte              | 13 ++---
 .../AbstractTypeDisplayOptions.svelte         |  6 ++-
 .../AbstractTypeSelector.svelte               |  6 ++-
 .../DbTypeIndicator.svelte                    |  1 +
 .../DurationConfiguration.svelte              |  7 +--
 .../components/abstract-type-control/utils.ts | 10 ++--
 .../breadcrumb/BreadcrumbItem.svelte          | 17 ++++---
 .../breadcrumb/BreadcrumbPageSeparator.svelte |  2 +-
 .../BreadcrumbRecordSelector.svelte           |  2 +-
 .../breadcrumb/BreadcrumbSelector.svelte      |  6 ++-
 .../breadcrumb/BreadcrumbSelectorRow.svelte   |  2 +
 .../breadcrumb/DatabaseSelector.svelte        |  6 ++-
 .../breadcrumb/EntitySelector.svelte          | 18 +++----
 .../breadcrumb/LogoAndNameWithLink.svelte     |  1 +
 .../breadcrumb/SchemaSelector.svelte          |  2 +
 .../components/breadcrumb/breadcrumbUtils.ts  |  6 ++-
 .../components/cell-fabric/CellFabric.svelte  |  1 +
 .../cell-fabric/DynamicInput.svelte           |  2 +-
 .../cell-fabric/data-types/arrayFactory.ts    |  9 ++--
 .../cell-fabric/data-types/boolean.ts         |  5 +-
 .../data-types/components/CellWrapper.svelte  |  6 ++-
 .../components/SteppedInputCell.svelte        |  5 +-
 .../__tests__/SteppedInputCell.test.ts        |  1 +
 .../components/array/ArrayCell.svelte         |  4 +-
 .../components/checkbox/CheckboxCell.svelte   |  4 +-
 .../components/date-time/DateTimeCell.svelte  |  1 +
 .../components/date-time/DateTimeInput.svelte | 11 +++--
 .../components/date-time/Presets.svelte       |  2 +
 .../formatted-input/FormattedInputCell.svelte |  1 +
 .../linked-record/LinkedRecordCell.svelte     | 14 +++---
 .../linked-record/LinkedRecordInput.svelte    | 15 +++---
 .../components/money/MoneyCell.svelte         |  1 +
 .../components/money/MoneyCellInput.svelte    |  1 +
 .../components/number/NumberCell.svelte       |  1 +
 .../components/number/NumberCellInput.svelte  |  1 +
 .../primary-key/PrimaryKeyCell.svelte         |  3 +-
 .../components/select/SingleSelectCell.svelte | 10 ++--
 .../components/textarea/TextAreaCell.svelte   |  1 +
 .../components/textbox/TextBoxCell.svelte     |  1 +
 .../data-types/components/typeDefinitions.ts  | 10 ++--
 .../data-types/components/uri/UriCell.svelte  |  4 +-
 .../components/cell-fabric/data-types/date.ts |  9 ++--
 .../cell-fabric/data-types/datetime.ts        |  9 ++--
 .../cell-fabric/data-types/duration.ts        | 13 ++---
 .../cell-fabric/data-types/index.ts           | 20 ++++----
 .../cell-fabric/data-types/money.ts           | 11 +++--
 .../cell-fabric/data-types/number.ts          | 11 +++--
 .../cell-fabric/data-types/string.ts          |  5 +-
 .../components/cell-fabric/data-types/time.ts |  9 ++--
 .../cell-fabric/data-types/typeDefinitions.ts |  3 +-
 .../components/cell-fabric/data-types/uri.ts  |  3 +-
 .../cell-fabric/data-types/utils.ts           |  3 +-
 .../src/components/cell-fabric/utils.ts       |  3 +-
 .../src/components/column/ColumnName.svelte   |  1 +
 .../column/ProcessedColumnName.svelte         |  1 +
 mathesar_ui/src/components/column/types.ts    |  2 +-
 .../filter-entry/FilterEntry.svelte           | 21 ++++----
 .../src/components/filter-entry/types.ts      |  2 +-
 .../src/components/filter-entry/utils.ts      |  2 +-
 mathesar_ui/src/components/form/Field.svelte  |  3 +-
 .../src/components/form/FieldErrors.svelte    |  1 +
 .../src/components/form/FormStatus.svelte     |  3 +-
 .../src/components/form/FormSubmit.svelte     |  3 +-
 .../src/components/form/GridFormInput.svelte  |  4 +-
 .../components/form/__tests__/form.test.ts    |  4 +-
 mathesar_ui/src/components/form/field.ts      |  4 +-
 mathesar_ui/src/components/form/form.ts       | 11 +++--
 mathesar_ui/src/components/form/validators.ts |  1 +
 .../components/group-entry/GroupEntry.svelte  | 10 ++--
 .../components/message-boxes/ErrorBox.svelte  |  1 +
 .../components/message-boxes/InfoBox.svelte   |  1 +
 .../message-boxes/MessageBox.svelte           |  2 +-
 .../message-boxes/OutcomeBox.svelte           |  1 +
 .../message-boxes/WarningBox.svelte           |  1 +
 .../src/components/rich-text/RichText.svelte  |  1 +
 .../rich-text/__tests__/richTextUtils.test.ts |  4 +-
 .../components/routing/EventfulRoute.svelte   |  1 +
 .../components/routing/MultiPathRoute.svelte  |  1 +
 mathesar_ui/src/components/sheet/Sheet.svelte |  3 +-
 .../components/sheet/SheetCellResizer.svelte  |  1 +
 .../components/sheet/SheetClipboardHandler.ts |  2 +-
 .../src/components/sheet/SheetHeader.svelte   |  1 +
 .../sheet/SheetPositionableCell.svelte        |  2 +-
 .../src/components/sheet/SheetSelection.ts    |  3 +-
 .../components/sheet/SheetVirtualRows.svelte  |  3 +-
 mathesar_ui/src/components/sheet/utils.ts     |  3 +-
 .../sheet/virtual-list/Resizer.svelte         |  3 +-
 .../sheet/virtual-list/VirtualList.svelte     | 15 +++---
 .../components/sort-entry/SortEntry.svelte    | 12 +++--
 .../src/components/sort-entry/types.ts        |  1 +
 .../src/components/sort-entry/utils.ts        |  3 +-
 mathesar_ui/src/i18n/index.ts                 |  3 +-
 mathesar_ui/src/i18n/languages/en/index.ts    |  3 +-
 mathesar_ui/src/i18n/languages/ja/index.ts    |  3 +-
 mathesar_ui/src/icons/index.ts                | 48 ++++++++++---------
 .../src/layouts/LayoutWithHeader.svelte       |  2 +-
 .../json-rpc-client-builder/requests.ts       |  1 +
 mathesar_ui/src/pages/ErrorPage.svelte        |  3 +-
 mathesar_ui/src/pages/WelcomePage.svelte      |  5 +-
 .../src/pages/admin-update/ReleaseBox.svelte  |  2 +-
 .../admin-update/SoftwareUpdateContent.svelte |  4 +-
 .../admin-update/SoftwareUpdatePage.svelte    |  2 +
 .../pages/admin-users/AdminNavigation.svelte  |  5 +-
 .../src/pages/admin-users/EditUserPage.svelte | 11 +++--
 .../src/pages/admin-users/NewUserPage.svelte  |  9 ++--
 .../pages/admin-users/UserListingPage.svelte  | 10 ++--
 .../src/pages/admin-users/UserRow.svelte      |  2 +-
 .../pages/connections/ConnectionRow.svelte    | 13 ++---
 .../pages/connections/ConnectionsPage.svelte  |  3 +-
 .../data-explorer/DataExplorerPage.svelte     |  9 ++--
 .../pages/database/AddEditSchemaModal.svelte  | 13 ++---
 .../src/pages/database/DatabaseDetails.svelte | 37 +++++++-------
 .../src/pages/database/DatabasePage.svelte    |  1 +
 .../database/DbAccessControlModal.svelte      | 15 +++---
 .../database/SchemaConstituentCounts.svelte   |  1 +
 .../src/pages/database/SchemaRow.svelte       |  4 +-
 .../pages/exploration/ExplorationPage.svelte  |  6 ++-
 .../src/pages/exploration/Header.svelte       |  6 ++-
 .../ShareExplorationDropdown.svelte           |  9 ++--
 .../ColumnNamingStrategyInput.svelte          |  4 +-
 .../column-names/LabelNoHeaderRow.svelte      |  1 +
 .../column-names/LabelYesHeaderRow.svelte     |  1 +
 .../inference/ColumnTypeInferenceInput.svelte |  4 +-
 .../inference/LabelInferenceFalse.svelte      |  1 +
 .../inference/LabelInferenceTrue.svelte       |  1 +
 .../src/pages/import/preview/ErrorInfo.svelte |  3 +-
 .../preview/ImportPreviewContent.svelte       | 19 ++++----
 .../import/preview/ImportPreviewLayout.svelte |  1 +
 .../import/preview/ImportPreviewPage.svelte   |  8 ++--
 .../import/preview/ImportPreviewSheet.svelte  |  3 +-
 .../pages/import/preview/PreviewColumn.svelte |  4 +-
 .../import/preview/importPreviewPageUtils.ts  |  4 +-
 .../pages/import/upload/DataFileInput.svelte  |  7 +--
 .../import/upload/ImportUploadPage.svelte     | 24 ++++++----
 mathesar_ui/src/pages/pageTitleUtils.ts       |  1 +
 .../src/pages/record/DirectField.svelte       | 16 ++++---
 .../src/pages/record/RecordPage.svelte        |  1 +
 .../src/pages/record/RecordPageContent.svelte |  4 +-
 mathesar_ui/src/pages/record/RecordStore.ts   | 18 +++----
 .../src/pages/record/TableWidget.svelte       |  2 +-
 mathesar_ui/src/pages/record/Widgets.svelte   |  4 +-
 .../schema/CreateEmptyTableButton.svelte      |  5 +-
 .../CreateNewExplorationTutorial.svelte       |  3 +-
 .../pages/schema/CreateNewTableButton.svelte  | 15 +++---
 .../schema/CreateNewTableTutorial.svelte      |  4 +-
 mathesar_ui/src/pages/schema/EditTable.svelte |  5 +-
 .../src/pages/schema/ExplorationItem.svelte   |  5 +-
 .../src/pages/schema/ExplorationsList.svelte  |  4 +-
 .../schema/SchemaAccessControlModal.svelte    | 15 +++---
 .../pages/schema/SchemaExplorations.svelte    | 10 ++--
 .../src/pages/schema/SchemaOverview.svelte    | 20 ++++----
 .../src/pages/schema/SchemaPage.svelte        | 29 ++++++-----
 .../src/pages/schema/SchemaTables.svelte      |  6 ++-
 mathesar_ui/src/pages/schema/TableCard.svelte | 16 ++++---
 .../src/pages/schema/TablesList.svelte        |  2 +
 mathesar_ui/src/pages/table/TablePage.svelte  | 11 +++--
 .../src/pages/user-profile/ProfilePage.svelte | 11 +++--
 mathesar_ui/src/routes/AdminRoute.svelte      |  6 ++-
 .../src/routes/AnonymousAccessRoutes.svelte   |  3 +-
 .../src/routes/AuthenticatedRoutes.svelte     |  3 +-
 .../src/routes/DataExplorerRoute.svelte       | 25 +++++-----
 mathesar_ui/src/routes/DatabaseRoute.svelte   |  8 ++--
 .../src/routes/ExplorationRoute.svelte        |  3 +-
 mathesar_ui/src/routes/ImportRoute.svelte     |  4 +-
 mathesar_ui/src/routes/RecordPageRoute.svelte |  4 +-
 mathesar_ui/src/routes/RootRoute.svelte       |  8 ++--
 mathesar_ui/src/routes/SchemaRoute.svelte     | 10 ++--
 .../src/routes/SharedExplorationRoute.svelte  |  5 +-
 .../src/routes/SharedTableRoute.svelte        |  3 +-
 mathesar_ui/src/routes/TableRoute.svelte      |  4 +-
 .../src/routes/UserProfileRoute.svelte        |  2 +
 mathesar_ui/src/routes/UsersRoute.svelte      |  9 ++--
 mathesar_ui/src/stores/AsyncStore.ts          |  6 +--
 mathesar_ui/src/stores/LocalStorageStore.ts   |  2 +-
 .../abstract-types/abstractTypeCategories.ts  | 29 +++++------
 .../abstract-types/operations/filtering.ts    |  4 +-
 .../operations/preprocFunctions.ts            |  2 +-
 .../operations/summarization.ts               |  1 +
 .../src/stores/abstract-types/store.ts        |  3 +-
 .../abstract-types/type-configs/boolean.ts    |  3 +-
 .../type-configs/comboTypes/arrayFactory.ts   |  3 +-
 .../comboTypes/jsonArrayFactory.ts            |  1 +
 .../comboTypes/jsonObjectFactory.ts           |  1 +
 .../abstract-types/type-configs/date.ts       |  6 ++-
 .../abstract-types/type-configs/datetime.ts   | 12 +++--
 .../abstract-types/type-configs/duration.ts   |  5 +-
 .../abstract-types/type-configs/email.ts      |  1 +
 .../abstract-types/type-configs/fallback.ts   |  1 +
 .../abstract-types/type-configs/money.ts      |  6 ++-
 .../abstract-types/type-configs/number.ts     |  5 +-
 .../abstract-types/type-configs/text.ts       |  6 +--
 .../abstract-types/type-configs/time.ts       |  8 ++--
 .../stores/abstract-types/type-configs/uri.ts |  1 +
 .../abstract-types/type-configs/utils.ts      |  2 +-
 .../src/stores/abstract-types/types.ts        | 11 +++--
 .../src/stores/abstract-types/utils.ts        |  1 +
 mathesar_ui/src/stores/clipboard.ts           |  2 +-
 mathesar_ui/src/stores/confirmation.ts        |  6 ++-
 mathesar_ui/src/stores/databases.ts           | 12 ++---
 mathesar_ui/src/stores/queries.ts             | 37 +++++++-------
 mathesar_ui/src/stores/releases.ts            |  3 +-
 mathesar_ui/src/stores/schemas.ts             | 11 ++---
 mathesar_ui/src/stores/storeBasedUrls.ts      |  1 +
 .../src/stores/table-data/TableStructure.ts   |  5 +-
 .../stores/table-data/__tests__/utils.test.ts |  3 +-
 mathesar_ui/src/stores/table-data/columns.ts  | 13 ++---
 .../src/stores/table-data/constraints.ts      | 29 +++++------
 .../src/stores/table-data/constraintsUtils.ts |  2 +-
 mathesar_ui/src/stores/table-data/display.ts  | 10 ++--
 .../src/stores/table-data/filtering.ts        |  2 +-
 mathesar_ui/src/stores/table-data/meta.ts     | 11 +++--
 .../src/stores/table-data/processedColumns.ts |  6 ++-
 .../record-summaries/RecordSummaryStore.ts    |  5 +-
 .../__tests__/recordSummaryUtils.test.ts      |  3 +-
 .../record-summaries/recordSummaryUtils.ts    |  2 +-
 mathesar_ui/src/stores/table-data/records.ts  | 21 ++++----
 mathesar_ui/src/stores/table-data/sorting.ts  | 11 +++--
 .../src/stores/table-data/tabularData.ts      | 24 +++++-----
 mathesar_ui/src/stores/table-data/utils.ts    |  8 ++--
 mathesar_ui/src/stores/tables.ts              | 19 ++++----
 mathesar_ui/src/stores/userProfile.ts         |  5 +-
 mathesar_ui/src/stores/users.ts               | 15 +++---
 .../systems/connections/AddConnection.svelte  | 19 ++++----
 .../connections/AddConnectionModal.svelte     |  5 +-
 .../connections/ConnectionsEmptyState.svelte  |  6 ++-
 .../connections/DeleteConnectionModal.svelte  | 19 ++++----
 .../connections/EditConnectionModal.svelte    | 14 +++---
 .../connections/GeneralConnection.svelte      |  2 +-
 .../systems/connections/generalConnections.ts |  4 +-
 .../systems/data-explorer/ActionsPane.svelte  | 42 ++++++++--------
 .../systems/data-explorer/DataExplorer.svelte |  6 ++-
 .../QueryFilterTransformationModel.ts         |  5 +-
 .../QueryHideTransformationModel.ts           |  3 +-
 .../systems/data-explorer/QueryInspector.ts   |  8 ++--
 .../src/systems/data-explorer/QueryManager.ts | 24 +++++-----
 .../src/systems/data-explorer/QueryModel.ts   |  7 +--
 .../src/systems/data-explorer/QueryRunner.ts  | 30 ++++++------
 .../QuerySortTransformationModel.ts           |  3 +-
 .../QuerySummarizationTransformationModel.ts  |  5 +-
 .../data-explorer/QueryUndoRedoManager.ts     |  1 +
 .../data-explorer/__tests__/utils.test.ts     | 15 +++---
 .../exploration-inspector/CellTab.svelte      |  2 +
 .../ExplorationInspector.svelte               |  8 ++--
 .../ExplorationTab.svelte                     | 28 ++++++-----
 .../WithExplorationInspector.svelte           |  3 +-
 .../column-tab/ColumnSource.svelte            |  4 +-
 .../column-tab/ColumnTab.svelte               |  5 +-
 .../column-tab/DeleteColumnAction.svelte      |  4 +-
 .../input-sidebar/InputSidebar.svelte         | 13 +++--
 .../input-sidebar/WithInputSidebar.svelte     |  3 +-
 .../ColumnSelectionPane.svelte                |  9 ++--
 .../SelectableColumn.svelte                   |  4 +-
 .../SelectableColumnTree.svelte               |  4 +-
 .../TableGroupCollapsible.svelte              |  8 ++--
 .../FilterTransformation.svelte               |  2 +
 .../HideTransformation.svelte                 |  4 +-
 .../SortTransformation.svelte                 |  1 +
 .../summarization/Aggregation.svelte          |  4 +-
 .../SummarizationTransformation.svelte        | 11 +++--
 .../transformationUtils.ts                    |  5 +-
 .../result-pane/QueryRefreshButton.svelte     |  1 +
 .../result-pane/QueryRunErrors.svelte         | 10 ++--
 .../result-pane/ResultHeaderCell.svelte       |  7 +--
 .../result-pane/ResultPane.svelte             |  6 ++-
 .../result-pane/ResultRowCell.svelte          | 10 ++--
 .../data-explorer/result-pane/Results.svelte  |  7 ++-
 .../data-explorer/urlSerializationUtils.ts    |  4 +-
 .../src/systems/data-explorer/utils.ts        | 39 +++++++--------
 .../ModalRecordSelector.svelte                |  6 ++-
 .../RecordSelectorCellWrapper.svelte          |  5 +-
 .../RecordSelectorColumnHeaderCell.svelte     | 15 +++---
 .../RecordSelectorContent.svelte              |  8 ++--
 .../RecordSelectorController.ts               |  3 +-
 .../RecordSelectorDataCell.svelte             |  5 +-
 .../RecordSelectorNavigationButton.svelte     |  2 +
 .../RecordSelectorSubmitButton.svelte         |  4 +-
 .../RecordSelectorTable.svelte                | 15 +++---
 .../RecordSelectorWindow.svelte               |  8 ++--
 .../src/systems/shares/ShareEntity.svelte     | 31 ++++++------
 .../src/systems/table-view/Body.svelte        | 23 ++++-----
 .../table-view/ScrollAndResetHandler.svelte   |  9 ++--
 .../src/systems/table-view/StatusPane.svelte  | 15 +++---
 .../src/systems/table-view/TableView.svelte   |  7 +--
 .../actions-pane/ActionsPane.svelte           |  6 ++-
 .../actions-pane/MiniActionsPane.svelte       |  8 ++--
 .../actions-pane/ShareTableDropdown.svelte    |  9 ++--
 .../record-operations/filter/Filter.svelte    |  7 ++-
 .../filter/FilterDropdown.svelte              |  8 ++--
 .../filter/FilterEntries.svelte               | 13 ++---
 .../record-operations/group/Group.svelte      | 11 +++--
 .../group/GroupDropdown.svelte                |  4 +-
 .../record-operations/sort/Sort.svelte        |  3 +-
 .../sort/SortDropdown.svelte                  |  4 +-
 .../actions-pane/record-operations/utils.ts   |  2 +-
 .../ConstraintCollapseHeader.svelte           |  1 -
 .../constraints/ConstraintDetails.svelte      |  1 +
 .../constraints/ConstraintTypeSection.svelte  |  8 ++--
 .../ForeignKeyConstraintDetails.svelte        | 11 +++--
 .../constraints/NewFkConstraint.svelte        | 20 ++++----
 .../constraints/NewUniqueConstraint.svelte    | 26 +++++-----
 .../constraints/TableConstraints.svelte       | 14 +++---
 .../constraints/TableConstraintsModal.svelte  |  2 +
 .../__help__/ConstraintNameHelp.svelte        |  1 +
 .../systems/table-view/header/Header.svelte   | 21 ++++----
 .../ColumnHeaderContextMenu.svelte            |  6 +--
 .../header/header-cell/HeaderCell.svelte      | 12 ++---
 .../new-column-cell/ColumnTypeSelector.svelte |  8 ++--
 .../new-column-cell/NewColumnCell.svelte      | 12 +++--
 .../link-table/LinkTableForm.svelte           | 20 ++++----
 .../link-table/LinkTableModal.svelte          |  4 +-
 .../link-table/LinkTypeOption.svelte          |  8 ++--
 .../table-view/link-table/NewColumn.svelte    |  6 ++-
 .../link-table/SelectLinkType.svelte          |  2 +
 .../table-view/link-table/linkTableUtils.ts   |  1 +
 .../systems/table-view/row/CellErrors.svelte  |  3 +-
 .../systems/table-view/row/GroupHeader.svelte |  7 +--
 .../row/GroupHeaderCellValue.svelte           |  6 +--
 .../table-view/row/NewRecordMessage.svelte    |  1 +
 .../src/systems/table-view/row/Row.svelte     | 29 +++++------
 .../src/systems/table-view/row/RowCell.svelte | 24 +++++-----
 .../table-view/row/RowContextOptions.svelte   | 17 +++----
 .../systems/table-view/row/RowControl.svelte  | 13 ++---
 .../table-inspector/CollapsibleHeader.svelte  |  3 +-
 .../table-inspector/TableInspector.svelte     |  9 ++--
 .../table-inspector/WithTableInspector.svelte |  3 +-
 .../table-inspector/cell/CellMode.svelte      |  3 +-
 .../column/ColumnActions.svelte               |  8 ++--
 .../column/ColumnFormatting.svelte            |  3 +-
 .../table-inspector/column/ColumnMode.svelte  | 19 ++++----
 .../column/ColumnNameAndDescription.svelte    |  1 +
 .../column/ColumnOptions.svelte               | 19 ++++----
 .../table-inspector/column/ColumnType.svelte  | 11 +++--
 .../column/ColumnTypeSpecifierTag.svelte      |  3 +-
 .../column/SetDefaultValue.svelte             | 13 ++---
 .../ExtractColumnsModal.svelte                | 10 ++--
 .../ExtractColumnsModalController.ts          |  6 ++-
 .../column-extraction/LinkedTableName.svelte  |  4 +-
 .../SelectLinkedTable.svelte                  |  1 +
 .../SuccessToastContent.svelte                |  1 +
 .../columnExtractionUtils.ts                  |  5 +-
 .../record-summary/AppendColumn.svelte        |  7 +--
 .../FkRecordSummaryConfig.svelte              |  2 +-
 .../record-summary/RecordSummaryConfig.svelte |  4 +-
 .../record-summary/TemplateInput.svelte       |  5 +-
 .../record-summary/TemplateInputFormatter.ts  |  3 +-
 .../recordSummaryTemplateUtils.ts             |  3 +-
 .../table-inspector/record/RecordMode.svelte  |  5 +-
 .../table-inspector/record/RowActions.svelte  | 13 ++---
 .../table/AdvancedActions.svelte              |  6 ++-
 .../table-inspector/table/TableActions.svelte | 18 +++----
 .../table/TableDeleteConfirmationBody.svelte  |  5 +-
 .../table/TableDescription.svelte             |  3 +-
 .../table-inspector/table/TableMode.svelte    | 15 +++---
 .../table-inspector/table/TableName.svelte    |  3 +-
 .../table/links/LinkItem.svelte               |  4 +-
 .../table/links/LinkSection.svelte            |  6 ++-
 .../table/links/LinksSectionContainer.svelte  |  4 +-
 .../table/links/TableLinks.svelte             |  1 +
 .../AccessControlRow.svelte                   | 29 +++++------
 .../AccessControlView.svelte                  | 30 ++++++------
 .../PasswordChangeForm.svelte                 | 25 +++++-----
 .../SelectDisplayLanguage.svelte              |  2 +-
 .../SelectUserType.svelte                     |  2 +
 .../UserDetailsForm.svelte                    | 22 +++++----
 .../systems/users-and-permissions/utils.ts    |  6 +--
 mathesar_ui/src/utils/cachedFetchStore.ts     |  2 +-
 mathesar_ui/src/utils/columnUtils.ts          |  7 +--
 .../src/utils/date-time/DateTimeFormatter.ts  |  1 +
 .../utils/date-time/DateTimeSpecification.ts  |  2 +-
 .../src/utils/duration/DurationFormatter.ts   |  6 ++-
 .../__tests__/DurationFormatter.test.ts       |  2 +-
 mathesar_ui/src/utils/overflowObserver.ts     |  2 +-
 mathesar_ui/src/utils/permissions.ts          |  1 +
 mathesar_ui/src/utils/preloadData.ts          |  6 +--
 mathesar_ui/src/utils/tables.ts               |  2 +-
 mathesar_ui/src/utils/typeUtils.ts            |  1 +
 mathesar_ui/vite.config.js                    |  8 ++--
 mathesar_ui/vitest-setup.config.ts            |  3 +-
 529 files changed, 1978 insertions(+), 1370 deletions(-)

diff --git a/mathesar_ui/src/App.svelte b/mathesar_ui/src/App.svelte
index e426b495da..a0b1812e01 100644
--- a/mathesar_ui/src/App.svelte
+++ b/mathesar_ui/src/App.svelte
@@ -1,10 +1,12 @@
 <script lang="ts">
-  import { Spinner } from '@mathesar-component-library';
-  import { preloadCommonData } from '@mathesar/utils/preloadData';
   import { isLoading as isTranslationLoading, locale } from 'svelte-i18n';
+
+  import { preloadCommonData } from '@mathesar/utils/preloadData';
+  import { Spinner } from '@mathesar-component-library';
+
   import AppContext from './AppContext.svelte';
-  import RootRoute from './routes/RootRoute.svelte';
   import { initI18n } from './i18n';
+  import RootRoute from './routes/RootRoute.svelte';
 
   const commonData = preloadCommonData();
   void initI18n(commonData.user.display_language ?? 'en');
diff --git a/mathesar_ui/src/AppContext.svelte b/mathesar_ui/src/AppContext.svelte
index e153ef508d..87e28eaeaa 100644
--- a/mathesar_ui/src/AppContext.svelte
+++ b/mathesar_ui/src/AppContext.svelte
@@ -1,20 +1,21 @@
 <script lang="ts">
   import { get } from 'svelte/store';
-  import { Confirmation, ToastPresenter } from '@mathesar-component-library';
-  import type { CommonData } from '@mathesar/utils/preloadData';
+
+  import { setBreadcrumbItemsInContext } from '@mathesar/components/breadcrumb/breadcrumbUtils';
+  import { setNewClipboardHandlerStoreInContext } from '@mathesar/stores/clipboard';
   import { confirmationController } from '@mathesar/stores/confirmation';
+  import { modal } from '@mathesar/stores/modal';
+  import { setReleasesStoreInContext } from '@mathesar/stores/releases';
   import { toast } from '@mathesar/stores/toast';
-  import { setNewClipboardHandlerStoreInContext } from '@mathesar/stores/clipboard';
   import { setUserProfileStoreInContext } from '@mathesar/stores/userProfile';
-  import { setReleasesStoreInContext } from '@mathesar/stores/releases';
   import { AnonymousViewerUserModel } from '@mathesar/stores/users';
-  import { modal } from '@mathesar/stores/modal';
+  import ModalRecordSelector from '@mathesar/systems/record-selector/ModalRecordSelector.svelte';
   import {
     RecordSelectorController,
     setRecordSelectorControllerInContext,
   } from '@mathesar/systems/record-selector/RecordSelectorController';
-  import ModalRecordSelector from '@mathesar/systems/record-selector/ModalRecordSelector.svelte';
-  import { setBreadcrumbItemsInContext } from '@mathesar/components/breadcrumb/breadcrumbUtils';
+  import type { CommonData } from '@mathesar/utils/preloadData';
+  import { Confirmation, ToastPresenter } from '@mathesar-component-library';
 
   export let commonData: CommonData;
 
diff --git a/mathesar_ui/src/api/rest/columns.ts b/mathesar_ui/src/api/rest/columns.ts
index eebcf9bcde..bbe7c8429b 100644
--- a/mathesar_ui/src/api/rest/columns.ts
+++ b/mathesar_ui/src/api/rest/columns.ts
@@ -1,6 +1,6 @@
 import type { TableEntry } from './types/tables';
 import type { Column } from './types/tables/columns';
-import { getAPI, type PaginatedResponse } from './utils/requestUtils';
+import { type PaginatedResponse, getAPI } from './utils/requestUtils';
 
 function list(tableId: TableEntry['id']) {
   const url = `/api/db/v0/tables/${tableId}/columns/?limit=500`;
diff --git a/mathesar_ui/src/api/rest/connections.ts b/mathesar_ui/src/api/rest/connections.ts
index 2ce58de7d6..0a23ad7eb1 100644
--- a/mathesar_ui/src/api/rest/connections.ts
+++ b/mathesar_ui/src/api/rest/connections.ts
@@ -1,10 +1,10 @@
 import {
+  type PaginatedResponse,
   addQueryParamsToUrl,
   deleteAPI,
   getAPI,
   patchAPI,
   postAPI,
-  type PaginatedResponse,
 } from './utils/requestUtils';
 
 export interface Connection {
diff --git a/mathesar_ui/src/api/rest/dataFiles.ts b/mathesar_ui/src/api/rest/dataFiles.ts
index ac7c454a51..6a8ee67e66 100644
--- a/mathesar_ui/src/api/rest/dataFiles.ts
+++ b/mathesar_ui/src/api/rest/dataFiles.ts
@@ -1,11 +1,12 @@
 import type { CancellablePromise } from '@mathesar-component-library';
+
 import type { DataFile } from './types/dataFiles';
 import {
+  type UploadCompletionOpts,
   getAPI,
   patchAPI,
   postAPI,
   uploadFile,
-  type UploadCompletionOpts,
 } from './utils/requestUtils';
 
 const ENDPOINT = '/api/db/v0/data_files/';
diff --git a/mathesar_ui/src/api/rest/queryShares.ts b/mathesar_ui/src/api/rest/queryShares.ts
index f51fd39f75..477762afb1 100644
--- a/mathesar_ui/src/api/rest/queryShares.ts
+++ b/mathesar_ui/src/api/rest/queryShares.ts
@@ -1,9 +1,9 @@
-import type { Share, UnsavedShare, ShareApi } from './shares';
+import type { Share, ShareApi, UnsavedShare } from './shares';
 import {
+  type PaginatedResponse,
   getAPI,
   patchAPI,
   postAPI,
-  type PaginatedResponse,
 } from './utils/requestUtils';
 
 type UnsavedQueryShare = UnsavedShare;
diff --git a/mathesar_ui/src/api/rest/schemas.ts b/mathesar_ui/src/api/rest/schemas.ts
index f227e336be..20dcff06d9 100644
--- a/mathesar_ui/src/api/rest/schemas.ts
+++ b/mathesar_ui/src/api/rest/schemas.ts
@@ -1,12 +1,13 @@
 import type { SchemaEntry, SchemaResponse } from '@mathesar/AppTypes';
+
+import type { Connection } from './connections';
 import {
-  getAPI,
-  patchAPI,
   type PaginatedResponse,
   deleteAPI,
+  getAPI,
+  patchAPI,
   postAPI,
 } from './utils/requestUtils';
-import type { Connection } from './connections';
 
 function list(connectionId: Connection['id']) {
   return getAPI<PaginatedResponse<SchemaResponse>>(
diff --git a/mathesar_ui/src/api/rest/shares.ts b/mathesar_ui/src/api/rest/shares.ts
index ebebc0f79f..6fbb23a897 100644
--- a/mathesar_ui/src/api/rest/shares.ts
+++ b/mathesar_ui/src/api/rest/shares.ts
@@ -1,8 +1,8 @@
 import type {
-  getAPI,
-  postAPI,
   PaginatedResponse,
+  getAPI,
   patchAPI,
+  postAPI,
 } from './utils/requestUtils';
 
 export interface UnsavedShare {
diff --git a/mathesar_ui/src/api/rest/tableShares.ts b/mathesar_ui/src/api/rest/tableShares.ts
index b20dd36892..fb760357f6 100644
--- a/mathesar_ui/src/api/rest/tableShares.ts
+++ b/mathesar_ui/src/api/rest/tableShares.ts
@@ -1,9 +1,9 @@
-import type { Share, UnsavedShare, ShareApi } from './shares';
+import type { Share, ShareApi, UnsavedShare } from './shares';
 import {
+  type PaginatedResponse,
   getAPI,
   patchAPI,
   postAPI,
-  type PaginatedResponse,
 } from './utils/requestUtils';
 
 type UnsavedTableShare = UnsavedShare;
diff --git a/mathesar_ui/src/api/rest/types/queries.ts b/mathesar_ui/src/api/rest/types/queries.ts
index d6f4c8a468..713f32c96a 100644
--- a/mathesar_ui/src/api/rest/types/queries.ts
+++ b/mathesar_ui/src/api/rest/types/queries.ts
@@ -1,6 +1,6 @@
-import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { JpPath } from '@mathesar/api/rest/types/tables/joinable_tables';
+import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
 import type { SchemaEntry } from '@mathesar/AppTypes';
 
 export type QueryColumnAlias = string;
diff --git a/mathesar_ui/src/api/rest/types/tables.ts b/mathesar_ui/src/api/rest/types/tables.ts
index f399b5bed0..cd11e1cc5e 100644
--- a/mathesar_ui/src/api/rest/types/tables.ts
+++ b/mathesar_ui/src/api/rest/types/tables.ts
@@ -1,4 +1,5 @@
 import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
+
 import type { Column } from './tables/columns';
 
 export type MinimalColumnDetails = Pick<
diff --git a/mathesar_ui/src/api/rest/types/tables/joinable_tables.ts b/mathesar_ui/src/api/rest/types/tables/joinable_tables.ts
index c2592281f1..cc295e9e2d 100644
--- a/mathesar_ui/src/api/rest/types/tables/joinable_tables.ts
+++ b/mathesar_ui/src/api/rest/types/tables/joinable_tables.ts
@@ -5,6 +5,7 @@
  */
 
 import type { TableEntry } from '@mathesar/api/rest/types/tables';
+
 import type { Column } from './columns';
 
 type ForeignKeyId = number;
diff --git a/mathesar_ui/src/api/rest/users.ts b/mathesar_ui/src/api/rest/users.ts
index 28e9f71fc6..1020ccc448 100644
--- a/mathesar_ui/src/api/rest/users.ts
+++ b/mathesar_ui/src/api/rest/users.ts
@@ -1,11 +1,12 @@
 import type { Database, SchemaEntry } from '@mathesar/AppTypes';
 import type { Language } from '@mathesar/i18n/languages/utils';
+
 import {
+  type PaginatedResponse,
   deleteAPI,
   getAPI,
   patchAPI,
   postAPI,
-  type PaginatedResponse,
 } from './utils/requestUtils';
 
 export interface UnsavedUser {
diff --git a/mathesar_ui/src/api/rest/utils/errors.ts b/mathesar_ui/src/api/rest/utils/errors.ts
index bcf55f02f8..4dc7cd65e0 100644
--- a/mathesar_ui/src/api/rest/utils/errors.ts
+++ b/mathesar_ui/src/api/rest/utils/errors.ts
@@ -1,11 +1,11 @@
 /* eslint-disable max-classes-per-file */
 
+import { getErrorMessage } from '@mathesar/utils/errors';
 import {
+  ImmutableMap,
   hasProperty,
   hasStringProperty,
-  ImmutableMap,
 } from '@mathesar-component-library';
-import { getErrorMessage } from '@mathesar/utils/errors';
 
 /**
  * This is our front end representation of API errors. It's almost the same as
diff --git a/mathesar_ui/src/api/rest/utils/recordUtils.ts b/mathesar_ui/src/api/rest/utils/recordUtils.ts
index 4dbe3db16e..857ffea9a8 100644
--- a/mathesar_ui/src/api/rest/utils/recordUtils.ts
+++ b/mathesar_ui/src/api/rest/utils/recordUtils.ts
@@ -1,10 +1,11 @@
+import { getErrorMessage } from '@mathesar/utils/errors';
 import {
+  ImmutableMap,
   hasProperty,
   hasStringProperty,
-  ImmutableMap,
   isNumber,
 } from '@mathesar-component-library';
-import { getErrorMessage } from '@mathesar/utils/errors';
+
 import { ApiError, ApiMultiError } from './errors';
 
 /** Keys are column ids */
diff --git a/mathesar_ui/src/api/rest/utils/requestUtils.ts b/mathesar_ui/src/api/rest/utils/requestUtils.ts
index 5d59384828..1df260a756 100644
--- a/mathesar_ui/src/api/rest/utils/requestUtils.ts
+++ b/mathesar_ui/src/api/rest/utils/requestUtils.ts
@@ -1,6 +1,7 @@
 import Cookies from 'js-cookie';
 
 import { CancellablePromise } from '@mathesar-component-library';
+
 import { ApiMultiError } from './errors';
 
 /**
diff --git a/mathesar_ui/src/api/rpc/index.ts b/mathesar_ui/src/api/rpc/index.ts
index a2259be005..0ed7c027c2 100644
--- a/mathesar_ui/src/api/rpc/index.ts
+++ b/mathesar_ui/src/api/rpc/index.ts
@@ -1,6 +1,7 @@
 import Cookies from 'js-cookie';
 
 import { buildRpcApi } from '@mathesar/packages/json-rpc-client-builder';
+
 import { connections } from './connections';
 
 /** Mathesar's JSON-RPC API */
diff --git a/mathesar_ui/src/component-library/button/__meta__/Button.test.ts b/mathesar_ui/src/component-library/button/__meta__/Button.test.ts
index 37061b5daf..c59ee4c800 100644
--- a/mathesar_ui/src/component-library/button/__meta__/Button.test.ts
+++ b/mathesar_ui/src/component-library/button/__meta__/Button.test.ts
@@ -1,7 +1,9 @@
 import { vi } from 'vitest';
 import '@testing-library/jest-dom';
-import { render, fireEvent } from '@testing-library/svelte';
+import { fireEvent, render } from '@testing-library/svelte';
+
 import SlotTest from '@mathesar-component-library-dir/__meta__/utils/SlotTest.svelte';
+
 import Button from '../Button.svelte';
 
 test('renders button in default appearance and medium size', () => {
diff --git a/mathesar_ui/src/component-library/cancel-or-proceed-button-pair/CancelOrProceedButtonPair.svelte b/mathesar_ui/src/component-library/cancel-or-proceed-button-pair/CancelOrProceedButtonPair.svelte
index a1c17f434e..21ec27edb6 100644
--- a/mathesar_ui/src/component-library/cancel-or-proceed-button-pair/CancelOrProceedButtonPair.svelte
+++ b/mathesar_ui/src/component-library/cancel-or-proceed-button-pair/CancelOrProceedButtonPair.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
   import Button from '@mathesar-component-library-dir/button/Button.svelte';
-  import SpinnerButton from '@mathesar-component-library-dir/spinner-button/SpinnerButton.svelte';
-  import Icon from '@mathesar-component-library-dir/icon/Icon.svelte';
   import { iconProceed } from '@mathesar-component-library-dir/common/icons';
   import type { Size } from '@mathesar-component-library-dir/commonTypes';
+  import Icon from '@mathesar-component-library-dir/icon/Icon.svelte';
+  import SpinnerButton from '@mathesar-component-library-dir/spinner-button/SpinnerButton.svelte';
+
   import type { ButtonDetails } from './CancelOrProceedButtonPairTypes';
 
   const cancelButtonDefaults: ButtonDetails = {
diff --git a/mathesar_ui/src/component-library/checkbox-group/CheckboxGroup.svelte b/mathesar_ui/src/component-library/checkbox-group/CheckboxGroup.svelte
index 0c34867481..9ed775b439 100644
--- a/mathesar_ui/src/component-library/checkbox-group/CheckboxGroup.svelte
+++ b/mathesar_ui/src/component-library/checkbox-group/CheckboxGroup.svelte
@@ -4,6 +4,7 @@
   import Checkbox from '@mathesar-component-library-dir/checkbox/Checkbox.svelte';
   import type { LabelGetter } from '@mathesar-component-library-dir/common/utils/formatUtils';
   import FieldsetGroup from '@mathesar-component-library-dir/fieldset-group/FieldsetGroup.svelte';
+
   import type { ComponentWithProps } from '../types';
 
   type Option = $$Generic;
diff --git a/mathesar_ui/src/component-library/checkbox/Checkbox.svelte b/mathesar_ui/src/component-library/checkbox/Checkbox.svelte
index 25a155672a..ddf8892a56 100644
--- a/mathesar_ui/src/component-library/checkbox/Checkbox.svelte
+++ b/mathesar_ui/src/component-library/checkbox/Checkbox.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
+
   import BaseInput from '@mathesar-component-library-dir/common/base-components/BaseInput.svelte';
 
   const dispatch = createEventDispatcher<{ change: boolean }>();
diff --git a/mathesar_ui/src/component-library/collapsible/Collapsible.svelte b/mathesar_ui/src/component-library/collapsible/Collapsible.svelte
index ec4bf2803e..89e618150c 100644
--- a/mathesar_ui/src/component-library/collapsible/Collapsible.svelte
+++ b/mathesar_ui/src/component-library/collapsible/Collapsible.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-  import Icon from '@mathesar-component-library-dir/icon/Icon.svelte';
   import Button from '@mathesar-component-library-dir/button/Button.svelte';
   import { iconExpandDown } from '@mathesar-component-library-dir/common/icons';
   import type { Appearance } from '@mathesar-component-library-dir/commonTypes';
+  import Icon from '@mathesar-component-library-dir/icon/Icon.svelte';
 
   export let isOpen = false;
   export let triggerAppearance: Appearance = 'default';
diff --git a/mathesar_ui/src/component-library/common/actions/clickOffBounds.ts b/mathesar_ui/src/component-library/common/actions/clickOffBounds.ts
index 424c33f765..0c4e8b6dcc 100644
--- a/mathesar_ui/src/component-library/common/actions/clickOffBounds.ts
+++ b/mathesar_ui/src/component-library/common/actions/clickOffBounds.ts
@@ -1,6 +1,6 @@
-import { get } from 'svelte/store';
-import type { Readable } from 'svelte/store';
 import type { ActionReturn } from 'svelte/action';
+import type { Readable } from 'svelte/store';
+import { get } from 'svelte/store';
 
 type CallbackFn = (e: Event) => void;
 interface Options {
diff --git a/mathesar_ui/src/component-library/common/actions/popper.ts b/mathesar_ui/src/component-library/common/actions/popper.ts
index 1419e325dc..3e3b03bb7d 100644
--- a/mathesar_ui/src/component-library/common/actions/popper.ts
+++ b/mathesar_ui/src/component-library/common/actions/popper.ts
@@ -1,9 +1,9 @@
 // @ts-ignore: https://github.com/centerofci/mathesar/issues/1055
 import { createPopper } from '@popperjs/core/dist/umd/popper.min';
 import type {
+  Instance,
   ModifierArguments,
   Options,
-  Instance,
   VirtualElement,
 } from '@popperjs/core/lib/types';
 import type { ActionReturn } from 'svelte/action';
diff --git a/mathesar_ui/src/component-library/common/base-components/BaseInput.svelte b/mathesar_ui/src/component-library/common/base-components/BaseInput.svelte
index 1ab6640381..25fd1ad8bf 100644
--- a/mathesar_ui/src/component-library/common/base-components/BaseInput.svelte
+++ b/mathesar_ui/src/component-library/common/base-components/BaseInput.svelte
@@ -1,7 +1,9 @@
 <script lang="ts">
-  import { tick, afterUpdate } from 'svelte';
-  import { getLabelControllerFromContainingLabel } from '@mathesar-component-library-dir/label/LabelController';
+  import { afterUpdate, tick } from 'svelte';
+
   import { getGloballyUniqueId } from '@mathesar-component-library-dir/common/utils/domUtils';
+  import { getLabelControllerFromContainingLabel } from '@mathesar-component-library-dir/label/LabelController';
+
   import type { BaseInputProps } from './BaseInputTypes';
 
   type $$Props = BaseInputProps;
diff --git a/mathesar_ui/src/component-library/common/icons.ts b/mathesar_ui/src/component-library/common/icons.ts
index 0dd415dec2..4a3417f68c 100644
--- a/mathesar_ui/src/component-library/common/icons.ts
+++ b/mathesar_ui/src/component-library/common/icons.ts
@@ -1,25 +1,26 @@
 import {
-  faQuestionCircle,
+  faAngleDoubleLeft,
+  faAngleDoubleRight,
+  faAngleDown,
+  faAngleLeft,
+  faAngleRight,
   faArrowLeft,
+  faArrowUpRightFromSquare,
+  faCaretRight,
   faCheck,
+  faCircleExclamation,
+  faEllipsisH,
   faExclamationTriangle,
-  faSpinner,
-  faAngleDown,
   faFile,
   faFileUpload,
-  faTimes,
-  faSearch,
-  faAngleLeft,
-  faEllipsisH,
-  faAngleDoubleLeft,
-  faAngleDoubleRight,
-  faAngleRight,
-  faCaretRight,
-  faLightbulb,
   faGears,
-  faArrowUpRightFromSquare,
-  faCircleExclamation,
+  faLightbulb,
+  faQuestionCircle,
+  faSearch,
+  faSpinner,
+  faTimes,
 } from '@fortawesome/free-solid-svg-icons';
+
 import type { IconProps } from '@mathesar-component-library-dir/icon/IconTypes';
 
 /**
diff --git a/mathesar_ui/src/component-library/common/utils/ReductionStore.ts b/mathesar_ui/src/component-library/common/utils/ReductionStore.ts
index 93a4cd2a58..dbc242fa5c 100644
--- a/mathesar_ui/src/component-library/common/utils/ReductionStore.ts
+++ b/mathesar_ui/src/component-library/common/utils/ReductionStore.ts
@@ -1,9 +1,10 @@
 import {
-  derived,
   type Readable,
   type Subscriber,
   type Unsubscriber,
+  derived,
 } from 'svelte/store';
+
 import { collapse, ensureReadable, unite } from './storeUtils';
 import WritableSet from './WritableSet';
 
diff --git a/mathesar_ui/src/component-library/common/utils/WritableMap.ts b/mathesar_ui/src/component-library/common/utils/WritableMap.ts
index 065c29a42f..05b404f5cf 100644
--- a/mathesar_ui/src/component-library/common/utils/WritableMap.ts
+++ b/mathesar_ui/src/component-library/common/utils/WritableMap.ts
@@ -1,10 +1,11 @@
 import type {
+  Readable,
   Subscriber,
   Unsubscriber,
   Writable,
-  Readable,
 } from 'svelte/store';
-import { writable, get, derived } from 'svelte/store';
+import { derived, get, writable } from 'svelte/store';
+
 import ImmutableMap from './ImmutableMap';
 
 export default class WritableMap<Key, Value>
diff --git a/mathesar_ui/src/component-library/common/utils/WritableSet.ts b/mathesar_ui/src/component-library/common/utils/WritableSet.ts
index e1eb7ea8fa..6466cbed64 100644
--- a/mathesar_ui/src/component-library/common/utils/WritableSet.ts
+++ b/mathesar_ui/src/component-library/common/utils/WritableSet.ts
@@ -1,10 +1,11 @@
 import type {
+  Readable,
   Subscriber,
   Unsubscriber,
   Writable,
-  Readable,
 } from 'svelte/store';
-import { writable, get, derived } from 'svelte/store';
+import { derived, get, writable } from 'svelte/store';
+
 import ImmutableSet from './ImmutableSet';
 
 export default class WritableSet<Value>
diff --git a/mathesar_ui/src/component-library/common/utils/__tests__/CancellablePromise.test.ts b/mathesar_ui/src/component-library/common/utils/__tests__/CancellablePromise.test.ts
index 4a3da4d9eb..cfea1ecd27 100644
--- a/mathesar_ui/src/component-library/common/utils/__tests__/CancellablePromise.test.ts
+++ b/mathesar_ui/src/component-library/common/utils/__tests__/CancellablePromise.test.ts
@@ -1,4 +1,5 @@
 import { vi } from 'vitest';
+
 import CancellablePromise from '../CancellablePromise';
 
 const dummyOnCancel = vi.fn().mockReturnValueOnce('cancelled');
diff --git a/mathesar_ui/src/component-library/common/utils/__tests__/ruleExecutor.test.ts b/mathesar_ui/src/component-library/common/utils/__tests__/ruleExecutor.test.ts
index 0d2cd3c2e9..a106938213 100644
--- a/mathesar_ui/src/component-library/common/utils/__tests__/ruleExecutor.test.ts
+++ b/mathesar_ui/src/component-library/common/utils/__tests__/ruleExecutor.test.ts
@@ -1,5 +1,5 @@
-import { executeRule } from '../ruleExecuter';
 import type { Rule } from '../ruleExecuter';
+import { executeRule } from '../ruleExecuter';
 
 describe('Rule executer', () => {
   test('Single term rule', () => {
diff --git a/mathesar_ui/src/component-library/common/utils/__tests__/storeUtils.test.ts b/mathesar_ui/src/component-library/common/utils/__tests__/storeUtils.test.ts
index 633d4b87fe..99dc539230 100644
--- a/mathesar_ui/src/component-library/common/utils/__tests__/storeUtils.test.ts
+++ b/mathesar_ui/src/component-library/common/utils/__tests__/storeUtils.test.ts
@@ -1,4 +1,5 @@
 import { get, writable } from 'svelte/store';
+
 import { collapse, unite } from '../storeUtils';
 
 test('collapse', () => {
diff --git a/mathesar_ui/src/component-library/common/utils/contextValidationUtil.ts b/mathesar_ui/src/component-library/common/utils/contextValidationUtil.ts
index f83c5cb6e8..6f50c69c1b 100644
--- a/mathesar_ui/src/component-library/common/utils/contextValidationUtil.ts
+++ b/mathesar_ui/src/component-library/common/utils/contextValidationUtil.ts
@@ -1,6 +1,6 @@
-import { setContext, hasContext, getContext, onDestroy } from 'svelte';
-import { writable } from 'svelte/store';
+import { getContext, hasContext, onDestroy, setContext } from 'svelte';
 import type { Writable } from 'svelte/store';
+import { writable } from 'svelte/store';
 
 export type ValidationFunction = () => boolean;
 export type ValidationResultStore = Writable<boolean>;
diff --git a/mathesar_ui/src/component-library/common/utils/formatUtils.ts b/mathesar_ui/src/component-library/common/utils/formatUtils.ts
index 1088c075a2..bbec469a61 100644
--- a/mathesar_ui/src/component-library/common/utils/formatUtils.ts
+++ b/mathesar_ui/src/component-library/common/utils/formatUtils.ts
@@ -1,4 +1,5 @@
 import type { ComponentAndProps } from '@mathesar-component-library-dir/common/types/ComponentAndPropsTypes';
+
 import { hasStringProperty } from './typeUtils';
 
 export function formatSize(sizeInBytes: number): string {
diff --git a/mathesar_ui/src/component-library/common/utils/storeUtils.ts b/mathesar_ui/src/component-library/common/utils/storeUtils.ts
index 52b60dacf1..c050c153b1 100644
--- a/mathesar_ui/src/component-library/common/utils/storeUtils.ts
+++ b/mathesar_ui/src/component-library/common/utils/storeUtils.ts
@@ -2,8 +2,8 @@ import {
   type Readable,
   type Subscriber,
   type Unsubscriber,
-  readable,
   derived,
+  readable,
 } from 'svelte/store';
 
 export function isReadable<T>(v: Readable<T> | T): v is Readable<T> {
diff --git a/mathesar_ui/src/component-library/common/utils/styleUtils.ts b/mathesar_ui/src/component-library/common/utils/styleUtils.ts
index 059b780001..83a482a233 100644
--- a/mathesar_ui/src/component-library/common/utils/styleUtils.ts
+++ b/mathesar_ui/src/component-library/common/utils/styleUtils.ts
@@ -1,4 +1,5 @@
 import type { CssVariablesObj } from '@mathesar-component-library-dir/types';
+
 import { isDefinedNonNullable } from './typeUtils';
 
 const isCssVariable = (str: string) => str.indexOf('--') === 0;
diff --git a/mathesar_ui/src/component-library/confirmation/Confirmation.svelte b/mathesar_ui/src/component-library/confirmation/Confirmation.svelte
index a4aac08434..0e18864837 100644
--- a/mathesar_ui/src/component-library/confirmation/Confirmation.svelte
+++ b/mathesar_ui/src/component-library/confirmation/Confirmation.svelte
@@ -1,7 +1,9 @@
 <script lang="ts">
   import CancelOrProceedButtonPair from '@mathesar-component-library-dir/cancel-or-proceed-button-pair/CancelOrProceedButtonPair.svelte';
   import { ControlledModal } from '@mathesar-component-library-dir/modal';
+
   import StringOrComponent from '../string-or-component/StringOrComponent.svelte';
+
   import type { ConfirmationController } from './ConfirmationController';
 
   export let controller: ConfirmationController;
diff --git a/mathesar_ui/src/component-library/confirmation/ConfirmationController.ts b/mathesar_ui/src/component-library/confirmation/ConfirmationController.ts
index 2d6a52e2d6..85fb7c1c00 100644
--- a/mathesar_ui/src/component-library/confirmation/ConfirmationController.ts
+++ b/mathesar_ui/src/component-library/confirmation/ConfirmationController.ts
@@ -1,6 +1,7 @@
-import type { IconProps } from '@mathesar-component-library-dir/icon/IconTypes';
 import type { Writable } from 'svelte/store';
 import { writable } from 'svelte/store';
+
+import type { IconProps } from '@mathesar-component-library-dir/icon/IconTypes';
 import type { ModalController } from '@mathesar-component-library-dir/modal';
 import type { ComponentAndProps } from '@mathesar-component-library-dir/types';
 
diff --git a/mathesar_ui/src/component-library/context-menu/ContextMenu.svelte b/mathesar_ui/src/component-library/context-menu/ContextMenu.svelte
index bd3e383345..fa024a1be6 100644
--- a/mathesar_ui/src/component-library/context-menu/ContextMenu.svelte
+++ b/mathesar_ui/src/component-library/context-menu/ContextMenu.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
-  import Menu from '@mathesar-component-library-dir/menu/Menu.svelte';
+  import { onMount } from 'svelte';
+
+  import clickOffBounds from '@mathesar-component-library-dir/common/actions/clickOffBounds';
   import popper from '@mathesar-component-library-dir/common/actions/popper';
   import portal from '@mathesar-component-library-dir/common/actions/portal';
-  import clickOffBounds from '@mathesar-component-library-dir/common/actions/clickOffBounds';
-  import { onMount } from 'svelte';
+  import Menu from '@mathesar-component-library-dir/menu/Menu.svelte';
+
 
   /**
    * A reference to the DOM node where we'll attach the contextmenu event
diff --git a/mathesar_ui/src/component-library/data-type-based-input/BooleanInput.svelte b/mathesar_ui/src/component-library/data-type-based-input/BooleanInput.svelte
index 62c1ef1e2b..50d8ed5445 100644
--- a/mathesar_ui/src/component-library/data-type-based-input/BooleanInput.svelte
+++ b/mathesar_ui/src/component-library/data-type-based-input/BooleanInput.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import Checkbox from '@mathesar-component-library-dir/checkbox/Checkbox.svelte';
+
   import type { DataTypeBasedInputInterface } from './types';
 
   export let value = false;
diff --git a/mathesar_ui/src/component-library/data-type-based-input/DataTypeBasedInput.svelte b/mathesar_ui/src/component-library/data-type-based-input/DataTypeBasedInput.svelte
index 3aa332d07c..3bad0ec788 100644
--- a/mathesar_ui/src/component-library/data-type-based-input/DataTypeBasedInput.svelte
+++ b/mathesar_ui/src/component-library/data-type-based-input/DataTypeBasedInput.svelte
@@ -1,12 +1,13 @@
 <script lang="ts">
   import NumberInput from '@mathesar-component-library-dir/number-input/NumberInput.svelte';
+
+  import BooleanInput from './BooleanInput.svelte';
   import EnumInput from './EnumInput.svelte';
   import StringInput from './StringInput.svelte';
-  import BooleanInput from './BooleanInput.svelte';
   import type {
-    DataTypeBasedInputType,
     DataTypeBasedInputInterface,
     DataTypeBasedInputSelectElement,
+    DataTypeBasedInputType,
   } from './types';
 
   /**
diff --git a/mathesar_ui/src/component-library/data-type-based-input/EnumInput.svelte b/mathesar_ui/src/component-library/data-type-based-input/EnumInput.svelte
index 20a5bb9737..51133e3607 100644
--- a/mathesar_ui/src/component-library/data-type-based-input/EnumInput.svelte
+++ b/mathesar_ui/src/component-library/data-type-based-input/EnumInput.svelte
@@ -1,16 +1,17 @@
 <script lang="ts">
   import Select from '@mathesar-component-library-dir/select/Select.svelte';
   import type { Appearance } from '@mathesar-component-library-dir/types';
-  import {
-    generateSelectOptions,
-    getSelectedValue,
-    getInitialValue,
-  } from './utils';
+
   import type {
-    DataTypeBasedInputType,
     DataTypeBasedInputSelectElement,
+    DataTypeBasedInputType,
     EnumSelectOption,
   } from './types';
+  import {
+    generateSelectOptions,
+    getInitialValue,
+    getSelectedValue,
+  } from './utils';
 
   export let dataType: DataTypeBasedInputType;
   export let enumValues: unknown[] | undefined = undefined;
diff --git a/mathesar_ui/src/component-library/data-type-based-input/StringInput.svelte b/mathesar_ui/src/component-library/data-type-based-input/StringInput.svelte
index 971fc60e03..abf235133c 100644
--- a/mathesar_ui/src/component-library/data-type-based-input/StringInput.svelte
+++ b/mathesar_ui/src/component-library/data-type-based-input/StringInput.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
-  import TextInput from '@mathesar-component-library-dir/text-input/TextInput.svelte';
   import TextArea from '@mathesar-component-library-dir/text-area/TextArea.svelte';
+  import TextInput from '@mathesar-component-library-dir/text-input/TextInput.svelte';
+
   import type { DataTypeBasedInputInterface } from './types';
 
   export let value: string | undefined = undefined;
diff --git a/mathesar_ui/src/component-library/data-type-based-input/utils.ts b/mathesar_ui/src/component-library/data-type-based-input/utils.ts
index e7e060310e..010f8d82a0 100644
--- a/mathesar_ui/src/component-library/data-type-based-input/utils.ts
+++ b/mathesar_ui/src/component-library/data-type-based-input/utils.ts
@@ -1,6 +1,6 @@
 import type {
-  DataTypeBasedInputType,
   DataTypeBasedInputSelectElement,
+  DataTypeBasedInputType,
   EnumSelectOption,
 } from './types';
 
diff --git a/mathesar_ui/src/component-library/date-time-picker/DatePicker.svelte b/mathesar_ui/src/component-library/date-time-picker/DatePicker.svelte
index 0523b4ae23..1d638b97be 100644
--- a/mathesar_ui/src/component-library/date-time-picker/DatePicker.svelte
+++ b/mathesar_ui/src/component-library/date-time-picker/DatePicker.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
-  import TextInput from '@mathesar-component-library-dir/text-input/TextInput.svelte';
   import AttachableDropdown from '@mathesar-component-library-dir/dropdown/AttachableDropdown.svelte';
+  import TextInput from '@mathesar-component-library-dir/text-input/TextInput.svelte';
+
   import InlineDateTimePicker from './InlineDateTimePicker.svelte';
 
   export let value: string | null | undefined;
diff --git a/mathesar_ui/src/component-library/date-time-picker/InlineDateTimePicker.svelte b/mathesar_ui/src/component-library/date-time-picker/InlineDateTimePicker.svelte
index 5b5ca72824..b07e7c1a86 100644
--- a/mathesar_ui/src/component-library/date-time-picker/InlineDateTimePicker.svelte
+++ b/mathesar_ui/src/component-library/date-time-picker/InlineDateTimePicker.svelte
@@ -1,8 +1,11 @@
 <script lang="ts">
-  import { onMount, createEventDispatcher } from 'svelte';
+  import flatpickr from 'flatpickr';
   import type FlatPickr from 'flatpickr/dist/typings';
+  import { createEventDispatcher, onMount } from 'svelte';
+
   import { dayjs } from '@mathesar-component-library-dir/common/utils';
-  import flatpickr from 'flatpickr';
+
+
   import type { InlineDateTimePickerProps } from './DateTimePickerTypes';
 
   type $$Props = InlineDateTimePickerProps;
diff --git a/mathesar_ui/src/component-library/debounce/Debounce.svelte b/mathesar_ui/src/component-library/debounce/Debounce.svelte
index 45602ddd44..8218994209 100644
--- a/mathesar_ui/src/component-library/debounce/Debounce.svelte
+++ b/mathesar_ui/src/component-library/debounce/Debounce.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { createEventDispatcher, onDestroy } from 'svelte';
+
   import type { ArtificialEvents } from '@mathesar-component-library-dir/common/types/ArtificialEvents';
 
   const dispatch = createEventDispatcher<ArtificialEvents<unknown>>();
diff --git a/mathesar_ui/src/component-library/dropdown-menu/DropdownMenu.svelte b/mathesar_ui/src/component-library/dropdown-menu/DropdownMenu.svelte
index 3785e01ee2..7c3850de7e 100644
--- a/mathesar_ui/src/component-library/dropdown-menu/DropdownMenu.svelte
+++ b/mathesar_ui/src/component-library/dropdown-menu/DropdownMenu.svelte
@@ -2,9 +2,9 @@
   import type { ComponentProps } from 'svelte';
 
   import Dropdown from '@mathesar-component-library-dir/dropdown/Dropdown.svelte';
-  import Menu from '@mathesar-component-library-dir/menu/Menu.svelte';
   import Icon from '@mathesar-component-library-dir/icon/Icon.svelte';
   import type { IconProps } from '@mathesar-component-library-dir/icon/IconTypes';
+  import Menu from '@mathesar-component-library-dir/menu/Menu.svelte';
 
   interface $$Props extends ComponentProps<Dropdown> {
     label?: string;
diff --git a/mathesar_ui/src/component-library/dropdown/AccompanyingElements.ts b/mathesar_ui/src/component-library/dropdown/AccompanyingElements.ts
index af4b694241..c6741175da 100644
--- a/mathesar_ui/src/component-library/dropdown/AccompanyingElements.ts
+++ b/mathesar_ui/src/component-library/dropdown/AccompanyingElements.ts
@@ -1,5 +1,5 @@
-import { writable } from 'svelte/store';
 import type { Readable, Subscriber, Unsubscriber } from 'svelte/store';
+import { writable } from 'svelte/store';
 
 /**
  * AccompanyingElements stores references to any DOM nodes which "accompany" a
diff --git a/mathesar_ui/src/component-library/dropdown/AttachableDropdown.svelte b/mathesar_ui/src/component-library/dropdown/AttachableDropdown.svelte
index 131d0b64e2..98f8e3a94e 100644
--- a/mathesar_ui/src/component-library/dropdown/AttachableDropdown.svelte
+++ b/mathesar_ui/src/component-library/dropdown/AttachableDropdown.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import type { Placement } from '@popperjs/core/lib/enums';
   import {
     createEventDispatcher,
     getContext,
@@ -7,12 +8,13 @@
     tick,
   } from 'svelte';
   import { derived } from 'svelte/store';
-  import type { Placement } from '@popperjs/core/lib/enums';
-  import type { ComponentAndProps } from '@mathesar-component-library-dir/types';
-  import portal from '@mathesar-component-library-dir/common/actions/portal';
-  import popper from '@mathesar-component-library-dir/common/actions/popper';
+
   import clickOffBounds from '@mathesar-component-library-dir/common/actions/clickOffBounds';
+  import popper from '@mathesar-component-library-dir/common/actions/popper';
+  import portal from '@mathesar-component-library-dir/common/actions/portal';
   import StringOrComponent from '@mathesar-component-library-dir/string-or-component/StringOrComponent.svelte';
+  import type { ComponentAndProps } from '@mathesar-component-library-dir/types';
+
   import { AccompanyingElements } from './AccompanyingElements';
 
   const dispatch = createEventDispatcher();
diff --git a/mathesar_ui/src/component-library/dropdown/Dropdown.svelte b/mathesar_ui/src/component-library/dropdown/Dropdown.svelte
index e313b05aac..67bc9d8e01 100644
--- a/mathesar_ui/src/component-library/dropdown/Dropdown.svelte
+++ b/mathesar_ui/src/component-library/dropdown/Dropdown.svelte
@@ -1,13 +1,14 @@
 <script lang="ts">
   import type { Placement } from '@popperjs/core/lib/enums';
+
+  import Button from '@mathesar-component-library-dir/button/Button.svelte';
+  import { iconExpandDown } from '@mathesar-component-library-dir/common/icons';
   import type {
     Appearance,
     Size,
   } from '@mathesar-component-library-dir/commonTypes';
-  import Button from '@mathesar-component-library-dir/button/Button.svelte';
   import Icon from '@mathesar-component-library-dir/icon/Icon.svelte';
 
-  import { iconExpandDown } from '@mathesar-component-library-dir/common/icons';
   import AttachableDropdown from './AttachableDropdown.svelte';
 
   export let triggerClass = '';
diff --git a/mathesar_ui/src/component-library/fieldset-group/FieldsetGroup.svelte b/mathesar_ui/src/component-library/fieldset-group/FieldsetGroup.svelte
index d7938108ce..e2ba707649 100644
--- a/mathesar_ui/src/component-library/fieldset-group/FieldsetGroup.svelte
+++ b/mathesar_ui/src/component-library/fieldset-group/FieldsetGroup.svelte
@@ -6,6 +6,7 @@
   import LabeledInput from '@mathesar-component-library-dir/labeled-input/LabeledInput.svelte';
   import Render from '@mathesar-component-library-dir/render/Render.svelte';
   import StringOrComponent from '@mathesar-component-library-dir/string-or-component/StringOrComponent.svelte';
+
   import type { ComponentWithProps } from '../types';
 
   type Option = $$Generic;
diff --git a/mathesar_ui/src/component-library/file-upload/FileUpload.svelte b/mathesar_ui/src/component-library/file-upload/FileUpload.svelte
index cac1b1a7db..4c3a5c7da9 100644
--- a/mathesar_ui/src/component-library/file-upload/FileUpload.svelte
+++ b/mathesar_ui/src/component-library/file-upload/FileUpload.svelte
@@ -11,6 +11,7 @@
   } from '@mathesar-component-library-dir/common/utils';
   import Icon from '@mathesar-component-library-dir/icon/Icon.svelte';
   import Progress from '@mathesar-component-library-dir/progress/Progress.svelte';
+
   import type { FileUpload, FileUploadAddDetail } from './FileUploadTypes';
 
   const dispatch = createEventDispatcher<{ add: FileUploadAddDetail }>();
diff --git a/mathesar_ui/src/component-library/form-builder/FormBuilder.svelte b/mathesar_ui/src/component-library/form-builder/FormBuilder.svelte
index ea1e7781ed..87a0fc8dcd 100644
--- a/mathesar_ui/src/component-library/form-builder/FormBuilder.svelte
+++ b/mathesar_ui/src/component-library/form-builder/FormBuilder.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
+
   import FormElement from './FormElement.svelte';
   import type { FormBuildConfiguration } from './types';
 
diff --git a/mathesar_ui/src/component-library/form-builder/FormElement.svelte b/mathesar_ui/src/component-library/form-builder/FormElement.svelte
index 0e43adac3d..92b2439a0f 100644
--- a/mathesar_ui/src/component-library/form-builder/FormElement.svelte
+++ b/mathesar_ui/src/component-library/form-builder/FormElement.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
+  import FormCustomComponent from './FormCustomComponent.svelte';
   import FormInput from './FormInput.svelte';
   import FormLayout from './FormLayout.svelte';
-  import Switch from './Switch.svelte';
   import If from './If.svelte';
-  import FormCustomComponent from './FormCustomComponent.svelte';
+  import Switch from './Switch.svelte';
   import type {
-    FormElement,
     FormBuildConfiguration,
+    FormElement,
     FormValidationResult,
   } from './types';
 
diff --git a/mathesar_ui/src/component-library/form-builder/FormInput.svelte b/mathesar_ui/src/component-library/form-builder/FormInput.svelte
index ea76fb31eb..8ba76c07ab 100644
--- a/mathesar_ui/src/component-library/form-builder/FormInput.svelte
+++ b/mathesar_ui/src/component-library/form-builder/FormInput.svelte
@@ -1,12 +1,13 @@
 <script lang="ts">
   // TODO: Use FormField component here
-  import LabeledInput from '@mathesar-component-library-dir/labeled-input/LabeledInput.svelte';
   import DataTypeBasedInput from '@mathesar/component-library/data-type-based-input/DataTypeBasedInput.svelte';
   import type { DataTypeBasedInputType } from '@mathesar/component-library/data-type-based-input/types';
+  import LabeledInput from '@mathesar-component-library-dir/labeled-input/LabeledInput.svelte';
+
   import type {
     FormInputElement,
-    FormValueStore,
     FormValidationCheck,
+    FormValueStore,
   } from './types';
 
   export let type: DataTypeBasedInputType;
diff --git a/mathesar_ui/src/component-library/form-builder/If.svelte b/mathesar_ui/src/component-library/form-builder/If.svelte
index a2d9fcb239..0ecefe76a8 100644
--- a/mathesar_ui/src/component-library/form-builder/If.svelte
+++ b/mathesar_ui/src/component-library/form-builder/If.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
+  import type { ConditionalIfElement, FormValueStore } from './types';
   import { computeIfElements } from './utils';
-  import type { FormValueStore, ConditionalIfElement } from './types';
 
   export let store: FormValueStore;
   export let condition: ConditionalIfElement['condition'] = 'eq';
diff --git a/mathesar_ui/src/component-library/form-builder/Switch.svelte b/mathesar_ui/src/component-library/form-builder/Switch.svelte
index f1c146c90d..6ec36680c1 100644
--- a/mathesar_ui/src/component-library/form-builder/Switch.svelte
+++ b/mathesar_ui/src/component-library/form-builder/Switch.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
+  import type { ConditionalSwitchElement, FormValueStore } from './types';
   import { computeSwitchElements } from './utils';
-  import type { FormValueStore, ConditionalSwitchElement } from './types';
 
   export let store: FormValueStore;
   export let cases: ConditionalSwitchElement['cases'];
diff --git a/mathesar_ui/src/component-library/form-builder/__meta__/FormBuilderStory.svelte b/mathesar_ui/src/component-library/form-builder/__meta__/FormBuilderStory.svelte
index 787dfc97f9..9021611b01 100644
--- a/mathesar_ui/src/component-library/form-builder/__meta__/FormBuilderStory.svelte
+++ b/mathesar_ui/src/component-library/form-builder/__meta__/FormBuilderStory.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { makeForm, FormBuilder } from '../index';
+  import { FormBuilder, makeForm } from '../index';
 
   export let formConfig;
 
diff --git a/mathesar_ui/src/component-library/form-builder/__meta__/formFactory.test.ts b/mathesar_ui/src/component-library/form-builder/__meta__/formFactory.test.ts
index 63b8e96b71..0242fabfa5 100644
--- a/mathesar_ui/src/component-library/form-builder/__meta__/formFactory.test.ts
+++ b/mathesar_ui/src/component-library/form-builder/__meta__/formFactory.test.ts
@@ -1,4 +1,5 @@
 import { get } from 'svelte/store';
+
 import { makeForm } from '../formFactory';
 
 describe('Form factory tests', () => {
diff --git a/mathesar_ui/src/component-library/form-builder/formFactory.ts b/mathesar_ui/src/component-library/form-builder/formFactory.ts
index 5c685c26d8..3236326859 100644
--- a/mathesar_ui/src/component-library/form-builder/formFactory.ts
+++ b/mathesar_ui/src/component-library/form-builder/formFactory.ts
@@ -1,11 +1,12 @@
-import { derived, get, writable, readable } from 'svelte/store';
 import type { Readable } from 'svelte/store';
+import { derived, get, readable, writable } from 'svelte/store';
+
 import type {
-  FormConfiguration,
   FormBuildConfiguration,
-  FormValues,
-  FormValidationResult,
+  FormConfiguration,
   FormElement,
+  FormValidationResult,
+  FormValues,
 } from './types';
 import { computeIfElements, computeSwitchElements } from './utils';
 
diff --git a/mathesar_ui/src/component-library/form-builder/types.ts b/mathesar_ui/src/component-library/form-builder/types.ts
index ee76e3b975..f3370cdc2f 100644
--- a/mathesar_ui/src/component-library/form-builder/types.ts
+++ b/mathesar_ui/src/component-library/form-builder/types.ts
@@ -1,5 +1,6 @@
 import type { SvelteComponent } from 'svelte';
 import type { Readable, Writable } from 'svelte/store';
+
 import type { DataTypeBasedInputType } from '@mathesar-component-library-dir/data-type-based-input/types';
 
 export interface FormInputBaseElement {
diff --git a/mathesar_ui/src/component-library/formatted-input/FormattedInput.svelte b/mathesar_ui/src/component-library/formatted-input/FormattedInput.svelte
index 9c00445337..9184f2ec05 100644
--- a/mathesar_ui/src/component-library/formatted-input/FormattedInput.svelte
+++ b/mathesar_ui/src/component-library/formatted-input/FormattedInput.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
   import { createEventDispatcher, tick } from 'svelte';
 
+  import type { ArtificialEvents } from '@mathesar/component-library/common/types/ArtificialEvents';
   import { getOutcomeOfBeforeInputEvent } from '@mathesar-component-library-dir/common/utils';
   import TextInput from '@mathesar-component-library-dir/text-input/TextInput.svelte';
-  import type { ArtificialEvents } from '@mathesar/component-library/common/types/ArtificialEvents';
+
   import type { FormattedInputProps, ParseResult } from './FormattedInputTypes';
   import { getCursorPositionAfterReformat } from './formattedInputUtils';
   import { scrollCaretIntoView } from './scrollCaretIntoView';
diff --git a/mathesar_ui/src/component-library/help/Help.svelte b/mathesar_ui/src/component-library/help/Help.svelte
index 794089a130..edadc0b906 100644
--- a/mathesar_ui/src/component-library/help/Help.svelte
+++ b/mathesar_ui/src/component-library/help/Help.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import Tooltip from '@mathesar-component-library-dir/tooltip/Tooltip.svelte';
-  import Icon from '@mathesar-component-library-dir/icon/Icon.svelte';
   import { iconHelp } from '@mathesar-component-library-dir/common/icons';
+  import Icon from '@mathesar-component-library-dir/icon/Icon.svelte';
+  import Tooltip from '@mathesar-component-library-dir/tooltip/Tooltip.svelte';
 </script>
 
 <Tooltip aria-label="Help" class="help-trigger" allowHover>
diff --git a/mathesar_ui/src/component-library/icon/__meta__/Icon.test.ts b/mathesar_ui/src/component-library/icon/__meta__/Icon.test.ts
index 1cb143cdd3..3c727cf8ce 100644
--- a/mathesar_ui/src/component-library/icon/__meta__/Icon.test.ts
+++ b/mathesar_ui/src/component-library/icon/__meta__/Icon.test.ts
@@ -1,6 +1,7 @@
 import '@testing-library/jest-dom';
-import { render } from '@testing-library/svelte';
 import { faCat } from '@fortawesome/free-solid-svg-icons';
+import { render } from '@testing-library/svelte';
+
 import Icon from '../Icon.svelte';
 
 test('renders icon with default role as presentation', () => {
diff --git a/mathesar_ui/src/component-library/input-group/__meta__/InputGroup.test.ts b/mathesar_ui/src/component-library/input-group/__meta__/InputGroup.test.ts
index 380decbfd0..a69a29a051 100644
--- a/mathesar_ui/src/component-library/input-group/__meta__/InputGroup.test.ts
+++ b/mathesar_ui/src/component-library/input-group/__meta__/InputGroup.test.ts
@@ -1,5 +1,6 @@
 import '@testing-library/jest-dom';
 import { render } from '@testing-library/svelte';
+
 import InputGroupTest from './InputGroupTest.svelte';
 
 test('renders slotted content', () => {
diff --git a/mathesar_ui/src/component-library/input-group/__meta__/InputGroupTest.svelte b/mathesar_ui/src/component-library/input-group/__meta__/InputGroupTest.svelte
index 160ab8b281..183aebc0df 100644
--- a/mathesar_ui/src/component-library/input-group/__meta__/InputGroupTest.svelte
+++ b/mathesar_ui/src/component-library/input-group/__meta__/InputGroupTest.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import TextInput from '@mathesar-component-library-dir/text-input/TextInput.svelte';
+
   import InputGroup from '../InputGroup.svelte';
   import InputGroupText from '../InputGroupText.svelte';
 </script>
diff --git a/mathesar_ui/src/component-library/label/LabelController.ts b/mathesar_ui/src/component-library/label/LabelController.ts
index 527fca6d4a..3af09ee843 100644
--- a/mathesar_ui/src/component-library/label/LabelController.ts
+++ b/mathesar_ui/src/component-library/label/LabelController.ts
@@ -1,5 +1,6 @@
-import { writable } from 'svelte/store';
 import { getContext, setContext } from 'svelte';
+import { writable } from 'svelte/store';
+
 import { getGloballyUniqueId } from '../common/utils/domUtils';
 
 export class LabelController {
diff --git a/mathesar_ui/src/component-library/labeled-input/LabeledInput.svelte b/mathesar_ui/src/component-library/labeled-input/LabeledInput.svelte
index e8e40eee53..21c8d02a88 100644
--- a/mathesar_ui/src/component-library/labeled-input/LabeledInput.svelte
+++ b/mathesar_ui/src/component-library/labeled-input/LabeledInput.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import Label from '@mathesar-component-library-dir/label/Label.svelte';
+
   import type { LabeledInputLayout } from './LabeledInputTypes';
 
   export let label: string | undefined = undefined;
diff --git a/mathesar_ui/src/component-library/list-box/ListBox.svelte b/mathesar_ui/src/component-library/list-box/ListBox.svelte
index 03854e49b6..f7ff994fa9 100644
--- a/mathesar_ui/src/component-library/list-box/ListBox.svelte
+++ b/mathesar_ui/src/component-library/list-box/ListBox.svelte
@@ -1,15 +1,17 @@
 <script lang="ts">
   import { onMount } from 'svelte';
-  import { writable } from 'svelte/store';
+  import { createEventDispatcher, setContext } from 'svelte';
   import type { Writable } from 'svelte/store';
-  import { setContext, createEventDispatcher } from 'svelte';
+  import { writable } from 'svelte/store';
+
   import { getLabel as defaultGetLabel } from '@mathesar-component-library-dir/common/utils/formatUtils';
+
   import type {
-    ListBoxProps,
-    ListBoxStaticContextProps,
     ListBoxApi,
-    ListBoxContextState,
     ListBoxContext,
+    ListBoxContextState,
+    ListBoxProps,
+    ListBoxStaticContextProps,
   } from './ListBoxTypes';
 
   type Option = $$Generic;
diff --git a/mathesar_ui/src/component-library/list-box/ListBoxOptions.svelte b/mathesar_ui/src/component-library/list-box/ListBoxOptions.svelte
index 7f4bd977bf..c1b3683f96 100644
--- a/mathesar_ui/src/component-library/list-box/ListBoxOptions.svelte
+++ b/mathesar_ui/src/component-library/list-box/ListBoxOptions.svelte
@@ -1,6 +1,8 @@
 <script lang="ts">
-  import { onMount, getContext, tick } from 'svelte';
+  import { getContext, onMount, tick } from 'svelte';
+
   import StringOrComponent from '@mathesar-component-library-dir/string-or-component/StringOrComponent.svelte';
+
   import type { ListBoxContext } from './ListBoxTypes';
 
   type Option = $$Generic;
diff --git a/mathesar_ui/src/component-library/list-box/ListBoxTypes.ts b/mathesar_ui/src/component-library/list-box/ListBoxTypes.ts
index ae8824c122..b083adafe1 100644
--- a/mathesar_ui/src/component-library/list-box/ListBoxTypes.ts
+++ b/mathesar_ui/src/component-library/list-box/ListBoxTypes.ts
@@ -1,4 +1,5 @@
 import type { Readable } from 'svelte/store';
+
 import type CancellablePromise from '@mathesar-component-library-dir/common/utils/CancellablePromise';
 import type { LabelGetter } from '@mathesar-component-library-dir/common/utils/formatUtils';
 
diff --git a/mathesar_ui/src/component-library/match-highlighter/MatchHighlighter.svelte b/mathesar_ui/src/component-library/match-highlighter/MatchHighlighter.svelte
index 3fdcebd506..68f45df4d4 100644
--- a/mathesar_ui/src/component-library/match-highlighter/MatchHighlighter.svelte
+++ b/mathesar_ui/src/component-library/match-highlighter/MatchHighlighter.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import { splitMatchParts } from './matchHighlighterUtils';
   import type Match from './Match.svelte';
+  import { splitMatchParts } from './matchHighlighterUtils';
   import PrecomputedMatchHighlighter from './PrecomputedMatchHighlighter.svelte';
 
   export let text: string;
diff --git a/mathesar_ui/src/component-library/match-highlighter/__tests__/matchHighlighterUtils.test.ts b/mathesar_ui/src/component-library/match-highlighter/__tests__/matchHighlighterUtils.test.ts
index a4dad2a188..0c35a22f56 100644
--- a/mathesar_ui/src/component-library/match-highlighter/__tests__/matchHighlighterUtils.test.ts
+++ b/mathesar_ui/src/component-library/match-highlighter/__tests__/matchHighlighterUtils.test.ts
@@ -1,7 +1,7 @@
 import {
-  splitMatchParts,
   match as m,
   nonMatch as n,
+  splitMatchParts,
 } from '../matchHighlighterUtils';
 
 test.each([
diff --git a/mathesar_ui/src/component-library/match-highlighter/matchHighlighterUtils.ts b/mathesar_ui/src/component-library/match-highlighter/matchHighlighterUtils.ts
index 0db8a891bc..4b3f4cbda3 100644
--- a/mathesar_ui/src/component-library/match-highlighter/matchHighlighterUtils.ts
+++ b/mathesar_ui/src/component-library/match-highlighter/matchHighlighterUtils.ts
@@ -1,4 +1,5 @@
 import { toAsciiLowerCase } from '@mathesar-component-library-dir/common/utils';
+
 import type {
   MatchPart,
   ValueComparisonOutcome,
diff --git a/mathesar_ui/src/component-library/menu/ButtonMenuItem.svelte b/mathesar_ui/src/component-library/menu/ButtonMenuItem.svelte
index b0f3f45e05..6e0e6720cb 100644
--- a/mathesar_ui/src/component-library/menu/ButtonMenuItem.svelte
+++ b/mathesar_ui/src/component-library/menu/ButtonMenuItem.svelte
@@ -1,8 +1,10 @@
 <script lang="ts">
-  import type { IconProps } from '@mathesar-component-library-dir/icon/IconTypes';
   import { createEventDispatcher } from 'svelte';
-  import MenuItemWrapper from './MenuItemWrapper.svelte';
+
+  import type { IconProps } from '@mathesar-component-library-dir/icon/IconTypes';
+
   import MenuItemContents from './MenuItemContents.svelte';
+  import MenuItemWrapper from './MenuItemWrapper.svelte';
 
   const dispatch = createEventDispatcher();
 
diff --git a/mathesar_ui/src/component-library/menu/CheckboxMenuItem.svelte b/mathesar_ui/src/component-library/menu/CheckboxMenuItem.svelte
index f57a88f862..0ec485c5d5 100644
--- a/mathesar_ui/src/component-library/menu/CheckboxMenuItem.svelte
+++ b/mathesar_ui/src/component-library/menu/CheckboxMenuItem.svelte
@@ -1,13 +1,14 @@
 <script lang="ts">
+  import Checkbox from '@mathesar-component-library-dir/checkbox/Checkbox.svelte';
   import type { IconProps } from '@mathesar-component-library-dir/icon/IconTypes';
+  import Label from '@mathesar-component-library-dir/label/Label.svelte';
   import {
     LabelController,
     setLabelControllerInContext,
   } from '@mathesar-component-library-dir/label/LabelController';
-  import Label from '@mathesar-component-library-dir/label/Label.svelte';
-  import Checkbox from '@mathesar-component-library-dir/checkbox/Checkbox.svelte';
-  import MenuItemWrapper from './MenuItemWrapper.svelte';
+
   import MenuItemContents from './MenuItemContents.svelte';
+  import MenuItemWrapper from './MenuItemWrapper.svelte';
 
   export let icon: IconProps | undefined = undefined;
   export let checked: boolean | null = false;
diff --git a/mathesar_ui/src/component-library/menu/LinkMenuItem.svelte b/mathesar_ui/src/component-library/menu/LinkMenuItem.svelte
index a9cfd85d2f..0059c873b8 100644
--- a/mathesar_ui/src/component-library/menu/LinkMenuItem.svelte
+++ b/mathesar_ui/src/component-library/menu/LinkMenuItem.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
   import type { IconProps } from '@mathesar-component-library-dir/icon/IconTypes';
-  import MenuItemWrapper from './MenuItemWrapper.svelte';
+
   import MenuItemContents from './MenuItemContents.svelte';
+  import MenuItemWrapper from './MenuItemWrapper.svelte';
 
   export let icon: IconProps | undefined = undefined;
   export let href: string;
diff --git a/mathesar_ui/src/component-library/menu/Menu.svelte b/mathesar_ui/src/component-library/menu/Menu.svelte
index b97b1eb622..5a0a14f86f 100644
--- a/mathesar_ui/src/component-library/menu/Menu.svelte
+++ b/mathesar_ui/src/component-library/menu/Menu.svelte
@@ -4,6 +4,7 @@
     mergeStyleStrings,
   } from '@mathesar-component-library-dir/common/utils/styleUtils';
   import type { CssVariablesObj } from '@mathesar-component-library-dir/types';
+
   import { setNewMenuControllerInContext } from './MenuController';
 
   const controller = setNewMenuControllerInContext();
diff --git a/mathesar_ui/src/component-library/menu/MenuController.ts b/mathesar_ui/src/component-library/menu/MenuController.ts
index 9c6be34f30..ef16099548 100644
--- a/mathesar_ui/src/component-library/menu/MenuController.ts
+++ b/mathesar_ui/src/component-library/menu/MenuController.ts
@@ -1,4 +1,4 @@
-import { setContext, getContext } from 'svelte';
+import { getContext, setContext } from 'svelte';
 
 import ReductionStore from '@mathesar-component-library-dir/common/utils/ReductionStore';
 
diff --git a/mathesar_ui/src/component-library/menu/MenuItemContents.svelte b/mathesar_ui/src/component-library/menu/MenuItemContents.svelte
index 7eb5d059da..4f2500e07a 100644
--- a/mathesar_ui/src/component-library/menu/MenuItemContents.svelte
+++ b/mathesar_ui/src/component-library/menu/MenuItemContents.svelte
@@ -4,6 +4,7 @@
 
   import Icon from '@mathesar-component-library-dir/icon/Icon.svelte';
   import type { IconProps } from '@mathesar-component-library-dir/icon/IconTypes';
+
   import { getMenuControllerFromContext } from './MenuController';
 
   const menu = getMenuControllerFromContext();
diff --git a/mathesar_ui/src/component-library/modal/ControlledModal.svelte b/mathesar_ui/src/component-library/modal/ControlledModal.svelte
index 31032c6104..51feb574dd 100644
--- a/mathesar_ui/src/component-library/modal/ControlledModal.svelte
+++ b/mathesar_ui/src/component-library/modal/ControlledModal.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import type { ModalCloseAction, ModalWidth } from './modalTypes';
   import IndependentModal from './IndependentModal.svelte';
   import type ModalController from './ModalController';
+  import type { ModalCloseAction, ModalWidth } from './modalTypes';
 
   export let controller: ModalController;
   export let title: string | undefined = undefined;
diff --git a/mathesar_ui/src/component-library/modal/IndependentModal.svelte b/mathesar_ui/src/component-library/modal/IndependentModal.svelte
index 10b4cafba7..a2da3b21f4 100644
--- a/mathesar_ui/src/component-library/modal/IndependentModal.svelte
+++ b/mathesar_ui/src/component-library/modal/IndependentModal.svelte
@@ -2,8 +2,8 @@
   import { createEventDispatcher, tick } from 'svelte';
   import { fade, fly } from 'svelte/transition';
 
-  import Window from '@mathesar-component-library-dir/window/Window.svelte';
   import portal from '@mathesar-component-library-dir/common/actions/portal';
+  import Window from '@mathesar-component-library-dir/window/Window.svelte';
 
   import type { ModalCloseAction, ModalWidth } from './modalTypes';
 
diff --git a/mathesar_ui/src/component-library/modal/ModalController.ts b/mathesar_ui/src/component-library/modal/ModalController.ts
index 79726bf108..23c92082a3 100644
--- a/mathesar_ui/src/component-library/modal/ModalController.ts
+++ b/mathesar_ui/src/component-library/modal/ModalController.ts
@@ -1,11 +1,12 @@
 import type {
-  Writable,
   Readable,
   Subscriber,
   Unsubscriber,
   Updater,
+  Writable,
 } from 'svelte/store';
 import { derived } from 'svelte/store';
+
 import type ModalStack from './ModalStack';
 
 /**
diff --git a/mathesar_ui/src/component-library/modal/ModalMultiplexer.ts b/mathesar_ui/src/component-library/modal/ModalMultiplexer.ts
index 8dc7bb2906..e229aa3ee6 100644
--- a/mathesar_ui/src/component-library/modal/ModalMultiplexer.ts
+++ b/mathesar_ui/src/component-library/modal/ModalMultiplexer.ts
@@ -1,7 +1,8 @@
 import type { Readable, Writable } from 'svelte/store';
-import { writable, derived } from 'svelte/store';
-import ModalStack from './ModalStack';
+import { derived, writable } from 'svelte/store';
+
 import ModalController from './ModalController';
+import ModalStack from './ModalStack';
 
 /**
  * Controls all the modals in the system.
diff --git a/mathesar_ui/src/component-library/multi-select/MultiSelect.svelte b/mathesar_ui/src/component-library/multi-select/MultiSelect.svelte
index 1e4a825485..6841536d28 100644
--- a/mathesar_ui/src/component-library/multi-select/MultiSelect.svelte
+++ b/mathesar_ui/src/component-library/multi-select/MultiSelect.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
-  import { createEventDispatcher } from 'svelte';
   import { faBackspace, faTimes } from '@fortawesome/free-solid-svg-icons';
+  import { createEventDispatcher } from 'svelte';
+
   import BaseInput from '@mathesar-component-library-dir/common/base-components/BaseInput.svelte';
   import { getGloballyUniqueId } from '@mathesar-component-library-dir/common/utils/domUtils';
   import type { LabelGetter } from '@mathesar-component-library-dir/common/utils/formatUtils';
diff --git a/mathesar_ui/src/component-library/notification/Notification.svelte b/mathesar_ui/src/component-library/notification/Notification.svelte
index efb0dbf693..fd92541be3 100644
--- a/mathesar_ui/src/component-library/notification/Notification.svelte
+++ b/mathesar_ui/src/component-library/notification/Notification.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
   import { fade } from 'svelte/transition';
-  import { Icon, Button } from '@mathesar-component-library';
+
+  import { Button, Icon } from '@mathesar-component-library';
   import {
     iconClose,
     iconError,
diff --git a/mathesar_ui/src/component-library/number-input/NumberInput.svelte b/mathesar_ui/src/component-library/number-input/NumberInput.svelte
index fc73727f17..bba4248dfb 100644
--- a/mathesar_ui/src/component-library/number-input/NumberInput.svelte
+++ b/mathesar_ui/src/component-library/number-input/NumberInput.svelte
@@ -25,9 +25,10 @@
 -->
 <script lang="ts">
   import FormattedInput from '../formatted-input/FormattedInput.svelte';
+
   import { NumberFormatter } from './number-formatter';
-  import { getInputMode } from './numberInputUtils';
   import type { NumberInputProps } from './NumberInputTypes';
+  import { getInputMode } from './numberInputUtils';
 
   type $$Props = NumberInputProps;
 
diff --git a/mathesar_ui/src/component-library/number-input/NumberInputTypes.ts b/mathesar_ui/src/component-library/number-input/NumberInputTypes.ts
index 7fd4052173..9133835926 100644
--- a/mathesar_ui/src/component-library/number-input/NumberInputTypes.ts
+++ b/mathesar_ui/src/component-library/number-input/NumberInputTypes.ts
@@ -1,5 +1,6 @@
 import type { FormattedInputProps } from '@mathesar-component-library-dir/formatted-input/FormattedInputTypes';
 import type { SimplifiedTextInputProps } from '@mathesar-component-library-dir/text-input/TextInputTypes';
+
 import type { NumberFormatterOptions } from './number-formatter/types';
 
 export * from './number-formatter/types';
diff --git a/mathesar_ui/src/component-library/number-input/StringifiedNumberInput.svelte b/mathesar_ui/src/component-library/number-input/StringifiedNumberInput.svelte
index f2ff8ecbe1..c63f659246 100644
--- a/mathesar_ui/src/component-library/number-input/StringifiedNumberInput.svelte
+++ b/mathesar_ui/src/component-library/number-input/StringifiedNumberInput.svelte
@@ -30,9 +30,10 @@
 -->
 <script lang="ts">
   import FormattedInput from '@mathesar-component-library-dir/formatted-input/FormattedInput.svelte';
+
   import { StringifiedNumberFormatter } from './number-formatter';
-  import { getInputMode } from './numberInputUtils';
   import type { StringifiedNumberInputProps } from './NumberInputTypes';
+  import { getInputMode } from './numberInputUtils';
 
   type $$Props = StringifiedNumberInputProps;
 
diff --git a/mathesar_ui/src/component-library/number-input/__tests__/NumberInput.test.ts b/mathesar_ui/src/component-library/number-input/__tests__/NumberInput.test.ts
index 8dc8675b45..dda4b74813 100644
--- a/mathesar_ui/src/component-library/number-input/__tests__/NumberInput.test.ts
+++ b/mathesar_ui/src/component-library/number-input/__tests__/NumberInput.test.ts
@@ -1,6 +1,7 @@
 import '@testing-library/jest-dom';
 import { render } from '@testing-library/svelte';
 import userEvent from '@testing-library/user-event';
+
 import NumberInput from '../NumberInput.svelte';
 
 test.each([
diff --git a/mathesar_ui/src/component-library/number-input/number-formatter/AbstractNumberFormatter.ts b/mathesar_ui/src/component-library/number-input/number-formatter/AbstractNumberFormatter.ts
index 21639d749d..c4b27643c9 100644
--- a/mathesar_ui/src/component-library/number-input/number-formatter/AbstractNumberFormatter.ts
+++ b/mathesar_ui/src/component-library/number-input/number-formatter/AbstractNumberFormatter.ts
@@ -1,9 +1,10 @@
+import { withDefaults } from '@mathesar-component-library-dir/common/utils';
 import type {
   InputFormatter,
   ParseResult,
 } from '@mathesar-component-library-dir/formatted-input/FormattedInputTypes';
 import type { PartiallyMissingOrUndefined } from '@mathesar-component-library-dir/types';
-import { withDefaults } from '@mathesar-component-library-dir/common/utils';
+
 import type { DerivedOptions, Options } from './options';
 import { defaultOptions, getDerivedOptions } from './options';
 
diff --git a/mathesar_ui/src/component-library/number-input/number-formatter/NumberFormatter.ts b/mathesar_ui/src/component-library/number-input/number-formatter/NumberFormatter.ts
index 127c28bc3e..3aba8e1ffc 100644
--- a/mathesar_ui/src/component-library/number-input/number-formatter/NumberFormatter.ts
+++ b/mathesar_ui/src/component-library/number-input/number-formatter/NumberFormatter.ts
@@ -1,4 +1,5 @@
 import type { ParseResult } from '@mathesar-component-library-dir/formatted-input/FormattedInputTypes';
+
 import AbstractNumberFormatter from './AbstractNumberFormatter';
 import { makeFormatter } from './formatter';
 import { makeUniversalNumberParser } from './parsers';
diff --git a/mathesar_ui/src/component-library/number-input/number-formatter/StringifiedNumberFormatter.ts b/mathesar_ui/src/component-library/number-input/number-formatter/StringifiedNumberFormatter.ts
index d681150a48..4ea31eb494 100644
--- a/mathesar_ui/src/component-library/number-input/number-formatter/StringifiedNumberFormatter.ts
+++ b/mathesar_ui/src/component-library/number-input/number-formatter/StringifiedNumberFormatter.ts
@@ -1,4 +1,5 @@
 import type { ParseResult } from '@mathesar-component-library-dir/formatted-input/FormattedInputTypes';
+
 import AbstractNumberFormatter from './AbstractNumberFormatter';
 import { makeFormatter } from './formatter';
 import { makeUniversalNumberParser } from './parsers';
diff --git a/mathesar_ui/src/component-library/number-input/number-formatter/__tests__/NumberFormatter.test.ts b/mathesar_ui/src/component-library/number-input/number-formatter/__tests__/NumberFormatter.test.ts
index 02ecda713b..b9ad50098f 100644
--- a/mathesar_ui/src/component-library/number-input/number-formatter/__tests__/NumberFormatter.test.ts
+++ b/mathesar_ui/src/component-library/number-input/number-formatter/__tests__/NumberFormatter.test.ts
@@ -1,5 +1,5 @@
-import type { Options } from '../options';
 import NumberFormatter from '../NumberFormatter';
+import type { Options } from '../options';
 
 function getFormatter(partialOpts: Partial<Options> = {}): NumberFormatter {
   /**
diff --git a/mathesar_ui/src/component-library/number-input/number-formatter/__tests__/cleaners.test.ts b/mathesar_ui/src/component-library/number-input/number-formatter/__tests__/cleaners.test.ts
index e2ba77d46d..42426ada2f 100644
--- a/mathesar_ui/src/component-library/number-input/number-formatter/__tests__/cleaners.test.ts
+++ b/mathesar_ui/src/component-library/number-input/number-formatter/__tests__/cleaners.test.ts
@@ -1,11 +1,11 @@
 import {
-  removeExtraneousMinusSigns,
-  factoryToRemoveExtraneousDecimalSeparators,
   factoryToPrependShorthandDecimalWithZero,
+  factoryToRemoveExtraneousDecimalSeparators,
   factoryToSimplify,
+  removeExtraneousMinusSigns,
   removePrecedingZeros,
-  removeTrailingDecimalZeros,
   removeTrailingDecimalSeparator,
+  removeTrailingDecimalZeros,
 } from '../cleaners';
 
 test.each([
diff --git a/mathesar_ui/src/component-library/number-input/number-formatter/cleaners.ts b/mathesar_ui/src/component-library/number-input/number-formatter/cleaners.ts
index ec7a53e09c..72f1a33b8d 100644
--- a/mathesar_ui/src/component-library/number-input/number-formatter/cleaners.ts
+++ b/mathesar_ui/src/component-library/number-input/number-formatter/cleaners.ts
@@ -1,4 +1,5 @@
 import { escapeRegex } from '@mathesar-component-library-dir/common/utils/stringUtils';
+
 import type { DerivedOptions } from './options';
 
 type Cleaner = (input: string) => string;
diff --git a/mathesar_ui/src/component-library/number-input/number-formatter/formatter.ts b/mathesar_ui/src/component-library/number-input/number-formatter/formatter.ts
index 3b0a68496f..c5b69d7e06 100644
--- a/mathesar_ui/src/component-library/number-input/number-formatter/formatter.ts
+++ b/mathesar_ui/src/component-library/number-input/number-formatter/formatter.ts
@@ -1,6 +1,6 @@
+import { forceAsciiMinusSign } from './cleaners';
 import type { DerivedOptions } from './options';
 import { getDerivedOptions } from './options';
-import { forceAsciiMinusSign } from './cleaners';
 
 type Parts = Intl.NumberFormatPart[];
 
diff --git a/mathesar_ui/src/component-library/number-input/number-formatter/parsers.ts b/mathesar_ui/src/component-library/number-input/number-formatter/parsers.ts
index 6b1dc3687f..dfaf78ef17 100644
--- a/mathesar_ui/src/component-library/number-input/number-formatter/parsers.ts
+++ b/mathesar_ui/src/component-library/number-input/number-formatter/parsers.ts
@@ -1,9 +1,10 @@
 import type { ParseResult } from '@mathesar-component-library-dir/formatted-input/FormattedInputTypes';
+
 import { factoryToNormalize, factoryToSimplify } from './cleaners';
 import {
+  factoryToFormatSimplifiedInputForLocale,
   formatToNormalizedForm,
   makeFormatter,
-  factoryToFormatSimplifiedInputForLocale,
 } from './formatter';
 import { fractionDigitCount, hasTrailingDecimal } from './inference';
 import type { DerivedOptions } from './options';
diff --git a/mathesar_ui/src/component-library/pagination/Pagination.svelte b/mathesar_ui/src/component-library/pagination/Pagination.svelte
index 54a2b3e43b..37cd0ea044 100644
--- a/mathesar_ui/src/component-library/pagination/Pagination.svelte
+++ b/mathesar_ui/src/component-library/pagination/Pagination.svelte
@@ -1,13 +1,15 @@
 <script lang="ts">
-  import { tick, createEventDispatcher } from 'svelte';
+  import { createEventDispatcher, tick } from 'svelte';
+
   import { Button, Icon } from '@mathesar-component-library';
   import {
-    iconChooseItemPrevious,
-    iconShowMore,
-    iconChooseItemManyPrior,
     iconChooseItemManyAhead,
+    iconChooseItemManyPrior,
     iconChooseItemNext,
+    iconChooseItemPrevious,
+    iconShowMore,
   } from '@mathesar-component-library-dir/common/icons';
+
   import { calculatePages, getPageCount } from './paginationUtils';
 
   const dispatch = createEventDispatcher();
diff --git a/mathesar_ui/src/component-library/password-input/PasswordInput.svelte b/mathesar_ui/src/component-library/password-input/PasswordInput.svelte
index 17fdf5f3a0..2284f28267 100644
--- a/mathesar_ui/src/component-library/password-input/PasswordInput.svelte
+++ b/mathesar_ui/src/component-library/password-input/PasswordInput.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import BaseInput from '@mathesar-component-library-dir/common/base-components/BaseInput.svelte';
+
   import type { PasswordInputProps } from './PasswordInputTypes';
 
   type $$Props = PasswordInputProps;
diff --git a/mathesar_ui/src/component-library/radio-group/RadioGroup.svelte b/mathesar_ui/src/component-library/radio-group/RadioGroup.svelte
index b561b3d868..bb397bce50 100644
--- a/mathesar_ui/src/component-library/radio-group/RadioGroup.svelte
+++ b/mathesar_ui/src/component-library/radio-group/RadioGroup.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
+  import type { LabelGetter } from '@mathesar-component-library-dir/common/utils/formatUtils';
   import FieldsetGroup from '@mathesar-component-library-dir/fieldset-group/FieldsetGroup.svelte';
   import Radio from '@mathesar-component-library-dir/radio/Radio.svelte';
-  import type { LabelGetter } from '@mathesar-component-library-dir/common/utils/formatUtils';
 
   type Option = $$Generic;
 
diff --git a/mathesar_ui/src/component-library/radio/Radio.svelte b/mathesar_ui/src/component-library/radio/Radio.svelte
index 3611c11312..b605d891a2 100644
--- a/mathesar_ui/src/component-library/radio/Radio.svelte
+++ b/mathesar_ui/src/component-library/radio/Radio.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
+
   import BaseInput from '@mathesar-component-library-dir/common/base-components/BaseInput.svelte';
 
   const dispatch = createEventDispatcher<{ change: boolean }>();
diff --git a/mathesar_ui/src/component-library/render/Render.svelte b/mathesar_ui/src/component-library/render/Render.svelte
index f9fc24ff3b..c3efdbe880 100644
--- a/mathesar_ui/src/component-library/render/Render.svelte
+++ b/mathesar_ui/src/component-library/render/Render.svelte
@@ -3,6 +3,7 @@
 
   import MarginTrim from '@mathesar-component-library-dir/margin-trim/MarginTrim.svelte';
   import type { ComponentWithProps } from '@mathesar-component-library-dir/types';
+
   import RenderComponentWithProps from './RenderComponentWithProps.svelte';
 
   type T = $$Generic<SvelteComponent>;
diff --git a/mathesar_ui/src/component-library/select/Select.svelte b/mathesar_ui/src/component-library/select/Select.svelte
index 40f92443f6..208c1a1528 100644
--- a/mathesar_ui/src/component-library/select/Select.svelte
+++ b/mathesar_ui/src/component-library/select/Select.svelte
@@ -1,14 +1,17 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
+
   import BaseInput from '@mathesar-component-library-dir/common/base-components/BaseInput.svelte';
+  import { getGloballyUniqueId } from '@mathesar-component-library-dir/common/utils/domUtils';
+  import { getLabel as defaultGetLabel } from '@mathesar-component-library-dir/common/utils/formatUtils';
+  import { Dropdown } from '@mathesar-component-library-dir/dropdown';
   import {
     ListBox,
     ListBoxOptions,
   } from '@mathesar-component-library-dir/list-box';
-  import { Dropdown } from '@mathesar-component-library-dir/dropdown';
-  import { getLabel as defaultGetLabel } from '@mathesar-component-library-dir/common/utils/formatUtils';
-  import { getGloballyUniqueId } from '@mathesar-component-library-dir/common/utils/domUtils';
+
   import StringOrComponent from '../string-or-component/StringOrComponent.svelte';
+
   import type { SelectProps } from './SelectTypes';
 
   type Option = $$Generic;
diff --git a/mathesar_ui/src/component-library/select/__meta__/Select.test.ts b/mathesar_ui/src/component-library/select/__meta__/Select.test.ts
index 8e65733807..e0c8013977 100644
--- a/mathesar_ui/src/component-library/select/__meta__/Select.test.ts
+++ b/mathesar_ui/src/component-library/select/__meta__/Select.test.ts
@@ -1,5 +1,6 @@
 import '@testing-library/jest-dom';
-import { render, fireEvent } from '@testing-library/svelte';
+import { fireEvent, render } from '@testing-library/svelte';
+
 import Select from '../Select.svelte';
 
 test('renders select button in default appearance', () => {
diff --git a/mathesar_ui/src/component-library/selection-list/SelectionList.svelte b/mathesar_ui/src/component-library/selection-list/SelectionList.svelte
index 3a08e6cf5c..26629bc9f5 100644
--- a/mathesar_ui/src/component-library/selection-list/SelectionList.svelte
+++ b/mathesar_ui/src/component-library/selection-list/SelectionList.svelte
@@ -1,13 +1,15 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
+
   import BaseInput from '@mathesar-component-library-dir/common/base-components/BaseInput.svelte';
+  import { getGloballyUniqueId } from '@mathesar-component-library-dir/common/utils/domUtils';
+  import { getLabel as defaultGetLabel } from '@mathesar-component-library-dir/common/utils/formatUtils';
   import {
     ListBox,
     ListBoxOptions,
   } from '@mathesar-component-library-dir/list-box';
-  import { getLabel as defaultGetLabel } from '@mathesar-component-library-dir/common/utils/formatUtils';
   import StringOrComponent from '@mathesar-component-library-dir/string-or-component/StringOrComponent.svelte';
-  import { getGloballyUniqueId } from '@mathesar-component-library-dir/common/utils/domUtils';
+
   import type { SelectionListProps } from './SelectionListTypes';
 
   type Option = $$Generic;
diff --git a/mathesar_ui/src/component-library/skeleton/__meta__/Skeleton.test.ts b/mathesar_ui/src/component-library/skeleton/__meta__/Skeleton.test.ts
index 22f7283218..d57f229239 100644
--- a/mathesar_ui/src/component-library/skeleton/__meta__/Skeleton.test.ts
+++ b/mathesar_ui/src/component-library/skeleton/__meta__/Skeleton.test.ts
@@ -1,4 +1,5 @@
 import { render } from '@testing-library/svelte';
+
 import Skeleton from '../Skeleton.svelte';
 
 test('renders skeleton when loading is true', () => {
diff --git a/mathesar_ui/src/component-library/spinner-button/SpinnerButton.svelte b/mathesar_ui/src/component-library/spinner-button/SpinnerButton.svelte
index 01f0ab2edf..faad65e6d1 100644
--- a/mathesar_ui/src/component-library/spinner-button/SpinnerButton.svelte
+++ b/mathesar_ui/src/component-library/spinner-button/SpinnerButton.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
   import type { ComponentProps } from 'svelte';
 
-  import type { IconProps } from '@mathesar-component-library-dir/icon/IconTypes';
   import Button from '@mathesar-component-library-dir/button/Button.svelte';
-  import Spinner from '@mathesar-component-library-dir/spinner/Spinner.svelte';
   import Icon from '@mathesar-component-library-dir/icon/Icon.svelte';
+  import type { IconProps } from '@mathesar-component-library-dir/icon/IconTypes';
+  import Spinner from '@mathesar-component-library-dir/spinner/Spinner.svelte';
+
   import type { Appearance } from '../commonTypes';
 
   /** TODO: Improve typing to ensure there's either a label or an icon */
diff --git a/mathesar_ui/src/component-library/string-or-component/StringOrComponent.svelte b/mathesar_ui/src/component-library/string-or-component/StringOrComponent.svelte
index 9c33f9d052..dd4ef472de 100644
--- a/mathesar_ui/src/component-library/string-or-component/StringOrComponent.svelte
+++ b/mathesar_ui/src/component-library/string-or-component/StringOrComponent.svelte
@@ -5,11 +5,11 @@
   type safety in comparing a component to its props.
 -->
 <script lang="ts">
-  import type { ComponentAndProps } from '@mathesar-component-library-dir/types';
   import {
     hasProperty,
     isDefinedObject,
   } from '@mathesar-component-library-dir/common/utils/typeUtils';
+  import type { ComponentAndProps } from '@mathesar-component-library-dir/types';
 
   export let arg: string | string[] | ComponentAndProps;
 
diff --git a/mathesar_ui/src/component-library/tabs/Tab.svelte b/mathesar_ui/src/component-library/tabs/Tab.svelte
index 8614ed5b1b..d8ca397b51 100644
--- a/mathesar_ui/src/component-library/tabs/Tab.svelte
+++ b/mathesar_ui/src/component-library/tabs/Tab.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
+
   import type { Tab } from './TabContainerTypes';
 
   const dispatch = createEventDispatcher();
diff --git a/mathesar_ui/src/component-library/tabs/TabContainer.svelte b/mathesar_ui/src/component-library/tabs/TabContainer.svelte
index 58e3ac0465..bdce6d6691 100644
--- a/mathesar_ui/src/component-library/tabs/TabContainer.svelte
+++ b/mathesar_ui/src/component-library/tabs/TabContainer.svelte
@@ -9,6 +9,7 @@
 
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
+
   import TabComponent from './Tab.svelte';
   import type { Tab, TabEvents } from './TabContainerTypes';
 
diff --git a/mathesar_ui/src/component-library/text-area/TextArea.svelte b/mathesar_ui/src/component-library/text-area/TextArea.svelte
index 7b2f411af3..07d52e9381 100644
--- a/mathesar_ui/src/component-library/text-area/TextArea.svelte
+++ b/mathesar_ui/src/component-library/text-area/TextArea.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
+
   import BaseInput from '@mathesar-component-library-dir/common/base-components/BaseInput.svelte';
   import type {
-    TextAreaProps,
     TextAreaProcessedKeyDown,
+    TextAreaProps,
   } from '@mathesar-component-library-dir/text-area/TextAreaTypes';
 
   const dispatch = createEventDispatcher<{
diff --git a/mathesar_ui/src/component-library/text-input/TextInput.svelte b/mathesar_ui/src/component-library/text-input/TextInput.svelte
index 70561b18cd..6e3a141a5d 100644
--- a/mathesar_ui/src/component-library/text-input/TextInput.svelte
+++ b/mathesar_ui/src/component-library/text-input/TextInput.svelte
@@ -4,6 +4,7 @@
     makeStyleStringFromCssVariables,
     mergeStyleStrings,
   } from '@mathesar-component-library-dir/common/utils/styleUtils';
+
   import type { TextInputProps } from './TextInputTypes';
 
   type $$Props = TextInputProps;
diff --git a/mathesar_ui/src/component-library/text-input/TextInputTypes.ts b/mathesar_ui/src/component-library/text-input/TextInputTypes.ts
index c9644b67dd..ea0ff78810 100644
--- a/mathesar_ui/src/component-library/text-input/TextInputTypes.ts
+++ b/mathesar_ui/src/component-library/text-input/TextInputTypes.ts
@@ -3,6 +3,7 @@ import type {
   CssVariablesObj,
   SimplifiedInputProps,
 } from '@mathesar-component-library-dir/commonTypes';
+
 import type { IconProps } from '../types';
 
 export interface TextInputProps extends SimplifiedInputProps, BaseInputProps {
diff --git a/mathesar_ui/src/component-library/text-input/TextInputWithPrefix.svelte b/mathesar_ui/src/component-library/text-input/TextInputWithPrefix.svelte
index 864adf0c28..b5f57c8cb3 100644
--- a/mathesar_ui/src/component-library/text-input/TextInputWithPrefix.svelte
+++ b/mathesar_ui/src/component-library/text-input/TextInputWithPrefix.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import Icon from '../icon/Icon.svelte';
+
   import TextInput from './TextInput.svelte';
   import type { TextInputWithPrefixProps } from './TextInputTypes';
 
diff --git a/mathesar_ui/src/component-library/text-input/__meta__/TextInput.test.ts b/mathesar_ui/src/component-library/text-input/__meta__/TextInput.test.ts
index 88ae469603..976637771a 100644
--- a/mathesar_ui/src/component-library/text-input/__meta__/TextInput.test.ts
+++ b/mathesar_ui/src/component-library/text-input/__meta__/TextInput.test.ts
@@ -1,5 +1,6 @@
 import '@testing-library/jest-dom';
 import { render } from '@testing-library/svelte';
+
 import TextInput from '../TextInput.svelte';
 
 test('renders text-input with value', () => {
diff --git a/mathesar_ui/src/component-library/toast/ToastController.ts b/mathesar_ui/src/component-library/toast/ToastController.ts
index 892ea23ea1..53a51133a5 100644
--- a/mathesar_ui/src/component-library/toast/ToastController.ts
+++ b/mathesar_ui/src/component-library/toast/ToastController.ts
@@ -1,16 +1,17 @@
-import type { IconProps } from '@mathesar-component-library-dir/icon/IconTypes';
 import type { SvelteComponent } from 'svelte';
 import { linear } from 'svelte/easing';
-import type { Writable, Readable } from 'svelte/store';
-import { writable, derived } from 'svelte/store';
-import type { PauseableTweened } from '@mathesar-component-library-dir/common/utils/pauseableTweened';
-import { pauseableTweened } from '@mathesar-component-library-dir/common/utils/pauseableTweened';
+import type { Readable, Writable } from 'svelte/store';
+import { derived, writable } from 'svelte/store';
+
 import {
-  iconSuccess,
-  iconLoading,
   iconError,
   iconInfo,
+  iconLoading,
+  iconSuccess,
 } from '@mathesar-component-library-dir/common/icons';
+import type { PauseableTweened } from '@mathesar-component-library-dir/common/utils/pauseableTweened';
+import { pauseableTweened } from '@mathesar-component-library-dir/common/utils/pauseableTweened';
+import type { IconProps } from '@mathesar-component-library-dir/icon/IconTypes';
 
 /**
  * Allows control of the toast message after it is displayed
diff --git a/mathesar_ui/src/component-library/toast/ToastItem.svelte b/mathesar_ui/src/component-library/toast/ToastItem.svelte
index 2dc7e8561f..d956d7de4a 100644
--- a/mathesar_ui/src/component-library/toast/ToastItem.svelte
+++ b/mathesar_ui/src/component-library/toast/ToastItem.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
-  import Icon from '@mathesar-component-library-dir/icon/Icon.svelte';
-  import { ensureReadable } from '@mathesar-component-library-dir/common/utils/storeUtils';
   import { iconClose } from '@mathesar-component-library-dir/common/icons';
+  import { ensureReadable } from '@mathesar-component-library-dir/common/utils/storeUtils';
+  import Icon from '@mathesar-component-library-dir/icon/Icon.svelte';
+
   import type { ToastEntry } from './ToastController';
 
   export let entry: ToastEntry;
diff --git a/mathesar_ui/src/component-library/toast/ToastPresenter.svelte b/mathesar_ui/src/component-library/toast/ToastPresenter.svelte
index 68988d00b8..5472db3d59 100644
--- a/mathesar_ui/src/component-library/toast/ToastPresenter.svelte
+++ b/mathesar_ui/src/component-library/toast/ToastPresenter.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
   import type { SvelteComponent } from 'svelte';
-  import { fade, fly } from 'svelte/transition';
   import { flip } from 'svelte/animate';
   import type { Readable } from 'svelte/store';
+  import { fade, fly } from 'svelte/transition';
+
   import type { ToastEntry } from './ToastController';
   import ToastItem from './ToastItem.svelte';
 
diff --git a/mathesar_ui/src/component-library/toast/__meta__/ToastStoryCustomItem.svelte b/mathesar_ui/src/component-library/toast/__meta__/ToastStoryCustomItem.svelte
index 06cca6b1d0..5c23c0a214 100644
--- a/mathesar_ui/src/component-library/toast/__meta__/ToastStoryCustomItem.svelte
+++ b/mathesar_ui/src/component-library/toast/__meta__/ToastStoryCustomItem.svelte
@@ -2,6 +2,7 @@
   import Button from '../../button/Button.svelte';
   import { makeToast } from '../ToastController';
   import ToastPresenter from '../ToastPresenter.svelte';
+
   import ToastCustomItem from './ToastCustomItem.svelte';
 
   const toast = makeToast();
diff --git a/mathesar_ui/src/component-library/toast/__meta__/ToastStoryHighLevel.svelte b/mathesar_ui/src/component-library/toast/__meta__/ToastStoryHighLevel.svelte
index 03570f740e..5206b2e097 100644
--- a/mathesar_ui/src/component-library/toast/__meta__/ToastStoryHighLevel.svelte
+++ b/mathesar_ui/src/component-library/toast/__meta__/ToastStoryHighLevel.svelte
@@ -1,9 +1,11 @@
 <script>
   import { faRocket } from '@fortawesome/free-solid-svg-icons';
   import { derived, writable } from 'svelte/store';
+
   import Button from '../../button/Button.svelte';
   import { makeToast } from '../ToastController';
   import ToastPresenter from '../ToastPresenter.svelte';
+
   import ToastStoryRichTextContent from './ToastStoryRichTextContent.svelte';
 
   /* eslint-disable @typescript-eslint/no-unsafe-call */
diff --git a/mathesar_ui/src/component-library/toast/__meta__/ToastStoryLowLevel.svelte b/mathesar_ui/src/component-library/toast/__meta__/ToastStoryLowLevel.svelte
index 1614304aca..d4bbd02723 100644
--- a/mathesar_ui/src/component-library/toast/__meta__/ToastStoryLowLevel.svelte
+++ b/mathesar_ui/src/component-library/toast/__meta__/ToastStoryLowLevel.svelte
@@ -5,11 +5,12 @@
     faExclamationTriangle,
   } from '@fortawesome/free-solid-svg-icons';
   import { onMount } from 'svelte';
+
   import Button from '../../button/Button.svelte';
-  import ToastPresenter from '../ToastPresenter.svelte';
-  import { ToastController } from '../ToastController';
-  import Select from '../../select/Select.svelte';
   import Icon from '../../icon/Icon.svelte';
+  import Select from '../../select/Select.svelte';
+  import { ToastController } from '../ToastController';
+  import ToastPresenter from '../ToastPresenter.svelte';
 
   const toast = new ToastController();
   const { entries } = toast;
diff --git a/mathesar_ui/src/component-library/tooltip/TooltipAction.ts b/mathesar_ui/src/component-library/tooltip/TooltipAction.ts
index d8ee99b697..59c1ec623f 100644
--- a/mathesar_ui/src/component-library/tooltip/TooltipAction.ts
+++ b/mathesar_ui/src/component-library/tooltip/TooltipAction.ts
@@ -1,4 +1,5 @@
 import type { ActionReturn } from 'svelte/action';
+
 import AttachableDropdown from '@mathesar-component-library-dir/dropdown/AttachableDropdown.svelte';
 import type { ComponentAndProps } from '@mathesar-component-library-dir/types';
 
diff --git a/mathesar_ui/src/component-library/tree/Tree.svelte b/mathesar_ui/src/component-library/tree/Tree.svelte
index 042cba9512..b83e08ee89 100644
--- a/mathesar_ui/src/component-library/tree/Tree.svelte
+++ b/mathesar_ui/src/component-library/tree/Tree.svelte
@@ -1,16 +1,17 @@
 <script lang="ts">
-  import TextInput from '@mathesar-component-library-dir/text-input/TextInput.svelte';
-  import Icon from '@mathesar-component-library-dir/icon/Icon.svelte';
-  import {
-    InputGroup,
-    InputGroupText,
-  } from '@mathesar-component-library-dir/input-group';
+  import { iconSearch } from '@mathesar-component-library-dir/common/icons';
   import { filterTree } from '@mathesar-component-library-dir/common/utils/filterUtils';
   import {
     hasProperty,
     hasStringProperty,
   } from '@mathesar-component-library-dir/common/utils/typeUtils';
-  import { iconSearch } from '@mathesar-component-library-dir/common/icons';
+  import Icon from '@mathesar-component-library-dir/icon/Icon.svelte';
+  import {
+    InputGroup,
+    InputGroupText,
+  } from '@mathesar-component-library-dir/input-group';
+  import TextInput from '@mathesar-component-library-dir/text-input/TextInput.svelte';
+
   import TreeItemComponent from './TreeItem.svelte';
 
   type TreeItem = $$Generic;
diff --git a/mathesar_ui/src/component-library/tree/TreeItem.svelte b/mathesar_ui/src/component-library/tree/TreeItem.svelte
index 4b702c6703..e3768ae1dd 100644
--- a/mathesar_ui/src/component-library/tree/TreeItem.svelte
+++ b/mathesar_ui/src/component-library/tree/TreeItem.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
-  import { Icon, Button } from '@mathesar-component-library';
+
+  import { Button, Icon } from '@mathesar-component-library';
   import { iconVerticallyCollapsed } from '@mathesar-component-library-dir/common/icons';
 
   type TreeItem = $$Generic;
diff --git a/mathesar_ui/src/component-library/window/Window.svelte b/mathesar_ui/src/component-library/window/Window.svelte
index a42d107f74..2ba0e26b1a 100644
--- a/mathesar_ui/src/component-library/window/Window.svelte
+++ b/mathesar_ui/src/component-library/window/Window.svelte
@@ -2,8 +2,8 @@
   import { createEventDispatcher } from 'svelte';
 
   import Button from '@mathesar-component-library-dir/button/Button.svelte';
-  import Icon from '@mathesar-component-library-dir/icon/Icon.svelte';
   import { iconClose } from '@mathesar-component-library-dir/common/icons';
+  import Icon from '@mathesar-component-library-dir/icon/Icon.svelte';
 
   const dispatch = createEventDispatcher();
 
diff --git a/mathesar_ui/src/component-library/with-panel/WithPanel.svelte b/mathesar_ui/src/component-library/with-panel/WithPanel.svelte
index 51e0136b32..b057758691 100644
--- a/mathesar_ui/src/component-library/with-panel/WithPanel.svelte
+++ b/mathesar_ui/src/component-library/with-panel/WithPanel.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import { slider } from '@mathesar-component-library';
   import { assertExhaustive } from '@mathesar/utils/typeUtils';
+  import { slider } from '@mathesar-component-library';
 
   export let placement: 'top' | 'bottom' | 'left' | 'right' = 'right';
   export let sizePx = 300;
diff --git a/mathesar_ui/src/components/AppHeader.svelte b/mathesar_ui/src/components/AppHeader.svelte
index 77ec02727e..0fa38e1483 100644
--- a/mathesar_ui/src/components/AppHeader.svelte
+++ b/mathesar_ui/src/components/AppHeader.svelte
@@ -1,16 +1,7 @@
 <script lang="ts">
-  import { router } from 'tinro';
   import { _ } from 'svelte-i18n';
-  import { preloadCommonData } from '@mathesar/utils/preloadData';
-  import {
-    DropdownMenu,
-    Icon,
-    iconLoading,
-    LinkMenuItem,
-    MenuDivider,
-    MenuHeading,
-    ButtonMenuItem,
-  } from '@mathesar-component-library';
+  import { router } from 'tinro';
+
   import {
     iconAddNew,
     iconConnection,
@@ -24,18 +15,29 @@
   import {
     ADMIN_URL,
     CONNECTIONS_URL,
-    getDatabasePageUrl,
+    LOGOUT_URL,
+    USER_PROFILE_URL,
     getDataExplorerPageUrl,
+    getDatabasePageUrl,
     getImportPageUrl,
     getTablePageUrl,
-    LOGOUT_URL,
-    USER_PROFILE_URL,
   } from '@mathesar/routes/urls';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { getReleaseDataStoreFromContext } from '@mathesar/stores/releases';
   import { currentSchema } from '@mathesar/stores/schemas';
   import { createTable } from '@mathesar/stores/tables';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
+  import { preloadCommonData } from '@mathesar/utils/preloadData';
+  import {
+    ButtonMenuItem,
+    DropdownMenu,
+    Icon,
+    LinkMenuItem,
+    MenuDivider,
+    MenuHeading,
+    iconLoading,
+  } from '@mathesar-component-library';
+
   import Breadcrumb from './breadcrumb/Breadcrumb.svelte';
 
   const commonData = preloadCommonData();
diff --git a/mathesar_ui/src/components/AppSecondaryHeader.svelte b/mathesar_ui/src/components/AppSecondaryHeader.svelte
index 9858405ce2..72d242b98d 100644
--- a/mathesar_ui/src/components/AppSecondaryHeader.svelte
+++ b/mathesar_ui/src/components/AppSecondaryHeader.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import type { ComponentProps } from 'svelte';
+
   import PageTitleAndMeta from './PageTitleAndMeta.svelte';
 
   export let pageTitleAndMetaProps: ComponentProps<PageTitleAndMeta>;
diff --git a/mathesar_ui/src/components/CellValue.svelte b/mathesar_ui/src/components/CellValue.svelte
index f4551b144d..0e8dc42cbe 100644
--- a/mathesar_ui/src/components/CellValue.svelte
+++ b/mathesar_ui/src/components/CellValue.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { PrecomputedMatchHighlighter } from '@mathesar-component-library';
   import type { MatchPart } from '@mathesar-component-library/types';
+
   import Default from './Default.svelte';
   import Null from './Null.svelte';
 
diff --git a/mathesar_ui/src/components/DatabaseName.svelte b/mathesar_ui/src/components/DatabaseName.svelte
index 3797cb446d..7be52793e0 100644
--- a/mathesar_ui/src/components/DatabaseName.svelte
+++ b/mathesar_ui/src/components/DatabaseName.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import type { Database } from '@mathesar/AppTypes';
   import { iconDatabase } from '@mathesar/icons';
+
   import NameWithIcon from './NameWithIcon.svelte';
 
   export let database: Database;
diff --git a/mathesar_ui/src/components/EditTableHOC.svelte b/mathesar_ui/src/components/EditTableHOC.svelte
index f418f93857..3e8ac9ca50 100644
--- a/mathesar_ui/src/components/EditTableHOC.svelte
+++ b/mathesar_ui/src/components/EditTableHOC.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import { currentSchemaId } from '@mathesar/stores/schemas';
   import {
     refetchTablesForSchema,
-    updateTableMetaData,
     tables,
+    updateTableMetaData,
   } from '@mathesar/stores/tables';
   import type { AtLeastOne } from '@mathesar/typeUtils';
 
diff --git a/mathesar_ui/src/components/EditableTextWithActions.svelte b/mathesar_ui/src/components/EditableTextWithActions.svelte
index 3df3422e9e..5467fd9e04 100644
--- a/mathesar_ui/src/components/EditableTextWithActions.svelte
+++ b/mathesar_ui/src/components/EditableTextWithActions.svelte
@@ -5,13 +5,14 @@
 -->
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
+  import { toast } from '@mathesar/stores/toast';
+  import { getErrorMessage } from '@mathesar/utils/errors';
   import {
     CancelOrProceedButtonPair,
-    TextInput,
     TextArea,
+    TextInput,
   } from '@mathesar-component-library';
-  import { toast } from '@mathesar/stores/toast';
-  import { getErrorMessage } from '@mathesar/utils/errors';
 
   export let initialValue = '';
   export let onSubmit: (value: string) => Promise<void>;
diff --git a/mathesar_ui/src/components/GrowableTextArea.svelte b/mathesar_ui/src/components/GrowableTextArea.svelte
index 801c08c8d9..971103bf81 100644
--- a/mathesar_ui/src/components/GrowableTextArea.svelte
+++ b/mathesar_ui/src/components/GrowableTextArea.svelte
@@ -8,6 +8,7 @@
 -->
 <script lang="ts">
   import type { ComponentProps } from 'svelte';
+
   import { TextArea } from '@mathesar-component-library';
 
   const MAX_HEIGHT_PX = 400;
diff --git a/mathesar_ui/src/components/LinkedRecord.svelte b/mathesar_ui/src/components/LinkedRecord.svelte
index 7140d8fe43..c673bcf423 100644
--- a/mathesar_ui/src/components/LinkedRecord.svelte
+++ b/mathesar_ui/src/components/LinkedRecord.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
+
+  import { iconDeleteMinor } from '@mathesar/icons';
   import { Icon } from '@mathesar-component-library';
   import type { ValueComparisonOutcome } from '@mathesar-component-library/types';
-  import { iconDeleteMinor } from '@mathesar/icons';
+
   import RecordSummary from './RecordSummary.svelte';
 
   const dispatch = createEventDispatcher();
diff --git a/mathesar_ui/src/components/ModificationStatus.svelte b/mathesar_ui/src/components/ModificationStatus.svelte
index bc7e403a60..6f3589fc8e 100644
--- a/mathesar_ui/src/components/ModificationStatus.svelte
+++ b/mathesar_ui/src/components/ModificationStatus.svelte
@@ -1,8 +1,10 @@
 <script lang="ts">
   import { onDestroy } from 'svelte';
-  import { _ } from 'svelte-i18n';
   import { fade } from 'svelte/transition';
+  import { _ } from 'svelte-i18n';
+
   import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+
   import StatusIndicator from './StatusIndicator.svelte';
 
   let incomingRequestState: RequestStatus['state'] | undefined;
diff --git a/mathesar_ui/src/components/NameAndDescInputModalForm.svelte b/mathesar_ui/src/components/NameAndDescInputModalForm.svelte
index 40ee59f4f9..300e8be269 100644
--- a/mathesar_ui/src/components/NameAndDescInputModalForm.svelte
+++ b/mathesar_ui/src/components/NameAndDescInputModalForm.svelte
@@ -10,6 +10,9 @@
    */
   import { tick } from 'svelte';
   import { _ } from 'svelte-i18n';
+
+  import TextArea from '@mathesar/component-library/text-area/TextArea.svelte';
+  import { toast } from '@mathesar/stores/toast';
   import {
     LabeledInput,
     type ModalController,
@@ -19,8 +22,6 @@
     ControlledModal,
     TextInput,
   } from '@mathesar-component-library';
-  import { toast } from '@mathesar/stores/toast';
-  import TextArea from '@mathesar/component-library/text-area/TextArea.svelte';
 
   export let saveButtonLabel = $_('save');
   export let controller: ModalController;
diff --git a/mathesar_ui/src/components/OnPageFilterBar.svelte b/mathesar_ui/src/components/OnPageFilterBar.svelte
index d48452cec8..c9eca99fb3 100644
--- a/mathesar_ui/src/components/OnPageFilterBar.svelte
+++ b/mathesar_ui/src/components/OnPageFilterBar.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
+  import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
-  import { iconSearch, Button } from '@mathesar-component-library';
+
   import TextInputWithPrefix from '@mathesar/component-library/text-input/TextInputWithPrefix.svelte';
-  import { createEventDispatcher } from 'svelte';
+  import { Button, iconSearch } from '@mathesar-component-library';
 
   const dispatch = createEventDispatcher();
 
diff --git a/mathesar_ui/src/components/PaginationGroup.svelte b/mathesar_ui/src/components/PaginationGroup.svelte
index b7d9fe0c52..e5bf7d5eeb 100644
--- a/mathesar_ui/src/components/PaginationGroup.svelte
+++ b/mathesar_ui/src/components/PaginationGroup.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
+
+  import Pagination from '@mathesar/utils/Pagination';
   import {
     Pagination as PaginationComponent,
     Select,
   } from '@mathesar-component-library';
-  import Pagination from '@mathesar/utils/Pagination';
 
   const dispatch = createEventDispatcher();
 
diff --git a/mathesar_ui/src/components/QueryName.svelte b/mathesar_ui/src/components/QueryName.svelte
index fd1d125e5c..be85152f28 100644
--- a/mathesar_ui/src/components/QueryName.svelte
+++ b/mathesar_ui/src/components/QueryName.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import { iconExploration } from '@mathesar/icons';
+
   import NameWithIcon from './NameWithIcon.svelte';
 
   export let query: QueryInstance;
diff --git a/mathesar_ui/src/components/RecordPageLink.svelte b/mathesar_ui/src/components/RecordPageLink.svelte
index ed5a904fc2..5cfea48a4b 100644
--- a/mathesar_ui/src/components/RecordPageLink.svelte
+++ b/mathesar_ui/src/components/RecordPageLink.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { Icon } from '@mathesar-component-library';
+
   import { iconLinkToRecordPage } from '@mathesar/icons';
+  import { Icon } from '@mathesar-component-library';
 
   export let href: string;
 
diff --git a/mathesar_ui/src/components/RefreshButton.svelte b/mathesar_ui/src/components/RefreshButton.svelte
index df0c67c26c..9072e52e88 100644
--- a/mathesar_ui/src/components/RefreshButton.svelte
+++ b/mathesar_ui/src/components/RefreshButton.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { Button, Icon, iconError } from '@mathesar-component-library';
+
   import { iconRefresh } from '@mathesar/icons';
+  import { Button, Icon, iconError } from '@mathesar-component-library';
 
   export let state: 'loading' | 'error' | undefined = undefined;
 
diff --git a/mathesar_ui/src/components/SchemaName.svelte b/mathesar_ui/src/components/SchemaName.svelte
index b8abb3430f..e6fa7cf638 100644
--- a/mathesar_ui/src/components/SchemaName.svelte
+++ b/mathesar_ui/src/components/SchemaName.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import type { SchemaEntry } from '@mathesar/AppTypes';
   import { iconSchema } from '@mathesar/icons';
+
   import NameWithIcon from './NameWithIcon.svelte';
 
   export let schema: SchemaEntry;
diff --git a/mathesar_ui/src/components/SelectProcessedColumn.svelte b/mathesar_ui/src/components/SelectProcessedColumn.svelte
index 77c21acdad..53e8b90e6d 100644
--- a/mathesar_ui/src/components/SelectProcessedColumn.svelte
+++ b/mathesar_ui/src/components/SelectProcessedColumn.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
-  import { Select } from '@mathesar-component-library';
   import type { ProcessedColumn } from '@mathesar/stores/table-data';
+  import { Select } from '@mathesar-component-library';
+
   import ProcessedColumnName from './column/ProcessedColumnName.svelte';
 
   export let columns: ProcessedColumn[];
diff --git a/mathesar_ui/src/components/SelectProcessedColumns.svelte b/mathesar_ui/src/components/SelectProcessedColumns.svelte
index c551822bdc..1b62c7feee 100644
--- a/mathesar_ui/src/components/SelectProcessedColumns.svelte
+++ b/mathesar_ui/src/components/SelectProcessedColumns.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
+  import type { ProcessedColumn } from '@mathesar/stores/table-data';
   import { MultiSelect } from '@mathesar-component-library';
   import type { ComponentAndProps } from '@mathesar-component-library/types';
-  import type { ProcessedColumn } from '@mathesar/stores/table-data';
+
   import ProcessedColumnName from './column/ProcessedColumnName.svelte';
 
   export let options: ProcessedColumn[];
diff --git a/mathesar_ui/src/components/SelectTable.svelte b/mathesar_ui/src/components/SelectTable.svelte
index 34f61bda1b..797d791798 100644
--- a/mathesar_ui/src/components/SelectTable.svelte
+++ b/mathesar_ui/src/components/SelectTable.svelte
@@ -1,8 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import { Select } from '@mathesar-component-library';
   import type { SelectProps } from '@mathesar-component-library/types';
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+
   import TableName from './TableName.svelte';
 
   type $$Events = Select<TableEntry | undefined>['$$events_def'];
diff --git a/mathesar_ui/src/components/SelectTableWithinCurrentSchema.svelte b/mathesar_ui/src/components/SelectTableWithinCurrentSchema.svelte
index 7582455a67..1c3c7b51f8 100644
--- a/mathesar_ui/src/components/SelectTableWithinCurrentSchema.svelte
+++ b/mathesar_ui/src/components/SelectTableWithinCurrentSchema.svelte
@@ -2,6 +2,7 @@
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import { importVerifiedTables } from '@mathesar/stores/tables';
   import type { SelectProps } from '@mathesar-component-library/types';
+
   import SelectTable from './SelectTable.svelte';
 
   export let value: TableEntry | undefined = undefined;
diff --git a/mathesar_ui/src/components/StatusIndicator.svelte b/mathesar_ui/src/components/StatusIndicator.svelte
index 6d70cf8ba4..45f3068664 100644
--- a/mathesar_ui/src/components/StatusIndicator.svelte
+++ b/mathesar_ui/src/components/StatusIndicator.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import {
     Icon,
+    Spinner,
     iconError,
     iconSuccess,
     iconWarning,
-    Spinner,
   } from '@mathesar-component-library';
 
   type State = 'processing' | 'success' | 'failure' | 'warning';
diff --git a/mathesar_ui/src/components/TableName.svelte b/mathesar_ui/src/components/TableName.svelte
index ef1cea020b..80cb9b2de5 100644
--- a/mathesar_ui/src/components/TableName.svelte
+++ b/mathesar_ui/src/components/TableName.svelte
@@ -2,8 +2,9 @@
   import type { ComponentProps } from 'svelte';
 
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
-  import { isTableImportConfirmationRequired } from '@mathesar/utils/tables';
   import { iconTable } from '@mathesar/icons';
+  import { isTableImportConfirmationRequired } from '@mathesar/utils/tables';
+
   import NameWithIcon from './NameWithIcon.svelte';
 
   interface $$Props extends Omit<ComponentProps<NameWithIcon>, 'icon'> {
diff --git a/mathesar_ui/src/components/abstract-type-control/AbstractTypeControl.svelte b/mathesar_ui/src/components/abstract-type-control/AbstractTypeControl.svelte
index 3659c19b29..efe1810829 100644
--- a/mathesar_ui/src/components/abstract-type-control/AbstractTypeControl.svelte
+++ b/mathesar_ui/src/components/abstract-type-control/AbstractTypeControl.svelte
@@ -1,20 +1,24 @@
 <script lang="ts">
   import { createEventDispatcher, onMount } from 'svelte';
   import { _ } from 'svelte-i18n';
+
+  import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+  import { toast } from '@mathesar/stores/toast';
   import {
-    createValidationContext,
     CancelOrProceedButtonPair,
+    createValidationContext,
   } from '@mathesar-component-library';
-  import { toast } from '@mathesar/stores/toast';
-  import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+
+  import WarningBox from '../message-boxes/WarningBox.svelte';
+
+  import AbstractTypeDBOptions from './AbstractTypeDBOptions.svelte';
+  import AbstractTypeSelector from './AbstractTypeSelector.svelte';
   import {
-    type ColumnWithAbstractType,
     type ColumnTypeOptionsSaveArgs,
+    type ColumnWithAbstractType,
     hasTypeOptionsChanged,
   } from './utils';
-  import AbstractTypeDBOptions from './AbstractTypeDBOptions.svelte';
-  import AbstractTypeSelector from './AbstractTypeSelector.svelte';
-  import WarningBox from '../message-boxes/WarningBox.svelte';
+
 
   const dispatch = createEventDispatcher();
 
diff --git a/mathesar_ui/src/components/abstract-type-control/AbstractTypeDBOptions.svelte b/mathesar_ui/src/components/abstract-type-control/AbstractTypeDBOptions.svelte
index 5fddd952ac..298f6ca67a 100644
--- a/mathesar_ui/src/components/abstract-type-control/AbstractTypeDBOptions.svelte
+++ b/mathesar_ui/src/components/abstract-type-control/AbstractTypeDBOptions.svelte
@@ -1,17 +1,18 @@
 <script lang="ts">
-  import {
-    FormBuilder,
-    getValidationContext,
-  } from '@mathesar-component-library';
-  import type { FormValues } from '@mathesar-component-library/types';
   import type { DbType } from '@mathesar/AppTypes';
   import type {
     AbstractType,
     AbstractTypeDbConfig,
   } from '@mathesar/stores/abstract-types/types';
+  import {
+    FormBuilder,
+    getValidationContext,
+  } from '@mathesar-component-library';
+  import type { FormValues } from '@mathesar-component-library/types';
+
   import DbTypeIndicator from './DbTypeIndicator.svelte';
-  import { constructDbForm } from './utils';
   import type { ColumnWithAbstractType } from './utils';
+  import { constructDbForm } from './utils';
 
   export let selectedAbstractType: AbstractType;
   export let selectedDbType: DbType;
diff --git a/mathesar_ui/src/components/abstract-type-control/AbstractTypeDisplayOptions.svelte b/mathesar_ui/src/components/abstract-type-control/AbstractTypeDisplayOptions.svelte
index 1849ee6ec0..1b3e587d80 100644
--- a/mathesar_ui/src/components/abstract-type-control/AbstractTypeDisplayOptions.svelte
+++ b/mathesar_ui/src/components/abstract-type-control/AbstractTypeDisplayOptions.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+  import type { Readable } from 'svelte/store';
+
+  import type { AbstractTypeDisplayConfig } from '@mathesar/stores/abstract-types/types';
   import {
     FormBuilder,
     getValidationContext,
@@ -7,8 +10,7 @@
     FormBuildConfiguration,
     FormValues,
   } from '@mathesar-component-library/types';
-  import type { AbstractTypeDisplayConfig } from '@mathesar/stores/abstract-types/types';
-  import type { Readable } from 'svelte/store';
+
   import type { ColumnWithAbstractType } from './utils';
 
   export let displayOptions: ColumnWithAbstractType['display_options'];
diff --git a/mathesar_ui/src/components/abstract-type-control/AbstractTypeSelector.svelte b/mathesar_ui/src/components/abstract-type-control/AbstractTypeSelector.svelte
index c014a64aae..9984c0632a 100644
--- a/mathesar_ui/src/components/abstract-type-control/AbstractTypeSelector.svelte
+++ b/mathesar_ui/src/components/abstract-type-control/AbstractTypeSelector.svelte
@@ -1,13 +1,15 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
-  import { Select, LabeledInput } from '@mathesar-component-library';
+
+  import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
   import {
     currentDbAbstractTypes,
     getAllowedAbstractTypesForDbTypeAndItsTargetTypes,
   } from '@mathesar/stores/abstract-types';
   import type { AbstractType } from '@mathesar/stores/abstract-types/types';
-  import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
+  import { LabeledInput, Select } from '@mathesar-component-library';
+
   import type { ColumnWithAbstractType } from './utils';
 
   const dispatch = createEventDispatcher<{
diff --git a/mathesar_ui/src/components/abstract-type-control/DbTypeIndicator.svelte b/mathesar_ui/src/components/abstract-type-control/DbTypeIndicator.svelte
index 02666a7346..e09c30974d 100644
--- a/mathesar_ui/src/components/abstract-type-control/DbTypeIndicator.svelte
+++ b/mathesar_ui/src/components/abstract-type-control/DbTypeIndicator.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import type { DbType } from '@mathesar/AppTypes';
 
   export let type: DbType | undefined;
diff --git a/mathesar_ui/src/components/abstract-type-control/config-components/DurationConfiguration.svelte b/mathesar_ui/src/components/abstract-type-control/config-components/DurationConfiguration.svelte
index 679077e752..2771c8178b 100644
--- a/mathesar_ui/src/components/abstract-type-control/config-components/DurationConfiguration.svelte
+++ b/mathesar_ui/src/components/abstract-type-control/config-components/DurationConfiguration.svelte
@@ -1,12 +1,13 @@
 <script lang="ts">
   import type { Writable } from 'svelte/store';
   import { _ } from 'svelte-i18n';
-  import { LabeledInput, Select } from '@mathesar-component-library';
+
   import type { DurationUnit } from '@mathesar/api/rest/types/tables/columns';
+  import { RichText } from '@mathesar/components/rich-text';
+  import { DurationSpecification } from '@mathesar/utils/duration';
   import type { DurationConfig } from '@mathesar/utils/duration/types';
+  import { LabeledInput, Select } from '@mathesar-component-library';
   import type { FormValues } from '@mathesar-component-library/types';
-  import { DurationSpecification } from '@mathesar/utils/duration';
-  import { RichText } from '@mathesar/components/rich-text';
 
   interface DurationFormValues extends FormValues, DurationConfig {}
 
diff --git a/mathesar_ui/src/components/abstract-type-control/utils.ts b/mathesar_ui/src/components/abstract-type-control/utils.ts
index 59a8edacbd..822b90faa5 100644
--- a/mathesar_ui/src/components/abstract-type-control/utils.ts
+++ b/mathesar_ui/src/components/abstract-type-control/utils.ts
@@ -1,13 +1,15 @@
-import { makeForm } from '@mathesar-component-library';
+import { readable } from 'svelte/store';
+
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { DbType } from '@mathesar/AppTypes';
-import type { FormBuildConfiguration } from '@mathesar-component-library/types';
 import type {
   AbstractType,
   AbstractTypeDbConfig,
   AbstractTypeDisplayConfig,
 } from '@mathesar/stores/abstract-types/types';
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
-import { readable } from 'svelte/store';
+import { makeForm } from '@mathesar-component-library';
+import type { FormBuildConfiguration } from '@mathesar-component-library/types';
+
 import DurationConfiguration from './config-components/DurationConfiguration.svelte';
 
 export interface ColumnWithAbstractType
diff --git a/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte b/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
index 10ceb27208..0ff6ccf992 100644
--- a/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
+++ b/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
@@ -1,27 +1,30 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
+  import { StringOrComponent } from '@mathesar/component-library';
   import DatabaseName from '@mathesar/components/DatabaseName.svelte';
+  import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
   import SchemaName from '@mathesar/components/SchemaName.svelte';
   import TableName from '@mathesar/components/TableName.svelte';
-  import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
+  import { iconConnection, iconExploration, iconRecord } from '@mathesar/icons';
   import {
+    CONNECTIONS_URL,
     getDatabasePageUrl,
     getExplorationPageUrl,
     getRecordPageUrl,
     getSchemaPageUrl,
-    CONNECTIONS_URL,
   } from '@mathesar/routes/urls';
-  import { StringOrComponent } from '@mathesar/component-library';
-  import { iconExploration, iconRecord, iconConnection } from '@mathesar/icons';
   import { getLinkForTableItem } from '@mathesar/utils/tables';
+
+  import RecordSummary from '../RecordSummary.svelte';
+
   import BreadcrumbLink from './BreadcrumbLink.svelte';
+  import BreadcrumbPageSeparator from './BreadcrumbPageSeparator.svelte';
+  import BreadcrumbRecordSelector from './BreadcrumbRecordSelector.svelte';
   import type { BreadcrumbItem } from './breadcrumbTypes';
   import DatabaseSelector from './DatabaseSelector.svelte';
   import EntitySelector from './EntitySelector.svelte';
   import SchemaSelector from './SchemaSelector.svelte';
-  import BreadcrumbRecordSelector from './BreadcrumbRecordSelector.svelte';
-  import BreadcrumbPageSeparator from './BreadcrumbPageSeparator.svelte';
-  import RecordSummary from '../RecordSummary.svelte';
 
   export let item: BreadcrumbItem;
 </script>
diff --git a/mathesar_ui/src/components/breadcrumb/BreadcrumbPageSeparator.svelte b/mathesar_ui/src/components/breadcrumb/BreadcrumbPageSeparator.svelte
index 46bca58585..513e4bdd35 100644
--- a/mathesar_ui/src/components/breadcrumb/BreadcrumbPageSeparator.svelte
+++ b/mathesar_ui/src/components/breadcrumb/BreadcrumbPageSeparator.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import { iconForwardSeparator } from '@mathesar/icons';
   import { Icon } from '@mathesar/component-library';
+  import { iconForwardSeparator } from '@mathesar/icons';
 </script>
 
 <span class="page-separator"><Icon {...iconForwardSeparator} /></span>
diff --git a/mathesar_ui/src/components/breadcrumb/BreadcrumbRecordSelector.svelte b/mathesar_ui/src/components/breadcrumb/BreadcrumbRecordSelector.svelte
index 858f291e21..1dda15f858 100644
--- a/mathesar_ui/src/components/breadcrumb/BreadcrumbRecordSelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/BreadcrumbRecordSelector.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-  import { Button, iconSearch, Icon } from '@mathesar-component-library';
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import { iconExpandRight } from '@mathesar/icons';
   import { getRecordSelectorFromContext } from '@mathesar/systems/record-selector/RecordSelectorController';
+  import { Button, Icon, iconSearch } from '@mathesar-component-library';
 
   const recordSelector = getRecordSelectorFromContext();
   export let table: TableEntry;
diff --git a/mathesar_ui/src/components/breadcrumb/BreadcrumbSelector.svelte b/mathesar_ui/src/components/breadcrumb/BreadcrumbSelector.svelte
index ba803668b4..2114474dd6 100644
--- a/mathesar_ui/src/components/breadcrumb/BreadcrumbSelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/BreadcrumbSelector.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+  import { _ } from 'svelte-i18n';
+
   import {
     AttachableDropdown,
     Button,
@@ -6,9 +8,9 @@
     iconSearch,
   } from '@mathesar/component-library';
   import TextInputWithPrefix from '@mathesar/component-library/text-input/TextInputWithPrefix.svelte';
-  import { iconExpandRight } from '@mathesar/icons';
-  import { _ } from 'svelte-i18n';
   import { RichText } from '@mathesar/components/rich-text';
+  import { iconExpandRight } from '@mathesar/icons';
+
   import BreadcrumbSelectorRow from './BreadcrumbSelectorRow.svelte';
   import type {
     BreadcrumbSelectorData,
diff --git a/mathesar_ui/src/components/breadcrumb/BreadcrumbSelectorRow.svelte b/mathesar_ui/src/components/breadcrumb/BreadcrumbSelectorRow.svelte
index 11c2a3a545..677ed93f9f 100644
--- a/mathesar_ui/src/components/breadcrumb/BreadcrumbSelectorRow.svelte
+++ b/mathesar_ui/src/components/breadcrumb/BreadcrumbSelectorRow.svelte
@@ -2,7 +2,9 @@
   import { MatchHighlighter } from '@mathesar/component-library';
   import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
   import RecordSelectorNavigationButton from '@mathesar/systems/record-selector/RecordSelectorNavigationButton.svelte';
+
   import TableName from '../TableName.svelte';
+
   import type { BreadcrumbSelectorEntry } from './breadcrumbTypes';
 
   export let entry: BreadcrumbSelectorEntry;
diff --git a/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte b/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
index a753afbc25..f061c5e257 100644
--- a/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import type { Connection } from '@mathesar/api/rest/connections';
-  import { iconDatabase, iconConnection } from '@mathesar/icons';
-  import { getDatabasePageUrl, CONNECTIONS_URL } from '@mathesar/routes/urls';
+  import { iconConnection, iconDatabase } from '@mathesar/icons';
+  import { CONNECTIONS_URL, getDatabasePageUrl } from '@mathesar/routes/urls';
   import { connectionsStore } from '@mathesar/stores/databases';
+
   import BreadcrumbSelector from './BreadcrumbSelector.svelte';
   import type { BreadcrumbSelectorEntry } from './breadcrumbTypes';
 
diff --git a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
index 9424e912a8..59febd3af3 100644
--- a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
@@ -1,22 +1,24 @@
 <script lang="ts">
-  import { meta } from 'tinro';
   import { _ } from 'svelte-i18n';
-  import {
-    currentTableId,
-    tables as tablesStore,
-  } from '@mathesar/stores/tables';
+  import { meta } from 'tinro';
+
+  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
-  import { getExplorationPageUrl } from '@mathesar/routes/urls';
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import { iconTable } from '@mathesar/icons';
+  import { getExplorationPageUrl } from '@mathesar/routes/urls';
   import { queries as queriesStore } from '@mathesar/stores/queries';
-  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+  import {
+    currentTableId,
+    tables as tablesStore,
+  } from '@mathesar/stores/tables';
   import { getLinkForTableItem } from '@mathesar/utils/tables';
+
   import BreadcrumbSelector from './BreadcrumbSelector.svelte';
   import type {
     BreadcrumbSelectorEntry,
-    SimpleBreadcrumbSelectorEntry,
     BreadcrumbSelectorEntryForTable,
+    SimpleBreadcrumbSelectorEntry,
   } from './breadcrumbTypes';
 
   export let database: Database;
diff --git a/mathesar_ui/src/components/breadcrumb/LogoAndNameWithLink.svelte b/mathesar_ui/src/components/breadcrumb/LogoAndNameWithLink.svelte
index 0013b8571f..c2171b8d67 100644
--- a/mathesar_ui/src/components/breadcrumb/LogoAndNameWithLink.svelte
+++ b/mathesar_ui/src/components/breadcrumb/LogoAndNameWithLink.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import Logo from '../Logo.svelte';
 
   export let hasResponsiveAbridgement = false;
diff --git a/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte b/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte
index 0091272521..81d71206af 100644
--- a/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import { iconSchema } from '@mathesar/icons';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
@@ -7,6 +8,7 @@
     currentSchemaId,
     schemas as schemasStore,
   } from '@mathesar/stores/schemas';
+
   import BreadcrumbSelector from './BreadcrumbSelector.svelte';
   import type { BreadcrumbSelectorEntry } from './breadcrumbTypes';
 
diff --git a/mathesar_ui/src/components/breadcrumb/breadcrumbUtils.ts b/mathesar_ui/src/components/breadcrumb/breadcrumbUtils.ts
index 7a498fc0ef..25d5a11504 100644
--- a/mathesar_ui/src/components/breadcrumb/breadcrumbUtils.ts
+++ b/mathesar_ui/src/components/breadcrumb/breadcrumbUtils.ts
@@ -1,7 +1,9 @@
-import { toAsciiLowerCase } from '@mathesar/component-library';
-import { setContext, getContext } from 'svelte';
+import { getContext, setContext } from 'svelte';
 import type { Writable } from 'svelte/store';
 import { writable } from 'svelte/store';
+
+import { toAsciiLowerCase } from '@mathesar/component-library';
+
 import type {
   BreadcrumbItem,
   BreadcrumbItemDatabase,
diff --git a/mathesar_ui/src/components/cell-fabric/CellFabric.svelte b/mathesar_ui/src/components/cell-fabric/CellFabric.svelte
index d77a167437..564ca257ee 100644
--- a/mathesar_ui/src/components/cell-fabric/CellFabric.svelte
+++ b/mathesar_ui/src/components/cell-fabric/CellFabric.svelte
@@ -5,6 +5,7 @@
 -->
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
+
   import type { HorizontalAlignment } from './data-types/components/typeDefinitions';
   import type { CellColumnFabric } from './types';
 
diff --git a/mathesar_ui/src/components/cell-fabric/DynamicInput.svelte b/mathesar_ui/src/components/cell-fabric/DynamicInput.svelte
index 08d21fa4e2..db252899a4 100644
--- a/mathesar_ui/src/components/cell-fabric/DynamicInput.svelte
+++ b/mathesar_ui/src/components/cell-fabric/DynamicInput.svelte
@@ -8,8 +8,8 @@ during Sheet component creation.
 -->
 <script lang="ts">
   import type {
-    ComponentAndProps,
     BaseInputProps,
+    ComponentAndProps,
     SimplifiedInputProps,
   } from '@mathesar-component-library/types';
 
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/arrayFactory.ts b/mathesar_ui/src/components/cell-fabric/data-types/arrayFactory.ts
index 98d6813421..4f65d1defb 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/arrayFactory.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/arrayFactory.ts
@@ -1,14 +1,15 @@
 import type { DbType } from '@mathesar/AppTypes';
-import type { ComponentAndProps } from '@mathesar-component-library/types';
 import { TextInput, isDefinedNonNullable } from '@mathesar-component-library';
+import type { ComponentAndProps } from '@mathesar-component-library/types';
+
 import ArrayCell from './components/array/ArrayCell.svelte';
 import type { ArrayCellExternalProps } from './components/typeDefinitions';
 import type {
-  SimpleCellDataTypes,
-  CellComponentFactory,
   CellColumnLike,
+  CellComponentFactory,
+  SimpleCellDataTypes,
 } from './typeDefinitions';
-import { getCellInfo, getCellConfiguration } from './utils';
+import { getCellConfiguration, getCellInfo } from './utils';
 
 export interface ArrayLikeColumn extends CellColumnLike {
   type_options: {
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/boolean.ts b/mathesar_ui/src/components/cell-fabric/data-types/boolean.ts
index 5976381526..00a3435bce 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/boolean.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/boolean.ts
@@ -1,16 +1,17 @@
 import type { BooleanDisplayOptions } from '@mathesar/api/rest/types/tables/columns';
+import { Select, isDefinedNonNullable } from '@mathesar-component-library';
 import type {
   ComponentAndProps,
   SelectProps,
 } from '@mathesar-component-library/types';
-import { Select, isDefinedNonNullable } from '@mathesar-component-library';
+
 import CheckboxCell from './components/checkbox/CheckboxCell.svelte';
 import SingleSelectCell from './components/select/SingleSelectCell.svelte';
 import type {
   CheckBoxCellExternalProps,
   SingleSelectCellExternalProps,
 } from './components/typeDefinitions';
-import type { CellComponentFactory, CellColumnLike } from './typeDefinitions';
+import type { CellColumnLike, CellComponentFactory } from './typeDefinitions';
 
 export interface BooleanLikeColumn extends CellColumnLike {
   display_options: Partial<BooleanDisplayOptions> | null;
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
index 54c04b74ef..775f060aff 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
@@ -1,7 +1,9 @@
 <script lang="ts">
-  import type { ValueComparisonOutcome } from '@mathesar-component-library/types';
-  import CellBackground from '@mathesar/components/CellBackground.svelte';
   import { tick } from 'svelte';
+
+  import CellBackground from '@mathesar/components/CellBackground.svelte';
+  import type { ValueComparisonOutcome } from '@mathesar-component-library/types';
+
   import type { HorizontalAlignment } from './typeDefinitions';
 
   export let element: HTMLElement | undefined = undefined;
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/SteppedInputCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/SteppedInputCell.svelte
index 695fbb968e..b90bff0edc 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/SteppedInputCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/SteppedInputCell.svelte
@@ -1,18 +1,19 @@
 <script lang="ts">
   import { createEventDispatcher, onMount } from 'svelte';
 
+  import CellValue from '@mathesar/components/CellValue.svelte';
   import {
     Truncate,
     compareWholeValues,
     getValueComparisonOutcome,
     splitMatchParts,
   } from '@mathesar-component-library';
-  import CellValue from '@mathesar/components/CellValue.svelte';
+
   import CellWrapper from './CellWrapper.svelte';
   import type {
     CellTypeProps,
-    HorizontalAlignment,
     CellValueFormatter,
+    HorizontalAlignment,
   } from './typeDefinitions';
 
   const dispatch = createEventDispatcher();
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/__tests__/SteppedInputCell.test.ts b/mathesar_ui/src/components/cell-fabric/data-types/components/__tests__/SteppedInputCell.test.ts
index 6be1b9daeb..6caae49d45 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/__tests__/SteppedInputCell.test.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/__tests__/SteppedInputCell.test.ts
@@ -1,5 +1,6 @@
 import '@testing-library/jest-dom';
 import { render } from '@testing-library/svelte';
+
 import SteppedInputCell from '../SteppedInputCell.svelte';
 
 const requiredProps = {
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/array/ArrayCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/array/ArrayCell.svelte
index 4dfff4c2aa..7882714912 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/array/ArrayCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/array/ArrayCell.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
-  import { isDefinedNonNullable, Chip } from '@mathesar-component-library';
+
   import CellValue from '@mathesar/components/CellValue.svelte';
   import Null from '@mathesar/components/Null.svelte';
   import { labeledCount } from '@mathesar/utils/languageUtils';
+  import { Chip, isDefinedNonNullable } from '@mathesar-component-library';
+
   import CellWrapper from '../CellWrapper.svelte';
   import type { ArrayCellProps } from '../typeDefinitions';
 
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/checkbox/CheckboxCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/checkbox/CheckboxCell.svelte
index d9932a13f8..fa7fb382f1 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/checkbox/CheckboxCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/checkbox/CheckboxCell.svelte
@@ -1,7 +1,9 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
-  import { Checkbox, compareWholeValues } from '@mathesar-component-library';
+
   import Default from '@mathesar/components/Default.svelte';
+  import { Checkbox, compareWholeValues } from '@mathesar-component-library';
+
   import CellWrapper from '../CellWrapper.svelte';
   import type { CheckBoxCellProps } from '../typeDefinitions';
 
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/DateTimeCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/DateTimeCell.svelte
index 26a046e6fb..68cd21e284 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/DateTimeCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/DateTimeCell.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import SteppedInputCell from '../SteppedInputCell.svelte';
   import type { DateTimeCellProps } from '../typeDefinitions';
+
   import DateTimeInput from './DateTimeInput.svelte';
 
   type $$Props = DateTimeCellProps;
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/DateTimeInput.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/DateTimeInput.svelte
index 39954c1cd1..7377c008b1 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/DateTimeInput.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/DateTimeInput.svelte
@@ -1,17 +1,20 @@
 <script lang="ts">
+  import { createEventDispatcher } from 'svelte';
+
   import {
-    dayjs,
-    isDefinedNonNullable,
+    AttachableDropdown,
     FormattedInput,
     InlineDateTimePicker,
-    AttachableDropdown,
+    dayjs,
+    isDefinedNonNullable,
   } from '@mathesar-component-library';
-  import { createEventDispatcher } from 'svelte';
   import type { FormattedInputProps } from '@mathesar-component-library/types';
+
   import type {
     DateTimeCellExternalProps,
     DateTimeCellProps,
   } from '../typeDefinitions';
+
   import Presets from './Presets.svelte';
 
   const dispatch = createEventDispatcher();
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/Presets.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/Presets.svelte
index db9ccd885b..eaac0c08d0 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/Presets.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/date-time/Presets.svelte
@@ -1,7 +1,9 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
+
   import { Button, dayjs } from '@mathesar-component-library';
+
   import type {
     DateTimeCellExternalProps,
     DateTimeCellProps,
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/formatted-input/FormattedInputCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/formatted-input/FormattedInputCell.svelte
index e4dea6cf04..aba9dc1f70 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/formatted-input/FormattedInputCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/formatted-input/FormattedInputCell.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { FormattedInput } from '@mathesar-component-library';
+
   import SteppedInputCell from '../SteppedInputCell.svelte';
   import type { FormattedInputCellProps } from '../typeDefinitions';
 
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordCell.svelte
index 61db0abafe..91d013a31e 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordCell.svelte
@@ -1,16 +1,18 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
-  import {
-    Icon,
-    iconExpandDown,
-    compareWholeValues,
-  } from '@mathesar-component-library';
+
   import Default from '@mathesar/components/Default.svelte';
-  import Null from '@mathesar/components/Null.svelte';
   import LinkedRecord from '@mathesar/components/LinkedRecord.svelte';
+  import Null from '@mathesar/components/Null.svelte';
   // eslint-disable-next-line import/no-cycle
   import { getRecordSelectorFromContext } from '@mathesar/systems/record-selector/RecordSelectorController';
+  import {
+    Icon,
+    compareWholeValues,
+    iconExpandDown,
+  } from '@mathesar-component-library';
+
   import CellWrapper from '../CellWrapper.svelte';
   import type { LinkedRecordCellProps } from '../typeDefinitions';
 
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordInput.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordInput.svelte
index d1d0fec9be..3752025c2b 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordInput.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/linked-record/LinkedRecordInput.svelte
@@ -4,20 +4,21 @@
 
   // TODO remove dependency cycle
   // eslint-disable-next-line import/no-cycle
-  import { getRecordSelectorFromContext } from '@mathesar/systems/record-selector/RecordSelectorController';
 
+  import BaseInput from '@mathesar/component-library/common/base-components/BaseInput.svelte';
+  import type { LinkedRecordCellProps } from '@mathesar/components/cell-fabric/data-types/components/typeDefinitions';
+  import LinkedRecord from '@mathesar/components/LinkedRecord.svelte';
+  import { storeToGetRecordPageUrl } from '@mathesar/stores/storeBasedUrls';
+  import { getRecordSelectorFromContext } from '@mathesar/systems/record-selector/RecordSelectorController';
   import {
+    type AccompanyingElements,
+    Icon,
     getGloballyUniqueId,
     getLabelControllerFromContainingLabel,
     getLabelIdFromInputId,
-    Icon,
     iconExpandDown,
-    type AccompanyingElements,
   } from '@mathesar-component-library';
-  import BaseInput from '@mathesar/component-library/common/base-components/BaseInput.svelte';
-  import type { LinkedRecordCellProps } from '@mathesar/components/cell-fabric/data-types/components/typeDefinitions';
-  import LinkedRecord from '@mathesar/components/LinkedRecord.svelte';
-  import { storeToGetRecordPageUrl } from '@mathesar/stores/storeBasedUrls';
+
   import type { LinkedRecordInputElement } from './LinkedRecordUtils';
 
   interface $$Props
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/money/MoneyCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/money/MoneyCell.svelte
index 54e9f7a556..a6c63969fa 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/money/MoneyCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/money/MoneyCell.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import SteppedInputCell from '../SteppedInputCell.svelte';
   import type { MoneyCellProps } from '../typeDefinitions';
+
   import MoneyCellInput from './MoneyCellInput.svelte';
 
   type $$Props = MoneyCellProps;
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/money/MoneyCellInput.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/money/MoneyCellInput.svelte
index 1392a54383..b8437f6af4 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/money/MoneyCellInput.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/money/MoneyCellInput.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { StringifiedNumberInput } from '@mathesar-component-library';
   import type { StringifiedNumberInputProps } from '@mathesar-component-library/types';
+
   import type { NumberCellProps } from '../typeDefinitions';
 
   interface $$Props extends Omit<StringifiedNumberInputProps, 'value'> {
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/number/NumberCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/number/NumberCell.svelte
index af78d264ec..ec4eca6442 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/number/NumberCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/number/NumberCell.svelte
@@ -4,6 +4,7 @@
     HorizontalAlignment,
     NumberCellProps,
   } from '../typeDefinitions';
+
   import NumberCellInput from './NumberCellInput.svelte';
 
   type $$Props = NumberCellProps;
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/number/NumberCellInput.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/number/NumberCellInput.svelte
index 1392a54383..b8437f6af4 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/number/NumberCellInput.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/number/NumberCellInput.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { StringifiedNumberInput } from '@mathesar-component-library';
   import type { StringifiedNumberInputProps } from '@mathesar-component-library/types';
+
   import type { NumberCellProps } from '../typeDefinitions';
 
   interface $$Props extends Omit<StringifiedNumberInputProps, 'value'> {
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/primary-key/PrimaryKeyCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/primary-key/PrimaryKeyCell.svelte
index 776bfed3ac..66992bef9d 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/primary-key/PrimaryKeyCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/primary-key/PrimaryKeyCell.svelte
@@ -1,12 +1,13 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
-  import { Icon } from '@mathesar-component-library';
+
   import CellWrapper from '@mathesar/components/cell-fabric/data-types/components/CellWrapper.svelte';
   import type { PrimaryKeyCellProps } from '@mathesar/components/cell-fabric/data-types/components/typeDefinitions';
   import Default from '@mathesar/components/Default.svelte';
   import { iconLinkToRecordPage } from '@mathesar/icons';
   import { storeToGetRecordPageUrl } from '@mathesar/stores/storeBasedUrls';
+  import { Icon } from '@mathesar-component-library';
 
   type $$Props = PrimaryKeyCellProps;
 
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/select/SingleSelectCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/select/SingleSelectCell.svelte
index a50750788f..951dd24e45 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/select/SingleSelectCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/select/SingleSelectCell.svelte
@@ -1,17 +1,19 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
+
+  import CellValue from '@mathesar/components/CellValue.svelte';
   import {
     AttachableDropdown,
+    Icon,
     ListBox,
     ListBoxOptions,
-    getGloballyUniqueId,
-    Icon,
-    isDefinedNonNullable,
     getLabel as defaultGetLabel,
+    getGloballyUniqueId,
     iconExpandDown,
+    isDefinedNonNullable,
   } from '@mathesar-component-library';
   import type { ListBoxApi } from '@mathesar-component-library/types';
-  import CellValue from '@mathesar/components/CellValue.svelte';
+
   import CellWrapper from '../CellWrapper.svelte';
   import type { SingleSelectCellProps } from '../typeDefinitions';
 
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/textarea/TextAreaCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/textarea/TextAreaCell.svelte
index 4783748f39..0bfc11f7bf 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/textarea/TextAreaCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/textarea/TextAreaCell.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { TextArea, optionalNonNullable } from '@mathesar-component-library';
   import type { TextAreaProcessedKeyDown } from '@mathesar-component-library/types';
+
   import SteppedInputCell from '../SteppedInputCell.svelte';
   import type { TextAreaCellProps } from '../typeDefinitions';
 
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/textbox/TextBoxCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/textbox/TextBoxCell.svelte
index b14bc78854..a5ef92f5c5 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/textbox/TextBoxCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/textbox/TextBoxCell.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { TextInput, optionalNonNullable } from '@mathesar-component-library';
+
   import SteppedInputCell from '../SteppedInputCell.svelte';
   import type { TextBoxCellProps } from '../typeDefinitions';
 
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts b/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts
index ee8b5caf49..b91fa59169 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts
@@ -1,13 +1,13 @@
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type { FkConstraint } from '@mathesar/api/rest/types/tables/constraints';
+import type { DBObjectEntry } from '@mathesar/AppTypes';
+import type { DateTimeFormatter } from '@mathesar/utils/date-time/types';
 import type {
+  ComponentAndProps,
   FormattedInputProps,
   NumberFormatterOptions,
   SelectProps,
-  ComponentAndProps,
 } from '@mathesar-component-library/types';
-import type { DBObjectEntry } from '@mathesar/AppTypes';
-import type { DateTimeFormatter } from '@mathesar/utils/date-time/types';
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
-import type { FkConstraint } from '@mathesar/api/rest/types/tables/constraints';
 
 export type CellColumnLike = Pick<
   Column,
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/uri/UriCell.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/uri/UriCell.svelte
index 08bfa74608..006dc48e2e 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/uri/UriCell.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/uri/UriCell.svelte
@@ -1,11 +1,13 @@
 <script lang="ts">
+  import CellValue from '@mathesar/components/CellValue.svelte';
   import {
     PrecomputedMatchHighlighter,
     TextInput,
   } from '@mathesar-component-library';
-  import CellValue from '@mathesar/components/CellValue.svelte';
+
   import SteppedInputCell from '../SteppedInputCell.svelte';
   import type { CellTypeProps } from '../typeDefinitions';
+
   import UriCellContent from './UriCellContent.svelte';
 
   type $$Props = CellTypeProps<string>;
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/date.ts b/mathesar_ui/src/components/cell-fabric/data-types/date.ts
index 9eccdc8daa..a754b40b06 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/date.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/date.ts
@@ -1,14 +1,15 @@
-import { isDefinedNonNullable } from '@mathesar-component-library';
 import type { DateDisplayOptions } from '@mathesar/api/rest/types/tables/columns';
-import type { ComponentAndProps } from '@mathesar-component-library/types';
 import {
   DateTimeFormatter,
   DateTimeSpecification,
 } from '@mathesar/utils/date-time';
-import type { DateTimeCellExternalProps } from './components/typeDefinitions';
-import type { CellComponentFactory, CellColumnLike } from './typeDefinitions';
+import { isDefinedNonNullable } from '@mathesar-component-library';
+import type { ComponentAndProps } from '@mathesar-component-library/types';
+
 import DateTimeCell from './components/date-time/DateTimeCell.svelte';
 import DateTimeInput from './components/date-time/DateTimeInput.svelte';
+import type { DateTimeCellExternalProps } from './components/typeDefinitions';
+import type { CellColumnLike, CellComponentFactory } from './typeDefinitions';
 
 export interface DateLikeColumn extends CellColumnLike {
   display_options: Partial<DateDisplayOptions> | null;
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/datetime.ts b/mathesar_ui/src/components/cell-fabric/data-types/datetime.ts
index 9b2a85db94..d214e45060 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/datetime.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/datetime.ts
@@ -1,14 +1,15 @@
-import { isDefinedNonNullable } from '@mathesar-component-library';
 import type { TimeStampDisplayOptions } from '@mathesar/api/rest/types/tables/columns';
-import type { ComponentAndProps } from '@mathesar-component-library/types';
 import {
   DateTimeFormatter,
   DateTimeSpecification,
 } from '@mathesar/utils/date-time';
-import type { DateTimeCellExternalProps } from './components/typeDefinitions';
-import type { CellComponentFactory, CellColumnLike } from './typeDefinitions';
+import { isDefinedNonNullable } from '@mathesar-component-library';
+import type { ComponentAndProps } from '@mathesar-component-library/types';
+
 import DateTimeCell from './components/date-time/DateTimeCell.svelte';
 import DateTimeInput from './components/date-time/DateTimeInput.svelte';
+import type { DateTimeCellExternalProps } from './components/typeDefinitions';
+import type { CellColumnLike, CellComponentFactory } from './typeDefinitions';
 
 export interface DateLikeColumn extends CellColumnLike {
   display_options: Partial<TimeStampDisplayOptions> | null;
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/duration.ts b/mathesar_ui/src/components/cell-fabric/data-types/duration.ts
index 059d9da6cb..5f7af38409 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/duration.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/duration.ts
@@ -1,3 +1,8 @@
+import type { DurationDisplayOptions } from '@mathesar/api/rest/types/tables/columns';
+import {
+  DurationFormatter,
+  DurationSpecification,
+} from '@mathesar/utils/duration';
 import {
   FormattedInput,
   isDefinedNonNullable,
@@ -6,14 +11,10 @@ import type {
   ComponentAndProps,
   FormattedInputProps,
 } from '@mathesar-component-library/types';
-import type { DurationDisplayOptions } from '@mathesar/api/rest/types/tables/columns';
-import {
-  DurationFormatter,
-  DurationSpecification,
-} from '@mathesar/utils/duration';
+
 import FormattedInputCell from './components/formatted-input/FormattedInputCell.svelte';
 import type { FormattedInputCellExternalProps } from './components/typeDefinitions';
-import type { CellComponentFactory, CellColumnLike } from './typeDefinitions';
+import type { CellColumnLike, CellComponentFactory } from './typeDefinitions';
 
 export interface DurationLikeColumn extends CellColumnLike {
   display_options: Partial<DurationDisplayOptions> | null;
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/index.ts b/mathesar_ui/src/components/cell-fabric/data-types/index.ts
index 9e968c5214..ba966dcbd5 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/index.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/index.ts
@@ -1,19 +1,19 @@
-import string from './string';
+import arrayFactory from './arrayFactory';
 import boolean from './boolean';
-import number from './number';
-import money from './money';
-import uri from './uri';
-import duration from './duration';
 import date from './date';
-import time from './time';
 import datetime from './datetime';
-import arrayFactory from './arrayFactory';
+import duration from './duration';
+import money from './money';
+import number from './number';
+import string from './string';
+import time from './time';
 import type {
-  SimpleCellDataTypes,
-  CompoundCellDataTypes,
-  CellDataType,
   CellComponentFactory,
+  CellDataType,
+  CompoundCellDataTypes,
+  SimpleCellDataTypes,
 } from './typeDefinitions';
+import uri from './uri';
 
 const simpleDataTypeComponentFactories: Record<
   SimpleCellDataTypes,
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/money.ts b/mathesar_ui/src/components/cell-fabric/data-types/money.ts
index 052cf9a51a..028f50ac60 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/money.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/money.ts
@@ -1,17 +1,18 @@
-import {
-  StringifiedNumberFormatter,
-  isDefinedNonNullable,
-} from '@mathesar-component-library';
 import type {
   MoneyColumn,
   NumberFormat,
 } from '@mathesar/api/rest/types/tables/columns';
+import {
+  StringifiedNumberFormatter,
+  isDefinedNonNullable,
+} from '@mathesar-component-library';
 import type { ComponentAndProps } from '@mathesar-component-library/types';
+
 import MoneyCell from './components/money/MoneyCell.svelte';
 import MoneyCellInput from './components/money/MoneyCellInput.svelte';
 import type { MoneyCellExternalProps } from './components/typeDefinitions';
-import type { CellComponentFactory } from './typeDefinitions';
 import { getUseGrouping } from './number';
+import type { CellComponentFactory } from './typeDefinitions';
 
 // Values to use if for some reason we don't get them from the API.
 const FALLBACK_CURRENCY_SYMBOL = '$';
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/number.ts b/mathesar_ui/src/components/cell-fabric/data-types/number.ts
index a2cbb8c1d6..eff54ce072 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/number.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/number.ts
@@ -1,13 +1,14 @@
-import {
-  isDefinedNonNullable,
-  StringifiedNumberFormatter,
-} from '@mathesar-component-library';
-import type { ComponentAndProps } from '@mathesar-component-library/types';
 import type {
   NumberColumn,
   NumberDisplayOptions,
   NumberFormat,
 } from '@mathesar/api/rest/types/tables/columns';
+import {
+  StringifiedNumberFormatter,
+  isDefinedNonNullable,
+} from '@mathesar-component-library';
+import type { ComponentAndProps } from '@mathesar-component-library/types';
+
 import NumberCell from './components/number/NumberCell.svelte';
 import NumberCellInput from './components/number/NumberCellInput.svelte';
 import type { NumberCellExternalProps } from './components/typeDefinitions';
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/string.ts b/mathesar_ui/src/components/cell-fabric/data-types/string.ts
index 682398f95b..79ab7c20cd 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/string.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/string.ts
@@ -1,10 +1,11 @@
+import type { TextTypeOptions } from '@mathesar/api/rest/types/tables/columns';
+import GrowableTextArea from '@mathesar/components/GrowableTextArea.svelte';
 import { TextInput, optionalNonNullable } from '@mathesar-component-library';
 import type {
   ComponentAndProps,
   TextInputProps,
 } from '@mathesar-component-library/types';
-import type { TextTypeOptions } from '@mathesar/api/rest/types/tables/columns';
-import GrowableTextArea from '@mathesar/components/GrowableTextArea.svelte';
+
 import TextAreaCell from './components/textarea/TextAreaCell.svelte';
 import TextBoxCell from './components/textbox/TextBoxCell.svelte';
 import type {
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/time.ts b/mathesar_ui/src/components/cell-fabric/data-types/time.ts
index 1b43bfdab0..a6c1ed331f 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/time.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/time.ts
@@ -1,14 +1,15 @@
-import { isDefinedNonNullable } from '@mathesar-component-library';
 import type { TimeDisplayOptions } from '@mathesar/api/rest/types/tables/columns';
-import type { ComponentAndProps } from '@mathesar-component-library/types';
 import {
   DateTimeFormatter,
   DateTimeSpecification,
 } from '@mathesar/utils/date-time';
-import type { DateTimeCellExternalProps } from './components/typeDefinitions';
-import type { CellComponentFactory, CellColumnLike } from './typeDefinitions';
+import { isDefinedNonNullable } from '@mathesar-component-library';
+import type { ComponentAndProps } from '@mathesar-component-library/types';
+
 import DateTimeCell from './components/date-time/DateTimeCell.svelte';
 import DateTimeInput from './components/date-time/DateTimeInput.svelte';
+import type { DateTimeCellExternalProps } from './components/typeDefinitions';
+import type { CellColumnLike, CellComponentFactory } from './typeDefinitions';
 
 export interface TimeLikeColumn extends CellColumnLike {
   display_options: Partial<TimeDisplayOptions> | null;
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/typeDefinitions.ts b/mathesar_ui/src/components/cell-fabric/data-types/typeDefinitions.ts
index b066f67896..c078d011fe 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/typeDefinitions.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/typeDefinitions.ts
@@ -1,7 +1,8 @@
 import type { ComponentAndProps } from '@mathesar-component-library/types';
+
 import type {
-  CellValueFormatter,
   CellColumnLike as CellColumnLikeInner,
+  CellValueFormatter,
 } from './components/typeDefinitions';
 
 export type CellColumnLike = CellColumnLikeInner;
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/uri.ts b/mathesar_ui/src/components/cell-fabric/data-types/uri.ts
index 39442c4958..d909e1ec90 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/uri.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/uri.ts
@@ -1,5 +1,6 @@
-import type { ComponentAndProps } from '@mathesar-component-library/types';
 import { TextInput } from '@mathesar-component-library';
+import type { ComponentAndProps } from '@mathesar-component-library/types';
+
 import UriCell from './components/uri/UriCell.svelte';
 import type { CellComponentFactory } from './typeDefinitions';
 
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/utils.ts b/mathesar_ui/src/components/cell-fabric/data-types/utils.ts
index fd0137f668..0266834589 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/utils.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/utils.ts
@@ -1,10 +1,11 @@
 import { get } from 'svelte/store';
+
 import type { DbType } from '@mathesar/AppTypes';
-import type { CellInfo } from '@mathesar/stores/abstract-types/types';
 import {
   currentDbAbstractTypes,
   getAbstractTypeForDbType,
 } from '@mathesar/stores/abstract-types';
+import type { CellInfo } from '@mathesar/stores/abstract-types/types';
 
 export function getCellInfo(dbType: DbType): CellInfo | undefined {
   const abstractTypeOfColumn = getAbstractTypeForDbType(
diff --git a/mathesar_ui/src/components/cell-fabric/utils.ts b/mathesar_ui/src/components/cell-fabric/utils.ts
index 24a2175e7d..f70664dccc 100644
--- a/mathesar_ui/src/components/cell-fabric/utils.ts
+++ b/mathesar_ui/src/components/cell-fabric/utils.ts
@@ -1,8 +1,9 @@
-import type { ComponentAndProps } from '@mathesar-component-library/types';
 import type { TableEntry } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { CellInfo } from '@mathesar/stores/abstract-types/types';
 import type { RecordSummariesForSheet } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
+import type { ComponentAndProps } from '@mathesar-component-library/types';
+
 import DataTypes from './data-types';
 import LinkedRecordCell from './data-types/components/linked-record/LinkedRecordCell.svelte';
 import LinkedRecordInput from './data-types/components/linked-record/LinkedRecordInput.svelte';
diff --git a/mathesar_ui/src/components/column/ColumnName.svelte b/mathesar_ui/src/components/column/ColumnName.svelte
index b5474a1545..cdc38e6698 100644
--- a/mathesar_ui/src/components/column/ColumnName.svelte
+++ b/mathesar_ui/src/components/column/ColumnName.svelte
@@ -3,6 +3,7 @@
 
   import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
   import { getColumnIconProps } from '@mathesar/utils/columnUtils';
+
   import type { DisplayColumn } from './types';
 
   interface $$Props extends Omit<ComponentProps<NameWithIcon>, 'icon'> {
diff --git a/mathesar_ui/src/components/column/ProcessedColumnName.svelte b/mathesar_ui/src/components/column/ProcessedColumnName.svelte
index db0d384211..770ba44120 100644
--- a/mathesar_ui/src/components/column/ProcessedColumnName.svelte
+++ b/mathesar_ui/src/components/column/ProcessedColumnName.svelte
@@ -2,6 +2,7 @@
   import type { ComponentProps } from 'svelte';
 
   import type { ProcessedColumn } from '@mathesar/stores/table-data';
+
   import ColumnName from './ColumnName.svelte';
   import type { DisplayColumn } from './types';
 
diff --git a/mathesar_ui/src/components/column/types.ts b/mathesar_ui/src/components/column/types.ts
index d0bbb4d988..2b5d4023cb 100644
--- a/mathesar_ui/src/components/column/types.ts
+++ b/mathesar_ui/src/components/column/types.ts
@@ -1,5 +1,5 @@
-import type { CellColumnLike } from '@mathesar/components/cell-fabric/data-types/typeDefinitions';
 import type { ConstraintType } from '@mathesar/api/rest/types/tables/constraints';
+import type { CellColumnLike } from '@mathesar/components/cell-fabric/data-types/typeDefinitions';
 
 // Since the ColumnName component is being used
 // in Tables, Queries & DataImport and many more in the future
diff --git a/mathesar_ui/src/components/filter-entry/FilterEntry.svelte b/mathesar_ui/src/components/filter-entry/FilterEntry.svelte
index 035ac211d5..a3d64c2743 100644
--- a/mathesar_ui/src/components/filter-entry/FilterEntry.svelte
+++ b/mathesar_ui/src/components/filter-entry/FilterEntry.svelte
@@ -2,6 +2,15 @@
   import { createEventDispatcher, onDestroy } from 'svelte';
   import { readable } from 'svelte/store';
 
+  import type { ConstraintType } from '@mathesar/api/rest/types/tables/constraints';
+  import DynamicInput from '@mathesar/components/cell-fabric/DynamicInput.svelte';
+  import { getDbTypeBasedInputCap } from '@mathesar/components/cell-fabric/utils';
+  import ColumnName from '@mathesar/components/column/ColumnName.svelte';
+  import { iconDeleteMajor } from '@mathesar/icons';
+  import type { AbstractTypeFilterDefinition } from '@mathesar/stores/abstract-types/types';
+  import type RecordSummaryStore from '@mathesar/stores/table-data/record-summaries/RecordSummaryStore';
+  import type { RecordSummariesForColumn } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
+  import type { ReadableMapLike } from '@mathesar/typeUtils';
   import {
     Button,
     Icon,
@@ -9,18 +18,10 @@
     Select,
   } from '@mathesar-component-library';
   import {
-    ImmutableMap,
     type ComponentAndProps,
+    ImmutableMap,
   } from '@mathesar-component-library/types';
-  import DynamicInput from '@mathesar/components/cell-fabric/DynamicInput.svelte';
-  import { getDbTypeBasedInputCap } from '@mathesar/components/cell-fabric/utils';
-  import ColumnName from '@mathesar/components/column/ColumnName.svelte';
-  import { iconDeleteMajor } from '@mathesar/icons';
-  import type { AbstractTypeFilterDefinition } from '@mathesar/stores/abstract-types/types';
-  import type RecordSummaryStore from '@mathesar/stores/table-data/record-summaries/RecordSummaryStore';
-  import type { RecordSummariesForColumn } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
-  import type { ReadableMapLike } from '@mathesar/typeUtils';
-  import type { ConstraintType } from '@mathesar/api/rest/types/tables/constraints';
+
   import type { FilterEntryColumnLike } from './types';
   import { FILTER_INPUT_CLASS, validateFilterEntry } from './utils';
 
diff --git a/mathesar_ui/src/components/filter-entry/types.ts b/mathesar_ui/src/components/filter-entry/types.ts
index db46e28e1d..63a174e834 100644
--- a/mathesar_ui/src/components/filter-entry/types.ts
+++ b/mathesar_ui/src/components/filter-entry/types.ts
@@ -1,7 +1,7 @@
 import type { CellColumnFabric } from '@mathesar/components/cell-fabric/types';
 import type { getFiltersForAbstractType } from '@mathesar/stores/abstract-types';
-import type { ComponentAndProps } from '@mathesar-component-library/types';
 import type { AbstractType } from '@mathesar/stores/abstract-types/types';
+import type { ComponentAndProps } from '@mathesar-component-library/types';
 
 export interface FilterEntryColumnLike
   extends Pick<CellColumnFabric, 'id' | 'column'> {
diff --git a/mathesar_ui/src/components/filter-entry/utils.ts b/mathesar_ui/src/components/filter-entry/utils.ts
index eecc13a27d..179018cf85 100644
--- a/mathesar_ui/src/components/filter-entry/utils.ts
+++ b/mathesar_ui/src/components/filter-entry/utils.ts
@@ -1,5 +1,4 @@
 import type { FkConstraint } from '@mathesar/api/rest/types/tables/constraints';
-import { isDefinedNonNullable } from '@mathesar-component-library';
 import {
   getEqualityFiltersForAbstractType,
   getFiltersForAbstractType,
@@ -9,6 +8,7 @@ import type {
   AbstractTypeFilterDefinition,
   AbstractTypeLimitedFilterInformation,
 } from '@mathesar/stores/abstract-types/types';
+import { isDefinedNonNullable } from '@mathesar-component-library';
 
 export const FILTER_INPUT_CLASS = 'filter-input';
 
diff --git a/mathesar_ui/src/components/form/Field.svelte b/mathesar_ui/src/components/form/Field.svelte
index 614b0bb852..9406aff42f 100644
--- a/mathesar_ui/src/components/form/Field.svelte
+++ b/mathesar_ui/src/components/form/Field.svelte
@@ -3,10 +3,11 @@
 
   import { LabeledInput, TextInput } from '@mathesar-component-library';
   import type { ComponentWithProps } from '@mathesar-component-library/types';
+
+  import type { FieldStore } from './field';
   import FieldErrors from './FieldErrors.svelte';
   import FieldHelp from './FieldHelp.svelte';
   import FieldLayout from './FieldLayout.svelte';
-  import type { FieldStore } from './field';
 
   type Layout = ComponentProps<LabeledInput>['layout'];
   type Value = $$Generic;
diff --git a/mathesar_ui/src/components/form/FieldErrors.svelte b/mathesar_ui/src/components/form/FieldErrors.svelte
index cbe545f65c..4c6df052e1 100644
--- a/mathesar_ui/src/components/form/FieldErrors.svelte
+++ b/mathesar_ui/src/components/form/FieldErrors.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import Errors from '@mathesar/components/Errors.svelte';
+
   import type { FieldStore } from './field';
 
   export let field: FieldStore;
diff --git a/mathesar_ui/src/components/form/FormStatus.svelte b/mathesar_ui/src/components/form/FormStatus.svelte
index 0fde687190..918f69cea5 100644
--- a/mathesar_ui/src/components/form/FormStatus.svelte
+++ b/mathesar_ui/src/components/form/FormStatus.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
-  import type { Form } from './form';
   import ModificationStatus from '../ModificationStatus.svelte';
 
+  import type { Form } from './form';
+
   export let form: Form;
 
   $: ({ requestStatus } = form);
diff --git a/mathesar_ui/src/components/form/FormSubmit.svelte b/mathesar_ui/src/components/form/FormSubmit.svelte
index 82eb2ebae6..61b117a2e4 100644
--- a/mathesar_ui/src/components/form/FormSubmit.svelte
+++ b/mathesar_ui/src/components/form/FormSubmit.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
   import type { ComponentProps } from 'svelte';
 
+  import Errors from '@mathesar/components/Errors.svelte';
   import { getErrorMessage } from '@mathesar/utils/errors';
   import { CancelOrProceedButtonPair } from '@mathesar-component-library';
-  import Errors from '@mathesar/components/Errors.svelte';
+
   import type { FilledFormValues, Form } from './form';
 
   type F = $$Generic<Form>;
diff --git a/mathesar_ui/src/components/form/GridFormInput.svelte b/mathesar_ui/src/components/form/GridFormInput.svelte
index a01c46ee9e..57777a5342 100644
--- a/mathesar_ui/src/components/form/GridFormInput.svelte
+++ b/mathesar_ui/src/components/form/GridFormInput.svelte
@@ -6,13 +6,15 @@
 -->
 <script lang="ts">
   import type { SvelteComponent } from 'svelte';
+
+  import { Field, type FieldStore } from '@mathesar/components/form';
   import {
     Label,
     LabelController,
     setLabelControllerInContext,
   } from '@mathesar-component-library';
-  import { Field, type FieldStore } from '@mathesar/components/form';
   import type { ComponentWithProps } from '@mathesar-component-library/types';
+
   import GridFormInputRow from './GridFormInputRow.svelte';
 
   const labelController = new LabelController();
diff --git a/mathesar_ui/src/components/form/__tests__/form.test.ts b/mathesar_ui/src/components/form/__tests__/form.test.ts
index 48afe6dba3..0973654457 100644
--- a/mathesar_ui/src/components/form/__tests__/form.test.ts
+++ b/mathesar_ui/src/components/form/__tests__/form.test.ts
@@ -1,8 +1,8 @@
 import { get } from 'svelte/store';
 
-import { uniqueWith, min, comboInvalidIf } from '../validators';
-import { makeForm } from '../form';
 import { requiredField } from '../field';
+import { makeForm } from '../form';
+import { comboInvalidIf, min, uniqueWith } from '../validators';
 
 type Beverage = 'juice' | 'water' | 'beer';
 
diff --git a/mathesar_ui/src/components/form/field.ts b/mathesar_ui/src/components/form/field.ts
index b0c6a5df18..2d9377fd03 100644
--- a/mathesar_ui/src/components/form/field.ts
+++ b/mathesar_ui/src/components/form/field.ts
@@ -1,6 +1,6 @@
-import { derived, writable, type Readable, type Writable } from 'svelte/store';
+import { type Readable, type Writable, derived, writable } from 'svelte/store';
 
-import { getErrors, type Filled, type ValidationFn } from './validators';
+import { type Filled, type ValidationFn, getErrors } from './validators';
 
 export const comboErrorsKey = Symbol('comboErrors');
 export const disabledKey = Symbol('disabled');
diff --git a/mathesar_ui/src/components/form/form.ts b/mathesar_ui/src/components/form/form.ts
index d327769b45..29ac8b14ae 100644
--- a/mathesar_ui/src/components/form/form.ts
+++ b/mathesar_ui/src/components/form/form.ts
@@ -1,21 +1,22 @@
-import { derived, get, writable, type Readable } from 'svelte/store';
+import { type Readable, derived, get, writable } from 'svelte/store';
 
+import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import {
   unite,
   withSideChannelSubscriptions,
 } from '@mathesar-component-library';
-import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+
 import {
-  comboErrorsKey,
-  disabledKey,
   type FieldStore,
   type RequiredField,
   type ValuedField,
+  comboErrorsKey,
+  disabledKey,
 } from './field';
 import {
-  isValid as outcomeIsValid,
   type ComboValidator,
   type Filled,
+  isValid as outcomeIsValid,
 } from './validators';
 
 type GenericFieldsObj = Record<string, FieldStore>;
diff --git a/mathesar_ui/src/components/form/validators.ts b/mathesar_ui/src/components/form/validators.ts
index 501b7a9fdd..937c19d42b 100644
--- a/mathesar_ui/src/components/form/validators.ts
+++ b/mathesar_ui/src/components/form/validators.ts
@@ -1,5 +1,6 @@
 import { get } from 'svelte/store';
 import { _ } from 'svelte-i18n';
+
 import type { FieldStore, FieldValue, ValuedField } from './field';
 
 export type Filled<T> = Exclude<T, null | undefined>;
diff --git a/mathesar_ui/src/components/group-entry/GroupEntry.svelte b/mathesar_ui/src/components/group-entry/GroupEntry.svelte
index 3e0a32e10b..b86e28fd9d 100644
--- a/mathesar_ui/src/components/group-entry/GroupEntry.svelte
+++ b/mathesar_ui/src/components/group-entry/GroupEntry.svelte
@@ -1,16 +1,18 @@
 <script lang="ts">
   import { createEventDispatcher, tick } from 'svelte';
   import { _ } from 'svelte-i18n';
+
+  import type { ConstraintType } from '@mathesar/api/rest/types/tables/constraints';
+  import ColumnName from '@mathesar/components/column/ColumnName.svelte';
+  import { iconDeleteMajor } from '@mathesar/icons';
+  import type { ReadableMapLike } from '@mathesar/typeUtils';
   import {
     Button,
     Icon,
     InputGroup,
     Select,
   } from '@mathesar-component-library';
-  import { iconDeleteMajor } from '@mathesar/icons';
-  import type { ReadableMapLike } from '@mathesar/typeUtils';
-  import ColumnName from '@mathesar/components/column/ColumnName.svelte';
-  import type { ConstraintType } from '@mathesar/api/rest/types/tables/constraints';
+
   import type { GroupEntryColumnLike } from './types';
 
   type T = $$Generic;
diff --git a/mathesar_ui/src/components/message-boxes/ErrorBox.svelte b/mathesar_ui/src/components/message-boxes/ErrorBox.svelte
index c5b3396bda..d07c970419 100644
--- a/mathesar_ui/src/components/message-boxes/ErrorBox.svelte
+++ b/mathesar_ui/src/components/message-boxes/ErrorBox.svelte
@@ -2,6 +2,7 @@
   import type { ComponentProps } from 'svelte';
 
   import { iconError } from '@mathesar-component-library';
+
   import MessageBox from './MessageBox.svelte';
 
   type $$Props = ComponentProps<MessageBox>;
diff --git a/mathesar_ui/src/components/message-boxes/InfoBox.svelte b/mathesar_ui/src/components/message-boxes/InfoBox.svelte
index b612bc00b8..987e09f385 100644
--- a/mathesar_ui/src/components/message-boxes/InfoBox.svelte
+++ b/mathesar_ui/src/components/message-boxes/InfoBox.svelte
@@ -2,6 +2,7 @@
   import type { ComponentProps } from 'svelte';
 
   import { iconInfo } from '@mathesar-component-library';
+
   import MessageBox from './MessageBox.svelte';
 
   type $$Props = ComponentProps<MessageBox>;
diff --git a/mathesar_ui/src/components/message-boxes/MessageBox.svelte b/mathesar_ui/src/components/message-boxes/MessageBox.svelte
index c8f74dd431..16757983da 100644
--- a/mathesar_ui/src/components/message-boxes/MessageBox.svelte
+++ b/mathesar_ui/src/components/message-boxes/MessageBox.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import type { IconProps } from '@mathesar-component-library/types';
   import { Icon } from '@mathesar-component-library';
+  import type { IconProps } from '@mathesar-component-library/types';
 
   export let icon: IconProps | undefined = undefined;
   export let style: string | undefined = undefined;
diff --git a/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte b/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte
index 980812b7b5..15993406cc 100644
--- a/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte
+++ b/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte
@@ -2,6 +2,7 @@
   import type { ComponentProps } from 'svelte';
 
   import { iconOutcome } from '@mathesar/icons';
+
   import MessageBox from './MessageBox.svelte';
 
   type $$Props = ComponentProps<MessageBox>;
diff --git a/mathesar_ui/src/components/message-boxes/WarningBox.svelte b/mathesar_ui/src/components/message-boxes/WarningBox.svelte
index 329179315d..1fbae58ef2 100644
--- a/mathesar_ui/src/components/message-boxes/WarningBox.svelte
+++ b/mathesar_ui/src/components/message-boxes/WarningBox.svelte
@@ -2,6 +2,7 @@
   import type { ComponentProps } from 'svelte';
 
   import { iconWarning } from '@mathesar-component-library';
+
   import MessageBox from './MessageBox.svelte';
 
   type $$Props = ComponentProps<MessageBox>;
diff --git a/mathesar_ui/src/components/rich-text/RichText.svelte b/mathesar_ui/src/components/rich-text/RichText.svelte
index d8a4f0e404..2429439104 100644
--- a/mathesar_ui/src/components/rich-text/RichText.svelte
+++ b/mathesar_ui/src/components/rich-text/RichText.svelte
@@ -45,6 +45,7 @@
 -->
 <script lang="ts">
   import { assertExhaustive } from '@mathesar/utils/typeUtils';
+
   import { parse } from './richTextUtils';
 
   export let text: string;
diff --git a/mathesar_ui/src/components/rich-text/__tests__/richTextUtils.test.ts b/mathesar_ui/src/components/rich-text/__tests__/richTextUtils.test.ts
index 53562f5715..b940a6d4a8 100644
--- a/mathesar_ui/src/components/rich-text/__tests__/richTextUtils.test.ts
+++ b/mathesar_ui/src/components/rich-text/__tests__/richTextUtils.test.ts
@@ -1,8 +1,8 @@
 import {
-  parse,
   type Token,
-  textToken as text,
+  parse,
   slotToken as slot,
+  textToken as text,
 } from '../richTextUtils';
 
 describe('RichText', () => {
diff --git a/mathesar_ui/src/components/routing/EventfulRoute.svelte b/mathesar_ui/src/components/routing/EventfulRoute.svelte
index deac9f54e2..211235e1e2 100644
--- a/mathesar_ui/src/components/routing/EventfulRoute.svelte
+++ b/mathesar_ui/src/components/routing/EventfulRoute.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { Route } from 'tinro';
+
   import RouteObserver from './RouteObserver.svelte';
 
   export let path: string;
diff --git a/mathesar_ui/src/components/routing/MultiPathRoute.svelte b/mathesar_ui/src/components/routing/MultiPathRoute.svelte
index 1d56f0f1f4..7be61b5539 100644
--- a/mathesar_ui/src/components/routing/MultiPathRoute.svelte
+++ b/mathesar_ui/src/components/routing/MultiPathRoute.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { tick } from 'svelte';
   import type { TinroRouteMeta } from 'tinro';
+
   import EventfulRoute from './EventfulRoute.svelte';
   import type { RoutePath } from './utils';
 
diff --git a/mathesar_ui/src/components/sheet/Sheet.svelte b/mathesar_ui/src/components/sheet/Sheet.svelte
index f14d947adb..14e24a6954 100644
--- a/mathesar_ui/src/components/sheet/Sheet.svelte
+++ b/mathesar_ui/src/components/sheet/Sheet.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
   import { writable } from 'svelte/store';
 
-  import { ImmutableMap } from '@mathesar-component-library/types';
   import type { ClipboardHandler } from '@mathesar/stores/clipboard';
   import { getClipboardHandlerStoreFromContext } from '@mathesar/stores/clipboard';
+  import { ImmutableMap } from '@mathesar-component-library/types';
+
   import {
     DEFAULT_COLUMN_WIDTH,
     calculateColumnStyleMapAndRowWidth,
diff --git a/mathesar_ui/src/components/sheet/SheetCellResizer.svelte b/mathesar_ui/src/components/sheet/SheetCellResizer.svelte
index db09ee920f..09e9c9dc50 100644
--- a/mathesar_ui/src/components/sheet/SheetCellResizer.svelte
+++ b/mathesar_ui/src/components/sheet/SheetCellResizer.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { slider } from '@mathesar-component-library';
+
   import { getSheetContext } from './utils';
 
   type SheetColumnIdentifierKey = $$Generic;
diff --git a/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts b/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts
index f2dcfcbe2f..d076834269 100644
--- a/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts
+++ b/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts
@@ -1,7 +1,6 @@
 import * as Papa from 'papaparse';
 import { get } from 'svelte/store';
 
-import { ImmutableSet, type MakeToast } from '@mathesar-component-library';
 import SheetSelection, {
   isCellSelected,
 } from '@mathesar/components/sheet/SheetSelection';
@@ -16,6 +15,7 @@ import type { QueryRow } from '@mathesar/systems/data-explorer/QueryRunner';
 import type { ProcessedQueryOutputColumn } from '@mathesar/systems/data-explorer/utils';
 import type { ReadableMapLike } from '@mathesar/typeUtils';
 import { labeledCount } from '@mathesar/utils/languageUtils';
+import { ImmutableSet, type MakeToast } from '@mathesar-component-library';
 
 const MIME_PLAIN_TEXT = 'text/plain';
 const MIME_MATHESAR_SHEET_CLIPBOARD =
diff --git a/mathesar_ui/src/components/sheet/SheetHeader.svelte b/mathesar_ui/src/components/sheet/SheetHeader.svelte
index 7b5e7ac7d8..c2b98dff0e 100644
--- a/mathesar_ui/src/components/sheet/SheetHeader.svelte
+++ b/mathesar_ui/src/components/sheet/SheetHeader.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { onMount } from 'svelte';
+
   import { getSheetContext } from './utils';
 
   const { stores, api } = getSheetContext();
diff --git a/mathesar_ui/src/components/sheet/SheetPositionableCell.svelte b/mathesar_ui/src/components/sheet/SheetPositionableCell.svelte
index 1b7a10f22d..4cc8fe18ee 100644
--- a/mathesar_ui/src/components/sheet/SheetPositionableCell.svelte
+++ b/mathesar_ui/src/components/sheet/SheetPositionableCell.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import { getSheetContext } from './utils';
   import type { ColumnPosition } from './utils';
+  import { getSheetContext } from './utils';
 
   const { stores } = getSheetContext();
   const { columnStyleMap } = stores;
diff --git a/mathesar_ui/src/components/sheet/SheetSelection.ts b/mathesar_ui/src/components/sheet/SheetSelection.ts
index 4c88ef8c50..7d198698f9 100644
--- a/mathesar_ui/src/components/sheet/SheetSelection.ts
+++ b/mathesar_ui/src/components/sheet/SheetSelection.ts
@@ -1,5 +1,6 @@
+import { type Unsubscriber, type Writable, get, writable } from 'svelte/store';
+
 import { ImmutableSet, WritableSet } from '@mathesar-component-library';
-import { get, writable, type Unsubscriber, type Writable } from 'svelte/store';
 
 export interface SelectionColumn {
   id: number | string;
diff --git a/mathesar_ui/src/components/sheet/SheetVirtualRows.svelte b/mathesar_ui/src/components/sheet/SheetVirtualRows.svelte
index 1113863324..febe95f9e8 100644
--- a/mathesar_ui/src/components/sheet/SheetVirtualRows.svelte
+++ b/mathesar_ui/src/components/sheet/SheetVirtualRows.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
   import { rowHeightPx } from '@mathesar/geometry';
+
   import { getSheetContext } from './utils';
+  import type { Props as VirtualListProps } from './virtual-list/listUtils';
   import Resizer from './virtual-list/Resizer.svelte';
   import VirtualList from './virtual-list/VirtualList.svelte';
-  import type { Props as VirtualListProps } from './virtual-list/listUtils';
 
   const { stores, api } = getSheetContext();
   const { rowWidth, horizontalScrollOffset, scrollOffset } = stores;
diff --git a/mathesar_ui/src/components/sheet/utils.ts b/mathesar_ui/src/components/sheet/utils.ts
index c05015864a..4f3915d8d0 100644
--- a/mathesar_ui/src/components/sheet/utils.ts
+++ b/mathesar_ui/src/components/sheet/utils.ts
@@ -1,5 +1,6 @@
-import { setContext, getContext } from 'svelte';
+import { getContext, setContext } from 'svelte';
 import type { Readable } from 'svelte/store';
+
 import type { ImmutableMap } from '@mathesar-component-library/types';
 
 export interface ColumnPosition {
diff --git a/mathesar_ui/src/components/sheet/virtual-list/Resizer.svelte b/mathesar_ui/src/components/sheet/virtual-list/Resizer.svelte
index 39108250e7..f95e62e2b3 100644
--- a/mathesar_ui/src/components/sheet/virtual-list/Resizer.svelte
+++ b/mathesar_ui/src/components/sheet/virtual-list/Resizer.svelte
@@ -11,8 +11,9 @@
    */
 
   import { onMount } from 'svelte';
-  import { createDetectElementResize } from './detectElementResize';
+
   import type { ElementResizeDetector } from './detectElementResize';
+  import { createDetectElementResize } from './detectElementResize';
 
   let classes = 'default';
   export { classes as class };
diff --git a/mathesar_ui/src/components/sheet/virtual-list/VirtualList.svelte b/mathesar_ui/src/components/sheet/virtual-list/VirtualList.svelte
index df9e36d8de..0426719b77 100644
--- a/mathesar_ui/src/components/sheet/virtual-list/VirtualList.svelte
+++ b/mathesar_ui/src/components/sheet/virtual-list/VirtualList.svelte
@@ -19,18 +19,21 @@
 </script>
 
 <script lang="ts">
+  import PerfectScrollbar from 'perfect-scrollbar';
   import {
-    createEventDispatcher,
-    onMount,
     afterUpdate,
+    createEventDispatcher,
     onDestroy,
+    onMount,
   } from 'svelte';
-  import PerfectScrollbar from 'perfect-scrollbar';
+
+  import type { SheetVirtualRowsApi } from '../types';
+
+  import type { ItemInfo, Props } from './listUtils';
+  import listUtils from './listUtils';
   import type { Timeout } from './timer';
   import { cancelTimeout, requestTimeout } from './timer';
-  import listUtils from './listUtils';
-  import type { Props, ItemInfo } from './listUtils';
-  import type { SheetVirtualRowsApi } from '../types';
+
 
   const dispatch = createEventDispatcher();
 
diff --git a/mathesar_ui/src/components/sort-entry/SortEntry.svelte b/mathesar_ui/src/components/sort-entry/SortEntry.svelte
index 8e9a17dd01..485d4931a7 100644
--- a/mathesar_ui/src/components/sort-entry/SortEntry.svelte
+++ b/mathesar_ui/src/components/sort-entry/SortEntry.svelte
@@ -1,22 +1,24 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
+
+  import type { ConstraintType } from '@mathesar/api/rest/types/tables/constraints';
+  import ColumnName from '@mathesar/components/column/ColumnName.svelte';
+  import { iconDeleteMajor } from '@mathesar/icons';
+  import type { ReadableMapLike } from '@mathesar/typeUtils';
   import {
     Button,
     Icon,
     InputGroup,
     Select,
   } from '@mathesar-component-library';
-  import ColumnName from '@mathesar/components/column/ColumnName.svelte';
-  import { iconDeleteMajor } from '@mathesar/icons';
-  import type { ReadableMapLike } from '@mathesar/typeUtils';
-  import type { ConstraintType } from '@mathesar/api/rest/types/tables/constraints';
+
+  import type { SortEntryColumnLike } from './types';
   import {
     type SortDirection,
     allowedSortDirections,
     getSortingLabelForColumn,
   } from './utils';
-  import type { SortEntryColumnLike } from './types';
 
   type T = $$Generic;
   type ColumnLikeType = SortEntryColumnLike & T;
diff --git a/mathesar_ui/src/components/sort-entry/types.ts b/mathesar_ui/src/components/sort-entry/types.ts
index ad94b4afff..e338d54cb5 100644
--- a/mathesar_ui/src/components/sort-entry/types.ts
+++ b/mathesar_ui/src/components/sort-entry/types.ts
@@ -1,4 +1,5 @@
 import type { AbstractType } from '@mathesar/stores/abstract-types/types';
+
 import type { CellColumnFabric } from '../cell-fabric/types';
 
 export interface SortEntryColumnLike
diff --git a/mathesar_ui/src/components/sort-entry/utils.ts b/mathesar_ui/src/components/sort-entry/utils.ts
index fdf899feb8..c853fa2758 100644
--- a/mathesar_ui/src/components/sort-entry/utils.ts
+++ b/mathesar_ui/src/components/sort-entry/utils.ts
@@ -1,5 +1,6 @@
-import { _ } from 'svelte-i18n';
 import { get } from 'svelte/store';
+import { _ } from 'svelte-i18n';
+
 import type { CellDataType } from '../cell-fabric/data-types/typeDefinitions';
 
 export type SortDirection = 'ASCENDING' | 'DESCENDING';
diff --git a/mathesar_ui/src/i18n/index.ts b/mathesar_ui/src/i18n/index.ts
index 19f46419fa..e81b19cbfd 100644
--- a/mathesar_ui/src/i18n/index.ts
+++ b/mathesar_ui/src/i18n/index.ts
@@ -1,5 +1,6 @@
 import Cookies from 'js-cookie';
-import { addMessages, init, register, locale } from 'svelte-i18n';
+import { addMessages, init, locale, register } from 'svelte-i18n';
+
 import type { LangObject } from './languages/utils';
 
 const loaders = {
diff --git a/mathesar_ui/src/i18n/languages/en/index.ts b/mathesar_ui/src/i18n/languages/en/index.ts
index 3c3dee1d43..e416c0ee74 100644
--- a/mathesar_ui/src/i18n/languages/en/index.ts
+++ b/mathesar_ui/src/i18n/languages/en/index.ts
@@ -1,6 +1,7 @@
-import enDict from './dict.json';
 import { type LangObject, addTranslationsToGlobalWindowObject } from '../utils';
 
+import enDict from './dict.json';
+
 const lang: LangObject = {
   language: 'en',
   dictionary: enDict,
diff --git a/mathesar_ui/src/i18n/languages/ja/index.ts b/mathesar_ui/src/i18n/languages/ja/index.ts
index 139c3797bf..adaacb5fcb 100644
--- a/mathesar_ui/src/i18n/languages/ja/index.ts
+++ b/mathesar_ui/src/i18n/languages/ja/index.ts
@@ -1,6 +1,7 @@
-import jaDict from './dict.json';
 import { type LangObject, addTranslationsToGlobalWindowObject } from '../utils';
 
+import jaDict from './dict.json';
+
 const lang: LangObject = {
   language: 'ja',
   dictionary: jaDict,
diff --git a/mathesar_ui/src/icons/index.ts b/mathesar_ui/src/icons/index.ts
index 95e3a4de4f..880ab8b918 100644
--- a/mathesar_ui/src/icons/index.ts
+++ b/mathesar_ui/src/icons/index.ts
@@ -2,83 +2,85 @@ import {
   faAlignLeft,
   faArrowLeft,
   faArrowRight,
+  faArrowRightFromBracket,
   faBackspace,
   faCalendarDay,
   faCalendarWeek,
   faCheck,
   faCheckSquare,
   faChevronRight,
+  faCircleArrowLeft,
+  faCircleArrowRight,
+  faCircleExclamation,
+  faCircleInfo,
   faClock,
   faClone,
   faCogs,
   faCopy,
   faDatabase,
+  faDiagramNext,
   faDollarSign,
+  faEllipsisV,
   faEnvelope,
+  faExternalLink,
   faExternalLinkAlt,
   faFileAlt,
   faFilter,
+  faFilterCircleXmark,
   faGear,
   faGlobe,
+  faGrip,
   faHammer,
   faHashtag,
   faICursor,
+  faInfo,
   faKey,
   faLink,
+  faListUl,
   faLock,
+  faMicroscope,
   faPalette,
+  faPaste,
   faPencilAlt,
   faPlug,
   faPlus,
   faProjectDiagram,
   faQuestion,
   faRedo,
+  faSave,
   faSearchPlus,
   faShapes,
+  faShareFromSquare,
+  faSlash,
   faSnowflake,
   faSort,
   faSortAmountDown,
   faSortAmountDownAlt,
+  faStar,
   faStopwatch,
   faSync,
+  faTimes,
   faTrashAlt,
   faUndo,
   faUnlink,
+  faUpRightFromSquare,
   faUpload,
   faUser,
-  faUsers,
-  faSave,
-  faTimes,
-  faCircleExclamation,
-  faCircleArrowRight,
-  faCircleArrowLeft,
-  faListUl,
-  faInfo,
-  faSlash,
-  faStar,
-  faPaste,
-  faEllipsisV,
-  faArrowRightFromBracket,
   faUserEdit,
-  faUserPlus,
-  faUpRightFromSquare,
-  faCircleInfo,
   faUserGear,
-  faFilterCircleXmark,
-  faMicroscope,
-  faDiagramNext,
+  faUserPlus,
+  faUsers,
   faWandSparkles,
-  faShareFromSquare,
   faXmark,
-  faExternalLink,
-  faGrip,
 } from '@fortawesome/free-solid-svg-icons';
+
 import type { IconProps } from '@mathesar-component-library/types';
+
 import {
   arrayIcon,
-  tableIcon,
   explorationIcon,
   outcomeIcon,
+  tableIcon,
 } from './customIcons';
 
 /**
diff --git a/mathesar_ui/src/layouts/LayoutWithHeader.svelte b/mathesar_ui/src/layouts/LayoutWithHeader.svelte
index ea177b7701..d9e5306548 100644
--- a/mathesar_ui/src/layouts/LayoutWithHeader.svelte
+++ b/mathesar_ui/src/layouts/LayoutWithHeader.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import { makeStyleStringFromCssVariables } from '@mathesar-component-library';
   import AppHeader from '@mathesar/components/AppHeader.svelte';
+  import { makeStyleStringFromCssVariables } from '@mathesar-component-library';
 
   export let fitViewport = false;
   export let restrictWidth = false;
diff --git a/mathesar_ui/src/packages/json-rpc-client-builder/requests.ts b/mathesar_ui/src/packages/json-rpc-client-builder/requests.ts
index 3afa088a44..4609dffa6f 100644
--- a/mathesar_ui/src/packages/json-rpc-client-builder/requests.ts
+++ b/mathesar_ui/src/packages/json-rpc-client-builder/requests.ts
@@ -1,4 +1,5 @@
 import { CancellablePromise, hasProperty } from '@mathesar-component-library';
+
 import { RpcError } from './RpcError';
 
 const METHOD_PATH_SEPARATOR = '.';
diff --git a/mathesar_ui/src/pages/ErrorPage.svelte b/mathesar_ui/src/pages/ErrorPage.svelte
index 055b3abffd..793b593d2a 100644
--- a/mathesar_ui/src/pages/ErrorPage.svelte
+++ b/mathesar_ui/src/pages/ErrorPage.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { AnchorButton } from '@mathesar-component-library';
+
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
+  import { AnchorButton } from '@mathesar-component-library';
 
   export let showGoToRoot = true;
 </script>
diff --git a/mathesar_ui/src/pages/WelcomePage.svelte b/mathesar_ui/src/pages/WelcomePage.svelte
index 419d7ec11e..2a65a4e18d 100644
--- a/mathesar_ui/src/pages/WelcomePage.svelte
+++ b/mathesar_ui/src/pages/WelcomePage.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { AnchorButton, Icon } from '@mathesar-component-library';
+
   import { iconExternalHyperlink } from '@mathesar/icons';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { getDocsLink, getWikiLink } from '@mathesar/routes/urls';
+  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { ConnectionsEmptyState } from '@mathesar/systems/connections';
+  import { AnchorButton, Icon } from '@mathesar-component-library';
 
   const userProfileStore = getUserProfileStoreFromContext();
   $: userProfile = $userProfileStore;
diff --git a/mathesar_ui/src/pages/admin-update/ReleaseBox.svelte b/mathesar_ui/src/pages/admin-update/ReleaseBox.svelte
index c2bde11161..0e20c10907 100644
--- a/mathesar_ui/src/pages/admin-update/ReleaseBox.svelte
+++ b/mathesar_ui/src/pages/admin-update/ReleaseBox.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import { Icon } from '@mathesar-component-library';
   import Logo from '@mathesar/components/Logo.svelte';
   import {
     iconCurrentlyInstalledVersion,
@@ -10,6 +9,7 @@
   } from '@mathesar/icons';
   import type { Release } from '@mathesar/stores/releases';
   import { assertExhaustive } from '@mathesar/utils/typeUtils';
+  import { Icon } from '@mathesar-component-library';
 
   export let type:
     | 'available-upgrade'
diff --git a/mathesar_ui/src/pages/admin-update/SoftwareUpdateContent.svelte b/mathesar_ui/src/pages/admin-update/SoftwareUpdateContent.svelte
index 7bf6f00ddd..f9f61d562b 100644
--- a/mathesar_ui/src/pages/admin-update/SoftwareUpdateContent.svelte
+++ b/mathesar_ui/src/pages/admin-update/SoftwareUpdateContent.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { SpinnerButton } from '@mathesar-component-library';
+
   import Spinner from '@mathesar/component-library/spinner/Spinner.svelte';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { RichText } from '@mathesar/components/rich-text';
@@ -8,6 +8,8 @@
   import type { ReleaseDataStore } from '@mathesar/stores/releases';
   import { toast } from '@mathesar/stores/toast';
   import { assertExhaustive } from '@mathesar/utils/typeUtils';
+  import { SpinnerButton } from '@mathesar-component-library';
+
   import ReleaseBox from './ReleaseBox.svelte';
 
   export let releaseDataStore: ReleaseDataStore;
diff --git a/mathesar_ui/src/pages/admin-update/SoftwareUpdatePage.svelte b/mathesar_ui/src/pages/admin-update/SoftwareUpdatePage.svelte
index b253a34153..889db41d5a 100644
--- a/mathesar_ui/src/pages/admin-update/SoftwareUpdatePage.svelte
+++ b/mathesar_ui/src/pages/admin-update/SoftwareUpdatePage.svelte
@@ -1,8 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { getReleaseDataStoreFromContext } from '@mathesar/stores/releases';
+
   import SoftwareUpdateContent from './SoftwareUpdateContent.svelte';
 
   const releaseDataStore = getReleaseDataStoreFromContext();
diff --git a/mathesar_ui/src/pages/admin-users/AdminNavigation.svelte b/mathesar_ui/src/pages/admin-users/AdminNavigation.svelte
index 29a1c6d8a1..4a43fb56e0 100644
--- a/mathesar_ui/src/pages/admin-users/AdminNavigation.svelte
+++ b/mathesar_ui/src/pages/admin-users/AdminNavigation.svelte
@@ -1,13 +1,14 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
   import { active } from 'tinro';
-  import { Menu, MenuItemContents } from '@mathesar-component-library';
-  import { iconSettingsMajor, iconMultipleUsers } from '@mathesar/icons';
+
+  import { iconMultipleUsers, iconSettingsMajor } from '@mathesar/icons';
   import {
     ADMIN_UPDATE_PAGE_URL,
     ADMIN_USERS_PAGE_URL,
   } from '@mathesar/routes/urls';
   import { getReleaseDataStoreFromContext } from '@mathesar/stores/releases';
+  import { Menu, MenuItemContents } from '@mathesar-component-library';
 
   const releaseDataStore = getReleaseDataStoreFromContext();
 
diff --git a/mathesar_ui/src/pages/admin-users/EditUserPage.svelte b/mathesar_ui/src/pages/admin-users/EditUserPage.svelte
index 127be87ba5..c3dfd5f1a3 100644
--- a/mathesar_ui/src/pages/admin-users/EditUserPage.svelte
+++ b/mathesar_ui/src/pages/admin-users/EditUserPage.svelte
@@ -1,7 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
-  import { Icon, SpinnerButton } from '@mathesar-component-library';
+
+  import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
+  import FormBox from '@mathesar/components/form/FormBox.svelte';
+  import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { iconDeleteMajor, iconEditUser } from '@mathesar/icons';
   import {
     ADMIN_USERS_PAGE_URL,
@@ -10,15 +13,13 @@
   import { confirmDelete } from '@mathesar/stores/confirmation';
   import { toast } from '@mathesar/stores/toast';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
+  import type { UserModel } from '@mathesar/stores/users';
   import { getUsersStoreFromContext } from '@mathesar/stores/users';
   import {
     PasswordChangeForm,
     UserDetailsForm,
   } from '@mathesar/systems/users-and-permissions';
-  import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
-  import type { UserModel } from '@mathesar/stores/users';
-  import FormBox from '@mathesar/components/form/FormBox.svelte';
-  import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
+  import { Icon, SpinnerButton } from '@mathesar-component-library';
 
   const userProfileStore = getUserProfileStoreFromContext();
   const usersStore = getUsersStoreFromContext();
diff --git a/mathesar_ui/src/pages/admin-users/NewUserPage.svelte b/mathesar_ui/src/pages/admin-users/NewUserPage.svelte
index 0e91cc7d1a..9a08545ac6 100644
--- a/mathesar_ui/src/pages/admin-users/NewUserPage.svelte
+++ b/mathesar_ui/src/pages/admin-users/NewUserPage.svelte
@@ -1,17 +1,18 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
-  import { Icon } from '@mathesar-component-library';
+
   import type { User } from '@mathesar/api/rest/users';
+  import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
+  import FormBox from '@mathesar/components/form/FormBox.svelte';
   import { iconAddUser } from '@mathesar/icons';
   import {
-    getEditUsersPageUrl,
     ADMIN_USERS_PAGE_ADD_NEW_URL,
+    getEditUsersPageUrl,
   } from '@mathesar/routes/urls';
   import { getUsersStoreFromContext } from '@mathesar/stores/users';
   import { UserDetailsForm } from '@mathesar/systems/users-and-permissions';
-  import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
-  import FormBox from '@mathesar/components/form/FormBox.svelte';
+  import { Icon } from '@mathesar-component-library';
 
   const usersStore = getUsersStoreFromContext();
 
diff --git a/mathesar_ui/src/pages/admin-users/UserListingPage.svelte b/mathesar_ui/src/pages/admin-users/UserListingPage.svelte
index 3036a63b46..7cc226383a 100644
--- a/mathesar_ui/src/pages/admin-users/UserListingPage.svelte
+++ b/mathesar_ui/src/pages/admin-users/UserListingPage.svelte
@@ -1,14 +1,16 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { AnchorButton, Icon } from '@mathesar-component-library';
+
+  import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
+  import Errors from '@mathesar/components/Errors.svelte';
+  import { RichText } from '@mathesar/components/rich-text';
   import { iconAddNew } from '@mathesar/icons';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { ADMIN_USERS_PAGE_ADD_NEW_URL } from '@mathesar/routes/urls';
   import type { UserModel } from '@mathesar/stores/users';
   import { getUsersStoreFromContext } from '@mathesar/stores/users';
-  import Errors from '@mathesar/components/Errors.svelte';
-  import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
-  import { RichText } from '@mathesar/components/rich-text';
+  import { AnchorButton, Icon } from '@mathesar-component-library';
+
   import UserRow from './UserRow.svelte';
   import UserSkeleton from './UserSkeleton.svelte';
 
diff --git a/mathesar_ui/src/pages/admin-users/UserRow.svelte b/mathesar_ui/src/pages/admin-users/UserRow.svelte
index 7bf4cc3022..1c957666c6 100644
--- a/mathesar_ui/src/pages/admin-users/UserRow.svelte
+++ b/mathesar_ui/src/pages/admin-users/UserRow.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-  import { Icon } from '@mathesar-component-library';
   import { getEditUsersPageUrl } from '@mathesar/routes/urls';
   import type { UserModel } from '@mathesar/stores/users';
   import { getUserTypeInfoFromUserModel } from '@mathesar/systems/users-and-permissions';
+  import { Icon } from '@mathesar-component-library';
 
   export let user: UserModel;
 
diff --git a/mathesar_ui/src/pages/connections/ConnectionRow.svelte b/mathesar_ui/src/pages/connections/ConnectionRow.svelte
index ee7d11e3da..62b394116a 100644
--- a/mathesar_ui/src/pages/connections/ConnectionRow.svelte
+++ b/mathesar_ui/src/pages/connections/ConnectionRow.svelte
@@ -1,16 +1,17 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { Icon, Button } from '@mathesar-component-library';
-  import { iconEdit, iconDeleteMajor } from '@mathesar/icons';
+
+  import type { Connection } from '@mathesar/api/rest/connections';
+  import { iconDeleteMajor, iconEdit } from '@mathesar/icons';
+  import { iconConnection } from '@mathesar/icons';
+  import { getDatabasePageUrl } from '@mathesar/routes/urls';
   import { modal } from '@mathesar/stores/modal';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import {
-    EditConnectionModal,
     DeleteConnectionModal,
+    EditConnectionModal,
   } from '@mathesar/systems/connections';
-  import type { Connection } from '@mathesar/api/rest/connections';
-  import { getDatabasePageUrl } from '@mathesar/routes/urls';
-  import { iconConnection } from '@mathesar/icons';
+  import { Button, Icon } from '@mathesar-component-library';
 
   const userProfileStore = getUserProfileStoreFromContext();
   $: userProfile = $userProfileStore;
diff --git a/mathesar_ui/src/pages/connections/ConnectionsPage.svelte b/mathesar_ui/src/pages/connections/ConnectionsPage.svelte
index 6f6b4893de..0dfa4fe923 100644
--- a/mathesar_ui/src/pages/connections/ConnectionsPage.svelte
+++ b/mathesar_ui/src/pages/connections/ConnectionsPage.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import { Button, Icon } from '@mathesar-component-library';
   import type { Connection } from '@mathesar/api/rest/connections';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
@@ -15,6 +14,8 @@
     AddConnectionModal,
     ConnectionsEmptyState,
   } from '@mathesar/systems/connections';
+  import { Button, Icon } from '@mathesar-component-library';
+
   import ConnectionRow from './ConnectionRow.svelte';
 
   const addConnectionModalController = modal.spawnModalController();
diff --git a/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte b/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte
index 7d4ba28952..084fd9815c 100644
--- a/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte
+++ b/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte
@@ -1,16 +1,17 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
+
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
-  import { DataExplorer } from '@mathesar/systems/data-explorer';
-  import type { QueryManager } from '@mathesar/systems/data-explorer/types';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import {
-    getSchemaPageUrl,
     getExplorationPageUrl,
+    getSchemaPageUrl,
   } from '@mathesar/routes/urls';
+  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
+  import { DataExplorer } from '@mathesar/systems/data-explorer';
+  import type { QueryManager } from '@mathesar/systems/data-explorer/types';
 
   const userProfile = getUserProfileStoreFromContext();
 
diff --git a/mathesar_ui/src/pages/database/AddEditSchemaModal.svelte b/mathesar_ui/src/pages/database/AddEditSchemaModal.svelte
index 97e582aaa7..734923fb38 100644
--- a/mathesar_ui/src/pages/database/AddEditSchemaModal.svelte
+++ b/mathesar_ui/src/pages/database/AddEditSchemaModal.svelte
@@ -1,18 +1,19 @@
 <!-- TODO: Shouldn't this be inside the schema page instead? -->
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import type { ModalController } from '@mathesar-component-library';
+
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import Identifier from '@mathesar/components/Identifier.svelte';
+  import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
+  import NameAndDescInputModalForm from '@mathesar/components/NameAndDescInputModalForm.svelte';
+  import { RichText } from '@mathesar/components/rich-text';
   import {
-    schemas,
     createSchema,
+    schemas,
     updateSchema,
   } from '@mathesar/stores/schemas';
-  import NameAndDescInputModalForm from '@mathesar/components/NameAndDescInputModalForm.svelte';
-  import Identifier from '@mathesar/components/Identifier.svelte';
-  import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
-  import { RichText } from '@mathesar/components/rich-text';
   import { toast } from '@mathesar/stores/toast';
+  import type { ModalController } from '@mathesar-component-library';
 
   export let database: Database;
   export let controller: ModalController;
diff --git a/mathesar_ui/src/pages/database/DatabaseDetails.svelte b/mathesar_ui/src/pages/database/DatabaseDetails.svelte
index 64426e4955..9643e5f64b 100644
--- a/mathesar_ui/src/pages/database/DatabaseDetails.svelte
+++ b/mathesar_ui/src/pages/database/DatabaseDetails.svelte
@@ -1,24 +1,23 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import {
-    Button,
-    Help,
-    Icon,
-    DropdownMenu,
-    ButtonMenuItem,
-  } from '@mathesar-component-library';
+  import { router } from 'tinro';
+
   import { reflectApi } from '@mathesar/api/rest/reflect';
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import AppSecondaryHeader from '@mathesar/components/AppSecondaryHeader.svelte';
+  import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
+  import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
+  import { RichText } from '@mathesar/components/rich-text';
   import {
     iconAddNew,
     iconDatabase,
+    iconDeleteMajor,
+    iconEdit,
     iconManageAccess,
-    iconRefresh,
     iconMoreActions,
-    iconEdit,
-    iconDeleteMajor,
+    iconRefresh,
   } from '@mathesar/icons';
+  import { CONNECTIONS_URL } from '@mathesar/routes/urls';
   import { confirmDelete } from '@mathesar/stores/confirmation';
   import { modal } from '@mathesar/stores/modal';
   import type { DBSchemaStoreData } from '@mathesar/stores/schemas';
@@ -29,19 +28,23 @@
   import { removeTablesInSchemaTablesStore } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
-  import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import {
-    EditConnectionModal,
     DeleteConnectionModal,
+    EditConnectionModal,
   } from '@mathesar/systems/connections';
-  import { CONNECTIONS_URL } from '@mathesar/routes/urls';
-  import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
-  import { RichText } from '@mathesar/components/rich-text';
-  import { router } from 'tinro';
+  import {
+    Button,
+    ButtonMenuItem,
+    DropdownMenu,
+    Help,
+    Icon,
+  } from '@mathesar-component-library';
+
+
   import AddEditSchemaModal from './AddEditSchemaModal.svelte';
   import DbAccessControlModal from './DbAccessControlModal.svelte';
-  import SchemaRow from './SchemaRow.svelte';
   import SchemaListSkeleton from './SchemaListSkeleton.svelte';
+  import SchemaRow from './SchemaRow.svelte';
 
   const addEditModal = modal.spawnModalController();
   const accessControlModal = modal.spawnModalController();
diff --git a/mathesar_ui/src/pages/database/DatabasePage.svelte b/mathesar_ui/src/pages/database/DatabasePage.svelte
index 7f8be0300e..766772ee84 100644
--- a/mathesar_ui/src/pages/database/DatabasePage.svelte
+++ b/mathesar_ui/src/pages/database/DatabasePage.svelte
@@ -2,6 +2,7 @@
   import type { Database } from '@mathesar/AppTypes';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
+
   import DatabaseDetails from './DatabaseDetails.svelte';
 
   export let database: Database;
diff --git a/mathesar_ui/src/pages/database/DbAccessControlModal.svelte b/mathesar_ui/src/pages/database/DbAccessControlModal.svelte
index 6b61056f53..cfa2c09c82 100644
--- a/mathesar_ui/src/pages/database/DbAccessControlModal.svelte
+++ b/mathesar_ui/src/pages/database/DbAccessControlModal.svelte
@@ -1,20 +1,21 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import {
-    ControlledModal,
-    type ModalController,
-  } from '@mathesar-component-library';
+
+  import type { UserRole } from '@mathesar/api/rest/users';
   import type { Database } from '@mathesar/AppTypes';
   import Identifier from '@mathesar/components/Identifier.svelte';
+  import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import {
-    setUsersStoreInContext,
     type UserModel,
+    setUsersStoreInContext,
   } from '@mathesar/stores/users';
-  import type { UserRole } from '@mathesar/api/rest/users';
-  import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { AccessControlView } from '@mathesar/systems/users-and-permissions';
   import type { ObjectRoleMap } from '@mathesar/utils/permissions';
+  import {
+    ControlledModal,
+    type ModalController,
+  } from '@mathesar-component-library';
 
   export let controller: ModalController;
   export let database: Database;
diff --git a/mathesar_ui/src/pages/database/SchemaConstituentCounts.svelte b/mathesar_ui/src/pages/database/SchemaConstituentCounts.svelte
index 0edc6b1ea6..561e5d130d 100644
--- a/mathesar_ui/src/pages/database/SchemaConstituentCounts.svelte
+++ b/mathesar_ui/src/pages/database/SchemaConstituentCounts.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import type { SchemaEntry } from '@mathesar/AppTypes';
 
   export let schema: SchemaEntry;
diff --git a/mathesar_ui/src/pages/database/SchemaRow.svelte b/mathesar_ui/src/pages/database/SchemaRow.svelte
index e732fb398f..6eb6c24f72 100644
--- a/mathesar_ui/src/pages/database/SchemaRow.svelte
+++ b/mathesar_ui/src/pages/database/SchemaRow.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
-  import { ButtonMenuItem, Icon } from '@mathesar-component-library';
+
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import DropdownMenu from '@mathesar/component-library/dropdown-menu/DropdownMenu.svelte';
   import MenuDivider from '@mathesar/component-library/menu/MenuDivider.svelte';
@@ -14,6 +14,8 @@
     iconNotEditable,
   } from '@mathesar/icons';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
+  import { ButtonMenuItem, Icon } from '@mathesar-component-library';
+
   import SchemaConstituentCounts from './SchemaConstituentCounts.svelte';
 
   const dispatch = createEventDispatcher();
diff --git a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
index 32f9caba58..c5372c4f36 100644
--- a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
+++ b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
-  import { router } from 'tinro';
   import { _ } from 'svelte-i18n';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import { router } from 'tinro';
+
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
@@ -15,6 +16,7 @@
     WithExplorationInspector,
   } from '@mathesar/systems/data-explorer';
   import type { ShareConsumer } from '@mathesar/utils/shares';
+
   import Header from './Header.svelte';
 
   const userProfile = getUserProfileStoreFromContext();
diff --git a/mathesar_ui/src/pages/exploration/Header.svelte b/mathesar_ui/src/pages/exploration/Header.svelte
index f6ce17ed7b..5a96c39484 100644
--- a/mathesar_ui/src/pages/exploration/Header.svelte
+++ b/mathesar_ui/src/pages/exploration/Header.svelte
@@ -1,11 +1,13 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
+  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
-  import { Button, Icon } from '@mathesar-component-library';
   import EntityPageHeader from '@mathesar/components/EntityPageHeader.svelte';
   import { iconExploration, iconInspector } from '@mathesar/icons';
-  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import { getExplorationEditorPageUrl } from '@mathesar/routes/urls';
+  import { Button, Icon } from '@mathesar-component-library';
+
   import ShareExplorationDropdown from './ShareExplorationDropdown.svelte';
 
   export let database: Database;
diff --git a/mathesar_ui/src/pages/exploration/ShareExplorationDropdown.svelte b/mathesar_ui/src/pages/exploration/ShareExplorationDropdown.svelte
index fc4068d7b2..133e6b9c38 100644
--- a/mathesar_ui/src/pages/exploration/ShareExplorationDropdown.svelte
+++ b/mathesar_ui/src/pages/exploration/ShareExplorationDropdown.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { iconShare } from '@mathesar/icons';
-  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import { Dropdown, Icon } from '@mathesar-component-library';
-  import ShareEntity from '@mathesar/systems/shares/ShareEntity.svelte';
+
   import queryShareApi from '@mathesar/api/rest/queryShares';
+  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+  import { iconShare } from '@mathesar/icons';
   import { getSharedExplorationPageUrl } from '@mathesar/routes/urls';
+  import ShareEntity from '@mathesar/systems/shares/ShareEntity.svelte';
+  import { Dropdown, Icon } from '@mathesar-component-library';
 
   export let id: QueryInstance['id'];
 </script>
diff --git a/mathesar_ui/src/pages/import/column-names/ColumnNamingStrategyInput.svelte b/mathesar_ui/src/pages/import/column-names/ColumnNamingStrategyInput.svelte
index b97440804e..d2dfab5f34 100644
--- a/mathesar_ui/src/pages/import/column-names/ColumnNamingStrategyInput.svelte
+++ b/mathesar_ui/src/pages/import/column-names/ColumnNamingStrategyInput.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
   import type { ComponentProps } from 'svelte';
   import { _ } from 'svelte-i18n';
+
   import { RadioGroup } from '@mathesar-component-library';
-  import LabelYesHeaderRow from './LabelYesHeaderRow.svelte';
+
   import LabelNoHeaderRow from './LabelNoHeaderRow.svelte';
+  import LabelYesHeaderRow from './LabelYesHeaderRow.svelte';
 
   type $$Props = ComponentProps<RadioGroup<boolean>>;
 
diff --git a/mathesar_ui/src/pages/import/column-names/LabelNoHeaderRow.svelte b/mathesar_ui/src/pages/import/column-names/LabelNoHeaderRow.svelte
index 2f4d0d8008..d499cbe439 100644
--- a/mathesar_ui/src/pages/import/column-names/LabelNoHeaderRow.svelte
+++ b/mathesar_ui/src/pages/import/column-names/LabelNoHeaderRow.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
   import { iconUseFirstRowAsData } from '@mathesar/icons';
 </script>
diff --git a/mathesar_ui/src/pages/import/column-names/LabelYesHeaderRow.svelte b/mathesar_ui/src/pages/import/column-names/LabelYesHeaderRow.svelte
index 621f75bfce..160cef306b 100644
--- a/mathesar_ui/src/pages/import/column-names/LabelYesHeaderRow.svelte
+++ b/mathesar_ui/src/pages/import/column-names/LabelYesHeaderRow.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
   import { iconUseFirstRowAsColumnName } from '@mathesar/icons';
 </script>
diff --git a/mathesar_ui/src/pages/import/inference/ColumnTypeInferenceInput.svelte b/mathesar_ui/src/pages/import/inference/ColumnTypeInferenceInput.svelte
index 024e89ced1..e26b3b31aa 100644
--- a/mathesar_ui/src/pages/import/inference/ColumnTypeInferenceInput.svelte
+++ b/mathesar_ui/src/pages/import/inference/ColumnTypeInferenceInput.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
   import type { ComponentProps } from 'svelte';
   import { _ } from 'svelte-i18n';
+
   import { RadioGroup } from '@mathesar/component-library';
-  import LabelInferenceTrue from './LabelInferenceTrue.svelte';
+
   import LabelInferenceFalse from './LabelInferenceFalse.svelte';
+  import LabelInferenceTrue from './LabelInferenceTrue.svelte';
 
   type $$Props = ComponentProps<RadioGroup<boolean>>;
 
diff --git a/mathesar_ui/src/pages/import/inference/LabelInferenceFalse.svelte b/mathesar_ui/src/pages/import/inference/LabelInferenceFalse.svelte
index c59efc5210..b1f0fbc1a6 100644
--- a/mathesar_ui/src/pages/import/inference/LabelInferenceFalse.svelte
+++ b/mathesar_ui/src/pages/import/inference/LabelInferenceFalse.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
   import { iconUiTypeText } from '@mathesar/icons';
 </script>
diff --git a/mathesar_ui/src/pages/import/inference/LabelInferenceTrue.svelte b/mathesar_ui/src/pages/import/inference/LabelInferenceTrue.svelte
index 69eb7f1ac6..d2e8847d18 100644
--- a/mathesar_ui/src/pages/import/inference/LabelInferenceTrue.svelte
+++ b/mathesar_ui/src/pages/import/inference/LabelInferenceTrue.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
   import { iconInferColumnType } from '@mathesar/icons';
 </script>
diff --git a/mathesar_ui/src/pages/import/preview/ErrorInfo.svelte b/mathesar_ui/src/pages/import/preview/ErrorInfo.svelte
index add354aff7..d8ff7448bf 100644
--- a/mathesar_ui/src/pages/import/preview/ErrorInfo.svelte
+++ b/mathesar_ui/src/pages/import/preview/ErrorInfo.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
-  import { Button, Icon } from '@mathesar-component-library';
+
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { iconDeleteMajor } from '@mathesar/icons';
+  import { Button, Icon } from '@mathesar-component-library';
 
   const dispatch = createEventDispatcher();
 
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index fdeb3e329a..2b59a9e911 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -1,15 +1,12 @@
 <script lang="ts">
-  import { router } from 'tinro';
   import { _ } from 'svelte-i18n';
-  import {
-    CancelOrProceedButtonPair,
-    Spinner,
-  } from '@mathesar-component-library';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import { router } from 'tinro';
+
   import { columnsApi } from '@mathesar/api/rest/columns';
   import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import type { Column } from '@mathesar/api/rest/types/tables/columns';
+  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import {
     Field,
     FieldLayout,
@@ -24,8 +21,8 @@
     getSchemaPageUrl,
     getTablePageUrl,
   } from '@mathesar/routes/urls';
-  import AsyncStore from '@mathesar/stores/AsyncStore';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
+  import AsyncStore from '@mathesar/stores/AsyncStore';
   import {
     generateTablePreview,
     getTypeSuggestionsForTable,
@@ -33,11 +30,16 @@
     tables,
   } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
+  import {
+    CancelOrProceedButtonPair,
+    Spinner,
+  } from '@mathesar-component-library';
+
   import ColumnNamingStrategyInput from '../column-names/ColumnNamingStrategyInput.svelte';
   import ColumnTypeInferenceInput from '../inference/ColumnTypeInferenceInput.svelte';
+
   import ErrorInfo from './ErrorInfo.svelte';
   import ImportPreviewLayout from './ImportPreviewLayout.svelte';
-  import ImportPreviewSheet from './ImportPreviewSheet.svelte';
   import {
     buildColumnPropertiesMap,
     finalizeColumns,
@@ -46,6 +48,7 @@
     makeHeaderUpdateRequest,
     processColumns,
   } from './importPreviewPageUtils';
+  import ImportPreviewSheet from './ImportPreviewSheet.svelte';
 
   /** Set via back-end */
   const TRUNCATION_LIMIT = 20;
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewLayout.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewLayout.svelte
index a3c303e84d..ffbd71129d 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewLayout.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewLayout.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import InsetPageLayout from '@mathesar/layouts/InsetPageLayout.svelte';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
 </script>
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
index dc1e48eaf4..d67efa353b 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
@@ -1,15 +1,17 @@
 <script lang="ts">
-  import { router } from 'tinro';
   import { _ } from 'svelte-i18n';
-  import { Spinner } from '@mathesar-component-library';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import { router } from 'tinro';
+
   import { dataFilesApi } from '@mathesar/api/rest/dataFiles';
+  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { getTablePageUrl } from '@mathesar/routes/urls';
   import AsyncStore from '@mathesar/stores/AsyncStore';
   import { getTableFromStoreOrApi } from '@mathesar/stores/tables';
   import { getErrorMessage } from '@mathesar/utils/errors';
+  import { Spinner } from '@mathesar-component-library';
+
   import ImportPreviewContent from './ImportPreviewContent.svelte';
   import ImportPreviewLayout from './ImportPreviewLayout.svelte';
 
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewSheet.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewSheet.svelte
index 8311481db8..bc443f6a92 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewSheet.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewSheet.svelte
@@ -8,11 +8,12 @@
     SheetHeader,
     SheetRow,
   } from '@mathesar/components/sheet';
-  import PreviewColumn from './PreviewColumn.svelte';
+
   import type {
     ColumnProperties,
     ProcessedPreviewColumn,
   } from './importPreviewPageUtils';
+  import PreviewColumn from './PreviewColumn.svelte';
 
   export let columns: ProcessedPreviewColumn[];
   export let isLoading: boolean;
diff --git a/mathesar_ui/src/pages/import/preview/PreviewColumn.svelte b/mathesar_ui/src/pages/import/preview/PreviewColumn.svelte
index 1531b95907..b1692543f2 100644
--- a/mathesar_ui/src/pages/import/preview/PreviewColumn.svelte
+++ b/mathesar_ui/src/pages/import/preview/PreviewColumn.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-  import { Dropdown, TextInput, Checkbox } from '@mathesar-component-library';
   import type { Column } from '@mathesar/api/rest/types/tables/columns';
   import { AbstractTypeControl } from '@mathesar/components/abstract-type-control';
-  import type { AbstractType } from '@mathesar/stores/abstract-types/types';
   import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
+  import type { AbstractType } from '@mathesar/stores/abstract-types/types';
+  import { Checkbox, Dropdown, TextInput } from '@mathesar-component-library';
 
   export let isLoading = false;
 
diff --git a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
index 3308f98ec0..262ae59480 100644
--- a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
+++ b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
@@ -1,4 +1,3 @@
-import type { Database, SchemaEntry } from '@mathesar/AppTypes';
 import { dataFilesApi } from '@mathesar/api/rest/dataFiles';
 import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
 import type {
@@ -6,13 +5,14 @@ import type {
   TableEntry,
 } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type { Database, SchemaEntry } from '@mathesar/AppTypes';
 import { getCellCap } from '@mathesar/components/cell-fabric/utils';
-import AsyncStore from '@mathesar/stores/AsyncStore';
 import { getAbstractTypeForDbType } from '@mathesar/stores/abstract-types';
 import type {
   AbstractType,
   AbstractTypesMap,
 } from '@mathesar/stores/abstract-types/types';
+import AsyncStore from '@mathesar/stores/AsyncStore';
 import { createTable, deleteTable } from '@mathesar/stores/tables';
 
 /**
diff --git a/mathesar_ui/src/pages/import/upload/DataFileInput.svelte b/mathesar_ui/src/pages/import/upload/DataFileInput.svelte
index 23fc48359f..329e2a48d8 100644
--- a/mathesar_ui/src/pages/import/upload/DataFileInput.svelte
+++ b/mathesar_ui/src/pages/import/upload/DataFileInput.svelte
@@ -1,6 +1,10 @@
 <script lang="ts">
   import { onDestroy } from 'svelte';
   import { _ } from 'svelte-i18n';
+
+  import { dataFilesApi as api } from '@mathesar/api/rest/dataFiles';
+  import type { UploadCompletionOpts } from '@mathesar/api/rest/utils/requestUtils';
+  import { toast } from '@mathesar/stores/toast';
   import {
     Button,
     FileUpload as FileUploadComponent,
@@ -10,9 +14,6 @@
     FileUpload,
     FileUploadAddDetail,
   } from '@mathesar-component-library/types';
-  import { dataFilesApi as api } from '@mathesar/api/rest/dataFiles';
-  import type { UploadCompletionOpts } from '@mathesar/api/rest/utils/requestUtils';
-  import { toast } from '@mathesar/stores/toast';
 
   /**
    * Keep the displayed progress at this value until the request resolves.
diff --git a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
index 5f553cdb6a..c768b89941 100644
--- a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
+++ b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
@@ -1,18 +1,12 @@
 <script lang="ts">
-  import { router } from 'tinro';
   import { _ } from 'svelte-i18n';
-  import {
-    RadioGroup,
-    TextArea,
-    iconUploadFile,
-  } from '@mathesar-component-library';
-  import type { IconProps } from '@mathesar-component-library/types';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import { router } from 'tinro';
+
   import { dataFilesApi } from '@mathesar/api/rest/dataFiles';
   import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import Spinner from '@mathesar/component-library/spinner/Spinner.svelte';
   import DocsLink from '@mathesar/components/DocsLink.svelte';
-  import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
   import {
     Field,
     FieldLayout,
@@ -22,6 +16,7 @@
   } from '@mathesar/components/form';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import WarningBox from '@mathesar/components/message-boxes/WarningBox.svelte';
+  import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import { iconPaste, iconUrl } from '@mathesar/icons';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
@@ -30,9 +25,18 @@
   import { createTable } from '@mathesar/stores/tables';
   import { getErrorMessage } from '@mathesar/utils/errors';
   import { assertExhaustive } from '@mathesar/utils/typeUtils';
-  import DataFileInput from './DataFileInput.svelte';
+  import {
+    RadioGroup,
+    TextArea,
+    iconUploadFile,
+  } from '@mathesar-component-library';
+  import type { IconProps } from '@mathesar-component-library/types';
+
+
   import ColumnTypeInferenceInput from '../inference/ColumnTypeInferenceInput.svelte';
 
+  import DataFileInput from './DataFileInput.svelte';
+
   export let database: Database;
   export let schema: SchemaEntry;
 
diff --git a/mathesar_ui/src/pages/pageTitleUtils.ts b/mathesar_ui/src/pages/pageTitleUtils.ts
index d8339f573b..842ad8997a 100644
--- a/mathesar_ui/src/pages/pageTitleUtils.ts
+++ b/mathesar_ui/src/pages/pageTitleUtils.ts
@@ -1,5 +1,6 @@
 import { get } from 'svelte/store';
 import { _ } from 'svelte-i18n';
+
 import { currentSchema } from '@mathesar/stores/schemas';
 
 const SEPARATOR = ' | ';
diff --git a/mathesar_ui/src/pages/record/DirectField.svelte b/mathesar_ui/src/pages/record/DirectField.svelte
index 8674917339..d03a0bc59a 100644
--- a/mathesar_ui/src/pages/record/DirectField.svelte
+++ b/mathesar_ui/src/pages/record/DirectField.svelte
@@ -1,12 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import {
-    ButtonMenuItem,
-    DropdownMenu,
-    iconExpandDown,
-    Label,
-    LabelController,
-  } from '@mathesar-component-library';
+
   import type { CellDataType } from '@mathesar/components/cell-fabric/data-types/typeDefinitions';
   import DynamicInput from '@mathesar/components/cell-fabric/DynamicInput.svelte';
   import ProcessedColumnName from '@mathesar/components/column/ProcessedColumnName.svelte';
@@ -18,6 +12,14 @@
   import { currentSchema } from '@mathesar/stores/schemas';
   import type { ProcessedColumn } from '@mathesar/stores/table-data';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
+  import {
+    ButtonMenuItem,
+    DropdownMenu,
+    Label,
+    LabelController,
+    iconExpandDown,
+  } from '@mathesar-component-library';
+
   import type RecordStore from './RecordStore';
 
   const userProfile = getUserProfileStoreFromContext();
diff --git a/mathesar_ui/src/pages/record/RecordPage.svelte b/mathesar_ui/src/pages/record/RecordPage.svelte
index 2fd3143948..bde3ee3ab9 100644
--- a/mathesar_ui/src/pages/record/RecordPage.svelte
+++ b/mathesar_ui/src/pages/record/RecordPage.svelte
@@ -6,6 +6,7 @@
   import { TableStructure } from '@mathesar/stores/table-data';
   import { displayRecordSummaryAsPlainText } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
   import { currentTable } from '@mathesar/stores/tables';
+
   import RecordPageContent from './RecordPageContent.svelte';
   import RecordPageLoadingSpinner from './RecordPageLoadingSpinner.svelte';
   import type RecordStore from './RecordStore';
diff --git a/mathesar_ui/src/pages/record/RecordPageContent.svelte b/mathesar_ui/src/pages/record/RecordPageContent.svelte
index 39475660e2..d504fdb71a 100644
--- a/mathesar_ui/src/pages/record/RecordPageContent.svelte
+++ b/mathesar_ui/src/pages/record/RecordPageContent.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
   import { getDetailedRecordsErrors } from '@mathesar/api/rest/utils/recordUtils';
@@ -12,12 +13,13 @@
   import FormStatus from '@mathesar/components/form/FormStatus.svelte';
   import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
   import RecordSummary from '@mathesar/components/RecordSummary.svelte';
-  import TableName from '@mathesar/components/TableName.svelte';
   import { RichText } from '@mathesar/components/rich-text';
+  import TableName from '@mathesar/components/TableName.svelte';
   import { iconRecord, iconSave, iconUndo } from '@mathesar/icons';
   import InsetPageLayout from '@mathesar/layouts/InsetPageLayout.svelte';
   import type { TableStructure } from '@mathesar/stores/table-data';
   import { currentTable } from '@mathesar/stores/tables';
+
   import DirectField from './DirectField.svelte';
   import RecordPageLoadingSpinner from './RecordPageLoadingSpinner.svelte';
   import type RecordStore from './RecordStore';
diff --git a/mathesar_ui/src/pages/record/RecordStore.ts b/mathesar_ui/src/pages/record/RecordStore.ts
index fb3aa57b0a..efe8ff0300 100644
--- a/mathesar_ui/src/pages/record/RecordStore.ts
+++ b/mathesar_ui/src/pages/record/RecordStore.ts
@@ -1,20 +1,20 @@
-import { derived, writable, type Readable } from 'svelte/store';
+import { type Readable, derived, writable } from 'svelte/store';
 
 import type { TableEntry } from '@mathesar/api/rest/types/tables';
 import type { Response as ApiResponse } from '@mathesar/api/rest/types/tables/records';
-import { WritableMap } from '@mathesar/component-library';
-import {
-  renderTransitiveRecordSummary,
-  prepareFieldsAsRecordSummaryInputData,
-  buildRecordSummariesForSheet,
-} from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
 import {
+  type RequestStatus,
   getAPI,
   patchAPI,
-  type RequestStatus,
 } from '@mathesar/api/rest/utils/requestUtils';
-import { getErrorMessage } from '@mathesar/utils/errors';
+import { WritableMap } from '@mathesar/component-library';
 import RecordSummaryStore from '@mathesar/stores/table-data/record-summaries/RecordSummaryStore';
+import {
+  buildRecordSummariesForSheet,
+  prepareFieldsAsRecordSummaryInputData,
+  renderTransitiveRecordSummary,
+} from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
+import { getErrorMessage } from '@mathesar/utils/errors';
 
 export default class RecordStore {
   fetchRequest = writable<RequestStatus | undefined>(undefined);
diff --git a/mathesar_ui/src/pages/record/TableWidget.svelte b/mathesar_ui/src/pages/record/TableWidget.svelte
index 0662ff1edb..cdb7ab686b 100644
--- a/mathesar_ui/src/pages/record/TableWidget.svelte
+++ b/mathesar_ui/src/pages/record/TableWidget.svelte
@@ -5,8 +5,8 @@
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
   import {
     Meta,
-    setTabularDataStoreInContext,
     TabularData,
+    setTabularDataStoreInContext,
   } from '@mathesar/stores/table-data';
   import MiniActionsPane from '@mathesar/systems/table-view/actions-pane/MiniActionsPane.svelte';
   import TableView from '@mathesar/systems/table-view/TableView.svelte';
diff --git a/mathesar_ui/src/pages/record/Widgets.svelte b/mathesar_ui/src/pages/record/Widgets.svelte
index 3ee77992ca..79bf1abdee 100644
--- a/mathesar_ui/src/pages/record/Widgets.svelte
+++ b/mathesar_ui/src/pages/record/Widgets.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { Help, isDefinedNonNullable } from '@mathesar-component-library';
+
   import type {
     JoinableTable,
     JoinableTablesResult,
@@ -9,6 +9,8 @@
   import { RichText } from '@mathesar/components/rich-text';
   import { iconRecord } from '@mathesar/icons';
   import { tables } from '@mathesar/stores/tables';
+  import { Help, isDefinedNonNullable } from '@mathesar-component-library';
+
   import TableWidget from './TableWidget.svelte';
 
   export let recordPk: string;
diff --git a/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte b/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
index d9e86c5a61..1d95dcea92 100644
--- a/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
+++ b/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
   import { router } from 'tinro';
-  import { createTable } from '@mathesar/stores/tables';
-  import { getTablePageUrl } from '@mathesar/routes/urls';
+
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import { getTablePageUrl } from '@mathesar/routes/urls';
+  import { createTable } from '@mathesar/stores/tables';
   import { Button, Spinner } from '@mathesar-component-library';
 
   export let database: Database;
diff --git a/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte b/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte
index 3842dba3a5..9592e2677a 100644
--- a/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte
+++ b/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
-  import { AnchorButton, Tutorial } from '@mathesar-component-library';
   import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
+  import { AnchorButton, Tutorial } from '@mathesar-component-library';
 
   export let database: Database;
   export let schema: SchemaEntry;
diff --git a/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte b/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
index f7fed0761e..2bb296e493 100644
--- a/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
+++ b/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
@@ -1,17 +1,18 @@
 <script lang="ts">
-  import { router } from 'tinro';
   import { _ } from 'svelte-i18n';
-  import { createTable } from '@mathesar/stores/tables';
-  import { getImportPageUrl, getTablePageUrl } from '@mathesar/routes/urls';
+  import { router } from 'tinro';
+
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import Icon from '@mathesar/component-library/icon/Icon.svelte';
+  import LinkMenuItem from '@mathesar/component-library/menu/LinkMenuItem.svelte';
+  import { iconAddNew } from '@mathesar/icons';
+  import { getImportPageUrl, getTablePageUrl } from '@mathesar/routes/urls';
+  import { createTable } from '@mathesar/stores/tables';
   import {
+    ButtonMenuItem,
     DropdownMenu,
     Spinner,
-    ButtonMenuItem,
   } from '@mathesar-component-library';
-  import { iconAddNew } from '@mathesar/icons';
-  import Icon from '@mathesar/component-library/icon/Icon.svelte';
-  import LinkMenuItem from '@mathesar/component-library/menu/LinkMenuItem.svelte';
 
   export let database: Database;
   export let schema: SchemaEntry;
diff --git a/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte b/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte
index d65a462d52..230dcfd739 100644
--- a/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte
+++ b/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte
@@ -1,8 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
-  import { AnchorButton, Tutorial } from '@mathesar-component-library';
   import { getImportPageUrl } from '@mathesar/routes/urls';
+  import { AnchorButton, Tutorial } from '@mathesar-component-library';
+
   import CreateEmptyTableButton from './CreateEmptyTableButton.svelte';
 
   export let database: Database;
diff --git a/mathesar_ui/src/pages/schema/EditTable.svelte b/mathesar_ui/src/pages/schema/EditTable.svelte
index 287d6a756d..88c61ffa2f 100644
--- a/mathesar_ui/src/pages/schema/EditTable.svelte
+++ b/mathesar_ui/src/pages/schema/EditTable.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
-  import type { ModalController } from '@mathesar-component-library';
   import EditTableHoc from '@mathesar/components/EditTableHOC.svelte';
   import Identifier from '@mathesar/components/Identifier.svelte';
-  import { RichText } from '@mathesar/components/rich-text';
   import NameAndDescInputModalForm from '@mathesar/components/NameAndDescInputModalForm.svelte';
+  import { RichText } from '@mathesar/components/rich-text';
+  import type { ModalController } from '@mathesar-component-library';
 
   export let table: TableEntry;
   export let modalController: ModalController;
diff --git a/mathesar_ui/src/pages/schema/ExplorationItem.svelte b/mathesar_ui/src/pages/schema/ExplorationItem.svelte
index 5a7758171f..ade361c335 100644
--- a/mathesar_ui/src/pages/schema/ExplorationItem.svelte
+++ b/mathesar_ui/src/pages/schema/ExplorationItem.svelte
@@ -1,12 +1,13 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import { Icon } from '@mathesar-component-library';
+  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import TableName from '@mathesar/components/TableName.svelte';
   import { iconExploration } from '@mathesar/icons';
   import { getExplorationPageUrl } from '@mathesar/routes/urls';
   import { tables as tablesStore } from '@mathesar/stores/tables';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import { Icon } from '@mathesar-component-library';
 
   export let exploration: QueryInstance;
   export let database: Database;
diff --git a/mathesar_ui/src/pages/schema/ExplorationsList.svelte b/mathesar_ui/src/pages/schema/ExplorationsList.svelte
index 74259bfbf5..6dd223f709 100644
--- a/mathesar_ui/src/pages/schema/ExplorationsList.svelte
+++ b/mathesar_ui/src/pages/schema/ExplorationsList.svelte
@@ -1,10 +1,12 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import { iconExploration } from '@mathesar/icons';
-  import ExplorationItem from './ExplorationItem.svelte';
+
   import EmptyEntity from './EmptyEntity.svelte';
+  import ExplorationItem from './ExplorationItem.svelte';
 
   export let explorations: QueryInstance[];
   export let database: Database;
diff --git a/mathesar_ui/src/pages/schema/SchemaAccessControlModal.svelte b/mathesar_ui/src/pages/schema/SchemaAccessControlModal.svelte
index 9d98ec5be0..cb22a2a557 100644
--- a/mathesar_ui/src/pages/schema/SchemaAccessControlModal.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaAccessControlModal.svelte
@@ -1,20 +1,21 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import {
-    ControlledModal,
-    type ModalController,
-  } from '@mathesar-component-library';
+
+  import type { UserRole } from '@mathesar/api/rest/users';
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import Identifier from '@mathesar/components/Identifier.svelte';
+  import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import {
-    setUsersStoreInContext,
     type UserModel,
+    setUsersStoreInContext,
   } from '@mathesar/stores/users';
-  import type { UserRole } from '@mathesar/api/rest/users';
-  import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { AccessControlView } from '@mathesar/systems/users-and-permissions';
   import type { ObjectRoleMap } from '@mathesar/utils/permissions';
+  import {
+    ControlledModal,
+    type ModalController,
+  } from '@mathesar-component-library';
 
   export let controller: ModalController;
   export let database: Database;
diff --git a/mathesar_ui/src/pages/schema/SchemaExplorations.svelte b/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
index fa60216e22..4cfee93bce 100644
--- a/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
@@ -1,13 +1,15 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
-  import { AnchorButton } from '@mathesar-component-library';
+
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
-  import ExplorationsList from './ExplorationsList.svelte';
+  import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
+  import { AnchorButton } from '@mathesar-component-library';
+
   import CreateNewExplorationTutorial from './CreateNewExplorationTutorial.svelte';
+  import ExplorationsList from './ExplorationsList.svelte';
 
   export let database: Database;
   export let schema: SchemaEntry;
diff --git a/mathesar_ui/src/pages/schema/SchemaOverview.svelte b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
index 3c541b383b..4385fc2de7 100644
--- a/mathesar_ui/src/pages/schema/SchemaOverview.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
@@ -1,24 +1,26 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
-  import { AnchorButton, Button } from '@mathesar-component-library';
-  import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
   import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import SpinnerButton from '@mathesar/component-library/spinner-button/SpinnerButton.svelte';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { iconRefresh } from '@mathesar/icons';
+  import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
   import { refetchQueriesForSchema } from '@mathesar/stores/queries';
   import { refetchTablesForSchema } from '@mathesar/stores/tables';
-  import SpinnerButton from '@mathesar/component-library/spinner-button/SpinnerButton.svelte';
-  import OverviewHeader from './OverviewHeader.svelte';
-  import TablesList from './TablesList.svelte';
-  import ExplorationsList from './ExplorationsList.svelte';
-  import CreateNewTableTutorial from './CreateNewTableTutorial.svelte';
+  import { AnchorButton, Button } from '@mathesar-component-library';
+
   import CreateNewExplorationTutorial from './CreateNewExplorationTutorial.svelte';
   import CreateNewTableButton from './CreateNewTableButton.svelte';
-  import TableSkeleton from './TableSkeleton.svelte';
+  import CreateNewTableTutorial from './CreateNewTableTutorial.svelte';
   import ExplorationSkeleton from './ExplorationSkeleton.svelte';
+  import ExplorationsList from './ExplorationsList.svelte';
+  import OverviewHeader from './OverviewHeader.svelte';
+  import TableSkeleton from './TableSkeleton.svelte';
+  import TablesList from './TablesList.svelte';
 
   export let tablesMap: Map<number, TableEntry>;
   export let explorationsMap: Map<number, QueryInstance>;
diff --git a/mathesar_ui/src/pages/schema/SchemaPage.svelte b/mathesar_ui/src/pages/schema/SchemaPage.svelte
index e27df7e865..fab522012b 100644
--- a/mathesar_ui/src/pages/schema/SchemaPage.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPage.svelte
@@ -1,31 +1,34 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
-  import { queries } from '@mathesar/stores/queries';
-  import {
-    tables as tablesStore,
-    importVerifiedTables as importVerifiedTablesStore,
-  } from '@mathesar/stores/tables';
-  import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
-  import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import AppSecondaryHeader from '@mathesar/components/AppSecondaryHeader.svelte';
-  import { iconSchema, iconEdit, iconManageAccess } from '@mathesar/icons';
-  import { modal } from '@mathesar/stores/modal';
-  import { Button, TabContainer, Icon } from '@mathesar-component-library';
+  import { iconEdit, iconManageAccess, iconSchema } from '@mathesar/icons';
+  import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
+  import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import {
     getSchemaPageExplorationsSectionUrl,
     getSchemaPageTablesSectionUrl,
     getSchemaPageUrl,
   } from '@mathesar/routes/urls';
+  import { modal } from '@mathesar/stores/modal';
+  import { queries } from '@mathesar/stores/queries';
+  import {
+    importVerifiedTables as importVerifiedTablesStore,
+    tables as tablesStore,
+  } from '@mathesar/stores/tables';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { logEvent } from '@mathesar/utils/telemetry';
+  import { Button, Icon, TabContainer } from '@mathesar-component-library';
+
   import AddEditSchemaModal from '../database/AddEditSchemaModal.svelte';
+
+  import ExplorationSkeleton from './ExplorationSkeleton.svelte';
+  import SchemaAccessControlModal from './SchemaAccessControlModal.svelte';
+  import SchemaExplorations from './SchemaExplorations.svelte';
   import SchemaOverview from './SchemaOverview.svelte';
   import SchemaTables from './SchemaTables.svelte';
-  import SchemaExplorations from './SchemaExplorations.svelte';
   import TableSkeleton from './TableSkeleton.svelte';
-  import ExplorationSkeleton from './ExplorationSkeleton.svelte';
-  import SchemaAccessControlModal from './SchemaAccessControlModal.svelte';
 
   export let database: Database;
   export let schema: SchemaEntry;
diff --git a/mathesar_ui/src/pages/schema/SchemaTables.svelte b/mathesar_ui/src/pages/schema/SchemaTables.svelte
index 9126aa29c6..a82ca506e9 100644
--- a/mathesar_ui/src/pages/schema/SchemaTables.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaTables.svelte
@@ -1,12 +1,14 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
-  import TablesList from './TablesList.svelte';
-  import CreateNewTableTutorial from './CreateNewTableTutorial.svelte';
+
   import CreateNewTableButton from './CreateNewTableButton.svelte';
+  import CreateNewTableTutorial from './CreateNewTableTutorial.svelte';
+  import TablesList from './TablesList.svelte';
 
   export let tablesMap: Map<number, TableEntry>;
 
diff --git a/mathesar_ui/src/pages/schema/TableCard.svelte b/mathesar_ui/src/pages/schema/TableCard.svelte
index ca7315ea42..727b1702e8 100644
--- a/mathesar_ui/src/pages/schema/TableCard.svelte
+++ b/mathesar_ui/src/pages/schema/TableCard.svelte
@@ -1,11 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import {
-    ButtonMenuItem,
-    DropdownMenu,
-    Icon,
-    Truncate,
-  } from '@mathesar-component-library';
+
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import LinkMenuItem from '@mathesar/component-library/menu/LinkMenuItem.svelte';
@@ -26,8 +21,15 @@
   import { deleteTable } from '@mathesar/stores/tables';
   import { createDataExplorerUrlToExploreATable } from '@mathesar/systems/data-explorer';
   import { getRecordSelectorFromContext } from '@mathesar/systems/record-selector/RecordSelectorController';
-  import { isTableImportConfirmationRequired } from '@mathesar/utils/tables';
   import TableDeleteConfirmationBody from '@mathesar/systems/table-view/table-inspector/table/TableDeleteConfirmationBody.svelte';
+  import { isTableImportConfirmationRequired } from '@mathesar/utils/tables';
+  import {
+    ButtonMenuItem,
+    DropdownMenu,
+    Icon,
+    Truncate,
+  } from '@mathesar-component-library';
+
   import EditTable from './EditTable.svelte';
 
   const recordSelector = getRecordSelectorFromContext();
diff --git a/mathesar_ui/src/pages/schema/TablesList.svelte b/mathesar_ui/src/pages/schema/TablesList.svelte
index 8007e90d83..1776506bbb 100644
--- a/mathesar_ui/src/pages/schema/TablesList.svelte
+++ b/mathesar_ui/src/pages/schema/TablesList.svelte
@@ -1,8 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import { iconTable } from '@mathesar/icons';
+
   import EmptyEntity from './EmptyEntity.svelte';
   import TableCard from './TableCard.svelte';
 
diff --git a/mathesar_ui/src/pages/table/TablePage.svelte b/mathesar_ui/src/pages/table/TablePage.svelte
index 050ec81961..6c12da00a9 100644
--- a/mathesar_ui/src/pages/table/TablePage.svelte
+++ b/mathesar_ui/src/pages/table/TablePage.svelte
@@ -2,17 +2,18 @@
   import { router } from 'tinro';
 
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
+  import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
   import {
-    setTabularDataStoreInContext,
-    TabularData,
     Meta,
+    TabularData,
+    setTabularDataStoreInContext,
   } from '@mathesar/stores/table-data';
-  import TableView from '@mathesar/systems/table-view/TableView.svelte';
   import ActionsPane from '@mathesar/systems/table-view/actions-pane/ActionsPane.svelte';
-  import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
-  import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
+  import TableView from '@mathesar/systems/table-view/TableView.svelte';
   import type { ShareConsumer } from '@mathesar/utils/shares';
+
   import { setNewImperativeFilterControllerInContext } from './ImperativeFilterController';
 
   const metaSerializationQueryKey = 'q';
diff --git a/mathesar_ui/src/pages/user-profile/ProfilePage.svelte b/mathesar_ui/src/pages/user-profile/ProfilePage.svelte
index 5fe4f6b586..1aeb20cb33 100644
--- a/mathesar_ui/src/pages/user-profile/ProfilePage.svelte
+++ b/mathesar_ui/src/pages/user-profile/ProfilePage.svelte
@@ -1,14 +1,15 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
-  import InsetPageLayout from '@mathesar/layouts/InsetPageLayout.svelte';
+
   import InsetPageSection from '@mathesar/components/InsetPageSection.svelte';
+  import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
+  import InsetPageLayout from '@mathesar/layouts/InsetPageLayout.svelte';
+  import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
+  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import {
-    UserDetailsForm,
     PasswordChangeForm,
+    UserDetailsForm,
   } from '@mathesar/systems/users-and-permissions';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
-  import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
 
   const userProfileStore = getUserProfileStoreFromContext();
 
diff --git a/mathesar_ui/src/routes/AdminRoute.svelte b/mathesar_ui/src/routes/AdminRoute.svelte
index 61cfee1c62..ed9ad6a965 100644
--- a/mathesar_ui/src/routes/AdminRoute.svelte
+++ b/mathesar_ui/src/routes/AdminRoute.svelte
@@ -1,13 +1,15 @@
 <script lang="ts">
-  import { Route } from 'tinro';
   import { _ } from 'svelte-i18n';
+  import { Route } from 'tinro';
+
   import AppSecondaryHeader from '@mathesar/components/AppSecondaryHeader.svelte';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import { iconSettingsMajor } from '@mathesar/icons';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
+  import PageLayoutWithSidebar from '@mathesar/layouts/PageLayoutWithSidebar.svelte';
   import SoftwareUpdate from '@mathesar/pages/admin-update/SoftwareUpdatePage.svelte';
   import AdminNavigation from '@mathesar/pages/admin-users/AdminNavigation.svelte';
-  import PageLayoutWithSidebar from '@mathesar/layouts/PageLayoutWithSidebar.svelte';
+
   import { ADMIN_UPDATE_PAGE_URL, ADMIN_URL } from './urls';
   import UsersRoute from './UsersRoute.svelte';
 </script>
diff --git a/mathesar_ui/src/routes/AnonymousAccessRoutes.svelte b/mathesar_ui/src/routes/AnonymousAccessRoutes.svelte
index a62230e9f8..093708b378 100644
--- a/mathesar_ui/src/routes/AnonymousAccessRoutes.svelte
+++ b/mathesar_ui/src/routes/AnonymousAccessRoutes.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
   import { Route } from 'tinro';
-  import SharedTableRoute from '@mathesar/routes/SharedTableRoute.svelte';
+
   import SharedExplorationRoute from '@mathesar/routes/SharedExplorationRoute.svelte';
+  import SharedTableRoute from '@mathesar/routes/SharedTableRoute.svelte';
 </script>
 
 <Route path="/tables/:slug/*" let:meta>
diff --git a/mathesar_ui/src/routes/AuthenticatedRoutes.svelte b/mathesar_ui/src/routes/AuthenticatedRoutes.svelte
index 549ef74987..30cd000f15 100644
--- a/mathesar_ui/src/routes/AuthenticatedRoutes.svelte
+++ b/mathesar_ui/src/routes/AuthenticatedRoutes.svelte
@@ -2,12 +2,13 @@
   import { Route } from 'tinro';
 
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
-  import WelcomePage from '@mathesar/pages/WelcomePage.svelte';
   import ConnectionsPage from '@mathesar/pages/connections/ConnectionsPage.svelte';
+  import WelcomePage from '@mathesar/pages/WelcomePage.svelte';
   import { CONNECTIONS_URL, getDatabasePageUrl } from '@mathesar/routes/urls';
   import { connectionsStore } from '@mathesar/stores/databases';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { mapExactlyOne } from '@mathesar/utils/iterUtils';
+
   import AdminRoute from './AdminRoute.svelte';
   import DatabaseRoute from './DatabaseRoute.svelte';
   import UserProfileRoute from './UserProfileRoute.svelte';
diff --git a/mathesar_ui/src/routes/DataExplorerRoute.svelte b/mathesar_ui/src/routes/DataExplorerRoute.svelte
index 83b4bab9b8..0bbd7b7f67 100644
--- a/mathesar_ui/src/routes/DataExplorerRoute.svelte
+++ b/mathesar_ui/src/routes/DataExplorerRoute.svelte
@@ -1,26 +1,27 @@
 <script lang="ts">
+  import { type Readable, readable } from 'svelte/store';
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
+
+  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
-  import {
-    QueryManager,
-    QueryModel,
-    constructQueryModelFromHash,
-  } from '@mathesar/systems/data-explorer';
-  import { getQuery } from '@mathesar/stores/queries';
-  import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
   import type { CancellablePromise } from '@mathesar/component-library';
-  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { UnsavedQueryInstance } from '@mathesar/stores/queries';
+  import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
+  import { iconEdit, iconExploration } from '@mathesar/icons';
   import DataExplorerPage from '@mathesar/pages/data-explorer/DataExplorerPage.svelte';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import {
     getDataExplorerPageUrl,
     getExplorationEditorPageUrl,
   } from '@mathesar/routes/urls';
-  import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
-  import { iconEdit, iconExploration } from '@mathesar/icons';
-  import { readable, type Readable } from 'svelte/store';
+  import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
+  import type { UnsavedQueryInstance } from '@mathesar/stores/queries';
+  import { getQuery } from '@mathesar/stores/queries';
+  import {
+    QueryManager,
+    QueryModel,
+    constructQueryModelFromHash,
+  } from '@mathesar/systems/data-explorer';
 
   export let database: Database;
   export let schema: SchemaEntry;
diff --git a/mathesar_ui/src/routes/DatabaseRoute.svelte b/mathesar_ui/src/routes/DatabaseRoute.svelte
index 1399e452ba..c6e7aab2a7 100644
--- a/mathesar_ui/src/routes/DatabaseRoute.svelte
+++ b/mathesar_ui/src/routes/DatabaseRoute.svelte
@@ -1,14 +1,16 @@
 <script lang="ts">
   import { onMount } from 'svelte';
-  import { Route } from 'tinro';
   import { _ } from 'svelte-i18n';
+  import { Route } from 'tinro';
+
+  import type { Connection } from '@mathesar/api/rest/connections';
+  import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import Identifier from '@mathesar/components/Identifier.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import DatabasePage from '@mathesar/pages/database/DatabasePage.svelte';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import { connectionsStore } from '@mathesar/stores/databases';
-  import type { Connection } from '@mathesar/api/rest/connections';
-  import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
+
   import SchemaRoute from './SchemaRoute.svelte';
 
   export let connectionId: Connection['id'];
diff --git a/mathesar_ui/src/routes/ExplorationRoute.svelte b/mathesar_ui/src/routes/ExplorationRoute.svelte
index 34fa8e93b6..cb973f1b57 100644
--- a/mathesar_ui/src/routes/ExplorationRoute.svelte
+++ b/mathesar_ui/src/routes/ExplorationRoute.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
+  import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import ExplorationPage from '@mathesar/pages/exploration/ExplorationPage.svelte';
   import { queries } from '@mathesar/stores/queries';
-  import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
 
   export let database: Database;
   export let schema: SchemaEntry;
diff --git a/mathesar_ui/src/routes/ImportRoute.svelte b/mathesar_ui/src/routes/ImportRoute.svelte
index bffdd2a569..3690eaa72e 100644
--- a/mathesar_ui/src/routes/ImportRoute.svelte
+++ b/mathesar_ui/src/routes/ImportRoute.svelte
@@ -1,11 +1,13 @@
 <script lang="ts">
-  import { Route } from 'tinro';
   import { _ } from 'svelte-i18n';
+  import { Route } from 'tinro';
+
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import { iconImportData } from '@mathesar/icons';
   import ImportPreviewPage from '@mathesar/pages/import/preview/ImportPreviewPage.svelte';
   import ImportUploadPage from '@mathesar/pages/import/upload/ImportUploadPage.svelte';
+
   import { getImportPageUrl, getImportPreviewPageQueryParams } from './urls';
 
   export let database: Database;
diff --git a/mathesar_ui/src/routes/RecordPageRoute.svelte b/mathesar_ui/src/routes/RecordPageRoute.svelte
index 8ff5c86a9c..650c26ce21 100644
--- a/mathesar_ui/src/routes/RecordPageRoute.svelte
+++ b/mathesar_ui/src/routes/RecordPageRoute.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-  import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
-  import RecordPage from '@mathesar/pages/record/RecordPage.svelte';
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
+  import RecordPage from '@mathesar/pages/record/RecordPage.svelte';
   import RecordStore from '@mathesar/pages/record/RecordStore';
 
   export let database: Database;
diff --git a/mathesar_ui/src/routes/RootRoute.svelte b/mathesar_ui/src/routes/RootRoute.svelte
index 584ba41d83..56cf138c13 100644
--- a/mathesar_ui/src/routes/RootRoute.svelte
+++ b/mathesar_ui/src/routes/RootRoute.svelte
@@ -1,11 +1,13 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
   import { Route } from 'tinro';
-  import type { CommonData } from '@mathesar/utils/preloadData';
-  import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
+
   import RouteObserver from '@mathesar/components/routing/RouteObserver.svelte';
-  import AuthenticatedRoutes from './AuthenticatedRoutes.svelte';
+  import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
+  import type { CommonData } from '@mathesar/utils/preloadData';
+
   import AnonymousAccessRoutes from './AnonymousAccessRoutes.svelte';
+  import AuthenticatedRoutes from './AuthenticatedRoutes.svelte';
 
   export let commonData: CommonData;
 </script>
diff --git a/mathesar_ui/src/routes/SchemaRoute.svelte b/mathesar_ui/src/routes/SchemaRoute.svelte
index ca6fcd8884..7096a66552 100644
--- a/mathesar_ui/src/routes/SchemaRoute.svelte
+++ b/mathesar_ui/src/routes/SchemaRoute.svelte
@@ -2,17 +2,19 @@
   import { onMount } from 'svelte';
   import { _ } from 'svelte-i18n';
   import { Route } from 'tinro';
+
   import type { Database } from '@mathesar/AppTypes';
+  import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
+  import MultiPathRoute from '@mathesar/components/routing/MultiPathRoute.svelte';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import SchemaPage from '@mathesar/pages/schema/SchemaPage.svelte';
   import { currentSchemaId, schemas } from '@mathesar/stores/schemas';
-  import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
-  import MultiPathRoute from '@mathesar/components/routing/MultiPathRoute.svelte';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
+
   import DataExplorerRoute from './DataExplorerRoute.svelte';
-  import TableRoute from './TableRoute.svelte';
-  import ImportRoute from './ImportRoute.svelte';
   import ExplorationRoute from './ExplorationRoute.svelte';
+  import ImportRoute from './ImportRoute.svelte';
+  import TableRoute from './TableRoute.svelte';
 
   const userProfile = getUserProfileStoreFromContext();
 
diff --git a/mathesar_ui/src/routes/SharedExplorationRoute.svelte b/mathesar_ui/src/routes/SharedExplorationRoute.svelte
index 75debc8207..8584a56025 100644
--- a/mathesar_ui/src/routes/SharedExplorationRoute.svelte
+++ b/mathesar_ui/src/routes/SharedExplorationRoute.svelte
@@ -1,12 +1,13 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
   import { Route } from 'tinro';
-  import { preloadRouteData } from '@mathesar/utils/preloadData';
+
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import ExplorationPage from '@mathesar/pages/exploration/ExplorationPage.svelte';
   import { currentDatabase } from '@mathesar/stores/databases';
-  import { currentSchema } from '@mathesar/stores/schemas';
   import { queries } from '@mathesar/stores/queries';
+  import { currentSchema } from '@mathesar/stores/schemas';
+  import { preloadRouteData } from '@mathesar/utils/preloadData';
   import { ShareConsumer } from '@mathesar/utils/shares';
 
   const routeSpecificData = preloadRouteData<{ query_id: number | null }>(
diff --git a/mathesar_ui/src/routes/SharedTableRoute.svelte b/mathesar_ui/src/routes/SharedTableRoute.svelte
index 3b7e3a2359..e8c7c33f82 100644
--- a/mathesar_ui/src/routes/SharedTableRoute.svelte
+++ b/mathesar_ui/src/routes/SharedTableRoute.svelte
@@ -2,10 +2,11 @@
   import { onMount } from 'svelte';
   import { _ } from 'svelte-i18n';
   import { Route } from 'tinro';
-  import { preloadRouteData } from '@mathesar/utils/preloadData';
+
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import TablePage from '@mathesar/pages/table/TablePage.svelte';
   import { currentTableId, tables } from '@mathesar/stores/tables';
+  import { preloadRouteData } from '@mathesar/utils/preloadData';
   import { ShareConsumer } from '@mathesar/utils/shares';
 
   const routeSpecificData = preloadRouteData<{ table_id: number | null }>(
diff --git a/mathesar_ui/src/routes/TableRoute.svelte b/mathesar_ui/src/routes/TableRoute.svelte
index 1311d604aa..21359c159b 100644
--- a/mathesar_ui/src/routes/TableRoute.svelte
+++ b/mathesar_ui/src/routes/TableRoute.svelte
@@ -2,11 +2,13 @@
   import { onMount } from 'svelte';
   import { _ } from 'svelte-i18n';
   import { Route } from 'tinro';
+
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import TablePage from '@mathesar/pages/table/TablePage.svelte';
   import { currentTableId, tables } from '@mathesar/stores/tables';
-  import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
+
   import RecordPageRoute from './RecordPageRoute.svelte';
 
   export let database: Database;
diff --git a/mathesar_ui/src/routes/UserProfileRoute.svelte b/mathesar_ui/src/routes/UserProfileRoute.svelte
index 0bce453efc..88603c6b0b 100644
--- a/mathesar_ui/src/routes/UserProfileRoute.svelte
+++ b/mathesar_ui/src/routes/UserProfileRoute.svelte
@@ -1,8 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import { iconUser } from '@mathesar/icons';
   import ProfilePage from '@mathesar/pages/user-profile/ProfilePage.svelte';
+
   import { USER_PROFILE_URL } from './urls';
 </script>
 
diff --git a/mathesar_ui/src/routes/UsersRoute.svelte b/mathesar_ui/src/routes/UsersRoute.svelte
index 84326672b5..623df34100 100644
--- a/mathesar_ui/src/routes/UsersRoute.svelte
+++ b/mathesar_ui/src/routes/UsersRoute.svelte
@@ -1,13 +1,14 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
   import { Route } from 'tinro';
-  import { iconMultipleUsers } from '@mathesar/icons';
+
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
-  import UserListingPage from '@mathesar/pages/admin-users/UserListingPage.svelte';
-  import NewUserPage from '@mathesar/pages/admin-users/NewUserPage.svelte';
+  import { iconMultipleUsers } from '@mathesar/icons';
   import EditUserPage from '@mathesar/pages/admin-users/EditUserPage.svelte';
-  import { setUsersStoreInContext } from '@mathesar/stores/users';
+  import NewUserPage from '@mathesar/pages/admin-users/NewUserPage.svelte';
+  import UserListingPage from '@mathesar/pages/admin-users/UserListingPage.svelte';
   import { ADMIN_USERS_PAGE_URL } from '@mathesar/routes/urls';
+  import { setUsersStoreInContext } from '@mathesar/stores/users';
 
   setUsersStoreInContext();
 </script>
diff --git a/mathesar_ui/src/stores/AsyncStore.ts b/mathesar_ui/src/stores/AsyncStore.ts
index 4dc2a98ec5..a21be3ae1d 100644
--- a/mathesar_ui/src/stores/AsyncStore.ts
+++ b/mathesar_ui/src/stores/AsyncStore.ts
@@ -1,16 +1,16 @@
 /* eslint-disable max-classes-per-file */
 
 import {
-  writable,
   type Readable,
-  type Writable,
   type Subscriber,
   type Unsubscriber,
+  type Writable,
   get,
+  writable,
 } from 'svelte/store';
 
-import type { CancellablePromise } from '@mathesar-component-library';
 import { getErrorMessage } from '@mathesar/utils/errors';
+import type { CancellablePromise } from '@mathesar-component-library';
 
 export type AsyncStoreSettlement<T, E> =
   | { state: 'resolved'; value: T }
diff --git a/mathesar_ui/src/stores/LocalStorageStore.ts b/mathesar_ui/src/stores/LocalStorageStore.ts
index b8297885ca..1042a758d4 100644
--- a/mathesar_ui/src/stores/LocalStorageStore.ts
+++ b/mathesar_ui/src/stores/LocalStorageStore.ts
@@ -1,8 +1,8 @@
 import {
-  writable,
   type Subscriber,
   type Unsubscriber,
   type Writable,
+  writable,
 } from 'svelte/store';
 
 interface Props<T> {
diff --git a/mathesar_ui/src/stores/abstract-types/abstractTypeCategories.ts b/mathesar_ui/src/stores/abstract-types/abstractTypeCategories.ts
index 9870bad9f3..9273d41abc 100644
--- a/mathesar_ui/src/stores/abstract-types/abstractTypeCategories.ts
+++ b/mathesar_ui/src/stores/abstract-types/abstractTypeCategories.ts
@@ -1,28 +1,29 @@
 import type { DbType } from '@mathesar/AppTypes';
+
 import { abstractTypeCategory } from './constants';
-import Text, { DB_TYPES as textDbTypes } from './type-configs/text';
-import Money from './type-configs/money';
-import Email from './type-configs/email';
-import Number from './type-configs/number';
 import Boolean from './type-configs/boolean';
-import Uri from './type-configs/uri';
-import Duration from './type-configs/duration';
+import arrayFactory from './type-configs/comboTypes/arrayFactory';
+import jsonArrayFactory from './type-configs/comboTypes/jsonArrayFactory';
+import jsonObjectFactory from './type-configs/comboTypes/jsonObjectFactory';
 import Date from './type-configs/date';
-import Time from './type-configs/time';
 import DateTime from './type-configs/datetime';
+import Duration from './type-configs/duration';
+import Email from './type-configs/email';
 import Fallback from './type-configs/fallback';
-import jsonArrayFactory from './type-configs/comboTypes/jsonArrayFactory';
-import jsonObjectFactory from './type-configs/comboTypes/jsonObjectFactory';
-import arrayFactory from './type-configs/comboTypes/arrayFactory';
+import Money from './type-configs/money';
+import Text, { DB_TYPES as textDbTypes } from './type-configs/text';
+import Number from './type-configs/number';
+import Time from './type-configs/time';
+import Uri from './type-configs/uri';
 import type {
   AbstractType,
-  AbstractTypesMap,
-  AbstractTypeResponse,
   AbstractTypeCategoryIdentifier,
-  AbstractTypeConfigurationPartialMap,
   AbstractTypeConfigurationFactory,
+  AbstractTypeConfigurationPartialMap,
+  AbstractTypeResponse,
+  AbstractTypesMap,
 } from './types';
-import { unknownAbstractType, identifyAbstractTypeForDbType } from './utils';
+import { identifyAbstractTypeForDbType, unknownAbstractType } from './utils';
 
 /**
  * This is meant to be serializable and replaced by an API
diff --git a/mathesar_ui/src/stores/abstract-types/operations/filtering.ts b/mathesar_ui/src/stores/abstract-types/operations/filtering.ts
index 58c33e20ef..7ced596907 100644
--- a/mathesar_ui/src/stores/abstract-types/operations/filtering.ts
+++ b/mathesar_ui/src/stores/abstract-types/operations/filtering.ts
@@ -1,9 +1,9 @@
 import { abstractTypeCategory } from '../constants';
 import type {
   AbstractTypeCategoryIdentifier,
-  AbstractTypeFilterDefinitionResponse,
-  AbstractTypeFilterDefinitionMap,
   AbstractTypeFilterDefinition,
+  AbstractTypeFilterDefinitionMap,
+  AbstractTypeFilterDefinitionResponse,
   AbstractTypeLimitedFilterInformation,
 } from '../types';
 
diff --git a/mathesar_ui/src/stores/abstract-types/operations/preprocFunctions.ts b/mathesar_ui/src/stores/abstract-types/operations/preprocFunctions.ts
index f8b4570b3f..ad2a03b6ba 100644
--- a/mathesar_ui/src/stores/abstract-types/operations/preprocFunctions.ts
+++ b/mathesar_ui/src/stores/abstract-types/operations/preprocFunctions.ts
@@ -1,9 +1,9 @@
 import { abstractTypeCategory } from '../constants';
 import type {
   AbstractTypeCategoryIdentifier,
-  AbstractTypePreprocFunctionsResponse,
   AbstractTypePreprocFunctionDefinition,
   AbstractTypePreprocFunctionDefinitionMap,
+  AbstractTypePreprocFunctionsResponse,
 } from '../types';
 
 const preprocFunctionsResponse: AbstractTypePreprocFunctionsResponse[] = [
diff --git a/mathesar_ui/src/stores/abstract-types/operations/summarization.ts b/mathesar_ui/src/stores/abstract-types/operations/summarization.ts
index 04094d83bf..90040f475e 100644
--- a/mathesar_ui/src/stores/abstract-types/operations/summarization.ts
+++ b/mathesar_ui/src/stores/abstract-types/operations/summarization.ts
@@ -1,4 +1,5 @@
 import { querySummarizationFunctionIds } from '@mathesar/api/rest/types/queries';
+
 import { abstractTypeCategory } from '../constants';
 import type {
   AbstractTypeCategoryIdentifier,
diff --git a/mathesar_ui/src/stores/abstract-types/store.ts b/mathesar_ui/src/stores/abstract-types/store.ts
index 2020d6d28d..71a0897b1c 100644
--- a/mathesar_ui/src/stores/abstract-types/store.ts
+++ b/mathesar_ui/src/stores/abstract-types/store.ts
@@ -1,11 +1,12 @@
 import type { Readable, Unsubscriber, Writable } from 'svelte/store';
 import { derived, get, writable } from 'svelte/store';
 
-import type { CancellablePromise } from '@mathesar-component-library';
 import type { Connection } from '@mathesar/api/rest/connections';
 import { States, getAPI } from '@mathesar/api/rest/utils/requestUtils';
 import { currentDatabase } from '@mathesar/stores/databases';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
+import type { CancellablePromise } from '@mathesar-component-library';
+
 import { constructAbstractTypeMapFromResponse } from './abstractTypeCategories';
 import type {
   AbstractTypeResponse,
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/boolean.ts b/mathesar_ui/src/stores/abstract-types/type-configs/boolean.ts
index 5d5a7c865f..730490ecc8 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/boolean.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/boolean.ts
@@ -1,9 +1,10 @@
-import type { FormValues } from '@mathesar-component-library/types';
 import type {
   BooleanDisplayOptions,
   Column,
 } from '@mathesar/api/rest/types/tables/columns';
 import { iconUiTypeBoolean } from '@mathesar/icons';
+import type { FormValues } from '@mathesar-component-library/types';
+
 import type {
   AbstractTypeConfigForm,
   AbstractTypeConfiguration,
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/comboTypes/arrayFactory.ts b/mathesar_ui/src/stores/abstract-types/type-configs/comboTypes/arrayFactory.ts
index f1e8f7c11d..3238fdfdc3 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/comboTypes/arrayFactory.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/comboTypes/arrayFactory.ts
@@ -1,5 +1,6 @@
-import { iconUiTypeArray } from '@mathesar/icons';
 import type { ArrayTypeOptions } from '@mathesar/api/rest/types/tables/columns';
+import { iconUiTypeArray } from '@mathesar/icons';
+
 import type { AbstractTypeConfigurationFactory } from '../../types';
 import { getAbstractTypeForDbType } from '../../utils';
 
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/comboTypes/jsonArrayFactory.ts b/mathesar_ui/src/stores/abstract-types/type-configs/comboTypes/jsonArrayFactory.ts
index 3fe26c76d6..ad7652078a 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/comboTypes/jsonArrayFactory.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/comboTypes/jsonArrayFactory.ts
@@ -1,4 +1,5 @@
 import { iconUiTypeJsonArray } from '@mathesar/icons';
+
 import type { AbstractTypeConfigurationFactory } from '../../types';
 
 const jsonArrayFactory: AbstractTypeConfigurationFactory = () => ({
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/comboTypes/jsonObjectFactory.ts b/mathesar_ui/src/stores/abstract-types/type-configs/comboTypes/jsonObjectFactory.ts
index e5ea7bf8ad..e17cbfa057 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/comboTypes/jsonObjectFactory.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/comboTypes/jsonObjectFactory.ts
@@ -1,4 +1,5 @@
 import { iconUiTypeJsonObject } from '@mathesar/icons';
+
 import type { AbstractTypeConfigurationFactory } from '../../types';
 
 const jsonObjectFactory: AbstractTypeConfigurationFactory = () => ({
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/date.ts b/mathesar_ui/src/stores/abstract-types/type-configs/date.ts
index 6086746ef1..b31d33175e 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/date.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/date.ts
@@ -1,14 +1,16 @@
-import type { FormValues } from '@mathesar-component-library/types';
 import type {
+  Column,
   DateDisplayOptions,
   DateFormat,
-  Column,
 } from '@mathesar/api/rest/types/tables/columns';
 import { iconUiTypeDate } from '@mathesar/icons';
+import type { FormValues } from '@mathesar-component-library/types';
+
 import type {
   AbstractTypeConfigForm,
   AbstractTypeConfiguration,
 } from '../types';
+
 import { getDateFormatOptions } from './utils';
 
 const displayForm: AbstractTypeConfigForm = {
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/datetime.ts b/mathesar_ui/src/stores/abstract-types/type-configs/datetime.ts
index 88a30ea5e6..43e1771aa6 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/datetime.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/datetime.ts
@@ -1,16 +1,18 @@
-import type { FormValues } from '@mathesar-component-library/types';
 import type {
-  TimeStampDisplayOptions,
-  TimeFormat,
-  DateFormat,
   Column,
+  DateFormat,
+  TimeFormat,
+  TimeStampDisplayOptions,
 } from '@mathesar/api/rest/types/tables/columns';
 import { iconUiTypeDateTime } from '@mathesar/icons';
+import type { FormValues } from '@mathesar-component-library/types';
+
 import type {
-  AbstractTypeDbConfig,
   AbstractTypeConfigForm,
   AbstractTypeConfiguration,
+  AbstractTypeDbConfig,
 } from '../types';
+
 import { getDateFormatOptions, getTimeFormatOptions } from './utils';
 
 const DB_TYPES = {
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/duration.ts b/mathesar_ui/src/stores/abstract-types/type-configs/duration.ts
index 616b7ed5a5..fc546fa12e 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/duration.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/duration.ts
@@ -1,10 +1,11 @@
-import type { FormValues } from '@mathesar-component-library/types';
 import type {
-  DurationDisplayOptions,
   Column,
+  DurationDisplayOptions,
 } from '@mathesar/api/rest/types/tables/columns';
 import { iconUiTypeDuration } from '@mathesar/icons';
 import { DurationSpecification } from '@mathesar/utils/duration';
+import type { FormValues } from '@mathesar-component-library/types';
+
 import type {
   AbstractTypeConfigForm,
   AbstractTypeConfiguration,
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/email.ts b/mathesar_ui/src/stores/abstract-types/type-configs/email.ts
index 60f5b79e63..d9a8485424 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/email.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/email.ts
@@ -1,4 +1,5 @@
 import { iconUiTypeEmail } from '@mathesar/icons';
+
 import type { AbstractTypeConfiguration } from '../types';
 
 const emailType: AbstractTypeConfiguration = {
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/fallback.ts b/mathesar_ui/src/stores/abstract-types/type-configs/fallback.ts
index 94af051336..c562bf429d 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/fallback.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/fallback.ts
@@ -1,4 +1,5 @@
 import { iconUiTypeUnknown } from '@mathesar/icons';
+
 import type { AbstractTypeConfiguration } from '../types';
 
 const fallbackType: AbstractTypeConfiguration = {
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/money.ts b/mathesar_ui/src/stores/abstract-types/type-configs/money.ts
index cc990f048f..83da2fb45b 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/money.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/money.ts
@@ -1,14 +1,16 @@
 import type {
+  Column,
   MoneyDisplayOptions,
   NumberFormat,
-  Column,
 } from '@mathesar/api/rest/types/tables/columns';
-import type { FormValues } from '@mathesar-component-library/types';
 import { iconUiTypeMoney } from '@mathesar/icons';
+import type { FormValues } from '@mathesar-component-library/types';
+
 import type {
   AbstractTypeConfigForm,
   AbstractTypeConfiguration,
 } from '../types';
+
 import { getDecimalPlaces } from './number';
 
 const DB_TYPES = {
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/number.ts b/mathesar_ui/src/stores/abstract-types/type-configs/number.ts
index c64b43ffa9..423b344e25 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/number.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/number.ts
@@ -1,11 +1,12 @@
 import type {
+  Column,
   NumberDisplayOptions,
   NumberFormat,
-  Column,
 } from '@mathesar/api/rest/types/tables/columns';
-import type { FormValues } from '@mathesar-component-library/types';
 import type { DbType } from '@mathesar/AppTypes';
 import { iconUiTypeNumber } from '@mathesar/icons';
+import type { FormValues } from '@mathesar-component-library/types';
+
 import type {
   AbstractTypeConfigForm,
   AbstractTypeConfiguration,
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/text.ts b/mathesar_ui/src/stores/abstract-types/type-configs/text.ts
index 702822bc09..fecf3c0b87 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/text.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/text.ts
@@ -1,8 +1,8 @@
-import type { FormValues } from '@mathesar-component-library/types';
-
-import type { DbType } from '@mathesar/AppTypes';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type { DbType } from '@mathesar/AppTypes';
 import { iconUiTypeText } from '@mathesar/icons';
+import type { FormValues } from '@mathesar-component-library/types';
+
 import type {
   AbstractTypeConfigForm,
   AbstractTypeConfiguration,
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/time.ts b/mathesar_ui/src/stores/abstract-types/type-configs/time.ts
index 4924c3dafa..8c0905dc44 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/time.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/time.ts
@@ -1,15 +1,17 @@
-import type { FormValues } from '@mathesar-component-library/types';
 import type {
+  Column,
   TimeDisplayOptions,
   TimeFormat,
-  Column,
 } from '@mathesar/api/rest/types/tables/columns';
 import { iconUiTypeTime } from '@mathesar/icons';
+import type { FormValues } from '@mathesar-component-library/types';
+
 import type {
-  AbstractTypeDbConfig,
   AbstractTypeConfigForm,
   AbstractTypeConfiguration,
+  AbstractTypeDbConfig,
 } from '../types';
+
 import { getTimeFormatOptions } from './utils';
 
 const DB_TYPES = {
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/uri.ts b/mathesar_ui/src/stores/abstract-types/type-configs/uri.ts
index 1b54058b3e..0245b23b19 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/uri.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/uri.ts
@@ -1,4 +1,5 @@
 import { iconUiTypeUri } from '@mathesar/icons';
+
 import type { AbstractTypeConfiguration } from '../types';
 
 const DB_TYPES = {
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/utils.ts b/mathesar_ui/src/stores/abstract-types/type-configs/utils.ts
index e01f60f4f1..bb3774db89 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/utils.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/utils.ts
@@ -1,9 +1,9 @@
-import { dayjs } from '@mathesar-component-library';
 import type {
   DateFormat,
   TimeFormat,
 } from '@mathesar/api/rest/types/tables/columns';
 import { DateTimeSpecification } from '@mathesar/utils/date-time';
+import { dayjs } from '@mathesar-component-library';
 
 export function getDateFormatOptions(): Record<DateFormat, { label: string }> {
   const day = dayjs('2001-12-31');
diff --git a/mathesar_ui/src/stores/abstract-types/types.ts b/mathesar_ui/src/stores/abstract-types/types.ts
index 8770702b74..c05a43ed8b 100644
--- a/mathesar_ui/src/stores/abstract-types/types.ts
+++ b/mathesar_ui/src/stores/abstract-types/types.ts
@@ -1,14 +1,15 @@
+import type { QuerySummarizationFunctionId } from '@mathesar/api/rest/types/queries';
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type { States } from '@mathesar/api/rest/utils/requestUtils';
+import type { DbType } from '@mathesar/AppTypes';
+import type { CellDataType } from '@mathesar/components/cell-fabric/data-types/typeDefinitions';
 import type {
   FormConfiguration,
   FormConfigurationVariable,
   FormValues,
   IconProps,
 } from '@mathesar-component-library/types';
-import type { DbType } from '@mathesar/AppTypes';
-import type { QuerySummarizationFunctionId } from '@mathesar/api/rest/types/queries';
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
-import type { States } from '@mathesar/api/rest/utils/requestUtils';
-import type { CellDataType } from '@mathesar/components/cell-fabric/data-types/typeDefinitions';
+
 import type { abstractTypeCategory } from './constants';
 
 type AbstractTypeCategoryKeys = keyof typeof abstractTypeCategory;
diff --git a/mathesar_ui/src/stores/abstract-types/utils.ts b/mathesar_ui/src/stores/abstract-types/utils.ts
index 057af22e76..09ef40fdd1 100644
--- a/mathesar_ui/src/stores/abstract-types/utils.ts
+++ b/mathesar_ui/src/stores/abstract-types/utils.ts
@@ -1,4 +1,5 @@
 import type { DbType } from '@mathesar/AppTypes';
+
 import Fallback from './type-configs/fallback';
 import type { AbstractType, AbstractTypesMap } from './types';
 
diff --git a/mathesar_ui/src/stores/clipboard.ts b/mathesar_ui/src/stores/clipboard.ts
index 868bc365d6..23b0c4fea3 100644
--- a/mathesar_ui/src/stores/clipboard.ts
+++ b/mathesar_ui/src/stores/clipboard.ts
@@ -1,5 +1,5 @@
 import { getContext, setContext } from 'svelte';
-import { writable, type Writable } from 'svelte/store';
+import { type Writable, writable } from 'svelte/store';
 
 export interface ClipboardHandler {
   handleCopy: (event: ClipboardEvent) => void;
diff --git a/mathesar_ui/src/stores/confirmation.ts b/mathesar_ui/src/stores/confirmation.ts
index d3013633e6..bbd5d17e7b 100644
--- a/mathesar_ui/src/stores/confirmation.ts
+++ b/mathesar_ui/src/stores/confirmation.ts
@@ -1,9 +1,11 @@
 import { get } from 'svelte/store';
 import { _ } from 'svelte-i18n';
-import type { ConfirmationProps } from '@mathesar-component-library';
-import { makeConfirm } from '@mathesar-component-library';
+
 import PhraseContainingIdentifier from '@mathesar/components/PhraseContainingIdentifier.svelte';
 import { iconDeleteMajor } from '@mathesar/icons';
+import type { ConfirmationProps } from '@mathesar-component-library';
+import { makeConfirm } from '@mathesar-component-library';
+
 import { modal } from './modal';
 import { toast } from './toast';
 
diff --git a/mathesar_ui/src/stores/databases.ts b/mathesar_ui/src/stores/databases.ts
index 115ae1a912..24c98cf5d2 100644
--- a/mathesar_ui/src/stores/databases.ts
+++ b/mathesar_ui/src/stores/databases.ts
@@ -1,11 +1,6 @@
 import { some } from 'iter-tools';
-import { derived, get, writable, type Readable } from 'svelte/store';
+import { type Readable, derived, get, writable } from 'svelte/store';
 
-import {
-  ImmutableMap,
-  WritableMap,
-  defined,
-} from '@mathesar-component-library';
 import connectionsApi, {
   type Connection,
   type CreateWithNewUserProps,
@@ -14,6 +9,11 @@ import connectionsApi, {
 import { api } from '@mathesar/api/rpc';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import type { MakeWritablePropertiesReadable } from '@mathesar/utils/typeUtils';
+import {
+  ImmutableMap,
+  WritableMap,
+  defined,
+} from '@mathesar-component-library';
 
 const commonData = preloadCommonData();
 
diff --git a/mathesar_ui/src/stores/queries.ts b/mathesar_ui/src/stores/queries.ts
index 439719906c..1aa0ed73d5 100644
--- a/mathesar_ui/src/stores/queries.ts
+++ b/mathesar_ui/src/stores/queries.ts
@@ -32,33 +32,34 @@
  * to having us use the currentSchemaId store directly.
  */
 
-import { derived, writable, get } from 'svelte/store';
-import type { Readable, Writable, Unsubscriber } from 'svelte/store';
+import type { Readable, Unsubscriber, Writable } from 'svelte/store';
+import { derived, get, writable } from 'svelte/store';
+
+import type {
+  QueryGetResponse,
+  QueryInstance,
+  QueryResultsResponse,
+  QueryRunRequest,
+  QueryRunResponse,
+} from '@mathesar/api/rest/types/queries';
+import type {
+  PaginatedResponse,
+  RequestStatus,
+} from '@mathesar/api/rest/utils/requestUtils';
 import {
+  addQueryParamsToUrl,
   deleteAPI,
   getAPI,
   postAPI,
   putAPI,
-  addQueryParamsToUrl,
 } from '@mathesar/api/rest/utils/requestUtils';
-import type {
-  RequestStatus,
-  PaginatedResponse,
-} from '@mathesar/api/rest/utils/requestUtils';
-import { preloadCommonData } from '@mathesar/utils/preloadData';
-import CacheManager from '@mathesar/utils/CacheManager';
 import type { SchemaEntry } from '@mathesar/AppTypes';
-import type {
-  QueryInstance,
-  QueryGetResponse,
-  QueryRunRequest,
-  QueryRunResponse,
-  QueryResultsResponse,
-} from '@mathesar/api/rest/types/queries';
-import { CancellablePromise } from '@mathesar-component-library';
+import CacheManager from '@mathesar/utils/CacheManager';
+import { preloadCommonData } from '@mathesar/utils/preloadData';
 import { SHARED_LINK_UUID_QUERY_PARAM } from '@mathesar/utils/shares';
+import { CancellablePromise } from '@mathesar-component-library';
 
-import { currentSchemaId, addCountToSchemaNumExplorations } from './schemas';
+import { addCountToSchemaNumExplorations, currentSchemaId } from './schemas';
 
 const commonData = preloadCommonData();
 
diff --git a/mathesar_ui/src/stores/releases.ts b/mathesar_ui/src/stores/releases.ts
index 4022d353e3..7502290a67 100644
--- a/mathesar_ui/src/stores/releases.ts
+++ b/mathesar_ui/src/stores/releases.ts
@@ -1,10 +1,11 @@
 import { getContext, setContext } from 'svelte';
 
 import {
-  gitHubReleases,
   type GitHubRelease,
+  gitHubReleases,
 } from '@mathesar/3rd-party-apis/github-releases';
 import { CachedFetchStore } from '@mathesar/utils/cachedFetchStore';
+
 import { LOCAL_STORAGE_KEYS } from './localStorage';
 
 export interface Release {
diff --git a/mathesar_ui/src/stores/schemas.ts b/mathesar_ui/src/stores/schemas.ts
index 3844cfb829..307264c838 100644
--- a/mathesar_ui/src/stores/schemas.ts
+++ b/mathesar_ui/src/stores/schemas.ts
@@ -1,15 +1,14 @@
-import { writable, derived, get } from 'svelte/store';
-import type { Writable, Readable, Unsubscriber } from 'svelte/store';
+import type { Readable, Unsubscriber, Writable } from 'svelte/store';
+import { derived, get, writable } from 'svelte/store';
 
-import { preloadCommonData } from '@mathesar/utils/preloadData';
+import type { Connection } from '@mathesar/api/rest/connections';
+import schemasApi from '@mathesar/api/rest/schemas';
 import type {
   PaginatedResponse,
   RequestStatus,
 } from '@mathesar/api/rest/utils/requestUtils';
-import schemasApi from '@mathesar/api/rest/schemas';
-import type { Connection } from '@mathesar/api/rest/connections';
-
 import type { SchemaEntry, SchemaResponse } from '@mathesar/AppTypes';
+import { preloadCommonData } from '@mathesar/utils/preloadData';
 import type { CancellablePromise } from '@mathesar-component-library';
 
 import { connectionsStore } from './databases';
diff --git a/mathesar_ui/src/stores/storeBasedUrls.ts b/mathesar_ui/src/stores/storeBasedUrls.ts
index dc9a4f7a0c..2ac9ba02a5 100644
--- a/mathesar_ui/src/stores/storeBasedUrls.ts
+++ b/mathesar_ui/src/stores/storeBasedUrls.ts
@@ -11,6 +11,7 @@
 import { derived } from 'svelte/store';
 
 import * as urls from '@mathesar/routes/urls';
+
 import { connectionsStore } from './databases';
 import { currentSchema } from './schemas';
 import { currentTable } from './tables';
diff --git a/mathesar_ui/src/stores/table-data/TableStructure.ts b/mathesar_ui/src/stores/table-data/TableStructure.ts
index c58693f047..0289a340c2 100644
--- a/mathesar_ui/src/stores/table-data/TableStructure.ts
+++ b/mathesar_ui/src/stores/table-data/TableStructure.ts
@@ -1,10 +1,11 @@
 import type { Readable } from 'svelte/store';
 import { derived } from 'svelte/store';
 
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import { States } from '@mathesar/api/rest/utils/requestUtils';
 import type { DBObjectEntry } from '@mathesar/AppTypes';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
-import { States } from '@mathesar/api/rest/utils/requestUtils';
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
+
 import { ColumnsDataStore } from './columns';
 import type { ConstraintsData } from './constraints';
 import { ConstraintsDataStore } from './constraints';
diff --git a/mathesar_ui/src/stores/table-data/__tests__/utils.test.ts b/mathesar_ui/src/stores/table-data/__tests__/utils.test.ts
index f0ca94a9ad..3bf48a8ca2 100644
--- a/mathesar_ui/src/stores/table-data/__tests__/utils.test.ts
+++ b/mathesar_ui/src/stores/table-data/__tests__/utils.test.ts
@@ -1,5 +1,6 @@
-import { ImmutableMap } from '@mathesar/component-library';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+import { ImmutableMap } from '@mathesar/component-library';
+
 import type { RowStatus } from '../meta';
 import type { CellKey, RowKey } from '../utils';
 import { ROW_HAS_CELL_ERROR_MSG, getRowStatus } from '../utils';
diff --git a/mathesar_ui/src/stores/table-data/columns.ts b/mathesar_ui/src/stores/table-data/columns.ts
index e91aeeec01..23774937a2 100644
--- a/mathesar_ui/src/stores/table-data/columns.ts
+++ b/mathesar_ui/src/stores/table-data/columns.ts
@@ -1,24 +1,25 @@
 import { type Readable, derived, writable } from 'svelte/store';
+
 import type { TableEntry } from '@mathesar/api/rest/types/tables';
-import {
-  type CancellablePromise,
-  EventHandler,
-  WritableSet,
-} from '@mathesar-component-library';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type {
   PaginatedResponse,
   RequestStatus,
 } from '@mathesar/api/rest/utils/requestUtils';
 import {
+  addQueryParamsToUrl,
   deleteAPI,
   getAPI,
   patchAPI,
   postAPI,
-  addQueryParamsToUrl,
 } from '@mathesar/api/rest/utils/requestUtils';
 import { getErrorMessage } from '@mathesar/utils/errors';
 import type { ShareConsumer } from '@mathesar/utils/shares';
+import {
+  type CancellablePromise,
+  EventHandler,
+  WritableSet,
+} from '@mathesar-component-library';
 
 function api(url: string) {
   return {
diff --git a/mathesar_ui/src/stores/table-data/constraints.ts b/mathesar_ui/src/stores/table-data/constraints.ts
index 7f2fa277fe..50ed5ec1e7 100644
--- a/mathesar_ui/src/stores/table-data/constraints.ts
+++ b/mathesar_ui/src/stores/table-data/constraints.ts
@@ -1,24 +1,25 @@
-import { writable, get as getStoreValue, derived } from 'svelte/store';
-import {
-  deleteAPI,
-  getAPI,
-  postAPI,
-  States,
-  addQueryParamsToUrl,
-} from '@mathesar/api/rest/utils/requestUtils';
 import type {
-  Writable,
-  Updater,
+  Readable,
   Subscriber,
   Unsubscriber,
-  Readable,
+  Updater,
+  Writable,
 } from 'svelte/store';
-import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
-import type { CancellablePromise } from '@mathesar-component-library';
+import { derived, get as getStoreValue, writable } from 'svelte/store';
+
 import type { TableEntry } from '@mathesar/api/rest/types/tables';
-import type { Constraint as ApiConstraint } from '@mathesar/api/rest/types/tables/constraints';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type { Constraint as ApiConstraint } from '@mathesar/api/rest/types/tables/constraints';
+import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
+import {
+  States,
+  addQueryParamsToUrl,
+  deleteAPI,
+  getAPI,
+  postAPI,
+} from '@mathesar/api/rest/utils/requestUtils';
 import type { ShareConsumer } from '@mathesar/utils/shares';
+import type { CancellablePromise } from '@mathesar-component-library';
 
 /**
  * When representing a constraint on the front end, we directly use the object
diff --git a/mathesar_ui/src/stores/table-data/constraintsUtils.ts b/mathesar_ui/src/stores/table-data/constraintsUtils.ts
index 536ecc74a4..31f616a838 100644
--- a/mathesar_ui/src/stores/table-data/constraintsUtils.ts
+++ b/mathesar_ui/src/stores/table-data/constraintsUtils.ts
@@ -1,8 +1,8 @@
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type {
   Constraint,
   FkConstraint,
 } from '@mathesar/api/rest/types/tables/constraints';
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
 
 export function constraintIsFk(c: Constraint): c is FkConstraint {
   return c.type === 'foreignkey';
diff --git a/mathesar_ui/src/stores/table-data/display.ts b/mathesar_ui/src/stores/table-data/display.ts
index 0a969e23db..c4e1426608 100644
--- a/mathesar_ui/src/stores/table-data/display.ts
+++ b/mathesar_ui/src/stores/table-data/display.ts
@@ -1,9 +1,11 @@
-import { writable, derived } from 'svelte/store';
-import type { Writable, Readable } from 'svelte/store';
+import type { Readable, Writable } from 'svelte/store';
+import { derived, writable } from 'svelte/store';
+
 import { WritableMap } from '@mathesar-component-library';
-import type { Meta } from './meta';
+
 import type { ColumnsDataStore } from './columns';
-import { type Row, type RecordsData, filterRecordRows } from './records';
+import type { Meta } from './meta';
+import { type RecordsData, type Row, filterRecordRows } from './records';
 
 // @deprecated
 export const DEFAULT_COLUMN_WIDTH = 160;
diff --git a/mathesar_ui/src/stores/table-data/filtering.ts b/mathesar_ui/src/stores/table-data/filtering.ts
index 3ec733bd62..e19881229f 100644
--- a/mathesar_ui/src/stores/table-data/filtering.ts
+++ b/mathesar_ui/src/stores/table-data/filtering.ts
@@ -1,8 +1,8 @@
 import type {
   FilterCombination,
-  GetRequestParams,
   FilterCondition,
   FilterConditionParams,
+  GetRequestParams,
 } from '@mathesar/api/rest/types/tables/records';
 
 export interface FilterEntry {
diff --git a/mathesar_ui/src/stores/table-data/meta.ts b/mathesar_ui/src/stores/table-data/meta.ts
index 2a269b1930..37cf8581ad 100644
--- a/mathesar_ui/src/stores/table-data/meta.ts
+++ b/mathesar_ui/src/stores/table-data/meta.ts
@@ -1,25 +1,26 @@
 import type { Readable, Writable } from 'svelte/store';
 import { derived, writable } from 'svelte/store';
 
+import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+import type { TersePagination } from '@mathesar/utils/Pagination';
+import Pagination from '@mathesar/utils/Pagination';
+import Url64 from '@mathesar/utils/Url64';
 import {
   ImmutableMap,
   ImmutableSet,
   WritableMap,
 } from '@mathesar-component-library';
-import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
-import type { TersePagination } from '@mathesar/utils/Pagination';
-import Pagination from '@mathesar/utils/Pagination';
-import Url64 from '@mathesar/utils/Url64';
+
 import type { TerseFiltering } from './filtering';
 import { Filtering } from './filtering';
 import type { TerseGrouping } from './grouping';
 import { Grouping } from './grouping';
 import type { RecordsRequestParamsData } from './records';
+import { SearchFuzzy } from './searchFuzzy';
 import type { TerseSorting } from './sorting';
 import { Sorting } from './sorting';
 import type { CellKey, RowKey } from './utils';
 import { extractRowKeyFromCellKey, getRowStatus, getSheetState } from './utils';
-import { SearchFuzzy } from './searchFuzzy';
 
 /**
  * Unlike in `RequestStatus`, here the state and the error messages are
diff --git a/mathesar_ui/src/stores/table-data/processedColumns.ts b/mathesar_ui/src/stores/table-data/processedColumns.ts
index c88aa4ae9e..dbd2978ec6 100644
--- a/mathesar_ui/src/stores/table-data/processedColumns.ts
+++ b/mathesar_ui/src/stores/table-data/processedColumns.ts
@@ -1,4 +1,5 @@
-import type { ComponentAndProps } from '@mathesar-component-library/types';
+import type { Readable } from 'svelte/store';
+
 import type { TableEntry } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { Constraint } from '@mathesar/api/rest/types/tables/constraints';
@@ -20,7 +21,8 @@ import type {
   AbstractTypePreprocFunctionDefinition,
   AbstractTypesMap,
 } from '@mathesar/stores/abstract-types/types';
-import type { Readable } from 'svelte/store';
+import type { ComponentAndProps } from '@mathesar-component-library/types';
+
 import { findFkConstraintsForColumn } from './constraintsUtils';
 import type { RecordSummariesForSheet } from './record-summaries/recordSummaryUtils';
 
diff --git a/mathesar_ui/src/stores/table-data/record-summaries/RecordSummaryStore.ts b/mathesar_ui/src/stores/table-data/record-summaries/RecordSummaryStore.ts
index 0af6c8755f..08e7a539a5 100644
--- a/mathesar_ui/src/stores/table-data/record-summaries/RecordSummaryStore.ts
+++ b/mathesar_ui/src/stores/table-data/record-summaries/RecordSummaryStore.ts
@@ -1,9 +1,10 @@
-import { derived, writable, type Readable, type Writable } from 'svelte/store';
+import { type Readable, type Writable, derived, writable } from 'svelte/store';
 
 import { ImmutableMap } from '@mathesar-component-library';
+
 import {
-  mergeRecordSummariesForSheet,
   type RecordSummariesForSheet,
+  mergeRecordSummariesForSheet,
 } from './recordSummaryUtils';
 
 /**
diff --git a/mathesar_ui/src/stores/table-data/record-summaries/__tests__/recordSummaryUtils.test.ts b/mathesar_ui/src/stores/table-data/record-summaries/__tests__/recordSummaryUtils.test.ts
index b4ea2ddbc4..064881cccc 100644
--- a/mathesar_ui/src/stores/table-data/record-summaries/__tests__/recordSummaryUtils.test.ts
+++ b/mathesar_ui/src/stores/table-data/record-summaries/__tests__/recordSummaryUtils.test.ts
@@ -1,9 +1,10 @@
 import { ImmutableMap } from '@mathesar-component-library';
+
 import {
+  type RecordSummariesForSheet,
   nullPlaceholder,
   prepareFieldsAsRecordSummaryInputData,
   renderTransitiveRecordSummary,
-  type RecordSummariesForSheet,
 } from '../recordSummaryUtils';
 
 describe('Record Summary', () => {
diff --git a/mathesar_ui/src/stores/table-data/record-summaries/recordSummaryUtils.ts b/mathesar_ui/src/stores/table-data/record-summaries/recordSummaryUtils.ts
index 89095ab100..445c2ac371 100644
--- a/mathesar_ui/src/stores/table-data/record-summaries/recordSummaryUtils.ts
+++ b/mathesar_ui/src/stores/table-data/record-summaries/recordSummaryUtils.ts
@@ -1,9 +1,9 @@
-import { ImmutableMap } from '@mathesar-component-library';
 import type {
   ApiDataForRecordSummariesInFkColumn,
   ApiRecordSummaryInputData,
 } from '@mathesar/api/rest/types/tables/records';
 import { escapeHtml } from '@mathesar/utils/stringUtils';
+import { ImmutableMap } from '@mathesar-component-library';
 
 /** A generalized type that can be used for Map or ImmutableMap or others. */
 interface LookerUpper<Key, Value> {
diff --git a/mathesar_ui/src/stores/table-data/records.ts b/mathesar_ui/src/stores/table-data/records.ts
index 30243572ad..e64ecd35cb 100644
--- a/mathesar_ui/src/stores/table-data/records.ts
+++ b/mathesar_ui/src/stores/table-data/records.ts
@@ -1,17 +1,12 @@
 import {
-  derived,
-  get,
-  writable,
   type Readable,
   type Unsubscriber,
   type Writable,
+  derived,
+  get,
+  writable,
 } from 'svelte/store';
 
-import {
-  getGloballyUniqueId,
-  isDefinedNonNullable,
-  type CancellablePromise,
-} from '@mathesar-component-library';
 import type { TableEntry } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type {
@@ -26,14 +21,20 @@ import {
   States,
   deleteAPI,
   getAPI,
+  getQueryStringFromParams,
   patchAPI,
   postAPI,
-  getQueryStringFromParams,
 } from '@mathesar/api/rest/utils/requestUtils';
-import type Pagination from '@mathesar/utils/Pagination';
 import { getErrorMessage } from '@mathesar/utils/errors';
 import { pluralize } from '@mathesar/utils/languageUtils';
+import type Pagination from '@mathesar/utils/Pagination';
 import type { ShareConsumer } from '@mathesar/utils/shares';
+import {
+  type CancellablePromise,
+  getGloballyUniqueId,
+  isDefinedNonNullable,
+} from '@mathesar-component-library';
+
 import type { ColumnsDataStore } from './columns';
 import type { Filtering } from './filtering';
 import type { Grouping as GroupingRequest } from './grouping';
diff --git a/mathesar_ui/src/stores/table-data/sorting.ts b/mathesar_ui/src/stores/table-data/sorting.ts
index 198444baaa..f133a5a8f2 100644
--- a/mathesar_ui/src/stores/table-data/sorting.ts
+++ b/mathesar_ui/src/stores/table-data/sorting.ts
@@ -1,13 +1,14 @@
-import { ImmutableMap } from '@mathesar-component-library';
-import {
-  type SortDirection,
-  allowedSortDirections,
-} from '@mathesar/components/sort-entry/utils';
 import type {
   SortDirection as ApiSortDirection,
   SortingEntry as ApiSortingEntry,
   GetRequestParams,
 } from '@mathesar/api/rest/types/tables/records';
+import {
+  type SortDirection,
+  allowedSortDirections,
+} from '@mathesar/components/sort-entry/utils';
+import { ImmutableMap } from '@mathesar-component-library';
+
 import type { Grouping } from './grouping';
 
 function sortDirectionIsValid(d: string): boolean {
diff --git a/mathesar_ui/src/stores/table-data/tabularData.ts b/mathesar_ui/src/stores/table-data/tabularData.ts
index 45f5e159c1..7be6ffe365 100644
--- a/mathesar_ui/src/stores/table-data/tabularData.ts
+++ b/mathesar_ui/src/stores/table-data/tabularData.ts
@@ -1,31 +1,33 @@
 import { getContext, setContext } from 'svelte';
 import {
-  derived,
-  writable,
-  get,
   type Readable,
   type Writable,
+  derived,
+  get,
+  writable,
 } from 'svelte/store';
-import type { DBObjectEntry } from '@mathesar/AppTypes';
+
 import type { TableEntry } from '@mathesar/api/rest/types/tables';
-import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
-import { States } from '@mathesar/api/rest/utils/requestUtils';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import { States } from '@mathesar/api/rest/utils/requestUtils';
+import type { DBObjectEntry } from '@mathesar/AppTypes';
 import { SheetSelection } from '@mathesar/components/sheet';
-import { getColumnOrder } from '@mathesar/utils/tables';
+import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
 import type { ShareConsumer } from '@mathesar/utils/shares';
-import { Meta } from './meta';
+import { getColumnOrder } from '@mathesar/utils/tables';
+
 import { ColumnsDataStore } from './columns';
-import type { RecordRow, TableRecordsData } from './records';
-import { RecordsData } from './records';
-import { Display } from './display';
 import type { ConstraintsData } from './constraints';
 import { ConstraintsDataStore } from './constraints';
+import { Display } from './display';
+import { Meta } from './meta';
 import type {
   ProcessedColumn,
   ProcessedColumnsStore,
 } from './processedColumns';
 import { processColumn } from './processedColumns';
+import type { RecordRow, TableRecordsData } from './records';
+import { RecordsData } from './records';
 
 export interface TabularDataProps {
   id: DBObjectEntry['id'];
diff --git a/mathesar_ui/src/stores/table-data/utils.ts b/mathesar_ui/src/stores/table-data/utils.ts
index 5a2ebe4989..7557f7f9c8 100644
--- a/mathesar_ui/src/stores/table-data/utils.ts
+++ b/mathesar_ui/src/stores/table-data/utils.ts
@@ -1,12 +1,14 @@
 import { concat } from 'iter-tools';
+
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+import { getMostImportantRequestStatusState } from '@mathesar/api/rest/utils/requestUtils';
 import {
   ImmutableMap,
   ImmutableSet,
   WritableMap,
 } from '@mathesar-component-library';
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
-import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
-import { getMostImportantRequestStatusState } from '@mathesar/api/rest/utils/requestUtils';
+
 import type { RowStatus } from './meta';
 import type { RecordRow } from './records';
 
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index f438163bff..047d37d183 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -16,20 +16,15 @@
 import type { Readable, Unsubscriber, Writable } from 'svelte/store';
 import { derived, get, writable } from 'svelte/store';
 
-import {
-  CancellablePromise,
-  type RecursivePartial,
-} from '@mathesar-component-library';
 import type {
   MinimalColumnDetails,
   TableEntry,
 } from '@mathesar/api/rest/types/tables';
+import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
 import type {
   SplitTableRequest,
   SplitTableResponse,
 } from '@mathesar/api/rest/types/tables/split_table';
-import type { DBObjectEntry, Database, SchemaEntry } from '@mathesar/AppTypes';
-import { invalidIf } from '@mathesar/components/form';
 import type {
   PaginatedResponse,
   RequestStatus,
@@ -40,11 +35,17 @@ import {
   patchAPI,
   postAPI,
 } from '@mathesar/api/rest/utils/requestUtils';
+import type { DBObjectEntry, Database, SchemaEntry } from '@mathesar/AppTypes';
+import { invalidIf } from '@mathesar/components/form';
+import type { AtLeastOne } from '@mathesar/typeUtils';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import { isTableImportConfirmationRequired } from '@mathesar/utils/tables';
-import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
-import type { AtLeastOne } from '@mathesar/typeUtils';
-import { currentSchemaId, addCountToSchemaNumTables } from './schemas';
+import {
+  CancellablePromise,
+  type RecursivePartial,
+} from '@mathesar-component-library';
+
+import { addCountToSchemaNumTables, currentSchemaId } from './schemas';
 
 const commonData = preloadCommonData();
 
diff --git a/mathesar_ui/src/stores/userProfile.ts b/mathesar_ui/src/stores/userProfile.ts
index bccca8acd3..4f9230609b 100644
--- a/mathesar_ui/src/stores/userProfile.ts
+++ b/mathesar_ui/src/stores/userProfile.ts
@@ -1,7 +1,8 @@
-import { setContext, getContext } from 'svelte';
-import { writable, type Writable } from 'svelte/store';
+import { getContext, setContext } from 'svelte';
+import { type Writable, writable } from 'svelte/store';
 
 import type { User } from '@mathesar/api/rest/users';
+
 import { UserModel } from './users';
 
 const contextKey = Symbol('UserProfileStore');
diff --git a/mathesar_ui/src/stores/users.ts b/mathesar_ui/src/stores/users.ts
index 20ef68ca6c..8609761322 100644
--- a/mathesar_ui/src/stores/users.ts
+++ b/mathesar_ui/src/stores/users.ts
@@ -1,22 +1,23 @@
 /* eslint-disable max-classes-per-file */
 
-import { setContext, getContext } from 'svelte';
-import { derived, get, writable, type Writable } from 'svelte/store';
+import { getContext, setContext } from 'svelte';
+import { type Writable, derived, get, writable } from 'svelte/store';
+
 import userApi, {
-  type User,
-  type UnsavedUser,
   type DatabaseRole,
   type SchemaRole,
+  type UnsavedUser,
+  type User,
   type UserRole,
 } from '@mathesar/api/rest/users';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
-import { getErrorMessage } from '@mathesar/utils/errors';
-import type { MakeWritablePropertiesReadable } from '@mathesar/utils/typeUtils';
 import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+import { getErrorMessage } from '@mathesar/utils/errors';
 import {
-  rolesAllowOperation,
   type AccessOperation,
+  rolesAllowOperation,
 } from '@mathesar/utils/permissions';
+import type { MakeWritablePropertiesReadable } from '@mathesar/utils/typeUtils';
 
 export class UserModel {
   readonly id: User['id'];
diff --git a/mathesar_ui/src/systems/connections/AddConnection.svelte b/mathesar_ui/src/systems/connections/AddConnection.svelte
index b96098343a..520731a0f2 100644
--- a/mathesar_ui/src/systems/connections/AddConnection.svelte
+++ b/mathesar_ui/src/systems/connections/AddConnection.svelte
@@ -3,18 +3,10 @@
   import { _ } from 'svelte-i18n';
 
   import {
-    CheckboxGroup,
-    NumberInput,
-    PasswordInput,
-    RadioGroup,
-    defined,
-    portalToWindowFooter,
-  } from '@mathesar-component-library';
-  import {
-    sampleDataOptions,
     type CommonCreationProps,
     type Connection,
     type SampleDataSchemaIdentifier,
+    sampleDataOptions,
   } from '@mathesar/api/rest/connections';
   import Checkbox from '@mathesar/component-library/checkbox/Checkbox.svelte';
   import LabeledInput from '@mathesar/component-library/labeled-input/LabeledInput.svelte';
@@ -35,6 +27,15 @@
   import { connectionsStore } from '@mathesar/stores/databases';
   import { toast } from '@mathesar/stores/toast';
   import { getAvailableName } from '@mathesar/utils/db';
+  import {
+    CheckboxGroup,
+    NumberInput,
+    PasswordInput,
+    RadioGroup,
+    defined,
+    portalToWindowFooter,
+  } from '@mathesar-component-library';
+
   import GeneralConnection from './GeneralConnection.svelte';
   import {
     generalConnections,
diff --git a/mathesar_ui/src/systems/connections/AddConnectionModal.svelte b/mathesar_ui/src/systems/connections/AddConnectionModal.svelte
index ff190ae2d0..dc52dfada4 100644
--- a/mathesar_ui/src/systems/connections/AddConnectionModal.svelte
+++ b/mathesar_ui/src/systems/connections/AddConnectionModal.svelte
@@ -2,12 +2,13 @@
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
 
+  import type { Connection } from '@mathesar/api/rest/connections';
+  import { getDatabasePageUrl } from '@mathesar/routes/urls';
   import {
     ControlledModal,
     type ModalController,
   } from '@mathesar-component-library';
-  import type { Connection } from '@mathesar/api/rest/connections';
-  import { getDatabasePageUrl } from '@mathesar/routes/urls';
+
   import AddConnection from './AddConnection.svelte';
 
   export let controller: ModalController;
diff --git a/mathesar_ui/src/systems/connections/ConnectionsEmptyState.svelte b/mathesar_ui/src/systems/connections/ConnectionsEmptyState.svelte
index d5b0c9c8b6..4d3e46497f 100644
--- a/mathesar_ui/src/systems/connections/ConnectionsEmptyState.svelte
+++ b/mathesar_ui/src/systems/connections/ConnectionsEmptyState.svelte
@@ -1,8 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { Tutorial, Icon, Button } from '@mathesar-component-library';
-  import { iconConnection, iconAddNew } from '@mathesar/icons';
+
+  import { iconAddNew, iconConnection } from '@mathesar/icons';
   import { modal } from '@mathesar/stores/modal';
+  import { Button, Icon, Tutorial } from '@mathesar-component-library';
+
   import AddConnectionModal from './AddConnectionModal.svelte';
 
   const addConnectionModalController = modal.spawnModalController();
diff --git a/mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte b/mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte
index fb4335b0ac..9525c5dccb 100644
--- a/mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte
+++ b/mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte
@@ -1,24 +1,25 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
-  import {
-    Checkbox,
-    ControlledModal,
-    LabeledInput,
-    ModalController,
-    CancelOrProceedButtonPair,
-  } from '@mathesar-component-library';
+
+  import type { Connection } from '@mathesar/api/rest/connections';
   import DocsLink from '@mathesar/components/DocsLink.svelte';
   import Identifier from '@mathesar/components/Identifier.svelte';
-  import RichText from '@mathesar/components/rich-text/RichText.svelte';
   import WarningBox from '@mathesar/components/message-boxes/WarningBox.svelte';
-  import type { Connection } from '@mathesar/api/rest/connections';
+  import RichText from '@mathesar/components/rich-text/RichText.svelte';
   import {
     connectionHasUniqueDatabaseReference,
     connectionsStore,
   } from '@mathesar/stores/databases';
   import { toast } from '@mathesar/stores/toast';
   import { getErrorMessage } from '@mathesar/utils/errors';
+  import {
+    CancelOrProceedButtonPair,
+    Checkbox,
+    ControlledModal,
+    LabeledInput,
+    ModalController,
+  } from '@mathesar-component-library';
 
   const { connections } = connectionsStore;
   const dispatch = createEventDispatcher<{ delete: undefined }>();
diff --git a/mathesar_ui/src/systems/connections/EditConnectionModal.svelte b/mathesar_ui/src/systems/connections/EditConnectionModal.svelte
index ebcae681f9..375ac95020 100644
--- a/mathesar_ui/src/systems/connections/EditConnectionModal.svelte
+++ b/mathesar_ui/src/systems/connections/EditConnectionModal.svelte
@@ -2,16 +2,9 @@
   import { map } from 'iter-tools';
   import { _ } from 'svelte-i18n';
 
-  import {
-    ControlledModal,
-    LabeledInput,
-    PasswordInput,
-    type ModalController,
-  } from '@mathesar-component-library';
   import type { Connection } from '@mathesar/api/rest/connections';
   import Checkbox from '@mathesar/component-library/checkbox/Checkbox.svelte';
   import TextInput from '@mathesar/component-library/text-input/TextInput.svelte';
-  import Identifier from '@mathesar/components/Identifier.svelte';
   import {
     Field,
     FieldLayout,
@@ -21,11 +14,18 @@
     requiredField,
     uniqueWith,
   } from '@mathesar/components/form';
+  import Identifier from '@mathesar/components/Identifier.svelte';
   import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import { connectionsStore } from '@mathesar/stores/databases';
   import { toast } from '@mathesar/stores/toast';
   import { getErrorMessage } from '@mathesar/utils/errors';
+  import {
+    ControlledModal,
+    LabeledInput,
+    type ModalController,
+    PasswordInput,
+  } from '@mathesar-component-library';
 
   export let controller: ModalController;
   export let connection: Connection;
diff --git a/mathesar_ui/src/systems/connections/GeneralConnection.svelte b/mathesar_ui/src/systems/connections/GeneralConnection.svelte
index c97587d6fd..1b6ae557b2 100644
--- a/mathesar_ui/src/systems/connections/GeneralConnection.svelte
+++ b/mathesar_ui/src/systems/connections/GeneralConnection.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import { getUsername, type GeneralConnection } from './generalConnections';
+  import { type GeneralConnection, getUsername } from './generalConnections';
 
   export let generalConnection: GeneralConnection;
 
diff --git a/mathesar_ui/src/systems/connections/generalConnections.ts b/mathesar_ui/src/systems/connections/generalConnections.ts
index 6530992bda..b33e2d7767 100644
--- a/mathesar_ui/src/systems/connections/generalConnections.ts
+++ b/mathesar_ui/src/systems/connections/generalConnections.ts
@@ -1,5 +1,5 @@
 import { map } from 'iter-tools';
-import { derived, type Readable } from 'svelte/store';
+import { type Readable, derived } from 'svelte/store';
 
 import type {
   Connection,
@@ -7,8 +7,8 @@ import type {
 } from '@mathesar/api/rest/connections';
 import { connectionsStore } from '@mathesar/stores/databases';
 import {
-  preloadCommonData,
   type CommonData,
+  preloadCommonData,
 } from '@mathesar/utils/preloadData';
 
 interface UserDatabaseConnection {
diff --git a/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte b/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
index 86155fb7a5..54ff4d47f2 100644
--- a/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
+++ b/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
@@ -1,32 +1,34 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
+
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import EntityPageHeader from '@mathesar/components/EntityPageHeader.svelte';
+  import ModificationStatus from '@mathesar/components/ModificationStatus.svelte';
+  import NameAndDescInputModalForm from '@mathesar/components/NameAndDescInputModalForm.svelte';
+  import SelectTableWithinCurrentSchema from '@mathesar/components/SelectTableWithinCurrentSchema.svelte';
+  import TableName from '@mathesar/components/TableName.svelte';
   import {
-    Icon,
-    InputGroup,
-    Button,
-    SpinnerButton,
-    DropdownMenu,
-    ButtonMenuItem,
-    iconExpandDown,
-    Help,
-  } from '@mathesar-component-library';
-  import {
+    iconExploration,
+    iconInspector,
     iconRedo,
     iconUndo,
-    iconInspector,
-    iconExploration,
   } from '@mathesar/icons';
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
-  import { tables as tablesDataStore } from '@mathesar/stores/tables';
-  import TableName from '@mathesar/components/TableName.svelte';
-  import SelectTableWithinCurrentSchema from '@mathesar/components/SelectTableWithinCurrentSchema.svelte';
-  import ModificationStatus from '@mathesar/components/ModificationStatus.svelte';
-  import EntityPageHeader from '@mathesar/components/EntityPageHeader.svelte';
-  import NameAndDescInputModalForm from '@mathesar/components/NameAndDescInputModalForm.svelte';
   import { modal } from '@mathesar/stores/modal';
-  import { toast } from '@mathesar/stores/toast';
   import { queries } from '@mathesar/stores/queries';
+  import { tables as tablesDataStore } from '@mathesar/stores/tables';
+  import { toast } from '@mathesar/stores/toast';
+  import {
+    Button,
+    ButtonMenuItem,
+    DropdownMenu,
+    Help,
+    Icon,
+    InputGroup,
+    SpinnerButton,
+    iconExpandDown,
+  } from '@mathesar-component-library';
+
   import type QueryManager from './QueryManager';
   import type { ColumnWithLink } from './utils';
 
diff --git a/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte b/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte
index 787fbdf4d6..a8118e14d0 100644
--- a/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte
+++ b/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte
@@ -1,11 +1,13 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { Tutorial } from '@mathesar-component-library';
+
   import { queries } from '@mathesar/stores/queries';
+  import { Tutorial } from '@mathesar-component-library';
+
   import ActionsPane from './ActionsPane.svelte';
-  import type QueryManager from './QueryManager';
   import { WithExplorationInspector } from './exploration-inspector';
   import WithInputSidebar from './input-sidebar/WithInputSidebar.svelte';
+  import type QueryManager from './QueryManager';
   import ResultPane from './result-pane/ResultPane.svelte';
   import type { ColumnWithLink } from './utils';
 
diff --git a/mathesar_ui/src/systems/data-explorer/QueryFilterTransformationModel.ts b/mathesar_ui/src/systems/data-explorer/QueryFilterTransformationModel.ts
index 2a04e65b01..c5ff2a1405 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryFilterTransformationModel.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryFilterTransformationModel.ts
@@ -1,8 +1,9 @@
-import { _ } from 'svelte-i18n';
 import { get } from 'svelte/store';
+import { _ } from 'svelte-i18n';
+
 import type { QueryInstanceFilterTransformation } from '@mathesar/api/rest/types/queries';
-import { getLimitedFilterInformationById } from '@mathesar/stores/abstract-types';
 import { validateFilterEntry } from '@mathesar/components/filter-entry';
+import { getLimitedFilterInformationById } from '@mathesar/stores/abstract-types';
 
 export interface QueryFilterTransformationEntry {
   columnIdentifier: string;
diff --git a/mathesar_ui/src/systems/data-explorer/QueryHideTransformationModel.ts b/mathesar_ui/src/systems/data-explorer/QueryHideTransformationModel.ts
index 5cebcd9e42..b8c856d510 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryHideTransformationModel.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryHideTransformationModel.ts
@@ -1,5 +1,6 @@
-import { _ } from 'svelte-i18n';
 import { get } from 'svelte/store';
+import { _ } from 'svelte-i18n';
+
 import type { QueryInstanceHideTransformation } from '@mathesar/api/rest/types/queries';
 
 export interface QueryHideTransformationEntry {
diff --git a/mathesar_ui/src/systems/data-explorer/QueryInspector.ts b/mathesar_ui/src/systems/data-explorer/QueryInspector.ts
index b99067a771..12cfea051b 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryInspector.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryInspector.ts
@@ -1,12 +1,14 @@
 import {
-  derived,
-  writable,
-  get,
   type Readable,
   type Writable,
+  derived,
+  get,
+  writable,
 } from 'svelte/store';
 import { _ } from 'svelte-i18n';
+
 import type { Tab } from '@mathesar-component-library/types';
+
 import type QueryModel from './QueryModel';
 
 export default class QueryInspector {
diff --git a/mathesar_ui/src/systems/data-explorer/QueryManager.ts b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
index e6cef2e250..cb97856185 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryManager.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
@@ -1,30 +1,32 @@
-import { get, writable } from 'svelte/store';
 import type { Writable } from 'svelte/store';
+import { get, writable } from 'svelte/store';
 import { _ } from 'svelte-i18n';
-import type { CancellablePromise } from '@mathesar-component-library';
-import { getAPI } from '@mathesar/api/rest/utils/requestUtils';
-import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
-import CacheManager from '@mathesar/utils/CacheManager';
+
 import type {
   QueryInstance,
   QueryRunResponse,
 } from '@mathesar/api/rest/types/queries';
 import type { TableEntry } from '@mathesar/api/rest/types/tables';
 import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
+import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+import { getAPI } from '@mathesar/api/rest/utils/requestUtils';
+import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
 import { createQuery, putQuery } from '@mathesar/stores/queries';
 import { getTable } from '@mathesar/stores/tables';
-import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
-import QueryModel from './QueryModel';
+import CacheManager from '@mathesar/utils/CacheManager';
+import type { CancellablePromise } from '@mathesar-component-library';
+
 import type { QueryModelUpdateDiff } from './QueryModel';
+import QueryModel from './QueryModel';
+import QueryRunner from './QueryRunner';
+import QuerySummarizationTransformationModel from './QuerySummarizationTransformationModel';
 import QueryUndoRedoManager from './QueryUndoRedoManager';
+import type { InputColumnsStoreSubstance } from './utils';
 import {
-  getTablesThatReferenceBaseTable,
   getBaseTableColumnsWithLinks,
   getColumnInformationMap,
+  getTablesThatReferenceBaseTable,
 } from './utils';
-import type { InputColumnsStoreSubstance } from './utils';
-import QueryRunner from './QueryRunner';
-import QuerySummarizationTransformationModel from './QuerySummarizationTransformationModel';
 
 export default class QueryManager extends QueryRunner {
   private undoRedoManager: QueryUndoRedoManager;
diff --git a/mathesar_ui/src/systems/data-explorer/QueryModel.ts b/mathesar_ui/src/systems/data-explorer/QueryModel.ts
index 502cab3deb..6ba32d2173 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryModel.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryModel.ts
@@ -1,15 +1,16 @@
 import type {
+  QueryInstance,
   QueryInstanceInitialColumn,
   QueryInstanceTransformation,
-  QueryInstance,
   QueryRunRequest,
 } from '@mathesar/api/rest/types/queries';
-import { MissingExhaustiveConditionError } from '@mathesar/utils/errors';
 import type { UnsavedQueryInstance } from '@mathesar/stores/queries';
+import { MissingExhaustiveConditionError } from '@mathesar/utils/errors';
+
 import QueryFilterTransformationModel from './QueryFilterTransformationModel';
-import QuerySummarizationTransformationModel from './QuerySummarizationTransformationModel';
 import QueryHideTransformationModel from './QueryHideTransformationModel';
 import QuerySortTransformationModel from './QuerySortTransformationModel';
+import QuerySummarizationTransformationModel from './QuerySummarizationTransformationModel';
 
 export interface QueryModelUpdateDiff {
   model: QueryModel;
diff --git a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
index a3b43c4cec..cd9ec9fa04 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
@@ -1,29 +1,31 @@
-import { get, writable } from 'svelte/store';
 import type { Writable } from 'svelte/store';
-import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
-import { ApiMultiError } from '@mathesar/api/rest/utils/errors';
-import { ImmutableMap, CancellablePromise } from '@mathesar-component-library';
-import Pagination from '@mathesar/utils/Pagination';
+import { get, writable } from 'svelte/store';
+
 import type {
+  QueryColumnMetaData,
   QueryResultRecord,
-  QueryRunResponse,
   QueryResultsResponse,
-  QueryColumnMetaData,
+  QueryRunResponse,
 } from '@mathesar/api/rest/types/queries';
-import { runQuery, fetchQueryResults } from '@mathesar/stores/queries';
+import { ApiMultiError } from '@mathesar/api/rest/utils/errors';
+import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { SheetSelection } from '@mathesar/components/sheet';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
+import { fetchQueryResults, runQuery } from '@mathesar/stores/queries';
+import Pagination from '@mathesar/utils/Pagination';
 import type { ShareConsumer } from '@mathesar/utils/shares';
-import type QueryModel from './QueryModel';
+import { CancellablePromise, ImmutableMap } from '@mathesar-component-library';
+
 import QueryInspector from './QueryInspector';
+import type QueryModel from './QueryModel';
 import {
-  processColumnMetaData,
-  getProcessedOutputColumns,
-  speculateColumnMetaData,
+  type InputColumnsStoreSubstance,
   type ProcessedQueryOutputColumn,
-  type ProcessedQueryResultColumnMap,
   type ProcessedQueryOutputColumnMap,
-  type InputColumnsStoreSubstance,
+  type ProcessedQueryResultColumnMap,
+  getProcessedOutputColumns,
+  processColumnMetaData,
+  speculateColumnMetaData,
 } from './utils';
 
 export interface QueryRow {
diff --git a/mathesar_ui/src/systems/data-explorer/QuerySortTransformationModel.ts b/mathesar_ui/src/systems/data-explorer/QuerySortTransformationModel.ts
index 2c02f82e4f..53142f20fa 100644
--- a/mathesar_ui/src/systems/data-explorer/QuerySortTransformationModel.ts
+++ b/mathesar_ui/src/systems/data-explorer/QuerySortTransformationModel.ts
@@ -1,5 +1,6 @@
-import { _ } from 'svelte-i18n';
 import { get } from 'svelte/store';
+import { _ } from 'svelte-i18n';
+
 import type { QueryInstanceSortTransformation } from '@mathesar/api/rest/types/queries';
 import type { SortDirection } from '@mathesar/components/sort-entry/utils';
 
diff --git a/mathesar_ui/src/systems/data-explorer/QuerySummarizationTransformationModel.ts b/mathesar_ui/src/systems/data-explorer/QuerySummarizationTransformationModel.ts
index c49c48a6d3..0c3c8fab22 100644
--- a/mathesar_ui/src/systems/data-explorer/QuerySummarizationTransformationModel.ts
+++ b/mathesar_ui/src/systems/data-explorer/QuerySummarizationTransformationModel.ts
@@ -1,10 +1,11 @@
-import { _ } from 'svelte-i18n';
 import { get } from 'svelte/store';
-import { ImmutableMap } from '@mathesar-component-library';
+import { _ } from 'svelte-i18n';
+
 import type {
   QueryInstanceSummarizationTransformation,
   QuerySummarizationFunctionId,
 } from '@mathesar/api/rest/types/queries';
+import { ImmutableMap } from '@mathesar-component-library';
 
 export interface QuerySummarizationAggregationEntry {
   inputAlias: string;
diff --git a/mathesar_ui/src/systems/data-explorer/QueryUndoRedoManager.ts b/mathesar_ui/src/systems/data-explorer/QueryUndoRedoManager.ts
index 26b8fe85d6..fe49bac2d9 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryUndoRedoManager.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryUndoRedoManager.ts
@@ -1,4 +1,5 @@
 import type { UnsavedQueryInstance } from '@mathesar/stores/queries';
+
 import QueryListEntry from './QueryListEntry';
 import QueryModel from './QueryModel';
 
diff --git a/mathesar_ui/src/systems/data-explorer/__tests__/utils.test.ts b/mathesar_ui/src/systems/data-explorer/__tests__/utils.test.ts
index 2da445b5c0..66a77a0535 100644
--- a/mathesar_ui/src/systems/data-explorer/__tests__/utils.test.ts
+++ b/mathesar_ui/src/systems/data-explorer/__tests__/utils.test.ts
@@ -1,17 +1,18 @@
+import { getLinkFromColumn } from '../utils';
+
 import {
-  checkoutsJoinableTables,
   CheckoutsPkColumnId,
-  checkoutsLinkTreeFromItems,
-  selfRefTableJoinableTables,
   SelfRefTableFkColumnId,
-  selfRefTableLinkTree,
+  checkoutsJoinableTables,
+  checkoutsLinkTreeFromItems,
   groupTable,
-  groupTablePerson1ColumnId,
-  groupTablePerson2ColumnId,
   groupTableLinkTreeFromPerson1,
   groupTableLinkTreeFromPerson2,
+  groupTablePerson1ColumnId,
+  groupTablePerson2ColumnId,
+  selfRefTableJoinableTables,
+  selfRefTableLinkTree,
 } from './mockData';
-import { getLinkFromColumn } from '../utils';
 
 vi.mock('@mathesar/utils/preloadData', () => ({
   preloadCommonData: () => ({
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/CellTab.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/CellTab.svelte
index a6a38a4f3b..eb4a77de4b 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/CellTab.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/CellTab.svelte
@@ -8,7 +8,9 @@
    * changes to both files as necessary.
    */
   import { _ } from 'svelte-i18n';
+
   import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
+
   import type QueryRunner from '../QueryRunner';
 
   export let queryHandler: QueryRunner;
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte
index 6ef0dd00e8..cb2daab392 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte
@@ -1,10 +1,12 @@
 <script lang="ts">
   import { TabContainer } from '@mathesar-component-library';
-  import type QueryRunner from '../QueryRunner';
+
   import type QueryManager from '../QueryManager';
-  import ExplorationTab from './ExplorationTab.svelte';
-  import ColumnTab from './column-tab/ColumnTab.svelte';
+  import type QueryRunner from '../QueryRunner';
+
   import CellTab from './CellTab.svelte';
+  import ColumnTab from './column-tab/ColumnTab.svelte';
+  import ExplorationTab from './ExplorationTab.svelte';
 
   export let queryHandler: QueryRunner | QueryManager;
   export let canEditMetadata: boolean;
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte
index df94f617de..e6001b2a66 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte
@@ -1,25 +1,27 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
+
+  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+  import Form from '@mathesar/components/Form.svelte';
+  import FormField from '@mathesar/components/FormField.svelte';
+  import { iconDeleteMajor } from '@mathesar/icons';
+  import { confirmDelete } from '@mathesar/stores/confirmation';
+  import { deleteQuery, putQuery, queries } from '@mathesar/stores/queries';
+  import { toast } from '@mathesar/stores/toast';
+  import { getAvailableName } from '@mathesar/utils/db';
   import {
+    Button,
+    CancelOrProceedButtonPair,
     Collapsible,
+    Icon,
     LabeledInput,
-    TextInput,
     TextArea,
-    CancelOrProceedButtonPair,
-    Button,
-    Icon,
+    TextInput,
   } from '@mathesar-component-library';
-  import { iconDeleteMajor } from '@mathesar/icons';
-  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import { queries, putQuery, deleteQuery } from '@mathesar/stores/queries';
-  import { confirmDelete } from '@mathesar/stores/confirmation';
-  import { getAvailableName } from '@mathesar/utils/db';
-  import Form from '@mathesar/components/Form.svelte';
-  import FormField from '@mathesar/components/FormField.svelte';
-  import { toast } from '@mathesar/stores/toast';
-  import type QueryRunner from '../QueryRunner';
+
   import QueryManager from '../QueryManager';
+  import type QueryRunner from '../QueryRunner';
 
   const dispatch = createEventDispatcher();
 
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/WithExplorationInspector.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/WithExplorationInspector.svelte
index 3b8bbff579..b03250fb52 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/WithExplorationInspector.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/WithExplorationInspector.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
-  import { WithPanel } from '@mathesar-component-library';
   import { dataExplorerRightSidebarWidth } from '@mathesar/stores/localStorage';
   import type QueryManager from '@mathesar/systems/data-explorer/QueryManager';
   import type QueryRunner from '@mathesar/systems/data-explorer/QueryRunner';
+  import { WithPanel } from '@mathesar-component-library';
+
   import ExplorationInspector from './ExplorationInspector.svelte';
 
   export let isInspectorOpen: boolean;
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/ColumnSource.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/ColumnSource.svelte
index 5116ebd708..fd3cec1810 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/ColumnSource.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/ColumnSource.svelte
@@ -1,8 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import TableName from '@mathesar/components/TableName.svelte';
+
   import ColumnName from '@mathesar/components/column/ColumnName.svelte';
   import { RichText } from '@mathesar/components/rich-text';
+  import TableName from '@mathesar/components/TableName.svelte';
+
   import type {
     ProcessedQueryResultColumn,
     ProcessedQueryResultColumnMap,
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/ColumnTab.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/ColumnTab.svelte
index 95ef4ce52e..c64ad21a42 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/ColumnTab.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/ColumnTab.svelte
@@ -1,13 +1,16 @@
 <script lang="ts">
   import { onDestroy } from 'svelte';
   import { _ } from 'svelte-i18n';
+
   import {
     Collapsible,
     LabeledInput,
     TextInput,
   } from '@mathesar-component-library';
-  import type QueryRunner from '../../QueryRunner';
+
   import QueryManager from '../../QueryManager';
+  import type QueryRunner from '../../QueryRunner';
+
   import ColumnSource from './ColumnSource.svelte';
   import DeleteColumnAction from './DeleteColumnAction.svelte';
 
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/DeleteColumnAction.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/DeleteColumnAction.svelte
index 4418d512e2..4f276fc5b2 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/DeleteColumnAction.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/DeleteColumnAction.svelte
@@ -1,8 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { Collapsible, Button, Icon } from '@mathesar-component-library';
+
   import WarningBox from '@mathesar/components/message-boxes/WarningBox.svelte';
   import { iconDeleteMajor } from '@mathesar/icons';
+  import { Button, Collapsible, Icon } from '@mathesar-component-library';
+
   import type QueryManager from '../../QueryManager';
   import type { ProcessedQueryOutputColumn } from '../../utils';
 
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/InputSidebar.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/InputSidebar.svelte
index 87ba93f72a..6c8c100e96 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/InputSidebar.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/InputSidebar.svelte
@@ -1,15 +1,18 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { TabContainer, Spinner } from '@mathesar-component-library';
-  import { getAvailableName } from '@mathesar/utils/db';
-  import { confirm } from '@mathesar/stores/confirmation';
+
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import PhraseContainingIdentifier from '@mathesar/components/PhraseContainingIdentifier.svelte';
-  import ColumnSelectionPane from './column-selection-pane/ColumnSelectionPane.svelte';
-  import TransformationsPane from './transformations-pane/TransformationsPane.svelte';
+  import { confirm } from '@mathesar/stores/confirmation';
+  import { getAvailableName } from '@mathesar/utils/db';
+  import { Spinner, TabContainer } from '@mathesar-component-library';
+
   import type QueryManager from '../QueryManager';
   import type { ColumnWithLink } from '../utils';
 
+  import ColumnSelectionPane from './column-selection-pane/ColumnSelectionPane.svelte';
+  import TransformationsPane from './transformations-pane/TransformationsPane.svelte';
+
   export let queryManager: QueryManager;
   export let linkCollapsibleOpenState: Record<ColumnWithLink['id'], boolean> =
     {};
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/WithInputSidebar.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/WithInputSidebar.svelte
index 67ffe47659..7a4b0f0024 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/WithInputSidebar.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/WithInputSidebar.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
-  import { WithPanel } from '@mathesar-component-library';
   import { dataExplorerLeftSidebarWidth } from '@mathesar/stores/localStorage';
   import type QueryManager from '@mathesar/systems/data-explorer/QueryManager';
   import type { ColumnWithLink } from '@mathesar/systems/data-explorer/utils';
+  import { WithPanel } from '@mathesar-component-library';
+
   import InputSidebar from './InputSidebar.svelte';
 
   export let queryManager: QueryManager;
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/ColumnSelectionPane.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/ColumnSelectionPane.svelte
index 3dbf5b6fc6..840729598d 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/ColumnSelectionPane.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/ColumnSelectionPane.svelte
@@ -1,11 +1,14 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import SelectableColumnTree from './SelectableColumnTree.svelte';
-  import SelectableColumn from './SelectableColumn.svelte';
+
   import type QueryManager from '../../QueryManager';
-  import TableGroupCollapsible from './TableGroupCollapsible.svelte';
   import type { ColumnWithLink } from '../../utils';
 
+  import SelectableColumn from './SelectableColumn.svelte';
+  import SelectableColumnTree from './SelectableColumnTree.svelte';
+  import TableGroupCollapsible from './TableGroupCollapsible.svelte';
+
+
   export let queryManager: QueryManager;
   export let linkCollapsibleOpenState: Record<ColumnWithLink['id'], boolean> =
     {};
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/SelectableColumn.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/SelectableColumn.svelte
index 4ef1480dfc..7edfc29be2 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/SelectableColumn.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/SelectableColumn.svelte
@@ -1,8 +1,10 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
-  import { Button, Badge, Tooltip } from '@mathesar-component-library';
+
   import ColumnName from '@mathesar/components/column/ColumnName.svelte';
+  import { Badge, Button, Tooltip } from '@mathesar-component-library';
+
   import type { ColumnWithLink } from '../../utils';
 
   const dispatch = createEventDispatcher();
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/SelectableColumnTree.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/SelectableColumnTree.svelte
index ea9d4529c0..0222009b9f 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/SelectableColumnTree.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/SelectableColumnTree.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
   import type { Writable } from 'svelte/store';
+
+  import type QueryModel from '../../QueryModel';
   import type { ColumnWithLink } from '../../utils';
+
   import SelectableColumn from './SelectableColumn.svelte';
   import TableGroupCollapsible from './TableGroupCollapsible.svelte';
-  import type QueryModel from '../../QueryModel';
 
   export let query: Writable<QueryModel>;
   export let linkCollapsibleOpenState: Record<ColumnWithLink['id'], boolean> =
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/TableGroupCollapsible.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/TableGroupCollapsible.svelte
index fab4205d83..dca5501788 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/TableGroupCollapsible.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/TableGroupCollapsible.svelte
@@ -1,13 +1,15 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
+  import TableName from '@mathesar/components/TableName.svelte';
   import {
+    Button,
     Collapsible,
     Icon,
-    Button,
-    iconExpandDown,
     Truncate,
+    iconExpandDown,
   } from '@mathesar-component-library';
-  import TableName from '@mathesar/components/TableName.svelte';
+
   import type { ColumnWithLink } from '../../utils';
 
   export let linkCollapsibleOpenState: Record<ColumnWithLink['id'], boolean> =
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/FilterTransformation.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/FilterTransformation.svelte
index 83d1e59520..694890fb4f 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/FilterTransformation.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/FilterTransformation.svelte
@@ -1,6 +1,8 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
+
   import { FilterEntry as FilterEntryComponent } from '@mathesar/components/filter-entry';
+
   import type QueryFilterTransformationModel from '../../QueryFilterTransformationModel';
   import type { ProcessedQueryResultColumnMap } from '../../utils';
 
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/HideTransformation.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/HideTransformation.svelte
index b73efd6b87..aa49a179a2 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/HideTransformation.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/HideTransformation.svelte
@@ -1,8 +1,10 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
-  import { MultiSelect, LabeledInput } from '@mathesar-component-library';
+
   import ColumnName from '@mathesar/components/column/ColumnName.svelte';
+  import { LabeledInput, MultiSelect } from '@mathesar-component-library';
+
   import type QueryHideTransformationModel from '../../QueryHideTransformationModel';
   import type { ProcessedQueryResultColumnMap } from '../../utils';
 
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/SortTransformation.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/SortTransformation.svelte
index d2bf47e487..88b4bf6e86 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/SortTransformation.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/SortTransformation.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import SortEntryComponent from '@mathesar/components/sort-entry/SortEntry.svelte';
+
   import type QuerySortTransformationModel from '../../QuerySortTransformationModel';
   import type { ProcessedQueryResultColumnMap } from '../../utils';
 
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/summarization/Aggregation.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/summarization/Aggregation.svelte
index 0982b902de..ccb0cb105a 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/summarization/Aggregation.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/summarization/Aggregation.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
-  import { Button, Icon, Select, iconClose } from '@mathesar-component-library';
+
   import ColumnName from '@mathesar/components/column/ColumnName.svelte';
   import { RichText } from '@mathesar/components/rich-text';
+  import { Button, Icon, Select, iconClose } from '@mathesar-component-library';
+
   import type { QuerySummarizationAggregationEntry } from '../../../QuerySummarizationTransformationModel';
   import type { ProcessedQueryResultColumn } from '../../../utils';
 
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/summarization/SummarizationTransformation.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/summarization/SummarizationTransformation.svelte
index d18cf61bf5..1ba0db7ecb 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/summarization/SummarizationTransformation.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/summarization/SummarizationTransformation.svelte
@@ -1,17 +1,20 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
+
+  import ColumnName from '@mathesar/components/column/ColumnName.svelte';
+  import GroupEntryComponent from '@mathesar/components/group-entry/GroupEntry.svelte';
   import {
     ImmutableMap,
-    MultiSelect,
     LabeledInput,
+    MultiSelect,
   } from '@mathesar-component-library';
-  import GroupEntryComponent from '@mathesar/components/group-entry/GroupEntry.svelte';
-  import ColumnName from '@mathesar/components/column/ColumnName.svelte';
+
   import type QuerySummarizationTransformationModel from '../../../QuerySummarizationTransformationModel';
+  import type { QuerySummarizationAggregationEntry } from '../../../QuerySummarizationTransformationModel';
   import type { ProcessedQueryResultColumnMap } from '../../../utils';
+
   import Aggregation from './Aggregation.svelte';
-  import type { QuerySummarizationAggregationEntry } from '../../../QuerySummarizationTransformationModel';
 
   const dispatch = createEventDispatcher();
 
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/transformationUtils.ts b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/transformationUtils.ts
index 17264427d3..bb2a3a196b 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/transformationUtils.ts
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/transformationUtils.ts
@@ -1,9 +1,10 @@
 import type { QueryInstanceInitialColumn } from '@mathesar/api/rest/types/queries';
+
+import type { QueryTransformationModel } from '../../QueryModel';
 import {
-  getProcessedOutputColumns,
   type ProcessedQueryResultColumnMap,
+  getProcessedOutputColumns,
 } from '../../utils';
-import type { QueryTransformationModel } from '../../QueryModel';
 
 export function calcAllowedColumnsPerTransformation(
   initialColumns: QueryInstanceInitialColumn[],
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/QueryRefreshButton.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/QueryRefreshButton.svelte
index 1344955345..dadc4c77fd 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/QueryRefreshButton.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/QueryRefreshButton.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import RefreshButton from '@mathesar/components/RefreshButton.svelte';
+
   import type QueryRunner from '../QueryRunner';
 
   export let queryRunner: QueryRunner;
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/QueryRunErrors.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/QueryRunErrors.svelte
index 11b082d719..cca067558f 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/QueryRunErrors.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/QueryRunErrors.svelte
@@ -1,14 +1,16 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { Button, hasProperty } from '@mathesar-component-library';
-  import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
-  import { ApiMultiError } from '@mathesar/api/rest/utils/errors';
+
   import { QUERY_CONTAINS_DELETED_COLUMN } from '@mathesar/api/rest/utils/errorCodes';
+  import { ApiMultiError } from '@mathesar/api/rest/utils/errors';
+  import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { getExplorationEditorPageUrl } from '@mathesar/routes/urls';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
-  import type QueryRunner from '../QueryRunner';
+  import { Button, hasProperty } from '@mathesar-component-library';
+
   import QueryManager from '../QueryManager';
+  import type QueryRunner from '../QueryRunner';
 
   export let queryHandler: QueryRunner | QueryManager;
   export let errors: ApiMultiError | string[];
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/ResultHeaderCell.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/ResultHeaderCell.svelte
index 5a1996a8a9..cbd5cef2a1 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/ResultHeaderCell.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/ResultHeaderCell.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
-  import { Button } from '@mathesar-component-library';
-  import { SheetCell, SheetCellResizer } from '@mathesar/components/sheet';
   import ColumnName from '@mathesar/components/column/ColumnName.svelte';
-  import type { ProcessedQueryOutputColumn } from '../utils';
+  import { SheetCell, SheetCellResizer } from '@mathesar/components/sheet';
+  import { Button } from '@mathesar-component-library';
+
   import type QueryRunner from '../QueryRunner';
+  import type { ProcessedQueryOutputColumn } from '../utils';
 
   export let queryRunner: QueryRunner;
   export let processedQueryColumn: ProcessedQueryOutputColumn;
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/ResultPane.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/ResultPane.svelte
index e85a461662..32c44b91bf 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/ResultPane.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/ResultPane.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import type QueryRunner from '../QueryRunner';
+
   import type QueryManager from '../QueryManager';
-  import Results from './Results.svelte';
+  import type QueryRunner from '../QueryRunner';
+
   import QueryRefreshButton from './QueryRefreshButton.svelte';
+  import Results from './Results.svelte';
 
   export let queryHandler: QueryRunner | QueryManager;
 </script>
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
index de2bdf240e..20070d9739 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
@@ -1,16 +1,18 @@
 <script lang="ts">
   import { tick } from 'svelte';
+
+  import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+  import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
   import {
     SheetCell,
     isCellActive,
-    scrollBasedOnActiveCell,
     isCellSelected,
+    scrollBasedOnActiveCell,
   } from '@mathesar/components/sheet';
-  import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
-  import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+
+  import type QueryInspector from '../QueryInspector';
   import type { QueryRow, QuerySheetSelection } from '../QueryRunner';
   import type { ProcessedQueryOutputColumn } from '../utils';
-  import type QueryInspector from '../QueryInspector';
 
   export let processedQueryColumn: ProcessedQueryOutputColumn;
   export let row: QueryRow | undefined;
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
index 293cdb0bf9..b7f08a82bd 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
@@ -1,22 +1,25 @@
 <script lang="ts">
   import { get } from 'svelte/store';
   import { _ } from 'svelte-i18n';
-  import { ImmutableMap } from '@mathesar-component-library';
+
   import CellBackground from '@mathesar/components/CellBackground.svelte';
   import PaginationGroup from '@mathesar/components/PaginationGroup.svelte';
   import {
-    isColumnSelected,
     Sheet,
     SheetCell,
     SheetHeader,
     SheetRow,
     SheetVirtualRows,
+    isColumnSelected,
   } from '@mathesar/components/sheet';
   import { SheetClipboardHandler } from '@mathesar/components/sheet/SheetClipboardHandler';
   import { rowHeaderWidthPx, rowHeightPx } from '@mathesar/geometry';
   import { toast } from '@mathesar/stores/toast';
+  import { ImmutableMap } from '@mathesar-component-library';
+
   import type QueryManager from '../QueryManager';
   import type QueryRunner from '../QueryRunner';
+
   import QueryRefreshButton from './QueryRefreshButton.svelte';
   import QueryRunErrors from './QueryRunErrors.svelte';
   import ResultHeaderCell from './ResultHeaderCell.svelte';
diff --git a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
index 6b8ca6f04a..79d9a4f8c5 100644
--- a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
+++ b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
@@ -1,10 +1,10 @@
-import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
+import type { QueryInstanceSummarizationTransformation } from '@mathesar/api/rest/types/queries';
 import type { TableEntry } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
 import type { UnsavedQueryInstance } from '@mathesar/stores/queries';
 import type { TerseGrouping } from '@mathesar/stores/table-data';
 import Url64 from '@mathesar/utils/Url64';
-import type { QueryInstanceSummarizationTransformation } from '@mathesar/api/rest/types/queries';
 
 type TerseSummarizedColumn = Pick<Column, 'id' | 'name'>;
 type BaseTable = Pick<TableEntry, 'id' | 'name'>;
diff --git a/mathesar_ui/src/systems/data-explorer/utils.ts b/mathesar_ui/src/systems/data-explorer/utils.ts
index 57183883e9..c91f41adae 100644
--- a/mathesar_ui/src/systems/data-explorer/utils.ts
+++ b/mathesar_ui/src/systems/data-explorer/utils.ts
@@ -1,12 +1,23 @@
-import { ImmutableMap } from '@mathesar-component-library';
-import type { ComponentAndProps } from '@mathesar-component-library/types';
 import type {
-  QueryResultColumn,
   QueryColumnMetaData,
-  QueryRunResponse,
-  QueryInitialColumnSource,
   QueryGeneratedColumnSource,
+  QueryInitialColumnSource,
+  QueryResultColumn,
+  QueryRunResponse,
 } from '@mathesar/api/rest/types/queries';
+import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type {
+  JoinableTablesResult,
+  JpPath,
+} from '@mathesar/api/rest/types/tables/joinable_tables';
+import type { CellColumnFabric } from '@mathesar/components/cell-fabric/types';
+import {
+  getCellCap,
+  getDbTypeBasedInputCap,
+  getDisplayFormatter,
+  getInitialInputValue,
+} from '@mathesar/components/cell-fabric/utils';
 import {
   getAbstractTypeForDbType,
   getFiltersForAbstractType,
@@ -15,23 +26,13 @@ import {
 } from '@mathesar/stores/abstract-types';
 import type {
   AbstractType,
-  AbstractTypesMap,
   AbstractTypePreprocFunctionDefinition,
   AbstractTypeSummarizationFunction,
+  AbstractTypesMap,
 } from '@mathesar/stores/abstract-types/types';
-import {
-  getCellCap,
-  getDbTypeBasedInputCap,
-  getDisplayFormatter,
-  getInitialInputValue,
-} from '@mathesar/components/cell-fabric/utils';
-import type { CellColumnFabric } from '@mathesar/components/cell-fabric/types';
-import type { TableEntry } from '@mathesar/api/rest/types/tables';
-import type {
-  JpPath,
-  JoinableTablesResult,
-} from '@mathesar/api/rest/types/tables/joinable_tables';
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import { ImmutableMap } from '@mathesar-component-library';
+import type { ComponentAndProps } from '@mathesar-component-library/types';
+
 import type QueryModel from './QueryModel';
 
 type ProcessedQueryResultColumnSource =
diff --git a/mathesar_ui/src/systems/record-selector/ModalRecordSelector.svelte b/mathesar_ui/src/systems/record-selector/ModalRecordSelector.svelte
index 4159b1a035..e34667565c 100644
--- a/mathesar_ui/src/systems/record-selector/ModalRecordSelector.svelte
+++ b/mathesar_ui/src/systems/record-selector/ModalRecordSelector.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
   import { createEventDispatcher, tick } from 'svelte';
   import { fade } from 'svelte/transition';
-  import { portal, type ModalController } from '@mathesar-component-library';
-  import RecordSelectorWindow from './RecordSelectorWindow.svelte';
+
+  import { type ModalController, portal } from '@mathesar-component-library';
+
   import type { RecordSelectorController } from './RecordSelectorController';
+  import RecordSelectorWindow from './RecordSelectorWindow.svelte';
 
   const dispatch = createEventDispatcher();
 
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorCellWrapper.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorCellWrapper.svelte
index 3f561d55c8..ddf4181170 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorCellWrapper.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorCellWrapper.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
-  import { ensureReadable } from '@mathesar-component-library';
   import type { OverflowDetails } from '@mathesar/utils/overflowObserver';
+  import { ensureReadable } from '@mathesar-component-library';
+
   import type {
-    CellLayoutRowType,
     CellLayoutColumnType,
+    CellLayoutRowType,
   } from './recordSelectorUtils';
 
   export let rowType: CellLayoutRowType;
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorColumnHeaderCell.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorColumnHeaderCell.svelte
index d296b67a4d..f8379f8b25 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorColumnHeaderCell.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorColumnHeaderCell.svelte
@@ -2,13 +2,6 @@
   import { onMount, tick } from 'svelte';
   import type { Writable } from 'svelte/store';
 
-  import {
-    Debounce,
-    getValueFromArtificialEvent,
-    getValueFromEvent,
-    Label,
-    LabelController,
-  } from '@mathesar-component-library';
   import DynamicInput from '@mathesar/components/cell-fabric/DynamicInput.svelte';
   import ProcessedColumnName from '@mathesar/components/column/ProcessedColumnName.svelte';
   import type {
@@ -17,6 +10,14 @@
   } from '@mathesar/stores/table-data';
   import type RecordSummaryStore from '@mathesar/stores/table-data/record-summaries/RecordSummaryStore';
   import type { OverflowDetails } from '@mathesar/utils/overflowObserver';
+  import {
+    Debounce,
+    Label,
+    LabelController,
+    getValueFromArtificialEvent,
+    getValueFromEvent,
+  } from '@mathesar-component-library';
+
   import Cell from './RecordSelectorCellWrapper.svelte';
 
   const labelController = new LabelController();
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
index 8d55f608d5..4f34d7bd3c 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-  import { router } from 'tinro';
   import { _ } from 'svelte-i18n';
-  import { Button, Icon, Spinner } from '@mathesar-component-library';
+  import { router } from 'tinro';
+
   import type { Response as ApiRecordsResponse } from '@mathesar/api/rest/types/tables/records';
-  import { postAPI, States } from '@mathesar/api/rest/utils/requestUtils';
+  import { States, postAPI } from '@mathesar/api/rest/utils/requestUtils';
   import { iconAddNew } from '@mathesar/icons';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
@@ -19,6 +19,8 @@
   import { toast } from '@mathesar/stores/toast';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { getErrorMessage } from '@mathesar/utils/errors';
+  import { Button, Icon, Spinner } from '@mathesar-component-library';
+
   import type {
     RecordSelectorController,
     RecordSelectorResult,
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorController.ts b/mathesar_ui/src/systems/record-selector/RecordSelectorController.ts
index 150838305d..933e5879df 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorController.ts
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorController.ts
@@ -2,8 +2,9 @@ import { getContext, setContext } from 'svelte';
 import { writable } from 'svelte/store';
 
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
-import type { DBObjectEntry } from '@mathesar/AppTypes';
 import type { Result as ApiRecord } from '@mathesar/api/rest/types/tables/records';
+import type { DBObjectEntry } from '@mathesar/AppTypes';
+
 import type { RecordSelectorPurpose } from './recordSelectorUtils';
 
 interface RecordSelectorControllerProps {
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorDataCell.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorDataCell.svelte
index b4357c0050..c44edb0462 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorDataCell.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorDataCell.svelte
@@ -3,12 +3,13 @@
 
   import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
   import {
-    rowHasSavedRecord,
-    SearchFuzzy,
     type ProcessedColumn,
     type RecordRow,
+    SearchFuzzy,
+    rowHasSavedRecord,
   } from '@mathesar/stores/table-data';
   import type RecordSummaryStore from '@mathesar/stores/table-data/record-summaries/RecordSummaryStore';
+
   import Cell from './RecordSelectorCellWrapper.svelte';
 
   export let row: RecordRow;
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorNavigationButton.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorNavigationButton.svelte
index 6f8d1a6bde..c930a71b12 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorNavigationButton.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorNavigationButton.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
+
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import { Icon } from '@mathesar/component-library';
   import { iconSelectRecord } from '@mathesar/icons';
+
   import { getRecordSelectorFromContext } from './RecordSelectorController';
 
   const recordSelector = getRecordSelectorFromContext();
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorSubmitButton.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorSubmitButton.svelte
index 18a45f54d6..c619c88249 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorSubmitButton.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorSubmitButton.svelte
@@ -1,8 +1,10 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
-  import { Icon } from '@mathesar-component-library';
+
   import { iconLinkToRecordPage, iconPickRecord } from '@mathesar/icons';
+  import { Icon } from '@mathesar-component-library';
+
   import type { RecordSelectorPurpose } from './recordSelectorUtils';
 
   const dispatch = createEventDispatcher();
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
index d409961f8c..e78adaa3c0 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
@@ -1,36 +1,37 @@
 <script lang="ts">
   import { onMount, tick } from 'svelte';
 
-  import { ImmutableSet } from '@mathesar-component-library';
   import type { Column } from '@mathesar/api/rest/types/tables/columns';
+  import { States } from '@mathesar/api/rest/utils/requestUtils';
   import { storeToGetRecordPageUrl } from '@mathesar/stores/storeBasedUrls';
   import {
+    type RecordRow,
+    TabularData,
     constraintIsFk,
     setTabularDataStoreInContext,
-    TabularData,
-    type RecordRow,
   } from '@mathesar/stores/table-data';
   import {
     buildInputData,
     renderTransitiveRecordSummary,
   } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
+  import { getPkValueInRecord } from '@mathesar/stores/table-data/records';
   import { tables } from '@mathesar/stores/tables';
-  import { States } from '@mathesar/api/rest/utils/requestUtils';
   import overflowObserver, {
     makeOverflowDetails,
   } from '@mathesar/utils/overflowObserver';
-  import { getPkValueInRecord } from '@mathesar/stores/table-data/records';
+  import { ImmutableSet } from '@mathesar-component-library';
+
   import Cell from './RecordSelectorCellWrapper.svelte';
+  import RecordSelectorColumnHeaderCell from './RecordSelectorColumnHeaderCell.svelte';
   import type {
     RecordSelectorController,
     RecordSelectorResult,
   } from './RecordSelectorController';
   import { setRecordSelectorControllerInContext } from './RecordSelectorController';
+  import RecordSelectorDataCell from './RecordSelectorDataCell.svelte';
   import RecordSelectorDataRow from './RecordSelectorDataRow.svelte';
-  import RecordSelectorColumnHeaderCell from './RecordSelectorColumnHeaderCell.svelte';
   import RecordSelectorSubmitButton from './RecordSelectorSubmitButton.svelte';
   import { getColumnIdToFocusInitially } from './recordSelectorUtils';
-  import RecordSelectorDataCell from './RecordSelectorDataCell.svelte';
 
   export let controller: RecordSelectorController;
   export let tabularData: TabularData;
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
index 2f0b58cfe7..167133e63f 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
@@ -1,13 +1,15 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { portal, Window } from '@mathesar-component-library';
-  import TableName from '@mathesar/components/TableName.svelte';
+
   import { RichText } from '@mathesar/components/rich-text';
+  import TableName from '@mathesar/components/TableName.svelte';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
   import { Meta, TabularData } from '@mathesar/stores/table-data';
   import { getTableName } from '@mathesar/stores/tables';
-  import Pagination from '@mathesar/utils/Pagination';
   import { tables } from '@mathesar/stores/tables';
+  import Pagination from '@mathesar/utils/Pagination';
+  import { Window, portal } from '@mathesar-component-library';
+
   import RecordSelectorContent from './RecordSelectorContent.svelte';
   import { RecordSelectorController } from './RecordSelectorController';
 
diff --git a/mathesar_ui/src/systems/shares/ShareEntity.svelte b/mathesar_ui/src/systems/shares/ShareEntity.svelte
index 4038e2cce9..395fdbe74f 100644
--- a/mathesar_ui/src/systems/shares/ShareEntity.svelte
+++ b/mathesar_ui/src/systems/shares/ShareEntity.svelte
@@ -1,31 +1,32 @@
 <script lang="ts">
   import { getContext, tick } from 'svelte';
   import { _ } from 'svelte-i18n';
-  import {
-    SpinnerButton,
-    Spinner,
-    TextInput,
-    InputGroup,
-    Button,
-    Icon,
-    type AccompanyingElements,
-  } from '@mathesar-component-library';
-  import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
-  import type { ShareApi, Share } from '@mathesar/api/rest/shares';
+
+  import type { Share, ShareApi } from '@mathesar/api/rest/shares';
   import { getApiErrorMessages } from '@mathesar/api/rest/utils/errors';
+  import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+  import Errors from '@mathesar/components/Errors.svelte';
   import {
-    iconCopyMajor,
     iconAddNew,
-    iconRecreate,
+    iconCopyMajor,
     iconDisable,
     iconOpenLinkInNewTab,
+    iconRecreate,
   } from '@mathesar/icons';
-  import Errors from '@mathesar/components/Errors.svelte';
-  import { toast } from '@mathesar/stores/toast';
   import {
     confirm,
     confirmationController,
   } from '@mathesar/stores/confirmation';
+  import { toast } from '@mathesar/stores/toast';
+  import {
+    type AccompanyingElements,
+    Button,
+    Icon,
+    InputGroup,
+    Spinner,
+    SpinnerButton,
+    TextInput,
+  } from '@mathesar-component-library';
 
   const dropdownAccompanyingElements = getContext<
     AccompanyingElements | undefined
diff --git a/mathesar_ui/src/systems/table-view/Body.svelte b/mathesar_ui/src/systems/table-view/Body.svelte
index f917c5dc71..9357e247c5 100644
--- a/mathesar_ui/src/systems/table-view/Body.svelte
+++ b/mathesar_ui/src/systems/table-view/Body.svelte
@@ -1,23 +1,24 @@
 <script lang="ts">
+  import { SheetVirtualRows } from '@mathesar/components/sheet';
+  import {
+    groupHeaderRowHeightPx,
+    helpTextRowHeightPx,
+    rowHeightPx,
+  } from '@mathesar/geometry';
+  import { currentDatabase } from '@mathesar/stores/databases';
+  import { currentSchema } from '@mathesar/stores/schemas';
   import {
+    type Row as RowType,
+    getRowKey,
     getTabularDataStoreFromContext,
     isGroupHeaderRow,
     isHelpTextRow,
-    type Row as RowType,
-    getRowKey,
     isPlaceholderRow,
   } from '@mathesar/stores/table-data';
-  import { SheetVirtualRows } from '@mathesar/components/sheet';
-  import {
-    rowHeightPx,
-    helpTextRowHeightPx,
-    groupHeaderRowHeightPx,
-  } from '@mathesar/geometry';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
-  import { currentDatabase } from '@mathesar/stores/databases';
-  import { currentSchema } from '@mathesar/stores/schemas';
-  import ScrollAndResetHandler from './ScrollAndResetHandler.svelte';
+
   import Row from './row/Row.svelte';
+  import ScrollAndResetHandler from './ScrollAndResetHandler.svelte';
 
   const tabularData = getTabularDataStoreFromContext();
   const userProfile = getUserProfileStoreFromContext();
diff --git a/mathesar_ui/src/systems/table-view/ScrollAndResetHandler.svelte b/mathesar_ui/src/systems/table-view/ScrollAndResetHandler.svelte
index 838a6a0a1c..bac00e8a72 100644
--- a/mathesar_ui/src/systems/table-view/ScrollAndResetHandler.svelte
+++ b/mathesar_ui/src/systems/table-view/ScrollAndResetHandler.svelte
@@ -1,15 +1,16 @@
 <script lang="ts">
   import { beforeUpdate, tick } from 'svelte';
+
+  import type { States } from '@mathesar/api/rest/utils/requestUtils';
+  import type { SheetVirtualRowsApi } from '@mathesar/components/sheet/types';
   import {
-    Sorting,
     Filtering,
     Grouping,
-    getTabularDataStoreFromContext,
     type Row,
+    Sorting,
+    getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
-  import type { SheetVirtualRowsApi } from '@mathesar/components/sheet/types';
   import type Pagination from '@mathesar/utils/Pagination';
-  import type { States } from '@mathesar/api/rest/utils/requestUtils';
 
   const tabularData = getTabularDataStoreFromContext();
 
diff --git a/mathesar_ui/src/systems/table-view/StatusPane.svelte b/mathesar_ui/src/systems/table-view/StatusPane.svelte
index 5601f9c385..58a3b31ce6 100644
--- a/mathesar_ui/src/systems/table-view/StatusPane.svelte
+++ b/mathesar_ui/src/systems/table-view/StatusPane.svelte
@@ -1,18 +1,19 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import {
-    getPaginationPageCount,
-    Button,
-    Icon,
-  } from '@mathesar-component-library';
+
   import { States } from '@mathesar/api/rest/utils/requestUtils';
-  import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import PaginationGroup from '@mathesar/components/PaginationGroup.svelte';
   import RefreshButton from '@mathesar/components/RefreshButton.svelte';
   import { iconAddNew } from '@mathesar/icons';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
+  import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
+  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
+  import {
+    Button,
+    Icon,
+    getPaginationPageCount,
+  } from '@mathesar-component-library';
 
   const tabularData = getTabularDataStoreFromContext();
   const userProfile = getUserProfileStoreFromContext();
diff --git a/mathesar_ui/src/systems/table-view/TableView.svelte b/mathesar_ui/src/systems/table-view/TableView.svelte
index 8fd7b0f642..75d542bc9e 100644
--- a/mathesar_ui/src/systems/table-view/TableView.svelte
+++ b/mathesar_ui/src/systems/table-view/TableView.svelte
@@ -1,22 +1,23 @@
 <script lang="ts">
   import { get } from 'svelte/store';
 
-  import { ImmutableMap } from '@mathesar-component-library';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import { Sheet } from '@mathesar/components/sheet';
   import { SheetClipboardHandler } from '@mathesar/components/sheet/SheetClipboardHandler';
   import { rowHeaderWidthPx } from '@mathesar/geometry';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
   import {
-    getTabularDataStoreFromContext,
     ID_ADD_NEW_COLUMN,
     ID_ROW_CONTROL_COLUMN,
     type TabularDataSelection,
+    getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
   import { toast } from '@mathesar/stores/toast';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { orderProcessedColumns } from '@mathesar/utils/tables';
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import { ImmutableMap } from '@mathesar-component-library';
+
   import Body from './Body.svelte';
   import Header from './header/Header.svelte';
   import StatusPane from './StatusPane.svelte';
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte b/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
index 6c8dafa835..a7277b088b 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
@@ -1,14 +1,16 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { Button, Icon } from '@mathesar-component-library';
+
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import EntityPageHeader from '@mathesar/components/EntityPageHeader.svelte';
   import ModificationStatus from '@mathesar/components/ModificationStatus.svelte';
   import { iconInspector, iconTable } from '@mathesar/icons';
-  import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
+  import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
+  import { Button, Icon } from '@mathesar-component-library';
+
   import FilterDropdown from './record-operations/filter/FilterDropdown.svelte';
   import GroupDropdown from './record-operations/group/GroupDropdown.svelte';
   import SortDropdown from './record-operations/sort/SortDropdown.svelte';
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/MiniActionsPane.svelte b/mathesar_ui/src/systems/table-view/actions-pane/MiniActionsPane.svelte
index ca4f35d8f9..4bafe9bae0 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/MiniActionsPane.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/MiniActionsPane.svelte
@@ -1,10 +1,12 @@
 <script lang="ts">
-  import type { Dropdown } from '@mathesar/component-library';
-  import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import type { ComponentProps } from 'svelte';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
+
+  import type { Dropdown } from '@mathesar/component-library';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
+  import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
+  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
+
   import FilterDropdown from './record-operations/filter/FilterDropdown.svelte';
   import GroupDropdown from './record-operations/group/GroupDropdown.svelte';
   import SortDropdown from './record-operations/sort/SortDropdown.svelte';
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/ShareTableDropdown.svelte b/mathesar_ui/src/systems/table-view/actions-pane/ShareTableDropdown.svelte
index 87965ed0b7..a2e5586006 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/ShareTableDropdown.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/ShareTableDropdown.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { iconShare } from '@mathesar/icons';
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
-  import { Dropdown, Icon } from '@mathesar-component-library';
-  import ShareEntity from '@mathesar/systems/shares/ShareEntity.svelte';
+
   import tableShareApi from '@mathesar/api/rest/tableShares';
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import { iconShare } from '@mathesar/icons';
   import { getSharedTablePageUrl } from '@mathesar/routes/urls';
+  import ShareEntity from '@mathesar/systems/shares/ShareEntity.svelte';
+  import { Dropdown, Icon } from '@mathesar-component-library';
 
   export let id: TableEntry['id'];
 </script>
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/Filter.svelte b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/Filter.svelte
index 6582c4c4e8..f93483ae5e 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/Filter.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/Filter.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import { takeLast } from 'iter-tools';
   import { onMount, tick } from 'svelte';
-  import { writable, type Writable } from 'svelte/store';
+  import { type Writable, writable } from 'svelte/store';
   import { _ } from 'svelte-i18n';
-  import { Button, Icon } from '@mathesar-component-library';
+
   import type { FilterCombination } from '@mathesar/api/rest/types/tables/records';
   import type { LinkedRecordInputElement } from '@mathesar/components/cell-fabric/data-types/components/linked-record/LinkedRecordUtils';
   import { validateFilterEntry } from '@mathesar/components/filter-entry';
@@ -15,7 +15,10 @@
     ProcessedColumns,
   } from '@mathesar/stores/table-data';
   import type RecordSummaryStore from '@mathesar/stores/table-data/record-summaries/RecordSummaryStore';
+  import { Button, Icon } from '@mathesar-component-library';
+
   import { deepCloneFiltering } from '../utils';
+
   import FilterEntries from './FilterEntries.svelte';
 
   const imperativeFilterController = getImperativeFilterControllerFromContext();
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterDropdown.svelte b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterDropdown.svelte
index 18cfc372a3..30a65c9083 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterDropdown.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterDropdown.svelte
@@ -1,14 +1,16 @@
 <script lang="ts">
-  import { onMount, type ComponentProps } from 'svelte';
+  import { type ComponentProps, onMount } from 'svelte';
   import type { Writable } from 'svelte/store';
   import { _ } from 'svelte-i18n';
-  import { Dropdown, Icon, BadgeCount } from '@mathesar-component-library';
+
   import { iconFiltering } from '@mathesar/icons';
   import { getImperativeFilterControllerFromContext } from '@mathesar/pages/table/ImperativeFilterController';
   import {
-    getTabularDataStoreFromContext,
     type Filtering,
+    getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
+  import { BadgeCount, Dropdown, Icon } from '@mathesar-component-library';
+
   import Filter from './Filter.svelte';
 
   interface $$Props extends ComponentProps<Dropdown> {
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterEntries.svelte b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterEntries.svelte
index e2a601bef8..1de93aab34 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterEntries.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterEntries.svelte
@@ -1,17 +1,18 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
-  import { InputGroupText, Select } from '@mathesar-component-library';
+
+  import type { FilterCombination } from '@mathesar/api/rest/types/tables/records';
+  import { FilterEntry as FilterEntryComponent } from '@mathesar/components/filter-entry';
   import {
-    filterCombinations,
-    defaultFilterCombination,
     type FilterEntry,
     type ProcessedColumns,
+    defaultFilterCombination,
+    filterCombinations,
   } from '@mathesar/stores/table-data';
-  import type { FilterCombination } from '@mathesar/api/rest/types/tables/records';
-  import { FilterEntry as FilterEntryComponent } from '@mathesar/components/filter-entry';
-  import { getColumnConstraintTypeByColumnId } from '@mathesar/utils/columnUtils';
   import type RecordSummaryStore from '@mathesar/stores/table-data/record-summaries/RecordSummaryStore';
+  import { getColumnConstraintTypeByColumnId } from '@mathesar/utils/columnUtils';
+  import { InputGroupText, Select } from '@mathesar-component-library';
 
   const dispatch = createEventDispatcher<{
     remove: number;
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/group/Group.svelte b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/group/Group.svelte
index 487cb6cfbd..e56a76264e 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/group/Group.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/group/Group.svelte
@@ -1,15 +1,16 @@
 <script lang="ts">
-  import { _ } from 'svelte-i18n';
-  import { DropdownMenu, ButtonMenuItem } from '@mathesar-component-library';
   import type { Writable } from 'svelte/store';
+  import { _ } from 'svelte-i18n';
+
+  import ColumnName from '@mathesar/components/column/ColumnName.svelte';
+  import GroupEntryComponent from '@mathesar/components/group-entry/GroupEntry.svelte';
   import {
-    getTabularDataStoreFromContext,
     type Grouping,
     type ProcessedColumn,
+    getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
-  import GroupEntryComponent from '@mathesar/components/group-entry/GroupEntry.svelte';
-  import ColumnName from '@mathesar/components/column/ColumnName.svelte';
   import { getColumnConstraintTypeByColumnId } from '@mathesar/utils/columnUtils';
+  import { ButtonMenuItem, DropdownMenu } from '@mathesar-component-library';
 
   const tabularData = getTabularDataStoreFromContext();
 
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/group/GroupDropdown.svelte b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/group/GroupDropdown.svelte
index ad3e028d7b..f68d41a7b5 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/group/GroupDropdown.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/group/GroupDropdown.svelte
@@ -2,10 +2,12 @@
   import type { ComponentProps } from 'svelte';
   import type { Writable } from 'svelte/store';
   import { _ } from 'svelte-i18n';
-  import { Dropdown, Icon } from '@mathesar-component-library';
+
   import BadgeCount from '@mathesar/component-library/badge-count/BadgeCount.svelte';
   import { iconGrouping } from '@mathesar/icons';
   import type { Grouping } from '@mathesar/stores/table-data';
+  import { Dropdown, Icon } from '@mathesar-component-library';
+
   import Group from './Group.svelte';
 
   interface $$Props extends ComponentProps<Dropdown> {
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/sort/Sort.svelte b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/sort/Sort.svelte
index 05be252d54..9adff51eaf 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/sort/Sort.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/sort/Sort.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import type { Writable } from 'svelte/store';
   import { _ } from 'svelte-i18n';
-  import { Icon, Button } from '@mathesar-component-library';
+
   import SortEntry from '@mathesar/components/sort-entry/SortEntry.svelte';
   import type { SortDirection } from '@mathesar/components/sort-entry/utils';
   import {
@@ -15,6 +15,7 @@
     getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
   import { getColumnConstraintTypeByColumnId } from '@mathesar/utils/columnUtils';
+  import { Button, Icon } from '@mathesar-component-library';
 
   const tabularData = getTabularDataStoreFromContext();
 
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/sort/SortDropdown.svelte b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/sort/SortDropdown.svelte
index 1c6e65eee0..9174e228f8 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/sort/SortDropdown.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/sort/SortDropdown.svelte
@@ -2,9 +2,11 @@
   import type { ComponentProps } from 'svelte';
   import type { Writable } from 'svelte/store';
   import { _ } from 'svelte-i18n';
-  import { BadgeCount, Dropdown, Icon } from '@mathesar-component-library';
+
   import { iconSorting } from '@mathesar/icons';
   import type { Sorting } from '@mathesar/stores/table-data';
+  import { BadgeCount, Dropdown, Icon } from '@mathesar-component-library';
+
   import Sort from './Sort.svelte';
 
   interface $$Props extends ComponentProps<Dropdown> {
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/utils.ts b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/utils.ts
index 46b1127c5e..523ff62795 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/utils.ts
+++ b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/utils.ts
@@ -1,4 +1,4 @@
-import { Filtering, type FilterEntry } from '@mathesar/stores/table-data';
+import { type FilterEntry, Filtering } from '@mathesar/stores/table-data';
 
 export function deepCloneFiltering(
   filtering: Pick<Filtering, 'combination' | 'entries'>,
diff --git a/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte b/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte
index ef114b3eeb..83ae8ec355 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import type { Constraint } from '@mathesar/api/rest/types/tables/constraints';
   import ColumnName from '@mathesar/components/column/ColumnName.svelte';
-
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
 
   export let constraint: Constraint;
diff --git a/mathesar_ui/src/systems/table-view/constraints/ConstraintDetails.svelte b/mathesar_ui/src/systems/table-view/constraints/ConstraintDetails.svelte
index a4c2e1a046..9822dfc13d 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ConstraintDetails.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ConstraintDetails.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import type { Constraint } from '@mathesar/stores/table-data';
 
   export let constraint: Constraint;
diff --git a/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte b/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
index eea6bc3ad7..09a85d67e7 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
@@ -1,16 +1,18 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import type { ConstraintType } from '@mathesar/api/rest/types/tables/constraints';
   import { Button, Collapsible, Help, Icon } from '@mathesar/component-library';
-  import type { Constraint } from '@mathesar/stores/table-data';
   import { iconDeleteMajor } from '@mathesar/icons';
   import { confirmDelete } from '@mathesar/stores/confirmation';
+  import type { Constraint } from '@mathesar/stores/table-data';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
+
   import ConstraintCollapseHeader from './ConstraintCollapseHeader.svelte';
-  import NewUniqueConstraint from './NewUniqueConstraint.svelte';
-  import NewFkConstraint from './NewFkConstraint.svelte';
   import ConstraintDetails from './ConstraintDetails.svelte';
   import ForeignKeyConstraintDetails from './ForeignKeyConstraintDetails.svelte';
+  import NewFkConstraint from './NewFkConstraint.svelte';
+  import NewUniqueConstraint from './NewUniqueConstraint.svelte';
 
   export let constraintType: ConstraintType;
   export let constraints: Constraint[];
diff --git a/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte b/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
index 8e786f10eb..a4d6c92120 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
@@ -1,13 +1,14 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import TableName from '@mathesar/components/TableName.svelte';
-  import type { Constraint } from '@mathesar/stores/table-data';
-  import { tables } from '@mathesar/stores/tables';
+
+  import type { Column } from '@mathesar/api/rest/types/tables/columns';
   import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
   import { getAPI } from '@mathesar/api/rest/utils/requestUtils';
-  import type { Column } from '@mathesar/api/rest/types/tables/columns';
-  import { Icon, iconError, Spinner } from '@mathesar/component-library';
+  import { Icon, Spinner, iconError } from '@mathesar/component-library';
   import ColumnName from '@mathesar/components/column/ColumnName.svelte';
+  import TableName from '@mathesar/components/TableName.svelte';
+  import type { Constraint } from '@mathesar/stores/table-data';
+  import { tables } from '@mathesar/stores/tables';
 
   export let constraint: Constraint;
 
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
index c81e4def1c..9ea24e4bd5 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
@@ -1,32 +1,34 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import {
-    ensureReadable,
-    RadioGroup,
-    Spinner,
-  } from '@mathesar-component-library';
+
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import {
+    type FilledFormValues,
     FormSubmit,
     makeForm,
     requiredField,
     uniqueWith,
-    type FilledFormValues,
   } from '@mathesar/components/form';
   import Field from '@mathesar/components/form/Field.svelte';
   import FieldLayout from '@mathesar/components/form/FieldLayout.svelte';
+  import { RichText } from '@mathesar/components/rich-text';
   import SelectProcessedColumn from '@mathesar/components/SelectProcessedColumn.svelte';
   import SelectTable from '@mathesar/components/SelectTable.svelte';
   import TableName from '@mathesar/components/TableName.svelte';
-  import { RichText } from '@mathesar/components/rich-text';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
   import {
-    getTabularDataStoreFromContext,
-    TableStructure,
     type ProcessedColumn,
+    TableStructure,
+    getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
   import { importVerifiedTables } from '@mathesar/stores/tables';
   import { getAvailableName } from '@mathesar/utils/db';
+  import {
+    RadioGroup,
+    Spinner,
+    ensureReadable,
+  } from '@mathesar-component-library';
+
   import ConstraintNameHelp from './__help__/ConstraintNameHelp.svelte';
 
   export let onClose: (() => void) | undefined = undefined;
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
index 8fdb5b2346..3c6b7379bd 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
@@ -1,24 +1,26 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
+  import ColumnName from '@mathesar/components/column/ColumnName.svelte';
+  import Form from '@mathesar/components/Form.svelte';
+  import FormField from '@mathesar/components/FormField.svelte';
   import {
-    LabeledInput,
-    MultiSelect,
-    RadioGroup,
-    TextInput,
-  } from '@mathesar-component-library';
-  import { CancelOrProceedButtonPair } from '@mathesar-component-library';
-  import {
-    getTabularDataStoreFromContext,
     type ProcessedColumn,
+    getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
   import { tables } from '@mathesar/stores/tables';
-  import FormField from '@mathesar/components/FormField.svelte';
   import { toast } from '@mathesar/stores/toast';
-  import Form from '@mathesar/components/Form.svelte';
-  import { getAvailableName } from '@mathesar/utils/db';
-  import ColumnName from '@mathesar/components/column/ColumnName.svelte';
   import { getColumnConstraintTypeByColumnId } from '@mathesar/utils/columnUtils';
+  import { getAvailableName } from '@mathesar/utils/db';
   import { getErrorMessage } from '@mathesar/utils/errors';
+  import { CancelOrProceedButtonPair } from '@mathesar-component-library';
+  import {
+    LabeledInput,
+    MultiSelect,
+    RadioGroup,
+    TextInput,
+  } from '@mathesar-component-library';
+
   import ConstraintNameHelp from './__help__/ConstraintNameHelp.svelte';
 
   export let onClose: (() => void) | undefined = undefined;
diff --git a/mathesar_ui/src/systems/table-view/constraints/TableConstraints.svelte b/mathesar_ui/src/systems/table-view/constraints/TableConstraints.svelte
index 88c73e8458..ac4c4ffae6 100644
--- a/mathesar_ui/src/systems/table-view/constraints/TableConstraints.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/TableConstraints.svelte
@@ -1,15 +1,17 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { Icon, iconLoading } from '@mathesar-component-library';
-  import {
-    getTabularDataStoreFromContext,
-    type Constraint,
-  } from '@mathesar/stores/table-data';
-  import { States } from '@mathesar/api/rest/utils/requestUtils';
+
   import type { ConstraintType } from '@mathesar/api/rest/types/tables/constraints';
+  import { States } from '@mathesar/api/rest/utils/requestUtils';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
+  import {
+    type Constraint,
+    getTabularDataStoreFromContext,
+  } from '@mathesar/stores/table-data';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
+  import { Icon, iconLoading } from '@mathesar-component-library';
+
   import ConstraintTypeSection from './ConstraintTypeSection.svelte';
 
   const tabularData = getTabularDataStoreFromContext();
diff --git a/mathesar_ui/src/systems/table-view/constraints/TableConstraintsModal.svelte b/mathesar_ui/src/systems/table-view/constraints/TableConstraintsModal.svelte
index abd518f24f..df84f81fa2 100644
--- a/mathesar_ui/src/systems/table-view/constraints/TableConstraintsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/TableConstraintsModal.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import {
     ControlledModal,
     type ModalController,
   } from '@mathesar-component-library';
+
   import TableConstraints from './TableConstraints.svelte';
 
   export let controller: ModalController;
diff --git a/mathesar_ui/src/systems/table-view/constraints/__help__/ConstraintNameHelp.svelte b/mathesar_ui/src/systems/table-view/constraints/__help__/ConstraintNameHelp.svelte
index a099b194dd..e543213057 100644
--- a/mathesar_ui/src/systems/table-view/constraints/__help__/ConstraintNameHelp.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/__help__/ConstraintNameHelp.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import { Help } from '@mathesar-component-library';
 </script>
 
diff --git a/mathesar_ui/src/systems/table-view/header/Header.svelte b/mathesar_ui/src/systems/table-view/header/Header.svelte
index b2c614f00c..a72c3a4414 100644
--- a/mathesar_ui/src/systems/table-view/header/Header.svelte
+++ b/mathesar_ui/src/systems/table-view/header/Header.svelte
@@ -1,23 +1,24 @@
 <script lang="ts">
+  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import { ContextMenu } from '@mathesar/component-library';
   import {
-    getTabularDataStoreFromContext,
-    ID_ADD_NEW_COLUMN,
-    ID_ROW_CONTROL_COLUMN,
-  } from '@mathesar/stores/table-data';
-  import {
-    SheetHeader,
     SheetCell,
     SheetCellResizer,
+    SheetHeader,
     isColumnSelected,
   } from '@mathesar/components/sheet';
   import type { ProcessedColumn } from '@mathesar/stores/table-data';
+  import {
+    ID_ADD_NEW_COLUMN,
+    ID_ROW_CONTROL_COLUMN,
+    getTabularDataStoreFromContext,
+  } from '@mathesar/stores/table-data';
   import { saveColumnOrder } from '@mathesar/stores/tables';
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
-  import { ContextMenu } from '@mathesar/component-library';
-  import HeaderCell from './header-cell/HeaderCell.svelte';
-  import NewColumnCell from './new-column-cell/NewColumnCell.svelte';
+
   import { Draggable, Droppable } from './drag-and-drop';
   import ColumnHeaderContextMenu from './header-cell/ColumnHeaderContextMenu.svelte';
+  import HeaderCell from './header-cell/HeaderCell.svelte';
+  import NewColumnCell from './new-column-cell/NewColumnCell.svelte';
 
   const tabularData = getTabularDataStoreFromContext();
 
diff --git a/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte b/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte
index ffd19aeece..2d426179ba 100644
--- a/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte
+++ b/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte
@@ -1,12 +1,11 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import { ButtonMenuItem, LinkMenuItem } from '@mathesar-component-library';
   import Identifier from '@mathesar/components/Identifier.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import {
-    getSortingLabelForColumn,
     type SortDirection,
+    getSortingLabelForColumn,
   } from '@mathesar/components/sort-entry/utils';
   import {
     iconAddFilter,
@@ -21,11 +20,12 @@
   import { currentSchema } from '@mathesar/stores/schemas';
   import { storeToGetTablePageUrl } from '@mathesar/stores/storeBasedUrls';
   import {
-    getTabularDataStoreFromContext,
     type ProcessedColumn,
+    getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
   import { tables } from '@mathesar/stores/tables';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
+  import { ButtonMenuItem, LinkMenuItem } from '@mathesar-component-library';
 
   const userProfile = getUserProfileStoreFromContext();
 
diff --git a/mathesar_ui/src/systems/table-view/header/header-cell/HeaderCell.svelte b/mathesar_ui/src/systems/table-view/header/header-cell/HeaderCell.svelte
index 6cfc0cbe26..803776ccc3 100644
--- a/mathesar_ui/src/systems/table-view/header/header-cell/HeaderCell.svelte
+++ b/mathesar_ui/src/systems/table-view/header/header-cell/HeaderCell.svelte
@@ -4,19 +4,19 @@
   using table inspector
 -->
 <script lang="ts">
-  import { Icon } from '@mathesar-component-library';
-  import {
-    getTabularDataStoreFromContext,
-    type ProcessedColumn,
-  } from '@mathesar/stores/table-data';
-  import ProcessedColumnName from '@mathesar/components/column/ProcessedColumnName.svelte';
   import CellBackground from '@mathesar/components/CellBackground.svelte';
+  import ProcessedColumnName from '@mathesar/components/column/ProcessedColumnName.svelte';
   import {
     iconFiltering,
     iconGrouping,
     iconSortAscending,
     iconSortDescending,
   } from '@mathesar/icons';
+  import {
+    type ProcessedColumn,
+    getTabularDataStoreFromContext,
+  } from '@mathesar/stores/table-data';
+  import { Icon } from '@mathesar-component-library';
 
   export let processedColumn: ProcessedColumn;
   export let isSelected = false;
diff --git a/mathesar_ui/src/systems/table-view/header/new-column-cell/ColumnTypeSelector.svelte b/mathesar_ui/src/systems/table-view/header/new-column-cell/ColumnTypeSelector.svelte
index e34f2786c8..5fb14722fe 100644
--- a/mathesar_ui/src/systems/table-view/header/new-column-cell/ColumnTypeSelector.svelte
+++ b/mathesar_ui/src/systems/table-view/header/new-column-cell/ColumnTypeSelector.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
-  import { SelectionList } from '@mathesar-component-library';
+  import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
   import {
     currentDbAbstractTypes,
-    getAllowedAbstractTypesForNewColumn,
-    getAbstractTypeForDbType,
     defaultDbType,
+    getAbstractTypeForDbType,
+    getAllowedAbstractTypesForNewColumn,
     getDefaultDbTypeOfAbstractType,
   } from '@mathesar/stores/abstract-types';
-  import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
+  import { SelectionList } from '@mathesar-component-library';
 
   export let value = defaultDbType;
   export let disabled = false;
diff --git a/mathesar_ui/src/systems/table-view/header/new-column-cell/NewColumnCell.svelte b/mathesar_ui/src/systems/table-view/header/new-column-cell/NewColumnCell.svelte
index 93cd9f2f94..6581301ddc 100644
--- a/mathesar_ui/src/systems/table-view/header/new-column-cell/NewColumnCell.svelte
+++ b/mathesar_ui/src/systems/table-view/header/new-column-cell/NewColumnCell.svelte
@@ -1,15 +1,17 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { Dropdown, Icon, Spinner } from '@mathesar-component-library';
-  import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
+
   import {
-    requiredField,
-    makeForm,
     Field,
     FormSubmit,
+    makeForm,
+    requiredField,
   } from '@mathesar/components/form';
-  import { columnNameIsAvailable } from '@mathesar/utils/columnUtils';
   import { iconAddNew } from '@mathesar/icons';
+  import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
+  import { columnNameIsAvailable } from '@mathesar/utils/columnUtils';
+  import { Dropdown, Icon, Spinner } from '@mathesar-component-library';
+
   import ColumnTypeSelector from './ColumnTypeSelector.svelte';
 
   const tabularData = getTabularDataStoreFromContext();
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index b51d61b318..2bab0c1240 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -1,25 +1,22 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import {
-    ensureReadable,
-    portalToWindowFooter,
-  } from '@mathesar-component-library';
+
   import type { LinksPostRequest } from '@mathesar/api/rest/types/links';
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import { postAPI } from '@mathesar/api/rest/utils/requestUtils';
-  import SelectTable from '@mathesar/components/SelectTable.svelte';
   import {
     Field,
     FieldLayout,
+    type FilledFormValues,
     FormSubmit,
     comboInvalidIf,
     makeForm,
     requiredField,
-    type FilledFormValues,
   } from '@mathesar/components/form';
   import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
   import OutcomeBox from '@mathesar/components/message-boxes/OutcomeBox.svelte';
   import { RichText } from '@mathesar/components/rich-text';
+  import SelectTable from '@mathesar/components/SelectTable.svelte';
   import { iconTableLink } from '@mathesar/icons';
   import { currentSchemaId } from '@mathesar/stores/schemas';
   import {
@@ -40,14 +37,19 @@
   import { getAvailableName } from '@mathesar/utils/db';
   import { makeSingular } from '@mathesar/utils/languageUtils';
   import { assertExhaustive } from '@mathesar/utils/typeUtils';
+  import {
+    ensureReadable,
+    portalToWindowFooter,
+  } from '@mathesar-component-library';
+
   import Pill from './LinkTablePill.svelte';
-  import NewColumn from './NewColumn.svelte';
-  import SelectLinkType from './SelectLinkType.svelte';
   import {
+    type LinkType,
     columnNameIsNotId,
     suggestMappingTableName,
-    type LinkType,
   } from './linkTableUtils';
+  import NewColumn from './NewColumn.svelte';
+  import SelectLinkType from './SelectLinkType.svelte';
 
   const tabularData = getTabularDataStoreFromContext();
 
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableModal.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableModal.svelte
index bbe41d8bbe..865d9a169c 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableModal.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableModal.svelte
@@ -1,10 +1,12 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
+  import { currentTable } from '@mathesar/stores/tables';
   import {
     ControlledModal,
     type ModalController,
   } from '@mathesar-component-library';
-  import { currentTable } from '@mathesar/stores/tables';
+
   import LinkTableForm from './LinkTableForm.svelte';
 
   export let controller: ModalController;
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte
index 8650d3f50e..3d3b65d053 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte
@@ -1,10 +1,12 @@
 <script lang="ts">
-  import { Label, Radio } from '@mathesar-component-library';
+  import { _ } from 'svelte-i18n';
+
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import type { FieldStore } from '@mathesar/components/form';
-  import { assertExhaustive } from '@mathesar/utils/typeUtils';
-  import { _ } from 'svelte-i18n';
   import { RichText } from '@mathesar/components/rich-text';
+  import { assertExhaustive } from '@mathesar/utils/typeUtils';
+  import { Label, Radio } from '@mathesar-component-library';
+
   import Diagram from './diagram/Diagram.svelte';
   import Pill from './LinkTablePill.svelte';
   import type { LinkType } from './linkTableUtils';
diff --git a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
index 42fbfd146e..1593b6a405 100644
--- a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
@@ -1,10 +1,12 @@
 <script lang="ts">
+  import type { ComponentProps } from 'svelte';
   import { _ } from 'svelte-i18n';
+
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
-  import { Spinner } from '@mathesar-component-library';
   import { Field, type FieldStore } from '@mathesar/components/form';
   import { RichText } from '@mathesar/components/rich-text';
-  import type { ComponentProps } from 'svelte';
+  import { Spinner } from '@mathesar-component-library';
+
   import Pill from './LinkTablePill.svelte';
 
   const label = 'Column Name';
diff --git a/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte b/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
index f2591de98b..1b6e3bc0e9 100644
--- a/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import type { FieldStore } from '@mathesar/components/form';
   import FieldErrors from '@mathesar/components/form/FieldErrors.svelte';
   import FieldLayout from '@mathesar/components/form/FieldLayout.svelte';
+
   import Pill from './LinkTablePill.svelte';
   import type { LinkType } from './linkTableUtils';
   import LinkTypeOption from './LinkTypeOption.svelte';
diff --git a/mathesar_ui/src/systems/table-view/link-table/linkTableUtils.ts b/mathesar_ui/src/systems/table-view/link-table/linkTableUtils.ts
index 1ffdb70403..285b598728 100644
--- a/mathesar_ui/src/systems/table-view/link-table/linkTableUtils.ts
+++ b/mathesar_ui/src/systems/table-view/link-table/linkTableUtils.ts
@@ -1,5 +1,6 @@
 import { get } from 'svelte/store';
 import { _ } from 'svelte-i18n';
+
 import type { TableEntry } from '@mathesar/api/rest/types/tables';
 import { invalidIf } from '@mathesar/components/form';
 import { getAvailableName } from '@mathesar/utils/db';
diff --git a/mathesar_ui/src/systems/table-view/row/CellErrors.svelte b/mathesar_ui/src/systems/table-view/row/CellErrors.svelte
index acadbded7d..87cb62e581 100644
--- a/mathesar_ui/src/systems/table-view/row/CellErrors.svelte
+++ b/mathesar_ui/src/systems/table-view/row/CellErrors.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
-  import { popper, portal } from '@mathesar-component-library';
   import { onMount } from 'svelte';
 
+  import { popper, portal } from '@mathesar-component-library';
+
   export let errors: string[];
   export let forceShowErrors = false;
 
diff --git a/mathesar_ui/src/systems/table-view/row/GroupHeader.svelte b/mathesar_ui/src/systems/table-view/row/GroupHeader.svelte
index 06a739656c..9ff17dcfee 100644
--- a/mathesar_ui/src/systems/table-view/row/GroupHeader.svelte
+++ b/mathesar_ui/src/systems/table-view/row/GroupHeader.svelte
@@ -1,14 +1,15 @@
 <script lang="ts">
+  import CellBackground from '@mathesar/components/CellBackground.svelte';
   import { SheetPositionableCell } from '@mathesar/components/sheet';
   import type {
-    RecordGrouping,
-    RecordGroup,
     GroupHeaderRow,
     ProcessedColumn,
+    RecordGroup,
+    RecordGrouping,
   } from '@mathesar/stores/table-data';
   import type { RecordSummariesForSheet } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
-  import CellBackground from '@mathesar/components/CellBackground.svelte';
   import { Badge } from '@mathesar-component-library';
+
   import GroupHeaderCellValue from './GroupHeaderCellValue.svelte';
 
   export let processedColumnsMap: Map<number, ProcessedColumn>;
diff --git a/mathesar_ui/src/systems/table-view/row/GroupHeaderCellValue.svelte b/mathesar_ui/src/systems/table-view/row/GroupHeaderCellValue.svelte
index bb36f90a3b..5be54f9819 100644
--- a/mathesar_ui/src/systems/table-view/row/GroupHeaderCellValue.svelte
+++ b/mathesar_ui/src/systems/table-view/row/GroupHeaderCellValue.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-  import type { ProcessedColumn } from '@mathesar/stores/table-data';
-  import CellValue from '@mathesar/components/CellValue.svelte';
-  import type { RecordSummariesForSheet } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
   import type { ResultValue } from '@mathesar/api/rest/types/tables/records';
+  import CellValue from '@mathesar/components/CellValue.svelte';
   import LinkedRecord from '@mathesar/components/LinkedRecord.svelte';
   import { storeToGetRecordPageUrl } from '@mathesar/stores/storeBasedUrls';
+  import type { ProcessedColumn } from '@mathesar/stores/table-data';
+  import type { RecordSummariesForSheet } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
 
   export let processedColumnsMap: Map<number, ProcessedColumn>;
   export let recordSummariesForSheet: RecordSummariesForSheet;
diff --git a/mathesar_ui/src/systems/table-view/row/NewRecordMessage.svelte b/mathesar_ui/src/systems/table-view/row/NewRecordMessage.svelte
index 88782f52dd..0e6c720dbd 100644
--- a/mathesar_ui/src/systems/table-view/row/NewRecordMessage.svelte
+++ b/mathesar_ui/src/systems/table-view/row/NewRecordMessage.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import { SheetPositionableCell } from '@mathesar/components/sheet';
 
   export let columnCount: number;
diff --git a/mathesar_ui/src/systems/table-view/row/Row.svelte b/mathesar_ui/src/systems/table-view/row/Row.svelte
index 127173aef5..7bf76bfe26 100644
--- a/mathesar_ui/src/systems/table-view/row/Row.svelte
+++ b/mathesar_ui/src/systems/table-view/row/Row.svelte
@@ -1,28 +1,29 @@
 <script lang="ts">
+  import { ContextMenu } from '@mathesar/component-library';
+  import {
+    SheetCell,
+    SheetRow,
+    isRowSelected,
+  } from '@mathesar/components/sheet';
+  import { rowHeightPx } from '@mathesar/geometry';
   import {
+    ID_ROW_CONTROL_COLUMN,
+    type Row,
     getCellKey,
+    getRowKey,
     getTabularDataStoreFromContext,
+    isGroupHeaderRow,
+    isHelpTextRow,
     isNewRecordRow,
     isPlaceholderRow,
     rowHasRecord,
-    isGroupHeaderRow,
-    isHelpTextRow,
-    getRowKey,
-    ID_ROW_CONTROL_COLUMN,
-    type Row,
   } from '@mathesar/stores/table-data';
-  import {
-    SheetRow,
-    SheetCell,
-    isRowSelected,
-  } from '@mathesar/components/sheet';
-  import { rowHeightPx } from '@mathesar/geometry';
-  import { ContextMenu } from '@mathesar/component-library';
-  import NewRecordMessage from './NewRecordMessage.svelte';
+
   import GroupHeader from './GroupHeader.svelte';
+  import NewRecordMessage from './NewRecordMessage.svelte';
   import RowCell from './RowCell.svelte';
-  import RowControl from './RowControl.svelte';
   import RowContextOptions from './RowContextOptions.svelte';
+  import RowControl from './RowControl.svelte';
 
   export let row: Row;
   export let style: { [key: string]: string | number };
diff --git a/mathesar_ui/src/systems/table-view/row/RowCell.svelte b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
index ac8b183b65..e2a9625df2 100644
--- a/mathesar_ui/src/systems/table-view/row/RowCell.svelte
+++ b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
@@ -2,22 +2,14 @@
   import { tick } from 'svelte';
   import { _ } from 'svelte-i18n';
 
-  import {
-    ButtonMenuItem,
-    ContextMenu,
-    LinkMenuItem,
-    MenuDivider,
-    MenuHeading,
-    WritableMap,
-  } from '@mathesar-component-library';
   import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
   import { States } from '@mathesar/api/rest/utils/requestUtils';
+  import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
   import CellBackground from '@mathesar/components/CellBackground.svelte';
   import Identifier from '@mathesar/components/Identifier.svelte';
   import Null from '@mathesar/components/Null.svelte';
-  import RowCellBackgrounds from '@mathesar/components/RowCellBackgrounds.svelte';
-  import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
   import { RichText } from '@mathesar/components/rich-text';
+  import RowCellBackgrounds from '@mathesar/components/RowCellBackgrounds.svelte';
   import {
     SheetCell,
     isCellActive,
@@ -29,15 +21,25 @@
   import { currentSchema } from '@mathesar/stores/schemas';
   import { storeToGetRecordPageUrl } from '@mathesar/stores/storeBasedUrls';
   import {
-    rowHasNewRecord,
     type CellKey,
     type ProcessedColumn,
     type RecordRow,
     type RecordsData,
     type TabularDataSelection,
+    rowHasNewRecord,
   } from '@mathesar/stores/table-data';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
+  import {
+    ButtonMenuItem,
+    ContextMenu,
+    LinkMenuItem,
+    MenuDivider,
+    MenuHeading,
+    WritableMap,
+  } from '@mathesar-component-library';
+
   import ColumnHeaderContextMenu from '../header/header-cell/ColumnHeaderContextMenu.svelte';
+
   import CellErrors from './CellErrors.svelte';
   import RowContextOptions from './RowContextOptions.svelte';
 
diff --git a/mathesar_ui/src/systems/table-view/row/RowContextOptions.svelte b/mathesar_ui/src/systems/table-view/row/RowContextOptions.svelte
index 654dbc82c2..72384f1657 100644
--- a/mathesar_ui/src/systems/table-view/row/RowContextOptions.svelte
+++ b/mathesar_ui/src/systems/table-view/row/RowContextOptions.svelte
@@ -1,22 +1,23 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import {
-    ButtonMenuItem,
-    iconExternalLink,
-    LinkMenuItem,
-  } from '@mathesar-component-library';
+
   import { iconDeleteMajor } from '@mathesar/icons';
   import { confirmDelete } from '@mathesar/stores/confirmation';
+  import { currentDatabase } from '@mathesar/stores/databases';
+  import { currentSchema } from '@mathesar/stores/schemas';
   import { storeToGetRecordPageUrl } from '@mathesar/stores/storeBasedUrls';
   import {
+    type RecordRow,
     RecordsData,
     rowHasRecord,
-    type RecordRow,
   } from '@mathesar/stores/table-data';
   import { toast } from '@mathesar/stores/toast';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
-  import { currentDatabase } from '@mathesar/stores/databases';
-  import { currentSchema } from '@mathesar/stores/schemas';
+  import {
+    ButtonMenuItem,
+    LinkMenuItem,
+    iconExternalLink,
+  } from '@mathesar-component-library';
 
   export let row: RecordRow;
   export let recordPk: string;
diff --git a/mathesar_ui/src/systems/table-view/row/RowControl.svelte b/mathesar_ui/src/systems/table-view/row/RowControl.svelte
index 62cd88ccd1..802137d66e 100644
--- a/mathesar_ui/src/systems/table-view/row/RowControl.svelte
+++ b/mathesar_ui/src/systems/table-view/row/RowControl.svelte
@@ -1,17 +1,18 @@
 <script lang="ts">
-  import { Icon, iconLoading } from '@mathesar-component-library';
+  import CellBackground from '@mathesar/components/CellBackground.svelte';
+  import RowCellBackgrounds from '@mathesar/components/RowCellBackgrounds.svelte';
   import { iconAddNew } from '@mathesar/icons';
   import {
+    type Meta,
+    type RecordsData,
+    type Row,
     getRowKey,
     isNewRecordRow,
     isPlaceholderRow,
     rowHasRecord,
-    type Meta,
-    type RecordsData,
-    type Row,
   } from '@mathesar/stores/table-data';
-  import CellBackground from '@mathesar/components/CellBackground.svelte';
-  import RowCellBackgrounds from '@mathesar/components/RowCellBackgrounds.svelte';
+  import { Icon, iconLoading } from '@mathesar-component-library';
+
   import CellErrors from './CellErrors.svelte';
 
   export let primaryKeyColumnId: number | undefined = undefined;
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/CollapsibleHeader.svelte b/mathesar_ui/src/systems/table-view/table-inspector/CollapsibleHeader.svelte
index dee3f35693..4671649a8b 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/CollapsibleHeader.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/CollapsibleHeader.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { Icon } from '@mathesar-component-library';
+
   import { iconDatabase } from '@mathesar/icons';
+  import { Icon } from '@mathesar-component-library';
 
   export let title: string;
   export let isDbLevelConfiguration = false;
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte b/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
index 60e454a677..0f9dcd6b2a 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
@@ -1,12 +1,13 @@
 <script lang="ts">
+  import type { ComponentType } from 'svelte';
   import { _ } from 'svelte-i18n';
-  import { TabContainer } from '@mathesar-component-library';
+
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
-  import type { ComponentType } from 'svelte';
+  import { TabContainer } from '@mathesar-component-library';
+
+  import CellMode from './cell/CellMode.svelte';
   import ColumnMode from './column/ColumnMode.svelte';
   import RecordMode from './record/RecordMode.svelte';
-  import CellMode from './cell/CellMode.svelte';
-
   import TableMode from './table/TableMode.svelte';
 
   type TabItem = { label: string; id: number; component: ComponentType };
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/WithTableInspector.svelte b/mathesar_ui/src/systems/table-view/table-inspector/WithTableInspector.svelte
index 3dc854f9ad..79bf7777bb 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/WithTableInspector.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/WithTableInspector.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
-  import { WithPanel } from '@mathesar-component-library';
   import { tableInspectorWidth } from '@mathesar/stores/localStorage';
+  import { WithPanel } from '@mathesar-component-library';
+
   import TableInspector from './TableInspector.svelte';
 
   export let context: 'page' | 'widget' | 'shared-consumer-page';
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/cell/CellMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/cell/CellMode.svelte
index cb7a00bfd4..ef4fe65b70 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/cell/CellMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/cell/CellMode.svelte
@@ -8,8 +8,9 @@
    * changes to both files as necessary.
    */
   import { _ } from 'svelte-i18n';
-  import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
+
   import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
+  import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
 
   const tabularData = getTabularDataStoreFromContext();
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnActions.svelte
index fd4a439e3b..41957adf16 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnActions.svelte
@@ -1,17 +1,19 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { Button, Icon, iconSettings } from '@mathesar-component-library';
+
   import {
     iconDeleteMajor,
-    iconMoveColumnsToNewLinkedTable,
     iconMoveColumnsToExistingLinkedTable,
+    iconMoveColumnsToNewLinkedTable,
   } from '@mathesar/icons';
   import { confirmDelete } from '@mathesar/stores/confirmation';
   import { modal } from '@mathesar/stores/modal';
   import {
-    getTabularDataStoreFromContext,
     type ProcessedColumn,
+    getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
+  import { Button, Icon, iconSettings } from '@mathesar-component-library';
+
   import ExtractColumnsModal from './column-extraction/ExtractColumnsModal.svelte';
   import { ExtractColumnsModalController } from './column-extraction/ExtractColumnsModalController';
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte
index 1499902d15..3ed265bb0f 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
   import { createValidationContext } from '@mathesar/component-library';
   import CancelOrProceedButtonPair from '@mathesar/component-library/cancel-or-proceed-button-pair/CancelOrProceedButtonPair.svelte';
@@ -7,8 +8,8 @@
   import type { ColumnWithAbstractType } from '@mathesar/components/abstract-type-control/types';
   import { constructDisplayForm } from '@mathesar/components/abstract-type-control/utils';
   import {
-    getTabularDataStoreFromContext,
     type ProcessedColumn,
+    getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
   import { toast } from '@mathesar/stores/toast';
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
index 910e68a977..06522c581f 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
@@ -1,19 +1,22 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { Collapsible } from '@mathesar-component-library';
-  import { tables } from '@mathesar/stores/tables';
-  import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
-  import FkRecordSummaryConfig from '@mathesar/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
+
   import { currentDatabase } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
-  import ColumnNameAndDescription from './ColumnNameAndDescription.svelte';
+  import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
+  import { tables } from '@mathesar/stores/tables';
+  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
+  import FkRecordSummaryConfig from '@mathesar/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte';
+  import { Collapsible } from '@mathesar-component-library';
+
+  import CollapsibleHeader from '../CollapsibleHeader.svelte';
+
   import ColumnActions from './ColumnActions.svelte';
+  import ColumnFormatting from './ColumnFormatting.svelte';
+  import ColumnNameAndDescription from './ColumnNameAndDescription.svelte';
   import ColumnOptions from './ColumnOptions.svelte';
   import ColumnType from './ColumnType.svelte';
-  import CollapsibleHeader from '../CollapsibleHeader.svelte';
   import ColumnTypeSpecifierTag from './ColumnTypeSpecifierTag.svelte';
-  import ColumnFormatting from './ColumnFormatting.svelte';
   import SetDefaultValue from './SetDefaultValue.svelte';
 
   const tabularData = getTabularDataStoreFromContext();
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnNameAndDescription.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnNameAndDescription.svelte
index 0d41fd73bd..58f552d10c 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnNameAndDescription.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnNameAndDescription.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import EditableTextWithActions from '@mathesar/components/EditableTextWithActions.svelte';
   import type {
     ColumnsDataStore,
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnOptions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnOptions.svelte
index 36ed3e7531..d2fcec6a54 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnOptions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnOptions.svelte
@@ -1,21 +1,22 @@
 <script lang="ts">
+  import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
-  import {
-    Icon,
-    Checkbox,
-    iconLoading,
-    Help,
-    LabeledInput,
-  } from '@mathesar-component-library';
+
   import { RichText } from '@mathesar/components/rich-text';
   import type {
     ColumnsDataStore,
-    ProcessedColumn,
     ConstraintsDataStore,
+    ProcessedColumn,
   } from '@mathesar/stores/table-data';
   import { toast } from '@mathesar/stores/toast';
   import { getErrorMessage } from '@mathesar/utils/errors';
-  import { createEventDispatcher } from 'svelte';
+  import {
+    Checkbox,
+    Help,
+    Icon,
+    LabeledInput,
+    iconLoading,
+  } from '@mathesar-component-library';
 
   export let column: ProcessedColumn;
   export let columnsDataStore: ColumnsDataStore;
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnType.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnType.svelte
index 90ed770924..9000c3b47b 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnType.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnType.svelte
@@ -1,13 +1,14 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import {
-    getTabularDataStoreFromContext,
-    type ProcessedColumn,
-  } from '@mathesar/stores/table-data';
+
   import { AbstractTypeControl } from '@mathesar/components/abstract-type-control';
-  import type { ColumnTypeOptionsSaveArgs } from '@mathesar/components/abstract-type-control/types';
   import AbstractTypeSelector from '@mathesar/components/abstract-type-control/AbstractTypeSelector.svelte';
+  import type { ColumnTypeOptionsSaveArgs } from '@mathesar/components/abstract-type-control/types';
   import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
+  import {
+    type ProcessedColumn,
+    getTabularDataStoreFromContext,
+  } from '@mathesar/stores/table-data';
 
   const tabularData = getTabularDataStoreFromContext();
   $: ({ columnsDataStore } = $tabularData);
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnTypeSpecifierTag.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnTypeSpecifierTag.svelte
index 0478ce34e9..6802e8bff3 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnTypeSpecifierTag.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnTypeSpecifierTag.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { Icon, iconExternalLink } from '@mathesar-component-library';
+
   import TableName from '@mathesar/components/TableName.svelte';
   import { iconConstraint } from '@mathesar/icons';
   import { storeToGetTablePageUrl } from '@mathesar/stores/storeBasedUrls';
   import type { ProcessedColumn } from '@mathesar/stores/table-data';
   import { tables } from '@mathesar/stores/tables';
+  import { Icon, iconExternalLink } from '@mathesar-component-library';
 
   export let type: 'primaryKey' | 'foreignKey';
   export let column: ProcessedColumn;
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte
index a67ec1f88d..eb98ec1f1a 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte
@@ -1,17 +1,18 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
-  import {
-    CancelOrProceedButtonPair,
-    LabeledInput,
-    Radio,
-  } from '@mathesar-component-library';
   import DynamicInput from '@mathesar/components/cell-fabric/DynamicInput.svelte';
   import {
-    getTabularDataStoreFromContext,
     type ProcessedColumn,
+    getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
   import { toast } from '@mathesar/stores/toast';
+  import {
+    CancelOrProceedButtonPair,
+    LabeledInput,
+    Radio,
+  } from '@mathesar-component-library';
 
   export let column: ProcessedColumn;
   export let canExecuteDDL: boolean;
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
index 748ab210eb..5835280b4f 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
@@ -2,22 +2,23 @@
   import { tick } from 'svelte';
   import { get } from 'svelte/store';
   import { _ } from 'svelte-i18n';
-  import { ControlledModal } from '@mathesar-component-library';
+
   import {
-    comboValidator,
     Field,
     FormSubmit,
+    comboValidator,
     makeForm,
     requiredField,
   } from '@mathesar/components/form';
   import FieldLayout from '@mathesar/components/form/FieldLayout.svelte';
   import OutcomeBox from '@mathesar/components/message-boxes/OutcomeBox.svelte';
+  import { RichText } from '@mathesar/components/rich-text';
   import SelectProcessedColumns from '@mathesar/components/SelectProcessedColumns.svelte';
   import { scrollBasedOnSelection } from '@mathesar/components/sheet';
   import TableName from '@mathesar/components/TableName.svelte';
   import {
-    getTabularDataStoreFromContext,
     type ProcessedColumn,
+    getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
   import {
     getTableFromStoreOrApi,
@@ -32,7 +33,8 @@
     getSuggestedFkColumnName,
   } from '@mathesar/utils/columnUtils';
   import { getErrorMessage } from '@mathesar/utils/errors';
-  import { RichText } from '@mathesar/components/rich-text';
+  import { ControlledModal } from '@mathesar-component-library';
+
   import type { LinkedTable } from './columnExtractionTypes';
   import {
     getLinkedTables,
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModalController.ts b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModalController.ts
index f9bf9ae07a..3f688ab871 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModalController.ts
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModalController.ts
@@ -1,8 +1,10 @@
+import { get, writable } from 'svelte/store';
 import { _ } from 'svelte-i18n';
-import { ModalController } from '@mathesar-component-library';
+
 import { invalidIf, requiredField } from '@mathesar/components/form';
 import type { ProcessedColumn } from '@mathesar/stores/table-data';
-import { writable, get } from 'svelte/store';
+import { ModalController } from '@mathesar-component-library';
+
 import type { ColumnExtractionTargetType } from './columnExtractionTypes';
 
 export class ExtractColumnsModalController extends ModalController {
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/LinkedTableName.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/LinkedTableName.svelte
index e818283d43..9577f8c298 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/LinkedTableName.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/LinkedTableName.svelte
@@ -1,8 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import ProcessedColumnName from '@mathesar/components/column/ProcessedColumnName.svelte';
-  import TableName from '@mathesar/components/TableName.svelte';
   import { RichText } from '@mathesar/components/rich-text';
+  import TableName from '@mathesar/components/TableName.svelte';
+
   import type { LinkedTable } from './columnExtractionTypes';
 
   export let linkedTable: LinkedTable;
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/SelectLinkedTable.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/SelectLinkedTable.svelte
index 8e0ecd7709..fb667bdb8d 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/SelectLinkedTable.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/SelectLinkedTable.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { Select } from '@mathesar/component-library';
+
   import type { LinkedTable } from './columnExtractionTypes';
   import LinkedTableName from './LinkedTableName.svelte';
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/SuccessToastContent.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/SuccessToastContent.svelte
index 3836b283d4..c549203888 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/SuccessToastContent.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/SuccessToastContent.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
   import { iconTableLink } from '@mathesar/icons';
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts
index c822c9058e..40b4fb240e 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts
@@ -1,5 +1,6 @@
-import { _ } from 'svelte-i18n';
 import { get } from 'svelte/store';
+import { _ } from 'svelte-i18n';
+
 import type { TableEntry } from '@mathesar/api/rest/types/tables';
 import type { FkConstraint } from '@mathesar/api/rest/types/tables/constraints';
 import { isDefinedNonNullable } from '@mathesar/component-library';
@@ -9,9 +10,9 @@ import {
   valid,
 } from '@mathesar/components/form';
 import {
-  constraintIsFk,
   type Constraint,
   type ProcessedColumn,
+  constraintIsFk,
 } from '@mathesar/stores/table-data';
 
 import type { LinkedTable } from './columnExtractionTypes';
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/AppendColumn.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/AppendColumn.svelte
index ad08d6ce67..1964dfceca 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/AppendColumn.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/AppendColumn.svelte
@@ -1,13 +1,14 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { ButtonMenuItem, DropdownMenu } from '@mathesar-component-library';
-  import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
+
   import type { Column } from '@mathesar/api/rest/types/tables/columns';
   import { iconAddNew, iconConstraint, iconTableLink } from '@mathesar/icons';
+  import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import {
-    getColumnIconProps,
     getColumnConstraintTypeByColumnId,
+    getColumnIconProps,
   } from '@mathesar/utils/columnUtils';
+  import { ButtonMenuItem, DropdownMenu } from '@mathesar-component-library';
 
   const tabularData = getTabularDataStoreFromContext();
   $: ({ processedColumns } = $tabularData);
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
index 19f64ad5ce..86afae45c2 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
-  import { Meta, TabularData } from '@mathesar/stores/table-data';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
+  import { Meta, TabularData } from '@mathesar/stores/table-data';
   import RecordSummaryConfig from '@mathesar/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte';
   import Pagination from '@mathesar/utils/Pagination';
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
index 5f340861ba..a9d6fe83d8 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { RadioGroup, Spinner } from '@mathesar-component-library';
+
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import {
     FormSubmit,
@@ -21,6 +21,8 @@
   import { toast } from '@mathesar/stores/toast';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { getErrorMessage } from '@mathesar/utils/errors';
+  import { RadioGroup, Spinner } from '@mathesar-component-library';
+
   import {
     columnIsConformant,
     getColumnsInTemplate,
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/TemplateInput.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/TemplateInput.svelte
index 298548924a..41fbde2f6e 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/TemplateInput.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/TemplateInput.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
   import type { ComponentProps } from 'svelte';
 
-  import { FormattedInput } from '@mathesar-component-library';
   import type { Column } from '@mathesar/api/rest/types/tables/columns';
-  import TemplateInputFormatter from './TemplateInputFormatter';
+  import { FormattedInput } from '@mathesar-component-library';
+
   import AppendColumn from './AppendColumn.svelte';
+  import TemplateInputFormatter from './TemplateInputFormatter';
 
   interface $$Props
     extends Omit<ComponentProps<FormattedInput<string>>, 'formatter'> {
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/TemplateInputFormatter.ts b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/TemplateInputFormatter.ts
index a34264eed9..ccde20fa73 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/TemplateInputFormatter.ts
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/TemplateInputFormatter.ts
@@ -2,9 +2,10 @@ import type {
   InputFormatter,
   ParseResult,
 } from '@mathesar-component-library/types';
+
 import {
-  columnIsConformant,
   type ColumnLike,
+  columnIsConformant,
 } from './recordSummaryTemplateUtils';
 
 export default class TemplateInputFormatter implements InputFormatter<string> {
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/recordSummaryTemplateUtils.ts b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/recordSummaryTemplateUtils.ts
index 01f5c4624e..23d38882bf 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/recordSummaryTemplateUtils.ts
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/recordSummaryTemplateUtils.ts
@@ -1,7 +1,8 @@
 import { get } from 'svelte/store';
 import { _ } from 'svelte-i18n';
+
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
-import { validIf, type ValidationFn } from '@mathesar/components/form';
+import { type ValidationFn, validIf } from '@mathesar/components/form';
 
 export type ColumnLike = Pick<Column, 'id' | 'name'>;
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
index 6bf84a9bda..f71655becd 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
@@ -1,12 +1,15 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { Collapsible } from '@mathesar-component-library';
+
   import { getSelectedRowIndex } from '@mathesar/components/sheet';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
+  import { Collapsible } from '@mathesar-component-library';
+
   import CollapsibleHeader from '../CollapsibleHeader.svelte';
+
   import RowActions from './RowActions.svelte';
 
   const tabularData = getTabularDataStoreFromContext();
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
index e06fd66f68..dd9aa2050c 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
@@ -1,11 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import {
-    AnchorButton,
-    Button,
-    Icon,
-    iconExternalLink,
-  } from '@mathesar-component-library';
+
   import { iconDeleteMajor, iconRecord } from '@mathesar/icons';
   import { confirmDelete } from '@mathesar/stores/confirmation';
   import { storeToGetRecordPageUrl } from '@mathesar/stores/storeBasedUrls';
@@ -16,6 +11,12 @@
   } from '@mathesar/stores/table-data';
   import { getPkValueInRecord } from '@mathesar/stores/table-data/records';
   import { toast } from '@mathesar/stores/toast';
+  import {
+    AnchorButton,
+    Button,
+    Icon,
+    iconExternalLink,
+  } from '@mathesar-component-library';
 
   export let selectedRowIndices: number[];
   export let recordsData: RecordsData;
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/AdvancedActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/AdvancedActions.svelte
index 49b6bf9dc9..557b265286 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/AdvancedActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/AdvancedActions.svelte
@@ -1,13 +1,15 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
+  import { iconConstraint } from '@mathesar/icons';
+  import { modal } from '@mathesar/stores/modal';
   import {
     Button,
     Help,
     Icon,
     iconSettings,
   } from '@mathesar-component-library';
-  import { iconConstraint } from '@mathesar/icons';
-  import { modal } from '@mathesar/stores/modal';
+
   import TableConstraintsModal from '../../constraints/TableConstraintsModal.svelte';
 
   const constraintsModal = modal.spawnModalController();
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
index 25869f95a4..f24e68428b 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
@@ -1,13 +1,7 @@
 <script lang="ts">
-  import { router } from 'tinro';
   import { _ } from 'svelte-i18n';
-  import {
-    AnchorButton,
-    Button,
-    Help,
-    Icon,
-    iconExternalLink,
-  } from '@mathesar-component-library';
+  import { router } from 'tinro';
+
   import { iconDeleteMajor, iconExploration } from '@mathesar/icons';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
   import { confirmDelete } from '@mathesar/stores/confirmation';
@@ -19,6 +13,14 @@
     constructDataExplorerUrlToSummarizeFromGroup,
     createDataExplorerUrlToExploreATable,
   } from '@mathesar/systems/data-explorer';
+  import {
+    AnchorButton,
+    Button,
+    Help,
+    Icon,
+    iconExternalLink,
+  } from '@mathesar-component-library';
+
   import TableDeleteConfirmationBody from './TableDeleteConfirmationBody.svelte';
 
   export let canExecuteDDL: boolean;
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableDeleteConfirmationBody.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableDeleteConfirmationBody.svelte
index 1d2d42b261..49380154b2 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableDeleteConfirmationBody.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableDeleteConfirmationBody.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { TextInput } from '@mathesar-component-library';
-  import { RichText } from '@mathesar/components/rich-text';
+
   import WarningBox from '@mathesar/components/message-boxes/WarningBox.svelte';
+  import { RichText } from '@mathesar/components/rich-text';
   import { confirmationController } from '@mathesar/stores/confirmation';
+  import { TextInput } from '@mathesar-component-library';
 
   export let tableName: string;
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
index 211eeeba20..afe973e18f 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import EditableTextWithActions from '@mathesar/components/EditableTextWithActions.svelte';
   import EditTableHOC from '@mathesar/components/EditTableHOC.svelte';
-  import { tables } from '@mathesar/stores/tables';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
+  import { tables } from '@mathesar/stores/tables';
 
   const tabularData = getTabularDataStoreFromContext();
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
index c902e78ab3..eac7f41abb 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
@@ -1,18 +1,21 @@
 <script>
   import { _ } from 'svelte-i18n';
-  import { Collapsible } from '@mathesar-component-library';
+
+  import { currentDatabase } from '@mathesar/stores/databases';
+  import { currentSchema } from '@mathesar/stores/schemas';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import { currentTable } from '@mathesar/stores/tables';
-  import RecordSummaryConfig from '@mathesar/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
-  import { currentDatabase } from '@mathesar/stores/databases';
-  import { currentSchema } from '@mathesar/stores/schemas';
-  import TableName from './TableName.svelte';
-  import TableActions from './TableActions.svelte';
+  import RecordSummaryConfig from '@mathesar/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte';
+  import { Collapsible } from '@mathesar-component-library';
+
   import CollapsibleHeader from '../CollapsibleHeader.svelte';
+
   import AdvancedActions from './AdvancedActions.svelte';
   import TableLinks from './links/TableLinks.svelte';
+  import TableActions from './TableActions.svelte';
   import TableDescription from './TableDescription.svelte';
+  import TableName from './TableName.svelte';
 
   const tabularData = getTabularDataStoreFromContext();
   const userProfile = getUserProfileStoreFromContext();
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
index dc955eeaed..f78e0debe5 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import EditableTextWithActions from '@mathesar/components/EditableTextWithActions.svelte';
   import EditTableHOC from '@mathesar/components/EditTableHOC.svelte';
-  import { tables } from '@mathesar/stores/tables';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
+  import { tables } from '@mathesar/stores/tables';
 
   const tabularData = getTabularDataStoreFromContext();
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkItem.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkItem.svelte
index b1627ea974..910abe4286 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkItem.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkItem.svelte
@@ -1,8 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
+  import { RichText } from '@mathesar/components/rich-text';
   import TableName from '@mathesar/components/TableName.svelte';
   import { storeToGetTablePageUrl } from '@mathesar/stores/storeBasedUrls';
-  import { RichText } from '@mathesar/components/rich-text';
+
   import type { TableLink } from './utils';
 
   export let link: TableLink;
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkSection.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkSection.svelte
index 23f7d4fede..8542093578 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkSection.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkSection.svelte
@@ -1,13 +1,15 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { Icon } from '@mathesar-component-library';
+
   import {
     iconLinksFromOtherTables,
     iconLinksInThisTable,
   } from '@mathesar/icons';
   import { MissingExhaustiveConditionError } from '@mathesar/utils/errors';
-  import type { TableLink, TableLinkType } from './utils';
+  import { Icon } from '@mathesar-component-library';
+
   import LinkItem from './LinkItem.svelte';
+  import type { TableLink, TableLinkType } from './utils';
 
   export let links: TableLink[];
   export let type: TableLinkType;
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinksSectionContainer.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinksSectionContainer.svelte
index 9c7cd18cfd..5089033ad3 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinksSectionContainer.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinksSectionContainer.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { Icon, Button } from '@mathesar-component-library';
+
   import { iconAddNew } from '@mathesar/icons';
   import { modal } from '@mathesar/stores/modal';
   import LinkTableModal from '@mathesar/systems/table-view/link-table/LinkTableModal.svelte';
+  import { Button, Icon } from '@mathesar-component-library';
+
   import LinkSection from './LinkSection.svelte';
   import type { TableLink } from './utils';
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/links/TableLinks.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/links/TableLinks.svelte
index 26a5d77a62..c1b86ad8fe 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/links/TableLinks.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/links/TableLinks.svelte
@@ -2,6 +2,7 @@
   import { Spinner } from '@mathesar/component-library';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import { getJoinableTablesResult } from '@mathesar/stores/tables';
+
   import LinksSectionContainer from './LinksSectionContainer.svelte';
   import { getTableLinks } from './utils';
 
diff --git a/mathesar_ui/src/systems/users-and-permissions/AccessControlRow.svelte b/mathesar_ui/src/systems/users-and-permissions/AccessControlRow.svelte
index 3fbfdfd3a3..1d3be23413 100644
--- a/mathesar_ui/src/systems/users-and-permissions/AccessControlRow.svelte
+++ b/mathesar_ui/src/systems/users-and-permissions/AccessControlRow.svelte
@@ -1,28 +1,29 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
+  import type { UserRole } from '@mathesar/api/rest/users';
   import {
-    Chip,
-    Icon,
-    SpinnerButton,
-    Button,
-    Help,
-    Tooltip,
-  } from '@mathesar-component-library';
-  import {
-    iconUser,
-    iconDeleteMajor,
     iconDatabase,
+    iconDeleteMajor,
     iconSchema,
+    iconUser,
   } from '@mathesar/icons';
   import type { UserModel } from '@mathesar/stores/users';
-  import type { UserRole } from '@mathesar/api/rest/users';
   import {
-    getDisplayNameForRole,
+    type AccessControlObject,
+    type ObjectRoleMap,
     getDescriptionForRole,
+    getDisplayNameForRole,
     getObjectWithHighestPrecedenceByRoles,
-    type ObjectRoleMap,
-    type AccessControlObject,
   } from '@mathesar/utils/permissions';
+  import {
+    Button,
+    Chip,
+    Help,
+    Icon,
+    SpinnerButton,
+    Tooltip,
+  } from '@mathesar-component-library';
 
   export let userProfile: UserModel | undefined;
   export let userModel: UserModel;
diff --git a/mathesar_ui/src/systems/users-and-permissions/AccessControlView.svelte b/mathesar_ui/src/systems/users-and-permissions/AccessControlView.svelte
index 20521f7719..9aa9679357 100644
--- a/mathesar_ui/src/systems/users-and-permissions/AccessControlView.svelte
+++ b/mathesar_ui/src/systems/users-and-permissions/AccessControlView.svelte
@@ -1,24 +1,26 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
+  import type { UserRole } from '@mathesar/api/rest/users';
+  import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
+  import { iconAddNew } from '@mathesar/icons';
+  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
+  import type { UserModel } from '@mathesar/stores/users';
+  import { getErrorMessage } from '@mathesar/utils/errors';
   import {
+    type AccessControlObject,
+    type ObjectRoleMap,
+    getDisplayNameForRole,
+  } from '@mathesar/utils/permissions';
+  import {
+    Button,
+    Help,
+    Icon,
     LabeledInput,
     Select,
     SpinnerButton,
-    Button,
-    Icon,
-    Help,
   } from '@mathesar-component-library';
-  import { iconAddNew } from '@mathesar/icons';
-  import type { UserRole } from '@mathesar/api/rest/users';
-  import {
-    getDisplayNameForRole,
-    type ObjectRoleMap,
-    type AccessControlObject,
-  } from '@mathesar/utils/permissions';
-  import type { UserModel } from '@mathesar/stores/users';
-  import { getErrorMessage } from '@mathesar/utils/errors';
-  import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
+
   import AccessControlRow from './AccessControlRow.svelte';
 
   const roles: UserRole[] = ['viewer', 'editor', 'manager'];
diff --git a/mathesar_ui/src/systems/users-and-permissions/PasswordChangeForm.svelte b/mathesar_ui/src/systems/users-and-permissions/PasswordChangeForm.svelte
index bfb0ce5386..5c7f775806 100644
--- a/mathesar_ui/src/systems/users-and-permissions/PasswordChangeForm.svelte
+++ b/mathesar_ui/src/systems/users-and-permissions/PasswordChangeForm.svelte
@@ -1,23 +1,24 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
+  import userApi, { type User } from '@mathesar/api/rest/users';
   import {
-    PasswordInput,
-    Button,
-    hasProperty,
-  } from '@mathesar-component-library';
-  import {
-    requiredField,
-    makeForm,
     FormSubmit,
-    optionalField,
     comboMustBeEqual,
+    makeForm,
+    optionalField,
+    requiredField,
   } from '@mathesar/components/form';
+  import GridFormInput from '@mathesar/components/form/GridFormInput.svelte';
+  import GridFormInputRow from '@mathesar/components/form/GridFormInputRow.svelte';
+  import WarningBox from '@mathesar/components/message-boxes/WarningBox.svelte';
   import { iconSave } from '@mathesar/icons';
-  import userApi, { type User } from '@mathesar/api/rest/users';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
-  import WarningBox from '@mathesar/components/message-boxes/WarningBox.svelte';
-  import GridFormInputRow from '@mathesar/components/form/GridFormInputRow.svelte';
-  import GridFormInput from '@mathesar/components/form/GridFormInput.svelte';
+  import {
+    Button,
+    PasswordInput,
+    hasProperty,
+  } from '@mathesar-component-library';
 
   const userProfileStore = getUserProfileStoreFromContext();
   $: userProfile = $userProfileStore;
diff --git a/mathesar_ui/src/systems/users-and-permissions/SelectDisplayLanguage.svelte b/mathesar_ui/src/systems/users-and-permissions/SelectDisplayLanguage.svelte
index f05bc6f9bf..1268590f43 100644
--- a/mathesar_ui/src/systems/users-and-permissions/SelectDisplayLanguage.svelte
+++ b/mathesar_ui/src/systems/users-and-permissions/SelectDisplayLanguage.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import { Select } from '@mathesar-component-library';
   import type { Language } from '@mathesar/i18n/languages/utils';
   import { preloadCommonData } from '@mathesar/utils/preloadData';
+  import { Select } from '@mathesar-component-library';
 
   const commonData = preloadCommonData();
   const supportedLanguages = commonData.supported_languages ?? {};
diff --git a/mathesar_ui/src/systems/users-and-permissions/SelectUserType.svelte b/mathesar_ui/src/systems/users-and-permissions/SelectUserType.svelte
index f8f81c8c11..a246f718a3 100644
--- a/mathesar_ui/src/systems/users-and-permissions/SelectUserType.svelte
+++ b/mathesar_ui/src/systems/users-and-permissions/SelectUserType.svelte
@@ -1,6 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import { Select } from '@mathesar-component-library';
+
   import type { UserType } from './utils';
 
   const userTypes: UserType[] = ['standard', 'admin'];
diff --git a/mathesar_ui/src/systems/users-and-permissions/UserDetailsForm.svelte b/mathesar_ui/src/systems/users-and-permissions/UserDetailsForm.svelte
index b46e03b9c8..3dc3df7904 100644
--- a/mathesar_ui/src/systems/users-and-permissions/UserDetailsForm.svelte
+++ b/mathesar_ui/src/systems/users-and-permissions/UserDetailsForm.svelte
@@ -1,15 +1,12 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
-  import type { UnionToIntersection } from 'type-fest';
   import { _ } from 'svelte-i18n';
-  import {
-    PasswordInput,
-    TextInput,
-    hasProperty,
-  } from '@mathesar-component-library';
+  import type { UnionToIntersection } from 'type-fest';
+
   import userApi, { type User } from '@mathesar/api/rest/users';
   import { extractDetailedFieldBasedErrors } from '@mathesar/api/rest/utils/errors';
   import {
+    type FieldStore,
     FormSubmit,
     isEmail,
     makeForm,
@@ -17,14 +14,19 @@
     maxLength,
     optionalField,
     requiredField,
-    type FieldStore,
   } from '@mathesar/components/form';
-  import { iconSave, iconUndo } from '@mathesar/icons';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import GridFormInput from '@mathesar/components/form/GridFormInput.svelte';
   import { setLanguage } from '@mathesar/i18n';
-  import SelectUserType from './SelectUserType.svelte';
+  import { iconSave, iconUndo } from '@mathesar/icons';
+  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
+  import {
+    PasswordInput,
+    TextInput,
+    hasProperty,
+  } from '@mathesar-component-library';
+
   import SelectDisplayLanguage from './SelectDisplayLanguage.svelte';
+  import SelectUserType from './SelectUserType.svelte';
 
   const dispatch = createEventDispatcher<{ create: User; update: undefined }>();
   const userProfileStore = getUserProfileStoreFromContext();
diff --git a/mathesar_ui/src/systems/users-and-permissions/utils.ts b/mathesar_ui/src/systems/users-and-permissions/utils.ts
index e7053f91e0..9c60e6ab89 100644
--- a/mathesar_ui/src/systems/users-and-permissions/utils.ts
+++ b/mathesar_ui/src/systems/users-and-permissions/utils.ts
@@ -1,7 +1,7 @@
-import type { IconProps } from '@mathesar-component-library/types';
-import { iconUser, iconAdminUser } from '@mathesar/icons';
-import { MissingExhaustiveConditionError } from '@mathesar/utils/errors';
+import { iconAdminUser, iconUser } from '@mathesar/icons';
 import type { UserModel } from '@mathesar/stores/users';
+import { MissingExhaustiveConditionError } from '@mathesar/utils/errors';
+import type { IconProps } from '@mathesar-component-library/types';
 
 export type UserType = 'admin' | 'standard';
 
diff --git a/mathesar_ui/src/utils/cachedFetchStore.ts b/mathesar_ui/src/utils/cachedFetchStore.ts
index 632ed3c9ef..80194766dd 100644
--- a/mathesar_ui/src/utils/cachedFetchStore.ts
+++ b/mathesar_ui/src/utils/cachedFetchStore.ts
@@ -1,4 +1,4 @@
-import { writable, type Readable, type Writable } from 'svelte/store';
+import { type Readable, type Writable, writable } from 'svelte/store';
 
 function deserialize<T>(s: string): T | undefined {
   try {
diff --git a/mathesar_ui/src/utils/columnUtils.ts b/mathesar_ui/src/utils/columnUtils.ts
index f6f3460ad9..15a83b5e3d 100644
--- a/mathesar_ui/src/utils/columnUtils.ts
+++ b/mathesar_ui/src/utils/columnUtils.ts
@@ -1,16 +1,17 @@
 import { get } from 'svelte/store';
 
-import type { IconProps } from '@mathesar-component-library/types';
 import type { TableEntry } from '@mathesar/api/rest/types/tables';
 import type { DisplayColumn } from '@mathesar/components/column/types';
-import { uniqueWith, type ValidationFn } from '@mathesar/components/form';
+import { type ValidationFn, uniqueWith } from '@mathesar/components/form';
 import { iconConstraint, iconTableLink } from '@mathesar/icons';
 import {
   currentDbAbstractTypes,
   getAbstractTypeForDbType,
 } from '@mathesar/stores/abstract-types';
-import { getAvailableName } from '@mathesar/utils/db';
 import type { ProcessedColumn } from '@mathesar/stores/table-data';
+import { getAvailableName } from '@mathesar/utils/db';
+import type { IconProps } from '@mathesar-component-library/types';
+
 import { makeSingular } from './languageUtils';
 
 export function getColumnIconProps(
diff --git a/mathesar_ui/src/utils/date-time/DateTimeFormatter.ts b/mathesar_ui/src/utils/date-time/DateTimeFormatter.ts
index 60cbf19d47..36bcc84b1a 100644
--- a/mathesar_ui/src/utils/date-time/DateTimeFormatter.ts
+++ b/mathesar_ui/src/utils/date-time/DateTimeFormatter.ts
@@ -3,6 +3,7 @@ import type {
   InputFormatter,
   ParseResult,
 } from '@mathesar-component-library/types';
+
 import type DateTimeSpecification from './DateTimeSpecification';
 
 export default class DateTimeFormatter implements InputFormatter<string> {
diff --git a/mathesar_ui/src/utils/date-time/DateTimeSpecification.ts b/mathesar_ui/src/utils/date-time/DateTimeSpecification.ts
index 4c86a4c74f..4c775e0fb4 100644
--- a/mathesar_ui/src/utils/date-time/DateTimeSpecification.ts
+++ b/mathesar_ui/src/utils/date-time/DateTimeSpecification.ts
@@ -1,8 +1,8 @@
-import { dayjs } from '@mathesar-component-library';
 import type {
   DateFormat,
   TimeFormat,
 } from '@mathesar/api/rest/types/tables/columns';
+import { dayjs } from '@mathesar-component-library';
 
 interface DateConfig {
   type: 'date';
diff --git a/mathesar_ui/src/utils/duration/DurationFormatter.ts b/mathesar_ui/src/utils/duration/DurationFormatter.ts
index 58fd3842be..a9408b4476 100644
--- a/mathesar_ui/src/utils/duration/DurationFormatter.ts
+++ b/mathesar_ui/src/utils/duration/DurationFormatter.ts
@@ -1,10 +1,12 @@
-import { dayjs } from '@mathesar-component-library';
 import type { Duration, DurationUnitType } from 'dayjs/plugin/duration';
+
+import type { DurationUnit } from '@mathesar/api/rest/types/tables/columns';
+import { dayjs } from '@mathesar-component-library';
 import type {
   InputFormatter,
   ParseResult,
 } from '@mathesar-component-library/types';
-import type { DurationUnit } from '@mathesar/api/rest/types/tables/columns';
+
 import type DurationSpecification from './DurationSpecification';
 
 const FLOAT_REGEX = /^((\.?\d+)|(\d+(\.\d+)?))$/;
diff --git a/mathesar_ui/src/utils/duration/__tests__/DurationFormatter.test.ts b/mathesar_ui/src/utils/duration/__tests__/DurationFormatter.test.ts
index e3a830cf11..ce3d961aa2 100644
--- a/mathesar_ui/src/utils/duration/__tests__/DurationFormatter.test.ts
+++ b/mathesar_ui/src/utils/duration/__tests__/DurationFormatter.test.ts
@@ -1,6 +1,6 @@
 import DurationFormatter from '../DurationFormatter';
-import DurationSpecification from '../DurationSpecification';
 import type { DurationConfig } from '../DurationSpecification';
+import DurationSpecification from '../DurationSpecification';
 
 describe('parse', () => {
   // prettier-ignore
diff --git a/mathesar_ui/src/utils/overflowObserver.ts b/mathesar_ui/src/utils/overflowObserver.ts
index 6348d46c5e..238b8d7364 100644
--- a/mathesar_ui/src/utils/overflowObserver.ts
+++ b/mathesar_ui/src/utils/overflowObserver.ts
@@ -1,5 +1,5 @@
-import { writable, type Writable } from 'svelte/store';
 import type { ActionReturn } from 'svelte/action';
+import { type Writable, writable } from 'svelte/store';
 
 export interface OverflowDetails {
   hasOverflowTop: Writable<boolean>;
diff --git a/mathesar_ui/src/utils/permissions.ts b/mathesar_ui/src/utils/permissions.ts
index d422b4c8e9..bef4020a72 100644
--- a/mathesar_ui/src/utils/permissions.ts
+++ b/mathesar_ui/src/utils/permissions.ts
@@ -1,5 +1,6 @@
 import { get } from 'svelte/store';
 import { _ } from 'svelte-i18n';
+
 import type { UserRole } from '@mathesar/api/rest/users';
 import { MissingExhaustiveConditionError } from '@mathesar/utils/errors';
 
diff --git a/mathesar_ui/src/utils/preloadData.ts b/mathesar_ui/src/utils/preloadData.ts
index 8855b7a177..09a3acc76e 100644
--- a/mathesar_ui/src/utils/preloadData.ts
+++ b/mathesar_ui/src/utils/preloadData.ts
@@ -1,8 +1,8 @@
-import type { SchemaResponse, AbstractTypeResponse } from '@mathesar/AppTypes';
-import type { TableEntry } from '@mathesar/api/rest/types/tables';
-import type { QueryInstance } from '@mathesar/api/rest/types/queries';
 import type { Connection } from '@mathesar/api/rest/connections';
+import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+import type { TableEntry } from '@mathesar/api/rest/types/tables';
 import type { User } from '@mathesar/api/rest/users';
+import type { AbstractTypeResponse, SchemaResponse } from '@mathesar/AppTypes';
 
 export interface CommonData {
   connections: Connection[];
diff --git a/mathesar_ui/src/utils/tables.ts b/mathesar_ui/src/utils/tables.ts
index fb8f80de21..3a8bcab41e 100644
--- a/mathesar_ui/src/utils/tables.ts
+++ b/mathesar_ui/src/utils/tables.ts
@@ -1,9 +1,9 @@
 import type { TableEntry } from '@mathesar/api/rest/types/tables';
-import type { ProcessedColumn } from '@mathesar/stores/table-data';
 import {
   getImportPreviewPageUrl,
   getTablePageUrl,
 } from '@mathesar/routes/urls';
+import type { ProcessedColumn } from '@mathesar/stores/table-data';
 
 export function isTableImportConfirmationRequired(
   table: Partial<Pick<TableEntry, 'import_verified' | 'data_files'>>,
diff --git a/mathesar_ui/src/utils/typeUtils.ts b/mathesar_ui/src/utils/typeUtils.ts
index ecfa1c7053..f5c61f6c0f 100644
--- a/mathesar_ui/src/utils/typeUtils.ts
+++ b/mathesar_ui/src/utils/typeUtils.ts
@@ -1,4 +1,5 @@
 import type { Readable, Writable } from 'svelte/store';
+
 import { MissingExhaustiveConditionError } from './errors';
 
 /**
diff --git a/mathesar_ui/vite.config.js b/mathesar_ui/vite.config.js
index d1f751d6e6..d13eab5d4e 100644
--- a/mathesar_ui/vite.config.js
+++ b/mathesar_ui/vite.config.js
@@ -1,7 +1,9 @@
-import { defineConfig } from 'vite';
-import legacy from '@vitejs/plugin-legacy';
-import { svelte } from '@sveltejs/vite-plugin-svelte';
 import path from 'path';
+
+import { svelte } from '@sveltejs/vite-plugin-svelte';
+import legacy from '@vitejs/plugin-legacy';
+import { defineConfig } from 'vite';
+
 import * as data from './tsconfig.json';
 
 function getAlias() {
diff --git a/mathesar_ui/vitest-setup.config.ts b/mathesar_ui/vitest-setup.config.ts
index e330362798..aed627dcaf 100644
--- a/mathesar_ui/vitest-setup.config.ts
+++ b/mathesar_ui/vitest-setup.config.ts
@@ -1,5 +1,6 @@
-import { beforeAll } from 'vitest';
 import { addMessages, init } from 'svelte-i18n';
+import { beforeAll } from 'vitest';
+
 import en from './src/i18n/languages/en';
 
 beforeAll(async () => {

From 268bdf176b6fb1287a2372eacaf0a3733290b9f3 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 7 May 2024 13:02:04 -0400
Subject: [PATCH 0161/1141] Fix simple linting errors

---
 .../src/component-library/button/__meta__/Button.test.ts       | 2 +-
 .../src/component-library/notification/Notification.svelte     | 3 ++-
 mathesar_ui/src/component-library/pagination/Pagination.svelte | 3 ++-
 mathesar_ui/src/component-library/spinner/Spinner.svelte       | 2 +-
 .../src/stores/abstract-types/abstractTypeCategories.ts        | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/mathesar_ui/src/component-library/button/__meta__/Button.test.ts b/mathesar_ui/src/component-library/button/__meta__/Button.test.ts
index c59ee4c800..eb10b877fc 100644
--- a/mathesar_ui/src/component-library/button/__meta__/Button.test.ts
+++ b/mathesar_ui/src/component-library/button/__meta__/Button.test.ts
@@ -1,6 +1,6 @@
-import { vi } from 'vitest';
 import '@testing-library/jest-dom';
 import { fireEvent, render } from '@testing-library/svelte';
+import { vi } from 'vitest';
 
 import SlotTest from '@mathesar-component-library-dir/__meta__/utils/SlotTest.svelte';
 
diff --git a/mathesar_ui/src/component-library/notification/Notification.svelte b/mathesar_ui/src/component-library/notification/Notification.svelte
index fd92541be3..93eea8c819 100644
--- a/mathesar_ui/src/component-library/notification/Notification.svelte
+++ b/mathesar_ui/src/component-library/notification/Notification.svelte
@@ -2,11 +2,12 @@
   import { createEventDispatcher } from 'svelte';
   import { fade } from 'svelte/transition';
 
-  import { Button, Icon } from '@mathesar-component-library';
+  import Button from '@mathesar-component-library-dir/button/Button.svelte';
   import {
     iconClose,
     iconError,
   } from '@mathesar-component-library-dir/common/icons';
+  import Icon from '@mathesar-component-library-dir/icon/Icon.svelte';
 
   const dispatch = createEventDispatcher();
 
diff --git a/mathesar_ui/src/component-library/pagination/Pagination.svelte b/mathesar_ui/src/component-library/pagination/Pagination.svelte
index 37cd0ea044..95951ffc86 100644
--- a/mathesar_ui/src/component-library/pagination/Pagination.svelte
+++ b/mathesar_ui/src/component-library/pagination/Pagination.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { createEventDispatcher, tick } from 'svelte';
 
-  import { Button, Icon } from '@mathesar-component-library';
+  import Button from '@mathesar-component-library-dir/button/Button.svelte';
   import {
     iconChooseItemManyAhead,
     iconChooseItemManyPrior,
@@ -9,6 +9,7 @@
     iconChooseItemPrevious,
     iconShowMore,
   } from '@mathesar-component-library-dir/common/icons';
+  import Icon from '@mathesar-component-library-dir/icon/Icon.svelte';
 
   import { calculatePages, getPageCount } from './paginationUtils';
 
diff --git a/mathesar_ui/src/component-library/spinner/Spinner.svelte b/mathesar_ui/src/component-library/spinner/Spinner.svelte
index 6d3bc6b0a2..c8a7c10fce 100644
--- a/mathesar_ui/src/component-library/spinner/Spinner.svelte
+++ b/mathesar_ui/src/component-library/spinner/Spinner.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import { Icon } from '@mathesar-component-library';
   import { iconLoading } from '@mathesar-component-library-dir/common/icons';
+  import Icon from '@mathesar-component-library-dir/icon/Icon.svelte';
 
   // eslint-disable-next-line no-undef-init
   export let size: string | undefined = undefined;
diff --git a/mathesar_ui/src/stores/abstract-types/abstractTypeCategories.ts b/mathesar_ui/src/stores/abstract-types/abstractTypeCategories.ts
index 9273d41abc..04f492de3b 100644
--- a/mathesar_ui/src/stores/abstract-types/abstractTypeCategories.ts
+++ b/mathesar_ui/src/stores/abstract-types/abstractTypeCategories.ts
@@ -11,8 +11,8 @@ import Duration from './type-configs/duration';
 import Email from './type-configs/email';
 import Fallback from './type-configs/fallback';
 import Money from './type-configs/money';
-import Text, { DB_TYPES as textDbTypes } from './type-configs/text';
 import Number from './type-configs/number';
+import Text, { DB_TYPES as textDbTypes } from './type-configs/text';
 import Time from './type-configs/time';
 import Uri from './type-configs/uri';
 import type {

From cc7253db51d595968a8f49eaeb5af8b194b27967 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 7 May 2024 12:15:08 -0400
Subject: [PATCH 0162/1141] Move assertExhaustive into component lib

This is to fix an import dependency cycle
---
 .../component-library/common/utils/typeUtils.ts   |  8 ++++++++
 .../component-library/with-panel/WithPanel.svelte |  4 ++--
 .../src/components/rich-text/RichText.svelte      |  2 +-
 .../src/pages/admin-update/ReleaseBox.svelte      |  3 +--
 .../admin-update/SoftwareUpdateContent.svelte     |  3 +--
 .../pages/import/upload/ImportUploadPage.svelte   |  3 +--
 .../src/systems/data-explorer/QueryModel.ts       |  4 ++--
 .../table-view/link-table/LinkTableForm.svelte    |  2 +-
 .../table-view/link-table/LinkTypeOption.svelte   |  3 +--
 .../table/links/LinkSection.svelte                |  7 +++----
 .../table-inspector/table/links/utils.ts          |  4 ++--
 .../src/systems/users-and-permissions/utils.ts    |  8 +++++---
 mathesar_ui/src/utils/errors.ts                   | 15 ---------------
 mathesar_ui/src/utils/languageUtils.ts            |  2 +-
 mathesar_ui/src/utils/permissions.ts              |  8 ++++----
 mathesar_ui/src/utils/typeUtils.ts                | 10 ----------
 16 files changed, 33 insertions(+), 53 deletions(-)

diff --git a/mathesar_ui/src/component-library/common/utils/typeUtils.ts b/mathesar_ui/src/component-library/common/utils/typeUtils.ts
index a0f13cd1ee..0442dedb18 100644
--- a/mathesar_ui/src/component-library/common/utils/typeUtils.ts
+++ b/mathesar_ui/src/component-library/common/utils/typeUtils.ts
@@ -56,6 +56,14 @@ export function defined<T, U>(
   return v === undefined ? undefined : f(v);
 }
 
+/**
+ * This function is used to assert that the value passed in has been narrowed
+ * down to `never` by checking all possible variants.
+ */
+export function assertExhaustive(value: never): never {
+  throw new Error(`Exhaustive condition error: ${JSON.stringify(value)}`);
+}
+
 /**
  * From https://stackoverflow.com/a/51365037/895563
  */
diff --git a/mathesar_ui/src/component-library/with-panel/WithPanel.svelte b/mathesar_ui/src/component-library/with-panel/WithPanel.svelte
index b057758691..a27c5b8f5c 100644
--- a/mathesar_ui/src/component-library/with-panel/WithPanel.svelte
+++ b/mathesar_ui/src/component-library/with-panel/WithPanel.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import { assertExhaustive } from '@mathesar/utils/typeUtils';
-  import { slider } from '@mathesar-component-library';
+  import slider from '@mathesar-component-library-dir/common/actions/slider';
+  import { assertExhaustive } from '@mathesar-component-library-dir/common/utils/typeUtils';
 
   export let placement: 'top' | 'bottom' | 'left' | 'right' = 'right';
   export let sizePx = 300;
diff --git a/mathesar_ui/src/components/rich-text/RichText.svelte b/mathesar_ui/src/components/rich-text/RichText.svelte
index 2429439104..ba245587ef 100644
--- a/mathesar_ui/src/components/rich-text/RichText.svelte
+++ b/mathesar_ui/src/components/rich-text/RichText.svelte
@@ -44,7 +44,7 @@
   ```
 -->
 <script lang="ts">
-  import { assertExhaustive } from '@mathesar/utils/typeUtils';
+  import { assertExhaustive } from '@mathesar-component-library';
 
   import { parse } from './richTextUtils';
 
diff --git a/mathesar_ui/src/pages/admin-update/ReleaseBox.svelte b/mathesar_ui/src/pages/admin-update/ReleaseBox.svelte
index 0e20c10907..9e92c84ae0 100644
--- a/mathesar_ui/src/pages/admin-update/ReleaseBox.svelte
+++ b/mathesar_ui/src/pages/admin-update/ReleaseBox.svelte
@@ -8,8 +8,7 @@
     iconUpgradeAvailable,
   } from '@mathesar/icons';
   import type { Release } from '@mathesar/stores/releases';
-  import { assertExhaustive } from '@mathesar/utils/typeUtils';
-  import { Icon } from '@mathesar-component-library';
+  import { Icon, assertExhaustive } from '@mathesar-component-library';
 
   export let type:
     | 'available-upgrade'
diff --git a/mathesar_ui/src/pages/admin-update/SoftwareUpdateContent.svelte b/mathesar_ui/src/pages/admin-update/SoftwareUpdateContent.svelte
index f9f61d562b..acb5077c9e 100644
--- a/mathesar_ui/src/pages/admin-update/SoftwareUpdateContent.svelte
+++ b/mathesar_ui/src/pages/admin-update/SoftwareUpdateContent.svelte
@@ -7,8 +7,7 @@
   import { iconRefresh } from '@mathesar/icons';
   import type { ReleaseDataStore } from '@mathesar/stores/releases';
   import { toast } from '@mathesar/stores/toast';
-  import { assertExhaustive } from '@mathesar/utils/typeUtils';
-  import { SpinnerButton } from '@mathesar-component-library';
+  import { SpinnerButton, assertExhaustive } from '@mathesar-component-library';
 
   import ReleaseBox from './ReleaseBox.svelte';
 
diff --git a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
index c768b89941..35704c6d47 100644
--- a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
+++ b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
@@ -24,15 +24,14 @@
   import { getImportPreviewPageUrl } from '@mathesar/routes/urls';
   import { createTable } from '@mathesar/stores/tables';
   import { getErrorMessage } from '@mathesar/utils/errors';
-  import { assertExhaustive } from '@mathesar/utils/typeUtils';
   import {
     RadioGroup,
     TextArea,
+    assertExhaustive,
     iconUploadFile,
   } from '@mathesar-component-library';
   import type { IconProps } from '@mathesar-component-library/types';
 
-
   import ColumnTypeInferenceInput from '../inference/ColumnTypeInferenceInput.svelte';
 
   import DataFileInput from './DataFileInput.svelte';
diff --git a/mathesar_ui/src/systems/data-explorer/QueryModel.ts b/mathesar_ui/src/systems/data-explorer/QueryModel.ts
index 6ba32d2173..2cc3efd67f 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryModel.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryModel.ts
@@ -5,7 +5,7 @@ import type {
   QueryRunRequest,
 } from '@mathesar/api/rest/types/queries';
 import type { UnsavedQueryInstance } from '@mathesar/stores/queries';
-import { MissingExhaustiveConditionError } from '@mathesar/utils/errors';
+import { assertExhaustive } from '@mathesar-component-library';
 
 import QueryFilterTransformationModel from './QueryFilterTransformationModel';
 import QueryHideTransformationModel from './QueryHideTransformationModel';
@@ -44,7 +44,7 @@ function getTransformationModel(
     case 'order':
       return new QuerySortTransformationModel(transformation);
     default:
-      throw new MissingExhaustiveConditionError(transformation);
+      return assertExhaustive(transformation);
   }
 }
 
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index 2bab0c1240..2358429709 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -36,8 +36,8 @@
   } from '@mathesar/utils/columnUtils';
   import { getAvailableName } from '@mathesar/utils/db';
   import { makeSingular } from '@mathesar/utils/languageUtils';
-  import { assertExhaustive } from '@mathesar/utils/typeUtils';
   import {
+    assertExhaustive,
     ensureReadable,
     portalToWindowFooter,
   } from '@mathesar-component-library';
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte
index 3d3b65d053..f1a956740f 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte
@@ -4,8 +4,7 @@
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import type { FieldStore } from '@mathesar/components/form';
   import { RichText } from '@mathesar/components/rich-text';
-  import { assertExhaustive } from '@mathesar/utils/typeUtils';
-  import { Label, Radio } from '@mathesar-component-library';
+  import { Label, Radio, assertExhaustive } from '@mathesar-component-library';
 
   import Diagram from './diagram/Diagram.svelte';
   import Pill from './LinkTablePill.svelte';
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkSection.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkSection.svelte
index 8542093578..e7d2fd2768 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkSection.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkSection.svelte
@@ -5,8 +5,7 @@
     iconLinksFromOtherTables,
     iconLinksInThisTable,
   } from '@mathesar/icons';
-  import { MissingExhaustiveConditionError } from '@mathesar/utils/errors';
-  import { Icon } from '@mathesar-component-library';
+  import { Icon, assertExhaustive } from '@mathesar-component-library';
 
   import LinkItem from './LinkItem.svelte';
   import type { TableLink, TableLinkType } from './utils';
@@ -21,7 +20,7 @@
       case 'from_other_tables':
         return iconLinksFromOtherTables;
       default:
-        throw new MissingExhaustiveConditionError(type);
+        return assertExhaustive(type);
     }
   })();
 
@@ -32,7 +31,7 @@
       case 'from_other_tables':
         return $_('from_other_tables');
       default:
-        throw new MissingExhaustiveConditionError(type);
+        return assertExhaustive(type);
     }
   })();
 </script>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/links/utils.ts b/mathesar_ui/src/systems/table-view/table-inspector/table/links/utils.ts
index a8f23049ea..e81d64ef6d 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/links/utils.ts
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/links/utils.ts
@@ -1,6 +1,6 @@
 import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
 import type { ProcessedColumn } from '@mathesar/stores/table-data';
-import { MissingExhaustiveConditionError } from '@mathesar/utils/errors';
+import { assertExhaustive } from '@mathesar-component-library';
 
 export type TableLinkType = 'in_this_table' | 'from_other_tables';
 export type TableLink = {
@@ -49,6 +49,6 @@ export function getTableLinks(
       return links;
     }
     default:
-      throw new MissingExhaustiveConditionError(type);
+      return assertExhaustive(type);
   }
 }
diff --git a/mathesar_ui/src/systems/users-and-permissions/utils.ts b/mathesar_ui/src/systems/users-and-permissions/utils.ts
index 9c60e6ab89..4805ed35ed 100644
--- a/mathesar_ui/src/systems/users-and-permissions/utils.ts
+++ b/mathesar_ui/src/systems/users-and-permissions/utils.ts
@@ -1,7 +1,9 @@
 import { iconAdminUser, iconUser } from '@mathesar/icons';
 import type { UserModel } from '@mathesar/stores/users';
-import { MissingExhaustiveConditionError } from '@mathesar/utils/errors';
-import type { IconProps } from '@mathesar-component-library/types';
+import {
+  type IconProps,
+  assertExhaustive,
+} from '@mathesar-component-library/types';
 
 export type UserType = 'admin' | 'standard';
 
@@ -12,7 +14,7 @@ export function getDisplayNameForUserType(userType: UserType): string {
     case 'standard':
       return 'Standard';
     default:
-      throw new MissingExhaustiveConditionError(userType);
+      return assertExhaustive(userType);
   }
 }
 
diff --git a/mathesar_ui/src/utils/errors.ts b/mathesar_ui/src/utils/errors.ts
index cb3307fc3a..56de16e135 100644
--- a/mathesar_ui/src/utils/errors.ts
+++ b/mathesar_ui/src/utils/errors.ts
@@ -1,5 +1,3 @@
-/* eslint-disable max-classes-per-file */
-
 import { hasStringProperty } from '@mathesar-component-library';
 
 export function getErrorMessage(data: unknown): string {
@@ -14,16 +12,3 @@ export function getErrorMessage(data: unknown): string {
   }
   return String(data);
 }
-
-/**
- * This error should be thrown when a union type has not been sufficiently
- * narrowed by exhaustiveness checking.
- */
-export class MissingExhaustiveConditionError extends Error {
-  constructor(value: never, message?: string) {
-    super(`${JSON.stringify(value)}${message ? ` ${message}` : ''}`);
-    this.name = 'MissingExhaustiveConditionError';
-  }
-}
-
-/* eslint-enable max-classes-per-file */
diff --git a/mathesar_ui/src/utils/languageUtils.ts b/mathesar_ui/src/utils/languageUtils.ts
index 7e4135e6ce..410891fd9d 100644
--- a/mathesar_ui/src/utils/languageUtils.ts
+++ b/mathesar_ui/src/utils/languageUtils.ts
@@ -1,4 +1,4 @@
-import { assertExhaustive } from './typeUtils';
+import { assertExhaustive } from '@mathesar-component-library';
 
 export function makeSingular(word: string): string {
   return word.length > 1 ? word.replace(/s$/i, '') : word;
diff --git a/mathesar_ui/src/utils/permissions.ts b/mathesar_ui/src/utils/permissions.ts
index bef4020a72..e2a281014f 100644
--- a/mathesar_ui/src/utils/permissions.ts
+++ b/mathesar_ui/src/utils/permissions.ts
@@ -2,7 +2,7 @@ import { get } from 'svelte/store';
 import { _ } from 'svelte-i18n';
 
 import type { UserRole } from '@mathesar/api/rest/users';
-import { MissingExhaustiveConditionError } from '@mathesar/utils/errors';
+import { assertExhaustive } from '@mathesar-component-library';
 
 /**
  * - `canEditTableRecords`: DML operations on table rows and cells.
@@ -46,7 +46,7 @@ export function roleAllowsOperation(
     case 'viewer':
       return operationsForViewer.has(operation);
     default:
-      throw new MissingExhaustiveConditionError(userRole);
+      return assertExhaustive(userRole);
   }
 }
 
@@ -66,7 +66,7 @@ export function getDisplayNameForRole(userRole: UserRole): string {
     case 'viewer':
       return get(_)('viewer');
     default:
-      throw new MissingExhaustiveConditionError(userRole);
+      return assertExhaustive(userRole);
   }
 }
 
@@ -79,7 +79,7 @@ export function getDescriptionForRole(userRole: UserRole): string {
     case 'viewer':
       return get(_)('readonly_access');
     default:
-      throw new MissingExhaustiveConditionError(userRole);
+      return assertExhaustive(userRole);
   }
 }
 
diff --git a/mathesar_ui/src/utils/typeUtils.ts b/mathesar_ui/src/utils/typeUtils.ts
index f5c61f6c0f..7e802cf02c 100644
--- a/mathesar_ui/src/utils/typeUtils.ts
+++ b/mathesar_ui/src/utils/typeUtils.ts
@@ -1,15 +1,5 @@
 import type { Readable, Writable } from 'svelte/store';
 
-import { MissingExhaustiveConditionError } from './errors';
-
-/**
- * This function is used to assert that the value passed in has been narrowed
- * down to `never` by checking all possible variants.
- */
-export function assertExhaustive(value: never): never {
-  throw new MissingExhaustiveConditionError(value);
-}
-
 type ChangeWritableToReadable<T> = T extends Writable<infer U>
   ? Readable<U>
   : T;

From f6c1654e17cb2e8bd9534ac75f7893dee279be64 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 7 May 2024 13:14:59 -0400
Subject: [PATCH 0163/1141] Prettier format

---
 .../src/component-library/context-menu/ContextMenu.svelte        | 1 -
 .../date-time-picker/InlineDateTimePicker.svelte                 | 1 -
 .../components/abstract-type-control/AbstractTypeControl.svelte  | 1 -
 mathesar_ui/src/components/sheet/virtual-list/VirtualList.svelte | 1 -
 mathesar_ui/src/pages/database/DatabaseDetails.svelte            | 1 -
 .../column-selection-pane/ColumnSelectionPane.svelte             | 1 -
 6 files changed, 6 deletions(-)

diff --git a/mathesar_ui/src/component-library/context-menu/ContextMenu.svelte b/mathesar_ui/src/component-library/context-menu/ContextMenu.svelte
index fa024a1be6..fc61fb7dd6 100644
--- a/mathesar_ui/src/component-library/context-menu/ContextMenu.svelte
+++ b/mathesar_ui/src/component-library/context-menu/ContextMenu.svelte
@@ -6,7 +6,6 @@
   import portal from '@mathesar-component-library-dir/common/actions/portal';
   import Menu from '@mathesar-component-library-dir/menu/Menu.svelte';
 
-
   /**
    * A reference to the DOM node where we'll attach the contextmenu event
    * listener. Right-clicking anywhere inside this element will open the context
diff --git a/mathesar_ui/src/component-library/date-time-picker/InlineDateTimePicker.svelte b/mathesar_ui/src/component-library/date-time-picker/InlineDateTimePicker.svelte
index b07e7c1a86..04462ada56 100644
--- a/mathesar_ui/src/component-library/date-time-picker/InlineDateTimePicker.svelte
+++ b/mathesar_ui/src/component-library/date-time-picker/InlineDateTimePicker.svelte
@@ -5,7 +5,6 @@
 
   import { dayjs } from '@mathesar-component-library-dir/common/utils';
 
-
   import type { InlineDateTimePickerProps } from './DateTimePickerTypes';
 
   type $$Props = InlineDateTimePickerProps;
diff --git a/mathesar_ui/src/components/abstract-type-control/AbstractTypeControl.svelte b/mathesar_ui/src/components/abstract-type-control/AbstractTypeControl.svelte
index efe1810829..5049f2185f 100644
--- a/mathesar_ui/src/components/abstract-type-control/AbstractTypeControl.svelte
+++ b/mathesar_ui/src/components/abstract-type-control/AbstractTypeControl.svelte
@@ -19,7 +19,6 @@
     hasTypeOptionsChanged,
   } from './utils';
 
-
   const dispatch = createEventDispatcher();
 
   export let column: ColumnWithAbstractType;
diff --git a/mathesar_ui/src/components/sheet/virtual-list/VirtualList.svelte b/mathesar_ui/src/components/sheet/virtual-list/VirtualList.svelte
index 0426719b77..9fa051af40 100644
--- a/mathesar_ui/src/components/sheet/virtual-list/VirtualList.svelte
+++ b/mathesar_ui/src/components/sheet/virtual-list/VirtualList.svelte
@@ -34,7 +34,6 @@
   import type { Timeout } from './timer';
   import { cancelTimeout, requestTimeout } from './timer';
 
-
   const dispatch = createEventDispatcher();
 
   let classes = 'default';
diff --git a/mathesar_ui/src/pages/database/DatabaseDetails.svelte b/mathesar_ui/src/pages/database/DatabaseDetails.svelte
index 9643e5f64b..6a1b655a3c 100644
--- a/mathesar_ui/src/pages/database/DatabaseDetails.svelte
+++ b/mathesar_ui/src/pages/database/DatabaseDetails.svelte
@@ -40,7 +40,6 @@
     Icon,
   } from '@mathesar-component-library';
 
-
   import AddEditSchemaModal from './AddEditSchemaModal.svelte';
   import DbAccessControlModal from './DbAccessControlModal.svelte';
   import SchemaListSkeleton from './SchemaListSkeleton.svelte';
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/ColumnSelectionPane.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/ColumnSelectionPane.svelte
index 840729598d..41fefe8421 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/ColumnSelectionPane.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/ColumnSelectionPane.svelte
@@ -8,7 +8,6 @@
   import SelectableColumnTree from './SelectableColumnTree.svelte';
   import TableGroupCollapsible from './TableGroupCollapsible.svelte';
 
-
   export let queryManager: QueryManager;
   export let linkCollapsibleOpenState: Record<ColumnWithLink['id'], boolean> =
     {};

From c371a203d3edba76a5347280e88544a207aafcec Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 7 May 2024 16:32:07 -0400
Subject: [PATCH 0164/1141] Auto-sort imports in some files

In preparation for git merge with develop to avoid merge conflicts
---
 .../data-types/components/CellWrapper.svelte  |  3 ++-
 mathesar_ui/src/components/sheet/Sheet.svelte |  7 ++---
 .../components/sheet/SheetClipboardHandler.ts |  2 +-
 .../pages/exploration/ExplorationPage.svelte  |  3 ++-
 mathesar_ui/src/pages/table/TablePage.svelte  |  3 ++-
 mathesar_ui/src/stores/table-data/display.ts  |  3 ++-
 .../src/stores/table-data/tabularData.ts      |  5 ++--
 .../connections/DeleteConnectionModal.svelte  | 15 +++++------
 .../systems/data-explorer/DataExplorer.svelte |  5 ++--
 .../src/systems/data-explorer/QueryRunner.ts  |  9 ++++---
 .../ExplorationInspector.svelte               |  6 +++--
 .../column-tab/ColumnTab.svelte               |  2 ++
 .../result-pane/ResultHeaderCell.svelte       |  9 ++++---
 .../result-pane/ResultPane.svelte             |  1 +
 .../result-pane/ResultRowCell.svelte          |  1 +
 .../data-explorer/result-pane/Results.svelte  |  6 +++--
 .../src/systems/table-view/TableView.svelte   |  5 ++--
 .../systems/table-view/header/Header.svelte   |  1 +
 .../src/systems/table-view/row/Row.svelte     |  3 ++-
 .../src/systems/table-view/row/RowCell.svelte | 26 ++++++++++---------
 .../table-view/row/RowContextOptions.svelte   | 19 +++++++-------
 21 files changed, 78 insertions(+), 56 deletions(-)

diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte b/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
index 29594fe1d4..f8b4b71c4b 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/CellWrapper.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
 
-  import type { ValueComparisonOutcome } from '@mathesar-component-library/types';
   import CellBackground from '@mathesar/components/CellBackground.svelte';
+  import type { ValueComparisonOutcome } from '@mathesar-component-library/types';
+
   import type { HorizontalAlignment } from './typeDefinitions';
 
   const dispatch = createEventDispatcher();
diff --git a/mathesar_ui/src/components/sheet/Sheet.svelte b/mathesar_ui/src/components/sheet/Sheet.svelte
index 73a6764435..29cb469587 100644
--- a/mathesar_ui/src/components/sheet/Sheet.svelte
+++ b/mathesar_ui/src/components/sheet/Sheet.svelte
@@ -2,19 +2,20 @@
   import { onMount, tick } from 'svelte';
   import { writable } from 'svelte/store';
 
-  import { ImmutableMap } from '@mathesar-component-library/types';
   import type { ClipboardHandler } from '@mathesar/stores/clipboard';
   import { getClipboardHandlerStoreFromContext } from '@mathesar/stores/clipboard';
   import { getModifierKeyCombo } from '@mathesar/utils/pointerUtils';
+  import { ImmutableMap } from '@mathesar-component-library/types';
+
   import {
+    type SheetCellDetails,
     beginSelection,
     findContainingSheetCell,
-    type SheetCellDetails,
   } from './selection';
   import type SheetSelectionStore from './selection/SheetSelectionStore';
   import {
-    calculateColumnStyleMapAndRowWidth,
     DEFAULT_COLUMN_WIDTH,
+    calculateColumnStyleMapAndRowWidth,
     focusActiveCell,
     setSheetContext,
   } from './utils';
diff --git a/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts b/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts
index 4d55f5aad3..dd691e9ef9 100644
--- a/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts
+++ b/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts
@@ -1,11 +1,11 @@
 import * as Papa from 'papaparse';
 
-import type { ImmutableSet } from '@mathesar-component-library';
 import type { AbstractTypeCategoryIdentifier } from '@mathesar/stores/abstract-types/types';
 import type { ClipboardHandler } from '@mathesar/stores/clipboard';
 import type { RecordSummariesForSheet } from '@mathesar/stores/table-data';
 import type { ReadableMapLike } from '@mathesar/typeUtils';
 import { labeledCount } from '@mathesar/utils/languageUtils';
+import type { ImmutableSet } from '@mathesar-component-library';
 
 const MIME_PLAIN_TEXT = 'text/plain';
 const MIME_MATHESAR_SHEET_CLIPBOARD =
diff --git a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
index 6c340948cb..c5372c4f36 100644
--- a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
+++ b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
@@ -2,8 +2,8 @@
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
 
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
@@ -16,6 +16,7 @@
     WithExplorationInspector,
   } from '@mathesar/systems/data-explorer';
   import type { ShareConsumer } from '@mathesar/utils/shares';
+
   import Header from './Header.svelte';
 
   const userProfile = getUserProfileStoreFromContext();
diff --git a/mathesar_ui/src/pages/table/TablePage.svelte b/mathesar_ui/src/pages/table/TablePage.svelte
index 3bcf3b07c7..a72515d1f5 100644
--- a/mathesar_ui/src/pages/table/TablePage.svelte
+++ b/mathesar_ui/src/pages/table/TablePage.svelte
@@ -12,9 +12,10 @@
     TabularData,
     setTabularDataStoreInContext,
   } from '@mathesar/stores/table-data';
-  import TableView from '@mathesar/systems/table-view/TableView.svelte';
   import ActionsPane from '@mathesar/systems/table-view/actions-pane/ActionsPane.svelte';
+  import TableView from '@mathesar/systems/table-view/TableView.svelte';
   import type { ShareConsumer } from '@mathesar/utils/shares';
+
   import { setNewImperativeFilterControllerInContext } from './ImperativeFilterController';
 
   const metaSerializationQueryKey = 'q';
diff --git a/mathesar_ui/src/stores/table-data/display.ts b/mathesar_ui/src/stores/table-data/display.ts
index d4f98202ce..872c7d8cdf 100644
--- a/mathesar_ui/src/stores/table-data/display.ts
+++ b/mathesar_ui/src/stores/table-data/display.ts
@@ -2,9 +2,10 @@ import type { Readable, Writable } from 'svelte/store';
 import { derived, writable } from 'svelte/store';
 
 import { WritableMap } from '@mathesar-component-library';
+
 import type { ColumnsDataStore } from './columns';
 import type { Meta } from './meta';
-import { filterRecordRows, type RecordsData, type Row } from './records';
+import { type RecordsData, type Row, filterRecordRows } from './records';
 
 // @deprecated
 export const DEFAULT_COLUMN_WIDTH = 160;
diff --git a/mathesar_ui/src/stores/table-data/tabularData.ts b/mathesar_ui/src/stores/table-data/tabularData.ts
index 9208b116bd..7a2edfec4a 100644
--- a/mathesar_ui/src/stores/table-data/tabularData.ts
+++ b/mathesar_ui/src/stores/table-data/tabularData.ts
@@ -1,16 +1,17 @@
 import { getContext, setContext } from 'svelte';
-import { derived, writable, type Readable, type Writable } from 'svelte/store';
+import { type Readable, type Writable, derived, writable } from 'svelte/store';
 
-import type { DBObjectEntry } from '@mathesar/AppTypes';
 import type { TableEntry } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import { States } from '@mathesar/api/rest/utils/requestUtils';
+import type { DBObjectEntry } from '@mathesar/AppTypes';
 import Plane from '@mathesar/components/sheet/selection/Plane';
 import Series from '@mathesar/components/sheet/selection/Series';
 import SheetSelectionStore from '@mathesar/components/sheet/selection/SheetSelectionStore';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
 import type { ShareConsumer } from '@mathesar/utils/shares';
 import { orderProcessedColumns } from '@mathesar/utils/tables';
+
 import { ColumnsDataStore } from './columns';
 import type { ConstraintsData } from './constraints';
 import { ConstraintsDataStore } from './constraints';
diff --git a/mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte b/mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte
index 65af01dcdc..26a79b1b18 100644
--- a/mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte
+++ b/mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte
@@ -2,23 +2,22 @@
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
 
-  import {
-    CancelOrProceedButtonPair,
-    Checkbox,
-    ControlledModal,
-    LabeledInput,
-    ModalController,
-  } from '@mathesar-component-library';
   import type { Connection } from '@mathesar/api/rest/connections';
   import Identifier from '@mathesar/components/Identifier.svelte';
   import RichText from '@mathesar/components/rich-text/RichText.svelte';
-
   import {
     connectionHasUniqueDatabaseReference,
     connectionsStore,
   } from '@mathesar/stores/databases';
   import { toast } from '@mathesar/stores/toast';
   import { getErrorMessage } from '@mathesar/utils/errors';
+  import {
+    CancelOrProceedButtonPair,
+    Checkbox,
+    ControlledModal,
+    LabeledInput,
+    ModalController,
+  } from '@mathesar-component-library';
 
   const { connections } = connectionsStore;
   const dispatch = createEventDispatcher<{ delete: undefined }>();
diff --git a/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte b/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte
index 96710d4d00..a8118e14d0 100644
--- a/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte
+++ b/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte
@@ -1,12 +1,13 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import { Tutorial } from '@mathesar-component-library';
   import { queries } from '@mathesar/stores/queries';
+  import { Tutorial } from '@mathesar-component-library';
+
   import ActionsPane from './ActionsPane.svelte';
-  import type QueryManager from './QueryManager';
   import { WithExplorationInspector } from './exploration-inspector';
   import WithInputSidebar from './input-sidebar/WithInputSidebar.svelte';
+  import type QueryManager from './QueryManager';
   import ResultPane from './result-pane/ResultPane.svelte';
   import type { ColumnWithLink } from './utils';
 
diff --git a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
index db2cccea76..4829acf33f 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
@@ -1,7 +1,6 @@
 import type { Readable, Writable } from 'svelte/store';
 import { derived, get, writable } from 'svelte/store';
 
-import { CancellablePromise, ImmutableMap } from '@mathesar-component-library';
 import type {
   QueryColumnMetaData,
   QueryResultRecord,
@@ -17,15 +16,17 @@ import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
 import { fetchQueryResults, runQuery } from '@mathesar/stores/queries';
 import Pagination from '@mathesar/utils/Pagination';
 import type { ShareConsumer } from '@mathesar/utils/shares';
+import { CancellablePromise, ImmutableMap } from '@mathesar-component-library';
+
 import QueryInspector from './QueryInspector';
 import type QueryModel from './QueryModel';
 import {
-  getProcessedOutputColumns,
-  processColumnMetaData,
-  speculateColumnMetaData,
   type InputColumnsStoreSubstance,
   type ProcessedQueryOutputColumnMap,
   type ProcessedQueryResultColumnMap,
+  getProcessedOutputColumns,
+  processColumnMetaData,
+  speculateColumnMetaData,
 } from './utils';
 
 export interface QueryRow {
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte
index c60ec2fef6..cc8fb8dc09 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte
@@ -1,12 +1,14 @@
 <script lang="ts">
-  import { TabContainer } from '@mathesar-component-library';
   import type { Tab } from '@mathesar/component-library/types';
+  import { TabContainer } from '@mathesar-component-library';
+
   import type { ExplorationInspectorTab } from '../QueryInspector';
   import type QueryManager from '../QueryManager';
   import type QueryRunner from '../QueryRunner';
-  import ExplorationTab from './ExplorationTab.svelte';
+
   import CellTab from './cell/CellTab.svelte';
   import ColumnTab from './column-tab/ColumnTab.svelte';
+  import ExplorationTab from './ExplorationTab.svelte';
 
   export let queryHandler: QueryRunner | QueryManager;
   export let canEditMetadata: boolean;
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/ColumnTab.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/ColumnTab.svelte
index 880a02d3d5..93f749fa2e 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/ColumnTab.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/ColumnTab.svelte
@@ -9,8 +9,10 @@
     TextInput,
     isDefinedNonNullable,
   } from '@mathesar-component-library';
+
   import QueryManager from '../../QueryManager';
   import type QueryRunner from '../../QueryRunner';
+
   import ColumnSource from './ColumnSource.svelte';
   import DeleteColumnAction from './DeleteColumnAction.svelte';
 
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/ResultHeaderCell.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/ResultHeaderCell.svelte
index ba46993a7f..10b427d321 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/ResultHeaderCell.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/ResultHeaderCell.svelte
@@ -1,12 +1,13 @@
 <script lang="ts">
-  import { Button } from '@mathesar-component-library';
+  import ColumnName from '@mathesar/components/column/ColumnName.svelte';
   import {
-    SheetColumnHeaderCell,
     SheetCellResizer,
+    SheetColumnHeaderCell,
   } from '@mathesar/components/sheet';
-  import ColumnName from '@mathesar/components/column/ColumnName.svelte';
-  import type { ProcessedQueryOutputColumn } from '../utils';
+  import { Button } from '@mathesar-component-library';
+
   import type QueryRunner from '../QueryRunner';
+  import type { ProcessedQueryOutputColumn } from '../utils';
 
   export let queryRunner: QueryRunner;
   export let processedQueryColumn: ProcessedQueryOutputColumn;
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/ResultPane.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/ResultPane.svelte
index 938d209eb6..32c44b91bf 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/ResultPane.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/ResultPane.svelte
@@ -3,6 +3,7 @@
 
   import type QueryManager from '../QueryManager';
   import type QueryRunner from '../QueryRunner';
+
   import QueryRefreshButton from './QueryRefreshButton.svelte';
   import Results from './Results.svelte';
 
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
index fd9a97c1b7..638872d09c 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/ResultRowCell.svelte
@@ -7,6 +7,7 @@
   import { makeCellId } from '@mathesar/components/sheet/cellIds';
   import type SheetSelection from '@mathesar/components/sheet/selection/SheetSelection';
   import { handleKeyboardEventOnCell } from '@mathesar/components/sheet/sheetKeyboardUtils';
+
   import type { QueryRow } from '../QueryRunner';
   import type { ProcessedQueryOutputColumn } from '../utils';
 
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
index a026092b3b..c1790b844f 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte
@@ -1,9 +1,8 @@
 <script lang="ts">
   import { map } from 'iter-tools';
-  import { _ } from 'svelte-i18n';
   import { get } from 'svelte/store';
+  import { _ } from 'svelte-i18n';
 
-  import { ImmutableMap } from '@mathesar-component-library';
   import CellBackground from '@mathesar/components/CellBackground.svelte';
   import PaginationGroup from '@mathesar/components/PaginationGroup.svelte';
   import {
@@ -18,9 +17,12 @@
   import { rowHeaderWidthPx, rowHeightPx } from '@mathesar/geometry';
   import { toast } from '@mathesar/stores/toast';
   import { arrayIndex } from '@mathesar/utils/typeUtils';
+  import { ImmutableMap } from '@mathesar-component-library';
+
   import type QueryManager from '../QueryManager';
   import type QueryRunner from '../QueryRunner';
   import { getRowSelectionId } from '../QueryRunner';
+
   import QueryRefreshButton from './QueryRefreshButton.svelte';
   import QueryRunErrors from './QueryRunErrors.svelte';
   import ResultHeaderCell from './ResultHeaderCell.svelte';
diff --git a/mathesar_ui/src/systems/table-view/TableView.svelte b/mathesar_ui/src/systems/table-view/TableView.svelte
index b63fdc649e..c9328db386 100644
--- a/mathesar_ui/src/systems/table-view/TableView.svelte
+++ b/mathesar_ui/src/systems/table-view/TableView.svelte
@@ -3,7 +3,6 @@
   import type { ComponentProps } from 'svelte';
   import { get } from 'svelte/store';
 
-  import { ImmutableMap } from '@mathesar-component-library';
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import { Sheet } from '@mathesar/components/sheet';
   import { SheetClipboardHandler } from '@mathesar/components/sheet/SheetClipboardHandler';
@@ -11,13 +10,15 @@
   import { currentDatabase } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
   import {
-    getTabularDataStoreFromContext,
     ID_ADD_NEW_COLUMN,
     ID_ROW_CONTROL_COLUMN,
+    getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
   import { toast } from '@mathesar/stores/toast';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { stringifyMapKeys } from '@mathesar/utils/collectionUtils';
+  import { ImmutableMap } from '@mathesar-component-library';
+
   import Body from './Body.svelte';
   import Header from './header/Header.svelte';
   import StatusPane from './StatusPane.svelte';
diff --git a/mathesar_ui/src/systems/table-view/header/Header.svelte b/mathesar_ui/src/systems/table-view/header/Header.svelte
index 0736100bae..88e779d715 100644
--- a/mathesar_ui/src/systems/table-view/header/Header.svelte
+++ b/mathesar_ui/src/systems/table-view/header/Header.svelte
@@ -17,6 +17,7 @@
     getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
   import { saveColumnOrder } from '@mathesar/stores/tables';
+
   import { Draggable, Droppable } from './drag-and-drop';
   import ColumnHeaderContextMenu from './header-cell/ColumnHeaderContextMenu.svelte';
   import HeaderCell from './header-cell/HeaderCell.svelte';
diff --git a/mathesar_ui/src/systems/table-view/row/Row.svelte b/mathesar_ui/src/systems/table-view/row/Row.svelte
index 4cbbd0820b..3d1ef87d78 100644
--- a/mathesar_ui/src/systems/table-view/row/Row.svelte
+++ b/mathesar_ui/src/systems/table-view/row/Row.svelte
@@ -4,6 +4,7 @@
   import { rowHeightPx } from '@mathesar/geometry';
   import {
     ID_ROW_CONTROL_COLUMN,
+    type Row,
     getCellKey,
     getRowKey,
     getTabularDataStoreFromContext,
@@ -12,9 +13,9 @@
     isNewRecordRow,
     isPlaceholderRow,
     rowHasRecord,
-    type Row,
   } from '@mathesar/stores/table-data';
   import { getRowSelectionId } from '@mathesar/stores/table-data/records';
+
   import GroupHeader from './GroupHeader.svelte';
   import NewRecordMessage from './NewRecordMessage.svelte';
   import RowCell from './RowCell.svelte';
diff --git a/mathesar_ui/src/systems/table-view/row/RowCell.svelte b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
index 5fa294cab0..6240c92b8c 100644
--- a/mathesar_ui/src/systems/table-view/row/RowCell.svelte
+++ b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
@@ -1,23 +1,15 @@
 <script lang="ts">
-  import { _ } from 'svelte-i18n';
   import type { Writable } from 'svelte/store';
+  import { _ } from 'svelte-i18n';
 
-  import {
-    ButtonMenuItem,
-    ContextMenu,
-    LinkMenuItem,
-    MenuDivider,
-    MenuHeading,
-    WritableMap,
-  } from '@mathesar-component-library';
   import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
   import { States } from '@mathesar/api/rest/utils/requestUtils';
+  import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
   import CellBackground from '@mathesar/components/CellBackground.svelte';
   import Identifier from '@mathesar/components/Identifier.svelte';
   import Null from '@mathesar/components/Null.svelte';
-  import RowCellBackgrounds from '@mathesar/components/RowCellBackgrounds.svelte';
-  import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
   import { RichText } from '@mathesar/components/rich-text';
+  import RowCellBackgrounds from '@mathesar/components/RowCellBackgrounds.svelte';
   import { SheetDataCell } from '@mathesar/components/sheet';
   import { makeCellId } from '@mathesar/components/sheet/cellIds';
   import type SheetSelection from '@mathesar/components/sheet/selection/SheetSelection';
@@ -27,15 +19,25 @@
   import { currentSchema } from '@mathesar/stores/schemas';
   import { storeToGetRecordPageUrl } from '@mathesar/stores/storeBasedUrls';
   import {
-    rowHasNewRecord,
     type CellKey,
     type ProcessedColumn,
     type RecordRow,
     type RecordsData,
+    rowHasNewRecord,
   } from '@mathesar/stores/table-data';
   import { getRowSelectionId } from '@mathesar/stores/table-data/records';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
+  import {
+    ButtonMenuItem,
+    ContextMenu,
+    LinkMenuItem,
+    MenuDivider,
+    MenuHeading,
+    WritableMap,
+  } from '@mathesar-component-library';
+
   import ColumnHeaderContextMenu from '../header/header-cell/ColumnHeaderContextMenu.svelte';
+
   import CellErrors from './CellErrors.svelte';
   import RowContextOptions from './RowContextOptions.svelte';
 
diff --git a/mathesar_ui/src/systems/table-view/row/RowContextOptions.svelte b/mathesar_ui/src/systems/table-view/row/RowContextOptions.svelte
index d7035da953..cd0cd83d7e 100644
--- a/mathesar_ui/src/systems/table-view/row/RowContextOptions.svelte
+++ b/mathesar_ui/src/systems/table-view/row/RowContextOptions.svelte
@@ -1,23 +1,24 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import {
-    ButtonMenuItem,
-    iconExternalLink,
-    LinkMenuItem,
-  } from '@mathesar-component-library';
+
   import { iconDeleteMajor } from '@mathesar/icons';
   import { confirmDelete } from '@mathesar/stores/confirmation';
+  import { currentDatabase } from '@mathesar/stores/databases';
+  import { currentSchema } from '@mathesar/stores/schemas';
   import { storeToGetRecordPageUrl } from '@mathesar/stores/storeBasedUrls';
   import {
+    type RecordRow,
     RecordsData,
     rowHasRecord,
-    type RecordRow,
   } from '@mathesar/stores/table-data';
+  import { getRowSelectionId } from '@mathesar/stores/table-data/records';
   import { toast } from '@mathesar/stores/toast';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
-  import { currentDatabase } from '@mathesar/stores/databases';
-  import { currentSchema } from '@mathesar/stores/schemas';
-  import { getRowSelectionId } from '@mathesar/stores/table-data/records';
+  import {
+    ButtonMenuItem,
+    LinkMenuItem,
+    iconExternalLink,
+  } from '@mathesar-component-library';
 
   export let row: RecordRow;
   export let recordPk: string;

From f37be57d24bdaeaeaee5d6ee2e2b671821fc0ab4 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 8 May 2024 16:07:04 +0530
Subject: [PATCH 0165/1141] fix search

---
 db/records/operations/relevance.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/db/records/operations/relevance.py b/db/records/operations/relevance.py
index 056f65eaac..f20daa3c23 100644
--- a/db/records/operations/relevance.py
+++ b/db/records/operations/relevance.py
@@ -1,5 +1,6 @@
 from sqlalchemy import case, select, desc
 from db.types import categories
+from db.types.base import MathesarCustomType
 from db.types.operations.convert import get_db_type_enum_from_class
 
 WEIGHT_4 = 4
@@ -37,8 +38,8 @@ def _get_scored_selectable(relation, parameters_dict):
 
 def _get_col_score_expr(col, param_val):
     col_type = get_db_type_enum_from_class(col.type.__class__)
-
-    if col_type in categories.STRING_LIKE_TYPES:
+    searchable_string_types = categories.STRING_LIKE_TYPES | frozenset([MathesarCustomType.URI, MathesarCustomType.EMAIL])
+    if col_type in searchable_string_types:
         score_expr = case(
             (col.ilike(param_val), WEIGHT_4),
             (col.ilike(param_val + '%'), WEIGHT_3),

From 616965337774a6f986bb91d3fcfa702fdc46ce91 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 9 May 2024 14:26:52 +0800
Subject: [PATCH 0166/1141] document fixtures in test_columns.py

---
 mathesar/tests/rpc/test_columns.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/mathesar/tests/rpc/test_columns.py b/mathesar/tests/rpc/test_columns.py
index e2ecce34f3..14aff7c760 100644
--- a/mathesar/tests/rpc/test_columns.py
+++ b/mathesar/tests/rpc/test_columns.py
@@ -1,3 +1,10 @@
+"""
+This file tests the column listing function.
+
+Fixtures:
+    rf(pytest-django): Provides mocked `Request` objects.
+    admin_client(pytest): Lets you monkeypatch an object for testing.
+"""
 from contextlib import contextmanager
 
 from mathesar.rpc import columns

From 7740f76f141ed3f3092c988e27503d4cd3418cd3 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 9 May 2024 17:26:28 +0800
Subject: [PATCH 0167/1141] fix fixture name typo

---
 mathesar/tests/rpc/test_columns.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/tests/rpc/test_columns.py b/mathesar/tests/rpc/test_columns.py
index 14aff7c760..9b77cb3e93 100644
--- a/mathesar/tests/rpc/test_columns.py
+++ b/mathesar/tests/rpc/test_columns.py
@@ -3,7 +3,7 @@
 
 Fixtures:
     rf(pytest-django): Provides mocked `Request` objects.
-    admin_client(pytest): Lets you monkeypatch an object for testing.
+    monkeypatch(pytest): Lets you monkeypatch an object for testing.
 """
 from contextlib import contextmanager
 

From afcd098c314b35265ea6253132029319e0535c6e Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 10 May 2024 12:20:42 +0530
Subject: [PATCH 0168/1141] Add workflow to reset demo

---
 .github/workflows/reset-demo.yml | 51 ++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 .github/workflows/reset-demo.yml

diff --git a/.github/workflows/reset-demo.yml b/.github/workflows/reset-demo.yml
new file mode 100644
index 0000000000..1849b0c393
--- /dev/null
+++ b/.github/workflows/reset-demo.yml
@@ -0,0 +1,51 @@
+name: Reset demo
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+  schedule:
+    - cron: '1,10,30,55 6 * * *'
+
+
+env:
+  PROJECT_ID: ${{ secrets.GKE_PROJECT_ID }}
+  GKE_CLUSTER: mathesar-demo
+  GKE_ZONE: us-central1
+
+
+jobs:
+  reset:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout branch
+        uses: actions/checkout@v4
+
+      - name: GCP login
+        uses: 'google-github-actions/auth@v0'
+        with:
+          credentials_json: '${{ secrets.GKE_DEMO_RESET_SA_KEY }}'
+
+      - name: Set up GKE credentials
+        uses: 'google-github-actions/get-gke-credentials@v0'
+        with:
+          cluster_name: ${{ env.GKE_CLUSTER }}
+          location: ${{ env.GKE_ZONE }}
+
+      - name: Delete existing demo deployment
+        run: kubectl delete deployments.apps demo-serve
+
+      - name: Wait until all pods are removed
+        run: >-
+          attempts=10
+          until [ $attempts -le 0 ] || [ -z "$(kubectl get pods)" ]; do
+            sleep 5
+            attempts=$((attempts - 1))
+          done
+          if [ $attempts -le 0 ]; then
+            return 1
+          fi
+
+      - name: Deploy demo
+        run: kubectl apply -f ./kubernetes_manifests/mathesar-demo.yml
\ No newline at end of file

From 78d674b63901d81c922cfc1ece58cf700796e396 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 10 May 2024 12:26:18 +0530
Subject: [PATCH 0169/1141] Add more schedules to test cron job

---
 .github/workflows/reset-demo.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/reset-demo.yml b/.github/workflows/reset-demo.yml
index 1849b0c393..7b7e895e31 100644
--- a/.github/workflows/reset-demo.yml
+++ b/.github/workflows/reset-demo.yml
@@ -6,7 +6,7 @@ on:
       - master
   workflow_dispatch:
   schedule:
-    - cron: '1,10,30,55 6 * * *'
+    - cron: '1,9,17,30,45 6,7,8 * * *'
 
 
 env:

From 6cb68f3a91d8e2595da5bd421f35eeea1fa04277 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 10 May 2024 14:57:36 +0530
Subject: [PATCH 0170/1141] Ignore errors if deployment is not present while
 deleting, fix line break issues

---
 .github/workflows/reset-demo.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/reset-demo.yml b/.github/workflows/reset-demo.yml
index 7b7e895e31..c67b9f05ae 100644
--- a/.github/workflows/reset-demo.yml
+++ b/.github/workflows/reset-demo.yml
@@ -34,17 +34,19 @@ jobs:
           location: ${{ env.GKE_ZONE }}
 
       - name: Delete existing demo deployment
-        run: kubectl delete deployments.apps demo-serve
+        run: kubectl delete deployments.apps demo-serve --ignore-not-found=true
 
       - name: Wait until all pods are removed
         run: >-
-          attempts=10
-          until [ $attempts -le 0 ] || [ -z "$(kubectl get pods)" ]; do
-            sleep 5
-            attempts=$((attempts - 1))
+          attempts=10;
+          until [ $attempts -le 0 ] || [ -z "$(kubectl get pods --selector=run=demo-serve)" ];
+          do
+            sleep 5;
+            attempts=$((attempts - 1));
           done
-          if [ $attempts -le 0 ]; then
-            return 1
+          if [ $attempts -le 0 ];
+          then
+            return 1;
           fi
 
       - name: Deploy demo

From 28f9df1a1611eef11a42f8a949a9cdc0258785e7 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 10 May 2024 14:58:52 +0530
Subject: [PATCH 0171/1141] Run cron job at 6:30 UTC everyday

---
 .github/workflows/reset-demo.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/reset-demo.yml b/.github/workflows/reset-demo.yml
index c67b9f05ae..eec904f7b5 100644
--- a/.github/workflows/reset-demo.yml
+++ b/.github/workflows/reset-demo.yml
@@ -6,7 +6,7 @@ on:
       - master
   workflow_dispatch:
   schedule:
-    - cron: '1,9,17,30,45 6,7,8 * * *'
+    - cron: '30 6 * * *'
 
 
 env:

From 8382626b508409f63e891161d48c0d9ecd86443a Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 10 May 2024 16:04:05 +0530
Subject: [PATCH 0172/1141] Fix line break issue

---
 .github/workflows/reset-demo.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/reset-demo.yml b/.github/workflows/reset-demo.yml
index eec904f7b5..e34a086d2a 100644
--- a/.github/workflows/reset-demo.yml
+++ b/.github/workflows/reset-demo.yml
@@ -43,11 +43,11 @@ jobs:
           do
             sleep 5;
             attempts=$((attempts - 1));
-          done
+          done;
           if [ $attempts -le 0 ];
           then
             return 1;
-          fi
+          fi;
 
       - name: Deploy demo
         run: kubectl apply -f ./kubernetes_manifests/mathesar-demo.yml
\ No newline at end of file

From 10e369cd00a64f5adcb0ac36c2ade9191f3b810f Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 10 May 2024 18:16:59 +0530
Subject: [PATCH 0173/1141] Remove the demo reset workflow, it should exist on
 the mathesar-ansible repo

---
 .github/workflows/reset-demo.yml | 53 --------------------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 .github/workflows/reset-demo.yml

diff --git a/.github/workflows/reset-demo.yml b/.github/workflows/reset-demo.yml
deleted file mode 100644
index e34a086d2a..0000000000
--- a/.github/workflows/reset-demo.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-name: Reset demo
-
-on:
-  push:
-    branches:
-      - master
-  workflow_dispatch:
-  schedule:
-    - cron: '30 6 * * *'
-
-
-env:
-  PROJECT_ID: ${{ secrets.GKE_PROJECT_ID }}
-  GKE_CLUSTER: mathesar-demo
-  GKE_ZONE: us-central1
-
-
-jobs:
-  reset:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout branch
-        uses: actions/checkout@v4
-
-      - name: GCP login
-        uses: 'google-github-actions/auth@v0'
-        with:
-          credentials_json: '${{ secrets.GKE_DEMO_RESET_SA_KEY }}'
-
-      - name: Set up GKE credentials
-        uses: 'google-github-actions/get-gke-credentials@v0'
-        with:
-          cluster_name: ${{ env.GKE_CLUSTER }}
-          location: ${{ env.GKE_ZONE }}
-
-      - name: Delete existing demo deployment
-        run: kubectl delete deployments.apps demo-serve --ignore-not-found=true
-
-      - name: Wait until all pods are removed
-        run: >-
-          attempts=10;
-          until [ $attempts -le 0 ] || [ -z "$(kubectl get pods --selector=run=demo-serve)" ];
-          do
-            sleep 5;
-            attempts=$((attempts - 1));
-          done;
-          if [ $attempts -le 0 ];
-          then
-            return 1;
-          fi;
-
-      - name: Deploy demo
-        run: kubectl apply -f ./kubernetes_manifests/mathesar-demo.yml
\ No newline at end of file

From 9d20a0d54d945f19bd2db6d4a0d7c1f8c351f115 Mon Sep 17 00:00:00 2001
From: Rahul Soni <rahulsoni2225@gmail.com>
Date: Sun, 12 May 2024 16:41:04 +0530
Subject: [PATCH 0174/1141] fix(clipboard): use regex with escapeFormulae to
 exclude negative numbers

---
 mathesar_ui/src/components/sheet/SheetClipboardHandler.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts b/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts
index d076834269..d5de04caf8 100644
--- a/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts
+++ b/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts
@@ -62,7 +62,7 @@ function getFormattedCellValue<
 function serializeTsv(data: string[][]): string {
   return Papa.unparse(data, {
     delimiter: '\t',
-    escapeFormulae: true,
+    escapeFormulae: /^=|^\+|^@|^\t|^\r/,
   });
 }
 

From 4601a6855213b05004a027b7e70a446a4dc2d89e Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 13 May 2024 21:32:01 -0400
Subject: [PATCH 0175/1141] Customize CSV parsing for negative numbers

---
 mathesar_ui/src/components/sheet/SheetClipboardHandler.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts b/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts
index d5de04caf8..9b6481b73a 100644
--- a/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts
+++ b/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts
@@ -62,7 +62,7 @@ function getFormattedCellValue<
 function serializeTsv(data: string[][]): string {
   return Papa.unparse(data, {
     delimiter: '\t',
-    escapeFormulae: /^=|^\+|^@|^\t|^\r/,
+    escapeFormulae: /^=|^\+|^@|^\t|^\r|^-(?!\d+(\.\d+)?$)/,
   });
 }
 

From e9d7ceb1a74e689dec99d08b0389d23bccf197f9 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 13 May 2024 21:32:33 -0400
Subject: [PATCH 0176/1141] Add code comment explaining special CSV formatting

---
 .../src/components/sheet/SheetClipboardHandler.ts    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts b/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts
index 9b6481b73a..26bcd2a853 100644
--- a/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts
+++ b/mathesar_ui/src/components/sheet/SheetClipboardHandler.ts
@@ -62,6 +62,18 @@ function getFormattedCellValue<
 function serializeTsv(data: string[][]): string {
   return Papa.unparse(data, {
     delimiter: '\t',
+    // From the [Papa Parse][1] library, `escapeFormulae` helps defend against
+    // formula [injection attacks][2]. We modify the default value though
+    // because it [didn't work][3] for negative numbers. We're supplying our own
+    // regex that uses the default behavior plus special handling for negative
+    // numbers. It doesn't escape negative numbers because they are valid. But
+    // it does escape anything else that begins with a hyphen.
+    //
+    // [1]: https://www.papaparse.com/docs
+    //
+    // [2]: https://owasp.org/www-community/attacks/CSV_Injection
+    //
+    // [3]: https://github.com/mathesar-foundation/mathesar/issues/3576
     escapeFormulae: /^=|^\+|^@|^\t|^\r|^-(?!\d+(\.\d+)?$)/,
   });
 }

From 45491f1c9aa571e84dde31489e77793229277b56 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 14 May 2024 15:16:35 +0800
Subject: [PATCH 0177/1141] guarantee null if no relation is found

---
 db/sql/0_msar.sql | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/db/sql/0_msar.sql b/db/sql/0_msar.sql
index 8abac5ea2d..e7889bb864 100644
--- a/db/sql/0_msar.sql
+++ b/db/sql/0_msar.sql
@@ -208,6 +208,26 @@ END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION
+msar.get_relation_name_or_null(rel_id oid) RETURNS text AS $$/*
+Return the name for a given relation (e.g., table), qualified or quoted as appropriate.
+
+In cases where the relation is already included in the search path, the returned name will not be
+fully-qualified.
+
+The relation *must* be in the pg_class table to use this function. This function will return NULL if
+no corresponding relation can be found.
+
+Args:
+  rel_id: The OID of the relation.
+*/
+SELECT CASE
+  WHEN EXISTS (SELECT oid FROM pg_class WHERE oid=rel_id) THEN rel_id::regclass::text
+END
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
+
 DROP FUNCTION IF EXISTS msar.get_relation_oid(text, text) CASCADE;
 CREATE OR REPLACE FUNCTION
 msar.get_relation_oid(sch_name text, rel_name text) RETURNS oid AS $$/*
@@ -1119,7 +1139,7 @@ BEGIN
   FROM pg_attribute
   WHERE attrelid=tab_id AND ARRAY[attnum::integer] <@ col_ids
   INTO col_names;
-  RETURN __msar.drop_columns(__msar.get_relation_name(tab_id), variadic col_names);
+  RETURN __msar.drop_columns(msar.get_relation_name_or_null(tab_id), variadic col_names);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 

From 5a21e2ceb1286ed5d793119526269df3bb3a5fb4 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 14 May 2024 15:31:57 +0800
Subject: [PATCH 0178/1141] add test to verify we don't drop errant columns

---
 db/sql/test_0_msar.sql | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/db/sql/test_0_msar.sql b/db/sql/test_0_msar.sql
index f9d1b30317..cac605eea7 100644
--- a/db/sql/test_0_msar.sql
+++ b/db/sql/test_0_msar.sql
@@ -30,6 +30,17 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+CREATE OR REPLACE FUNCTION test_drop_columns_ne_oid() RETURNS SETOF TEXT AS $$
+BEGIN
+  CREATE TABLE "12345" (bleh text, bleh2 numeric);
+  PERFORM msar.drop_columns(12345, 1);
+  RETURN NEXT has_column(
+    '12345', 'bleh', 'Doesn''t drop columns of stupidly-named table'
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
 CREATE OR REPLACE FUNCTION test_drop_columns_names() RETURNS SETOF TEXT AS $$
 BEGIN
   PERFORM __setup_drop_columns();

From 28f9c7eaab37ffb9083d188fea0c25394b9b69bd Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 14 May 2024 15:41:06 +0800
Subject: [PATCH 0179/1141] add python function to wire up column dropping

---
 db/columns/operations/drop.py            | 20 ++++++++++++++++----
 db/tests/columns/operations/test_drop.py | 16 ++++++++++++++++
 2 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 db/tests/columns/operations/test_drop.py

diff --git a/db/columns/operations/drop.py b/db/columns/operations/drop.py
index 8e2910bb45..30d643ec71 100644
--- a/db/columns/operations/drop.py
+++ b/db/columns/operations/drop.py
@@ -1,14 +1,14 @@
-"""The function in this module wraps SQL functions that drop columns."""
+"""The functions in this module wrap SQL functions that drop columns."""
 from db import connection as db_conn
 
 
 def drop_column(table_oid, column_attnum, engine):
     """
-    Drop the given columns from the given table.
+    Drop the given column from the given table.
 
     Args:
-        table_oid: OID of the table whose columns we'll drop.
-        column_attnum: The attnums of the columns to drop.
+        table_oid: OID of the table whose column we'll drop.
+        column_attnum: The attnum of the column to drop.
         engine: SQLAlchemy engine object for connecting.
 
     Returns:
@@ -17,3 +17,15 @@ def drop_column(table_oid, column_attnum, engine):
     return db_conn.execute_msar_func_with_engine(
         engine, 'drop_columns', table_oid, column_attnum
     ).fetchone()[0]
+
+
+def drop_columns_from_table(table_oid, column_attnums, conn):
+    """
+    Drop the given columns from the given table.
+
+    Args:
+        table_oid: OID of the table whose columns we'll drop.
+        column_attnums: The attnums of the columns to drop.
+        conn: A psycopg connection to the relevant database.
+    """
+    db_conn.exec_msar_func(conn, 'drop_columns', table_oid, *column_attnums)
diff --git a/db/tests/columns/operations/test_drop.py b/db/tests/columns/operations/test_drop.py
new file mode 100644
index 0000000000..2035d86a93
--- /dev/null
+++ b/db/tests/columns/operations/test_drop.py
@@ -0,0 +1,16 @@
+from unittest.mock import patch
+from db.columns.operations import drop as col_drop
+
+
+def test_drop_columns():
+    with patch.object(col_drop.db_conn, 'exec_msar_func') as mock_exec:
+        result = col_drop.drop_columns_from_table(123, [1, 3, 5], 'conn')
+    mock_exec.assert_called_once_with('conn', 'drop_columns', 123, 1, 3, 5)
+    assert result is None
+
+
+def test_get_column_info_for_table():
+    with patch.object(col_drop.db_conn, 'exec_msar_func') as mock_exec:
+        result = col_drop.drop_columns_from_table(123, [1], 'conn')
+    mock_exec.assert_called_once_with('conn', 'drop_columns', 123, 1)
+    assert result is None

From 2277ca9ebd28d5a2e5f6f54b85c95f05ce740feb Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 14 May 2024 16:31:15 +0800
Subject: [PATCH 0180/1141] update function to return number of columns dropped

---
 db/columns/operations/drop.py            | 4 +++-
 db/sql/0_msar.sql                        | 5 +++--
 db/tests/columns/operations/test_drop.py | 6 ++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/db/columns/operations/drop.py b/db/columns/operations/drop.py
index 30d643ec71..a9227af358 100644
--- a/db/columns/operations/drop.py
+++ b/db/columns/operations/drop.py
@@ -28,4 +28,6 @@ def drop_columns_from_table(table_oid, column_attnums, conn):
         column_attnums: The attnums of the columns to drop.
         conn: A psycopg connection to the relevant database.
     """
-    db_conn.exec_msar_func(conn, 'drop_columns', table_oid, *column_attnums)
+    return db_conn.exec_msar_func(
+        conn, 'drop_columns', table_oid, *column_attnums
+    ).fetchone()[0]
diff --git a/db/sql/0_msar.sql b/db/sql/0_msar.sql
index e7889bb864..6653689c03 100644
--- a/db/sql/0_msar.sql
+++ b/db/sql/0_msar.sql
@@ -1137,9 +1137,10 @@ DECLARE col_names text[];
 BEGIN
   SELECT array_agg(quote_ident(attname))
   FROM pg_attribute
-  WHERE attrelid=tab_id AND ARRAY[attnum::integer] <@ col_ids
+  WHERE attrelid=tab_id AND NOT attisdropped AND ARRAY[attnum::integer] <@ col_ids
   INTO col_names;
-  RETURN __msar.drop_columns(msar.get_relation_name_or_null(tab_id), variadic col_names);
+  PERFORM __msar.drop_columns(msar.get_relation_name_or_null(tab_id), variadic col_names);
+  RETURN array_length(col_names, 1);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
diff --git a/db/tests/columns/operations/test_drop.py b/db/tests/columns/operations/test_drop.py
index 2035d86a93..35805cd8bc 100644
--- a/db/tests/columns/operations/test_drop.py
+++ b/db/tests/columns/operations/test_drop.py
@@ -4,13 +4,15 @@
 
 def test_drop_columns():
     with patch.object(col_drop.db_conn, 'exec_msar_func') as mock_exec:
+        mock_exec.return_value.fetchone = lambda: (3,)
         result = col_drop.drop_columns_from_table(123, [1, 3, 5], 'conn')
     mock_exec.assert_called_once_with('conn', 'drop_columns', 123, 1, 3, 5)
-    assert result is None
+    assert result == 3
 
 
 def test_get_column_info_for_table():
     with patch.object(col_drop.db_conn, 'exec_msar_func') as mock_exec:
+        mock_exec.return_value.fetchone = lambda: (1,)
         result = col_drop.drop_columns_from_table(123, [1], 'conn')
     mock_exec.assert_called_once_with('conn', 'drop_columns', 123, 1)
-    assert result is None
+    assert result == 1

From 1c6c3e1a8cab27c839b03c3594186800e90d1c7d Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 14 May 2024 16:58:42 +0800
Subject: [PATCH 0181/1141] wire up RPC function to drop columns

---
 mathesar/rpc/columns.py              | 23 +++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py | 13 ++++++-------
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/mathesar/rpc/columns.py b/mathesar/rpc/columns.py
index d8a0f66dce..017a780204 100644
--- a/mathesar/rpc/columns.py
+++ b/mathesar/rpc/columns.py
@@ -7,6 +7,7 @@
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from db.columns.operations.select import get_column_info_for_table
+from db.columns.operations.drop import drop_columns_from_table
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
 from mathesar.utils.columns import get_raw_display_options
@@ -155,3 +156,25 @@ def list_(*, table_oid: int, database_id: int, **kwargs) -> ColumnListReturn:
         column_info=column_info,
         display_options=display_options,
     )
+
+
+@rpc_method(name="columns.delete")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def delete(
+        *, column_attnums: list[int], table_oid: int, database_id: int, **kwargs
+) -> int:
+    """
+    Delete columns from a table.
+
+    Args:
+        column_attnums: A list of attnums of columns to delete.
+        table_oid: Identity of the table in the user's database.
+        database_id: The Django id of the database containing the table.
+
+    Returns:
+        The number of columns dropped.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        return drop_columns_from_table(table_oid, column_attnums, conn)
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 41841079b1..da0a9205fd 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -12,13 +12,6 @@
 from mathesar.rpc import connections
 
 
-exposed_functions = [
-    "columns.list",
-    "connections.add_from_known_connection",
-    "connections.add_from_scratch",
-]
-
-
 def test_rpc_endpoint_expected_methods(live_server, admin_client):
     """Smoketest checks that we have exposed the expected methods."""
     all_methods = admin_client.post(
@@ -32,6 +25,7 @@ def test_rpc_endpoint_expected_methods(live_server, admin_client):
     ).json()["result"]
     mathesar_methods = [m for m in all_methods if not m.startswith("system.")]
     expect_methods = [
+        "columns.delete",
         "columns.list",
         "connections.add_from_known_connection",
         "connections.add_from_scratch",
@@ -42,6 +36,11 @@ def test_rpc_endpoint_expected_methods(live_server, admin_client):
 @pytest.mark.parametrize(
     "func,exposed_name,auth_pred_params",
     [
+        (
+            columns.delete,
+            "columns.delete",
+            [user_is_authenticated]
+        ),
         (
             columns.list_,
             "columns.list",

From bae160d73c55841ad6151b5d94a64c941bb26690 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 14 May 2024 17:18:45 +0800
Subject: [PATCH 0182/1141] add test for inner logic of column deleter RPC
 function

---
 mathesar/tests/rpc/test_columns.py | 33 ++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/mathesar/tests/rpc/test_columns.py b/mathesar/tests/rpc/test_columns.py
index 9b77cb3e93..8ae1b2d9e1 100644
--- a/mathesar/tests/rpc/test_columns.py
+++ b/mathesar/tests/rpc/test_columns.py
@@ -136,3 +136,36 @@ def mock_display_options(_database_id, _table_oid, attnums, user):
     }
     actual_col_list = columns.list_(table_oid=23457, database_id=2, request=request)
     assert actual_col_list == expect_col_list
+
+
+def test_columns_delete(rf, monkeypatch):
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username='alice', password='pass1234')
+    table_oid = 23457
+    database_id = 2
+    column_attnums = [2, 3, 8]
+
+    @contextmanager
+    def mock_connect(_database_id, user):
+        if _database_id == 2 and user.username == 'alice':
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_column_drop(_table_oid, _column_attnums, conn):
+        if _table_oid != table_oid or _column_attnums  != column_attnums:
+            raise AssertionError('incorrect parameters passed')
+        return 3
+
+    monkeypatch.setattr(columns, 'connect', mock_connect)
+    monkeypatch.setattr(columns, 'drop_columns_from_table', mock_column_drop)
+    actual_result = columns.delete(
+        column_attnums=column_attnums,
+        table_oid=table_oid,
+        database_id=database_id,
+        request=request
+    )
+    assert actual_result == 3

From b8bb0ef2a6ce777e983940238ad5e49457e5bab9 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 14 May 2024 17:38:21 +0800
Subject: [PATCH 0183/1141] Fix linter issue

---
 mathesar/tests/rpc/test_columns.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/tests/rpc/test_columns.py b/mathesar/tests/rpc/test_columns.py
index 8ae1b2d9e1..8f20811ecf 100644
--- a/mathesar/tests/rpc/test_columns.py
+++ b/mathesar/tests/rpc/test_columns.py
@@ -156,7 +156,7 @@ def mock_connect(_database_id, user):
             raise AssertionError('incorrect parameters passed')
 
     def mock_column_drop(_table_oid, _column_attnums, conn):
-        if _table_oid != table_oid or _column_attnums  != column_attnums:
+        if _table_oid != table_oid or _column_attnums != column_attnums:
             raise AssertionError('incorrect parameters passed')
         return 3
 

From 69e55bcfcb877801eb45e6612fe126ca123d17aa Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 14 May 2024 15:30:15 -0400
Subject: [PATCH 0184/1141] Use single quotes for non-SQL-syntax string

This fixes syntax highlighting in VS Code
---
 db/sql/test_0_msar.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/sql/test_0_msar.sql b/db/sql/test_0_msar.sql
index e21f4712f6..26d2510c1d 100644
--- a/db/sql/test_0_msar.sql
+++ b/db/sql/test_0_msar.sql
@@ -1378,7 +1378,7 @@ $f$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION test_add_mathesar_table_badname() RETURNS SETOF TEXT AS $f$
 DECLARE
-  badname text := $b$M"new"'dsf' \t"$b$;
+  badname text := '"new"''dsf'' \t"';
 BEGIN
   PERFORM msar.add_mathesar_table(
     'tab_create_schema'::regnamespace::oid, badname, null, null, null

From 62ed17f19d5d6604a1a975e2922716d21bd54c0e Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 14 May 2024 21:19:54 -0400
Subject: [PATCH 0185/1141] Remove dead frontend API client code

---
 mathesar_ui/src/api/rest/schemas.ts |  5 -----
 mathesar_ui/src/stores/schemas.ts   | 23 -----------------------
 2 files changed, 28 deletions(-)

diff --git a/mathesar_ui/src/api/rest/schemas.ts b/mathesar_ui/src/api/rest/schemas.ts
index 20dcff06d9..9940035c0b 100644
--- a/mathesar_ui/src/api/rest/schemas.ts
+++ b/mathesar_ui/src/api/rest/schemas.ts
@@ -15,10 +15,6 @@ function list(connectionId: Connection['id']) {
   );
 }
 
-function get(schemaId: SchemaEntry['id']) {
-  return getAPI<SchemaResponse>(`/api/db/v0/schemas/${schemaId}/`);
-}
-
 function add(props: {
   name: SchemaEntry['name'];
   description: SchemaEntry['description'];
@@ -48,7 +44,6 @@ function deleteSchema(schemaId: SchemaEntry['id']) {
 
 export default {
   list,
-  get,
   add,
   update,
   delete: deleteSchema,
diff --git a/mathesar_ui/src/stores/schemas.ts b/mathesar_ui/src/stores/schemas.ts
index 307264c838..774cd840f1 100644
--- a/mathesar_ui/src/stores/schemas.ts
+++ b/mathesar_ui/src/stores/schemas.ts
@@ -175,29 +175,6 @@ async function refetchSchemasForDB(
   }
 }
 
-export async function refetchSchema(
-  connectionId: Connection['id'],
-  schemaId: SchemaEntry['id'],
-): Promise<SchemaResponse | undefined> {
-  const store = dbSchemaStoreMap.get(connectionId);
-  if (!store) {
-    console.error(`DB Schemas store for db: ${connectionId} not found.`);
-    return undefined;
-  }
-
-  try {
-    const schemaRequest = schemasApi.get(schemaId);
-    const response = await schemaRequest;
-    if (!response) {
-      return undefined;
-    }
-    updateSchemaInDBSchemaStore(connectionId, response);
-    return response;
-  } catch (err) {
-    return undefined;
-  }
-}
-
 let preload = true;
 
 function getSchemasStoreForDB(

From 8a5a03f679d73a39ec417a3edabcbcf04934374d Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 15 May 2024 15:38:52 +0800
Subject: [PATCH 0186/1141] rename SQL files for more room

---
 db/sql/{0_msar.sql => 00_msar.sql}                            | 0
 ...1_msar_joinable_tables.sql => 10_msar_joinable_tables.sql} | 0
 db/sql/{2_msar_views.sql => 20_msar_views.sql}                | 2 +-
 ...ar_custom_aggregates.sql => 30_msar_custom_aggregates.sql} | 0
 db/sql/install.py                                             | 4 ++--
 db/sql/{test_0_msar.sql => test_00_msar.sql}                  | 0
 db/sql/test_startup.sql                                       | 4 ++--
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename db/sql/{0_msar.sql => 00_msar.sql} (100%)
 rename db/sql/{1_msar_joinable_tables.sql => 10_msar_joinable_tables.sql} (100%)
 rename db/sql/{2_msar_views.sql => 20_msar_views.sql} (98%)
 rename db/sql/{3_msar_custom_aggregates.sql => 30_msar_custom_aggregates.sql} (100%)
 rename db/sql/{test_0_msar.sql => test_00_msar.sql} (100%)

diff --git a/db/sql/0_msar.sql b/db/sql/00_msar.sql
similarity index 100%
rename from db/sql/0_msar.sql
rename to db/sql/00_msar.sql
diff --git a/db/sql/1_msar_joinable_tables.sql b/db/sql/10_msar_joinable_tables.sql
similarity index 100%
rename from db/sql/1_msar_joinable_tables.sql
rename to db/sql/10_msar_joinable_tables.sql
diff --git a/db/sql/2_msar_views.sql b/db/sql/20_msar_views.sql
similarity index 98%
rename from db/sql/2_msar_views.sql
rename to db/sql/20_msar_views.sql
index 1b9e608880..ad15a60284 100644
--- a/db/sql/2_msar_views.sql
+++ b/db/sql/20_msar_views.sql
@@ -18,7 +18,7 @@
 --
 -- This file creates a schema `msar_views` where internal mathesar views will be stored.
 --
--- For naming conventions, see 0_msar.sql
+-- For naming conventions, see 00_msar.sql
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 CREATE SCHEMA IF NOT EXISTS msar_views;
diff --git a/db/sql/3_msar_custom_aggregates.sql b/db/sql/30_msar_custom_aggregates.sql
similarity index 100%
rename from db/sql/3_msar_custom_aggregates.sql
rename to db/sql/30_msar_custom_aggregates.sql
diff --git a/db/sql/install.py b/db/sql/install.py
index b3736f2910..8de4c7e2f2 100644
--- a/db/sql/install.py
+++ b/db/sql/install.py
@@ -2,8 +2,8 @@
 from db.connection import load_file_with_engine
 
 FILE_DIR = os.path.abspath(os.path.dirname(__file__))
-MSAR_SQL = os.path.join(FILE_DIR, '0_msar.sql')
-MSAR_AGGREGATE_SQL = os.path.join(FILE_DIR, '3_msar_custom_aggregates.sql')
+MSAR_SQL = os.path.join(FILE_DIR, '00_msar.sql')
+MSAR_AGGREGATE_SQL = os.path.join(FILE_DIR, '30_msar_custom_aggregates.sql')
 
 
 def install(engine):
diff --git a/db/sql/test_0_msar.sql b/db/sql/test_00_msar.sql
similarity index 100%
rename from db/sql/test_0_msar.sql
rename to db/sql/test_00_msar.sql
diff --git a/db/sql/test_startup.sql b/db/sql/test_startup.sql
index 61408c7810..72e06bb899 100644
--- a/db/sql/test_startup.sql
+++ b/db/sql/test_startup.sql
@@ -8,5 +8,5 @@ $$ LANGUAGE plpgsql;
 CALL raise_notice('Creating testing DB');
 CREATE DATABASE mathesar_testing;
 \c mathesar_testing
-\ir 0_msar.sql
-\ir test_0_msar.sql
+\ir 00_msar.sql
+\ir test_00_msar.sql

From 1e2c64b15f42235dccaf2b7307e783ccd95a6224 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 16 May 2024 16:09:10 +0800
Subject: [PATCH 0187/1141] add docs for column delete

---
 docs/docs/api/rpc.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 12097fb5b1..f4a03d3abd 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -52,6 +52,7 @@ To use an RPC function:
     options:
       members:
       - list_
+      - delete
       - ColumnListReturn
       - ColumnInfo
       - TypeOptions

From cd0ec73d0fa9c805cfbd4d47eaad577313085d83 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 16 May 2024 14:07:53 -0400
Subject: [PATCH 0188/1141] Refactor list of methods in test_endpoints.py

---
 mathesar/tests/rpc/test_endpoints.py | 48 +++++++++++-----------------
 1 file changed, 18 insertions(+), 30 deletions(-)

diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 41841079b1..2cdfb1fe9b 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -12,10 +12,22 @@
 from mathesar.rpc import connections
 
 
-exposed_functions = [
-    "columns.list",
-    "connections.add_from_known_connection",
-    "connections.add_from_scratch",
+METHODS = [
+    (
+        columns.list_,
+        "columns.list",
+        [user_is_authenticated]
+    ),
+    (
+        connections.add_from_known_connection,
+        "connections.add_from_known_connection",
+        [user_is_superuser]
+    ),
+    (
+        connections.add_from_scratch,
+        "connections.add_from_scratch",
+        [user_is_superuser]
+    )
 ]
 
 
@@ -31,34 +43,10 @@ def test_rpc_endpoint_expected_methods(live_server, admin_client):
         content_type="application/json"
     ).json()["result"]
     mathesar_methods = [m for m in all_methods if not m.startswith("system.")]
-    expect_methods = [
-        "columns.list",
-        "connections.add_from_known_connection",
-        "connections.add_from_scratch",
-    ]
-    assert sorted(mathesar_methods) == expect_methods
+    assert sorted(mathesar_methods) == sorted(m[1] for m in METHODS)
 
 
-@pytest.mark.parametrize(
-    "func,exposed_name,auth_pred_params",
-    [
-        (
-            columns.list_,
-            "columns.list",
-            [user_is_authenticated]
-        ),
-        (
-            connections.add_from_known_connection,
-            "connections.add_from_known_connection",
-            [user_is_superuser]
-        ),
-        (
-            connections.add_from_scratch,
-            "connections.add_from_scratch",
-            [user_is_superuser]
-        )
-    ]
-)
+@pytest.mark.parametrize("func,exposed_name,auth_pred_params", METHODS)
 def test_correctly_exposed(func, exposed_name, auth_pred_params):
     """Tests to make sure every RPC function is correctly wired up."""
     # Make sure we didn't typo the function names for the endpoint.

From d7b942673a641f657a3c285bdddc755099fe5d95 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 16 May 2024 14:27:58 -0400
Subject: [PATCH 0189/1141] Refactor storage of schema names in constants

---
 db/constants.py                            | 20 +++++++++++++++-----
 db/schemas/operations/select.py            | 20 +++-----------------
 db/tests/schemas/operations/test_select.py |  4 ++--
 db/tests/types/test_install.py             |  4 ++--
 db/types/base.py                           |  6 ++----
 db/types/install.py                        |  6 +++---
 6 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/db/constants.py b/db/constants.py
index efc7a2504d..76f7d52c6d 100644
--- a/db/constants.py
+++ b/db/constants.py
@@ -1,8 +1,18 @@
-MATHESAR_PREFIX = "mathesar_"
 ID = "id"
 ID_ORIGINAL = "id_original"
-INFERENCE_SCHEMA = f"{MATHESAR_PREFIX}inference_schema"
 COLUMN_NAME_TEMPLATE = 'Column '  # auto generated column name 'Column 1' (no undescore)
-MSAR_PUBLIC = 'msar'
-MSAR_PRIVAT = f"__{MSAR_PUBLIC}"
-MSAR_VIEWS = f"{MSAR_PUBLIC}_views"
+
+MATHESAR_PREFIX = "mathesar_"
+MSAR_PUBLIC_SCHEMA = 'msar'
+MSAR_PRIVATE_SCHEMA = f"__{MSAR_PUBLIC_SCHEMA}"
+TYPES_SCHEMA = f"{MATHESAR_PREFIX}types"
+INFERENCE_SCHEMA = f"{MATHESAR_PREFIX}inference_schema"
+VIEWS_SCHEMA = f"{MSAR_PUBLIC_SCHEMA}_views"
+
+INTERNAL_SCHEMAS = {
+    TYPES_SCHEMA,
+    MSAR_PUBLIC_SCHEMA,
+    MSAR_PRIVATE_SCHEMA,
+    VIEWS_SCHEMA,
+    INFERENCE_SCHEMA
+}
diff --git a/db/schemas/operations/select.py b/db/schemas/operations/select.py
index 2a40e8666c..d4638d1682 100644
--- a/db/schemas/operations/select.py
+++ b/db/schemas/operations/select.py
@@ -1,24 +1,9 @@
 from sqlalchemy import select, and_, not_, or_, func
 
-from db import constants
-from db import types
+from db.constants import INTERNAL_SCHEMAS
 from db.utils import get_pg_catalog_table
 from db.metadata import get_empty_metadata
 
-TYPES_SCHEMA = types.base.SCHEMA
-TEMP_INFER_SCHEMA = constants.INFERENCE_SCHEMA
-MSAR_PUBLIC = constants.MSAR_PUBLIC
-MSAR_PRIVAT = constants.MSAR_PRIVAT
-MSAR_VIEWS = constants.MSAR_VIEWS
-EXCLUDED_SCHEMATA = [
-    "information_schema",
-    MSAR_PRIVAT,
-    MSAR_PUBLIC,
-    MSAR_VIEWS,
-    TEMP_INFER_SCHEMA,
-    TYPES_SCHEMA,
-]
-
 
 def reflect_schema(engine, name=None, oid=None, metadata=None):
     # If we have both arguments, the behavior is undefined.
@@ -46,7 +31,8 @@ def get_mathesar_schemas_with_oids(engine):
         select(pg_namespace.c.nspname.label('schema'), pg_namespace.c.oid)
         .where(
             and_(
-                *[pg_namespace.c.nspname != schema for schema in EXCLUDED_SCHEMATA],
+                *[pg_namespace.c.nspname != schema for schema in INTERNAL_SCHEMAS],
+                pg_namespace.c.nspname != "information_schema",
                 not_(pg_namespace.c.nspname.like("pg_%"))
             )
         )
diff --git a/db/tests/schemas/operations/test_select.py b/db/tests/schemas/operations/test_select.py
index 41ad8ba32b..35854d66ea 100644
--- a/db/tests/schemas/operations/test_select.py
+++ b/db/tests/schemas/operations/test_select.py
@@ -1,7 +1,7 @@
 import warnings
 from sqlalchemy import select, Table, MetaData, text
 
-from db import types
+from db.constants import TYPES_SCHEMA
 from db.tables.operations import infer_types
 from db.schemas.operations import select as ssel
 
@@ -27,7 +27,7 @@ def test_get_mathesar_schemas_with_oids_avoids_information_schema(engine_with_sc
 def test_get_mathesar_schemas_with_oids_avoids_types_schema(engine_with_schema):
     engine, schema = engine_with_schema
     actual_schemas = ssel.get_mathesar_schemas_with_oids(engine)
-    assert all([schema != types.base.SCHEMA for schema, _ in actual_schemas])
+    assert all([schema != TYPES_SCHEMA for schema, _ in actual_schemas])
 
 
 def test_get_mathesar_schemas_with_oids_avoids_temp_schema(engine_with_schema):
diff --git a/db/tests/types/test_install.py b/db/tests/types/test_install.py
index b10f08c883..0578001502 100644
--- a/db/tests/types/test_install.py
+++ b/db/tests/types/test_install.py
@@ -1,6 +1,6 @@
 from sqlalchemy import text
+from db.constants import TYPES_SCHEMA
 from db.types import install
-from db.types import base
 from db.types.custom import email
 from db.types.install import install_mathesar_on_database
 
@@ -10,7 +10,7 @@ def test_create_type_schema(engine):
     with engine.connect() as conn:
         res = conn.execute(text("SELECT * FROM information_schema.schemata"))
     schemata = {row['schema_name'] for row in res.fetchall()}
-    assert base.SCHEMA in schemata
+    assert TYPES_SCHEMA in schemata
 
 
 def test_create_type_schema_when_exists(engine):
diff --git a/db/types/base.py b/db/types/base.py
index 2024aaeeb6..06e4290d1a 100644
--- a/db/types/base.py
+++ b/db/types/base.py
@@ -2,7 +2,7 @@
 
 from sqlalchemy import text, create_engine as sa_create_engine
 
-from db import constants
+from db.constants import TYPES_SCHEMA
 from db.utils import OrderByIds
 
 
@@ -143,8 +143,6 @@ class PostgresType(DatabaseType, Enum):
     UUID = 'uuid'
 
 
-SCHEMA = f"{constants.MATHESAR_PREFIX}types"
-
 # Since we want to have our identifiers quoted appropriately for use in
 # PostgreSQL, we want to use the postgres dialect preparer to set this up.
 _preparer = sa_create_engine("postgresql://").dialect.identifier_preparer
@@ -154,7 +152,7 @@ def get_ma_qualified_schema():
     """
     Should usually return `mathesar_types`
     """
-    return _preparer.quote_schema(SCHEMA)
+    return _preparer.quote_schema(TYPES_SCHEMA)
 
 
 # TODO rename to get_qualified_mathesar_obj_name
diff --git a/db/types/install.py b/db/types/install.py
index 2b081f5aa2..5651af1eed 100644
--- a/db/types/install.py
+++ b/db/types/install.py
@@ -1,12 +1,12 @@
 from db.types.custom import email, money, multicurrency, uri, json_array, json_object
-from db.types.base import SCHEMA
+from db.constants import TYPES_SCHEMA
 from db.schemas.operations.create import create_schema
 from db.types.operations.cast import install_all_casts
 import psycopg
 
 
 def create_type_schema(engine):
-    create_schema(SCHEMA, engine, if_not_exists=True)
+    create_schema(TYPES_SCHEMA, engine, if_not_exists=True)
 
 
 def install_mathesar_on_database(engine):
@@ -24,4 +24,4 @@ def install_mathesar_on_database(engine):
 def uninstall_mathesar_from_database(engine):
     conn_str = str(engine.url)
     with psycopg.connect(conn_str) as conn:
-        conn.execute(f"DROP SCHEMA IF EXISTS __msar, msar, {SCHEMA} CASCADE")
+        conn.execute(f"DROP SCHEMA IF EXISTS __msar, msar, {TYPES_SCHEMA} CASCADE")

From 4a1a3d8320b59cd9453db65d1f599455bcd67bd2 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 16 May 2024 14:28:15 -0400
Subject: [PATCH 0190/1141] Add msar.get_schemas DB function

---
 db/schemas/operations/select.py |  5 ++++
 db/sql/0_msar.sql               | 39 +++++++++++++++++++++++++
 db/sql/test_0_msar.sql          | 51 +++++++++++++++++++++++++++++++++
 3 files changed, 95 insertions(+)

diff --git a/db/schemas/operations/select.py b/db/schemas/operations/select.py
index d4638d1682..046fbbc015 100644
--- a/db/schemas/operations/select.py
+++ b/db/schemas/operations/select.py
@@ -3,6 +3,11 @@
 from db.constants import INTERNAL_SCHEMAS
 from db.utils import get_pg_catalog_table
 from db.metadata import get_empty_metadata
+from db.connection import exec_msar_func
+
+
+def get_schemas(conn):
+    return exec_msar_func(conn, 'get_schemas').fetchone()[0]
 
 
 def reflect_schema(engine, name=None, oid=None, metadata=None):
diff --git a/db/sql/0_msar.sql b/db/sql/0_msar.sql
index 8abac5ea2d..a7f86d8363 100644
--- a/db/sql/0_msar.sql
+++ b/db/sql/0_msar.sql
@@ -662,6 +662,45 @@ SELECT EXISTS (SELECT 1 FROM pg_attribute WHERE attrelid=tab_id AND attname=col_
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION msar.get_schemas() RETURNS jsonb AS $$/*
+Return a json array of objects describing the user-defined schemas in the database.
+
+PostgreSQL system schemas are ignored.
+
+Internal Mathesar-specifc schemas are INCLUDED. These should be filtered out by the caller. This
+behavior is to avoid tight coupling between this function and other SQL files that might need to
+define additional Mathesar-specific schemas as our codebase grows.
+
+Each returned JSON object in the array will have the form:
+  {
+    "oid": <int>
+    "name": <str>
+    "description": <str|null>
+    "table_count": <int>
+  }
+*/
+SELECT jsonb_agg(schema_data)
+FROM (
+  SELECT 
+    s.oid AS oid,
+    min(s.nspname) AS name,
+    min(d.description) AS description,
+    COALESCE(count(c.oid), 0) AS table_count
+  FROM pg_catalog.pg_namespace s
+  LEFT JOIN pg_catalog.pg_description d ON
+    d.objoid = s.oid AND
+    d.objsubid = 0
+  LEFT JOIN pg_catalog.pg_class c ON
+    c.relnamespace = s.oid AND
+    c.relkind = 'r'
+  WHERE
+    s.nspname <> 'information_schema' AND
+    s.nspname NOT LIKE 'pg_%'
+  GROUP BY s.oid
+) AS schema_data;
+$$ LANGUAGE sql;
+
+
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 -- ROLE MANIPULATION FUNCTIONS
diff --git a/db/sql/test_0_msar.sql b/db/sql/test_0_msar.sql
index f9d1b30317..fb5d20a6fe 100644
--- a/db/sql/test_0_msar.sql
+++ b/db/sql/test_0_msar.sql
@@ -2557,3 +2557,54 @@ BEGIN
   );
 END;
 $$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_get_schemas() RETURNS SETOF TEXT AS $$
+DECLARE
+  initial_schema_count int;
+  foo_schema jsonb;
+BEGIN
+  -- Get the initial schema count
+  SELECT jsonb_array_length(msar.get_schemas()) INTO initial_schema_count;
+
+  -- Create a schema
+  CREATE SCHEMA foo;
+  -- We should now have one additional schema
+  RETURN NEXT is(jsonb_array_length(msar.get_schemas()), initial_schema_count + 1);
+  -- Reflect the "foo" schema
+  SELECT jsonb_path_query(msar.get_schemas(), '$[*] ? (@.name == "foo")') INTO foo_schema;
+  -- We should have a foo schema object
+  RETURN NEXT is(jsonb_typeof(foo_schema), 'object');
+  -- It should have no description
+  RETURN NEXT is(jsonb_typeof(foo_schema->'description'), 'null');
+  -- It should have no tables
+  RETURN NEXT is((foo_schema->'table_count')::int, 0);
+
+  -- And comment
+  COMMENT ON SCHEMA foo IS 'A test schema';
+  -- Create two tables
+  CREATE TABLE foo.test_table_1 (id serial PRIMARY KEY);
+  CREATE TABLE foo.test_table_2 (id serial PRIMARY KEY);
+  -- Reflect again
+  SELECT jsonb_path_query(msar.get_schemas(), '$[*] ? (@.name == "foo")') INTO foo_schema;
+  -- We should see the description we set
+  RETURN NEXT is(foo_schema->'description'#>>'{}', 'A test schema');
+  -- We should see two tables
+  RETURN NEXT is((foo_schema->'table_count')::int, 2);
+
+  -- Drop the tables we created
+  DROP TABLE foo.test_table_1;
+  DROP TABLE foo.test_table_2;
+  -- Reflect the "foo" schema
+  SELECT jsonb_path_query(msar.get_schemas(), '$[*] ? (@.name == "foo")') INTO foo_schema;
+  -- The "foo" schema should now have no tables
+  RETURN NEXT is((foo_schema->'table_count')::int, 0);
+
+  -- Drop the "foo" schema
+  DROP SCHEMA foo;
+  -- We should now have no "foo" schema
+  RETURN NEXT ok(NOT jsonb_path_exists(msar.get_schemas(), '$[*] ? (@.name == "foo")'));
+  -- We should see the initial schema count again
+  RETURN NEXT is(jsonb_array_length(msar.get_schemas()), initial_schema_count);
+END;
+$$ LANGUAGE plpgsql;

From 44cbcf0a9a9f66e0fd085d6c4eb7120d17e47842 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 16 May 2024 14:29:12 -0400
Subject: [PATCH 0191/1141] Add schemas.list RPC method

---
 config/settings/common_settings.py   |  3 +-
 docs/docs/api/rpc.md                 |  8 ++++
 mathesar/rpc/schemas.py              | 55 ++++++++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py |  9 ++++-
 4 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 mathesar/rpc/schemas.py

diff --git a/config/settings/common_settings.py b/config/settings/common_settings.py
index 7b8ab40d58..abd0e94204 100644
--- a/config/settings/common_settings.py
+++ b/config/settings/common_settings.py
@@ -66,7 +66,8 @@ def pipe_delim(pipe_string):
 
 MODERNRPC_METHODS_MODULES = [
     'mathesar.rpc.connections',
-    'mathesar.rpc.columns'
+    'mathesar.rpc.columns',
+    'mathesar.rpc.schemas'
 ]
 
 TEMPLATES = [
diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 12097fb5b1..44e7051d07 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -48,6 +48,14 @@ To use an RPC function:
 
 ---
 
+::: mathesar.rpc.schemas
+    options:
+      members:
+      - list_
+      - SchemaInfo
+
+---
+
 ::: mathesar.rpc.columns
     options:
       members:
diff --git a/mathesar/rpc/schemas.py b/mathesar/rpc/schemas.py
new file mode 100644
index 0000000000..1fdefa5b77
--- /dev/null
+++ b/mathesar/rpc/schemas.py
@@ -0,0 +1,55 @@
+"""
+Classes and functions exposed to the RPC endpoint for managing schemas.
+"""
+from typing import Optional, TypedDict
+
+from modernrpc.core import rpc_method, REQUEST_KEY
+from modernrpc.auth.basic import http_basic_auth_login_required
+
+from db.constants import INTERNAL_SCHEMAS
+from db.schemas.operations.select import get_schemas
+from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+from mathesar.rpc.utils import connect
+
+
+class SchemaInfo(TypedDict):
+    """
+    Information about a schema
+
+    Attributes:
+        oid: The OID of the schema
+        name: The name of the schema
+        description: A description of the schema
+        table_count: The number of tables in the schema
+        exploration_count: The number of explorations in the schema
+    """
+    oid: int
+    name: str
+    description: Optional[str]
+    table_count: int
+    exploration_count: int
+
+
+@rpc_method(name="schemas.list")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def list_(*, database_id: int, **kwargs) -> list[SchemaInfo]:
+    """
+    List information about schemas in a database. Exposed as `list`.
+
+    Args:
+        database_id: The Django id of the database containing the table.
+
+    Returns:
+        A list of schema details
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        schemas = get_schemas(conn)
+
+    user_defined_schemas = [s for s in schemas if s['name'] not in INTERNAL_SCHEMAS]
+
+    # TODO_FOR_BETA: join exploration count from internal DB here after we've
+    # refactored the models so that each exploration is associated with a schema
+    # (by oid) in a specific database.
+    return [{**s, "exploration_count": 0} for s in user_defined_schemas]
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 2cdfb1fe9b..09d2af3a64 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -10,7 +10,7 @@
 
 from mathesar.rpc import columns
 from mathesar.rpc import connections
-
+from mathesar.rpc import schemas
 
 METHODS = [
     (
@@ -27,7 +27,12 @@
         connections.add_from_scratch,
         "connections.add_from_scratch",
         [user_is_superuser]
-    )
+    ),
+    (
+        schemas.list_,
+        "schemas.list",
+        [user_is_authenticated]
+    ),
 ]
 
 

From 6e8e647611c5f6ef1581c86c181a9bb4839b570c Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 17 May 2024 13:30:30 +0800
Subject: [PATCH 0192/1141] add new-style column alteration python function

---
 db/columns/operations/alter.py | 84 ++++++++++++++++++++++++++++++++--
 1 file changed, 79 insertions(+), 5 deletions(-)

diff --git a/db/columns/operations/alter.py b/db/columns/operations/alter.py
index 04d089162d..ea804fb6d4 100644
--- a/db/columns/operations/alter.py
+++ b/db/columns/operations/alter.py
@@ -29,7 +29,7 @@ def alter_column(engine, table_oid, column_attnum, column_data, connection=None)
         "description": <str>
     }
     """
-    column_alter_def = _process_column_alter_dict(column_data, column_attnum)
+    column_alter_def = _process_column_alter_dict_dep(column_data, column_attnum)
     requested_type = column_alter_def.get("type", {}).get("name")
     if connection is None:
         try:
@@ -154,7 +154,7 @@ def batch_update_columns(table_oid, engine, column_data_list):
     """
     Alter the given columns of the table.
 
-    For details on the column_data_list format, see _process_column_alter_dict.
+    For details on the column_data_list format, see _process_column_alter_dict_dep.
 
     Args:
         table_oid: the OID of the table whose columns we'll alter.
@@ -167,7 +167,7 @@ def batch_update_columns(table_oid, engine, column_data_list):
             engine, 'alter_columns',
             table_oid,
             json.dumps(
-                [_process_column_alter_dict(column) for column in column_data_list]
+                [_process_column_alter_dict_dep(column) for column in column_data_list]
             )
         )
     except InvalidParameterValue:
@@ -180,7 +180,81 @@ def batch_update_columns(table_oid, engine, column_data_list):
         raise InvalidTypeOptionError
 
 
-def _process_column_alter_dict(column_data, column_attnum=None):
+def alter_columns_in_table(table_oid, column_data_list, conn):
+    """
+    Alter columns of the given table in bulk.
+
+    For a description of column_data_list, see _transform_column_alter_dict
+
+    Args:
+        table_oid: The OID of the table whose columns we'll alter.
+        column_data_list: a list of dicts describing the alterations to make.
+    """
+    transformed_column_data = [
+        _transform_column_alter_dict(column) for column in column_data_list
+    ]
+    db_conn.execute_msar_func_with_engine(
+        conn, 'alter_columns', table_oid, json.dumps(transformed_column_data)
+    )
+    return len(column_data_list)
+
+
+# TODO This function wouldn't be needed if we had the same form in the DB
+# as the RPC API function.
+def _transform_column_alter_dict(data):
+    """
+    Transform the data dict into the form needed for the DB functions.
+
+    Input data form:
+    {
+        "id": <int>,
+        "name": <str>,
+        "type": <str>,
+        "type_options": <dict>,
+        "nullable": <bool>,
+        "default": {"value": <any>}
+        "description": <str>
+    }
+
+    Output form:
+    {
+        "attnum": <int>,
+        "type": {"name": <str>, "options": <dict>},
+        "name": <str>,
+        "not_null": <bool>,
+        "default": <any>,
+        "description": <str>
+    }
+
+    Note that keys with empty values will be dropped, except "default"
+    and "description". Explicitly setting these to None requests dropping
+    the associated property of the underlying column.
+    """
+    type_ = {"name": data.get('type'), "options": data.get('type_options')}
+    new_type = {k: v for k, v in type_.items() if v} or None
+    nullable = data.get(NULLABLE)
+    not_null = not nullable if nullable is not None else None
+    column_name = (data.get(NAME) or '').strip() or None
+    raw_alter_def = {
+        "attnum": data["id"],
+        "type": new_type,
+        "not_null": not_null,
+        "name": column_name,
+        "description": data.get("description")
+    }
+    alter_def = {k: v for k, v in raw_alter_def.items() if v is not None}
+
+    default_dict = data.get("default", {})
+    if default_dict is None:
+        alter_def.update(default=None)
+    elif "value" in default_dict:
+        alter_def.update(default=default_dict["value"])
+
+    return alter_def
+
+
+# TODO This function is deprecated. Remove it when possible.
+def _process_column_alter_dict_dep(column_data, column_attnum=None):
     """
     Transform the column_data dict into the form needed for the DB functions.
 
@@ -221,7 +295,7 @@ def _process_column_alter_dict(column_data, column_attnum=None):
     column_not_null = not column_nullable if column_nullable is not None else None
     column_name = (column_data.get(NAME) or '').strip() or None
     raw_col_alter_def = {
-        "attnum": column_attnum or column_data.get("attnum"),
+        "attnum": column_attnum or column_data.get("attnum") or column_data.get("id"),
         "type": new_type,
         "not_null": column_not_null,
         "name": column_name,

From a5f2c82b3eab770c5359e250582ccb003c98213b Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 17 May 2024 16:16:11 +0530
Subject: [PATCH 0193/1141] add sql function, rpc endpoint for tables.list

---
 db/sql/0_msar.sql              | 28 ++++++++++++++++++++++++++++
 db/tables/operations/select.py |  5 +++++
 mathesar/rpc/tables.py         | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+)
 create mode 100644 mathesar/rpc/tables.py

diff --git a/db/sql/0_msar.sql b/db/sql/0_msar.sql
index 8abac5ea2d..6ebaa3e4e4 100644
--- a/db/sql/0_msar.sql
+++ b/db/sql/0_msar.sql
@@ -122,6 +122,17 @@ from Python through a single Python module.
   END
 $$ LANGUAGE plpgsql;
 
+
+CREATE OR REPLACE FUNCTION msar.obj_description(obj_id oid, catalog_name text) RETURNS text AS $$/*
+Transparent wrapper for obj_description. Putting it in the `msar` namespace helps route all DB calls
+from Python through a single Python module.
+*/
+  BEGIN
+    RETURN obj_description(obj_id, catalog_name);
+  END
+$$ LANGUAGE plpgsql;
+
+
 CREATE OR REPLACE FUNCTION __msar.jsonb_key_exists(data jsonb, key text) RETURNS boolean AS $$/*
 Wraps the `?` jsonb operator for improved readability.
 */
@@ -662,6 +673,23 @@ SELECT EXISTS (SELECT 1 FROM pg_attribute WHERE attrelid=tab_id AND attname=col_
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION msar.get_table_info() RETURNS jsonb AS $$
+SELECT jsonb_agg(
+  jsonb_build_object(
+    'id', pgc.oid,
+    'name', relname,
+    'schema', pgn.nspname,
+    'description', msar.obj_description(pgc.oid, 'pg_class')
+  )
+)
+FROM pg_catalog.pg_class AS pgc 
+  LEFT JOIN pg_namespace AS pgn ON pgc.relnamespace = pgn.oid 
+WHERE pgn.nspname NOT IN (
+  'pg_toast', 'pg_catalog', 'information_schema', '__msar', 'msar', 'mathesar_types'
+) AND pgc.relkind = 'r';
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 -- ROLE MANIPULATION FUNCTIONS
diff --git a/db/tables/operations/select.py b/db/tables/operations/select.py
index 5104d029e0..8a0efed2fc 100644
--- a/db/tables/operations/select.py
+++ b/db/tables/operations/select.py
@@ -3,6 +3,7 @@
 )
 from sqlalchemy.dialects.postgresql import JSONB
 
+from db.connection import exec_msar_func
 from db.utils import execute_statement, get_pg_catalog_table
 
 BASE = 'base'
@@ -14,6 +15,10 @@
 MULTIPLE_RESULTS = 'multiple_results'
 
 
+def get_table_info(conn):
+    return exec_msar_func(conn, 'get_table_info').fetchone()[0]
+
+
 def reflect_table(name, schema, engine, metadata, connection_to_use=None, keep_existing=False):
     extend_existing = not keep_existing
     autoload_with = engine if connection_to_use is None else connection_to_use
diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
new file mode 100644
index 0000000000..54262a38d4
--- /dev/null
+++ b/mathesar/rpc/tables.py
@@ -0,0 +1,34 @@
+from typing import TypedDict
+
+from modernrpc.core import rpc_method, REQUEST_KEY
+from modernrpc.auth.basic import http_basic_auth_login_required
+
+from db.tables.operations.select import get_table_info
+from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+from mathesar.rpc.utils import connect
+
+
+class TableInfo(TypedDict):
+    id: int
+    name: str
+    schema: str
+    description: str
+
+
+class TableListReturn(TypedDict):
+    table_info: list[TableInfo]
+
+
+@rpc_method(name="tables.list")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def list_(*, database_id: int, **kwargs) -> TableListReturn:
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        raw_table_info = get_table_info(conn)
+    table_info = [
+        TableInfo.from_dict(tab) for tab in raw_table_info
+    ]
+    return TableListReturn(
+        table_info=table_info
+    )

From 7cc4142508544e0834ae1839fa272353baeb32c0 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 17 May 2024 18:05:14 +0530
Subject: [PATCH 0194/1141] use schema_oid as a param for tables.list

---
 db/sql/0_msar.sql              | 10 ++++------
 db/tables/operations/select.py |  4 ++--
 mathesar/rpc/tables.md         | 19 +++++++++++++++++++
 mathesar/rpc/tables.py         |  8 ++++----
 4 files changed, 29 insertions(+), 12 deletions(-)
 create mode 100644 mathesar/rpc/tables.md

diff --git a/db/sql/0_msar.sql b/db/sql/0_msar.sql
index 6ebaa3e4e4..dd80f90678 100644
--- a/db/sql/0_msar.sql
+++ b/db/sql/0_msar.sql
@@ -673,20 +673,18 @@ SELECT EXISTS (SELECT 1 FROM pg_attribute WHERE attrelid=tab_id AND attname=col_
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
-CREATE OR REPLACE FUNCTION msar.get_table_info() RETURNS jsonb AS $$
+CREATE OR REPLACE FUNCTION msar.get_table_info(sch_id regnamespace) RETURNS jsonb AS $$
 SELECT jsonb_agg(
   jsonb_build_object(
     'id', pgc.oid,
-    'name', relname,
-    'schema', pgn.nspname,
+    'name', pgc.relname,
+    'schema', pgc.relnamespace,
     'description', msar.obj_description(pgc.oid, 'pg_class')
   )
 )
 FROM pg_catalog.pg_class AS pgc 
   LEFT JOIN pg_namespace AS pgn ON pgc.relnamespace = pgn.oid 
-WHERE pgn.nspname NOT IN (
-  'pg_toast', 'pg_catalog', 'information_schema', '__msar', 'msar', 'mathesar_types'
-) AND pgc.relkind = 'r';
+WHERE pgc.relnamespace = sch_id AND pgc.relkind = 'r';
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
diff --git a/db/tables/operations/select.py b/db/tables/operations/select.py
index 8a0efed2fc..89f0dc08ed 100644
--- a/db/tables/operations/select.py
+++ b/db/tables/operations/select.py
@@ -15,8 +15,8 @@
 MULTIPLE_RESULTS = 'multiple_results'
 
 
-def get_table_info(conn):
-    return exec_msar_func(conn, 'get_table_info').fetchone()[0]
+def get_table_info(schema_oid, conn):
+    return exec_msar_func(conn, 'get_table_info', schema_oid).fetchone()[0]
 
 
 def reflect_table(name, schema, engine, metadata, connection_to_use=None, keep_existing=False):
diff --git a/mathesar/rpc/tables.md b/mathesar/rpc/tables.md
new file mode 100644
index 0000000000..90169dbb51
--- /dev/null
+++ b/mathesar/rpc/tables.md
@@ -0,0 +1,19 @@
+What should be in the response for `tables.get`
+
+- id
+- name
+- schema
+- description
+
+```
+SELECT relname, relnamespace, pgn.nspname FROM pg_catalog.pg_class pgc LEFT JOIN pg_namespace pgn ON pgc.relnamespace=pgn.oid WHERE pgn.nspname != 'pg_toast' AND pgn.nspname != 'pg_catalog' AND pgn.nspname != 'information_schema' AND pgn.nspname != '__msar' AND pgn.nspname != 'msar' AND pgn.nspname != 'mathesar_types' AND pgc.relkind = 'r';
+```
+```
+SELECT pgc.relname, pgc.relnamespace, pgn.nspname 
+FROM pg_catalog.pg_class AS pgc 
+LEFT JOIN pg_namespace AS pgn ON pgc.relnamespace = pgn.oid 
+WHERE pgn.nspname NOT IN ('pg_toast', 'pg_catalog', 'information_schema', '__msar', 'msar', 'mathesar_types') 
+AND pgc.relkind = 'r';
+```
+select * from pg_depend as pgd left join pg_class as pgc on pgc.oid = pgd.classid LEFT JOIN pg_namespace AS pgn ON pgc.relnamespace = pgn.oid WHERE pgn.nspname NOT IN ('pg_toast', 'pg_catalog', 'information_schema', '__msar', 'msar', 'mathesar_types') 
+AND pgc.relkind = 'r' AND deptype = 'n';
\ No newline at end of file
diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index 54262a38d4..d07214dd39 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -11,7 +11,7 @@
 class TableInfo(TypedDict):
     id: int
     name: str
-    schema: str
+    schema: int
     description: str
 
 
@@ -22,12 +22,12 @@ class TableListReturn(TypedDict):
 @rpc_method(name="tables.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def list_(*, database_id: int, **kwargs) -> TableListReturn:
+def list_(*, schema_oid: int, database_id: int, **kwargs) -> TableListReturn:
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
-        raw_table_info = get_table_info(conn)
+        raw_table_info = get_table_info(schema_oid, conn)
     table_info = [
-        TableInfo.from_dict(tab) for tab in raw_table_info
+        TableInfo(tab) for tab in raw_table_info
     ]
     return TableListReturn(
         table_info=table_info

From 338ad88e8b76d42b1688434f8b41da405c6c2168 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 17 May 2024 18:07:01 +0530
Subject: [PATCH 0195/1141] rm tables.md

---
 mathesar/rpc/tables.md | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 mathesar/rpc/tables.md

diff --git a/mathesar/rpc/tables.md b/mathesar/rpc/tables.md
deleted file mode 100644
index 90169dbb51..0000000000
--- a/mathesar/rpc/tables.md
+++ /dev/null
@@ -1,19 +0,0 @@
-What should be in the response for `tables.get`
-
-- id
-- name
-- schema
-- description
-
-```
-SELECT relname, relnamespace, pgn.nspname FROM pg_catalog.pg_class pgc LEFT JOIN pg_namespace pgn ON pgc.relnamespace=pgn.oid WHERE pgn.nspname != 'pg_toast' AND pgn.nspname != 'pg_catalog' AND pgn.nspname != 'information_schema' AND pgn.nspname != '__msar' AND pgn.nspname != 'msar' AND pgn.nspname != 'mathesar_types' AND pgc.relkind = 'r';
-```
-```
-SELECT pgc.relname, pgc.relnamespace, pgn.nspname 
-FROM pg_catalog.pg_class AS pgc 
-LEFT JOIN pg_namespace AS pgn ON pgc.relnamespace = pgn.oid 
-WHERE pgn.nspname NOT IN ('pg_toast', 'pg_catalog', 'information_schema', '__msar', 'msar', 'mathesar_types') 
-AND pgc.relkind = 'r';
-```
-select * from pg_depend as pgd left join pg_class as pgc on pgc.oid = pgd.classid LEFT JOIN pg_namespace AS pgn ON pgc.relnamespace = pgn.oid WHERE pgn.nspname NOT IN ('pg_toast', 'pg_catalog', 'information_schema', '__msar', 'msar', 'mathesar_types') 
-AND pgc.relkind = 'r' AND deptype = 'n';
\ No newline at end of file

From 0132733734a93cb753697f69013e899b45270fe7 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 17 May 2024 18:48:15 +0530
Subject: [PATCH 0196/1141] add docstrings

---
 db/sql/0_msar.sql              | 15 ++++++++++++++-
 db/tables/operations/select.py | 22 ++++++++++++++++++++--
 mathesar/rpc/tables.py         | 25 +++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/db/sql/0_msar.sql b/db/sql/0_msar.sql
index dd80f90678..0d3e2f9d3f 100644
--- a/db/sql/0_msar.sql
+++ b/db/sql/0_msar.sql
@@ -673,7 +673,20 @@ SELECT EXISTS (SELECT 1 FROM pg_attribute WHERE attrelid=tab_id AND attname=col_
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
-CREATE OR REPLACE FUNCTION msar.get_table_info(sch_id regnamespace) RETURNS jsonb AS $$
+CREATE OR REPLACE FUNCTION msar.get_table_info(sch_id regnamespace) RETURNS jsonb AS $$/*
+Given a schema identifier, return an array of objects describing the tables of the schema.
+
+Each returned JSON object in the array will have the form:
+  {
+    "id": <int>,
+    "name": <str>,
+    "schema": <int>,
+    "description": <str>
+  }
+
+Args:
+  sch_id: The OID or name of the schema.
+*/
 SELECT jsonb_agg(
   jsonb_build_object(
     'id', pgc.oid,
diff --git a/db/tables/operations/select.py b/db/tables/operations/select.py
index 89f0dc08ed..f07c27006d 100644
--- a/db/tables/operations/select.py
+++ b/db/tables/operations/select.py
@@ -15,8 +15,26 @@
 MULTIPLE_RESULTS = 'multiple_results'
 
 
-def get_table_info(schema_oid, conn):
-    return exec_msar_func(conn, 'get_table_info', schema_oid).fetchone()[0]
+def get_table_info(schema, conn):
+    """
+    Return a list of dictionaries describing the tables of a schema.
+
+    The `schema` can be given as either a "qualified name", or an OID.
+    The OID is the preferred identifier, since it's much more robust.
+
+    The returned list contains dictionaries of the following form:
+
+        {
+            "id": <int>,
+            "name": <str>,
+            "schema": <int>,
+            "description": <str>
+        }
+
+    Args:
+        schema: The schema for which we want table info.
+    """
+    return exec_msar_func(conn, 'get_table_info', schema).fetchone()[0]
 
 
 def reflect_table(name, schema, engine, metadata, connection_to_use=None, keep_existing=False):
diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index d07214dd39..b126cae909 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -9,6 +9,15 @@
 
 
 class TableInfo(TypedDict):
+    """
+    Information about a table.
+
+    Attributes:
+        id: The `oid` of the table in the schema.
+        name: The name of the table.
+        schema: The `oid` of the schema where the table lives.
+        description: The description of the table.
+    """
     id: int
     name: str
     schema: int
@@ -16,6 +25,12 @@ class TableInfo(TypedDict):
 
 
 class TableListReturn(TypedDict):
+    """
+    Information about the tables of a schema.
+
+    Attributes:
+        table_info: Column information from the user's database.
+    """
     table_info: list[TableInfo]
 
 
@@ -23,6 +38,16 @@ class TableListReturn(TypedDict):
 @http_basic_auth_login_required
 @handle_rpc_exceptions
 def list_(*, schema_oid: int, database_id: int, **kwargs) -> TableListReturn:
+    """
+    List information about tables for a schema. Exposed as `list`.
+
+    Args:
+        schema_oid: Identity of the schema in the user's database.
+        database_id: The Django id of the database containing the table.
+
+    Returns:
+        A list of table details.
+    """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
         raw_table_info = get_table_info(schema_oid, conn)

From c59c85f1d501abb771d550566268ee5e875dcfb6 Mon Sep 17 00:00:00 2001
From: Rahul Soni <rahulsoni2225@gmail.com>
Date: Sat, 18 May 2024 16:11:13 +0530
Subject: [PATCH 0197/1141] feat: show loading spinner on table view

---
 mathesar_ui/src/systems/table-view/TableView.svelte | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mathesar_ui/src/systems/table-view/TableView.svelte b/mathesar_ui/src/systems/table-view/TableView.svelte
index 75d542bc9e..ed319dfc37 100644
--- a/mathesar_ui/src/systems/table-view/TableView.svelte
+++ b/mathesar_ui/src/systems/table-view/TableView.svelte
@@ -2,6 +2,7 @@
   import { get } from 'svelte/store';
 
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import Spinner from '@mathesar/component-library/spinner/Spinner.svelte';
   import { Sheet } from '@mathesar/components/sheet';
   import { SheetClipboardHandler } from '@mathesar/components/sheet/SheetClipboardHandler';
   import { rowHeaderWidthPx } from '@mathesar/geometry';
@@ -117,6 +118,11 @@
 <div class="table-view">
   <WithTableInspector {context} {showTableInspector}>
     <div class="sheet-area" on:click={checkAndReinstateFocusOnActiveCell}>
+      {#if $isLoading}
+        <div class="loading-sheet">
+          <Spinner />
+        </div>
+      {/if}
       {#if $processedColumns.size}
         <Sheet
           columns={sheetColumns}
@@ -151,4 +157,9 @@
     height: 100%;
     overflow-x: auto;
   }
+  .loading-sheet {
+    text-align: center;
+    font-size: 2rem;
+    color: var(--slate-500);
+  }
 </style>

From a2af3ad549d7608efff81fe9635a15a94f4694f6 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Sun, 19 May 2024 13:07:24 +0800
Subject: [PATCH 0198/1141] add column altering smoke test

---
 db/columns/operations/alter.py            |  2 +-
 db/tests/columns/operations/test_alter.py | 53 +++++++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/db/columns/operations/alter.py b/db/columns/operations/alter.py
index ea804fb6d4..bb0740c767 100644
--- a/db/columns/operations/alter.py
+++ b/db/columns/operations/alter.py
@@ -193,7 +193,7 @@ def alter_columns_in_table(table_oid, column_data_list, conn):
     transformed_column_data = [
         _transform_column_alter_dict(column) for column in column_data_list
     ]
-    db_conn.execute_msar_func_with_engine(
+    db_conn.exec_msar_func(
         conn, 'alter_columns', table_oid, json.dumps(transformed_column_data)
     )
     return len(column_data_list)
diff --git a/db/tests/columns/operations/test_alter.py b/db/tests/columns/operations/test_alter.py
index 7a783a6bf9..3fa449ed1c 100644
--- a/db/tests/columns/operations/test_alter.py
+++ b/db/tests/columns/operations/test_alter.py
@@ -1,6 +1,9 @@
+import json
+from unittest.mock import patch
 from sqlalchemy import Column, select, Table, MetaData, VARCHAR, INTEGER
 
 from db import constants
+from db.columns.operations import alter as col_alt
 from db.columns.operations.alter import batch_update_columns, rename_column
 from db.columns.operations.select import (
     get_column_attnum_from_name, get_column_name_from_attnum,
@@ -18,6 +21,56 @@
 from db.schemas.utils import get_schema_oid_from_name
 
 
+def test_alter_columns_in_table_smoke():
+    with patch.object(col_alt.db_conn, 'exec_msar_func') as mock_exec:
+        col_alt.alter_columns_in_table(
+            123,
+            [
+                {
+                    "id": 3, "name": "colname3", "type": "numeric",
+                    "type_options": {"precision": 8}, "nullable": True,
+                    "default": {"value": 8, "is_dynamic": False},
+                    "description": "third column"
+                },
+                {
+                    "id": 6, "name": "colname6", "type": "character varying",
+                    "type_options": {"length": 32}, "nullable": True,
+                    "default": {"value": "blahblah", "is_dynamic": False},
+                    "description": "textual column"
+                }
+            ],
+            'conn'
+        )
+        mock_exec.assert_called_once_with(
+            'conn', 'alter_columns', 123,
+            json.dumps(
+                [
+                    {
+                        "attnum": 3,
+                        "name": "colname3",
+                        "type": {
+                            "name": "numeric", "options": {"precision": 8},
+                        },
+                        "not_null": False,
+                        "name": "colname3",
+                        "default": 8,
+                        "description": "third column",
+                    },
+                    {
+                        "attnum": 6,
+                        "type": {
+                            "name": "character varying", "options": {"length": 32},
+                        },
+                        "not_null": False,
+                        "name": "colname6",
+                        "default": "blahblah",
+                        "description": "textual column"
+                    }
+                ],
+            )
+        )
+
+
 def _rename_column_and_assert(table, old_col_name, new_col_name, engine):
     """
     Renames the colum of a table and assert the change went through

From d781d7f8df73d1c4ac474cfdd68a00d0db33c250 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Sun, 19 May 2024 14:12:18 +0800
Subject: [PATCH 0199/1141] update basic column alterer test with accurate name
 and assertion

---
 db/tests/columns/operations/test_alter.py | 50 +++++++++--------------
 1 file changed, 19 insertions(+), 31 deletions(-)

diff --git a/db/tests/columns/operations/test_alter.py b/db/tests/columns/operations/test_alter.py
index 3fa449ed1c..78dbeb1abe 100644
--- a/db/tests/columns/operations/test_alter.py
+++ b/db/tests/columns/operations/test_alter.py
@@ -21,7 +21,7 @@
 from db.schemas.utils import get_schema_oid_from_name
 
 
-def test_alter_columns_in_table_smoke():
+def test_alter_columns_in_table_basic():
     with patch.object(col_alt.db_conn, 'exec_msar_func') as mock_exec:
         col_alt.alter_columns_in_table(
             123,
@@ -31,8 +31,7 @@ def test_alter_columns_in_table_smoke():
                     "type_options": {"precision": 8}, "nullable": True,
                     "default": {"value": 8, "is_dynamic": False},
                     "description": "third column"
-                },
-                {
+                }, {
                     "id": 6, "name": "colname6", "type": "character varying",
                     "type_options": {"length": 32}, "nullable": True,
                     "default": {"value": "blahblah", "is_dynamic": False},
@@ -41,34 +40,23 @@ def test_alter_columns_in_table_smoke():
             ],
             'conn'
         )
-        mock_exec.assert_called_once_with(
-            'conn', 'alter_columns', 123,
-            json.dumps(
-                [
-                    {
-                        "attnum": 3,
-                        "name": "colname3",
-                        "type": {
-                            "name": "numeric", "options": {"precision": 8},
-                        },
-                        "not_null": False,
-                        "name": "colname3",
-                        "default": 8,
-                        "description": "third column",
-                    },
-                    {
-                        "attnum": 6,
-                        "type": {
-                            "name": "character varying", "options": {"length": 32},
-                        },
-                        "not_null": False,
-                        "name": "colname6",
-                        "default": "blahblah",
-                        "description": "textual column"
-                    }
-                ],
-            )
-        )
+        expect_json_arg = [
+            {
+                "attnum": 3, "name": "colname3",
+                "type": {"name": "numeric", "options": {"precision": 8}},
+                "not_null": False, "default": 8, "description": "third column",
+            }, {
+                "attnum": 6, "name": "colname6",
+                "type": {
+                    "name": "character varying", "options": {"length": 32},
+                },
+                "not_null": False, "default": "blahblah",
+                "description": "textual column"
+            }
+        ]
+        assert mock_exec.call_args.args[:3] == ('conn', 'alter_columns', 123)
+        # Necessary since `json.dumps` mangles dict ordering, but we don't care.
+        assert json.loads(mock_exec.call_args.args[3]) == expect_json_arg
 
 
 def _rename_column_and_assert(table, old_col_name, new_col_name, engine):

From d85df60c3af1c8d36a73ffa961dd266bb3745a39 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 20 May 2024 09:14:25 -0400
Subject: [PATCH 0200/1141] Remove misleading usage of `min` SQL agg fn

---
 db/sql/0_msar.sql | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/db/sql/0_msar.sql b/db/sql/0_msar.sql
index a7f86d8363..9502d10451 100644
--- a/db/sql/0_msar.sql
+++ b/db/sql/0_msar.sql
@@ -683,8 +683,8 @@ SELECT jsonb_agg(schema_data)
 FROM (
   SELECT 
     s.oid AS oid,
-    min(s.nspname) AS name,
-    min(d.description) AS description,
+    s.nspname AS name,
+    d.description AS description,
     COALESCE(count(c.oid), 0) AS table_count
   FROM pg_catalog.pg_namespace s
   LEFT JOIN pg_catalog.pg_description d ON
@@ -696,7 +696,10 @@ FROM (
   WHERE
     s.nspname <> 'information_schema' AND
     s.nspname NOT LIKE 'pg_%'
-  GROUP BY s.oid
+  GROUP BY
+    s.oid,
+    s.nspname,
+    d.description
 ) AS schema_data;
 $$ LANGUAGE sql;
 

From 38d8ceeb60f8cbdc686c9570e118364d64e6873d Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 20 May 2024 09:22:53 -0400
Subject: [PATCH 0201/1141] Use obj_description SQL fn

---
 db/sql/0_msar.sql | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/db/sql/0_msar.sql b/db/sql/0_msar.sql
index 9502d10451..3b1ca98b49 100644
--- a/db/sql/0_msar.sql
+++ b/db/sql/0_msar.sql
@@ -684,12 +684,9 @@ FROM (
   SELECT 
     s.oid AS oid,
     s.nspname AS name,
-    d.description AS description,
+    obj_description(s.oid) AS description,
     COALESCE(count(c.oid), 0) AS table_count
   FROM pg_catalog.pg_namespace s
-  LEFT JOIN pg_catalog.pg_description d ON
-    d.objoid = s.oid AND
-    d.objsubid = 0
   LEFT JOIN pg_catalog.pg_class c ON
     c.relnamespace = s.oid AND
     c.relkind = 'r'
@@ -698,8 +695,7 @@ FROM (
     s.nspname NOT LIKE 'pg_%'
   GROUP BY
     s.oid,
-    s.nspname,
-    d.description
+    s.nspname
 ) AS schema_data;
 $$ LANGUAGE sql;
 

From e79f31c2e1f4a36b4cb68a67bcea92d49bb917fb Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 20 May 2024 09:39:44 -0400
Subject: [PATCH 0202/1141] Add comment explaining SQL filter condition

---
 db/sql/0_msar.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/db/sql/0_msar.sql b/db/sql/0_msar.sql
index 3b1ca98b49..7b33a20b65 100644
--- a/db/sql/0_msar.sql
+++ b/db/sql/0_msar.sql
@@ -689,6 +689,8 @@ FROM (
   FROM pg_catalog.pg_namespace s
   LEFT JOIN pg_catalog.pg_class c ON
     c.relnamespace = s.oid AND
+    -- Filter on relkind so that we only count tables. This must be done in the ON clause so that
+    -- we still get a row for schemas with no tables.
     c.relkind = 'r'
   WHERE
     s.nspname <> 'information_schema' AND

From f3289641fcf8f33ebe2c64aaf7d6c98dbf9e7bd4 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 20 May 2024 11:10:32 -0400
Subject: [PATCH 0203/1141] Namespace obj_description function

---
 db/sql/0_msar.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/sql/0_msar.sql b/db/sql/0_msar.sql
index 7b33a20b65..77d91d1aea 100644
--- a/db/sql/0_msar.sql
+++ b/db/sql/0_msar.sql
@@ -684,7 +684,7 @@ FROM (
   SELECT 
     s.oid AS oid,
     s.nspname AS name,
-    obj_description(s.oid) AS description,
+    pg_catalog.obj_description(s.oid) AS description,
     COALESCE(count(c.oid), 0) AS table_count
   FROM pg_catalog.pg_namespace s
   LEFT JOIN pg_catalog.pg_class c ON

From be9407bbf3e47f5b93b60fd54f461259a37dedb7 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 21 May 2024 00:39:07 +0800
Subject: [PATCH 0204/1141] fix test name typo, namespace catalog tables

---
 db/sql/00_msar.sql                       | 4 ++--
 db/tests/columns/operations/test_drop.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 6653689c03..bfaee7189c 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -222,7 +222,7 @@ Args:
   rel_id: The OID of the relation.
 */
 SELECT CASE
-  WHEN EXISTS (SELECT oid FROM pg_class WHERE oid=rel_id) THEN rel_id::regclass::text
+  WHEN EXISTS (SELECT oid FROM pg_catalog.pg_class WHERE oid=rel_id) THEN rel_id::regclass::text
 END
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
@@ -1136,7 +1136,7 @@ Args:
 DECLARE col_names text[];
 BEGIN
   SELECT array_agg(quote_ident(attname))
-  FROM pg_attribute
+  FROM pg_catalog.pg_attribute
   WHERE attrelid=tab_id AND NOT attisdropped AND ARRAY[attnum::integer] <@ col_ids
   INTO col_names;
   PERFORM __msar.drop_columns(msar.get_relation_name_or_null(tab_id), variadic col_names);
diff --git a/db/tests/columns/operations/test_drop.py b/db/tests/columns/operations/test_drop.py
index 35805cd8bc..0bedaa2cf3 100644
--- a/db/tests/columns/operations/test_drop.py
+++ b/db/tests/columns/operations/test_drop.py
@@ -10,7 +10,7 @@ def test_drop_columns():
     assert result == 3
 
 
-def test_get_column_info_for_table():
+def test_drop_columns_single():
     with patch.object(col_drop.db_conn, 'exec_msar_func') as mock_exec:
         mock_exec.return_value.fetchone = lambda: (1,)
         result = col_drop.drop_columns_from_table(123, [1], 'conn')

From 7f41d5ea416324c69b3d7ef2fa1004c27a1c739b Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Mon, 20 May 2024 22:45:08 +0530
Subject: [PATCH 0205/1141] fix namespacing

---
 db/sql/0_msar.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/sql/0_msar.sql b/db/sql/0_msar.sql
index 0d3e2f9d3f..f1fb7503bc 100644
--- a/db/sql/0_msar.sql
+++ b/db/sql/0_msar.sql
@@ -696,7 +696,7 @@ SELECT jsonb_agg(
   )
 )
 FROM pg_catalog.pg_class AS pgc 
-  LEFT JOIN pg_namespace AS pgn ON pgc.relnamespace = pgn.oid 
+  LEFT JOIN pg_catalog.pg_namespace AS pgn ON pgc.relnamespace = pgn.oid
 WHERE pgc.relnamespace = sch_id AND pgc.relkind = 'r';
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 

From 2ba206c96ddf2f593631c41df22e0d6666cf8af6 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Mon, 20 May 2024 23:08:34 +0530
Subject: [PATCH 0206/1141] id --> oid

---
 db/sql/00_msar.sql             |  4 ++--
 db/tables/operations/select.py |  2 +-
 mathesar/rpc/tables.py         | 25 ++++++-------------------
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 03727eef9b..05ef995580 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -698,7 +698,7 @@ Given a schema identifier, return an array of objects describing the tables of t
 
 Each returned JSON object in the array will have the form:
   {
-    "id": <int>,
+    "oid": <int>,
     "name": <str>,
     "schema": <int>,
     "description": <str>
@@ -709,7 +709,7 @@ Args:
 */
 SELECT jsonb_agg(
   jsonb_build_object(
-    'id', pgc.oid,
+    'oid', pgc.oid,
     'name', pgc.relname,
     'schema', pgc.relnamespace,
     'description', msar.obj_description(pgc.oid, 'pg_class')
diff --git a/db/tables/operations/select.py b/db/tables/operations/select.py
index f07c27006d..ec0871d3eb 100644
--- a/db/tables/operations/select.py
+++ b/db/tables/operations/select.py
@@ -25,7 +25,7 @@ def get_table_info(schema, conn):
     The returned list contains dictionaries of the following form:
 
         {
-            "id": <int>,
+            "oid": <int>,
             "name": <str>,
             "schema": <int>,
             "description": <str>
diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index b126cae909..948ee35248 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -1,4 +1,4 @@
-from typing import TypedDict
+from typing import Optional, TypedDict
 
 from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
@@ -13,31 +13,21 @@ class TableInfo(TypedDict):
     Information about a table.
 
     Attributes:
-        id: The `oid` of the table in the schema.
+        oid: The `oid` of the table in the schema.
         name: The name of the table.
         schema: The `oid` of the schema where the table lives.
         description: The description of the table.
     """
-    id: int
+    oid: int
     name: str
     schema: int
-    description: str
-
-
-class TableListReturn(TypedDict):
-    """
-    Information about the tables of a schema.
-
-    Attributes:
-        table_info: Column information from the user's database.
-    """
-    table_info: list[TableInfo]
+    description: Optional[str]
 
 
 @rpc_method(name="tables.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def list_(*, schema_oid: int, database_id: int, **kwargs) -> TableListReturn:
+def list_(*, schema_oid: int, database_id: int, **kwargs) -> list[TableInfo]:
     """
     List information about tables for a schema. Exposed as `list`.
 
@@ -51,9 +41,6 @@ def list_(*, schema_oid: int, database_id: int, **kwargs) -> TableListReturn:
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
         raw_table_info = get_table_info(schema_oid, conn)
-    table_info = [
+    return [
         TableInfo(tab) for tab in raw_table_info
     ]
-    return TableListReturn(
-        table_info=table_info
-    )

From 30d7500820aeaaf2384c57c2781b6f9c84857c54 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 21 May 2024 01:19:30 +0530
Subject: [PATCH 0207/1141] add python tests

---
 config/settings/common_settings.py        |  3 +-
 db/tests/tables/operations/test_select.py |  9 ++++
 mathesar/tests/rpc/test_endpoints.py      |  6 +++
 mathesar/tests/rpc/test_tables.py         | 64 +++++++++++++++++++++++
 4 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 mathesar/tests/rpc/test_tables.py

diff --git a/config/settings/common_settings.py b/config/settings/common_settings.py
index abd0e94204..ce2ce24282 100644
--- a/config/settings/common_settings.py
+++ b/config/settings/common_settings.py
@@ -67,7 +67,8 @@ def pipe_delim(pipe_string):
 MODERNRPC_METHODS_MODULES = [
     'mathesar.rpc.connections',
     'mathesar.rpc.columns',
-    'mathesar.rpc.schemas'
+    'mathesar.rpc.schemas',
+    'mathesar.rpc.tables'
 ]
 
 TEMPLATES = [
diff --git a/db/tests/tables/operations/test_select.py b/db/tests/tables/operations/test_select.py
index 4f442c1f00..36c0cc8ec9 100644
--- a/db/tests/tables/operations/test_select.py
+++ b/db/tests/tables/operations/test_select.py
@@ -1,4 +1,5 @@
 import sys
+from unittest.mock import patch
 from sqlalchemy import text
 from db.columns.operations.select import get_column_name_from_attnum
 from db.tables.operations import select as ma_sel
@@ -34,6 +35,14 @@
 MULTIPLE_RESULTS = ma_sel.MULTIPLE_RESULTS
 
 
+def test_get_table_info():
+    with patch.object(ma_sel, 'exec_msar_func') as mock_exec:
+        mock_exec.return_value.fetchone = lambda: ('a', 'b')
+        result = ma_sel.get_table_info('schema', 'conn')
+    mock_exec.assert_called_once_with('conn', 'get_table_info', 'schema')
+    assert result == 'a'
+
+
 def _transform_row_to_names(row, engine):
     metadata = get_empty_metadata()
     output_dict = {
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index e80eb7073f..8240e3fc3a 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -11,6 +11,7 @@
 from mathesar.rpc import columns
 from mathesar.rpc import connections
 from mathesar.rpc import schemas
+from mathesar.rpc import tables
 
 METHODS = [
     (
@@ -38,6 +39,11 @@
         "schemas.list",
         [user_is_authenticated]
     ),
+    (
+        tables.list_,
+        "tables.list",
+        [user_is_authenticated]
+    ),
 ]
 
 
diff --git a/mathesar/tests/rpc/test_tables.py b/mathesar/tests/rpc/test_tables.py
new file mode 100644
index 0000000000..ab9ad260a8
--- /dev/null
+++ b/mathesar/tests/rpc/test_tables.py
@@ -0,0 +1,64 @@
+"""
+This file tests the table RPC functions.
+
+Fixtures:
+    rf(pytest-django): Provides mocked `Request` objects.
+    monkeypatch(pytest): Lets you monkeypatch an object for testing.
+"""
+from contextlib import contextmanager
+
+from mathesar.rpc import tables
+from mathesar.models.users import User
+
+
+def test_tables_list(rf, monkeypatch):
+    request = rf.post('/api/rpc/v0', data={})
+    request.user = User(username='alice', password='pass1234')
+    schema_oid = 2200
+    database_id = 11
+
+    @contextmanager
+    def mock_connect(_database_id, user):
+        if _database_id == database_id and user.username == 'alice':
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_table_info(_schema_oid, conn):
+        if _schema_oid != schema_oid:
+            raise AssertionError('incorrect parameters passed')
+        return [
+            {
+                'oid': 17408,
+                'name': 'Authors',
+                'schema': schema_oid,
+                'description': 'a description on the authors table.'
+            },
+            {
+                'oid': 17809,
+                'name': 'Books',
+                'schema': schema_oid,
+                'description': None
+            }
+        ]
+    monkeypatch.setattr(tables, 'connect', mock_connect)
+    monkeypatch.setattr(tables, 'get_table_info', mock_table_info)
+    expect_table_list = [
+        {
+            'oid': 17408,
+            'name': 'Authors',
+            'schema': schema_oid,
+            'description': 'a description on the authors table.'
+        },
+        {
+            'oid': 17809,
+            'name': 'Books',
+            'schema': schema_oid,
+            'description': None
+        }
+    ]
+    actual_table_list = tables.list_(schema_oid=2200, database_id=11, request=request)
+    assert actual_table_list == expect_table_list

From 07663a0d196296d67d8a315ae87efa197222175e Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 21 May 2024 03:57:11 +0530
Subject: [PATCH 0208/1141] add api docs

---
 docs/docs/api/rpc.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index b7a594b3c8..bce7d6e441 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -56,6 +56,14 @@ To use an RPC function:
 
 ---
 
+::: mathesar.rpc.tables
+    options:
+      members:
+      - list_
+      - TableInfo
+
+---
+
 ::: mathesar.rpc.columns
     options:
       members:

From b5f7cadd68ee08595fc6369b0a0de0daa26a6794 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 05:36:50 +0000
Subject: [PATCH 0209/1141] --- updated-dependencies: - dependency-name:
 requests   dependency-type: direct:production ...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 6c686c71a9..5ae8c5bd9e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,7 +19,7 @@ psycopg==3.1.18
 psycopg-binary==3.1.18
 psycopg2-binary==2.9.7
 python-decouple==3.4
-requests==2.31.0
+requests==2.32.0
 SQLAlchemy==1.4.26
 responses==0.22.0
 SQLAlchemy-Utils==0.38.2

From b35148f563c0824e043b1539a9c58554f1afc788 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 21 May 2024 17:34:42 +0530
Subject: [PATCH 0210/1141] add sql tests

---
 db/sql/test_00_msar.sql | 55 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 929cb416bc..947136670d 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2570,6 +2570,61 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+CREATE OR REPLACE FUNCTION __setup_get_table_info() RETURNS SETOF TEXT AS $$
+BEGIN
+  CREATE SCHEMA pi;
+  -- Two tables with one having description
+  CREATE TABLE pi.three(id INT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY);
+  CREATE TABLE pi.one(id INT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY);
+  COMMENT ON TABLE pi.one IS 'first decimal digit of pi';
+
+  CREATE SCHEMA alice;
+  -- No tables in the schema  
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_get_table_info() RETURNS SETOF TEXT AS $$
+DECLARE
+ pi_table_info jsonb;
+ alice_table_info jsonb;
+BEGIN
+  PERFORM __setup_get_table_info();
+  SELECT msar.get_table_info('pi') INTO pi_table_info;
+  SELECT msar.get_table_info('alice') INTO alice_table_info;
+
+  -- Test table info for schema 'pi'
+    -- Check if all the required keys exist in the json blob
+    -- Check whether the correct name is returned
+    -- Check whether the correct description is returned
+  RETURN NEXT is(
+    pi_table_info->0 ?& array['oid', 'name', 'schema', 'description'], true
+  );
+  RETURN NEXT is(
+    pi_table_info->0->>'name', 'three'
+  );
+  RETURN NEXT is(
+    pi_table_info->0->>'description', null
+  );
+
+  RETURN NEXT is(
+    pi_table_info->1 ?& array['oid', 'name', 'schema', 'description'], true
+  );
+  RETURN NEXT is(
+    pi_table_info->1->>'name', 'one'
+  );
+  RETURN NEXT is(
+    pi_table_info->1->>'description', 'first decimal digit of pi'
+  );
+
+  -- Test table info for schema 'alice' that contains no tables
+  RETURN NEXT is(
+    alice_table_info, null
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
 CREATE OR REPLACE FUNCTION test_get_schemas() RETURNS SETOF TEXT AS $$
 DECLARE
   initial_schema_count int;

From 90e3ff3addd94814a439079e666b0dcba864e684 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Mon, 27 May 2024 19:48:58 +0530
Subject: [PATCH 0211/1141] add rpc endpoint for tables.delete with tests

---
 db/sql/00_msar.sql                | 13 +++++++++----
 db/sql/test_00_msar.sql           | 18 +++---------------
 db/tables/operations/drop.py      | 20 +++++++++++++++++++-
 mathesar/rpc/tables.py            | 23 +++++++++++++++++++++++
 mathesar/tests/rpc/test_tables.py | 27 +++++++++++++++++++++++++++
 5 files changed, 81 insertions(+), 20 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 05ef995580..9556b296b4 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2135,16 +2135,21 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-msar.drop_table(tab_id oid, cascade_ boolean, if_exists boolean) RETURNS text AS $$/*
-Drop a table, returning the command executed.
+msar.drop_table(tab_id oid, cascade_ boolean) RETURNS text AS $$/*
+Drop a table, returning the fully qualified name of the dropped table.
 
 Args:
   tab_id: The OID of the table to drop
   cascade_: Whether to drop dependent objects.
-  if_exists_: Whether to ignore an error if the table doesn't exist
 */
+DECLARE relation_name text;
 BEGIN
-  RETURN __msar.drop_table(__msar.get_relation_name(tab_id), cascade_, if_exists);
+  relation_name := __msar.get_relation_name(tab_id);
+  -- if_exists doesn't work while working with oids because 
+  -- the SQL query gets parameterized with tab_id instead of relation_name
+  -- since we're unable to find the relation_name for a non existing table. 
+  PERFORM __msar.drop_table(relation_name, cascade_, if_exists => false);
+  RETURN relation_name;
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 947136670d..ab004a8e84 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -72,24 +72,12 @@ DECLARE
 BEGIN
   PERFORM __setup_drop_tables();
   rel_id := 'dropme'::regclass::oid;
-  PERFORM msar.drop_table(tab_id => rel_id, cascade_ => false, if_exists => false);
+  PERFORM msar.drop_table(tab_id => rel_id, cascade_ => false);
   RETURN NEXT hasnt_table('dropme', 'Drops table');
 END;
 $$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION test_drop_table_oid_if_exists() RETURNS SETOF TEXT AS $$
-DECLARE
-  rel_id oid;
-BEGIN
-  PERFORM __setup_drop_tables();
-  rel_id := 'dropme'::regclass::oid;
-  PERFORM msar.drop_table(tab_id => rel_id, cascade_ => false, if_exists => true);
-  RETURN NEXT hasnt_table('dropme', 'Drops table with IF EXISTS');
-END;
-$$ LANGUAGE plpgsql;
-
-
 CREATE OR REPLACE FUNCTION test_drop_table_oid_restricted_fkey() RETURNS SETOF TEXT AS $$
 DECLARE
   rel_id oid;
@@ -99,7 +87,7 @@ BEGIN
   CREATE TABLE
     dependent (id SERIAL PRIMARY KEY, col1 integer REFERENCES dropme);
   RETURN NEXT throws_ok(
-    format('SELECT msar.drop_table(tab_id => %s, cascade_ => false, if_exists => true);', rel_id),
+    format('SELECT msar.drop_table(tab_id => %s, cascade_ => false);', rel_id),
     '2BP01',
     'cannot drop table dropme because other objects depend on it',
     'Table dropper throws for dependent objects'
@@ -116,7 +104,7 @@ BEGIN
   rel_id := 'dropme'::regclass::oid;
   CREATE TABLE
     dependent (id SERIAL PRIMARY KEY, col1 integer REFERENCES dropme);
-  PERFORM msar.drop_table(tab_id => rel_id, cascade_ => true, if_exists => false);
+  PERFORM msar.drop_table(tab_id => rel_id, cascade_ => true);
   RETURN NEXT hasnt_table('dropme', 'Drops table with dependent using CASCADE');
 END;
 $$ LANGUAGE plpgsql;
diff --git a/db/tables/operations/drop.py b/db/tables/operations/drop.py
index f0f40b3c88..9435dd2c70 100644
--- a/db/tables/operations/drop.py
+++ b/db/tables/operations/drop.py
@@ -1,5 +1,23 @@
-from db.connection import execute_msar_func_with_engine
+from db.connection import execute_msar_func_with_engine, exec_msar_func
 
 
 def drop_table(name, schema, engine, cascade=False, if_exists=False):
     execute_msar_func_with_engine(engine, 'drop_table', schema, name, cascade, if_exists)
+
+
+def drop_table_from_schema(table_oid, conn, cascade=False):
+    """
+    Drop a table.
+
+    Args:
+        table_oid: OID of the table to drop.
+        cascade: Whether to drop the dependent objects.
+        if_exists: Whether to ignore an error if the schema doesn't
+                   exist.
+
+    Returns:
+        Returns the fully qualified name of the dropped table.
+    """
+    return exec_msar_func(
+        conn, 'drop_table', table_oid, cascade
+    ).fetchone()[0]
diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index 948ee35248..683e60f307 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -4,6 +4,7 @@
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from db.tables.operations.select import get_table_info
+from db.tables.operations.drop import drop_table_from_schema
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
 
@@ -44,3 +45,25 @@ def list_(*, schema_oid: int, database_id: int, **kwargs) -> list[TableInfo]:
     return [
         TableInfo(tab) for tab in raw_table_info
     ]
+
+
+@rpc_method(name="tables.delete")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def delete(
+    *, table_oid: int, cascade: bool = False, database_id: int, **kwargs
+) -> str:
+    """
+    Delete a table from a schema.
+
+    Args:
+        table_oid: Identity of the table in the user's database.
+        cascade: Whether to drop the dependent objects.
+        database_id: The Django id of the database containing the table.
+
+    Returns:
+        The name of the dropped table.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        return drop_table_from_schema(table_oid, conn, cascade)
diff --git a/mathesar/tests/rpc/test_tables.py b/mathesar/tests/rpc/test_tables.py
index ab9ad260a8..b4b7d42887 100644
--- a/mathesar/tests/rpc/test_tables.py
+++ b/mathesar/tests/rpc/test_tables.py
@@ -62,3 +62,30 @@ def mock_table_info(_schema_oid, conn):
     ]
     actual_table_list = tables.list_(schema_oid=2200, database_id=11, request=request)
     assert actual_table_list == expect_table_list
+
+
+def test_tables_delete(rf, monkeypatch):
+    request = rf.post('/api/rpc/v0', data={})
+    request.user = User(username='alice', password='pass1234')
+    table_oid = 1964474
+    database_id = 11
+
+    @contextmanager
+    def mock_connect(_database_id, user):
+        if _database_id == database_id and user.username == 'alice':
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_drop_table(_table_oid, conn, cascade):
+        if _table_oid != table_oid:
+            raise AssertionError('incorrect parameters passed')
+        return 'public."Table 0"'
+
+    monkeypatch.setattr(tables, 'connect', mock_connect)
+    monkeypatch.setattr(tables, 'drop_table_from_schema', mock_drop_table)
+    deleted_table = tables.delete(table_oid=1964474, database_id=11, request=request)
+    assert deleted_table == 'public."Table 0"'

From b51dee1b778a3f39a999d3d3d5aabdc9ccd17df2 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Mon, 27 May 2024 19:52:55 +0530
Subject: [PATCH 0212/1141] add endpoint test and update docs

---
 docs/docs/api/rpc.md                 | 1 +
 mathesar/tests/rpc/test_endpoints.py | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index bce7d6e441..06d862f457 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -60,6 +60,7 @@ To use an RPC function:
     options:
       members:
       - list_
+      - delete
       - TableInfo
 
 ---
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 8240e3fc3a..b46af51cc0 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -44,6 +44,11 @@
         "tables.list",
         [user_is_authenticated]
     ),
+    (
+        tables.delete,
+        "tables.delete",
+        [user_is_authenticated]
+    )
 ]
 
 

From 2fbc79d4605cb6f6f1a50839ae7bf233e056145f Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 29 May 2024 14:55:55 -0400
Subject: [PATCH 0213/1141] Implement schemas.delete RPC method

---
 conftest.py                              |  4 +-
 db/schemas/operations/drop.py            | 39 ++++++++-----
 db/sql/00_msar.sql                       | 59 +++++++------------
 db/sql/test_00_msar.sql                  | 74 ++++++++++--------------
 db/tests/schemas/operations/test_drop.py |  9 +--
 docs/docs/api/rpc.md                     |  1 +
 mathesar/models/base.py                  |  5 +-
 mathesar/rpc/schemas.py                  | 16 +++++
 mathesar/tests/rpc/test_endpoints.py     |  5 ++
 9 files changed, 104 insertions(+), 108 deletions(-)

diff --git a/conftest.py b/conftest.py
index 41589a1e07..6089145050 100644
--- a/conftest.py
+++ b/conftest.py
@@ -13,7 +13,7 @@
 from db.engine import add_custom_types_to_ischema_names, create_engine as sa_create_engine
 from db.types import install
 from db.sql import install as sql_install
-from db.schemas.operations.drop import drop_schema as drop_sa_schema
+from db.schemas.operations.drop import drop_schema_via_name as drop_sa_schema
 from db.schemas.operations.create import create_schema as create_sa_schema
 from db.schemas.utils import get_schema_oid_from_name, get_schema_name_from_oid
 
@@ -225,7 +225,7 @@ def _create_schema(schema_name, engine, schema_mustnt_exist=True):
                 # Handle schemas being renamed during test
                 schema_name = get_schema_name_from_oid(schema_oid, engine)
                 if schema_name:
-                    drop_sa_schema(schema_name, engine, cascade=True, if_exists=True)
+                    drop_sa_schema(engine, schema_name, cascade=True)
                     logger.debug(f'dropping {schema_name}')
         except OperationalError as e:
             logger.debug(f'ignoring operational error: {e}')
diff --git a/db/schemas/operations/drop.py b/db/schemas/operations/drop.py
index 2b78e60a49..919ce352bb 100644
--- a/db/schemas/operations/drop.py
+++ b/db/schemas/operations/drop.py
@@ -1,20 +1,33 @@
-from db.connection import execute_msar_func_with_engine
+from db.connection import execute_msar_func_with_engine, exec_msar_func
 
 
-def drop_schema(schema_name, engine, cascade=False, if_exists=False):
+def drop_schema_via_name(engine, name, cascade=False):
     """
-    Drop a schema.
+    Drop a schema by its name.
+
+    If no schema exists with the given name, an exception will be raised.
+
+    Deprecated:
+        Use drop_schema_via_oid instead. This function is deprecated because we
+        are phasing out name-based operations in favor of OID-based operations
+        and we are phasing out SQLAlchemy in favor of psycopg.
 
     Args:
-        schema_name: Name of the schema to drop.
-        engine: SQLAlchemy engine object for connecting.
-        cascade: Whether to drop the dependent objects.
-        if_exists: Whether to ignore an error if the schema doesn't
-                   exist.
+        engine: SQLAlchemy engine object for connecting. name: Name of the
+        schema to drop. cascade: Whether to drop the dependent objects.
+    """
+    execute_msar_func_with_engine(engine, 'drop_schema', name, cascade).fetchone()
+
 
-    Returns:
-        Returns a string giving the command that was run.
+def drop_schema_via_oid(conn, id, cascade=False):
+    """
+    Drop a schema by its OID.
+
+    If no schema exists with the given oid, an exception will be raised.
+
+    Args:
+        conn: a psycopg connection
+        id: the OID of the schema to drop.
+        cascade: Whether to drop the dependent objects.
     """
-    return execute_msar_func_with_engine(
-        engine, 'drop_schema', schema_name, cascade, if_exists
-    ).fetchone()[0]
+    exec_msar_func(conn, 'drop_schema', id, cascade).fetchone()
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 05ef995580..74706fae44 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -957,61 +957,42 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 ----------------------------------------------------------------------------------------------------
 
 
--- Drop schema -------------------------------------------------------------------------------------
-
 CREATE OR REPLACE FUNCTION
-__msar.drop_schema(sch_name text, cascade_ boolean, if_exists boolean) RETURNS TEXT AS $$/*
-Drop a schema, returning the command executed.
+msar.drop_schema(sch_name text, cascade_ boolean) RETURNS void AS $$/*
+Drop a schema
+
+If no schema exists with the given name, an exception will be raised.
 
 Args:
-  sch_name: A properly quoted name of the schema to be dropped
-  cascade_: Whether to drop dependent objects.
-  if_exists: Whether to ignore an error if the schema doesn't exist
+  sch_name: An unqoted name of the schema to be dropped
+  cascade_: When true, dependent objects will be dropped automatically
 */
 DECLARE
-  cmd_template text;
+  cascade_sql text = CASE cascade_ WHEN TRUE THEN ' CASCADE' ELSE '' END;
 BEGIN
-  IF if_exists
-  THEN
-    cmd_template := 'DROP SCHEMA IF EXISTS %s';
-  ELSE
-    cmd_template := 'DROP SCHEMA %s';
-  END IF;
-  IF cascade_
-  THEN
-    cmd_template = cmd_template || ' CASCADE';
-  END IF;
-  RETURN __msar.exec_ddl(cmd_template, sch_name);
+  EXECUTE 'DROP SCHEMA ' || quote_ident(sch_name) || cascade_sql;
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-msar.drop_schema(sch_id oid, cascade_ boolean, if_exists boolean) RETURNS TEXT AS $$/*
-Drop a schema, returning the command executed.
-
-Args:
-  sch_id: The OID of the schema to drop
-  cascade_: Whether to drop dependent objects.
-  if_exists: Whether to ignore an error if the schema doesn't exist
-*/
-BEGIN
-  RETURN __msar.drop_schema(__msar.get_schema_name(sch_id), cascade_, if_exists);
-END;
-$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+msar.drop_schema(sch_id oid, cascade_ boolean) RETURNS void AS $$/*
+Drop a schema
 
-
-CREATE OR REPLACE FUNCTION
-msar.drop_schema(sch_name text, cascade_ boolean, if_exists boolean) RETURNS TEXT AS $$/*
-Drop a schema, returning the command executed.
+If no schema exists with the given oid, an exception will be raised.
 
 Args:
-  sch_name: An unqoted name of the schema to be dropped
-  cascade_: Whether to drop dependent objects.
-  if_exists: Whether to ignore an error if the schema doesn't exist
+  sch_id: The OID of the schema to drop
+  cascade_: When true, dependent objects will be dropped automatically
 */
+DECLARE
+  sch_name text;
 BEGIN
-  RETURN __msar.drop_schema(quote_ident(sch_name), cascade_, if_exists);
+  SELECT nspname INTO sch_name FROM pg_namespace WHERE oid = sch_id;
+  IF sch_name IS NULL THEN
+    RAISE EXCEPTION 'No schema with OID % exists.', sch_id;
+  END IF;
+  PERFORM msar.drop_schema(sch_name, cascade_);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 947136670d..6b20d34c78 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -1213,63 +1213,51 @@ END;
 $$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION test_drop_schema_if_exists_false() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION test_drop_schema_using_name() RETURNS SETOF TEXT AS $$
 BEGIN
   PERFORM __setup_drop_schema();
   PERFORM msar.drop_schema(
     sch_name => 'drop_test_schema', 
-    cascade_ => false, 
-    if_exists => false
+    cascade_ => false
   );
   RETURN NEXT hasnt_schema('drop_test_schema');
   RETURN NEXT throws_ok(
-    format(
-      'SELECT msar.drop_schema(
-        sch_name => ''%s'',
-        cascade_ => false,
-        if_exists => false
-      );', 
-      'drop_non_existing_schema'
-    ),
-    '3F000',
-    'schema "drop_non_existing_schema" does not exist'
+    $d$
+      SELECT msar.drop_schema(
+        sch_name => 'drop_non_existing_schema',
+        cascade_ => false
+      )
+    $d$, 
+    '3F000'
   );
 END;
 $$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION test_drop_schema_if_exists_true() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION test_drop_schema_using_oid() RETURNS SETOF TEXT AS $$
 BEGIN
   PERFORM __setup_drop_schema();
   PERFORM msar.drop_schema(
-    sch_name => 'drop_test_schema',
-    cascade_ => false,
-    if_exists => true
+    sch_id => 'drop_test_schema'::regnamespace::oid,
+    cascade_ => false
   );
   RETURN NEXT hasnt_schema('drop_test_schema');
-  RETURN NEXT lives_ok(
-    format(
-      'SELECT msar.drop_schema(
-        sch_name => ''%s'',
-        cascade_ => false,
-        if_exists => true
-      );', 
-      'drop_non_existing_schema'
-    )
-  );
 END;
 $$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION test_drop_schema_using_oid() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION test_drop_schema_using_invalid_oid() RETURNS SETOF TEXT AS $$
 BEGIN
   PERFORM __setup_drop_schema();
-  PERFORM msar.drop_schema(
-    sch_id => 'drop_test_schema'::regnamespace::oid,
-    cascade_ => false,
-    if_exists => false
+  RETURN NEXT throws_ok(
+    $d$
+      SELECT msar.drop_schema(
+        sch_id => 0,
+        cascade_ => false
+      )
+    $d$,
+    'P0001'
   );
-  RETURN NEXT hasnt_schema('drop_test_schema');
 END;
 $$ LANGUAGE plpgsql;
 
@@ -1290,8 +1278,7 @@ BEGIN
   PERFORM __setup_schema_with_dependent_obj();
   PERFORM msar.drop_schema(
     sch_name => 'schema1',
-    cascade_ => true,
-    if_exists => false
+    cascade_ => true
   );
   RETURN NEXT hasnt_schema('schema1');
 END;
@@ -1302,16 +1289,13 @@ CREATE OR REPLACE FUNCTION test_drop_schema_restricted() RETURNS SETOF TEXT AS $
 BEGIN
   PERFORM __setup_schema_with_dependent_obj();
   RETURN NEXT throws_ok(
-    format(
-      'SELECT msar.drop_schema(
-        sch_name => ''%s'',
-        cascade_ => false,
-        if_exists => false
-      );',
-      'schema1'
-    ),
-    '2BP01',
-    'cannot drop schema schema1 because other objects depend on it'
+    $d$
+      SELECT msar.drop_schema(
+        sch_name => 'schema1',
+        cascade_ => false
+      )
+    $d$,
+    '2BP01'
   );
 END;
 $$ LANGUAGE plpgsql;
diff --git a/db/tests/schemas/operations/test_drop.py b/db/tests/schemas/operations/test_drop.py
index cf513b11b7..243ec4fbd6 100644
--- a/db/tests/schemas/operations/test_drop.py
+++ b/db/tests/schemas/operations/test_drop.py
@@ -3,16 +3,13 @@
 import db.schemas.operations.drop as sch_drop
 
 
-@pytest.mark.parametrize(
-    "cascade, if_exists", [(True, True), (False, True), (True, False), (False, False)]
-)
-def test_drop_schema(engine_with_schema, cascade, if_exists):
+@pytest.mark.parametrize("cascade", [True, False])
+def test_drop_schema(engine_with_schema, cascade):
     engine = engine_with_schema
     with patch.object(sch_drop, 'execute_msar_func_with_engine') as mock_exec:
-        sch_drop.drop_schema('drop_test_schema', engine, cascade, if_exists)
+        sch_drop.drop_schema_via_name(engine, 'drop_test_schema', cascade)
     call_args = mock_exec.call_args_list[0][0]
     assert call_args[0] == engine
     assert call_args[1] == "drop_schema"
     assert call_args[2] == "drop_test_schema"
     assert call_args[3] == cascade
-    assert call_args[4] == if_exists
diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index bce7d6e441..6138958667 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -52,6 +52,7 @@ To use an RPC function:
     options:
       members:
       - list_
+      - delete
       - SchemaInfo
 
 ---
diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index 60b2b5059b..19685b065c 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -28,7 +28,7 @@
 from db.records.operations.select import get_column_cast_records, get_count, get_record
 from db.records.operations.select import get_records
 from db.records.operations.update import update_record
-from db.schemas.operations.drop import drop_schema
+from db.schemas.operations.drop import drop_schema_via_name
 from db.schemas.operations.select import get_schema_description
 from db.schemas import utils as schema_utils
 from db.tables import utils as table_utils
@@ -241,9 +241,8 @@ def update_sa_schema(self, update_params):
         return result
 
     def delete_sa_schema(self):
-        result = drop_schema(self.name, self._sa_engine, cascade=True)
+        drop_schema_via_name(self._sa_engine, self.name, cascade=True)
         reset_reflection(db_name=self.database.name)
-        return result
 
     def clear_name_cache(self):
         cache_key = f"{self.database.name}_schema_name_{self.oid}"
diff --git a/mathesar/rpc/schemas.py b/mathesar/rpc/schemas.py
index 1fdefa5b77..0b166fcd6c 100644
--- a/mathesar/rpc/schemas.py
+++ b/mathesar/rpc/schemas.py
@@ -8,6 +8,7 @@
 
 from db.constants import INTERNAL_SCHEMAS
 from db.schemas.operations.select import get_schemas
+from db.schemas.operations.drop import drop_schema_via_oid
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
 
@@ -53,3 +54,18 @@ def list_(*, database_id: int, **kwargs) -> list[SchemaInfo]:
     # refactored the models so that each exploration is associated with a schema
     # (by oid) in a specific database.
     return [{**s, "exploration_count": 0} for s in user_defined_schemas]
+
+
+@rpc_method(name="schemas.delete")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def delete(*, database_id: int, schema_id: int, **kwargs) -> None:
+    """
+    Delete a schema, given its OID.
+
+    Args:
+        database_id: The Django id of the database containing the schema.
+        schema_id: The OID of the schema to delete.
+    """
+    with connect(database_id, kwargs.get(REQUEST_KEY).user) as conn:
+        drop_schema_via_oid(conn, schema_id)
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 8240e3fc3a..b5982367fa 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -39,6 +39,11 @@
         "schemas.list",
         [user_is_authenticated]
     ),
+    (
+        schemas.delete,
+        "schemas.delete",
+        [user_is_authenticated]
+    ),
     (
         tables.list_,
         "tables.list",

From 529ffef1c1ffbfcc2e3fd9036cb53a479d6ac47e Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 29 May 2024 15:23:27 -0400
Subject: [PATCH 0214/1141] Fix SQL test assertions to be order-independent

---
 db/sql/test_00_msar.sql | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 6b20d34c78..c01c986630 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2403,10 +2403,13 @@ $$ LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION test_get_valid_target_type_strings() RETURNS SETOF TEXT AS $$
 BEGIN
   PERFORM __setup_cast_functions();
-  RETURN NEXT is(msar.get_valid_target_type_strings('text'), '["numeric", "text"]'::jsonb);
-  RETURN NEXT is(
-    msar.get_valid_target_type_strings('text'::regtype::oid), '["numeric", "text"]'::jsonb
-  );
+
+  RETURN NEXT ok(msar.get_valid_target_type_strings('text') @> '["numeric", "text"]');
+  RETURN NEXT is(jsonb_array_length(msar.get_valid_target_type_strings('text')), 2);
+
+  RETURN NEXT ok(msar.get_valid_target_type_strings('text'::regtype::oid) @> '["numeric", "text"]');
+  RETURN NEXT is(jsonb_array_length(msar.get_valid_target_type_strings('text'::regtype::oid)), 2);
+  
   RETURN NEXT is(msar.get_valid_target_type_strings('interval'), NULL);
 END;
 $$ LANGUAGE plpgsql;

From 9592f5c8aa884589e3b6ba5127dedbf4869dfc64 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 31 May 2024 15:47:35 +0530
Subject: [PATCH 0215/1141] implement tables.get rpc endpoint and sql function

---
 db/sql/00_msar.sql             | 23 +++++++++++++++++++++++
 db/tables/operations/select.py | 22 ++++++++++++++++++++++
 mathesar/rpc/tables.py         | 22 +++++++++++++++++++++-
 3 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 9556b296b4..83a0c1e557 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -693,6 +693,29 @@ SELECT EXISTS (SELECT 1 FROM pg_attribute WHERE attrelid=tab_id AND attname=col_
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION msar.get_table(tab_id regclass) RETURNS jsonb AS $$/*
+Given a table identifier, return a JSON object describing the table.
+
+Each returned JSON object will have the form:
+  {
+    "oid": <int>,
+    "name": <str>,
+    "schema": <int>,
+    "description": <str>
+  }
+
+Args:
+  tab_id: The OID or name of the table.
+*/
+SELECT jsonb_build_object(
+  'oid', oid,
+  'name', relname,
+  'schema', relnamespace,
+  'description', msar.obj_description(oid, 'pg_class')
+) FROM pg_catalog.pg_class WHERE oid = tab_id;
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
 CREATE OR REPLACE FUNCTION msar.get_table_info(sch_id regnamespace) RETURNS jsonb AS $$/*
 Given a schema identifier, return an array of objects describing the tables of the schema.
 
diff --git a/db/tables/operations/select.py b/db/tables/operations/select.py
index ec0871d3eb..3299d9b733 100644
--- a/db/tables/operations/select.py
+++ b/db/tables/operations/select.py
@@ -15,6 +15,28 @@
 MULTIPLE_RESULTS = 'multiple_results'
 
 
+def get_table(table, conn):
+    """
+    Return a list of dictionaries describing the tables of a schema.
+
+    The `table` can be given as either a "qualified name", or an OID.
+    The OID is the preferred identifier, since it's much more robust.
+
+    The returned dictionary is of the following form:
+
+        {
+            "oid": <int>,
+            "name": <str>,
+            "schema": <int>,
+            "description": <str>
+        }
+
+    Args:
+        table: The table for which we want table info.
+    """
+    return exec_msar_func(conn, 'get_table', table).fetchone()[0]
+
+
 def get_table_info(schema, conn):
     """
     Return a list of dictionaries describing the tables of a schema.
diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index 683e60f307..5e6a54ee09 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -3,7 +3,7 @@
 from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
 
-from db.tables.operations.select import get_table_info
+from db.tables.operations.select import get_table_info, get_table
 from db.tables.operations.drop import drop_table_from_schema
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
@@ -47,6 +47,26 @@ def list_(*, schema_oid: int, database_id: int, **kwargs) -> list[TableInfo]:
     ]
 
 
+@rpc_method(name="tables.get")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def get_(*, table_oid: int, database_id: int, **kwargs) -> TableInfo:
+    """
+    List information about a table for a schema. Exposed as `get_`.
+
+    Args:
+        schema_oid: Identity of the table in the user's database.
+        database_id: The Django id of the database containing the table.
+
+    Returns:
+        Table details for a given table oid.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        raw_table_info = get_table(table_oid, conn)
+    return TableInfo(raw_table_info)
+
+
 @rpc_method(name="tables.delete")
 @http_basic_auth_login_required
 @handle_rpc_exceptions

From 10f865cec04acfa2a27912d18ce149ea92d353da Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 31 May 2024 16:34:37 +0530
Subject: [PATCH 0216/1141] get_relation_name -> get_relation_name_or_null

---
 db/sql/00_msar.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 9556b296b4..eb8eff7ead 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2144,8 +2144,8 @@ Args:
 */
 DECLARE relation_name text;
 BEGIN
-  relation_name := __msar.get_relation_name(tab_id);
-  -- if_exists doesn't work while working with oids because 
+  relation_name := msar.get_relation_name_or_null(tab_id);
+  -- if_exists doesn't work while working with oids because
   -- the SQL query gets parameterized with tab_id instead of relation_name
   -- since we're unable to find the relation_name for a non existing table. 
   PERFORM __msar.drop_table(relation_name, cascade_, if_exists => false);

From 553aceee20347193479c7c87028cae4848ab3fb1 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 31 May 2024 17:21:33 +0530
Subject: [PATCH 0217/1141] refactor funtion name, and remove if_exists from
 docstring

---
 db/tables/operations/drop.py      | 4 +---
 mathesar/rpc/tables.py            | 8 ++++----
 mathesar/tests/rpc/test_tables.py | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/db/tables/operations/drop.py b/db/tables/operations/drop.py
index 9435dd2c70..9ffeb170d2 100644
--- a/db/tables/operations/drop.py
+++ b/db/tables/operations/drop.py
@@ -5,15 +5,13 @@ def drop_table(name, schema, engine, cascade=False, if_exists=False):
     execute_msar_func_with_engine(engine, 'drop_table', schema, name, cascade, if_exists)
 
 
-def drop_table_from_schema(table_oid, conn, cascade=False):
+def drop_table_from_database(table_oid, conn, cascade=False):
     """
     Drop a table.
 
     Args:
         table_oid: OID of the table to drop.
         cascade: Whether to drop the dependent objects.
-        if_exists: Whether to ignore an error if the schema doesn't
-                   exist.
 
     Returns:
         Returns the fully qualified name of the dropped table.
diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index 683e60f307..6290ea9322 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -4,7 +4,7 @@
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from db.tables.operations.select import get_table_info
-from db.tables.operations.drop import drop_table_from_schema
+from db.tables.operations.drop import drop_table_from_database
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
 
@@ -51,19 +51,19 @@ def list_(*, schema_oid: int, database_id: int, **kwargs) -> list[TableInfo]:
 @http_basic_auth_login_required
 @handle_rpc_exceptions
 def delete(
-    *, table_oid: int, cascade: bool = False, database_id: int, **kwargs
+    *, table_oid: int, database_id: int, cascade: bool = False, **kwargs
 ) -> str:
     """
     Delete a table from a schema.
 
     Args:
         table_oid: Identity of the table in the user's database.
-        cascade: Whether to drop the dependent objects.
         database_id: The Django id of the database containing the table.
+        cascade: Whether to drop the dependent objects.
 
     Returns:
         The name of the dropped table.
     """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
-        return drop_table_from_schema(table_oid, conn, cascade)
+        return drop_table_from_database(table_oid, conn, cascade)
diff --git a/mathesar/tests/rpc/test_tables.py b/mathesar/tests/rpc/test_tables.py
index b4b7d42887..be8fb93275 100644
--- a/mathesar/tests/rpc/test_tables.py
+++ b/mathesar/tests/rpc/test_tables.py
@@ -86,6 +86,6 @@ def mock_drop_table(_table_oid, conn, cascade):
         return 'public."Table 0"'
 
     monkeypatch.setattr(tables, 'connect', mock_connect)
-    monkeypatch.setattr(tables, 'drop_table_from_schema', mock_drop_table)
+    monkeypatch.setattr(tables, 'drop_table_from_database', mock_drop_table)
     deleted_table = tables.delete(table_oid=1964474, database_id=11, request=request)
     assert deleted_table == 'public."Table 0"'

From d2c7805aa3a6b1396975b9ebe973be1feeae5911 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 3 Jun 2024 10:50:53 -0400
Subject: [PATCH 0218/1141] Raise custom error code when schema OID not found

---
 db/sql/00_msar.sql      | 3 ++-
 db/sql/test_00_msar.sql | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 74706fae44..22c02b8dce 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -990,7 +990,8 @@ DECLARE
 BEGIN
   SELECT nspname INTO sch_name FROM pg_namespace WHERE oid = sch_id;
   IF sch_name IS NULL THEN
-    RAISE EXCEPTION 'No schema with OID % exists.', sch_id;
+    RAISE EXCEPTION 'No schema with OID % exists.', sch_id
+    USING ERRCODE = '3F000'; -- invalid_schema_name
   END IF;
   PERFORM msar.drop_schema(sch_name, cascade_);
 END;
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index c01c986630..566b68af24 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -1256,7 +1256,7 @@ BEGIN
         cascade_ => false
       )
     $d$,
-    'P0001'
+    '3F000'
   );
 END;
 $$ LANGUAGE plpgsql;

From ea51de0e422efe90918a27ef2c2b477540b4b251 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 4 Jun 2024 11:28:09 -0400
Subject: [PATCH 0219/1141] Adjust argument order

---
 mathesar/rpc/schemas.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mathesar/rpc/schemas.py b/mathesar/rpc/schemas.py
index 0b166fcd6c..caf7f3fc43 100644
--- a/mathesar/rpc/schemas.py
+++ b/mathesar/rpc/schemas.py
@@ -59,13 +59,13 @@ def list_(*, database_id: int, **kwargs) -> list[SchemaInfo]:
 @rpc_method(name="schemas.delete")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def delete(*, database_id: int, schema_id: int, **kwargs) -> None:
+def delete(*, schema_id: int, database_id: int, **kwargs) -> None:
     """
     Delete a schema, given its OID.
 
     Args:
-        database_id: The Django id of the database containing the schema.
         schema_id: The OID of the schema to delete.
+        database_id: The Django id of the database containing the schema.
     """
     with connect(database_id, kwargs.get(REQUEST_KEY).user) as conn:
         drop_schema_via_oid(conn, schema_id)

From e601a5ecb19fd954e6e8e27c3027dd7c62155e29 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 4 Jun 2024 22:42:18 +0530
Subject: [PATCH 0220/1141] add tests and docs

---
 docs/docs/api/rpc.md                 |  1 +
 mathesar/tests/rpc/test_endpoints.py |  5 ++++
 mathesar/tests/rpc/test_tables.py    | 37 ++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 06d862f457..4d0f327e88 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -60,6 +60,7 @@ To use an RPC function:
     options:
       members:
       - list_
+      - get_
       - delete
       - TableInfo
 
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index b46af51cc0..97d1aafd25 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -44,6 +44,11 @@
         "tables.list",
         [user_is_authenticated]
     ),
+    (
+        tables.get_,
+        "tables.get",
+        [user_is_authenticated]
+    ),
     (
         tables.delete,
         "tables.delete",
diff --git a/mathesar/tests/rpc/test_tables.py b/mathesar/tests/rpc/test_tables.py
index b4b7d42887..1b59460644 100644
--- a/mathesar/tests/rpc/test_tables.py
+++ b/mathesar/tests/rpc/test_tables.py
@@ -64,6 +64,43 @@ def mock_table_info(_schema_oid, conn):
     assert actual_table_list == expect_table_list
 
 
+def test_tables_get(rf, monkeypatch):
+    request = rf.post('/api/rpc/v0', data={})
+    request.user = User(username='alice', password='pass1234')
+    schema_oid = 2200
+    database_id = 11
+
+    @contextmanager
+    def mock_connect(_database_id, user):
+        if _database_id == database_id and user.username == 'alice':
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_table_get(_schema_oid, conn):
+        if _schema_oid != schema_oid:
+            raise AssertionError('incorrect parameters passed')
+        return {
+            'oid': 17408,
+            'name': 'Authors',
+            'schema': schema_oid,
+            'description': 'a description on the authors table.'
+        }
+    monkeypatch.setattr(tables, 'connect', mock_connect)
+    monkeypatch.setattr(tables, 'get_table', mock_table_get)
+    expect_table_list = {
+        'oid': 17408,
+        'name': 'Authors',
+        'schema': schema_oid,
+        'description': 'a description on the authors table.'
+    }
+    actual_table_list = tables.list_(schema_oid=2200, database_id=11, request=request)
+    assert actual_table_list == expect_table_list
+
+
 def test_tables_delete(rf, monkeypatch):
     request = rf.post('/api/rpc/v0', data={})
     request.user = User(username='alice', password='pass1234')

From 483c257897b9ab42602bad59b0acdaee5773bb08 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 4 Jun 2024 22:46:53 +0530
Subject: [PATCH 0221/1141] fix var name in docstring

---
 mathesar/rpc/tables.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index 69ecb23e0e..a55ed6638a 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -55,7 +55,7 @@ def get_(*, table_oid: int, database_id: int, **kwargs) -> TableInfo:
     List information about a table for a schema. Exposed as `get_`.
 
     Args:
-        schema_oid: Identity of the table in the user's database.
+        table_oid: Identity of the table in the user's database.
         database_id: The Django id of the database containing the table.
 
     Returns:

From 3adbb7363aaf0ba70e16386b8ef2732f833f1668 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 4 Jun 2024 23:18:30 +0530
Subject: [PATCH 0222/1141] fix test

---
 mathesar/tests/rpc/test_tables.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/mathesar/tests/rpc/test_tables.py b/mathesar/tests/rpc/test_tables.py
index 4c97986823..8a2e103795 100644
--- a/mathesar/tests/rpc/test_tables.py
+++ b/mathesar/tests/rpc/test_tables.py
@@ -67,7 +67,7 @@ def mock_table_info(_schema_oid, conn):
 def test_tables_get(rf, monkeypatch):
     request = rf.post('/api/rpc/v0', data={})
     request.user = User(username='alice', password='pass1234')
-    schema_oid = 2200
+    table_oid = 1964474
     database_id = 11
 
     @contextmanager
@@ -80,24 +80,24 @@ def mock_connect(_database_id, user):
         else:
             raise AssertionError('incorrect parameters passed')
 
-    def mock_table_get(_schema_oid, conn):
-        if _schema_oid != schema_oid:
+    def mock_table_get(_table_oid, conn):
+        if _table_oid != table_oid:
             raise AssertionError('incorrect parameters passed')
         return {
-            'oid': 17408,
+            'oid': table_oid,
             'name': 'Authors',
-            'schema': schema_oid,
+            'schema': 2200,
             'description': 'a description on the authors table.'
         }
     monkeypatch.setattr(tables, 'connect', mock_connect)
     monkeypatch.setattr(tables, 'get_table', mock_table_get)
     expect_table_list = {
-        'oid': 17408,
+        'oid': table_oid,
         'name': 'Authors',
-        'schema': schema_oid,
+        'schema': 2200,
         'description': 'a description on the authors table.'
     }
-    actual_table_list = tables.list_(schema_oid=2200, database_id=11, request=request)
+    actual_table_list = tables.get_(table_oid=1964474, database_id=11, request=request)
     assert actual_table_list == expect_table_list
 
 

From b028ac89fe3275d877863501203d0f2f50555ae0 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 5 Jun 2024 00:53:11 +0530
Subject: [PATCH 0223/1141] fix docsting

---
 db/tables/operations/select.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/tables/operations/select.py b/db/tables/operations/select.py
index 3299d9b733..e25ad3c976 100644
--- a/db/tables/operations/select.py
+++ b/db/tables/operations/select.py
@@ -17,7 +17,7 @@
 
 def get_table(table, conn):
     """
-    Return a list of dictionaries describing the tables of a schema.
+    Return a dictionary describing a table of a schema.
 
     The `table` can be given as either a "qualified name", or an OID.
     The OID is the preferred identifier, since it's much more robust.

From 2be3675416569f181e0c1aecd9d6eea4066d2a9b Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 5 Jun 2024 14:15:44 +0530
Subject: [PATCH 0224/1141] get_ -> get

---
 mathesar/rpc/tables.py            | 4 ++--
 mathesar/tests/rpc/test_tables.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index a55ed6638a..6a3b2f5573 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -50,9 +50,9 @@ def list_(*, schema_oid: int, database_id: int, **kwargs) -> list[TableInfo]:
 @rpc_method(name="tables.get")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def get_(*, table_oid: int, database_id: int, **kwargs) -> TableInfo:
+def get(*, table_oid: int, database_id: int, **kwargs) -> TableInfo:
     """
-    List information about a table for a schema. Exposed as `get_`.
+    List information about a table for a schema.
 
     Args:
         table_oid: Identity of the table in the user's database.
diff --git a/mathesar/tests/rpc/test_tables.py b/mathesar/tests/rpc/test_tables.py
index 8a2e103795..59ff818897 100644
--- a/mathesar/tests/rpc/test_tables.py
+++ b/mathesar/tests/rpc/test_tables.py
@@ -97,7 +97,7 @@ def mock_table_get(_table_oid, conn):
         'schema': 2200,
         'description': 'a description on the authors table.'
     }
-    actual_table_list = tables.get_(table_oid=1964474, database_id=11, request=request)
+    actual_table_list = tables.get(table_oid=1964474, database_id=11, request=request)
     assert actual_table_list == expect_table_list
 
 

From 97ae1a4d48a1fede85907989861cf2aa691d0050 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 5 Jun 2024 14:23:04 +0530
Subject: [PATCH 0225/1141] fix method name in test_endpoints

---
 mathesar/tests/rpc/test_endpoints.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 84aa897408..6fc82334c3 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -50,7 +50,7 @@
         [user_is_authenticated]
     ),
     (
-        tables.get_,
+        tables.get,
         "tables.get",
         [user_is_authenticated]
     ),

From d922f495f33acf8d7fd665c9236c8ad7b18c186a Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 5 Jun 2024 18:17:18 +0530
Subject: [PATCH 0226/1141] add rpc method for tables.add

---
 db/tables/operations/create.py | 27 ++++++++++++++++++++++++++-
 mathesar/rpc/tables.py         | 30 ++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/db/tables/operations/create.py b/db/tables/operations/create.py
index 61fc6b6729..c563585749 100644
--- a/db/tables/operations/create.py
+++ b/db/tables/operations/create.py
@@ -1,7 +1,7 @@
 from sqlalchemy.ext import compiler
 from sqlalchemy.schema import DDLElement
 import json
-from db.connection import execute_msar_func_with_engine
+from db.connection import execute_msar_func_with_engine, exec_msar_func
 from db.types.base import PostgresType
 from db.tables.operations.select import reflect_table_from_oid
 from db.metadata import get_empty_metadata
@@ -33,6 +33,31 @@ def create_mathesar_table(engine, table_name, schema_oid, columns=[], constraint
     ).fetchone()[0]
 
 
+def create_table_on_database(table_name, schema_oid, conn, columns=[], constraints=[], comment=None):
+    """
+    Creates a table with a default id column.
+
+    Args:
+        table_name: Name of the table to be created.
+        schema_oid: The OID of the schema where the table will be created.
+        columns: The columns dict for the new table, in order. (optional)
+        constraints: The constraints dict for the new table. (optional)
+        comment: The comment for the new table. (optional)
+
+    Returns:
+        Returns the OID of the created table.
+    """
+    return exec_msar_func(
+        conn,
+        'add_mathesar_table',
+        schema_oid,
+        table_name,
+        json.dumps(columns),
+        json.dumps(constraints),
+        comment
+    ).fetchone()[0]
+
+
 # TODO stop relying on reflections, instead return oid of the created table.
 def create_string_column_table(name, schema_oid, column_names, engine, comment=None):
     """
diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index 6a3b2f5573..4e0e23d968 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -5,6 +5,7 @@
 
 from db.tables.operations.select import get_table_info, get_table
 from db.tables.operations.drop import drop_table_from_database
+from db.tables.operations.create import create_table_on_database
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
 
@@ -67,6 +68,35 @@ def get(*, table_oid: int, database_id: int, **kwargs) -> TableInfo:
     return TableInfo(raw_table_info)
 
 
+@rpc_method(name="tables.add")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def add(
+    *, table_name: str, schema_oid: int, database_id: int,
+    columns: list[dict] = [], constraints: list[dict] = [], comment: str = None, **kwargs
+) -> int:
+    """
+    Add a table with a default id column.
+
+    Args:
+        table_name: Name of the table to be created.
+        schema_oid: The oid of the schema where the table will be created.
+        database_id: The Django id of the database containing the table.
+        columns: A list of columns dict for the new table, in order.
+        constraints: A list of constraints dict for the new table.
+        comment: The comment for the new table.
+
+    Returns:
+        Table oid of the created table.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        created_table_oid = create_table_on_database(
+            table_name, schema_oid, conn, columns, constraints, comment
+        )
+    return created_table_oid
+
+
 @rpc_method(name="tables.delete")
 @http_basic_auth_login_required
 @handle_rpc_exceptions

From 88b8e20f2e634bba2d8241f6723e55b7dd484871 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 5 Jun 2024 18:37:55 +0530
Subject: [PATCH 0227/1141] add endpoint test & docs

---
 docs/docs/api/rpc.md                 | 3 ++-
 mathesar/rpc/tables.py               | 4 ++--
 mathesar/tests/rpc/test_endpoints.py | 5 +++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 4c6f622548..ab1e996d61 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -61,7 +61,8 @@ To use an RPC function:
     options:
       members:
       - list_
-      - get_
+      - get
+      - add
       - delete
       - TableInfo
 
diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index 4e0e23d968..bf3af75513 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -80,14 +80,14 @@ def add(
 
     Args:
         table_name: Name of the table to be created.
-        schema_oid: The oid of the schema where the table will be created.
+        schema_oid: Identity of the schema in the user's database.
         database_id: The Django id of the database containing the table.
         columns: A list of columns dict for the new table, in order.
         constraints: A list of constraints dict for the new table.
         comment: The comment for the new table.
 
     Returns:
-        Table oid of the created table.
+        The `oid` of the created table.
     """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 6fc82334c3..b9e4b01d13 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -54,6 +54,11 @@
         "tables.get",
         [user_is_authenticated]
     ),
+    (
+        tables.add,
+        "tables.add",
+        [user_is_authenticated]
+    ),
     (
         tables.delete,
         "tables.delete",

From 9a50533eb92c11193731fee6db7dbeca635cc3c7 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 6 Jun 2024 13:58:48 +0800
Subject: [PATCH 0228/1141] add columns.patch rpc function

---
 docs/docs/api/rpc.md    |  2 ++
 mathesar/rpc/columns.py | 70 +++++++++++++++++++++++++++++++++++++++--
 2 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index b7a594b3c8..9c86863248 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -60,9 +60,11 @@ To use an RPC function:
     options:
       members:
       - list_
+      - patch
       - delete
       - ColumnListReturn
       - ColumnInfo
+      - SettableColumnInfo
       - TypeOptions
       - ColumnDefault
 
diff --git a/mathesar/rpc/columns.py b/mathesar/rpc/columns.py
index 017a780204..cf30b8faa1 100644
--- a/mathesar/rpc/columns.py
+++ b/mathesar/rpc/columns.py
@@ -1,13 +1,14 @@
 """
 Classes and functions exposed to the RPC endpoint for managing table columns.
 """
-from typing import TypedDict
+from typing import Optional, TypedDict
 
 from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
 
-from db.columns.operations.select import get_column_info_for_table
+from db.columns.operations.alter import alter_columns_in_table
 from db.columns.operations.drop import drop_columns_from_table
+from db.columns.operations.select import get_column_info_for_table
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
 from mathesar.utils.columns import get_raw_display_options
@@ -73,9 +74,43 @@ def from_dict(cls, col_default):
             )
 
 
+class SettableColumnInfo(TypedDict):
+    """
+    Information about a column, restricted to settable fields.
+
+    When possible, Passing `null` for a key will clear the underlying
+    setting. E.g.,
+
+    - `default = null` clears the column default setting.
+    - `type_options = null` clears the type options for the column.
+    - `description = null` clears the column description.
+
+    Setting any of `name`, `type`, or `nullable` is a noop.
+
+
+    Only the `id` key is required.
+
+    Attributes:
+        id: The `attnum` of the column in the table.
+        name: The name of the column.
+        type: The type of the column on the database.
+        type_options: The options applied to the column type.
+        nullable: Whether or not the column is nullable.
+        default: The default value.
+        description: The description of the column.
+    """
+    id: int
+    name: Optional[str]
+    type: Optional[str]
+    type_options: Optional[TypeOptions]
+    nullable: Optional[bool]
+    default: Optional[ColumnDefault]
+    description: Optional[str]
+
+
 class ColumnInfo(TypedDict):
     """
-    Information about a column.
+    Information about a column. Extends the settable fields.
 
     Attributes:
         id: The `attnum` of the column in the table.
@@ -158,6 +193,35 @@ def list_(*, table_oid: int, database_id: int, **kwargs) -> ColumnListReturn:
     )
 
 
+@rpc_method(name="columns.patch")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def patch(
+        *,
+        column_data_list: list[SettableColumnInfo],
+        table_oid: int,
+        database_id: int,
+        **kwargs
+) -> int:
+    """
+    Alter details of preexisting columns in a table.
+
+    Does not support altering the type or type options of array columns.
+
+    Args:
+        column_data_list: A list describing desired column alterations.
+        table_oid: Identity of the table whose columns we'll modify.
+        database_id: The Django id of the database containing the table.
+
+    Returns:
+        The number of columns altered.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        return alter_columns_in_table(table_oid, column_data_list, conn)
+
+
+
 @rpc_method(name="columns.delete")
 @http_basic_auth_login_required
 @handle_rpc_exceptions

From 7d88dbb3d49791ba766e14e19633b89c2307a3bb Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 6 Jun 2024 15:20:14 +0800
Subject: [PATCH 0229/1141] add tests for wiring

---
 mathesar/tests/rpc/test_columns.py   | 33 ++++++++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py |  5 +++++
 2 files changed, 38 insertions(+)

diff --git a/mathesar/tests/rpc/test_columns.py b/mathesar/tests/rpc/test_columns.py
index 8f20811ecf..ea9928aca0 100644
--- a/mathesar/tests/rpc/test_columns.py
+++ b/mathesar/tests/rpc/test_columns.py
@@ -138,6 +138,39 @@ def mock_display_options(_database_id, _table_oid, attnums, user):
     assert actual_col_list == expect_col_list
 
 
+def test_columns_patch(rf, monkeypatch):
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username='alice', password='pass1234')
+    table_oid = 23457
+    database_id = 2
+    column_data_list = [{"id": 3, "name": "newname"}]
+
+    @contextmanager
+    def mock_connect(_database_id, user):
+        if _database_id == 2 and user.username == 'alice':
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_column_alter(_table_oid, _column_data_list, conn):
+        if _table_oid != table_oid or _column_data_list != column_data_list:
+            raise AssertionError('incorrect parameters passed')
+        return 1
+
+    monkeypatch.setattr(columns, 'connect', mock_connect)
+    monkeypatch.setattr(columns, 'alter_columns_in_table', mock_column_alter)
+    actual_result = columns.patch(
+        column_data_list=column_data_list,
+        table_oid=table_oid,
+        database_id=database_id,
+        request=request
+    )
+    assert actual_result == 1
+
+
 def test_columns_delete(rf, monkeypatch):
     request = rf.post('/api/rpc/v0/', data={})
     request.user = User(username='alice', password='pass1234')
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 6fc82334c3..8f8d2bd29f 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -24,6 +24,11 @@
         "columns.list",
         [user_is_authenticated]
     ),
+    (
+        columns.patch,
+        "columns.patch",
+        [user_is_authenticated]
+    ),
     (
         connections.add_from_known_connection,
         "connections.add_from_known_connection",

From ecc3df6b6aa23c84ea98116ac8374d3eba410059 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 6 Jun 2024 15:22:33 +0800
Subject: [PATCH 0230/1141] fix linter errors

---
 mathesar/rpc/columns.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mathesar/rpc/columns.py b/mathesar/rpc/columns.py
index cf30b8faa1..860d7aaa6d 100644
--- a/mathesar/rpc/columns.py
+++ b/mathesar/rpc/columns.py
@@ -221,7 +221,6 @@ def patch(
         return alter_columns_in_table(table_oid, column_data_list, conn)
 
 
-
 @rpc_method(name="columns.delete")
 @http_basic_auth_login_required
 @handle_rpc_exceptions

From 5489684eb0fd75535de3c66137324a22b0baccad Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 6 Jun 2024 14:17:09 +0530
Subject: [PATCH 0231/1141] Fix regression: Table inspector tabs do not get
 highlighted based on column/row selection

---
 .../systems/table-view/table-inspector/TableInspector.svelte    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte b/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
index d044260b97..870fab24d7 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
@@ -21,7 +21,7 @@
   export let activeTabId: TableInspectorTabId | undefined;
 
   $: tabs = Object.entries(tabMap).map(([id, tab]) => ({ id, ...tab }));
-  $: activeTab = defined(activeTabId, (id) => tabMap[id]);
+  $: activeTab = defined(activeTabId, (id) => ({ id, ...tabMap[id] }));
 
   function handleTabSelected(e: CustomEvent<{ tab: Tab }>) {
     activeTabId = e.detail.tab.id as TableInspectorTabId;

From 5945d6518dae02166af2f77b471660354e76acde Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 11 Jun 2024 01:17:39 +0530
Subject: [PATCH 0232/1141] improve function signature

---
 db/tables/operations/create.py    | 13 ++++++--
 mathesar/rpc/columns.py           | 22 +++++++++++++
 mathesar/rpc/constraints.py       |  8 +++++
 mathesar/rpc/tables.py            | 18 ++++++++---
 mathesar/tests/rpc/test_tables.py | 53 +++++++++++++++++++++++++++++++
 5 files changed, 106 insertions(+), 8 deletions(-)
 create mode 100644 mathesar/rpc/constraints.py

diff --git a/db/tables/operations/create.py b/db/tables/operations/create.py
index c563585749..e25a05c12c 100644
--- a/db/tables/operations/create.py
+++ b/db/tables/operations/create.py
@@ -33,7 +33,14 @@ def create_mathesar_table(engine, table_name, schema_oid, columns=[], constraint
     ).fetchone()[0]
 
 
-def create_table_on_database(table_name, schema_oid, conn, columns=[], constraints=[], comment=None):
+def create_table_on_database(
+    conn,
+    table_name,
+    schema_oid,
+    column_data_list=[],
+    constraint_data_list=[],
+    comment=None
+):
     """
     Creates a table with a default id column.
 
@@ -52,8 +59,8 @@ def create_table_on_database(table_name, schema_oid, conn, columns=[], constrain
         'add_mathesar_table',
         schema_oid,
         table_name,
-        json.dumps(columns),
-        json.dumps(constraints),
+        json.dumps(column_data_list),
+        json.dumps(constraint_data_list),
         comment
     ).fetchone()[0]
 
diff --git a/mathesar/rpc/columns.py b/mathesar/rpc/columns.py
index 860d7aaa6d..54ad70896a 100644
--- a/mathesar/rpc/columns.py
+++ b/mathesar/rpc/columns.py
@@ -74,6 +74,28 @@ def from_dict(cls, col_default):
             )
 
 
+class CreateableColumnInfo(TypedDict):
+    """
+    Information about adding a new column.
+
+    Only the `name` & `type` keys are required.
+
+    Attributes:
+        name: The name of the column.
+        type: The type of the column on the database.
+        type_options: The options applied to the column type.
+        nullable: Whether or not the column is nullable.
+        default: The default value.
+        description: The description of the column.
+    """
+    name: str
+    type: str
+    type_options: Optional[TypeOptions]
+    nullable: Optional[bool]
+    default: Optional[ColumnDefault]
+    description: Optional[str]
+
+
 class SettableColumnInfo(TypedDict):
     """
     Information about a column, restricted to settable fields.
diff --git a/mathesar/rpc/constraints.py b/mathesar/rpc/constraints.py
new file mode 100644
index 0000000000..b8ebbdabc4
--- /dev/null
+++ b/mathesar/rpc/constraints.py
@@ -0,0 +1,8 @@
+"""
+Classes and functions exposed to the RPC endpoint for managing table constraints.
+"""
+from typing import TypedDict
+
+
+class CreateableConstraintInfo(TypedDict):
+    pass
diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index bf3af75513..72fd87c519 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -6,6 +6,8 @@
 from db.tables.operations.select import get_table_info, get_table
 from db.tables.operations.drop import drop_table_from_database
 from db.tables.operations.create import create_table_on_database
+from mathesar.rpc.columns import CreateableColumnInfo
+from mathesar.rpc.constraints import CreateableConstraintInfo
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
 
@@ -72,8 +74,14 @@ def get(*, table_oid: int, database_id: int, **kwargs) -> TableInfo:
 @http_basic_auth_login_required
 @handle_rpc_exceptions
 def add(
-    *, table_name: str, schema_oid: int, database_id: int,
-    columns: list[dict] = [], constraints: list[dict] = [], comment: str = None, **kwargs
+    *,
+    table_name: str,
+    schema_oid: int,
+    database_id: int,
+    column_data_list: list[CreateableColumnInfo] = [],
+    constraint_data_list: list[CreateableConstraintInfo] = [],
+    comment: str = None,
+    **kwargs
 ) -> int:
     """
     Add a table with a default id column.
@@ -82,8 +90,8 @@ def add(
         table_name: Name of the table to be created.
         schema_oid: Identity of the schema in the user's database.
         database_id: The Django id of the database containing the table.
-        columns: A list of columns dict for the new table, in order.
-        constraints: A list of constraints dict for the new table.
+        column_data_list: A list describing columns to be created for the new table, in order.
+        constraint_data_list: A list describing constraints to be created for the new table.
         comment: The comment for the new table.
 
     Returns:
@@ -92,7 +100,7 @@ def add(
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
         created_table_oid = create_table_on_database(
-            table_name, schema_oid, conn, columns, constraints, comment
+            conn, table_name, schema_oid, column_data_list, constraint_data_list, comment
         )
     return created_table_oid
 
diff --git a/mathesar/tests/rpc/test_tables.py b/mathesar/tests/rpc/test_tables.py
index 59ff818897..0771077d45 100644
--- a/mathesar/tests/rpc/test_tables.py
+++ b/mathesar/tests/rpc/test_tables.py
@@ -126,3 +126,56 @@ def mock_drop_table(_table_oid, conn, cascade):
     monkeypatch.setattr(tables, 'drop_table_from_database', mock_drop_table)
     deleted_table = tables.delete(table_oid=1964474, database_id=11, request=request)
     assert deleted_table == 'public."Table 0"'
+
+
+def test_tables_add(rf, monkeypatch):
+    request = rf.post('/api/rpc/v0', data={})
+    request.user = User(username='alice', password='pass1234')
+    schema_oid = 2200
+    database_id = 11
+
+    @contextmanager
+    def mock_connect(_database_id, user):
+        if _database_id == database_id and user.username == 'alice':
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_table_add(_schema_oid, conn):
+        if _schema_oid != schema_oid:
+            raise AssertionError('incorrect parameters passed')
+        return [
+            {
+                'oid': 17408,
+                'name': 'Authors',
+                'schema': schema_oid,
+                'description': 'a description on the authors table.'
+            },
+            {
+                'oid': 17809,
+                'name': 'Books',
+                'schema': schema_oid,
+                'description': None
+            }
+        ]
+    monkeypatch.setattr(tables, 'connect', mock_connect)
+    monkeypatch.setattr(tables, 'create_table_on_database', mock_table_add)
+    expect_table_list = [
+        {
+            'oid': 17408,
+            'name': 'Authors',
+            'schema': schema_oid,
+            'description': 'a description on the authors table.'
+        },
+        {
+            'oid': 17809,
+            'name': 'Books',
+            'schema': schema_oid,
+            'description': None
+        }
+    ]
+    actual_table_list = tables.add(schema_oid=2200, database_id=11, request=request)
+    assert actual_table_list == expect_table_list
\ No newline at end of file

From 4234b01d9f1e7bc4ee19973ded706bae5ef1fd0f Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 11 Jun 2024 01:44:16 +0530
Subject: [PATCH 0233/1141] refactor test

---
 mathesar/tests/rpc/test_tables.py | 33 +++----------------------------
 1 file changed, 3 insertions(+), 30 deletions(-)

diff --git a/mathesar/tests/rpc/test_tables.py b/mathesar/tests/rpc/test_tables.py
index 0771077d45..673fe5711b 100644
--- a/mathesar/tests/rpc/test_tables.py
+++ b/mathesar/tests/rpc/test_tables.py
@@ -147,35 +147,8 @@ def mock_connect(_database_id, user):
     def mock_table_add(_schema_oid, conn):
         if _schema_oid != schema_oid:
             raise AssertionError('incorrect parameters passed')
-        return [
-            {
-                'oid': 17408,
-                'name': 'Authors',
-                'schema': schema_oid,
-                'description': 'a description on the authors table.'
-            },
-            {
-                'oid': 17809,
-                'name': 'Books',
-                'schema': schema_oid,
-                'description': None
-            }
-        ]
+        return 1964474
     monkeypatch.setattr(tables, 'connect', mock_connect)
     monkeypatch.setattr(tables, 'create_table_on_database', mock_table_add)
-    expect_table_list = [
-        {
-            'oid': 17408,
-            'name': 'Authors',
-            'schema': schema_oid,
-            'description': 'a description on the authors table.'
-        },
-        {
-            'oid': 17809,
-            'name': 'Books',
-            'schema': schema_oid,
-            'description': None
-        }
-    ]
-    actual_table_list = tables.add(schema_oid=2200, database_id=11, request=request)
-    assert actual_table_list == expect_table_list
\ No newline at end of file
+    actual_table_oid = tables.add(table_name='newtable', schema_oid=2200, database_id=11, request=request)
+    assert actual_table_oid == 1964474

From fe0835bd27cd6814d90c172f214227eb555e9fa0 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 11 Jun 2024 02:04:24 +0530
Subject: [PATCH 0234/1141] fix tests

---
 db/tables/operations/create.py    | 2 +-
 mathesar/rpc/tables.py            | 2 +-
 mathesar/tests/rpc/test_tables.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/db/tables/operations/create.py b/db/tables/operations/create.py
index e25a05c12c..afbee8b32f 100644
--- a/db/tables/operations/create.py
+++ b/db/tables/operations/create.py
@@ -34,9 +34,9 @@ def create_mathesar_table(engine, table_name, schema_oid, columns=[], constraint
 
 
 def create_table_on_database(
-    conn,
     table_name,
     schema_oid,
+    conn,
     column_data_list=[],
     constraint_data_list=[],
     comment=None
diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index 72fd87c519..ec586a4129 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -100,7 +100,7 @@ def add(
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
         created_table_oid = create_table_on_database(
-            conn, table_name, schema_oid, column_data_list, constraint_data_list, comment
+            table_name, schema_oid, conn, column_data_list, constraint_data_list, comment
         )
     return created_table_oid
 
diff --git a/mathesar/tests/rpc/test_tables.py b/mathesar/tests/rpc/test_tables.py
index 673fe5711b..27b678cc54 100644
--- a/mathesar/tests/rpc/test_tables.py
+++ b/mathesar/tests/rpc/test_tables.py
@@ -144,7 +144,7 @@ def mock_connect(_database_id, user):
         else:
             raise AssertionError('incorrect parameters passed')
 
-    def mock_table_add(_schema_oid, conn):
+    def mock_table_add(table_name, _schema_oid, conn, column_data_list, constraint_data_list, comment):
         if _schema_oid != schema_oid:
             raise AssertionError('incorrect parameters passed')
         return 1964474

From d97f6a80a645eba4784390c48fd320c95bc71a15 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 11 Jun 2024 15:31:23 +0800
Subject: [PATCH 0235/1141] fix class name spelling

---
 mathesar/rpc/columns.py     | 4 ++--
 mathesar/rpc/constraints.py | 2 +-
 mathesar/rpc/tables.py      | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mathesar/rpc/columns.py b/mathesar/rpc/columns.py
index 54ad70896a..537e48dd38 100644
--- a/mathesar/rpc/columns.py
+++ b/mathesar/rpc/columns.py
@@ -74,9 +74,9 @@ def from_dict(cls, col_default):
             )
 
 
-class CreateableColumnInfo(TypedDict):
+class CreatableColumnInfo(TypedDict):
     """
-    Information about adding a new column.
+    Information needed to add a new column.
 
     Only the `name` & `type` keys are required.
 
diff --git a/mathesar/rpc/constraints.py b/mathesar/rpc/constraints.py
index b8ebbdabc4..fe726464d0 100644
--- a/mathesar/rpc/constraints.py
+++ b/mathesar/rpc/constraints.py
@@ -4,5 +4,5 @@
 from typing import TypedDict
 
 
-class CreateableConstraintInfo(TypedDict):
+class CreatableConstraintInfo(TypedDict):
     pass
diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index ec586a4129..8c6d4575a3 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -6,8 +6,8 @@
 from db.tables.operations.select import get_table_info, get_table
 from db.tables.operations.drop import drop_table_from_database
 from db.tables.operations.create import create_table_on_database
-from mathesar.rpc.columns import CreateableColumnInfo
-from mathesar.rpc.constraints import CreateableConstraintInfo
+from mathesar.rpc.columns import CreatableColumnInfo
+from mathesar.rpc.constraints import CreatableConstraintInfo
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
 
@@ -78,8 +78,8 @@ def add(
     table_name: str,
     schema_oid: int,
     database_id: int,
-    column_data_list: list[CreateableColumnInfo] = [],
-    constraint_data_list: list[CreateableConstraintInfo] = [],
+    column_data_list: list[CreatableColumnInfo] = [],
+    constraint_data_list: list[CreatableConstraintInfo] = [],
     comment: str = None,
     **kwargs
 ) -> int:

From 9510b8c4cc2631772215b4e192b9a59b7e15e7ee Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 11 Jun 2024 16:40:08 +0800
Subject: [PATCH 0236/1141] add python wrapper for new column creation

---
 db/columns/operations/create.py            | 78 ++++++++++++++--------
 db/tests/columns/operations/test_create.py |  8 +--
 2 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/db/columns/operations/create.py b/db/columns/operations/create.py
index 7361276015..da18be26a8 100644
--- a/db/columns/operations/create.py
+++ b/db/columns/operations/create.py
@@ -5,39 +5,18 @@
 from alembic.operations import Operations
 from psycopg.errors import InvalidTextRepresentation, InvalidParameterValue
 
-from db.columns.defaults import DEFAULT, NAME, NULLABLE, TYPE, DESCRIPTION
+from db import connection as db_conn
+from db.columns.defaults import DEFAULT, NAME, NULLABLE, DESCRIPTION
 from db.columns.exceptions import InvalidDefaultError, InvalidTypeOptionError
-from db.connection import execute_msar_func_with_engine
 from db.tables.operations.select import reflect_table_from_oid
 from db.types.base import PostgresType
 from db.metadata import get_empty_metadata
 
 
 def create_column(engine, table_oid, column_data):
-    column_name = (column_data.get(NAME) or '').strip() or None
-    column_type_id = (
-        column_data.get(
-            # TYPE = 'sa_type'. This is coming straight from the API.
-            # TODO Determine whether we actually need 'sa_type' and 'type'
-            TYPE, column_data.get("type")
-        )
-        or PostgresType.CHARACTER_VARYING.id
-    )
-    column_type_options = column_data.get("type_options", {})
-    column_nullable = column_data.get(NULLABLE, True)
-    default_value = column_data.get(DEFAULT, {}).get('value')
-    column_description = column_data.get(DESCRIPTION)
-    col_create_def = [
-        {
-            "name": column_name,
-            "type": {"name": column_type_id, "options": column_type_options},
-            "not_null": not column_nullable,
-            "default": default_value,
-            "description": column_description,
-        }
-    ]
+    col_create_def = [_transform_column_create_dict(column_data)]
     try:
-        curr = execute_msar_func_with_engine(
+        curr = db_conn.execute_msar_func_with_engine(
             engine, 'add_columns',
             table_oid,
             json.dumps(col_create_def)
@@ -49,6 +28,53 @@ def create_column(engine, table_oid, column_data):
     return curr.fetchone()[0]
 
 
+def add_columns_to_table(table_oid, column_data_list, conn):
+    transformed_column_data = [
+        _transform_column_create_dict(col) for col in column_data_list
+    ]
+    result = db_conn.exec_msar_func(
+        conn, 'add_columns', table_oid, json.dumps(transformed_column_data)
+    ).fetchone()[0]
+    return result
+
+
+# TODO This function wouldn't be needed if we had the same form in the DB
+# as the RPC API function.
+def _transform_column_create_dict(data):
+    """
+    Transform the data dict into the form needed for the DB functions.
+
+    Input data form:
+    {
+        "name": <str>,
+        "type": <str>,
+        "type_options": <dict>,
+        "nullable": <bool>,
+        "default": {"value": <any>}
+        "description": <str>
+    }
+
+    Output form:
+    {
+        "type": {"name": <str>, "options": <dict>},
+        "name": <str>,
+        "not_null": <bool>,
+        "default": <any>,
+        "description": <str>
+    }
+    """
+    return {
+        "name": (data.get(NAME) or '').strip() or None,
+        "type": {
+            "name": data.get("type") or PostgresType.CHARACTER_VARYING.id,
+            "options": data.get("type_options", {})
+        },
+        "not_null": not data.get(NULLABLE, True),
+        "default": data.get(DEFAULT, {}).get('value'),
+        "description": data.get(DESCRIPTION),
+    }
+
+
 def bulk_create_mathesar_column(engine, table_oid, columns, schema):
     # TODO reuse metadata
     table = reflect_table_from_oid(table_oid, engine, metadata=get_empty_metadata())
@@ -67,7 +93,7 @@ def duplicate_column(
         copy_data=True,
         copy_constraints=True
 ):
-    curr = execute_msar_func_with_engine(
+    curr = db_conn.execute_msar_func_with_engine(
         engine,
         'copy_column',
         table_oid,
diff --git a/db/tests/columns/operations/test_create.py b/db/tests/columns/operations/test_create.py
index b668e71bf6..cc736a97ff 100644
--- a/db/tests/columns/operations/test_create.py
+++ b/db/tests/columns/operations/test_create.py
@@ -29,7 +29,7 @@ def test_create_column_name(engine_with_schema, in_name, out_name):
     given a (maybe empty) name param
     """
     engine, schema = engine_with_schema
-    with patch.object(col_create, "execute_msar_func_with_engine") as mock_exec:
+    with patch.object(col_create.db_conn, "execute_msar_func_with_engine") as mock_exec:
         col_create.create_column(engine, 12345, {"name": in_name})
     call_args = mock_exec.call_args_list[0][0]
     assert call_args[0] == engine
@@ -47,7 +47,7 @@ def test_create_column_type(engine_with_schema, in_type, out_type):
     given a (maybe empty) type
     """
     engine, schema = engine_with_schema
-    with patch.object(col_create, "execute_msar_func_with_engine") as mock_exec:
+    with patch.object(col_create.db_conn, "execute_msar_func_with_engine") as mock_exec:
         col_create.create_column(engine, 12345, {"type": in_type})
     call_args = mock_exec.call_args_list[0][0]
     assert call_args[0] == engine
@@ -68,7 +68,7 @@ def test_create_column_type_options(engine_with_schema, in_options, out_options)
     given a (maybe empty) type options dict.
     """
     engine, schema = engine_with_schema
-    with patch.object(col_create, "execute_msar_func_with_engine") as mock_exec:
+    with patch.object(col_create.db_conn, "execute_msar_func_with_engine") as mock_exec:
         col_create.create_column(engine, 12345, {"type_options": in_options})
     call_args = mock_exec.call_args_list[0][0]
     assert call_args[0] == engine
@@ -81,7 +81,7 @@ def test_create_column_type_options(engine_with_schema, in_options, out_options)
 def test_duplicate_column_smoke(engine_with_schema):
     """This is just a smoke test, since the underlying function is trivial."""
     engine, schema = engine_with_schema
-    with patch.object(col_create, "execute_msar_func_with_engine") as mock_exec:
+    with patch.object(col_create.db_conn, "execute_msar_func_with_engine") as mock_exec:
         col_create.duplicate_column(
             12345,
             4,

From 787a07db450a7a0962245242342dacc85b28c3a6 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 11 Jun 2024 16:59:43 +0800
Subject: [PATCH 0237/1141] reuse column creation tests for new function

---
 db/tests/columns/operations/test_create.py | 35 ++++++++++------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/db/tests/columns/operations/test_create.py b/db/tests/columns/operations/test_create.py
index cc736a97ff..a248fd5d49 100644
--- a/db/tests/columns/operations/test_create.py
+++ b/db/tests/columns/operations/test_create.py
@@ -21,38 +21,36 @@ def test_type_list_completeness(engine):
 
 
 @pytest.mark.parametrize(
-    "in_name,out_name", [('test1', 'test1'), ('', None), (None, None)]
+    "in_name,out_name", [("test1", "test1"), ("", None), (None, None)]
 )
-def test_create_column_name(engine_with_schema, in_name, out_name):
+def test_add_columns_name(in_name, out_name):
     """
     Here, we just check that the PostgreSQL function is called properly, when
     given a (maybe empty) name param
     """
-    engine, schema = engine_with_schema
-    with patch.object(col_create.db_conn, "execute_msar_func_with_engine") as mock_exec:
-        col_create.create_column(engine, 12345, {"name": in_name})
+    with patch.object(col_create.db_conn, "exec_msar_func") as mock_exec:
+        col_create.add_columns_to_table(123, [{"name": in_name}], "conn")
     call_args = mock_exec.call_args_list[0][0]
-    assert call_args[0] == engine
+    assert call_args[0] == "conn"
     assert call_args[1] == "add_columns"
-    assert call_args[2] == 12345
+    assert call_args[2] == 123
     assert json.loads(call_args[3])[0]["name"] == out_name
 
 
 @pytest.mark.parametrize(
     "in_type,out_type", [("numeric", "numeric"), (None, "character varying")]
 )
-def test_create_column_type(engine_with_schema, in_type, out_type):
+def test_add_columns_type(in_type, out_type):
     """
     Here, we just check that the PostgreSQL function is called properly when
     given a (maybe empty) type
     """
-    engine, schema = engine_with_schema
-    with patch.object(col_create.db_conn, "execute_msar_func_with_engine") as mock_exec:
-        col_create.create_column(engine, 12345, {"type": in_type})
+    with patch.object(col_create.db_conn, "exec_msar_func") as mock_exec:
+        col_create.add_columns_to_table(123, [{"type": in_type}], "conn")
     call_args = mock_exec.call_args_list[0][0]
-    assert call_args[0] == engine
+    assert call_args[0] == "conn"
     assert call_args[1] == "add_columns"
-    assert call_args[2] == 12345
+    assert call_args[2] == 123
     actual_col_data = json.loads(call_args[3])[0]
     assert actual_col_data["name"] is None
     assert actual_col_data["type"]["name"] == out_type
@@ -62,18 +60,17 @@ def test_create_column_type(engine_with_schema, in_type, out_type):
 @pytest.mark.parametrize(
     "in_options,out_options", [({"foo": "bar"}, {"foo": "bar"}), (None, None), ({}, {})]
 )
-def test_create_column_type_options(engine_with_schema, in_options, out_options):
+def test_add_columns_type_options(in_options, out_options):
     """
     Here, we just check that the PostgreSQL function is called properly when
     given a (maybe empty) type options dict.
     """
-    engine, schema = engine_with_schema
-    with patch.object(col_create.db_conn, "execute_msar_func_with_engine") as mock_exec:
-        col_create.create_column(engine, 12345, {"type_options": in_options})
+    with patch.object(col_create.db_conn, "exec_msar_func") as mock_exec:
+        col_create.add_columns_to_table(123, [{"type_options": in_options}], "conn")
     call_args = mock_exec.call_args_list[0][0]
-    assert call_args[0] == engine
+    assert call_args[0] == "conn"
     assert call_args[1] == "add_columns"
-    assert call_args[2] == 12345
+    assert call_args[2] == 123
     assert json.loads(call_args[3])[0]["type"]["name"] == "character varying"
     assert json.loads(call_args[3])[0]["type"]["options"] == out_options
 

From 9907d0417a8acbc050bfa90e30d9b7ade1249056 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 11 Jun 2024 17:28:02 +0800
Subject: [PATCH 0238/1141] wire column adding up to RPC endpoint

---
 mathesar/rpc/columns.py              | 35 +++++++++++++++++++++++++---
 mathesar/tests/rpc/test_columns.py   | 33 ++++++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py |  5 ++++
 3 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/mathesar/rpc/columns.py b/mathesar/rpc/columns.py
index 537e48dd38..a4f7d00ca4 100644
--- a/mathesar/rpc/columns.py
+++ b/mathesar/rpc/columns.py
@@ -7,6 +7,7 @@
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from db.columns.operations.alter import alter_columns_in_table
+from db.columns.operations.create import add_columns_to_table
 from db.columns.operations.drop import drop_columns_from_table
 from db.columns.operations.select import get_column_info_for_table
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
@@ -78,7 +79,7 @@ class CreatableColumnInfo(TypedDict):
     """
     Information needed to add a new column.
 
-    Only the `name` & `type` keys are required.
+    No keys are required.
 
     Attributes:
         name: The name of the column.
@@ -88,8 +89,8 @@ class CreatableColumnInfo(TypedDict):
         default: The default value.
         description: The description of the column.
     """
-    name: str
-    type: str
+    name: Optional[str]
+    type: Optional[str]
     type_options: Optional[TypeOptions]
     nullable: Optional[bool]
     default: Optional[ColumnDefault]
@@ -215,6 +216,34 @@ def list_(*, table_oid: int, database_id: int, **kwargs) -> ColumnListReturn:
     )
 
 
+@rpc_method(name="columns.add")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def add(
+        *,
+        column_data_list: list[CreatableColumnInfo],
+        table_oid: int,
+        database_id: int,
+        **kwargs
+) -> list[int]:
+    """
+    Alter details of preexisting columns in a table.
+
+    Does not support altering the type or type options of array columns.
+
+    Args:
+        column_data_list: A list describing desired column alterations.
+        table_oid: Identity of the table whose columns we'll modify.
+        database_id: The Django id of the database containing the table.
+
+    Returns:
+        The number of columns altered.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        return add_columns_to_table(table_oid, column_data_list, conn)
+
+
 @rpc_method(name="columns.patch")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
diff --git a/mathesar/tests/rpc/test_columns.py b/mathesar/tests/rpc/test_columns.py
index ea9928aca0..1afd813a33 100644
--- a/mathesar/tests/rpc/test_columns.py
+++ b/mathesar/tests/rpc/test_columns.py
@@ -171,6 +171,39 @@ def mock_column_alter(_table_oid, _column_data_list, conn):
     assert actual_result == 1
 
 
+def test_columns_add(rf, monkeypatch):
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username='alice', password='pass1234')
+    table_oid = 23457
+    database_id = 2
+    column_data_list = [{"id": 3, "name": "newname"}]
+
+    @contextmanager
+    def mock_connect(_database_id, user):
+        if _database_id == 2 and user.username == 'alice':
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_column_create(_table_oid, _column_data_list, conn):
+        if _table_oid != table_oid or _column_data_list != column_data_list:
+            raise AssertionError('incorrect parameters passed')
+        return [3, 4]
+
+    monkeypatch.setattr(columns, 'connect', mock_connect)
+    monkeypatch.setattr(columns, 'add_columns_to_table', mock_column_create)
+    actual_result = columns.add(
+        column_data_list=column_data_list,
+        table_oid=table_oid,
+        database_id=database_id,
+        request=request
+    )
+    assert actual_result == [3, 4]
+
+
 def test_columns_delete(rf, monkeypatch):
     request = rf.post('/api/rpc/v0/', data={})
     request.user = User(username='alice', password='pass1234')
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 6542295a72..6db4a98248 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -29,6 +29,11 @@
         "columns.patch",
         [user_is_authenticated]
     ),
+    (
+        columns.add,
+        "columns.add",
+        [user_is_authenticated]
+    ),
     (
         connections.add_from_known_connection,
         "connections.add_from_known_connection",

From fb1501eed46f2f8c10ff03262182f50aeb7a00aa Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 11 Jun 2024 17:33:13 +0800
Subject: [PATCH 0239/1141] update docs for new column adder RPC function

---
 docs/docs/api/rpc.md    |  1 +
 mathesar/rpc/columns.py | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index d749847879..9366a78156 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -72,6 +72,7 @@ To use an RPC function:
     options:
       members:
       - list_
+      - add
       - patch
       - delete
       - ColumnListReturn
diff --git a/mathesar/rpc/columns.py b/mathesar/rpc/columns.py
index a4f7d00ca4..6a74a6f329 100644
--- a/mathesar/rpc/columns.py
+++ b/mathesar/rpc/columns.py
@@ -227,17 +227,15 @@ def add(
         **kwargs
 ) -> list[int]:
     """
-    Alter details of preexisting columns in a table.
-
-    Does not support altering the type or type options of array columns.
+    Add columns to a table.
 
     Args:
-        column_data_list: A list describing desired column alterations.
-        table_oid: Identity of the table whose columns we'll modify.
+        column_data_list: A list describing desired columns to add.
+        table_oid: Identity of the table to which we'll add columns.
         database_id: The Django id of the database containing the table.
 
     Returns:
-        The number of columns altered.
+        An array of the attnums of the new columns.
     """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:

From 899fb921153e90db0f2356f86fff262abc98acb5 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 11 Jun 2024 17:36:11 +0800
Subject: [PATCH 0240/1141] document db library python function

---
 db/columns/operations/create.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/db/columns/operations/create.py b/db/columns/operations/create.py
index da18be26a8..ddaf29d4b3 100644
--- a/db/columns/operations/create.py
+++ b/db/columns/operations/create.py
@@ -29,6 +29,17 @@ def create_column(engine, table_oid, column_data):
 
 
 def add_columns_to_table(table_oid, column_data_list, conn):
+    """
+    Add columns to the given table.
+
+    For a description of the members of column_data_list, see
+    _transform_column_create_dict
+
+    Args:
+        table_oid: The OID of the table whose columns we'll alter.
+        column_data_list: A list of dicts describing columns to add.
+        conn: A psycopg connection.
+    """
     transformed_column_data = [
         _transform_column_create_dict(col) for col in column_data_list
     ]

From 03247651fd25319c9ccce139f719a0aca4d46905 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 12 Jun 2024 00:25:01 +0530
Subject: [PATCH 0241/1141] implement table.patch with docs and tests

---
 db/sql/00_msar.sql                   | 19 ++++++++++++-
 db/tables/operations/alter.py        | 20 ++++++++++++++
 docs/docs/api/rpc.md                 |  2 ++
 mathesar/rpc/tables.py               | 29 +++++++++++++++++++-
 mathesar/tests/rpc/test_endpoints.py |  5 ++++
 mathesar/tests/rpc/test_tables.py    | 40 ++++++++++++++++++++++++++++
 6 files changed, 113 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index a18dabb1c4..fbc8dcaf1a 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1121,7 +1121,24 @@ SELECT __msar.comment_on_table(
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
--- Alter Table: LEFT IN PYTHON (for now) -----------------------------------------------------------
+-- Alter table -------------------------------------------------------------------------------------
+CREATE OR REPLACE FUNCTION
+msar.alter_table(tab_id oid, tab_alters jsonb) RETURNS text AS $$
+DECLARE
+  new_tab_name text;
+  comment text;
+  col_alters jsonb;
+BEGIN
+  new_tab_name := tab_alters->>'name';
+  comment := tab_alters->>'description';
+  col_alters := tab_alters->>'columns';
+  PERFORM msar.rename_table(tab_id, new_tab_name);
+  PERFORM msar.comment_on_table(tab_id, comment);
+  PERFORM msar.alter_columns(tab_id, col_alters);
+  RETURN tab_id::regclass::text;
+END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
 
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
diff --git a/db/tables/operations/alter.py b/db/tables/operations/alter.py
index 7ecb160163..d1d554bc29 100644
--- a/db/tables/operations/alter.py
+++ b/db/tables/operations/alter.py
@@ -50,6 +50,26 @@ def alter_table(table_name, table_oid, schema, engine, update_data):
         batch_update_columns(table_oid, engine, update_data['columns'])
 
 
+def alter_table_on_database(table_oid, table_data_dict, conn):
+    """
+    Alter the name, description, or columns of a table, returning name of the altered table.
+
+    Args:
+        table_oid: The OID of the table to be altered.
+        table_data_dict: A dict describing the alterations to make.
+
+    table_data_dict should have the form:
+    {
+        "name": <str>,
+        "description": <str>,
+        "columns": <list> of column_data describing columns to alter.
+    }
+    """
+    return db_conn.exec_msar_func(
+        conn, 'alter_table', table_oid, table_data_dict
+    ).fetchone()[0]
+
+
 def update_pk_sequence_to_latest(engine, table, connection=None):
     """
     Update the primary key sequence to the current maximum.
diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index d749847879..c93d6e7db0 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -64,7 +64,9 @@ To use an RPC function:
       - get
       - add
       - delete
+      - patch
       - TableInfo
+      - SettableTableInfo
 
 ---
 
diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index ec586a4129..09a243ecaf 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -6,7 +6,8 @@
 from db.tables.operations.select import get_table_info, get_table
 from db.tables.operations.drop import drop_table_from_database
 from db.tables.operations.create import create_table_on_database
-from mathesar.rpc.columns import CreateableColumnInfo
+from db.tables.operations.alter import alter_table_on_database
+from mathesar.rpc.columns import CreateableColumnInfo, SettableColumnInfo
 from mathesar.rpc.constraints import CreateableConstraintInfo
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
@@ -28,6 +29,12 @@ class TableInfo(TypedDict):
     description: Optional[str]
 
 
+class SettableTableInfo(TypedDict):
+    name: Optional[str]
+    description: Optional[str]
+    columns: Optional[list[SettableColumnInfo]]
+
+
 @rpc_method(name="tables.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
@@ -125,3 +132,23 @@ def delete(
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
         return drop_table_from_database(table_oid, conn, cascade)
+
+
+@rpc_method(name="tables.patch")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def patch(*, table_oid: str, table_data_dict: SettableTableInfo, database_id: int, **kwargs):
+    """
+    Alter details of preexisting tables in a database.
+
+    Args:
+        table_oid: Identity of the table whose name, description or columns we'll modify.
+        table_data_dict: A list describing desired table alterations.
+        database_id: The Django id of the database containing the table.
+
+    Returns:
+        The name of the altered table.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        return alter_table_on_database(table_oid, table_data_dict, conn)
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 6542295a72..3644b808b5 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -68,6 +68,11 @@
         tables.delete,
         "tables.delete",
         [user_is_authenticated]
+    ),
+    (
+        tables.patch,
+        "tables.patch",
+        [user_is_authenticated]
     )
 ]
 
diff --git a/mathesar/tests/rpc/test_tables.py b/mathesar/tests/rpc/test_tables.py
index 27b678cc54..76da0bbb1d 100644
--- a/mathesar/tests/rpc/test_tables.py
+++ b/mathesar/tests/rpc/test_tables.py
@@ -152,3 +152,43 @@ def mock_table_add(table_name, _schema_oid, conn, column_data_list, constraint_d
     monkeypatch.setattr(tables, 'create_table_on_database', mock_table_add)
     actual_table_oid = tables.add(table_name='newtable', schema_oid=2200, database_id=11, request=request)
     assert actual_table_oid == 1964474
+
+
+def test_tables_patch(rf, monkeypatch):
+    request = rf.post('/api/rpc/v0', data={})
+    request.user = User(username='alice', password='pass1234')
+    table_oid = 1964474
+    database_id = 11
+    table_data_dict = {
+        "name": "newtabname",
+        "description": "this is a description",
+        "columns": {}
+    }
+
+    @contextmanager
+    def mock_connect(_database_id, user):
+        if _database_id == database_id and user.username == 'alice':
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_table_patch(_table_oid, _table_data_dict, conn):
+        if _table_oid != table_oid and _table_data_dict != table_data_dict:
+            raise AssertionError('incorrect parameters passed')
+        return 'newtabname'
+    monkeypatch.setattr(tables, 'connect', mock_connect)
+    monkeypatch.setattr(tables, 'alter_table_on_database', mock_table_patch)
+    altered_table_name = tables.patch(
+        table_oid=1964474,
+        table_data_dict={
+            "name": "newtabname",
+            "description": "this is a description",
+            "columns": {}
+        },
+        database_id=11,
+        request=request
+    )
+    assert altered_table_name == 'newtabname'

From 52c45f0a6fedc4955421e208458397b137248950 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 12 Jun 2024 00:31:14 +0530
Subject: [PATCH 0242/1141] add return value to function signature

---
 mathesar/rpc/tables.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index 09a243ecaf..166acdf680 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -137,7 +137,9 @@ def delete(
 @rpc_method(name="tables.patch")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def patch(*, table_oid: str, table_data_dict: SettableTableInfo, database_id: int, **kwargs):
+def patch(
+    *, table_oid: str, table_data_dict: SettableTableInfo, database_id: int, **kwargs
+) -> int:
     """
     Alter details of preexisting tables in a database.
 

From 905e5f901e23cf51b498ff0a2221024cd677cf9b Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 12 Jun 2024 00:32:56 +0530
Subject: [PATCH 0243/1141] alter return from int->str

---
 mathesar/rpc/tables.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index 166acdf680..3e3a5e3cf6 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -139,7 +139,7 @@ def delete(
 @handle_rpc_exceptions
 def patch(
     *, table_oid: str, table_data_dict: SettableTableInfo, database_id: int, **kwargs
-) -> int:
+) -> str:
     """
     Alter details of preexisting tables in a database.
 

From 5b835fb58700eabdaace2925c27eb3c91459e10a Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 12 Jun 2024 01:13:25 +0530
Subject: [PATCH 0244/1141] fix comment_on_table sql funtions for null input
 and add docstring for funtions

---
 db/sql/00_msar.sql     | 27 ++++++++++++++++++++++-----
 mathesar/rpc/tables.py | 17 ++++++++++++++++-
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index fbc8dcaf1a..7cd4fbc0bc 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1089,8 +1089,12 @@ Args:
   tab_name: The qualified, quoted name of the table whose comment we will change.
   comment_: The new comment. Any quotes or special characters must be escaped.
 */
-SELECT __msar.exec_ddl('COMMENT ON TABLE %s IS %s', tab_name, comment_);
-$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+DECLARE
+  comment_or_null text := COALESCE(comment_, 'NULL');
+BEGIN
+RETURN __msar.exec_ddl('COMMENT ON TABLE %s IS %s', tab_name, comment_or_null);
+END;
+$$ LANGUAGE plpgsql;
 
 
 CREATE OR REPLACE FUNCTION
@@ -1102,7 +1106,7 @@ Args:
   comment_: The new comment.
 */
 SELECT __msar.comment_on_table(__msar.get_relation_name(tab_id), quote_literal(comment_));
-$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE SQL;
 
 
 CREATE OR REPLACE FUNCTION
@@ -1118,12 +1122,25 @@ SELECT __msar.comment_on_table(
   msar.get_fully_qualified_object_name(sch_name, tab_name),
   quote_literal(comment_)
 );
-$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE SQL;
 
 
 -- Alter table -------------------------------------------------------------------------------------
 CREATE OR REPLACE FUNCTION
-msar.alter_table(tab_id oid, tab_alters jsonb) RETURNS text AS $$
+msar.alter_table(tab_id oid, tab_alters jsonb) RETURNS text AS $$/*
+Alter columns of the given table in bulk, returning the IDs of the columns so altered.
+
+Args:
+  tab_id: The OID of the table whose columns we'll alter.
+  tab_alters: a JSONB describing the alterations to make.
+
+  The tab_alters should have the form:
+  {
+    "name": <str>,
+    "description": <str>
+    "columns": <col_alters>,
+  }
+*/
 DECLARE
   new_tab_name text;
   comment text;
diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index 3e3a5e3cf6..6a5ceaadac 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -30,6 +30,21 @@ class TableInfo(TypedDict):
 
 
 class SettableTableInfo(TypedDict):
+    """
+    Information about a table, restricted to settable fields.
+
+    When possible, Passing `null` for a key will clear the underlying
+    setting. E.g.,
+
+    - `description = null` clears the table description.
+
+    Setting any of `name`, `columns` to `null` is a noop.
+
+    Attributes:
+        name: The new name of the table.
+        description: The description of the table.
+        columns: A list describing desired column alterations.
+    """
     name: Optional[str]
     description: Optional[str]
     columns: Optional[list[SettableColumnInfo]]
@@ -141,7 +156,7 @@ def patch(
     *, table_oid: str, table_data_dict: SettableTableInfo, database_id: int, **kwargs
 ) -> str:
     """
-    Alter details of preexisting tables in a database.
+    Alter details of a preexisting table in a database.
 
     Args:
         table_oid: Identity of the table whose name, description or columns we'll modify.

From 07a6bdd7d2a8de7a1935f2e0210c89c8475626d6 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 12 Jun 2024 18:18:14 +0530
Subject: [PATCH 0245/1141] use get_relation_name_or_null

---
 db/sql/00_msar.sql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 7cd4fbc0bc..bb15f962d3 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1057,7 +1057,7 @@ Args:
   new_tab_name: unquoted, unqualified table name
 */
 BEGIN
-  RETURN __msar.rename_table(__msar.get_relation_name(tab_id), quote_ident(new_tab_name));
+  RETURN __msar.rename_table(msar.get_relation_name_or_null(tab_id), quote_ident(new_tab_name));
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
@@ -1105,7 +1105,7 @@ Args:
   tab_id: The OID of the table whose comment we will change.
   comment_: The new comment.
 */
-SELECT __msar.comment_on_table(__msar.get_relation_name(tab_id), quote_literal(comment_));
+SELECT __msar.comment_on_table(msar.get_relation_name_or_null(tab_id), quote_literal(comment_));
 $$ LANGUAGE SQL;
 
 
@@ -1152,7 +1152,7 @@ BEGIN
   PERFORM msar.rename_table(tab_id, new_tab_name);
   PERFORM msar.comment_on_table(tab_id, comment);
   PERFORM msar.alter_columns(tab_id, col_alters);
-  RETURN tab_id::regclass::text;
+  RETURN msar.get_relation_name_or_null(tab_id);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 

From 2bfaddeda486e54630f58c4ab43e46510a71f629 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 12 Jun 2024 18:32:42 +0530
Subject: [PATCH 0246/1141] add mock test for alter_table

---
 db/tests/tables/operations/test_alter.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/db/tests/tables/operations/test_alter.py b/db/tests/tables/operations/test_alter.py
index 993e307364..754a588956 100644
--- a/db/tests/tables/operations/test_alter.py
+++ b/db/tests/tables/operations/test_alter.py
@@ -29,3 +29,17 @@ def test_comment_on_table(engine_with_schema):
     assert call_args[2] == schema_name
     assert call_args[3] == "comment_on_me"
     assert call_args[4] == "This is a comment"
+
+
+def test_alter_table():
+    with patch.object(tab_alter.db_conn, 'exec_msar_func') as mock_exec:
+        tab_alter.alter_table_on_database(
+            12345,
+            {"name": "newname", "description": "this is a comment", "columns": {}},
+            "conn"
+        )
+    call_args = mock_exec.call_args_list[0][0]
+    assert call_args[0] == "conn"
+    assert call_args[1] == "alter_table"
+    assert call_args[2] == 12345
+    assert call_args[3] == {"name": "newname", "description": "this is a comment", "columns": {}}

From 43dc1f0e6e7d871e1b21b1b9ec7a3d170dda167e Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 12 Jun 2024 18:36:43 +0530
Subject: [PATCH 0247/1141] use -> instead of ->> for columns

---
 db/sql/00_msar.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index bb15f962d3..a6ee233ad2 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1148,7 +1148,7 @@ DECLARE
 BEGIN
   new_tab_name := tab_alters->>'name';
   comment := tab_alters->>'description';
-  col_alters := tab_alters->>'columns';
+  col_alters := tab_alters->'columns';
   PERFORM msar.rename_table(tab_id, new_tab_name);
   PERFORM msar.comment_on_table(tab_id, comment);
   PERFORM msar.alter_columns(tab_id, col_alters);

From c6f994cd1adeb58fd514ac0f28ac51553ebdb71d Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 12 Jun 2024 14:13:03 -0400
Subject: [PATCH 0248/1141] Add schemas.add RPC function

---
 conftest.py                                |  4 +-
 db/schemas/operations/alter.py             |  6 +-
 db/schemas/operations/create.py            | 55 ++++++++++----
 db/sql/00_msar.sql                         | 86 +++++++++++++---------
 db/sql/test_00_msar.sql                    | 33 +++++++--
 db/tables/operations/infer_types.py        |  4 +-
 db/tests/schemas/operations/test_create.py | 16 ++--
 db/types/install.py                        |  8 +-
 docs/docs/api/rpc.md                       |  1 +
 mathesar/rpc/schemas.py                    | 41 ++++++++---
 mathesar/tests/imports/test_csv.py         |  4 +-
 mathesar/tests/imports/test_json.py        |  4 +-
 mathesar/tests/rpc/test_endpoints.py       |  5 ++
 mathesar/utils/schemas.py                  |  4 +-
 14 files changed, 178 insertions(+), 93 deletions(-)

diff --git a/conftest.py b/conftest.py
index 6089145050..05cd0978ba 100644
--- a/conftest.py
+++ b/conftest.py
@@ -14,7 +14,7 @@
 from db.types import install
 from db.sql import install as sql_install
 from db.schemas.operations.drop import drop_schema_via_name as drop_sa_schema
-from db.schemas.operations.create import create_schema as create_sa_schema
+from db.schemas.operations.create import create_schema_if_not_exists_via_sql_alchemy
 from db.schemas.utils import get_schema_oid_from_name, get_schema_name_from_oid
 
 from fixtures.utils import create_scoped_fixtures
@@ -210,7 +210,7 @@ def _create_schema(schema_name, engine, schema_mustnt_exist=True):
         if schema_mustnt_exist:
             assert schema_name not in created_schemas
         logger.debug(f'creating {schema_name}')
-        create_sa_schema(schema_name, engine, if_not_exists=True)
+        create_schema_if_not_exists_via_sql_alchemy(schema_name, engine)
         schema_oid = get_schema_oid_from_name(schema_name, engine)
         db_name = engine.url.database
         created_schemas_in_this_engine = created_schemas.setdefault(db_name, {})
diff --git a/db/schemas/operations/alter.py b/db/schemas/operations/alter.py
index e6b345720f..919997eff0 100644
--- a/db/schemas/operations/alter.py
+++ b/db/schemas/operations/alter.py
@@ -27,10 +27,8 @@ def comment_on_schema(schema_name, engine, comment):
     Change description of a schema.
 
     Args:
-        schema_name: The name of the schema whose comment we will
-                     change.
-        comment: The new comment. Any quotes or special characters must
-                 be escaped.
+        schema_name: The name of the schema whose comment we will change.
+        comment: The new comment.
         engine: SQLAlchemy engine object for connecting.
 
     Returns:
diff --git a/db/schemas/operations/create.py b/db/schemas/operations/create.py
index a079ec2cd3..8be771c362 100644
--- a/db/schemas/operations/create.py
+++ b/db/schemas/operations/create.py
@@ -1,26 +1,53 @@
-from db.schemas.operations.alter import comment_on_schema
-from db.connection import execute_msar_func_with_engine
+from db.connection import execute_msar_func_with_engine, exec_msar_func
 
 
-def create_schema(schema_name, engine, comment=None, if_not_exists=False):
+def create_schema_via_sql_alchemy(schema_name, engine, description=None):
     """
-    Creates a schema.
+    Creates a schema using a SQLAlchemy engine.
 
     Args:
         schema_name: Name of the schema to create.
         engine: SQLAlchemy engine object for connecting.
-        comment: The new comment. Any quotes or special characters must
-                 be escaped.
-        if_not_exists: Whether to ignore an error if the schema does
-                       exist.
+        description: A new description to set on the schema.
+
+    If a schema already exists with the given name, this function will raise an error.
 
     Returns:
-        Returns a string giving the command that was run.
+        The integer oid of the newly created schema.
     """
-    result = execute_msar_func_with_engine(
-        engine, 'create_schema', schema_name, if_not_exists
+    return execute_msar_func_with_engine(
+        engine, 'create_schema', schema_name, description
     ).fetchone()[0]
 
-    if comment:
-        comment_on_schema(schema_name, engine, comment)
-    return result
+
+def create_schema_if_not_exists_via_sql_alchemy(schema_name, engine):
+    """
+    Ensure that a schema exists using a SQLAlchemy engine.
+
+    Args:
+        schema_name: Name of the schema to create.
+        engine: SQLAlchemy engine object for connecting.
+
+    Returns:
+        The integer oid of the newly created schema.
+    """
+    return execute_msar_func_with_engine(
+        engine, 'create_schema_if_not_exists', schema_name
+    ).fetchone()[0]
+
+
+def create_schema(schema_name, conn, description=None):
+    """
+    Create a schema using a psycopg connection.
+
+    Args:
+        schema_name: Name of the schema to create.
+        conn: a psycopg connection
+        description: A new description to set on the schema.
+
+    If a schema already exists with the given name, this function will raise an error.
+
+    Returns:
+        The integer oid of the newly created schema.
+    """
+    return exec_msar_func(conn, 'create_schema', schema_name, description).fetchone()[0]
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index a18dabb1c4..31689896a7 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -143,24 +143,27 @@ $$ LANGUAGE plpgsql;
 
 
 CREATE OR REPLACE FUNCTION msar.schema_exists(schema_name text) RETURNS boolean AS $$/*
-Return true if the given schema exists in the current database, false otherwise.
+Return true if the schema exists, false otherwise.
+
+Args :
+  sch_name: The name of the schema, UNQUOTED.
 */
 SELECT EXISTS (SELECT 1 FROM pg_namespace WHERE nspname=schema_name);
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
-CREATE OR REPLACE FUNCTION __msar.get_schema_oid(sch_name text) RETURNS oid AS $$/*
-Return the OID of a schema, if it can be diretly found from a name.
+CREATE OR REPLACE FUNCTION msar.get_schema_oid(sch_name text) RETURNS oid AS $$/*
+Return the OID of a schema, or NULL if the schema does not exist.
 
 Args :
-  sch_name: The name of the schema.
+  sch_name: The name of the schema, UNQUOTED.
 */
-SELECT CASE WHEN msar.schema_exists(sch_name) THEN sch_name::regnamespace::oid END;
+SELECT oid FROM pg_namespace WHERE nspname=sch_name;
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION __msar.get_schema_name(sch_id oid) RETURNS TEXT AS $$/*
-Return the name for a given schema, quoted as appropriate.
+Return the QUOTED name for a given schema.
 
 The schema *must* be in the pg_namespace table to use this function.
 
@@ -612,7 +615,7 @@ Args:
 SELECT jsonb_agg(prorettype::regtype::text)
 FROM pg_proc
 WHERE
-  pronamespace=__msar.get_schema_oid('mathesar_types')
+  pronamespace=msar.get_schema_oid('mathesar_types')
   AND proargtypes[0]=typ_id
   AND left(proname, 5) = 'cast_';
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
@@ -885,8 +888,8 @@ __msar.comment_on_schema(sch_name text, comment_ text) RETURNS TEXT AS $$/*
 Change the description of a schema, returning command executed.
 
 Args:
-  sch_name: The quoted name of the schema whose comment we will change.
-  comment_: The new comment. Any quotes or special characters must be escaped.
+  sch_name: The QUOTED name of the schema whose comment we will change.
+  comment_: The new comment, QUOTED
 */
 DECLARE
   cmd_template text;
@@ -902,8 +905,8 @@ msar.comment_on_schema(sch_name text, comment_ text) RETURNS TEXT AS $$/*
 Change the description of a schema, returning command executed.
 
 Args:
-  sch_name: The quoted name of the schema whose comment we will change.
-  comment_: The new comment.
+  sch_name: The UNQUOTED name of the schema whose comment we will change.
+  comment_: The new comment, UNQUOTED
 */
 BEGIN
   RETURN __msar.comment_on_schema(quote_ident(sch_name), quote_literal(comment_));
@@ -916,7 +919,7 @@ Change the description of a schema, returning command executed.
 
 Args:
   sch_id: The OID of the schema.
-  comment_: The new comment.
+  comment_: The new comment, UNQUOTED
 */
 BEGIN
   RETURN __msar.comment_on_schema(__msar.get_schema_name(sch_id), quote_literal(comment_));
@@ -932,43 +935,54 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 
+-- This gets rid of `msar.create_schema` as defined in Mathesar 0.1.7. We don't want that old
+-- function definition hanging around because it will get invoked when passing NULL as the second
+-- argument like `msar.create_schema('foo', NULL)`.
+DROP FUNCTION IF EXISTS msar.create_schema(text, boolean);
 
--- Create schema -----------------------------------------------------------------------------------
-
-CREATE OR REPLACE FUNCTION
-__msar.create_schema(sch_name text, if_not_exists boolean) RETURNS TEXT AS $$/*
-Create a schema, returning the command executed.
+CREATE OR REPLACE FUNCTION msar.create_schema_if_not_exists(sch_name text) RETURNS oid AS $$/*
+Ensure that a schema exists in the database.
 
 Args:
-  sch_name: A properly quoted name of the schema to be created
-  if_not_exists: Whether to ignore an error if the schema does exist
+  sch_name: the name of the schema to be created, UNQUOTED.
+
+Returns:
+  The integer OID of the schema
 */
-DECLARE
-  cmd_template text;
 BEGIN
-  IF if_not_exists
-  THEN
-    cmd_template := 'CREATE SCHEMA IF NOT EXISTS %s';
-  ELSE
-    cmd_template := 'CREATE SCHEMA %s';
-  END IF;
-  RETURN __msar.exec_ddl(cmd_template, sch_name);
+  EXECUTE 'CREATE SCHEMA IF NOT EXISTS ' || quote_ident(sch_name);
+  RETURN msar.get_schema_oid(sch_name);
 END;
-$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION
-msar.create_schema(sch_name text, if_not_exists boolean) RETURNS TEXT AS $$/*
-Create a schema, returning the command executed.
+CREATE OR REPLACE FUNCTION msar.create_schema(
+  sch_name text,
+  description text DEFAULT ''
+) RETURNS oid AS $$/*
+Create a schema, possibly with a description.
+
+If a schema with the given name already exists, an exception will be raised.
 
 Args:
-  sch_name: An unquoted name of the schema to be created
-  if_not_exists: Whether to ignore an error if the schema does exist
+  sch_name: the name of the schema to be created, UNQUOTED.
+  description: (optional) A description for the schema, UNQUOTED.
+
+Returns:
+  The integer OID of the schema
+
+Note: This function does not support IF NOT EXISTS because it's simpler that way. I originally tried
+to support descriptions and if_not_exists in the same function, but as I discovered more edge cases
+and inconsistencies, it got too complex, and I didn't think we'd have a good enough use case for it.
 */
+DECLARE schema_oid oid;
 BEGIN
-  RETURN __msar.create_schema(quote_ident(sch_name), if_not_exists);
+  EXECUTE 'CREATE SCHEMA ' || quote_ident(sch_name);
+  schema_oid := msar.get_schema_oid(sch_name);
+  PERFORM msar.comment_on_schema(schema_oid, description);
+  RETURN schema_oid;
 END;
-$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE plpgsql;
 
 
 ----------------------------------------------------------------------------------------------------
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index cb11d87e8e..db10bb73e5 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -1183,17 +1183,38 @@ $$ LANGUAGE plpgsql;
 
 -- msar.schema_ddl --------------------------------------------------------------------------------
 
-CREATE OR REPLACE FUNCTION test_create_schema() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION test_create_schema_without_description() RETURNS SETOF TEXT AS $$
+DECLARE sch_oid oid;
 BEGIN
-  PERFORM msar.create_schema(
-    sch_name => 'create_schema'::text,
-    if_not_exists => false
-  );
-  RETURN NEXT has_schema('create_schema');
+  SELECT msar.create_schema('foo bar') INTO sch_oid;
+  RETURN NEXT has_schema('foo bar');
+  RETURN NEXT is(sch_oid, msar.get_schema_oid('foo bar'));
+  RETURN NEXT is(obj_description(sch_oid), NULL);
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_create_schema_with_description() RETURNS SETOF TEXT AS $$
+DECLARE sch_oid oid;
+BEGIN
+  SELECT msar.create_schema('foo bar', 'yay') INTO sch_oid;
+  RETURN NEXT has_schema('foo bar');
+  RETURN NEXT is(sch_oid, msar.get_schema_oid('foo bar'));
+  RETURN NEXT is(obj_description(sch_oid), 'yay');
 END;
 $$ LANGUAGE plpgsql;
 
 
+CREATE OR REPLACE FUNCTION test_create_schema_that_already_exists() RETURNS SETOF TEXT AS $t$
+DECLARE sch_oid oid;
+BEGIN
+  SELECT msar.create_schema('foo bar') INTO sch_oid;
+  RETURN NEXT throws_ok($$SELECT msar.create_schema('foo bar')$$, '42P06');
+  RETURN NEXT is(msar.create_schema_if_not_exists('foo bar'), sch_oid);
+END;
+$t$ LANGUAGE plpgsql;
+
+
 CREATE OR REPLACE FUNCTION __setup_drop_schema() RETURNS SETOF TEXT AS $$
 BEGIN
   CREATE SCHEMA drop_test_schema;
diff --git a/db/tables/operations/infer_types.py b/db/tables/operations/infer_types.py
index e7d3c522a3..11c571103c 100644
--- a/db/tables/operations/infer_types.py
+++ b/db/tables/operations/infer_types.py
@@ -5,7 +5,7 @@
 from db import constants
 from db.columns.base import MathesarColumn
 from db.columns.operations.infer_types import infer_column_type
-from db.schemas.operations.create import create_schema
+from db.schemas.operations.create import create_schema_if_not_exists_via_sql_alchemy
 from db.tables.operations.create import CreateTableAs
 from db.tables.operations.select import reflect_table
 from db.types.operations.convert import get_db_type_enum_from_class
@@ -43,7 +43,7 @@ def infer_table_column_types(schema, table_name, engine, metadata=None, columns_
     table = reflect_table(table_name, schema, engine, metadata=metadata)
 
     temp_name = TEMP_TABLE % (int(time()))
-    create_schema(TEMP_SCHEMA, engine, if_not_exists=True)
+    create_schema_if_not_exists_via_sql_alchemy(TEMP_SCHEMA, engine)
     with engine.begin() as conn:
         while engine.dialect.has_table(conn, temp_name, schema=TEMP_SCHEMA):
             temp_name = TEMP_TABLE.format(int(time()))
diff --git a/db/tests/schemas/operations/test_create.py b/db/tests/schemas/operations/test_create.py
index 8c6d796f80..5ca649fc21 100644
--- a/db/tests/schemas/operations/test_create.py
+++ b/db/tests/schemas/operations/test_create.py
@@ -1,22 +1,16 @@
-import pytest
 from unittest.mock import patch
-import db.schemas.operations.create as sch_create
+from db.schemas.operations.create import create_schema_via_sql_alchemy
 
 
-@pytest.mark.parametrize(
-    "if_not_exists", [(True), (False), (None)]
-)
-def test_create_schema(engine_with_schema, if_not_exists):
+def test_create_schema_via_sql_alchemy(engine_with_schema):
     engine = engine_with_schema
-    with patch.object(sch_create, 'execute_msar_func_with_engine') as mock_exec:
-        sch_create.create_schema(
+    with patch.object(create_schema_via_sql_alchemy, 'execute_msar_func_with_engine') as mock_exec:
+        create_schema_via_sql_alchemy(
             schema_name='new_schema',
             engine=engine,
             comment=None,
-            if_not_exists=if_not_exists
         )
     call_args = mock_exec.call_args_list[0][0]
     assert call_args[0] == engine
-    assert call_args[1] == "create_schema"
+    assert call_args[1] == "create_schema_via_sql_alchemy"
     assert call_args[2] == "new_schema"
-    assert call_args[3] == if_not_exists or False
diff --git a/db/types/install.py b/db/types/install.py
index 5651af1eed..7c1dfd92d6 100644
--- a/db/types/install.py
+++ b/db/types/install.py
@@ -1,12 +1,12 @@
 from db.types.custom import email, money, multicurrency, uri, json_array, json_object
 from db.constants import TYPES_SCHEMA
-from db.schemas.operations.create import create_schema
+from db.schemas.operations.create import create_schema_if_not_exists_via_sql_alchemy
 from db.types.operations.cast import install_all_casts
 import psycopg
 
 
-def create_type_schema(engine):
-    create_schema(TYPES_SCHEMA, engine, if_not_exists=True)
+def create_type_schema(engine) -> None:
+    create_schema_if_not_exists_via_sql_alchemy(TYPES_SCHEMA, engine)
 
 
 def install_mathesar_on_database(engine):
@@ -24,4 +24,6 @@ def install_mathesar_on_database(engine):
 def uninstall_mathesar_from_database(engine):
     conn_str = str(engine.url)
     with psycopg.connect(conn_str) as conn:
+        # TODO: Clean up this code so that it references all the schemas in our
+        # `INTERNAL_SCHEMAS` constant.
         conn.execute(f"DROP SCHEMA IF EXISTS __msar, msar, {TYPES_SCHEMA} CASCADE")
diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index d749847879..911805ae19 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -52,6 +52,7 @@ To use an RPC function:
     options:
       members:
       - list_
+      - add
       - delete
       - SchemaInfo
 
diff --git a/mathesar/rpc/schemas.py b/mathesar/rpc/schemas.py
index caf7f3fc43..890f5c5747 100644
--- a/mathesar/rpc/schemas.py
+++ b/mathesar/rpc/schemas.py
@@ -7,6 +7,7 @@
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from db.constants import INTERNAL_SCHEMAS
+from db.schemas.operations.create import create_schema
 from db.schemas.operations.select import get_schemas
 from db.schemas.operations.drop import drop_schema_via_oid
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
@@ -22,13 +23,40 @@ class SchemaInfo(TypedDict):
         name: The name of the schema
         description: A description of the schema
         table_count: The number of tables in the schema
-        exploration_count: The number of explorations in the schema
     """
     oid: int
     name: str
     description: Optional[str]
     table_count: int
-    exploration_count: int
+
+
+@rpc_method(name="schemas.add")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def add(
+    *,
+    name: str,
+    database_id: int,
+    description: Optional[str] = None,
+    **kwargs,
+) -> int:
+    """
+    Add a schema
+
+    Args:
+        name: The name of the schema to add.
+        database_id: The Django id of the database containing the schema.
+        description: A description of the schema
+
+    Returns:
+        The integer OID of the schema created
+    """
+    with connect(database_id, kwargs.get(REQUEST_KEY).user) as conn:
+        return create_schema(
+            schema_name=name,
+            conn=conn,
+            description=description
+        )
 
 
 @rpc_method(name="schemas.list")
@@ -42,18 +70,13 @@ def list_(*, database_id: int, **kwargs) -> list[SchemaInfo]:
         database_id: The Django id of the database containing the table.
 
     Returns:
-        A list of schema details
+        A list of SchemaInfo objects
     """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
         schemas = get_schemas(conn)
 
-    user_defined_schemas = [s for s in schemas if s['name'] not in INTERNAL_SCHEMAS]
-
-    # TODO_FOR_BETA: join exploration count from internal DB here after we've
-    # refactored the models so that each exploration is associated with a schema
-    # (by oid) in a specific database.
-    return [{**s, "exploration_count": 0} for s in user_defined_schemas]
+    return [s for s in schemas if s['name'] not in INTERNAL_SCHEMAS]
 
 
 @rpc_method(name="schemas.delete")
diff --git a/mathesar/tests/imports/test_csv.py b/mathesar/tests/imports/test_csv.py
index a7b860df8d..ea88f53607 100644
--- a/mathesar/tests/imports/test_csv.py
+++ b/mathesar/tests/imports/test_csv.py
@@ -7,7 +7,7 @@
 from mathesar.errors import InvalidTableError
 from mathesar.imports.base import create_table_from_data_file
 from mathesar.imports.csv import get_sv_dialect, get_sv_reader
-from db.schemas.operations.create import create_schema
+from db.schemas.operations.create import create_schema_via_sql_alchemy
 from db.schemas.utils import get_schema_oid_from_name
 from db.constants import COLUMN_NAME_TEMPLATE
 from psycopg.errors import DuplicateTable
@@ -45,7 +45,7 @@ def col_headers_empty_data_file(col_headers_empty_csv_filepath):
 
 @pytest.fixture()
 def schema(engine, test_db_model):
-    create_schema(TEST_SCHEMA, engine)
+    create_schema_via_sql_alchemy(TEST_SCHEMA, engine)
     schema_oid = get_schema_oid_from_name(TEST_SCHEMA, engine)
     yield Schema.current_objects.create(oid=schema_oid, database=test_db_model)
     with engine.begin() as conn:
diff --git a/mathesar/tests/imports/test_json.py b/mathesar/tests/imports/test_json.py
index b099e48680..a35b47dc74 100644
--- a/mathesar/tests/imports/test_json.py
+++ b/mathesar/tests/imports/test_json.py
@@ -5,7 +5,7 @@
 
 from mathesar.models.base import DataFile, Schema
 from mathesar.imports.base import create_table_from_data_file
-from db.schemas.operations.create import create_schema
+from db.schemas.operations.create import create_schema_via_sql_alchemy
 from db.schemas.utils import get_schema_oid_from_name
 from psycopg.errors import DuplicateTable
 
@@ -21,7 +21,7 @@ def data_file(patents_json_filepath):
 
 @pytest.fixture()
 def schema(engine, test_db_model):
-    create_schema(TEST_SCHEMA, engine)
+    create_schema_via_sql_alchemy(TEST_SCHEMA, engine)
     schema_oid = get_schema_oid_from_name(TEST_SCHEMA, engine)
     yield Schema.current_objects.create(oid=schema_oid, database=test_db_model)
     with engine.begin() as conn:
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 6542295a72..c0854ad2fd 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -39,6 +39,11 @@
         "connections.add_from_scratch",
         [user_is_superuser]
     ),
+    (
+        schemas.add,
+        "schemas.add",
+        [user_is_authenticated]
+    ),
     (
         schemas.list_,
         "schemas.list",
diff --git a/mathesar/utils/schemas.py b/mathesar/utils/schemas.py
index 1d12c0060b..0552745704 100644
--- a/mathesar/utils/schemas.py
+++ b/mathesar/utils/schemas.py
@@ -1,7 +1,7 @@
 from django.core.exceptions import ObjectDoesNotExist
 from rest_framework.exceptions import ValidationError
 
-from db.schemas.operations.create import create_schema
+from db.schemas.operations.create import create_schema_via_sql_alchemy
 from db.schemas.utils import get_schema_oid_from_name, get_mathesar_schemas
 from mathesar.database.base import create_mathesar_engine
 from mathesar.models.base import Schema, Database
@@ -19,7 +19,7 @@ def create_schema_and_object(name, connection_id, comment=None):
     all_schemas = get_mathesar_schemas(engine)
     if name in all_schemas:
         raise ValidationError({"name": f"Schema name {name} is not unique"})
-    create_schema(name, engine, comment=comment)
+    create_schema_via_sql_alchemy(name, engine, comment)
     schema_oid = get_schema_oid_from_name(name, engine)
 
     schema = Schema.objects.create(oid=schema_oid, database=database_model)

From 05eb1769f6a997bd0f060fd11907fb7818891a7d Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 12 Jun 2024 14:30:03 -0400
Subject: [PATCH 0249/1141] Fix failing test

---
 db/tests/schemas/operations/test_create.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/db/tests/schemas/operations/test_create.py b/db/tests/schemas/operations/test_create.py
index 5ca649fc21..9452b95e1a 100644
--- a/db/tests/schemas/operations/test_create.py
+++ b/db/tests/schemas/operations/test_create.py
@@ -1,16 +1,16 @@
 from unittest.mock import patch
-from db.schemas.operations.create import create_schema_via_sql_alchemy
+import db.schemas.operations.create as sch_create
 
 
 def test_create_schema_via_sql_alchemy(engine_with_schema):
     engine = engine_with_schema
-    with patch.object(create_schema_via_sql_alchemy, 'execute_msar_func_with_engine') as mock_exec:
-        create_schema_via_sql_alchemy(
+    with patch.object(sch_create, 'execute_msar_func_with_engine') as mock_exec:
+        sch_create.create_schema_via_sql_alchemy(
             schema_name='new_schema',
             engine=engine,
-            comment=None,
+            description=None,
         )
     call_args = mock_exec.call_args_list[0][0]
     assert call_args[0] == engine
-    assert call_args[1] == "create_schema_via_sql_alchemy"
+    assert call_args[1] == "create_schema"
     assert call_args[2] == "new_schema"

From e4ee2bede9c6607f5813ed50cbc6b280fb8d0bb7 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 13 Jun 2024 11:30:23 +0800
Subject: [PATCH 0250/1141] add documentation of column creation defaults

---
 mathesar/rpc/columns.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mathesar/rpc/columns.py b/mathesar/rpc/columns.py
index 6a74a6f329..6f198d8553 100644
--- a/mathesar/rpc/columns.py
+++ b/mathesar/rpc/columns.py
@@ -229,6 +229,10 @@ def add(
     """
     Add columns to a table.
 
+    There are defaults for both the name and type of a column, and so
+    passing `[{}]` for `column_data_list` would add a single column of
+    type `CHARACTER VARYING`, with an auto-generated name.
+
     Args:
         column_data_list: A list describing desired columns to add.
         table_oid: Identity of the table to which we'll add columns.

From 4c2758cb8eed7b23e272d8697b1714f01533252f Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 13 Jun 2024 18:23:34 +0800
Subject: [PATCH 0251/1141] move Database model to Connection

---
 mathesar/api/db/viewsets/databases.py         |  4 +-
 mathesar/api/dj_filters.py                    |  4 +-
 mathesar/api/serializers/databases.py         |  6 +-
 mathesar/api/serializers/schemas.py           |  4 +-
 mathesar/api/ui/permissions/database_role.py  |  4 +-
 mathesar/api/ui/permissions/schema_role.py    |  4 +-
 mathesar/api/ui/serializers/users.py          |  4 +-
 mathesar/api/ui/viewsets/databases.py         |  4 +-
 mathesar/install.py                           |  4 +-
 ...007_rename_database_connection_and_more.py | 34 +++++++++
 mathesar/models/base.py                       |  4 +-
 mathesar/models/users.py                      |  4 +-
 mathesar/rpc/utils.py                         | 12 ++--
 mathesar/state/django.py                      |  6 +-
 mathesar/tests/api/test_database_api.py       |  8 +--
 mathesar/tests/api/test_ui_filters_api.py     |  4 +-
 mathesar/tests/api/test_ui_types_api.py       |  6 +-
 mathesar/tests/api/test_user_api.py           | 38 +++++-----
 mathesar/tests/conftest.py                    |  6 +-
 mathesar/tests/database/test_types.py         |  4 +-
 mathesar/tests/test_models.py                 |  8 +--
 mathesar/tests/test_multi_db.py               |  6 +-
 mathesar/utils/connections.py                 | 72 +++++++++----------
 mathesar/utils/schemas.py                     |  4 +-
 mathesar/views.py                             |  8 +--
 25 files changed, 148 insertions(+), 114 deletions(-)
 create mode 100644 mathesar/migrations/0007_rename_database_connection_and_more.py

diff --git a/mathesar/api/db/viewsets/databases.py b/mathesar/api/db/viewsets/databases.py
index 95d4eccbef..b09b94b027 100644
--- a/mathesar/api/db/viewsets/databases.py
+++ b/mathesar/api/db/viewsets/databases.py
@@ -5,7 +5,7 @@
 from rest_framework.response import Response
 
 from mathesar.api.db.permissions.database import DatabaseAccessPolicy
-from mathesar.models.base import Database
+from mathesar.models.base import Connection
 from mathesar.api.dj_filters import DatabaseFilter
 from mathesar.api.pagination import DefaultLimitOffsetPagination
 
@@ -28,7 +28,7 @@ class ConnectionViewSet(AccessViewSetMixin, viewsets.ModelViewSet):
     def get_queryset(self):
         return self.access_policy.scope_queryset(
             self.request,
-            Database.objects.all().order_by('-created_at')
+            Connection.objects.all().order_by('-created_at')
         )
 
     def destroy(self, request, pk=None):
diff --git a/mathesar/api/dj_filters.py b/mathesar/api/dj_filters.py
index d72e9f67cd..e22d3ff03d 100644
--- a/mathesar/api/dj_filters.py
+++ b/mathesar/api/dj_filters.py
@@ -1,7 +1,7 @@
 from django_filters import BooleanFilter, DateTimeFromToRangeFilter, OrderingFilter
 from django_property_filter import PropertyFilterSet, PropertyBaseInFilter, PropertyCharFilter, PropertyOrderingFilter
 
-from mathesar.models.base import Schema, Table, Database, DataFile
+from mathesar.models.base import Schema, Table, Connection, DataFile
 from mathesar.models.query import UIQuery
 
 
@@ -19,7 +19,7 @@ class DatabaseFilter(PropertyFilterSet):
     )
 
     class Meta:
-        model = Database
+        model = Connection
         fields = ['deleted']
 
 
diff --git a/mathesar/api/serializers/databases.py b/mathesar/api/serializers/databases.py
index 7911b909e7..8a8ab575a7 100644
--- a/mathesar/api/serializers/databases.py
+++ b/mathesar/api/serializers/databases.py
@@ -3,7 +3,7 @@
 
 from mathesar.api.display_options import DISPLAY_OPTIONS_BY_UI_TYPE
 from mathesar.api.exceptions.mixins import MathesarErrorMessageMixin
-from mathesar.models.base import Database
+from mathesar.models.base import Connection
 
 
 class ConnectionSerializer(MathesarErrorMessageMixin, serializers.ModelSerializer):
@@ -12,7 +12,7 @@ class ConnectionSerializer(MathesarErrorMessageMixin, serializers.ModelSerialize
     database = serializers.CharField(source='db_name')
 
     class Meta:
-        model = Database
+        model = Connection
         fields = ['id', 'nickname', 'database', 'supported_types_url', 'username', 'password', 'host', 'port']
         read_only_fields = ['id', 'supported_types_url']
         extra_kwargs = {
@@ -20,7 +20,7 @@ class Meta:
         }
 
     def get_supported_types_url(self, obj):
-        if isinstance(obj, Database) and not self.partial:
+        if isinstance(obj, Connection) and not self.partial:
             # Only get records if we are serializing an existing table
             request = self.context['request']
             return request.build_absolute_uri(reverse('connection-types', kwargs={'pk': obj.pk}))
diff --git a/mathesar/api/serializers/schemas.py b/mathesar/api/serializers/schemas.py
index f345362ed5..9dbd752817 100644
--- a/mathesar/api/serializers/schemas.py
+++ b/mathesar/api/serializers/schemas.py
@@ -6,7 +6,7 @@
 from mathesar.api.db.permissions.table import TableAccessPolicy
 from mathesar.api.db.permissions.database import DatabaseAccessPolicy
 from mathesar.api.exceptions.mixins import MathesarErrorMessageMixin
-from mathesar.models.base import Database, Schema, Table
+from mathesar.models.base import Connection, Schema, Table
 from mathesar.api.exceptions.database_exceptions import (
     exceptions as database_api_exceptions
 )
@@ -19,7 +19,7 @@ class SchemaSerializer(MathesarErrorMessageMixin, serializers.HyperlinkedModelSe
     connection_id = PermittedPkRelatedField(
         source='database',
         access_policy=DatabaseAccessPolicy,
-        queryset=Database.current_objects.all()
+        queryset=Connection.current_objects.all()
     )
     description = serializers.CharField(
         required=False, allow_blank=True, default=None, allow_null=True
diff --git a/mathesar/api/ui/permissions/database_role.py b/mathesar/api/ui/permissions/database_role.py
index 1f75662001..20d0c2205c 100644
--- a/mathesar/api/ui/permissions/database_role.py
+++ b/mathesar/api/ui/permissions/database_role.py
@@ -1,7 +1,7 @@
 from django.db.models import Q
 from rest_access_policy import AccessPolicy
 
-from mathesar.models.base import Database
+from mathesar.models.base import Connection
 from mathesar.models.users import DatabaseRole, Role
 
 
@@ -32,7 +32,7 @@ def scope_queryset(cls, request, qs):
         if not (request.user.is_superuser or request.user.is_anonymous):
             # TODO Consider moving to more reusable place
             allowed_roles = (Role.MANAGER.value, Role.EDITOR.value, Role.VIEWER.value)
-            databases_with_view_access = Database.objects.filter(
+            databases_with_view_access = Connection.objects.filter(
                 Q(database_role__role__in=allowed_roles) & Q(database_role__user=request.user)
             )
             qs = qs.filter(database__in=databases_with_view_access)
diff --git a/mathesar/api/ui/permissions/schema_role.py b/mathesar/api/ui/permissions/schema_role.py
index a6d58521c7..5b6ef84d21 100644
--- a/mathesar/api/ui/permissions/schema_role.py
+++ b/mathesar/api/ui/permissions/schema_role.py
@@ -1,7 +1,7 @@
 from django.db.models import Q
 from rest_access_policy import AccessPolicy
 
-from mathesar.models.base import Database, Schema
+from mathesar.models.base import Connection, Schema
 from mathesar.models.users import DatabaseRole, Role, SchemaRole
 
 
@@ -27,7 +27,7 @@ class SchemaRoleAccessPolicy(AccessPolicy):
     def scope_queryset(cls, request, qs):
         if not (request.user.is_superuser or request.user.is_anonymous):
             allowed_roles = (Role.MANAGER.value, Role.EDITOR.value, Role.VIEWER.value)
-            databases_with_view_access = Database.objects.filter(
+            databases_with_view_access = Connection.objects.filter(
                 Q(database_role__role__in=allowed_roles) & Q(database_role__user=request.user)
             )
             schema_with_view_access = Schema.objects.filter(
diff --git a/mathesar/api/ui/serializers/users.py b/mathesar/api/ui/serializers/users.py
index 250cfa9005..d092ba9524 100644
--- a/mathesar/api/ui/serializers/users.py
+++ b/mathesar/api/ui/serializers/users.py
@@ -8,7 +8,7 @@
 from mathesar.api.exceptions.mixins import MathesarErrorMessageMixin
 from mathesar.api.exceptions.validation_exceptions.exceptions import IncorrectOldPassword
 from mathesar.api.ui.permissions.users import UserAccessPolicy
-from mathesar.models.base import Database, Schema
+from mathesar.models.base import Connection, Schema
 from mathesar.models.users import User, DatabaseRole, SchemaRole
 
 
@@ -107,7 +107,7 @@ class Meta:
     # Refer https://rsinger86.github.io/drf-access-policy/policy_reuse/ for the usage of `PermittedPkRelatedField`
     database = PermittedPkRelatedField(
         access_policy=DatabaseAccessPolicy,
-        queryset=Database.current_objects.all()
+        queryset=Connection.current_objects.all()
     )
 
 
diff --git a/mathesar/api/ui/viewsets/databases.py b/mathesar/api/ui/viewsets/databases.py
index 0bdc1770cb..b01f539849 100644
--- a/mathesar/api/ui/viewsets/databases.py
+++ b/mathesar/api/ui/viewsets/databases.py
@@ -7,7 +7,7 @@
 from rest_framework.response import Response
 
 from mathesar.api.ui.permissions.ui_database import UIDatabaseAccessPolicy
-from mathesar.models.base import Database
+from mathesar.models.base import Connection
 from mathesar.api.dj_filters import DatabaseFilter
 from mathesar.api.exceptions.validation_exceptions.exceptions import (
     DictHasBadKeys, UnsupportedInstallationDatabase
@@ -39,7 +39,7 @@ class ConnectionViewSet(
     def get_queryset(self):
         return self.access_policy.scope_queryset(
             self.request,
-            Database.objects.all().order_by('-created_at')
+            Connection.objects.all().order_by('-created_at')
         )
 
     @action(methods=['get'], detail=True)
diff --git a/mathesar/install.py b/mathesar/install.py
index 3efaa9bd00..5f4d5973a3 100644
--- a/mathesar/install.py
+++ b/mathesar/install.py
@@ -40,8 +40,8 @@ def main(skip_static_collection=False):
 
 
 def install_on_db_with_key(database_key, skip_confirm):
-    from mathesar.models.base import Database
-    db_model = Database.create_from_settings_key(database_key)
+    from mathesar.models.base import Connection
+    db_model = Connection.create_from_settings_key(database_key)
     db_model.save()
     try:
         install.install_mathesar(
diff --git a/mathesar/migrations/0007_rename_database_connection_and_more.py b/mathesar/migrations/0007_rename_database_connection_and_more.py
new file mode 100644
index 0000000000..d47e6768f1
--- /dev/null
+++ b/mathesar/migrations/0007_rename_database_connection_and_more.py
@@ -0,0 +1,34 @@
+# Generated by Django 4.2.11 on 2024-06-13 09:05
+
+from django.db import migrations, models
+import django.db.models.deletion
+import mathesar.models.base
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mathesar', '0006_mathesar_databases_to_model'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='Database',
+            new_name='Connection',
+        ),
+        migrations.AlterField(
+            model_name='databaserole',
+            name='database',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mathesar.connection'),
+        ),
+        migrations.AlterField(
+            model_name='schemarole',
+            name='schema',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mathesar.schema'),
+        ),
+        migrations.AlterField(
+            model_name='tablesettings',
+            name='column_order',
+            field=models.JSONField(blank=True, default=None, null=True, validators=[mathesar.models.base.validate_column_order]),
+        ),
+    ]
diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index 19685b065c..0e54d0fa2e 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -109,7 +109,7 @@ def __repr__(self):
 _engine_cache = {}
 
 
-class Database(ReflectionManagerMixin, BaseModel):
+class Connection(ReflectionManagerMixin, BaseModel):
     name = models.CharField(max_length=128, unique=True)
     db_name = models.CharField(max_length=128)
     username = EncryptedCharField(max_length=255)
@@ -178,7 +178,7 @@ def save(self, **kwargs):
 
 
 class Schema(DatabaseObject):
-    database = models.ForeignKey('Database', on_delete=models.CASCADE,
+    database = models.ForeignKey('Connection', on_delete=models.CASCADE,
                                  related_name='schemas')
 
     class Meta:
diff --git a/mathesar/models/users.py b/mathesar/models/users.py
index e1b77a8161..4db3748959 100644
--- a/mathesar/models/users.py
+++ b/mathesar/models/users.py
@@ -2,7 +2,7 @@
 from django.contrib.auth.models import AbstractUser
 from django.db import models
 
-from mathesar.models.base import BaseModel, Database, Schema
+from mathesar.models.base import BaseModel, Connection, Schema
 
 
 class User(AbstractUser):
@@ -29,7 +29,7 @@ class Role(models.TextChoices):
 
 class DatabaseRole(BaseModel):
     user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name='database_roles')
-    database = models.ForeignKey(Database, on_delete=models.CASCADE)
+    database = models.ForeignKey(Connection, on_delete=models.CASCADE)
     role = models.CharField(max_length=10, choices=Role.choices)
 
     class Meta:
diff --git a/mathesar/rpc/utils.py b/mathesar/rpc/utils.py
index 4ae3a0dc4e..7ab6ce44ef 100644
--- a/mathesar/rpc/utils.py
+++ b/mathesar/rpc/utils.py
@@ -1,14 +1,14 @@
 from mathesar.database.base import get_psycopg_connection
-from mathesar.models.base import Database
+from mathesar.models.base import Connection
 
 
-def connect(db_id, user):
+def connect(conn_id, user):
     """
-    Return a psycopg connection, given a Database model id.
+    Return a psycopg connection, given a Connection model id.
 
     Args:
-        db_id: The Django id corresponding to the Database.
+        conn_id: The Django id corresponding to the Connection.
     """
     print("User is: ", user)
-    db_model = Database.current_objects.get(id=db_id)
-    return get_psycopg_connection(db_model)
+    conn_model = Connection.current_objects.get(id=conn_id)
+    return get_psycopg_connection(conn_model)
diff --git a/mathesar/state/django.py b/mathesar/state/django.py
index a812a9ca93..e60a671fd5 100644
--- a/mathesar/state/django.py
+++ b/mathesar/state/django.py
@@ -32,7 +32,7 @@ def clear_dj_cache():
 
 
 def reflect_db_objects(metadata, db_name=None):
-    databases = models.Database.current_objects.all()
+    databases = models.Connection.current_objects.all()
     if db_name is not None:
         databases = databases.filter(name=db_name)
     sync_databases_status(databases)
@@ -53,7 +53,7 @@ def reflect_db_objects(metadata, db_name=None):
 
 
 def sync_databases_status(databases):
-    """Update status and check health for current Database Model instances."""
+    """Update status and check health for current Connection Model instances."""
     for db in databases:
         try:
             db._sa_engine.connect()
@@ -65,7 +65,7 @@ def sync_databases_status(databases):
 
 def _set_db_is_deleted(db, deleted):
     """
-    Assures that a Django Database model's `deleted` field is equal to the `deleted`
+    Assures that a Django Connection model's `deleted` field is equal to the `deleted`
     parameter, updating if necessary. Takes care to `save()` only when an update has been performed,
     to save on the noteworthy performance cost.
     """
diff --git a/mathesar/tests/api/test_database_api.py b/mathesar/tests/api/test_database_api.py
index e63b384bef..d8333b9708 100644
--- a/mathesar/tests/api/test_database_api.py
+++ b/mathesar/tests/api/test_database_api.py
@@ -5,7 +5,7 @@
 from db.metadata import get_empty_metadata
 from mathesar.models.users import DatabaseRole
 from mathesar.state.django import reflect_db_objects
-from mathesar.models.base import Table, Schema, Database
+from mathesar.models.base import Table, Schema, Connection
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 from db.install import install_mathesar
@@ -50,7 +50,7 @@ def test_db_name(worker_id):
 @pytest.fixture
 def db_dj_model(test_db_name):
     _recreate_db(test_db_name)
-    db = Database.objects.get_or_create(
+    db = Connection.objects.get_or_create(
         name=test_db_name,
         defaults={
             'db_name': test_db_name,
@@ -70,7 +70,7 @@ def test_database_reflection_delete(db_dj_model):
     assert db_dj_model.deleted is False  # check DB is not marked deleted inappropriately
     _remove_db(db_dj_model.name)
     reflect_db_objects(get_empty_metadata())
-    fresh_db_model = Database.objects.get(name=db_dj_model.name)
+    fresh_db_model = Connection.objects.get(name=db_dj_model.name)
     assert fresh_db_model.deleted is True  # check DB is marked deleted appropriately
 
 
@@ -166,7 +166,7 @@ def test_delete_dbconn_with_msar_schemas(client, db_dj_model):
         after_deletion = conn.execute(check_schema_exists)
 
     with pytest.raises(ObjectDoesNotExist):
-        Database.objects.get(id=db_dj_model.id)
+        Connection.objects.get(id=db_dj_model.id)
     assert response.status_code == 204
     assert before_deletion.rowcount == 3
     assert after_deletion.rowcount == 0
diff --git a/mathesar/tests/api/test_ui_filters_api.py b/mathesar/tests/api/test_ui_filters_api.py
index b0cba3519a..38e73e01ac 100644
--- a/mathesar/tests/api/test_ui_filters_api.py
+++ b/mathesar/tests/api/test_ui_filters_api.py
@@ -1,10 +1,10 @@
-from mathesar.models.base import Database
+from mathesar.models.base import Connection
 from mathesar.filters.base import get_available_filters
 from mathesar.models.users import DatabaseRole
 
 
 def test_filter_list(client, test_db_name):
-    database = Database.objects.get(name=test_db_name)
+    database = Connection.objects.get(name=test_db_name)
 
     response = client.get(f'/api/ui/v0/connections/{database.id}/filters/')
     response_data = response.json()
diff --git a/mathesar/tests/api/test_ui_types_api.py b/mathesar/tests/api/test_ui_types_api.py
index 6a33ebf8c1..74450168f5 100644
--- a/mathesar/tests/api/test_ui_types_api.py
+++ b/mathesar/tests/api/test_ui_types_api.py
@@ -1,12 +1,12 @@
 from mathesar.api.display_options import DISPLAY_OPTIONS_BY_UI_TYPE
-from mathesar.models.base import Database
+from mathesar.models.base import Connection
 from mathesar.database.types import get_ui_type_from_id, UIType
 from db.types.base import PostgresType, MathesarCustomType
 from mathesar.models.users import DatabaseRole
 
 
 def test_type_list(client, test_db_name):
-    database = Database.objects.get(name=test_db_name)
+    database = Connection.objects.get(name=test_db_name)
 
     response = client.get(f'/api/ui/v0/connections/{database.id}/types/')
     response_data = response.json()
@@ -62,7 +62,7 @@ def test_database_types_installed(client, test_db_name):
             'display_options': None
         },
     ]
-    default_database = Database.objects.get(name=test_db_name)
+    default_database = Connection.objects.get(name=test_db_name)
 
     response = client.get(f'/api/ui/v0/connections/{default_database.id}/types/')
     assert response.status_code == 200
diff --git a/mathesar/tests/api/test_user_api.py b/mathesar/tests/api/test_user_api.py
index d655022188..8687873ff6 100644
--- a/mathesar/tests/api/test_user_api.py
+++ b/mathesar/tests/api/test_user_api.py
@@ -1,7 +1,7 @@
 from django.db import transaction
 
 from db.schemas.utils import get_schema_oid_from_name
-from mathesar.models.base import Database, Schema
+from mathesar.models.base import Connection, Schema
 from mathesar.models.users import User, DatabaseRole, SchemaRole
 
 
@@ -253,7 +253,7 @@ def test_user_delete_different_user(client_bob, user_alice):
 
 def test_database_role_list_user_without_view_permission(client_bob, user_alice):
     role = 'manager'
-    database = Database.objects.all()[0]
+    database = Connection.objects.all()[0]
     DatabaseRole.objects.create(user=user_alice, database=database, role=role)
 
     response = client_bob.get('/api/ui/v0/database_roles/')
@@ -267,7 +267,7 @@ def test_db_role_list_with_roles_on_multiple_database(FUN_create_dj_db, client_b
     FUN_create_dj_db(get_uid())
     FUN_create_dj_db(get_uid())
     FUN_create_dj_db(get_uid())
-    databases = Database.objects.all()
+    databases = Connection.objects.all()
     database_with_viewer_access = databases[0]
     DatabaseRole.objects.create(user=user_bob, database=database_with_viewer_access, role='viewer')
     database_with_manager_access = databases[1]
@@ -280,7 +280,7 @@ def test_db_role_list_with_roles_on_multiple_database(FUN_create_dj_db, client_b
 
 def test_database_role_list_user_with_view_permission(client_bob, user_alice, user_bob):
     role = 'manager'
-    database = Database.objects.all()[0]
+    database = Connection.objects.all()[0]
     DatabaseRole.objects.create(user=user_alice, database=database, role=role)
     DatabaseRole.objects.create(user=user_bob, database=database, role=role)
 
@@ -293,7 +293,7 @@ def test_database_role_list_user_with_view_permission(client_bob, user_alice, us
 
 def test_database_role_list_superuser(client, user_bob):
     role = 'manager'
-    database = Database.objects.all()[0]
+    database = Connection.objects.all()[0]
     DatabaseRole.objects.create(user=user_bob, database=database, role=role)
 
     response = client.get('/api/ui/v0/database_roles/')
@@ -384,7 +384,7 @@ def test_schema_role_list_with_roles_on_multiple_database(
 
 def test_database_role_detail(client, user_bob):
     role = 'editor'
-    database = Database.objects.all()[0]
+    database = Connection.objects.all()[0]
     database_role = DatabaseRole.objects.create(user=user_bob, database=database, role=role)
 
     response = client.get(f'/api/ui/v0/database_roles/{database_role.id}/')
@@ -414,7 +414,7 @@ def test_schema_role_detail(client, user_bob):
 
 def test_database_role_update(client, user_bob):
     role = 'viewer'
-    database = Database.objects.all()[0]
+    database = Connection.objects.all()[0]
     database_role = DatabaseRole.objects.create(user=user_bob, database=database, role=role)
     data = {'user': user_bob.id, 'role': role, 'database': database.id}
 
@@ -440,7 +440,7 @@ def test_schema_role_update(client, user_bob):
 
 def test_database_role_partial_update(client, user_bob):
     role = 'viewer'
-    database = Database.objects.all()[0]
+    database = Connection.objects.all()[0]
     database_role = DatabaseRole.objects.create(user=user_bob, database=database, role=role)
     data = {'role': 'editor'}
 
@@ -466,7 +466,7 @@ def test_schema_role_partial_update(client, user_bob):
 
 def test_database_role_create_by_superuser(client, user_bob):
     role = 'editor'
-    database = Database.objects.all()[0]
+    database = Connection.objects.all()[0]
     data = {'user': user_bob.id, 'role': role, 'database': database.id}
 
     response = client.post('/api/ui/v0/database_roles/', data)
@@ -480,7 +480,7 @@ def test_database_role_create_by_superuser(client, user_bob):
 
 
 def test_database_role_create_by_manager(client_bob, user_bob, user_alice):
-    database = Database.objects.all()[0]
+    database = Connection.objects.all()[0]
     DatabaseRole.objects.create(user=user_bob, database=database, role='manager')
 
     role = 'viewer'
@@ -500,7 +500,7 @@ def test_db_role_create_with_roles_on_multiple_database(FUN_create_dj_db, client
     FUN_create_dj_db(get_uid())
     FUN_create_dj_db(get_uid())
     FUN_create_dj_db(get_uid())
-    databases = Database.objects.all()
+    databases = Connection.objects.all()
     database_with_viewer_access = databases[0]
     DatabaseRole.objects.create(user=user_bob, database=database_with_viewer_access, role='viewer')
     database_with_manager_access = databases[1]
@@ -516,7 +516,7 @@ def test_db_role_create_with_roles_on_multiple_database(FUN_create_dj_db, client
 
 def test_database_role_create_non_superuser(client_bob, user_bob):
     role = 'editor'
-    database = Database.objects.all()[0]
+    database = Connection.objects.all()[0]
     data = {'user': user_bob.id, 'role': role, 'database': database.id}
 
     response = client_bob.post('/api/ui/v0/database_roles/', data)
@@ -642,7 +642,7 @@ def test_schema_role_create_with_multiple_database(
 
 def test_database_role_create_with_incorrect_role(client, user_bob):
     role = 'nonsense'
-    database = Database.objects.all()[0]
+    database = Connection.objects.all()[0]
     data = {'user': user_bob.id, 'role': role, 'database': database.id}
 
     response = client.post('/api/ui/v0/database_roles/', data)
@@ -666,7 +666,7 @@ def test_schema_role_create_with_incorrect_role(client, user_bob):
 
 def test_database_role_create_with_incorrect_database(client, user_bob):
     role = 'editor'
-    database = Database.objects.order_by('-id')[0]
+    database = Connection.objects.order_by('-id')[0]
     data = {'user': user_bob.id, 'role': role, 'database': database.id + 1}
 
     response = client.post('/api/ui/v0/database_roles/', data)
@@ -690,7 +690,7 @@ def test_schema_role_create_with_incorrect_schema(client, user_bob):
 
 def test_database_role_destroy(client, user_bob):
     role = 'viewer'
-    database = Database.objects.all()[0]
+    database = Connection.objects.all()[0]
     database_role = DatabaseRole.objects.create(user=user_bob, database=database, role=role)
 
     response = client.delete(f'/api/ui/v0/database_roles/{database_role.id}/')
@@ -698,7 +698,7 @@ def test_database_role_destroy(client, user_bob):
 
 
 def test_database_role_destroy_by_manager(client_bob, user_bob, user_alice):
-    database = Database.objects.all()[0]
+    database = Connection.objects.all()[0]
     DatabaseRole.objects.create(user=user_bob, database=database, role='manager')
 
     role = 'viewer'
@@ -709,7 +709,7 @@ def test_database_role_destroy_by_manager(client_bob, user_bob, user_alice):
 
 
 def test_database_role_destroy_by_non_manager(client_bob, user_bob, user_alice):
-    database = Database.objects.all()[0]
+    database = Connection.objects.all()[0]
     DatabaseRole.objects.create(user=user_bob, database=database, role='viewer')
 
     role = 'viewer'
@@ -720,7 +720,7 @@ def test_database_role_destroy_by_non_manager(client_bob, user_bob, user_alice):
 
 
 def test_database_role_destroy_by_user_without_role(client_bob, user_alice):
-    database = Database.objects.all()[0]
+    database = Connection.objects.all()[0]
 
     role = 'viewer'
     database_role = DatabaseRole.objects.create(user=user_alice, database=database, role=role)
@@ -769,7 +769,7 @@ def test_schema_role_destroy_by_db_manager(client_bob, user_bob, user_alice):
 
 def test_database_role_create_multiple_roles_on_same_object(client, user_bob):
     role = 'manager'
-    database = Database.objects.all()[0]
+    database = Connection.objects.all()[0]
     DatabaseRole.objects.create(user=user_bob, database=database, role=role)
     data = {'user': user_bob.id, 'role': 'editor', 'database': database.id}
 
diff --git a/mathesar/tests/conftest.py b/mathesar/tests/conftest.py
index fdea559cae..80b75edfdf 100644
--- a/mathesar/tests/conftest.py
+++ b/mathesar/tests/conftest.py
@@ -22,7 +22,7 @@
 
 import mathesar.tests.conftest
 from mathesar.imports.base import create_table_from_data_file
-from mathesar.models.base import Schema, Table, Database, DataFile
+from mathesar.models.base import Schema, Table, Connection, DataFile
 from mathesar.models.base import Column as mathesar_model_column
 from mathesar.models.users import DatabaseRole, SchemaRole, User
 
@@ -102,7 +102,7 @@ def _create_and_add(db_name):
         create_db(db_name)
         add_db_to_dj_settings(db_name)
         credentials = settings.DATABASES.get(db_name)
-        database_model = Database.current_objects.create(
+        database_model = Connection.current_objects.create(
             name=db_name,
             db_name=db_name,
             username=credentials['USER'],
@@ -132,7 +132,7 @@ def test_db_model(request, test_db_name, django_db_blocker):
     add_db_to_dj_settings(test_db_name)
     with django_db_blocker.unblock():
         credentials = settings.DATABASES.get(test_db_name)
-        database_model = Database.current_objects.create(
+        database_model = Connection.current_objects.create(
             name=test_db_name,
             db_name=test_db_name,
             username=credentials['USER'],
diff --git a/mathesar/tests/database/test_types.py b/mathesar/tests/database/test_types.py
index be86bdc828..f60e5407f7 100644
--- a/mathesar/tests/database/test_types.py
+++ b/mathesar/tests/database/test_types.py
@@ -1,5 +1,5 @@
 from mathesar.database.types import UIType
-from mathesar.models.base import Database
+from mathesar.models.base import Connection
 from db.types.base import known_db_types
 
 
@@ -33,6 +33,6 @@ def _verify_type_mapping(supported_ui_types):
 
 
 def test_type_mapping():
-    databases = Database.objects.all()
+    databases = Connection.objects.all()
     for database in databases:
         _verify_type_mapping(database.supported_ui_types)
diff --git a/mathesar/tests/test_models.py b/mathesar/tests/test_models.py
index 127c4a0b08..d219c619a8 100644
--- a/mathesar/tests/test_models.py
+++ b/mathesar/tests/test_models.py
@@ -2,7 +2,7 @@
 from unittest.mock import patch
 from django.core.cache import cache
 
-from mathesar.models.base import Database, Schema, Table, schema_utils
+from mathesar.models.base import Connection, Schema, Table, schema_utils
 from mathesar.utils.models import attempt_dumb_query
 
 
@@ -50,14 +50,14 @@ def mock_name_getter(*_):
     assert name_ == 'MISSING'
 
 
-@pytest.mark.parametrize("model", [Database, Schema, Table])
+@pytest.mark.parametrize("model", [Connection, Schema, Table])
 def test_model_queryset_reflects_db_objects(model):
     with patch('mathesar.state.base.reflect_db_objects') as mock_reflect:
         model.objects.all()
     mock_reflect.assert_called()
 
 
-@pytest.mark.parametrize("model", [Database, Schema, Table])
+@pytest.mark.parametrize("model", [Connection, Schema, Table])
 def test_model_current_queryset_does_not_reflects_db_objects(model):
     with patch('mathesar.state.base.reflect_db_objects') as mock_reflect:
         model.current_objects.all()
@@ -78,5 +78,5 @@ def test_database_engine_cache_stability(FUN_create_dj_db, iteration, uid):
     del iteration  # An unused parameter
     some_db_name = uid
     FUN_create_dj_db(some_db_name)
-    db_model = Database.objects.get(name=some_db_name)
+    db_model = Connection.objects.get(name=some_db_name)
     attempt_dumb_query(db_model._sa_engine)
diff --git a/mathesar/tests/test_multi_db.py b/mathesar/tests/test_multi_db.py
index 79af7489f4..6c951a67a8 100644
--- a/mathesar/tests/test_multi_db.py
+++ b/mathesar/tests/test_multi_db.py
@@ -1,7 +1,7 @@
 import pytest
 from django.core.exceptions import ValidationError
 
-from mathesar.models.base import Table, Schema, Database
+from mathesar.models.base import Table, Schema, Connection
 
 
 @pytest.fixture(autouse=True)
@@ -66,7 +66,7 @@ def test_multi_db_oid_unique():
     """
     schema_oid = 5000
     table_oid = 5001
-    all_dbs = Database.objects.all()
+    all_dbs = Connection.objects.all()
     assert len(all_dbs) > 1
     for db in all_dbs:
         schema = Schema.objects.create(oid=schema_oid, database=db)
@@ -75,7 +75,7 @@ def test_multi_db_oid_unique():
 
 def test_single_db_oid_unique_exception():
     table_oid = 5001
-    dbs = Database.objects.all()
+    dbs = Connection.objects.all()
     assert len(dbs) > 0
     db = dbs[0]
     schema_1 = Schema.objects.create(oid=4000, database=db)
diff --git a/mathesar/utils/connections.py b/mathesar/utils/connections.py
index 507d95afc7..70a12ec541 100644
--- a/mathesar/utils/connections.py
+++ b/mathesar/utils/connections.py
@@ -1,7 +1,7 @@
 """Utilities to help with creating and managing connections in Mathesar."""
 from psycopg2.errors import DuplicateSchema
 from sqlalchemy.exc import OperationalError, ProgrammingError
-from mathesar.models.base import Database
+from mathesar.models.base import Connection
 from db import install, connection as dbconn
 from mathesar.state import reset_reflection
 from mathesar.examples.library_dataset import load_library_dataset
@@ -17,71 +17,71 @@ def copy_connection_from_preexisting(
         connection, nickname, db_name, create_db, sample_data
 ):
     if connection['connection_type'] == 'internal_database':
-        db_model = Database.create_from_settings_key('default')
+        conn_model = Connection.create_from_settings_key('default')
     elif connection['connection_type'] == 'user_database':
-        db_model = Database.current_objects.get(id=connection['id'])
-        db_model.id = None
+        conn_model = Connection.current_objects.get(id=connection['id'])
+        conn_model.id = None
     else:
         raise KeyError("connection_type")
-    root_db = db_model.db_name
+    root_db = conn_model.db_name
     return _save_and_install(
-        db_model, db_name, root_db, nickname, create_db, sample_data
+        conn_model, db_name, root_db, nickname, create_db, sample_data
     )
 
 
 def create_connection_from_scratch(
         user, password, host, port, nickname, db_name, sample_data
 ):
-    db_model = Database(username=user, password=password, host=host, port=port)
+    conn_model = Connection(username=user, password=password, host=host, port=port)
     root_db = db_name
     return _save_and_install(
-        db_model, db_name, root_db, nickname, False, sample_data
+        conn_model, db_name, root_db, nickname, False, sample_data
     )
 
 
 def create_connection_with_new_user(
         connection, user, password, nickname, db_name, create_db, sample_data
 ):
-    db_model = copy_connection_from_preexisting(
+    conn_model = copy_connection_from_preexisting(
         connection, nickname, db_name, create_db, []
     )
-    engine = db_model._sa_engine
-    db_model.username = user
-    db_model.password = password
-    db_model.save()
+    engine = conn_model._sa_engine
+    conn_model.username = user
+    conn_model.password = password
+    conn_model.save()
     dbconn.execute_msar_func_with_engine(
         engine,
         'create_basic_mathesar_user',
-        db_model.username,
-        db_model.password
+        conn_model.username,
+        conn_model.password
     )
-    _load_sample_data(db_model._sa_engine, sample_data)
-    return db_model
+    _load_sample_data(conn_model._sa_engine, sample_data)
+    return conn_model
 
 
 def _save_and_install(
-        db_model, db_name, root_db, nickname, create_db, sample_data
+        conn_model, db_name, root_db, nickname, create_db, sample_data
 ):
-    db_model.name = nickname
-    db_model.db_name = db_name
-    _validate_db_model(db_model)
-    db_model.save()
+    conn_model.name = nickname
+    conn_model.db_name = db_name
+    _validate_conn_model(conn_model)
+    conn_model.save()
     try:
         install.install_mathesar(
-            database_name=db_model.db_name,
-            username=db_model.username,
-            password=db_model.password,
-            hostname=db_model.host,
-            port=db_model.port,
+            database_name=conn_model.db_name,
+            username=conn_model.username,
+            password=conn_model.password,
+            hostname=conn_model.host,
+            port=conn_model.port,
             skip_confirm=True,
             create_db=create_db,
             root_db=root_db,
         )
     except OperationalError as e:
-        db_model.delete()
+        conn_model.delete()
         raise e
-    _load_sample_data(db_model._sa_engine, sample_data)
-    return db_model
+    _load_sample_data(conn_model._sa_engine, sample_data)
+    return conn_model
 
 
 def _load_sample_data(engine, sample_data):
@@ -100,13 +100,13 @@ def _load_sample_data(engine, sample_data):
     reset_reflection()
 
 
-def _validate_db_model(db_model):
-    internal_db_model = Database.create_from_settings_key('default')
+def _validate_conn_model(conn_model):
+    internal_conn_model = Connection.create_from_settings_key('default')
     if (
-            internal_db_model is not None
-            and db_model.host == internal_db_model.host
-            and db_model.port == internal_db_model.port
-            and db_model.db_name == internal_db_model.db_name
+            internal_conn_model is not None
+            and conn_model.host == internal_conn_model.host
+            and conn_model.port == internal_conn_model.port
+            and conn_model.db_name == internal_conn_model.db_name
     ):
         raise BadInstallationTarget(
             "Mathesar can't be installed in the internal DB namespace"
diff --git a/mathesar/utils/schemas.py b/mathesar/utils/schemas.py
index 1d12c0060b..985249b372 100644
--- a/mathesar/utils/schemas.py
+++ b/mathesar/utils/schemas.py
@@ -4,12 +4,12 @@
 from db.schemas.operations.create import create_schema
 from db.schemas.utils import get_schema_oid_from_name, get_mathesar_schemas
 from mathesar.database.base import create_mathesar_engine
-from mathesar.models.base import Schema, Database
+from mathesar.models.base import Schema, Connection
 
 
 def create_schema_and_object(name, connection_id, comment=None):
     try:
-        database_model = Database.objects.get(id=connection_id)
+        database_model = Connection.objects.get(id=connection_id)
         database_name = database_model.name
     except ObjectDoesNotExist:
         raise ValidationError({"database": f"Database '{database_name}' not found"})
diff --git a/mathesar/views.py b/mathesar/views.py
index 947c6241b0..26807d39d3 100644
--- a/mathesar/views.py
+++ b/mathesar/views.py
@@ -18,7 +18,7 @@
 from mathesar.api.ui.serializers.users import UserSerializer
 from mathesar.api.utils import is_valid_uuid_v4
 from mathesar.database.types import UIType
-from mathesar.models.base import Database, Schema, Table
+from mathesar.models.base import Connection, Schema, Table
 from mathesar.models.query import UIQuery
 from mathesar.models.shares import SharedTable, SharedQuery
 from mathesar.state import reset_reflection
@@ -45,11 +45,11 @@ def _get_permissible_db_queryset(request):
     SchemaAccessPolicy.
     """
     for deleted in (True, False):
-        dbs_qs = Database.objects.filter(deleted=deleted)
+        dbs_qs = Connection.objects.filter(deleted=deleted)
         permitted_dbs_qs = DatabaseAccessPolicy.scope_queryset(request, dbs_qs)
         schemas_qs = Schema.objects.all()
         permitted_schemas_qs = SchemaAccessPolicy.scope_queryset(request, schemas_qs)
-        dbs_containing_permitted_schemas_qs = Database.objects.filter(schemas__in=permitted_schemas_qs, deleted=deleted)
+        dbs_containing_permitted_schemas_qs = Connection.objects.filter(schemas__in=permitted_schemas_qs, deleted=deleted)
         permitted_dbs_qs = permitted_dbs_qs | dbs_containing_permitted_schemas_qs
         permitted_dbs_qs = permitted_dbs_qs.distinct()
         if deleted:
@@ -144,7 +144,7 @@ def get_base_data_all_routes(request, database=None, schema=None):
 
 
 def _get_internal_db_meta():
-    internal_db = Database.create_from_settings_key('default')
+    internal_db = Connection.create_from_settings_key('default')
     if internal_db is not None:
         return {
             'type': 'postgres',

From 1dde9ba8094b8f4392c48af86e13988bf6f12549 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 14 Jun 2024 02:53:44 +0530
Subject: [PATCH 0252/1141] setup scaffolding for table.import endpoint

---
 db/tables/operations/create.py | 22 ++++++++
 db/tables/operations/select.py |  8 +++
 docs/docs/api/rpc.md           |  1 +
 mathesar/imports/csv.py        | 92 ++++++++++++++++++++++++++++++++--
 mathesar/rpc/tables.py         |  7 +++
 5 files changed, 127 insertions(+), 3 deletions(-)

diff --git a/db/tables/operations/create.py b/db/tables/operations/create.py
index afbee8b32f..d93d4a7972 100644
--- a/db/tables/operations/create.py
+++ b/db/tables/operations/create.py
@@ -66,6 +66,7 @@ def create_table_on_database(
 
 
 # TODO stop relying on reflections, instead return oid of the created table.
+# TODO remove this function
 def create_string_column_table(name, schema_oid, column_names, engine, comment=None):
     """
     This method creates a Postgres table in the specified schema, with all
@@ -82,6 +83,27 @@ def create_string_column_table(name, schema_oid, column_names, engine, comment=N
     return table
 
 
+def prepare_table_for_import(table_name, schema_oid, column_names, conn, comment=None):
+    """
+    This method creates a Postgres table in the specified schema, with all
+    columns being String type.
+    """
+    columns_ = [
+        {
+            "name": column_name,
+            "type": {"name": PostgresType.TEXT.id}
+        } for column_name in column_names
+    ]
+    table_oid = create_table_on_database(
+        table_name=table_name,
+        schema_oid=schema_oid,
+        conn=conn,
+        column_data_list=columns_,
+        comment=comment
+    )
+    return table_oid
+
+
 class CreateTableAs(DDLElement):
     def __init__(self, name, selectable):
         self.name = name
diff --git a/db/tables/operations/select.py b/db/tables/operations/select.py
index e25ad3c976..69149ea469 100644
--- a/db/tables/operations/select.py
+++ b/db/tables/operations/select.py
@@ -59,6 +59,14 @@ def get_table_info(schema, conn):
     return exec_msar_func(conn, 'get_table_info', schema).fetchone()[0]
 
 
+def get_relation_name(table_oid, conn):
+    """
+    Return a fully qualified table name for a given table_oid
+    when table is not included in the search path.
+    """
+    return exec_msar_func(conn, 'get_relation_name_or_null', table_oid).fetchone()[0]
+
+
 def reflect_table(name, schema, engine, metadata, connection_to_use=None, keep_existing=False):
     extend_existing = not keep_existing
     autoload_with = engine if connection_to_use is None else connection_to_use
diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index c93d6e7db0..6bcbac6123 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -65,6 +65,7 @@ To use an RPC function:
       - add
       - delete
       - patch
+      - import_
       - TableInfo
       - SettableTableInfo
 
diff --git a/mathesar/imports/csv.py b/mathesar/imports/csv.py
index e1b45236c5..428634e92d 100644
--- a/mathesar/imports/csv.py
+++ b/mathesar/imports/csv.py
@@ -1,17 +1,20 @@
 from io import TextIOWrapper
-
+import tempfile
 import clevercsv as csv
+from psycopg import sql
 
 from db.tables.operations.alter import update_pk_sequence_to_latest
 from mathesar.database.base import create_mathesar_engine
 from db.records.operations.insert import insert_records_from_csv
-from db.tables.operations.create import create_string_column_table
+from db.tables.operations.create import create_string_column_table, prepare_table_for_import
 from db.tables.operations.drop import drop_table
+from db.tables.operations.select import get_relation_name
 from mathesar.errors import InvalidTableError
 from mathesar.imports.utils import get_alternate_column_names, process_column_names
 from db.constants import COLUMN_NAME_TEMPLATE
 from psycopg2.errors import IntegrityError, DataError
-
+from mathesar.models.base import DataFile
+from db.encoding_utils import get_sql_compatible_encoding
 from mathesar.state import reset_reflection
 
 # The user-facing documentation replicates these delimiter characters. If you
@@ -161,3 +164,86 @@ def create_db_table_from_csv_data_file(data_file, name, schema, comment=None):
         table = insert_records_from_csv_data_file(name, schema, column_names_alt, engine, comment, data_file)
     reset_reflection(db_name=db_model.name)
     return table
+
+
+def insert_csv(data_file_id, table_name, schema_oid, conn, comment=None):
+    data_file = DataFile.current_objects.get(id=data_file_id)
+    file_path = data_file.file.path
+    header = data_file.header
+    dialect = csv.dialect.SimpleDialect(
+        data_file.delimiter,
+        data_file.quotechar,
+        data_file.escapechar
+    )
+    encoding = get_file_encoding(data_file.file)
+    with open(file_path, 'rb', encoding=encoding) as csv_file:
+        csv_reader = get_sv_reader(csv_file, header, dialect)
+        column_names = process_column_names(csv_reader.fieldnames)
+        table_oid = prepare_table_for_import(
+            table_name,
+            schema_oid,
+            column_names,
+            conn,
+            comment
+        )
+        insert_csv_records(
+            table_oid,
+            conn,
+            csv_file,
+            column_names,
+            header,
+            dialect.delimiter,
+            dialect.escapechar,
+            dialect.quotechar,
+            encoding
+        )
+
+
+def insert_csv_records(
+    table_oid,
+    conn,
+    csv_file,
+    column_names,
+    header,
+    delimiter=None,
+    escape=None,
+    quote=None,
+    encoding=None
+):
+    conversion_encoding, sql_encoding = get_sql_compatible_encoding(encoding)
+    fq_table_name = sql.SQL(get_relation_name(table_oid, conn))
+    formatted_columns = sql.SQL(",").join(
+        sql.Identifier(column_name) for column_name in column_names
+    )
+    copy_sql = sql.SQL(
+        f"COPY {fq_table_name} ({formatted_columns}) FROM STDIN CSV {header} {delimiter} {escape} {quote} {encoding}"
+    ).format(
+        fq_table_name=fq_table_name,
+        formatted_columns=formatted_columns,
+        header=sql.SQL("HEADER" if header else ""),
+        delimiter=sql.SQL(f"DELIMITER E'{delimiter}'" if delimiter else ""),
+        escape=sql.SQL(f"ESCAPE '{escape}'" if escape else ""),
+        quote=sql.SQL(
+            ("QUOTE ''''" if quote == "'" else f"QUOTE '{quote}'")
+            if quote
+            else ""
+        ),
+        encoding=sql.SQL(f"ENCODING '{sql_encoding}'" if sql_encoding else ""),
+    )
+    cursor = conn.connection.cursor()
+    if conversion_encoding == encoding:
+        with cursor.copy(copy_sql) as copy:
+            if data := csv_file.read():
+                copy.write(data)
+    else:
+        # File needs to be converted to compatible database supported encoding
+        with tempfile.SpooledTemporaryFile(mode='wb+', encoding=conversion_encoding) as temp_file:
+            while True:
+                contents = csv_file.read(SAMPLE_SIZE).encode(conversion_encoding, "replace")
+                if not contents:
+                    break
+                temp_file.write(contents)
+            temp_file.seek(0)
+            with cursor.copy(copy_sql) as copy:
+                if data := temp_file.read():
+                    copy.write(data)
diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index 6a5ceaadac..931a89dac1 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -169,3 +169,10 @@ def patch(
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
         return alter_table_on_database(table_oid, table_data_dict, conn)
+
+
+@rpc_method(name="tables.import")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def import_():
+    pass

From c4ee70c9745e758a3655d70dd996d5476fe0ca06 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 14 Jun 2024 02:56:30 +0530
Subject: [PATCH 0253/1141] fix inaccurate docstring

---
 db/sql/00_msar.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index a6ee233ad2..c6693b00a6 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1128,7 +1128,7 @@ $$ LANGUAGE SQL;
 -- Alter table -------------------------------------------------------------------------------------
 CREATE OR REPLACE FUNCTION
 msar.alter_table(tab_id oid, tab_alters jsonb) RETURNS text AS $$/*
-Alter columns of the given table in bulk, returning the IDs of the columns so altered.
+Alter the name, description, or columns of a table, returning name of the altered table.
 
 Args:
   tab_id: The OID of the table whose columns we'll alter.

From 4c41397b34b9a5ab81597f1088c7a6684b3d0145 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 14 Jun 2024 03:24:39 +0530
Subject: [PATCH 0254/1141] some reorganization

---
 mathesar/imports/csv.py | 91 +----------------------------------------
 mathesar/rpc/tables.py  |  9 +++-
 2 files changed, 9 insertions(+), 91 deletions(-)

diff --git a/mathesar/imports/csv.py b/mathesar/imports/csv.py
index 428634e92d..93478b8357 100644
--- a/mathesar/imports/csv.py
+++ b/mathesar/imports/csv.py
@@ -1,20 +1,16 @@
 from io import TextIOWrapper
-import tempfile
+
 import clevercsv as csv
-from psycopg import sql
 
 from db.tables.operations.alter import update_pk_sequence_to_latest
 from mathesar.database.base import create_mathesar_engine
 from db.records.operations.insert import insert_records_from_csv
-from db.tables.operations.create import create_string_column_table, prepare_table_for_import
+from db.tables.operations.create import create_string_column_table
 from db.tables.operations.drop import drop_table
-from db.tables.operations.select import get_relation_name
 from mathesar.errors import InvalidTableError
 from mathesar.imports.utils import get_alternate_column_names, process_column_names
 from db.constants import COLUMN_NAME_TEMPLATE
 from psycopg2.errors import IntegrityError, DataError
-from mathesar.models.base import DataFile
-from db.encoding_utils import get_sql_compatible_encoding
 from mathesar.state import reset_reflection
 
 # The user-facing documentation replicates these delimiter characters. If you
@@ -164,86 +160,3 @@ def create_db_table_from_csv_data_file(data_file, name, schema, comment=None):
         table = insert_records_from_csv_data_file(name, schema, column_names_alt, engine, comment, data_file)
     reset_reflection(db_name=db_model.name)
     return table
-
-
-def insert_csv(data_file_id, table_name, schema_oid, conn, comment=None):
-    data_file = DataFile.current_objects.get(id=data_file_id)
-    file_path = data_file.file.path
-    header = data_file.header
-    dialect = csv.dialect.SimpleDialect(
-        data_file.delimiter,
-        data_file.quotechar,
-        data_file.escapechar
-    )
-    encoding = get_file_encoding(data_file.file)
-    with open(file_path, 'rb', encoding=encoding) as csv_file:
-        csv_reader = get_sv_reader(csv_file, header, dialect)
-        column_names = process_column_names(csv_reader.fieldnames)
-        table_oid = prepare_table_for_import(
-            table_name,
-            schema_oid,
-            column_names,
-            conn,
-            comment
-        )
-        insert_csv_records(
-            table_oid,
-            conn,
-            csv_file,
-            column_names,
-            header,
-            dialect.delimiter,
-            dialect.escapechar,
-            dialect.quotechar,
-            encoding
-        )
-
-
-def insert_csv_records(
-    table_oid,
-    conn,
-    csv_file,
-    column_names,
-    header,
-    delimiter=None,
-    escape=None,
-    quote=None,
-    encoding=None
-):
-    conversion_encoding, sql_encoding = get_sql_compatible_encoding(encoding)
-    fq_table_name = sql.SQL(get_relation_name(table_oid, conn))
-    formatted_columns = sql.SQL(",").join(
-        sql.Identifier(column_name) for column_name in column_names
-    )
-    copy_sql = sql.SQL(
-        f"COPY {fq_table_name} ({formatted_columns}) FROM STDIN CSV {header} {delimiter} {escape} {quote} {encoding}"
-    ).format(
-        fq_table_name=fq_table_name,
-        formatted_columns=formatted_columns,
-        header=sql.SQL("HEADER" if header else ""),
-        delimiter=sql.SQL(f"DELIMITER E'{delimiter}'" if delimiter else ""),
-        escape=sql.SQL(f"ESCAPE '{escape}'" if escape else ""),
-        quote=sql.SQL(
-            ("QUOTE ''''" if quote == "'" else f"QUOTE '{quote}'")
-            if quote
-            else ""
-        ),
-        encoding=sql.SQL(f"ENCODING '{sql_encoding}'" if sql_encoding else ""),
-    )
-    cursor = conn.connection.cursor()
-    if conversion_encoding == encoding:
-        with cursor.copy(copy_sql) as copy:
-            if data := csv_file.read():
-                copy.write(data)
-    else:
-        # File needs to be converted to compatible database supported encoding
-        with tempfile.SpooledTemporaryFile(mode='wb+', encoding=conversion_encoding) as temp_file:
-            while True:
-                contents = csv_file.read(SAMPLE_SIZE).encode(conversion_encoding, "replace")
-                if not contents:
-                    break
-                temp_file.write(contents)
-            temp_file.seek(0)
-            with cursor.copy(copy_sql) as copy:
-                if data := temp_file.read():
-                    copy.write(data)
diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index 931a89dac1..783e3262e4 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -7,6 +7,7 @@
 from db.tables.operations.drop import drop_table_from_database
 from db.tables.operations.create import create_table_on_database
 from db.tables.operations.alter import alter_table_on_database
+from db.tables.operations.import_ import import_csv
 from mathesar.rpc.columns import CreateableColumnInfo, SettableColumnInfo
 from mathesar.rpc.constraints import CreateableConstraintInfo
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
@@ -174,5 +175,9 @@ def patch(
 @rpc_method(name="tables.import")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def import_():
-    pass
+def import_(
+    *, data_file_id: int, table_name: str, schema_oid: int, database_id: int, comment=None, **kwargs
+) -> int:
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        return import_csv(data_file_id, table_name, schema_oid, conn, comment)

From 401aed3ab5441a93a482c94cdb047418628a8748 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 14 Jun 2024 17:29:53 +0800
Subject: [PATCH 0255/1141] move old models to deprecated namespace

---
 mathesar/admin.py                             |  2 +-
 mathesar/api/db/viewsets/columns.py           |  2 +-
 mathesar/api/db/viewsets/constraints.py       |  2 +-
 mathesar/api/db/viewsets/data_files.py        |  2 +-
 mathesar/api/db/viewsets/databases.py         |  2 +-
 mathesar/api/db/viewsets/records.py           |  2 +-
 mathesar/api/db/viewsets/schemas.py           |  2 +-
 mathesar/api/db/viewsets/table_settings.py    |  2 +-
 mathesar/api/db/viewsets/tables.py            |  2 +-
 mathesar/api/dj_filters.py                    |  2 +-
 .../database_exceptions/exceptions.py         |  2 +-
 mathesar/api/pagination.py                    |  2 +-
 mathesar/api/serializers/columns.py           |  2 +-
 mathesar/api/serializers/constraints.py       |  2 +-
 mathesar/api/serializers/data_files.py        |  2 +-
 mathesar/api/serializers/databases.py         |  2 +-
 mathesar/api/serializers/dependents.py        |  2 +-
 mathesar/api/serializers/links.py             |  2 +-
 mathesar/api/serializers/queries.py           |  2 +-
 mathesar/api/serializers/records.py           |  2 +-
 mathesar/api/serializers/schemas.py           |  2 +-
 mathesar/api/serializers/table_settings.py    |  2 +-
 mathesar/api/serializers/tables.py            |  2 +-
 mathesar/api/ui/permissions/database_role.py  |  2 +-
 mathesar/api/ui/permissions/schema_role.py    |  2 +-
 mathesar/api/ui/serializers/users.py          |  2 +-
 mathesar/api/ui/viewsets/databases.py         |  2 +-
 mathesar/api/ui/viewsets/records.py           |  2 +-
 mathesar/api/utils.py                         |  2 +-
 mathesar/imports/base.py                      |  2 +-
 mathesar/install.py                           |  2 +-
 mathesar/migrations/0005_release_0_1_4.py     |  4 +-
 ...007_rename_database_connection_and_more.py |  4 +-
 mathesar/models/{base.py => deprecated.py}    |  0
 mathesar/models/query.py                      |  2 +-
 mathesar/models/shares.py                     |  2 +-
 mathesar/models/users.py                      |  2 +-
 mathesar/rpc/utils.py                         |  2 +-
 mathesar/signals.py                           |  2 +-
 mathesar/state/django.py                      | 50 +++++++++----------
 mathesar/tests/api/conftest.py                |  2 +-
 mathesar/tests/api/query/test_query_run.py    |  2 +-
 .../api/test_column_api_display_options.py    |  2 +-
 mathesar/tests/api/test_constraint_api.py     |  2 +-
 mathesar/tests/api/test_data_file_api.py      |  2 +-
 mathesar/tests/api/test_database_api.py       |  2 +-
 mathesar/tests/api/test_links.py              |  2 +-
 mathesar/tests/api/test_long_identifiers.py   |  2 +-
 mathesar/tests/api/test_record_api.py         |  6 +--
 mathesar/tests/api/test_schema_api.py         |  2 +-
 mathesar/tests/api/test_table_api.py          |  2 +-
 mathesar/tests/api/test_table_settings_api.py |  8 +--
 mathesar/tests/api/test_ui_filters_api.py     |  2 +-
 mathesar/tests/api/test_ui_types_api.py       |  2 +-
 mathesar/tests/api/test_user_api.py           |  2 +-
 mathesar/tests/conftest.py                    |  4 +-
 mathesar/tests/database/test_types.py         |  2 +-
 .../display_options_inference/test_money.py   |  2 +-
 mathesar/tests/imports/test_csv.py            |  2 +-
 mathesar/tests/imports/test_excel.py          |  2 +-
 mathesar/tests/imports/test_json.py           |  2 +-
 mathesar/tests/test_models.py                 |  2 +-
 mathesar/tests/test_multi_db.py               |  2 +-
 mathesar/utils/columns.py                     |  2 +-
 mathesar/utils/connections.py                 |  2 +-
 mathesar/utils/datafiles.py                   |  2 +-
 mathesar/utils/joins.py                       |  2 +-
 mathesar/utils/preview.py                     |  2 +-
 mathesar/utils/schemas.py                     |  2 +-
 mathesar/utils/tables.py                      |  2 +-
 mathesar/views.py                             |  2 +-
 71 files changed, 102 insertions(+), 102 deletions(-)
 rename mathesar/models/{base.py => deprecated.py} (100%)

diff --git a/mathesar/admin.py b/mathesar/admin.py
index 213b0595e2..6eca4ac3d5 100644
--- a/mathesar/admin.py
+++ b/mathesar/admin.py
@@ -1,7 +1,7 @@
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
 
-from mathesar.models.base import Table, Schema, DataFile
+from mathesar.models.deprecated import Table, Schema, DataFile
 from mathesar.models.users import User
 from mathesar.models.query import UIQuery
 from mathesar.models.shares import SharedTable, SharedQuery
diff --git a/mathesar/api/db/viewsets/columns.py b/mathesar/api/db/viewsets/columns.py
index cd535b76e4..6e6b2b76af 100644
--- a/mathesar/api/db/viewsets/columns.py
+++ b/mathesar/api/db/viewsets/columns.py
@@ -20,7 +20,7 @@
 from mathesar.api.pagination import DefaultLimitOffsetPagination
 from mathesar.api.serializers.columns import ColumnSerializer
 from mathesar.api.utils import get_table_or_404
-from mathesar.models.base import Column
+from mathesar.models.deprecated import Column
 
 
 class ColumnViewSet(AccessViewSetMixin, viewsets.ModelViewSet):
diff --git a/mathesar/api/db/viewsets/constraints.py b/mathesar/api/db/viewsets/constraints.py
index f276ae8af4..9e4aece735 100644
--- a/mathesar/api/db/viewsets/constraints.py
+++ b/mathesar/api/db/viewsets/constraints.py
@@ -12,7 +12,7 @@
 from mathesar.api.pagination import DefaultLimitOffsetPagination
 from mathesar.api.serializers.constraints import ConstraintSerializer
 from mathesar.api.utils import get_table_or_404
-from mathesar.models.base import Constraint
+from mathesar.models.deprecated import Constraint
 
 
 class ConstraintViewSet(AccessViewSetMixin, ListModelMixin, RetrieveModelMixin, CreateModelMixin, viewsets.GenericViewSet):
diff --git a/mathesar/api/db/viewsets/data_files.py b/mathesar/api/db/viewsets/data_files.py
index fc20278de3..4c3eb1a29f 100644
--- a/mathesar/api/db/viewsets/data_files.py
+++ b/mathesar/api/db/viewsets/data_files.py
@@ -10,7 +10,7 @@
 import mathesar.api.exceptions.generic_exceptions.base_exceptions as base_api_exceptions
 from mathesar.api.exceptions.error_codes import ErrorCodes
 from mathesar.errors import InvalidTableError
-from mathesar.models.base import DataFile
+from mathesar.models.deprecated import DataFile
 from mathesar.api.pagination import DefaultLimitOffsetPagination
 from mathesar.api.serializers.data_files import DataFileSerializer
 from mathesar.utils.datafiles import create_datafile
diff --git a/mathesar/api/db/viewsets/databases.py b/mathesar/api/db/viewsets/databases.py
index b09b94b027..0edac6828e 100644
--- a/mathesar/api/db/viewsets/databases.py
+++ b/mathesar/api/db/viewsets/databases.py
@@ -5,7 +5,7 @@
 from rest_framework.response import Response
 
 from mathesar.api.db.permissions.database import DatabaseAccessPolicy
-from mathesar.models.base import Connection
+from mathesar.models.deprecated import Connection
 from mathesar.api.dj_filters import DatabaseFilter
 from mathesar.api.pagination import DefaultLimitOffsetPagination
 
diff --git a/mathesar/api/db/viewsets/records.py b/mathesar/api/db/viewsets/records.py
index 4e14a6df83..b28782371f 100644
--- a/mathesar/api/db/viewsets/records.py
+++ b/mathesar/api/db/viewsets/records.py
@@ -22,7 +22,7 @@
 from mathesar.api.serializers.records import RecordListParameterSerializer, RecordSerializer
 from mathesar.api.utils import get_table_or_404
 from mathesar.functions.operations.convert import rewrite_db_function_spec_column_ids_to_names
-from mathesar.models.base import Table
+from mathesar.models.deprecated import Table
 from mathesar.utils.json import MathesarJSONRenderer
 
 
diff --git a/mathesar/api/db/viewsets/schemas.py b/mathesar/api/db/viewsets/schemas.py
index fb7dc64f24..153c081198 100644
--- a/mathesar/api/db/viewsets/schemas.py
+++ b/mathesar/api/db/viewsets/schemas.py
@@ -10,7 +10,7 @@
 from mathesar.api.pagination import DefaultLimitOffsetPagination
 from mathesar.api.serializers.dependents import DependentSerializer, DependentFilterSerializer
 from mathesar.api.serializers.schemas import SchemaSerializer
-from mathesar.models.base import Schema
+from mathesar.models.deprecated import Schema
 from mathesar.utils.schemas import create_schema_and_object
 from mathesar.api.exceptions.validation_exceptions.exceptions import EditingPublicSchemaIsDisallowed
 
diff --git a/mathesar/api/db/viewsets/table_settings.py b/mathesar/api/db/viewsets/table_settings.py
index cb2b525f65..62690e0ad0 100644
--- a/mathesar/api/db/viewsets/table_settings.py
+++ b/mathesar/api/db/viewsets/table_settings.py
@@ -5,7 +5,7 @@
 from mathesar.api.pagination import DefaultLimitOffsetPagination
 from mathesar.api.serializers.table_settings import TableSettingsSerializer
 from mathesar.api.utils import get_table_or_404
-from mathesar.models.base import TableSettings
+from mathesar.models.deprecated import TableSettings
 
 
 class TableSettingsViewSet(AccessViewSetMixin, ModelViewSet):
diff --git a/mathesar/api/db/viewsets/tables.py b/mathesar/api/db/viewsets/tables.py
index 635ab234d4..6bb4a533f6 100644
--- a/mathesar/api/db/viewsets/tables.py
+++ b/mathesar/api/db/viewsets/tables.py
@@ -28,7 +28,7 @@
     TableImportSerializer,
     MoveTableRequestSerializer
 )
-from mathesar.models.base import Table
+from mathesar.models.deprecated import Table
 from mathesar.utils.tables import get_table_column_types
 from mathesar.utils.joins import get_processed_joinable_tables
 
diff --git a/mathesar/api/dj_filters.py b/mathesar/api/dj_filters.py
index e22d3ff03d..bb850f8ebb 100644
--- a/mathesar/api/dj_filters.py
+++ b/mathesar/api/dj_filters.py
@@ -1,7 +1,7 @@
 from django_filters import BooleanFilter, DateTimeFromToRangeFilter, OrderingFilter
 from django_property_filter import PropertyFilterSet, PropertyBaseInFilter, PropertyCharFilter, PropertyOrderingFilter
 
-from mathesar.models.base import Schema, Table, Connection, DataFile
+from mathesar.models.deprecated import Schema, Table, Connection, DataFile
 from mathesar.models.query import UIQuery
 
 
diff --git a/mathesar/api/exceptions/database_exceptions/exceptions.py b/mathesar/api/exceptions/database_exceptions/exceptions.py
index a74727b764..f9e7d3c089 100644
--- a/mathesar/api/exceptions/database_exceptions/exceptions.py
+++ b/mathesar/api/exceptions/database_exceptions/exceptions.py
@@ -13,7 +13,7 @@
     MathesarAPIException,
     get_default_exception_detail,
 )
-from mathesar.models.base import Column, Constraint
+from mathesar.models.deprecated import Column, Constraint
 from mathesar.state import get_cached_metadata
 
 
diff --git a/mathesar/api/pagination.py b/mathesar/api/pagination.py
index 3a730c1832..ce0f137b57 100644
--- a/mathesar/api/pagination.py
+++ b/mathesar/api/pagination.py
@@ -5,7 +5,7 @@
 
 from db.records.operations.group import GroupBy
 from mathesar.api.utils import get_table_or_404, process_annotated_records
-from mathesar.models.base import Column, Table
+from mathesar.models.deprecated import Column, Table
 from mathesar.models.query import UIQuery
 from mathesar.utils.preview import get_preview_info
 
diff --git a/mathesar/api/serializers/columns.py b/mathesar/api/serializers/columns.py
index 338d3c166e..3abaa7e1b1 100644
--- a/mathesar/api/serializers/columns.py
+++ b/mathesar/api/serializers/columns.py
@@ -17,7 +17,7 @@
     DisplayOptionsMappingSerializer,
     DISPLAY_OPTIONS_SERIALIZER_MAPPING_KEY,
 )
-from mathesar.models.base import Column
+from mathesar.models.deprecated import Column
 
 
 class InputValueField(serializers.CharField):
diff --git a/mathesar/api/serializers/constraints.py b/mathesar/api/serializers/constraints.py
index 0dc9b8cde8..15401f170b 100644
--- a/mathesar/api/serializers/constraints.py
+++ b/mathesar/api/serializers/constraints.py
@@ -14,7 +14,7 @@
     MathesarPolymorphicErrorMixin,
     ReadWritePolymorphicSerializerMappingMixin,
 )
-from mathesar.models.base import Column, Constraint, Table
+from mathesar.models.deprecated import Column, Constraint, Table
 
 
 class TableFilteredPrimaryKeyRelatedField(serializers.PrimaryKeyRelatedField):
diff --git a/mathesar/api/serializers/data_files.py b/mathesar/api/serializers/data_files.py
index 2c684b0776..89cf7f9907 100644
--- a/mathesar/api/serializers/data_files.py
+++ b/mathesar/api/serializers/data_files.py
@@ -5,7 +5,7 @@
 
 from mathesar.api.exceptions.mixins import MathesarErrorMessageMixin
 from mathesar.errors import URLNotReachable, URLInvalidContentTypeError
-from mathesar.models.base import DataFile
+from mathesar.models.deprecated import DataFile
 
 SUPPORTED_URL_CONTENT_TYPES = {'text/csv', 'text/plain'}
 
diff --git a/mathesar/api/serializers/databases.py b/mathesar/api/serializers/databases.py
index 8a8ab575a7..4ddb3e76e4 100644
--- a/mathesar/api/serializers/databases.py
+++ b/mathesar/api/serializers/databases.py
@@ -3,7 +3,7 @@
 
 from mathesar.api.display_options import DISPLAY_OPTIONS_BY_UI_TYPE
 from mathesar.api.exceptions.mixins import MathesarErrorMessageMixin
-from mathesar.models.base import Connection
+from mathesar.models.deprecated import Connection
 
 
 class ConnectionSerializer(MathesarErrorMessageMixin, serializers.ModelSerializer):
diff --git a/mathesar/api/serializers/dependents.py b/mathesar/api/serializers/dependents.py
index 2cf5c7b792..1b7751793b 100644
--- a/mathesar/api/serializers/dependents.py
+++ b/mathesar/api/serializers/dependents.py
@@ -1,7 +1,7 @@
 from mathesar.api.serializers.shared_serializers import MathesarPolymorphicErrorMixin, ReadOnlyPolymorphicSerializerMappingMixin
 from rest_framework import serializers
 
-from mathesar.models.base import Constraint, Schema, Table
+from mathesar.models.deprecated import Constraint, Schema, Table
 
 
 DATABASE_OBJECT_TYPES = [
diff --git a/mathesar/api/serializers/links.py b/mathesar/api/serializers/links.py
index 32156aa41e..fe36bf7326 100644
--- a/mathesar/api/serializers/links.py
+++ b/mathesar/api/serializers/links.py
@@ -11,7 +11,7 @@
     MathesarPolymorphicErrorMixin,
     ReadWritePolymorphicSerializerMappingMixin,
 )
-from mathesar.models.base import Table
+from mathesar.models.deprecated import Table
 from mathesar.state import reset_reflection
 
 
diff --git a/mathesar/api/serializers/queries.py b/mathesar/api/serializers/queries.py
index 1eeb705ffc..2e4187d6b0 100644
--- a/mathesar/api/serializers/queries.py
+++ b/mathesar/api/serializers/queries.py
@@ -8,7 +8,7 @@
 from mathesar.api.db.permissions.query_table import QueryTableAccessPolicy
 from mathesar.api.exceptions.mixins import MathesarErrorMessageMixin
 from mathesar.api.exceptions.validation_exceptions.exceptions import DuplicateUIQueryInSchemaAPIException
-from mathesar.models.base import Table
+from mathesar.models.deprecated import Table
 from mathesar.models.query import UIQuery
 
 
diff --git a/mathesar/api/serializers/records.py b/mathesar/api/serializers/records.py
index 9367c5dff4..506b277c9c 100644
--- a/mathesar/api/serializers/records.py
+++ b/mathesar/api/serializers/records.py
@@ -6,7 +6,7 @@
 
 import mathesar.api.exceptions.database_exceptions.exceptions as database_api_exceptions
 from mathesar.api.exceptions.mixins import MathesarErrorMessageMixin
-from mathesar.models.base import Column
+from mathesar.models.deprecated import Column
 from mathesar.api.utils import follows_json_number_spec
 from mathesar.database.types import UIType
 
diff --git a/mathesar/api/serializers/schemas.py b/mathesar/api/serializers/schemas.py
index 9dbd752817..5bdf290285 100644
--- a/mathesar/api/serializers/schemas.py
+++ b/mathesar/api/serializers/schemas.py
@@ -6,7 +6,7 @@
 from mathesar.api.db.permissions.table import TableAccessPolicy
 from mathesar.api.db.permissions.database import DatabaseAccessPolicy
 from mathesar.api.exceptions.mixins import MathesarErrorMessageMixin
-from mathesar.models.base import Connection, Schema, Table
+from mathesar.models.deprecated import Connection, Schema, Table
 from mathesar.api.exceptions.database_exceptions import (
     exceptions as database_api_exceptions
 )
diff --git a/mathesar/api/serializers/table_settings.py b/mathesar/api/serializers/table_settings.py
index 576fb0c569..d0b7ddc6e4 100644
--- a/mathesar/api/serializers/table_settings.py
+++ b/mathesar/api/serializers/table_settings.py
@@ -2,7 +2,7 @@
 
 from mathesar.api.exceptions.mixins import MathesarErrorMessageMixin
 from mathesar.api.exceptions.validation_exceptions.exceptions import InvalidColumnOrder
-from mathesar.models.base import PreviewColumnSettings, TableSettings, compute_default_preview_template, ValidationError
+from mathesar.models.deprecated import PreviewColumnSettings, TableSettings, compute_default_preview_template, ValidationError
 
 
 class PreviewColumnSerializer(MathesarErrorMessageMixin, serializers.ModelSerializer):
diff --git a/mathesar/api/serializers/tables.py b/mathesar/api/serializers/tables.py
index ea3fecce3a..3f8e1a871a 100644
--- a/mathesar/api/serializers/tables.py
+++ b/mathesar/api/serializers/tables.py
@@ -26,7 +26,7 @@
 from mathesar.api.exceptions.mixins import MathesarErrorMessageMixin
 from mathesar.api.serializers.columns import SimpleColumnSerializer
 from mathesar.api.serializers.table_settings import TableSettingsSerializer
-from mathesar.models.base import Column, Schema, Table, DataFile
+from mathesar.models.deprecated import Column, Schema, Table, DataFile
 from mathesar.utils.tables import gen_table_name, create_table_from_datafile, create_empty_table
 
 
diff --git a/mathesar/api/ui/permissions/database_role.py b/mathesar/api/ui/permissions/database_role.py
index 20d0c2205c..090a4ded6e 100644
--- a/mathesar/api/ui/permissions/database_role.py
+++ b/mathesar/api/ui/permissions/database_role.py
@@ -1,7 +1,7 @@
 from django.db.models import Q
 from rest_access_policy import AccessPolicy
 
-from mathesar.models.base import Connection
+from mathesar.models.deprecated import Connection
 from mathesar.models.users import DatabaseRole, Role
 
 
diff --git a/mathesar/api/ui/permissions/schema_role.py b/mathesar/api/ui/permissions/schema_role.py
index 5b6ef84d21..b793fc98da 100644
--- a/mathesar/api/ui/permissions/schema_role.py
+++ b/mathesar/api/ui/permissions/schema_role.py
@@ -1,7 +1,7 @@
 from django.db.models import Q
 from rest_access_policy import AccessPolicy
 
-from mathesar.models.base import Connection, Schema
+from mathesar.models.deprecated import Connection, Schema
 from mathesar.models.users import DatabaseRole, Role, SchemaRole
 
 
diff --git a/mathesar/api/ui/serializers/users.py b/mathesar/api/ui/serializers/users.py
index d092ba9524..4ff9069b6a 100644
--- a/mathesar/api/ui/serializers/users.py
+++ b/mathesar/api/ui/serializers/users.py
@@ -8,7 +8,7 @@
 from mathesar.api.exceptions.mixins import MathesarErrorMessageMixin
 from mathesar.api.exceptions.validation_exceptions.exceptions import IncorrectOldPassword
 from mathesar.api.ui.permissions.users import UserAccessPolicy
-from mathesar.models.base import Connection, Schema
+from mathesar.models.deprecated import Connection, Schema
 from mathesar.models.users import User, DatabaseRole, SchemaRole
 
 
diff --git a/mathesar/api/ui/viewsets/databases.py b/mathesar/api/ui/viewsets/databases.py
index b01f539849..01a9ab26ac 100644
--- a/mathesar/api/ui/viewsets/databases.py
+++ b/mathesar/api/ui/viewsets/databases.py
@@ -7,7 +7,7 @@
 from rest_framework.response import Response
 
 from mathesar.api.ui.permissions.ui_database import UIDatabaseAccessPolicy
-from mathesar.models.base import Connection
+from mathesar.models.deprecated import Connection
 from mathesar.api.dj_filters import DatabaseFilter
 from mathesar.api.exceptions.validation_exceptions.exceptions import (
     DictHasBadKeys, UnsupportedInstallationDatabase
diff --git a/mathesar/api/ui/viewsets/records.py b/mathesar/api/ui/viewsets/records.py
index e59a1f9ece..981452e5a0 100644
--- a/mathesar/api/ui/viewsets/records.py
+++ b/mathesar/api/ui/viewsets/records.py
@@ -9,7 +9,7 @@
 import mathesar.api.exceptions.database_exceptions.exceptions as database_api_exceptions
 
 from mathesar.api.utils import get_table_or_404
-from mathesar.models.base import Table
+from mathesar.models.deprecated import Table
 
 
 class RecordViewSet(AccessViewSetMixin, viewsets.GenericViewSet):
diff --git a/mathesar/api/utils.py b/mathesar/api/utils.py
index 3f3a4382f6..d7a24d8927 100644
--- a/mathesar/api/utils.py
+++ b/mathesar/api/utils.py
@@ -6,7 +6,7 @@
 
 from db.records.operations import group
 from mathesar.api.exceptions.error_codes import ErrorCodes
-from mathesar.models.base import Table
+from mathesar.models.deprecated import Table
 from mathesar.models.query import UIQuery
 from mathesar.utils.preview import column_alias_from_preview_template
 from mathesar.api.exceptions.generic_exceptions.base_exceptions import BadDBCredentials
diff --git a/mathesar/imports/base.py b/mathesar/imports/base.py
index 4805eb6d04..a43ba100b3 100644
--- a/mathesar/imports/base.py
+++ b/mathesar/imports/base.py
@@ -1,4 +1,4 @@
-from mathesar.models.base import Table
+from mathesar.models.deprecated import Table
 from mathesar.imports.csv import create_db_table_from_csv_data_file
 from mathesar.imports.excel import create_db_table_from_excel_data_file
 from mathesar.imports.json import create_db_table_from_json_data_file
diff --git a/mathesar/install.py b/mathesar/install.py
index 5f4d5973a3..e026bd9591 100644
--- a/mathesar/install.py
+++ b/mathesar/install.py
@@ -40,7 +40,7 @@ def main(skip_static_collection=False):
 
 
 def install_on_db_with_key(database_key, skip_confirm):
-    from mathesar.models.base import Connection
+    from mathesar.models.deprecated import Connection
     db_model = Connection.create_from_settings_key(database_key)
     db_model.save()
     try:
diff --git a/mathesar/migrations/0005_release_0_1_4.py b/mathesar/migrations/0005_release_0_1_4.py
index 04df9ca932..0849b2a6e3 100644
--- a/mathesar/migrations/0005_release_0_1_4.py
+++ b/mathesar/migrations/0005_release_0_1_4.py
@@ -1,7 +1,7 @@
 from django.db import migrations, models, connection
 import django.contrib.postgres.fields
 import encrypted_fields.fields
-import mathesar.models.base
+import mathesar.models.deprecated
 
 
 def column_order_to_jsonb_postgres_fwd(apps, schema_editor):
@@ -12,7 +12,7 @@ def column_order_to_jsonb_postgres_fwd(apps, schema_editor):
     migrations.AlterField(
         model_name='tablesettings',
         name='column_order',
-        field=models.JSONField(blank=True, default=None, null=True, validators=[mathesar.models.base.validate_column_order]),
+        field=models.JSONField(blank=True, default=None, null=True, validators=[mathesar.models.deprecated.validate_column_order]),
     ),
 
 
diff --git a/mathesar/migrations/0007_rename_database_connection_and_more.py b/mathesar/migrations/0007_rename_database_connection_and_more.py
index d47e6768f1..34a6ad644a 100644
--- a/mathesar/migrations/0007_rename_database_connection_and_more.py
+++ b/mathesar/migrations/0007_rename_database_connection_and_more.py
@@ -2,7 +2,7 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import mathesar.models.base
+import mathesar.models.deprecated
 
 
 class Migration(migrations.Migration):
@@ -29,6 +29,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='tablesettings',
             name='column_order',
-            field=models.JSONField(blank=True, default=None, null=True, validators=[mathesar.models.base.validate_column_order]),
+            field=models.JSONField(blank=True, default=None, null=True, validators=[mathesar.models.deprecated.validate_column_order]),
         ),
     ]
diff --git a/mathesar/models/base.py b/mathesar/models/deprecated.py
similarity index 100%
rename from mathesar/models/base.py
rename to mathesar/models/deprecated.py
diff --git a/mathesar/models/query.py b/mathesar/models/query.py
index 539dcead89..06eed199e6 100644
--- a/mathesar/models/query.py
+++ b/mathesar/models/query.py
@@ -29,7 +29,7 @@
     TransformationsValidator,
 )
 from mathesar.state.cached_property import cached_property
-from mathesar.models.base import BaseModel, Column
+from mathesar.models.deprecated import BaseModel, Column
 from mathesar.models.relation import Relation
 from mathesar.state import get_cached_metadata
 
diff --git a/mathesar/models/shares.py b/mathesar/models/shares.py
index 20f076080a..de78b406c3 100644
--- a/mathesar/models/shares.py
+++ b/mathesar/models/shares.py
@@ -1,7 +1,7 @@
 import uuid
 from django.db import models
 
-from mathesar.models.base import BaseModel
+from mathesar.models.deprecated import BaseModel
 
 
 class SharedEntity(BaseModel):
diff --git a/mathesar/models/users.py b/mathesar/models/users.py
index 4db3748959..693348e558 100644
--- a/mathesar/models/users.py
+++ b/mathesar/models/users.py
@@ -2,7 +2,7 @@
 from django.contrib.auth.models import AbstractUser
 from django.db import models
 
-from mathesar.models.base import BaseModel, Connection, Schema
+from mathesar.models.deprecated import BaseModel, Connection, Schema
 
 
 class User(AbstractUser):
diff --git a/mathesar/rpc/utils.py b/mathesar/rpc/utils.py
index 7ab6ce44ef..57118f0f9b 100644
--- a/mathesar/rpc/utils.py
+++ b/mathesar/rpc/utils.py
@@ -1,5 +1,5 @@
 from mathesar.database.base import get_psycopg_connection
-from mathesar.models.base import Connection
+from mathesar.models.deprecated import Connection
 
 
 def connect(conn_id, user):
diff --git a/mathesar/signals.py b/mathesar/signals.py
index 83b673e93b..bcec182ab1 100644
--- a/mathesar/signals.py
+++ b/mathesar/signals.py
@@ -1,7 +1,7 @@
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 
-from mathesar.models.base import (
+from mathesar.models.deprecated import (
     Column, Table, _set_default_preview_template,
     _create_table_settings,
 )
diff --git a/mathesar/state/django.py b/mathesar/state/django.py
index e60a671fd5..ebb5cfbcfb 100644
--- a/mathesar/state/django.py
+++ b/mathesar/state/django.py
@@ -11,8 +11,8 @@
 from db.constraints.operations.select import get_constraints_with_oids
 from db.schemas.operations.select import get_mathesar_schemas_with_oids
 from db.tables.operations.select import get_table_oids_from_schemas
-# We import the entire models.base module to avoid a circular import error
-from mathesar.models import base as models
+# We import the entire models_deprecated.deprecated module to avoid a circular import error
+from mathesar.models import deprecated as models_deprecated
 from mathesar.api.serializers.shared_serializers import DisplayOptionsMappingSerializer, \
     DISPLAY_OPTIONS_SERIALIZER_MAPPING_KEY
 from mathesar.database.base import create_mathesar_engine
@@ -32,24 +32,24 @@ def clear_dj_cache():
 
 
 def reflect_db_objects(metadata, db_name=None):
-    databases = models.Connection.current_objects.all()
+    databases = models_deprecated.Connection.current_objects.all()
     if db_name is not None:
         databases = databases.filter(name=db_name)
     sync_databases_status(databases)
     for database in databases:
         if database.deleted is False:
             reflect_schemas_from_database(database)
-            schemas = models.Schema.current_objects.filter(database=database).prefetch_related(
+            schemas = models_deprecated.Schema.current_objects.filter(database=database).prefetch_related(
                 Prefetch('database', queryset=databases)
             )
             reflect_tables_from_schemas(schemas, metadata=metadata)
-            tables = models.Table.current_objects.filter(schema__in=schemas).prefetch_related(
+            tables = models_deprecated.Table.current_objects.filter(schema__in=schemas).prefetch_related(
                 Prefetch('schema', queryset=schemas)
             )
             reflect_columns_from_tables(tables, metadata=metadata)
             reflect_constraints_from_database(database)
         else:
-            models.Schema.current_objects.filter(database=database).delete()
+            models_deprecated.Schema.current_objects.filter(database=database).delete()
 
 
 def sync_databases_status(databases):
@@ -83,10 +83,10 @@ def reflect_schemas_from_database(database):
 
     schemas = []
     for oid in db_schema_oids:
-        schema = models.Schema(oid=oid, database=database)
+        schema = models_deprecated.Schema(oid=oid, database=database)
         schemas.append(schema)
-    models.Schema.current_objects.bulk_create(schemas, ignore_conflicts=True)
-    for schema in models.Schema.current_objects.all().select_related('database'):
+    models_deprecated.Schema.current_objects.bulk_create(schemas, ignore_conflicts=True)
+    for schema in models_deprecated.Schema.current_objects.all().select_related('database'):
         if schema.database == database and schema.oid not in db_schema_oids:
             # Deleting Schemas are a rare occasion, not worth deleting in bulk
             schema.delete()
@@ -105,17 +105,17 @@ def reflect_tables_from_schemas(schemas, metadata):
     tables = []
     for oid, schema_oid in db_table_oids:
         schema = next(schema for schema in schemas if schema.oid == schema_oid)
-        table = models.Table(oid=oid, schema=schema)
+        table = models_deprecated.Table(oid=oid, schema=schema)
         tables.append(table)
-    models.Table.current_objects.bulk_create(tables, ignore_conflicts=True)
+    models_deprecated.Table.current_objects.bulk_create(tables, ignore_conflicts=True)
     # Calling signals manually because bulk create does not emit any signals
-    models._create_table_settings(models.Table.current_objects.filter(settings__isnull=True))
+    models_deprecated._create_table_settings(models_deprecated.Table.current_objects.filter(settings__isnull=True))
     deleted_tables = []
-    for table in models.Table.current_objects.filter(schema__in=schemas).select_related('schema'):
+    for table in models_deprecated.Table.current_objects.filter(schema__in=schemas).select_related('schema'):
         if (table.oid, table.schema.oid) not in db_table_oids:
             deleted_tables.append(table.id)
 
-    models.Table.current_objects.filter(id__in=deleted_tables).delete()
+    models_deprecated.Table.current_objects.filter(id__in=deleted_tables).delete()
 
 
 def reflect_columns_from_tables(tables, metadata):
@@ -130,14 +130,14 @@ def reflect_columns_from_tables(tables, metadata):
     _delete_stale_columns(attnum_tuples, tables)
     # Manually trigger preview templates computation signal
     for table in tables:
-        models._set_default_preview_template(table)
+        models_deprecated._set_default_preview_template(table)
 
     _invalidate_columns_with_incorrect_display_options(tables)
 
 
 def _invalidate_columns_with_incorrect_display_options(tables):
     columns_with_invalid_display_option = []
-    columns = models.Column.current_objects.filter(table__in=tables)
+    columns = models_deprecated.Column.current_objects.filter(table__in=tables)
     for column in columns:
         if column.display_options:
             # If the type of column has changed, existing display options won't be valid anymore.
@@ -148,16 +148,16 @@ def _invalidate_columns_with_incorrect_display_options(tables):
             if not serializer.is_valid(raise_exception=False):
                 columns_with_invalid_display_option.append(column.id)
     if len(columns_with_invalid_display_option) > 0:
-        models.Column.current_objects.filter(id__in=columns_with_invalid_display_option).update(display_options=None)
+        models_deprecated.Column.current_objects.filter(id__in=columns_with_invalid_display_option).update(display_options=None)
 
 
 def _create_reflected_columns(attnum_tuples, tables):
     columns = []
     for attnum, table_oid in attnum_tuples:
         table = next(table for table in tables if table.oid == table_oid)
-        column = models.Column(attnum=attnum, table=table, display_options=None)
+        column = models_deprecated.Column(attnum=attnum, table=table, display_options=None)
         columns.append(column)
-    models.Column.current_objects.bulk_create(columns, ignore_conflicts=True)
+    models_deprecated.Column.current_objects.bulk_create(columns, ignore_conflicts=True)
 
 
 def _delete_stale_columns(attnum_tuples, tables):
@@ -176,7 +176,7 @@ def _delete_stale_columns(attnum_tuples, tables):
         operator.or_,
         stale_columns_conditions
     )
-    models.Column.objects.filter(stale_columns_query).delete()
+    models_deprecated.Column.objects.filter(stale_columns_query).delete()
 
 
 # TODO pass in a cached engine instead of creating a new one
@@ -190,14 +190,14 @@ def reflect_constraints_from_database(database):
         map_of_table_oid_to_constraint_oids[table_oid].append(constraint_oid)
 
     table_oids = map_of_table_oid_to_constraint_oids.keys()
-    tables = models.Table.current_objects.filter(oid__in=table_oids)
+    tables = models_deprecated.Table.current_objects.filter(oid__in=table_oids)
     constraint_objs_to_create = []
     for table in tables:
         constraint_oids = map_of_table_oid_to_constraint_oids.get(table.oid, [])
         for constraint_oid in constraint_oids:
-            constraint_obj = models.Constraint(oid=constraint_oid, table=table)
+            constraint_obj = models_deprecated.Constraint(oid=constraint_oid, table=table)
             constraint_objs_to_create.append(constraint_obj)
-    models.Constraint.current_objects.bulk_create(constraint_objs_to_create, ignore_conflicts=True)
+    models_deprecated.Constraint.current_objects.bulk_create(constraint_objs_to_create, ignore_conflicts=True)
     _delete_stale_dj_constraints(db_constraints, database)
     engine.dispose()
 
@@ -212,7 +212,7 @@ def _delete_stale_dj_constraints(known_db_constraints, database):
         for known_db_constraint
         in known_db_constraints
     )
-    stale_dj_constraints = models.Constraint.current_objects.filter(
+    stale_dj_constraints = models_deprecated.Constraint.current_objects.filter(
         ~Q(oid__in=known_db_constraint_oids),
         table__schema__database=database,
     )
@@ -224,7 +224,7 @@ def reflect_new_table_constraints(table):
     engine = create_mathesar_engine(table.schema.database)
     db_constraints = get_constraints_with_oids(engine, table_oid=table.oid)
     constraints = [
-        models.Constraint.current_objects.get_or_create(
+        models_deprecated.Constraint.current_objects.get_or_create(
             oid=db_constraint['oid'],
             table=table
         )
diff --git a/mathesar/tests/api/conftest.py b/mathesar/tests/api/conftest.py
index 5cc592ee9a..5d0318d51b 100644
--- a/mathesar/tests/api/conftest.py
+++ b/mathesar/tests/api/conftest.py
@@ -9,7 +9,7 @@
 from db.constraints.base import ForeignKeyConstraint, UniqueConstraint
 from db.tables.operations.select import get_oid_from_table
 from db.types.base import PostgresType
-from mathesar.models.base import Table, DataFile, Column as ServiceLayerColumn
+from mathesar.models.deprecated import Table, DataFile, Column as ServiceLayerColumn
 from db.metadata import get_empty_metadata
 from mathesar.state import reset_reflection
 
diff --git a/mathesar/tests/api/query/test_query_run.py b/mathesar/tests/api/query/test_query_run.py
index de0ada4541..5e477506ef 100644
--- a/mathesar/tests/api/query/test_query_run.py
+++ b/mathesar/tests/api/query/test_query_run.py
@@ -1,7 +1,7 @@
 import pytest
 
 from mathesar.api.exceptions.error_codes import ErrorCodes
-from mathesar.models.base import Column
+from mathesar.models.deprecated import Column
 
 run_client_with_status_code = [
     ('db_manager_client_factory', 200, 200),
diff --git a/mathesar/tests/api/test_column_api_display_options.py b/mathesar/tests/api/test_column_api_display_options.py
index 46126530b4..ae421e5ae1 100644
--- a/mathesar/tests/api/test_column_api_display_options.py
+++ b/mathesar/tests/api/test_column_api_display_options.py
@@ -9,7 +9,7 @@
 from db.types.custom.money import MathesarMoney
 from db.metadata import get_empty_metadata
 
-from mathesar.models.base import Table, Column
+from mathesar.models.deprecated import Table, Column
 
 
 @pytest.fixture
diff --git a/mathesar/tests/api/test_constraint_api.py b/mathesar/tests/api/test_constraint_api.py
index 91256846ca..3258032116 100644
--- a/mathesar/tests/api/test_constraint_api.py
+++ b/mathesar/tests/api/test_constraint_api.py
@@ -7,7 +7,7 @@
 from db.columns.operations.select import get_column_attnum_from_name
 from db.constraints.base import UniqueConstraint
 from db.tables.operations.select import get_oid_from_table
-from mathesar.models.base import Constraint, Table, Column
+from mathesar.models.deprecated import Constraint, Table, Column
 from mathesar.api.exceptions.error_codes import ErrorCodes
 from db.metadata import get_empty_metadata
 from mathesar.state import reset_reflection
diff --git a/mathesar/tests/api/test_data_file_api.py b/mathesar/tests/api/test_data_file_api.py
index 661adafe08..deec6fe884 100644
--- a/mathesar/tests/api/test_data_file_api.py
+++ b/mathesar/tests/api/test_data_file_api.py
@@ -8,7 +8,7 @@
 
 from mathesar.api.exceptions.error_codes import ErrorCodes
 from mathesar.imports import csv
-from mathesar.models.base import DataFile
+from mathesar.models.deprecated import DataFile
 from mathesar.errors import InvalidTableError
 
 
diff --git a/mathesar/tests/api/test_database_api.py b/mathesar/tests/api/test_database_api.py
index d8333b9708..6aeb80f931 100644
--- a/mathesar/tests/api/test_database_api.py
+++ b/mathesar/tests/api/test_database_api.py
@@ -5,7 +5,7 @@
 from db.metadata import get_empty_metadata
 from mathesar.models.users import DatabaseRole
 from mathesar.state.django import reflect_db_objects
-from mathesar.models.base import Table, Schema, Connection
+from mathesar.models.deprecated import Table, Schema, Connection
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 from db.install import install_mathesar
diff --git a/mathesar/tests/api/test_links.py b/mathesar/tests/api/test_links.py
index 4b1b1e0644..abd79f42af 100644
--- a/mathesar/tests/api/test_links.py
+++ b/mathesar/tests/api/test_links.py
@@ -6,7 +6,7 @@
 from db.tables.operations.select import get_oid_from_table
 from db.tables.utils import get_primary_key_column
 
-from mathesar.models.base import Constraint, Table
+from mathesar.models.deprecated import Constraint, Table
 from mathesar.api.exceptions.error_codes import ErrorCodes
 
 
diff --git a/mathesar/tests/api/test_long_identifiers.py b/mathesar/tests/api/test_long_identifiers.py
index d92cd12376..eb6443f00d 100644
--- a/mathesar/tests/api/test_long_identifiers.py
+++ b/mathesar/tests/api/test_long_identifiers.py
@@ -10,7 +10,7 @@
 from mathesar.api.exceptions.database_exceptions import (
     exceptions as database_api_exceptions
 )
-from mathesar.models.base import DataFile
+from mathesar.models.deprecated import DataFile
 
 from mathesar.tests.api.test_table_api import check_create_table_response, get_expected_name
 
diff --git a/mathesar/tests/api/test_record_api.py b/mathesar/tests/api/test_record_api.py
index e67ba8a26c..8fba30e10b 100644
--- a/mathesar/tests/api/test_record_api.py
+++ b/mathesar/tests/api/test_record_api.py
@@ -14,8 +14,8 @@
 from mathesar.api.exceptions.error_codes import ErrorCodes
 from mathesar.api.utils import follows_json_number_spec
 from mathesar.functions.operations.convert import rewrite_db_function_spec_column_ids_to_names
-from mathesar.models import base as models_base
-from mathesar.models.base import compute_default_preview_template
+from mathesar.models import deprecated as models_deprecated
+from mathesar.models.deprecated import compute_default_preview_template
 from mathesar.models.query import DBQuery
 from mathesar.utils.preview import compute_path_prefix, compute_path_str
 
@@ -235,7 +235,7 @@ def test_filter_with_added_columns(create_patents_table, client):
         table.add_column({"name": new_column_name, "type": new_column_type})
         row_values_list = []
         # Get a new instance with clean cache, so that the new column is added to the _sa_column list
-        table = models_base.Table.objects.get(oid=table.oid)
+        table = models_deprecated.Table.objects.get(oid=table.oid)
         response_data = client.get(f'/api/db/v0/tables/{table.id}/records/').json()
         existing_records = response_data['results']
 
diff --git a/mathesar/tests/api/test_schema_api.py b/mathesar/tests/api/test_schema_api.py
index 82166a926b..ac0f02c2f9 100644
--- a/mathesar/tests/api/test_schema_api.py
+++ b/mathesar/tests/api/test_schema_api.py
@@ -3,7 +3,7 @@
 from sqlalchemy import text
 
 from db.schemas.utils import get_mathesar_schemas, get_schema_oid_from_name
-from mathesar.models.base import Schema
+from mathesar.models.deprecated import Schema
 from mathesar.api.exceptions.error_codes import ErrorCodes
 from mathesar.models.users import DatabaseRole
 
diff --git a/mathesar/tests/api/test_table_api.py b/mathesar/tests/api/test_table_api.py
index 18df6ca1e0..b5ce0b906d 100644
--- a/mathesar/tests/api/test_table_api.py
+++ b/mathesar/tests/api/test_table_api.py
@@ -14,7 +14,7 @@
 
 from mathesar.state import reset_reflection
 from mathesar.api.exceptions.error_codes import ErrorCodes
-from mathesar.models.base import Column, Table, DataFile
+from mathesar.models.deprecated import Column, Table, DataFile
 
 
 @pytest.fixture
diff --git a/mathesar/tests/api/test_table_settings_api.py b/mathesar/tests/api/test_table_settings_api.py
index adb7131c94..6f1f680a24 100644
--- a/mathesar/tests/api/test_table_settings_api.py
+++ b/mathesar/tests/api/test_table_settings_api.py
@@ -3,7 +3,7 @@
 from sqlalchemy import Table as SATable
 
 from db.tables.operations.select import get_oid_from_table
-from mathesar.models import base as models_base
+from mathesar.models import deprecated as models_deprecated
 from mathesar.api.exceptions.error_codes import ErrorCodes
 
 
@@ -31,7 +31,7 @@ def column_test_table(patent_schema, engine):
     )
     db_table.create()
     db_table_oid = get_oid_from_table(db_table.name, db_table.schema, engine)
-    table = models_base.Table.current_objects.create(oid=db_table_oid, schema=patent_schema)
+    table = models_deprecated.Table.current_objects.create(oid=db_table_oid, schema=patent_schema)
     return table
 
 
@@ -86,7 +86,7 @@ def test_update_table_settings_permission(create_patents_table, request, client_
     table = create_patents_table(table_name)
     settings_id = table.settings.id
     client = request.getfixturevalue(client_name)(table.schema)
-    columns = models_base.Column.objects.filter(table=table).values_list('id', flat=True)
+    columns = models_deprecated.Column.objects.filter(table=table).values_list('id', flat=True)
     preview_template = ','.join(f'{{{ column }}}' for column in columns)
     data = {
         "preview_settings": {
@@ -100,7 +100,7 @@ def test_update_table_settings_permission(create_patents_table, request, client_
 
 
 def test_update_table_settings(client, column_test_table):
-    columns = models_base.Column.objects.filter(table=column_test_table).values_list('id', flat=True)
+    columns = models_deprecated.Column.objects.filter(table=column_test_table).values_list('id', flat=True)
     preview_template = ','.join(f'{{{ column }}}' for column in columns)
     settings_id = column_test_table.settings.id
     column_order = [4, 5, 6]
diff --git a/mathesar/tests/api/test_ui_filters_api.py b/mathesar/tests/api/test_ui_filters_api.py
index 38e73e01ac..f49516d1d5 100644
--- a/mathesar/tests/api/test_ui_filters_api.py
+++ b/mathesar/tests/api/test_ui_filters_api.py
@@ -1,4 +1,4 @@
-from mathesar.models.base import Connection
+from mathesar.models.deprecated import Connection
 from mathesar.filters.base import get_available_filters
 from mathesar.models.users import DatabaseRole
 
diff --git a/mathesar/tests/api/test_ui_types_api.py b/mathesar/tests/api/test_ui_types_api.py
index 74450168f5..79d8ab3c46 100644
--- a/mathesar/tests/api/test_ui_types_api.py
+++ b/mathesar/tests/api/test_ui_types_api.py
@@ -1,5 +1,5 @@
 from mathesar.api.display_options import DISPLAY_OPTIONS_BY_UI_TYPE
-from mathesar.models.base import Connection
+from mathesar.models.deprecated import Connection
 from mathesar.database.types import get_ui_type_from_id, UIType
 from db.types.base import PostgresType, MathesarCustomType
 from mathesar.models.users import DatabaseRole
diff --git a/mathesar/tests/api/test_user_api.py b/mathesar/tests/api/test_user_api.py
index 8687873ff6..c135081a3f 100644
--- a/mathesar/tests/api/test_user_api.py
+++ b/mathesar/tests/api/test_user_api.py
@@ -1,7 +1,7 @@
 from django.db import transaction
 
 from db.schemas.utils import get_schema_oid_from_name
-from mathesar.models.base import Connection, Schema
+from mathesar.models.deprecated import Connection, Schema
 from mathesar.models.users import User, DatabaseRole, SchemaRole
 
 
diff --git a/mathesar/tests/conftest.py b/mathesar/tests/conftest.py
index 80b75edfdf..b887648cbc 100644
--- a/mathesar/tests/conftest.py
+++ b/mathesar/tests/conftest.py
@@ -22,8 +22,8 @@
 
 import mathesar.tests.conftest
 from mathesar.imports.base import create_table_from_data_file
-from mathesar.models.base import Schema, Table, Connection, DataFile
-from mathesar.models.base import Column as mathesar_model_column
+from mathesar.models.deprecated import Schema, Table, Connection, DataFile
+from mathesar.models.deprecated import Column as mathesar_model_column
 from mathesar.models.users import DatabaseRole, SchemaRole, User
 
 from fixtures.utils import create_scoped_fixtures, get_fixture_value
diff --git a/mathesar/tests/database/test_types.py b/mathesar/tests/database/test_types.py
index f60e5407f7..c74be77335 100644
--- a/mathesar/tests/database/test_types.py
+++ b/mathesar/tests/database/test_types.py
@@ -1,5 +1,5 @@
 from mathesar.database.types import UIType
-from mathesar.models.base import Connection
+from mathesar.models.deprecated import Connection
 from db.types.base import known_db_types
 
 
diff --git a/mathesar/tests/display_options_inference/test_money.py b/mathesar/tests/display_options_inference/test_money.py
index 5eaaa95447..5698f4383b 100644
--- a/mathesar/tests/display_options_inference/test_money.py
+++ b/mathesar/tests/display_options_inference/test_money.py
@@ -3,7 +3,7 @@
 
 from db.columns.operations.select import get_column_attnum_from_name
 from db.metadata import get_empty_metadata
-from mathesar.models.base import DataFile, Table
+from mathesar.models.deprecated import DataFile, Table
 from mathesar.utils.display_options_inference import infer_mathesar_money_display_options
 
 create_display_options_test_list = [
diff --git a/mathesar/tests/imports/test_csv.py b/mathesar/tests/imports/test_csv.py
index ea88f53607..bdf73a39d3 100644
--- a/mathesar/tests/imports/test_csv.py
+++ b/mathesar/tests/imports/test_csv.py
@@ -3,7 +3,7 @@
 from django.core.files import File
 from sqlalchemy import text
 
-from mathesar.models.base import DataFile, Schema
+from mathesar.models.deprecated import DataFile, Schema
 from mathesar.errors import InvalidTableError
 from mathesar.imports.base import create_table_from_data_file
 from mathesar.imports.csv import get_sv_dialect, get_sv_reader
diff --git a/mathesar/tests/imports/test_excel.py b/mathesar/tests/imports/test_excel.py
index 6a87736a8a..2854c1ec6f 100644
--- a/mathesar/tests/imports/test_excel.py
+++ b/mathesar/tests/imports/test_excel.py
@@ -2,7 +2,7 @@
 
 from django.core.files import File
 
-from mathesar.models.base import DataFile, Schema
+from mathesar.models.deprecated import DataFile, Schema
 from mathesar.imports.base import create_table_from_data_file
 from db.schemas.utils import get_schema_oid_from_name
 from psycopg.errors import DuplicateTable
diff --git a/mathesar/tests/imports/test_json.py b/mathesar/tests/imports/test_json.py
index a35b47dc74..689a69a47b 100644
--- a/mathesar/tests/imports/test_json.py
+++ b/mathesar/tests/imports/test_json.py
@@ -3,7 +3,7 @@
 from django.core.files import File
 from sqlalchemy import text
 
-from mathesar.models.base import DataFile, Schema
+from mathesar.models.deprecated import DataFile, Schema
 from mathesar.imports.base import create_table_from_data_file
 from db.schemas.operations.create import create_schema_via_sql_alchemy
 from db.schemas.utils import get_schema_oid_from_name
diff --git a/mathesar/tests/test_models.py b/mathesar/tests/test_models.py
index d219c619a8..2c4da0dddb 100644
--- a/mathesar/tests/test_models.py
+++ b/mathesar/tests/test_models.py
@@ -2,7 +2,7 @@
 from unittest.mock import patch
 from django.core.cache import cache
 
-from mathesar.models.base import Connection, Schema, Table, schema_utils
+from mathesar.models.deprecated import Connection, Schema, Table, schema_utils
 from mathesar.utils.models import attempt_dumb_query
 
 
diff --git a/mathesar/tests/test_multi_db.py b/mathesar/tests/test_multi_db.py
index 6c951a67a8..96a3bd5df1 100644
--- a/mathesar/tests/test_multi_db.py
+++ b/mathesar/tests/test_multi_db.py
@@ -1,7 +1,7 @@
 import pytest
 from django.core.exceptions import ValidationError
 
-from mathesar.models.base import Table, Schema, Connection
+from mathesar.models.deprecated import Table, Schema, Connection
 
 
 @pytest.fixture(autouse=True)
diff --git a/mathesar/utils/columns.py b/mathesar/utils/columns.py
index b172d63203..97075a7d52 100644
--- a/mathesar/utils/columns.py
+++ b/mathesar/utils/columns.py
@@ -1,4 +1,4 @@
-from mathesar.models.base import Column
+from mathesar.models.deprecated import Column
 
 
 # This should be replaced once we have the ColumnMetadata model sorted out.
diff --git a/mathesar/utils/connections.py b/mathesar/utils/connections.py
index 70a12ec541..95fd15bd79 100644
--- a/mathesar/utils/connections.py
+++ b/mathesar/utils/connections.py
@@ -1,7 +1,7 @@
 """Utilities to help with creating and managing connections in Mathesar."""
 from psycopg2.errors import DuplicateSchema
 from sqlalchemy.exc import OperationalError, ProgrammingError
-from mathesar.models.base import Connection
+from mathesar.models.deprecated import Connection
 from db import install, connection as dbconn
 from mathesar.state import reset_reflection
 from mathesar.examples.library_dataset import load_library_dataset
diff --git a/mathesar/utils/datafiles.py b/mathesar/utils/datafiles.py
index 22e16ef69e..e9ab31d6f7 100644
--- a/mathesar/utils/datafiles.py
+++ b/mathesar/utils/datafiles.py
@@ -13,7 +13,7 @@
 from mathesar.errors import URLDownloadError
 from mathesar.imports.csv import is_valid_csv, get_sv_dialect, get_file_encoding
 from mathesar.imports.json import is_valid_json, validate_json_format
-from mathesar.models.base import DataFile
+from mathesar.models.deprecated import DataFile
 
 
 ALLOWED_FILE_FORMATS = ['csv', 'tsv', 'json', 'xls', 'xlsx', 'xlsm', 'xlsb', 'odf', 'ods', 'odt']
diff --git a/mathesar/utils/joins.py b/mathesar/utils/joins.py
index 0d3aee1776..cc67105dba 100644
--- a/mathesar/utils/joins.py
+++ b/mathesar/utils/joins.py
@@ -1,6 +1,6 @@
 from db.tables.operations import select as ma_sel
 from db.metadata import get_empty_metadata
-from mathesar.models.base import Table, Column, Constraint
+from mathesar.models.deprecated import Table, Column, Constraint
 
 TARGET = 'target'
 FK_PATH = 'fk_path'
diff --git a/mathesar/utils/preview.py b/mathesar/utils/preview.py
index 7108fb5295..a9f05cc98a 100644
--- a/mathesar/utils/preview.py
+++ b/mathesar/utils/preview.py
@@ -1,7 +1,7 @@
 import re
 
 from db.constraints.utils import ConstraintType
-from mathesar.models.base import Column, Constraint, Table
+from mathesar.models.deprecated import Column, Constraint, Table
 
 
 def _preview_info_by_column_id(fk_constraints, previous_path=None, exising_columns=None):
diff --git a/mathesar/utils/schemas.py b/mathesar/utils/schemas.py
index 2488c1d752..833cfc33b9 100644
--- a/mathesar/utils/schemas.py
+++ b/mathesar/utils/schemas.py
@@ -4,7 +4,7 @@
 from db.schemas.operations.create import create_schema_via_sql_alchemy
 from db.schemas.utils import get_schema_oid_from_name, get_mathesar_schemas
 from mathesar.database.base import create_mathesar_engine
-from mathesar.models.base import Schema, Connection
+from mathesar.models.deprecated import Schema, Connection
 
 
 def create_schema_and_object(name, connection_id, comment=None):
diff --git a/mathesar/utils/tables.py b/mathesar/utils/tables.py
index b4f8b4dca7..1772d653d7 100644
--- a/mathesar/utils/tables.py
+++ b/mathesar/utils/tables.py
@@ -4,7 +4,7 @@
 from db.tables.operations.infer_types import infer_table_column_types
 from mathesar.database.base import create_mathesar_engine
 from mathesar.imports.base import create_table_from_data_file
-from mathesar.models.base import Table
+from mathesar.models.deprecated import Table
 from mathesar.state.django import reflect_columns_from_tables
 from mathesar.state import get_cached_metadata
 
diff --git a/mathesar/views.py b/mathesar/views.py
index 26807d39d3..3b05ccabf0 100644
--- a/mathesar/views.py
+++ b/mathesar/views.py
@@ -18,7 +18,7 @@
 from mathesar.api.ui.serializers.users import UserSerializer
 from mathesar.api.utils import is_valid_uuid_v4
 from mathesar.database.types import UIType
-from mathesar.models.base import Connection, Schema, Table
+from mathesar.models.deprecated import Connection, Schema, Table
 from mathesar.models.query import UIQuery
 from mathesar.models.shares import SharedTable, SharedQuery
 from mathesar.state import reset_reflection

From 4d4359115437f0b1bc6f7dd8a4a70c7dc95a3361 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 14 Jun 2024 17:44:43 +0800
Subject: [PATCH 0256/1141] Create new models base with base model

---
 mathesar/models/base.py       | 9 +++++++++
 mathesar/models/deprecated.py | 9 +--------
 mathesar/models/query.py      | 3 ++-
 mathesar/models/shares.py     | 2 +-
 mathesar/models/users.py      | 3 ++-
 5 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 mathesar/models/base.py

diff --git a/mathesar/models/base.py b/mathesar/models/base.py
new file mode 100644
index 0000000000..3e157298bd
--- /dev/null
+++ b/mathesar/models/base.py
@@ -0,0 +1,9 @@
+from django.db import models
+
+
+class BaseModel(models.Model):
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    class Meta:
+        abstract = True
diff --git a/mathesar/models/deprecated.py b/mathesar/models/deprecated.py
index 0e54d0fa2e..510bc92ca4 100644
--- a/mathesar/models/deprecated.py
+++ b/mathesar/models/deprecated.py
@@ -44,6 +44,7 @@
 from db.records.operations.insert import insert_from_select
 from db.tables.utils import get_primary_key_column
 
+from mathesar.models.base import BaseModel
 from mathesar.models.relation import Relation
 from mathesar.utils import models as model_utils
 from mathesar.utils.prefetch import PrefetchManager, Prefetcher
@@ -57,14 +58,6 @@
 NAME_CACHE_INTERVAL = 60 * 5
 
 
-class BaseModel(models.Model):
-    created_at = models.DateTimeField(auto_now_add=True)
-    updated_at = models.DateTimeField(auto_now=True)
-
-    class Meta:
-        abstract = True
-
-
 class DatabaseObjectManager(PrefetchManager):
     def get_queryset(self):
         make_sure_initial_reflection_happened()
diff --git a/mathesar/models/query.py b/mathesar/models/query.py
index 06eed199e6..5497c78f99 100644
--- a/mathesar/models/query.py
+++ b/mathesar/models/query.py
@@ -28,8 +28,9 @@
     ListOfDictValidator,
     TransformationsValidator,
 )
+from mathesar.models.base import BaseModel
 from mathesar.state.cached_property import cached_property
-from mathesar.models.deprecated import BaseModel, Column
+from mathesar.models.deprecated import Column
 from mathesar.models.relation import Relation
 from mathesar.state import get_cached_metadata
 
diff --git a/mathesar/models/shares.py b/mathesar/models/shares.py
index de78b406c3..20f076080a 100644
--- a/mathesar/models/shares.py
+++ b/mathesar/models/shares.py
@@ -1,7 +1,7 @@
 import uuid
 from django.db import models
 
-from mathesar.models.deprecated import BaseModel
+from mathesar.models.base import BaseModel
 
 
 class SharedEntity(BaseModel):
diff --git a/mathesar/models/users.py b/mathesar/models/users.py
index 693348e558..301ea76314 100644
--- a/mathesar/models/users.py
+++ b/mathesar/models/users.py
@@ -2,7 +2,8 @@
 from django.contrib.auth.models import AbstractUser
 from django.db import models
 
-from mathesar.models.deprecated import BaseModel, Connection, Schema
+from mathesar.models.base import BaseModel
+from mathesar.models.deprecated import Connection, Schema
 
 
 class User(AbstractUser):

From 0796b6840125b440583f4ea5e9817ea9f03d29e0 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 14 Jun 2024 17:51:42 +0800
Subject: [PATCH 0257/1141] add default auto field setting to get rid of
 warning

---
 config/settings/common_settings.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/settings/common_settings.py b/config/settings/common_settings.py
index ce2ce24282..7697ed053c 100644
--- a/config/settings/common_settings.py
+++ b/config/settings/common_settings.py
@@ -247,6 +247,8 @@ def pipe_delim(pipe_string):
 MATHESAR_CAPTURE_UNHANDLED_EXCEPTION = decouple_config('CAPTURE_UNHANDLED_EXCEPTION', default=False)
 MATHESAR_STATIC_NON_CODE_FILES_LOCATION = os.path.join(BASE_DIR, 'mathesar/static/non-code/')
 
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+
 # UI source files have to be served by Django in order for static assets to be included during dev mode
 # https://vitejs.dev/guide/assets.html
 # https://vitejs.dev/guide/backend-integration.html

From de8ee006fd37ddd126295193c6ee6c74cb1cecef Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 14 Jun 2024 19:06:23 +0800
Subject: [PATCH 0258/1141] add new permissions and database models

---
 ...007_rename_database_connection_and_more.py | 61 ++++++++++++++++++-
 mathesar/models/base.py                       | 42 +++++++++++++
 2 files changed, 102 insertions(+), 1 deletion(-)

diff --git a/mathesar/migrations/0007_rename_database_connection_and_more.py b/mathesar/migrations/0007_rename_database_connection_and_more.py
index 34a6ad644a..930990b452 100644
--- a/mathesar/migrations/0007_rename_database_connection_and_more.py
+++ b/mathesar/migrations/0007_rename_database_connection_and_more.py
@@ -1,9 +1,11 @@
 # Generated by Django 4.2.11 on 2024-06-13 09:05
 
+from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
-import mathesar.models.deprecated
+import encrypted_fields.fields
 
+import mathesar.models.deprecated
 
 class Migration(migrations.Migration):
 
@@ -31,4 +33,61 @@ class Migration(migrations.Migration):
             name='column_order',
             field=models.JSONField(blank=True, default=None, null=True, validators=[mathesar.models.deprecated.validate_column_order]),
         ),
+        migrations.CreateModel(
+            name='Server',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('host', models.CharField(max_length=255)),
+                ('port', models.IntegerField()),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='Database',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('name', models.CharField(max_length=128)),
+                ('server', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='databases', to='mathesar.server')),
+            ],
+        ),
+        migrations.AddConstraint(
+            model_name='database',
+            constraint=models.UniqueConstraint(fields=('name', 'server'), name='unique_database'),
+        ),
+        migrations.CreateModel(
+            name='Role',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('name', models.CharField(max_length=255)),
+                ('password', encrypted_fields.fields.EncryptedCharField(max_length=255)),
+                ('server', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='roles', to='mathesar.server')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='UserDatabaseRoleMap',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('database', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mathesar.database')),
+                ('role', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mathesar.role')),
+                ('server', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mathesar.server')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.AddConstraint(
+            model_name='userdatabaserolemap',
+            constraint=models.UniqueConstraint(fields=('user', 'database'), name='user_one_role_per_database'),
+        ),
     ]
diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index 3e157298bd..0a60f83c76 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -1,4 +1,5 @@
 from django.db import models
+from encrypted_fields.fields import EncryptedCharField
 
 
 class BaseModel(models.Model):
@@ -7,3 +8,44 @@ class BaseModel(models.Model):
 
     class Meta:
         abstract = True
+
+
+class Server(BaseModel):
+    host = models.CharField(max_length=255)
+    port = models.IntegerField()
+
+
+class Database(BaseModel):
+    name = models.CharField(max_length=128)
+    server = models.ForeignKey(
+        'Server', on_delete=models.CASCADE, related_name='databases'
+    )
+
+    class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["name", "server"], name="unique_database"
+            )
+        ]
+
+
+class Role(BaseModel):
+    name = models.CharField(max_length=255)
+    server = models.ForeignKey(
+        'Server', on_delete=models.CASCADE, related_name='roles'
+    )
+    password = EncryptedCharField(max_length=255)
+
+
+class UserDatabaseRoleMap(BaseModel):
+    user = models.ForeignKey('User', on_delete=models.CASCADE)
+    database = models.ForeignKey('Database', on_delete=models.CASCADE)
+    role = models.ForeignKey('Role', on_delete=models.CASCADE)
+    server = models.ForeignKey('Server', on_delete=models.CASCADE)
+
+    class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["user", "database"], name="user_one_role_per_database"
+            )
+        ]

From 0411744fd16f24315612d464bdccafe4b9c1cf0a Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 14 Jun 2024 19:03:03 +0530
Subject: [PATCH 0259/1141] finished wiring and created a sql util function

---
 db/sql/00_msar.sql              | 24 +++++++++
 db/tables/operations/import_.py | 92 +++++++++++++++++++++++++++++++++
 db/tables/operations/select.py  |  7 ++-
 3 files changed, 119 insertions(+), 4 deletions(-)
 create mode 100644 db/tables/operations/import_.py

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index a6ee233ad2..e82e49b0a7 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -219,6 +219,30 @@ END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION
+msar.get_fully_qualified_relation_name(rel_id oid) RETURNS text AS $$/*
+Return the fully-qualified name for a given relation (e.g., table).
+
+The relation *must* be in the pg_class table to use this function. This function will return NULL if
+no corresponding relation can be found.
+
+Args:
+  rel_id: The OID of the relation.
+*/
+DECLARE
+  sch_name text;
+  rel_name text;
+BEGIN
+  SELECT nspname, relname INTO sch_name, rel_name
+  FROM pg_catalog.pg_class AS pgc
+  LEFT JOIN pg_catalog.pg_namespace AS pgn
+  ON pgc.relnamespace = pgn.oid
+  WHERE pgc.oid = rel_id;
+  RETURN msar.get_fully_qualified_object_name(sch_name, rel_name);
+END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
 CREATE OR REPLACE FUNCTION
 msar.get_relation_name_or_null(rel_id oid) RETURNS text AS $$/*
 Return the name for a given relation (e.g., table), qualified or quoted as appropriate.
diff --git a/db/tables/operations/import_.py b/db/tables/operations/import_.py
new file mode 100644
index 0000000000..0b4a114e64
--- /dev/null
+++ b/db/tables/operations/import_.py
@@ -0,0 +1,92 @@
+import tempfile
+import clevercsv as csv
+from psycopg import sql
+from db.tables.operations.create import prepare_table_for_import
+from db.tables.operations.select import get_fully_qualified_relation_name
+from db.encoding_utils import get_sql_compatible_encoding
+from mathesar.models.base import DataFile
+from mathesar.imports.csv import get_file_encoding, get_sv_reader, process_column_names
+
+
+def import_csv(data_file_id, table_name, schema_oid, conn, comment=None):
+    data_file = DataFile.objects.get(id=data_file_id)
+    file_path = data_file.file.path
+    header = data_file.header
+    dialect = csv.dialect.SimpleDialect(
+        data_file.delimiter,
+        data_file.quotechar,
+        data_file.escapechar
+    )
+    encoding = get_file_encoding(data_file.file)
+    with open(file_path, 'rb') as csv_file:
+        csv_reader = get_sv_reader(csv_file, header, dialect)
+        column_names = process_column_names(csv_reader.fieldnames)
+    table_oid = prepare_table_for_import(
+        table_name,
+        schema_oid,
+        column_names,
+        conn,
+        comment
+    )
+    insert_csv_records(
+        table_oid,
+        conn,
+        file_path,
+        column_names,
+        header,
+        dialect.delimiter,
+        dialect.escapechar,
+        dialect.quotechar,
+        encoding
+    )
+    return table_oid
+
+
+def insert_csv_records(
+    table_oid,
+    conn,
+    file_path,
+    column_names,
+    header,
+    delimiter=None,
+    escape=None,
+    quote=None,
+    encoding=None
+):
+    conversion_encoding, sql_encoding = get_sql_compatible_encoding(encoding)
+    schema_name, table_name = get_fully_qualified_relation_name(table_oid, conn).split('.')
+    formatted_columns = sql.SQL(",").join(sql.Identifier(column_name) for column_name in column_names)
+    copy_sql = sql.SQL(
+        "COPY {schema_name}.{table_name} ({formatted_columns}) FROM STDIN CSV {header} {delimiter} {escape} {quote} {encoding}"
+    ).format(
+        schema_name=sql.Identifier(schema_name),
+        table_name=sql.Identifier(table_name),
+        formatted_columns=formatted_columns,
+        header=sql.SQL("HEADER" if header else ""),
+        delimiter=sql.SQL(f"DELIMITER E'{delimiter}'" if delimiter else ""),
+        escape=sql.SQL(f"ESCAPE '{escape}'" if escape else ""),
+        quote=sql.SQL(
+            ("QUOTE ''''" if quote == "'" else f"QUOTE '{quote}'")
+            if quote
+            else ""
+        ),
+        encoding=sql.SQL(f"ENCODING '{sql_encoding}'" if sql_encoding else ""),
+    )
+    cursor = conn.cursor()
+    with open(file_path, 'r', encoding=encoding) as csv_file:
+        if conversion_encoding == encoding:
+            with cursor.copy(copy_sql) as copy:
+                while data := csv_file.read():
+                    copy.write(data)
+        else:
+            # File needs to be converted to compatible database supported encoding
+            with tempfile.SpooledTemporaryFile(mode='wb+', encoding=conversion_encoding) as temp_file:
+                while True:
+                    contents = csv_file.read().encode(conversion_encoding, "replace")
+                    if not contents:
+                        break
+                    temp_file.write(contents)
+                temp_file.seek(0)
+                with cursor.copy(copy_sql) as copy:
+                    while data := temp_file.read():
+                        copy.write(data)
diff --git a/db/tables/operations/select.py b/db/tables/operations/select.py
index 69149ea469..1f3cc96448 100644
--- a/db/tables/operations/select.py
+++ b/db/tables/operations/select.py
@@ -59,12 +59,11 @@ def get_table_info(schema, conn):
     return exec_msar_func(conn, 'get_table_info', schema).fetchone()[0]
 
 
-def get_relation_name(table_oid, conn):
+def get_fully_qualified_relation_name(table_oid, conn):
     """
-    Return a fully qualified table name for a given table_oid
-    when table is not included in the search path.
+    Return a fully qualified table name.
     """
-    return exec_msar_func(conn, 'get_relation_name_or_null', table_oid).fetchone()[0]
+    return exec_msar_func(conn, 'get_fully_qualified_relation_name', table_oid).fetchone()[0]
 
 
 def reflect_table(name, schema, engine, metadata, connection_to_use=None, keep_existing=False):

From a9542968b06e5f46d829ec959499f38697a38ea5 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 14 Jun 2024 19:20:24 +0530
Subject: [PATCH 0260/1141] add tests and docstrings

---
 db/tables/operations/select.py       |  3 +++
 mathesar/rpc/tables.py               | 13 +++++++++++++
 mathesar/tests/rpc/test_endpoints.py |  5 +++++
 mathesar/tests/rpc/test_tables.py    | 27 +++++++++++++++++++++++++++
 4 files changed, 48 insertions(+)

diff --git a/db/tables/operations/select.py b/db/tables/operations/select.py
index 1f3cc96448..9008b25030 100644
--- a/db/tables/operations/select.py
+++ b/db/tables/operations/select.py
@@ -62,6 +62,9 @@ def get_table_info(schema, conn):
 def get_fully_qualified_relation_name(table_oid, conn):
     """
     Return a fully qualified table name.
+
+    Args:
+        table_oid: The table oid for which we want fully qualified name.
     """
     return exec_msar_func(conn, 'get_fully_qualified_relation_name', table_oid).fetchone()[0]
 
diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index 783e3262e4..af2ad0b54e 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -178,6 +178,19 @@ def patch(
 def import_(
     *, data_file_id: int, table_name: str, schema_oid: int, database_id: int, comment=None, **kwargs
 ) -> int:
+    """
+    Import a CSV/TSV into a table.
+
+    Args:
+        data_file_id: The Django id of the DataFile containing desired CSV/TSV.
+        table_name: Name of the table to be imported.
+        schema_oid: Identity of the schema in the user's database.
+        database_id: The Django id of the database containing the table.
+        comment: The comment for the new table.
+
+    Returns:
+        The `oid` of the created table.
+    """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
         return import_csv(data_file_id, table_name, schema_oid, conn, comment)
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 3644b808b5..8541233ea4 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -73,6 +73,11 @@
         tables.patch,
         "tables.patch",
         [user_is_authenticated]
+    ),
+    (
+        tables.import_,
+        "tables.import",
+        [user_is_authenticated]
     )
 ]
 
diff --git a/mathesar/tests/rpc/test_tables.py b/mathesar/tests/rpc/test_tables.py
index 76da0bbb1d..76471c2da9 100644
--- a/mathesar/tests/rpc/test_tables.py
+++ b/mathesar/tests/rpc/test_tables.py
@@ -192,3 +192,30 @@ def mock_table_patch(_table_oid, _table_data_dict, conn):
         request=request
     )
     assert altered_table_name == 'newtabname'
+
+
+def test_tables_import(rf, monkeypatch):
+    request = rf.post('/api/rpc/v0', data={})
+    request.user = User(username='alice', password='pass1234')
+    schema_oid = 2200
+    data_file_id = 10
+    database_id = 11
+
+    @contextmanager
+    def mock_connect(_database_id, user):
+        if _database_id == database_id and user.username == 'alice':
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_table_import(_data_file_id, table_name, _schema_oid, conn, comment):
+        if _schema_oid != schema_oid and _data_file_id != data_file_id:
+            raise AssertionError('incorrect parameters passed')
+        return 1964474
+    monkeypatch.setattr(tables, 'connect', mock_connect)
+    monkeypatch.setattr(tables, 'import_csv', mock_table_import)
+    actual_table_oid = tables.import_(data_file_id=10, table_name='imported_table', schema_oid=2200, database_id=11, request=request)
+    assert actual_table_oid == 1964474

From 4df1557d6c59146510a15ad77643d33a6bc6fd20 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 14 Jun 2024 19:24:42 +0530
Subject: [PATCH 0261/1141] fix function signature

---
 mathesar/rpc/tables.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index e27740fa56..1516e12ad6 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -176,7 +176,13 @@ def patch(
 @http_basic_auth_login_required
 @handle_rpc_exceptions
 def import_(
-    *, data_file_id: int, table_name: str, schema_oid: int, database_id: int, comment=None, **kwargs
+    *,
+    data_file_id: int,
+    table_name: str,
+    schema_oid: int,
+    database_id: int,
+    comment: str = None,
+    **kwargs
 ) -> int:
     """
     Import a CSV/TSV into a table.

From a9839a03661b1ffaa03ceb6f8cc54a1e1b154df0 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 14 Jun 2024 19:29:19 +0530
Subject: [PATCH 0262/1141] restore csv.py

---
 mathesar/imports/csv.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mathesar/imports/csv.py b/mathesar/imports/csv.py
index 93478b8357..e1b45236c5 100644
--- a/mathesar/imports/csv.py
+++ b/mathesar/imports/csv.py
@@ -11,6 +11,7 @@
 from mathesar.imports.utils import get_alternate_column_names, process_column_names
 from db.constants import COLUMN_NAME_TEMPLATE
 from psycopg2.errors import IntegrityError, DataError
+
 from mathesar.state import reset_reflection
 
 # The user-facing documentation replicates these delimiter characters. If you

From dc4e54cfcc24d051e59b0376930a172806624237 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 14 Jun 2024 19:31:43 +0530
Subject: [PATCH 0263/1141] imporve test formatting

---
 mathesar/tests/rpc/test_tables.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/mathesar/tests/rpc/test_tables.py b/mathesar/tests/rpc/test_tables.py
index 76471c2da9..d0761730e5 100644
--- a/mathesar/tests/rpc/test_tables.py
+++ b/mathesar/tests/rpc/test_tables.py
@@ -217,5 +217,11 @@ def mock_table_import(_data_file_id, table_name, _schema_oid, conn, comment):
         return 1964474
     monkeypatch.setattr(tables, 'connect', mock_connect)
     monkeypatch.setattr(tables, 'import_csv', mock_table_import)
-    actual_table_oid = tables.import_(data_file_id=10, table_name='imported_table', schema_oid=2200, database_id=11, request=request)
-    assert actual_table_oid == 1964474
+    imported_table_oid = tables.import_(
+        data_file_id=10,
+        table_name='imported_table',
+        schema_oid=2200,
+        database_id=11,
+        request=request
+    )
+    assert imported_table_oid == 1964474

From dac974f1b8bdccd69eab2a6e1a3ffec952b180ad Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 17 Jun 2024 15:26:08 +0800
Subject: [PATCH 0264/1141] move UIQuery model to Exploration

---
 mathesar/admin.py                             |  4 ++--
 mathesar/api/db/viewsets/queries.py           | 12 +++++-----
 mathesar/api/dj_filters.py                    |  6 ++---
 mathesar/api/exceptions/error_codes.py        |  2 +-
 .../validation_exceptions/exceptions.py       |  6 ++---
 mathesar/api/pagination.py                    |  4 ++--
 mathesar/api/serializers/queries.py           | 24 +++++++++----------
 mathesar/api/utils.py                         |  6 ++---
 ...e.py => 0007_users_permissions_remodel.py} |  1 +
 mathesar/models/query.py                      |  4 ++--
 mathesar/models/shares.py                     |  2 +-
 mathesar/rpc/exceptions/error_codes.py        |  2 +-
 mathesar/tests/api/query/conftest.py          |  4 ++--
 mathesar/tests/api/query/test_query_api.py    |  6 ++---
 .../tests/api/query/test_query_records_api.py |  4 ++--
 mathesar/tests/api/test_table_api.py          |  4 ++--
 mathesar/tests/query/test_base.py             |  4 ++--
 mathesar/views.py                             |  4 ++--
 18 files changed, 50 insertions(+), 49 deletions(-)
 rename mathesar/migrations/{0007_rename_database_connection_and_more.py => 0007_users_permissions_remodel.py} (98%)

diff --git a/mathesar/admin.py b/mathesar/admin.py
index 6eca4ac3d5..6afc0e326d 100644
--- a/mathesar/admin.py
+++ b/mathesar/admin.py
@@ -3,7 +3,7 @@
 
 from mathesar.models.deprecated import Table, Schema, DataFile
 from mathesar.models.users import User
-from mathesar.models.query import UIQuery
+from mathesar.models.query import Exploration
 from mathesar.models.shares import SharedTable, SharedQuery
 
 
@@ -24,6 +24,6 @@ class MathesarUserAdmin(UserAdmin):
 admin.site.register(Schema)
 admin.site.register(DataFile)
 admin.site.register(User, MathesarUserAdmin)
-admin.site.register(UIQuery)
+admin.site.register(Exploration)
 admin.site.register(SharedTable)
 admin.site.register(SharedQuery)
diff --git a/mathesar/api/db/viewsets/queries.py b/mathesar/api/db/viewsets/queries.py
index b15b23c0df..c9549fd238 100644
--- a/mathesar/api/db/viewsets/queries.py
+++ b/mathesar/api/db/viewsets/queries.py
@@ -9,13 +9,13 @@
 from rest_framework.decorators import action
 
 from mathesar.api.db.permissions.query import QueryAccessPolicy
-from mathesar.api.dj_filters import UIQueryFilter
+from mathesar.api.dj_filters import ExplorationFilter
 
 from mathesar.api.exceptions.query_exceptions.exceptions import DeletedColumnAccess, DeletedColumnAccessAPIException
 from mathesar.api.pagination import DefaultLimitOffsetPagination, TableLimitOffsetPagination
 from mathesar.api.serializers.queries import BaseQuerySerializer, QuerySerializer
 from mathesar.api.serializers.records import RecordListParameterSerializer
-from mathesar.models.query import UIQuery
+from mathesar.models.query import Exploration
 
 
 class QueryViewSet(
@@ -30,7 +30,7 @@ class QueryViewSet(
     serializer_class = QuerySerializer
     pagination_class = DefaultLimitOffsetPagination
     filter_backends = (filters.DjangoFilterBackend,)
-    filterset_class = UIQueryFilter
+    filterset_class = ExplorationFilter
     permission_classes = [IsAuthenticatedOrReadOnly]
     access_policy = QueryAccessPolicy
 
@@ -55,10 +55,10 @@ def _get_scoped_queryset(self):
         if should_queryset_be_scoped:
             queryset = self.access_policy.scope_queryset(
                 self.request,
-                UIQuery.objects.all()
+                Exploration.objects.all()
             )
         else:
-            queryset = UIQuery.objects.all()
+            queryset = Exploration.objects.all()
         return queryset
 
     @action(methods=['get'], detail=True)
@@ -119,7 +119,7 @@ def run(self, request):
         paginator = TableLimitOffsetPagination()
         input_serializer = BaseQuerySerializer(data=request.data, context={'request': request})
         input_serializer.is_valid(raise_exception=True)
-        query = UIQuery(**input_serializer.validated_data)
+        query = Exploration(**input_serializer.validated_data)
         try:
             query.replace_transformations_with_processed_transformations()
             query.add_defaults_to_display_names()
diff --git a/mathesar/api/dj_filters.py b/mathesar/api/dj_filters.py
index bb850f8ebb..70d2cddb4b 100644
--- a/mathesar/api/dj_filters.py
+++ b/mathesar/api/dj_filters.py
@@ -2,7 +2,7 @@
 from django_property_filter import PropertyFilterSet, PropertyBaseInFilter, PropertyCharFilter, PropertyOrderingFilter
 
 from mathesar.models.deprecated import Schema, Table, Connection, DataFile
-from mathesar.models.query import UIQuery
+from mathesar.models.query import Exploration
 
 
 class CharInFilter(PropertyBaseInFilter, PropertyCharFilter):
@@ -77,7 +77,7 @@ class Meta:
         fields = ['name', 'schema', 'created_at', 'updated_at', 'import_verified']
 
 
-class UIQueryFilter(PropertyFilterSet):
+class ExplorationFilter(PropertyFilterSet):
     database = CharInFilter(field_name='base_table__schema__database__name', lookup_expr='in')
     name = CharInFilter(field_name='name', lookup_expr='in')
 
@@ -90,5 +90,5 @@ class UIQueryFilter(PropertyFilterSet):
     )
 
     class Meta:
-        model = UIQuery
+        model = Exploration
         fields = ['name']
diff --git a/mathesar/api/exceptions/error_codes.py b/mathesar/api/exceptions/error_codes.py
index c5fd4749ce..d4abf2b1ea 100644
--- a/mathesar/api/exceptions/error_codes.py
+++ b/mathesar/api/exceptions/error_codes.py
@@ -64,7 +64,7 @@ class ErrorCodes(Enum):
     DeletedColumnAccess = 4418
     IncorrectOldPassword = 4419
     EditingPublicSchema = 4421
-    DuplicateUIQueryInSchema = 4422
+    DuplicateExplorationInSchema = 4422
     IdentifierTooLong = 4423
     DynamicDefaultAlterationToStaticDefault = 4424
     InvalidJSONFormat = 4425
diff --git a/mathesar/api/exceptions/validation_exceptions/exceptions.py b/mathesar/api/exceptions/validation_exceptions/exceptions.py
index b99e1e1f3b..9187c717aa 100644
--- a/mathesar/api/exceptions/validation_exceptions/exceptions.py
+++ b/mathesar/api/exceptions/validation_exceptions/exceptions.py
@@ -2,12 +2,12 @@
 from mathesar.api.exceptions.validation_exceptions.base_exceptions import MathesarValidationException
 
 
-class DuplicateUIQueryInSchemaAPIException(MathesarValidationException):
-    error_code = ErrorCodes.DuplicateUIQueryInSchema.value
+class DuplicateExplorationInSchemaAPIException(MathesarValidationException):
+    error_code = ErrorCodes.DuplicateExplorationInSchema.value
 
     def __init__(
             self,
-            message="UIQuery names must be unique per schema",
+            message="Exploration names must be unique per schema",
             field=None,
             details=None,
     ):
diff --git a/mathesar/api/pagination.py b/mathesar/api/pagination.py
index ce0f137b57..fad6397ea2 100644
--- a/mathesar/api/pagination.py
+++ b/mathesar/api/pagination.py
@@ -6,7 +6,7 @@
 from db.records.operations.group import GroupBy
 from mathesar.api.utils import get_table_or_404, process_annotated_records
 from mathesar.models.deprecated import Column, Table
-from mathesar.models.query import UIQuery
+from mathesar.models.query import Exploration
 from mathesar.utils.preview import get_preview_info
 
 
@@ -89,7 +89,7 @@ def paginate_queryset(
             table_columns = [{'id': column.id, 'alias': column.name} for column in columns_query]
             columns_to_fetch = table_columns + preview_columns
 
-            query = UIQuery(name="preview", base_table=table, initial_columns=columns_to_fetch)
+            query = Exploration(name="preview", base_table=table, initial_columns=columns_to_fetch)
         else:
             query = table
         records = query.get_records(
diff --git a/mathesar/api/serializers/queries.py b/mathesar/api/serializers/queries.py
index 2e4187d6b0..e49be3cea7 100644
--- a/mathesar/api/serializers/queries.py
+++ b/mathesar/api/serializers/queries.py
@@ -7,9 +7,9 @@
 
 from mathesar.api.db.permissions.query_table import QueryTableAccessPolicy
 from mathesar.api.exceptions.mixins import MathesarErrorMessageMixin
-from mathesar.api.exceptions.validation_exceptions.exceptions import DuplicateUIQueryInSchemaAPIException
+from mathesar.api.exceptions.validation_exceptions.exceptions import DuplicateExplorationInSchemaAPIException
 from mathesar.models.deprecated import Table
-from mathesar.models.query import UIQuery
+from mathesar.models.query import Exploration
 
 
 class BaseQuerySerializer(MathesarErrorMessageMixin, serializers.ModelSerializer):
@@ -20,7 +20,7 @@ class BaseQuerySerializer(MathesarErrorMessageMixin, serializers.ModelSerializer
     )
 
     class Meta:
-        model = UIQuery
+        model = Exploration
         fields = ['schema', 'initial_columns', 'transformations', 'base_table', 'display_names']
 
     def get_schema(self, uiquery):
@@ -48,9 +48,9 @@ def _validate_uniqueness(self, attrs):
             if base_table:
                 schema = base_table.schema
                 is_duplicate_q = self._get_is_duplicate_q(name, schema)
-                duplicates = UIQuery.objects.filter(is_duplicate_q)
+                duplicates = Exploration.objects.filter(is_duplicate_q)
                 if duplicates.exists():
-                    raise DuplicateUIQueryInSchemaAPIException(field='name')
+                    raise DuplicateExplorationInSchemaAPIException(field='name')
 
     def _get_is_duplicate_q(self, name, schema):
         has_same_name_q = Q(name=name)
@@ -71,28 +71,28 @@ class QuerySerializer(BaseQuerySerializer):
     columns_url = serializers.SerializerMethodField('get_columns_url')
 
     class Meta:
-        model = UIQuery
+        model = Exploration
         fields = '__all__'
 
     def get_records_url(self, obj):
-        if isinstance(obj, UIQuery) and obj.pk is not None:
-            # Only get records_url if we are serializing an existing persisted UIQuery
+        if isinstance(obj, Exploration) and obj.pk is not None:
+            # Only get records_url if we are serializing an existing persisted Exploration
             request = self.context['request']
             return request.build_absolute_uri(reverse('query-records', kwargs={'pk': obj.pk}))
         else:
             return None
 
     def get_columns_url(self, obj):
-        if isinstance(obj, UIQuery) and obj.pk is not None:
-            # Only get columns_url if we are serializing an existing persisted UIQuery
+        if isinstance(obj, Exploration) and obj.pk is not None:
+            # Only get columns_url if we are serializing an existing persisted Exploration
             request = self.context['request']
             return request.build_absolute_uri(reverse('query-columns', kwargs={'pk': obj.pk}))
         else:
             return None
 
     def get_results_url(self, obj):
-        if isinstance(obj, UIQuery) and obj.pk is not None:
-            # Only get records_url if we are serializing an existing persisted UIQuery
+        if isinstance(obj, Exploration) and obj.pk is not None:
+            # Only get records_url if we are serializing an existing persisted Exploration
             request = self.context['request']
             return request.build_absolute_uri(reverse('query-results', kwargs={'pk': obj.pk}))
         else:
diff --git a/mathesar/api/utils.py b/mathesar/api/utils.py
index d7a24d8927..be83a84173 100644
--- a/mathesar/api/utils.py
+++ b/mathesar/api/utils.py
@@ -7,7 +7,7 @@
 from db.records.operations import group
 from mathesar.api.exceptions.error_codes import ErrorCodes
 from mathesar.models.deprecated import Table
-from mathesar.models.query import UIQuery
+from mathesar.models.query import Exploration
 from mathesar.utils.preview import column_alias_from_preview_template
 from mathesar.api.exceptions.generic_exceptions.base_exceptions import BadDBCredentials
 import psycopg
@@ -40,8 +40,8 @@ def get_table_or_404(pk):
 
 def get_query_or_404(pk):
     try:
-        query = UIQuery.objects.get(id=pk)
-    except UIQuery.DoesNotExist:
+        query = Exploration.objects.get(id=pk)
+    except Exploration.DoesNotExist:
         raise generic_api_exceptions.NotFoundAPIException(
             NotFound,
             error_code=ErrorCodes.QueryNotFound.value,
diff --git a/mathesar/migrations/0007_rename_database_connection_and_more.py b/mathesar/migrations/0007_users_permissions_remodel.py
similarity index 98%
rename from mathesar/migrations/0007_rename_database_connection_and_more.py
rename to mathesar/migrations/0007_users_permissions_remodel.py
index 930990b452..9f3352beb7 100644
--- a/mathesar/migrations/0007_rename_database_connection_and_more.py
+++ b/mathesar/migrations/0007_users_permissions_remodel.py
@@ -90,4 +90,5 @@ class Migration(migrations.Migration):
             model_name='userdatabaserolemap',
             constraint=models.UniqueConstraint(fields=('user', 'database'), name='user_one_role_per_database'),
         ),
+        migrations.RenameModel(old_name='UIQuery', new_name='Exploration'),
     ]
diff --git a/mathesar/models/query.py b/mathesar/models/query.py
index 5497c78f99..a82450f4d4 100644
--- a/mathesar/models/query.py
+++ b/mathesar/models/query.py
@@ -35,7 +35,7 @@
 from mathesar.state import get_cached_metadata
 
 
-class UIQuery(BaseModel, Relation):
+class Exploration(BaseModel, Relation):
     name = models.CharField(
         max_length=128,
     )
@@ -176,7 +176,7 @@ def replace_transformations_with_processed_transformations(self):
 
         Whereas before the transformations attribute was a one-way flow from the client,
         now it's something that the backend may redefine. This a significant complication of the
-        data flow. For example, if you replace transformations on a saved UIQuery and save it
+        data flow. For example, if you replace transformations on a saved Exploration and save it
         again, we must trigger a reflection, which can have a performance impact. Also, frontend
         must expect that certain transformations might alter the transformation pipeline, which
         would then need reflecting by frontend; that might be a breaking change.
diff --git a/mathesar/models/shares.py b/mathesar/models/shares.py
index 20f076080a..15f9cc3cda 100644
--- a/mathesar/models/shares.py
+++ b/mathesar/models/shares.py
@@ -24,5 +24,5 @@ class SharedTable(SharedEntity):
 
 class SharedQuery(SharedEntity):
     query = models.ForeignKey(
-        'UIQuery', on_delete=models.CASCADE, related_name='shared_query'
+        'Exploration', on_delete=models.CASCADE, related_name='shared_query'
     )
diff --git a/mathesar/rpc/exceptions/error_codes.py b/mathesar/rpc/exceptions/error_codes.py
index 52b4925196..af25368002 100644
--- a/mathesar/rpc/exceptions/error_codes.py
+++ b/mathesar/rpc/exceptions/error_codes.py
@@ -516,7 +516,7 @@ def get_error_code(err: Exception) -> int:
     "DictHasBadKeys": -28007,
     "DistinctColumnRequiredAPIException": -28008,
     "DoesNotExist": -28009,
-    "DuplicateUIQueryInSchemaAPIException": -28010,
+    "DuplicateExplorationInSchemaAPIException": -28010,
     "EditingPublicSchemaIsDisallowed": -28011,
     "GenericAPIException": -28012,
     "IncompatibleFractionDigitValuesAPIException": -28013,
diff --git a/mathesar/tests/api/query/conftest.py b/mathesar/tests/api/query/conftest.py
index 711119f6db..540680ca1e 100644
--- a/mathesar/tests/api/query/conftest.py
+++ b/mathesar/tests/api/query/conftest.py
@@ -1,5 +1,5 @@
 import pytest
-from mathesar.models.query import UIQuery
+from mathesar.models.query import Exploration
 
 
 @pytest.fixture
@@ -37,7 +37,7 @@ def _create(schema_name=schema_name):
             'col1': dict(a=1),
             'col2': dict(b=2),
         }
-        ui_query = UIQuery.objects.create(
+        ui_query = Exploration.objects.create(
             base_table=base_table,
             initial_columns=initial_columns,
             display_options=display_options,
diff --git a/mathesar/tests/api/query/test_query_api.py b/mathesar/tests/api/query/test_query_api.py
index e0c39e6fff..2c2d57acfa 100644
--- a/mathesar/tests/api/query/test_query_api.py
+++ b/mathesar/tests/api/query/test_query_api.py
@@ -1,6 +1,6 @@
 import pytest
 
-from mathesar.models.query import UIQuery
+from mathesar.models.query import Exploration
 
 
 @pytest.fixture
@@ -330,7 +330,7 @@ def test_update_based_on_permission(
 ):
     base_table = create_patents_table(table_name=get_uid())
     different_schema_base_table = create_patents_table(table_name=get_uid(), schema_name='Private Schema')
-    ui_query = UIQuery.objects.create(
+    ui_query = Exploration.objects.create(
         name="Query1",
         base_table=base_table,
         initial_columns=[
@@ -342,7 +342,7 @@ def test_update_based_on_permission(
             }
         ]
     )
-    different_schema_ui_query = UIQuery.objects.create(
+    different_schema_ui_query = Exploration.objects.create(
         name="Query2",
         base_table=different_schema_base_table,
         initial_columns=[
diff --git a/mathesar/tests/api/query/test_query_records_api.py b/mathesar/tests/api/query/test_query_records_api.py
index f35d6c142c..67a0681efc 100644
--- a/mathesar/tests/api/query/test_query_records_api.py
+++ b/mathesar/tests/api/query/test_query_records_api.py
@@ -1,7 +1,7 @@
 import pytest
 import json
 
-from mathesar.models.query import UIQuery
+from mathesar.models.query import Exploration
 
 
 @pytest.fixture
@@ -30,7 +30,7 @@ def joining_patents_query(academics_ma_tables):
         'name': dict(a=1),
         'institution_name': dict(b=2),
     }
-    ui_query = UIQuery.objects.create(
+    ui_query = Exploration.objects.create(
         base_table=academics_table,
         initial_columns=initial_columns,
         display_options=display_options,
diff --git a/mathesar/tests/api/test_table_api.py b/mathesar/tests/api/test_table_api.py
index b5ce0b906d..55e7fdbc73 100644
--- a/mathesar/tests/api/test_table_api.py
+++ b/mathesar/tests/api/test_table_api.py
@@ -10,7 +10,7 @@
 from db.types.base import PostgresType, MathesarCustomType
 from db.metadata import get_empty_metadata
 from mathesar.models.users import DatabaseRole, SchemaRole
-from mathesar.models.query import UIQuery
+from mathesar.models.query import Exploration
 
 from mathesar.state import reset_reflection
 from mathesar.api.exceptions.error_codes import ErrorCodes
@@ -1876,7 +1876,7 @@ def test_table_ui_dependency(client, create_patents_table, get_uid):
             },
         ],
     }
-    query = UIQuery.objects.create(**query_data)
+    query = Exploration.objects.create(**query_data)
     response = client.get(f'/api/db/v0/tables/{base_table.id}/ui_dependents/')
     response_data = response.json()
     expected_response = {
diff --git a/mathesar/tests/query/test_base.py b/mathesar/tests/query/test_base.py
index 16eb9c637a..c8611843ba 100644
--- a/mathesar/tests/query/test_base.py
+++ b/mathesar/tests/query/test_base.py
@@ -1,4 +1,4 @@
-from mathesar.models.query import UIQuery
+from mathesar.models.query import Exploration
 from db.queries.base import DBQuery, InitialColumn
 from db.transforms import base as transforms_base
 
@@ -49,7 +49,7 @@ def test_convert_to_db_query(create_patents_table, get_uid):
         transforms_base.Offset(15),
     ]
     name = "some query"
-    ui_query = UIQuery(
+    ui_query = Exploration(
         name=name,
         base_table=base_table_dj,
         initial_columns=initial_columns_json,
diff --git a/mathesar/views.py b/mathesar/views.py
index 3b05ccabf0..e88b596881 100644
--- a/mathesar/views.py
+++ b/mathesar/views.py
@@ -19,7 +19,7 @@
 from mathesar.api.utils import is_valid_uuid_v4
 from mathesar.database.types import UIType
 from mathesar.models.deprecated import Connection, Schema, Table
-from mathesar.models.query import UIQuery
+from mathesar.models.query import Exploration
 from mathesar.models.shares import SharedTable, SharedQuery
 from mathesar.state import reset_reflection
 from mathesar import __version__
@@ -96,7 +96,7 @@ def get_table_list(request, schema):
 def get_queries_list(request, schema):
     if schema is None:
         return []
-    qs = UIQuery.objects.filter(base_table__schema=schema)
+    qs = Exploration.objects.filter(base_table__schema=schema)
     permission_restricted_qs = QueryAccessPolicy.scope_queryset(request, qs)
 
     query_serializer = QuerySerializer(

From e6571e61973261828efc58715b690bcec669a280 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 17 Jun 2024 16:42:05 +0800
Subject: [PATCH 0265/1141] add multicolumn integrity enforcers

---
 .../0007_users_permissions_remodel.py         | 39 ++++++++++++++++---
 mathesar/models/base.py                       | 10 +++++
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/mathesar/migrations/0007_users_permissions_remodel.py b/mathesar/migrations/0007_users_permissions_remodel.py
index 9f3352beb7..8ca607bd8f 100644
--- a/mathesar/migrations/0007_users_permissions_remodel.py
+++ b/mathesar/migrations/0007_users_permissions_remodel.py
@@ -14,10 +14,8 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RenameModel(
-            old_name='Database',
-            new_name='Connection',
-        ),
+        migrations.RenameModel(old_name='Database', new_name='Connection'),
+        migrations.RenameModel(old_name='UIQuery', new_name='Exploration'),
         migrations.AlterField(
             model_name='databaserole',
             name='database',
@@ -60,6 +58,10 @@ class Migration(migrations.Migration):
             model_name='database',
             constraint=models.UniqueConstraint(fields=('name', 'server'), name='unique_database'),
         ),
+        migrations.AddConstraint(
+            model_name='database',
+            constraint=models.UniqueConstraint(fields=('id', 'server'), name='database_id_server_index'),
+        ),
         migrations.CreateModel(
             name='Role',
             fields=[
@@ -74,6 +76,10 @@ class Migration(migrations.Migration):
                 'abstract': False,
             },
         ),
+        migrations.AddConstraint(
+            model_name='role',
+            constraint=models.UniqueConstraint(fields=('id', 'server'), name='role_id_server_index'),
+        ),
         migrations.CreateModel(
             name='UserDatabaseRoleMap',
             fields=[
@@ -90,5 +96,28 @@ class Migration(migrations.Migration):
             model_name='userdatabaserolemap',
             constraint=models.UniqueConstraint(fields=('user', 'database'), name='user_one_role_per_database'),
         ),
-        migrations.RenameModel(old_name='UIQuery', new_name='Exploration'),
+        migrations.RunSQL(
+            sql="""
+            ALTER TABLE mathesar_userdatabaserolemap
+            ADD CONSTRAINT userdatabaserolemap_database_server_integrity
+              FOREIGN KEY (database_id, server_id)
+              REFERENCES mathesar_database(id, server_id);
+            """,
+            reverse_sql="""
+            ALTER TABLE mathesar_userdatabaserolemap
+            DROP CONSTRAINT userdatabaserolemap_database_server_integrity;
+            """
+        ),
+        migrations.RunSQL(
+            sql="""
+            ALTER TABLE mathesar_userdatabaserolemap
+            ADD CONSTRAINT userdatabaserolemap_role_server_integrity
+              FOREIGN KEY (role_id, server_id)
+              REFERENCES mathesar_role(id, server_id);
+            """,
+            reverse_sql="""
+            ALTER TABLE mathesar_userdatabaserolemap
+            DROP CONSTRAINT userdatabaserolemap_role_server_integrity;
+            """
+        ),
     ]
diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index 0a60f83c76..1086f3c87a 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -25,6 +25,9 @@ class Meta:
         constraints = [
             models.UniqueConstraint(
                 fields=["name", "server"], name="unique_database"
+            ),
+            models.UniqueConstraint(
+                fields=["id", "server"], name="database_id_server_index"
             )
         ]
 
@@ -36,6 +39,13 @@ class Role(BaseModel):
     )
     password = EncryptedCharField(max_length=255)
 
+    class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["id", "server"], name="role_id_server_index"
+            )
+        ]
+
 
 class UserDatabaseRoleMap(BaseModel):
     user = models.ForeignKey('User', on_delete=models.CASCADE)

From 4afc251f5b5d21d0e157d2ff12fdb76a45ef1215 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 17 Jun 2024 17:18:38 +0800
Subject: [PATCH 0266/1141] fix linter error

---
 mathesar/migrations/0007_users_permissions_remodel.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mathesar/migrations/0007_users_permissions_remodel.py b/mathesar/migrations/0007_users_permissions_remodel.py
index 8ca607bd8f..f9d69b6212 100644
--- a/mathesar/migrations/0007_users_permissions_remodel.py
+++ b/mathesar/migrations/0007_users_permissions_remodel.py
@@ -7,6 +7,7 @@
 
 import mathesar.models.deprecated
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -15,7 +16,6 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.RenameModel(old_name='Database', new_name='Connection'),
-        migrations.RenameModel(old_name='UIQuery', new_name='Exploration'),
         migrations.AlterField(
             model_name='databaserole',
             name='database',
@@ -31,6 +31,7 @@ class Migration(migrations.Migration):
             name='column_order',
             field=models.JSONField(blank=True, default=None, null=True, validators=[mathesar.models.deprecated.validate_column_order]),
         ),
+        migrations.RenameModel(old_name='UIQuery', new_name='Exploration'),
         migrations.CreateModel(
             name='Server',
             fields=[

From 59693911fef66575aa96fce16a40213e50fec28a Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 17 Jun 2024 18:11:50 +0800
Subject: [PATCH 0267/1141] update pandas to sort out build error

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 5ae8c5bd9e..cf6bc29440 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -26,6 +26,6 @@ SQLAlchemy-Utils==0.38.2
 thefuzz==0.19.0
 whitenoise==6.4.0
 gunicorn==20.1.0
-pandas==2.0.2
+pandas==2.2.2
 openpyxl==3.1.2
 pyxlsb==1.0.10

From 3f1f84f1bbb26d2266ee27d09d2c1a79de63cf3e Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 17 Jun 2024 12:09:29 -0400
Subject: [PATCH 0268/1141] Add schemas.patch RPC function

---
 db/schemas/operations/alter.py            |  47 +++-----
 db/sql/00_msar.sql                        | 125 +++++++++-------------
 db/sql/test_00_msar.sql                   |  61 +++++------
 db/tests/schemas/operations/test_alter.py |  28 -----
 docs/docs/api/rpc.md                      |   2 +
 mathesar/rpc/schemas.py                   |  34 +++++-
 mathesar/tests/rpc/test_endpoints.py      |   5 +
 mathesar/utils/models.py                  |   6 +-
 8 files changed, 135 insertions(+), 173 deletions(-)
 delete mode 100644 db/tests/schemas/operations/test_alter.py

diff --git a/db/schemas/operations/alter.py b/db/schemas/operations/alter.py
index 919997eff0..994cdb1fae 100644
--- a/db/schemas/operations/alter.py
+++ b/db/schemas/operations/alter.py
@@ -1,46 +1,31 @@
-from db.connection import execute_msar_func_with_engine
+import json
 
-SUPPORTED_SCHEMA_ALTER_ARGS = {'name', 'description'}
+from db.connection import execute_msar_func_with_engine, exec_msar_func
 
 
-def rename_schema(schema_name, engine, rename_to):
+def patch_schema_via_sql_alchemy(schema_name, engine, patch):
     """
-    Rename an existing schema.
+    Patch a schema using a SQLAlchemy engine.
 
     Args:
         schema_name: Name of the schema to change.
         engine: SQLAlchemy engine object for connecting.
-        rename_to: New schema name.
-
-    Returns:
-        Returns a string giving the command that was run.
+        patch: A dict mapping the following fields to new values:
+            - 'name' (optional): New name for the schema.
+            - 'description' (optional): New description for the schema.
     """
-    if rename_to == schema_name:
-        return
-    return execute_msar_func_with_engine(
-        engine, 'rename_schema', schema_name, rename_to
-    ).fetchone()[0]
+    execute_msar_func_with_engine(engine, "patch_schema", schema_name, json.dumps(patch))
 
 
-def comment_on_schema(schema_name, engine, comment):
+def patch_schema(schema_oid, conn, patch):
     """
-    Change description of a schema.
+    Patch a schema using a psycopg connection.
 
     Args:
-        schema_name: The name of the schema whose comment we will change.
-        comment: The new comment.
-        engine: SQLAlchemy engine object for connecting.
-
-    Returns:
-        Returns a string giving the command that was run.
+        schema_oid: The OID of the schema to change.
+        conn: a psycopg connection
+        patch: A dict mapping the following fields to new values:
+            - 'name' (optional): New name for the schema.
+            - 'description' (optional): New description for the schema.
     """
-    return execute_msar_func_with_engine(
-        engine, 'comment_on_schema', schema_name, comment
-    ).fetchone()[0]
-
-
-def alter_schema(name, engine, update_data):
-    if "description" in update_data:
-        comment_on_schema(name, engine, update_data["description"])
-    if "name" in update_data:
-        rename_schema(name, engine, update_data["name"])
+    exec_msar_func(conn, "patch_schema", schema_oid, json.dumps(patch))
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 52e69e92e9..f242b84797 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -162,18 +162,26 @@ SELECT oid FROM pg_namespace WHERE nspname=sch_name;
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
-CREATE OR REPLACE FUNCTION __msar.get_schema_name(sch_id oid) RETURNS TEXT AS $$/*
-Return the QUOTED name for a given schema.
+CREATE OR REPLACE FUNCTION msar.get_schema_name(sch_id oid) RETURNS TEXT AS $$/*
+Return the UNQUOTED name for a given schema.
 
-The schema *must* be in the pg_namespace table to use this function.
+Raises an exception if the schema is not found.
 
 Args:
   sch_id: The OID of the schema.
 */
+DECLARE sch_name text;
 BEGIN
-  RETURN sch_id::regnamespace::text;
+  SELECT nspname INTO sch_name FROM pg_namespace WHERE oid=sch_id;
+
+  IF sch_name IS NULL THEN
+    RAISE EXCEPTION 'No schema with OID % exists.', sch_id
+    USING ERRCODE = '3F000'; -- invalid_schema_name
+  END IF;
+
+  RETURN sch_name;
 END;
-$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE plpgsql;
 
 
 CREATE OR REPLACE FUNCTION
@@ -834,95 +842,71 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 
-
--- Rename schema -----------------------------------------------------------------------------------
-
-CREATE OR REPLACE FUNCTION
-__msar.rename_schema(old_sch_name text, new_sch_name text) RETURNS TEXT AS $$/*
-Change a schema's name, returning the command executed.
+DROP FUNCTION IF EXISTS msar.rename_schema(oid, text);
+CREATE OR REPLACE FUNCTION msar.rename_schema(sch_id oid, new_sch_name text) RETURNS void AS $$/*
+Change a schema's name
 
 Args:
-  old_sch_name: A properly quoted original schema name
-  new_sch_name: A properly quoted new schema name
+  sch_id: The OID of the schema to rename
+  new_sch_name: A new for the schema, UNQUOTED
 */
 DECLARE
-  cmd_template text;
-BEGIN
-  cmd_template := 'ALTER SCHEMA %s RENAME TO %s';
-  RETURN __msar.exec_ddl(cmd_template, old_sch_name, new_sch_name);
-END;
-$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
-
-
-CREATE OR REPLACE FUNCTION
-msar.rename_schema(old_sch_name text, new_sch_name text) RETURNS TEXT AS $$/*
-Change a schema's name, returning the command executed.
-
-Args:
-  old_sch_name: An unquoted original schema name
-  new_sch_name: An unquoted new schema name
-*/
-BEGIN
-  RETURN __msar.rename_schema(quote_ident(old_sch_name), quote_ident(new_sch_name));
-END;
-$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
-
-
-CREATE OR REPLACE FUNCTION msar.rename_schema(sch_id oid, new_sch_name text) RETURNS TEXT AS $$/*
-Change a schema's name, returning the command executed.
-
-Args:
-  sch_id: The OID of the original schema
-  new_sch_name: An unquoted new schema name
-*/
+  old_sch_name text := msar.get_schema_name(sch_id);
 BEGIN
-  RETURN __msar.rename_schema(__msar.get_schema_name(sch_id), quote_ident(new_sch_name));
+  IF old_sch_name = new_sch_name THEN
+    -- Return early if the names are the same. This avoids an error from Postgres.
+    RETURN;
+  END IF;
+  EXECUTE format('ALTER SCHEMA %I RENAME TO %I', old_sch_name, new_sch_name);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
--- Comment on schema -------------------------------------------------------------------------------
+CREATE OR REPLACE FUNCTION msar.set_schema_description(
+  sch_id oid,
+  description text
+) RETURNS void AS $$/*
+Set the PostgreSQL description (aka COMMENT) of a schema.
 
-CREATE OR REPLACE FUNCTION
-__msar.comment_on_schema(sch_name text, comment_ text) RETURNS TEXT AS $$/*
-Change the description of a schema, returning command executed.
+Descriptions are removed by passing an empty string. Passing a NULL description will cause
+this function to return NULL withou doing anything.
 
 Args:
-  sch_name: The QUOTED name of the schema whose comment we will change.
-  comment_: The new comment, QUOTED
+  sch_id: The OID of the schema.
+  description: The new description, UNQUOTED
 */
-DECLARE
-  cmd_template text;
 BEGIN
-  cmd_template := 'COMMENT ON SCHEMA %s IS %s';
-  RETURN __msar.exec_ddl(cmd_template, sch_name, comment_);
+  EXECUTE format('COMMENT ON SCHEMA %I IS %L', msar.get_schema_name(sch_id), description);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
-CREATE OR REPLACE FUNCTION
-msar.comment_on_schema(sch_name text, comment_ text) RETURNS TEXT AS $$/*
-Change the description of a schema, returning command executed.
+CREATE OR REPLACE FUNCTION msar.patch_schema(sch_id oid, patch jsonb) RETURNS void AS $$/*
+Modify a schema according to the given patch.
 
 Args:
-  sch_name: The UNQUOTED name of the schema whose comment we will change.
-  comment_: The new comment, UNQUOTED
+  sch_id: The OID of the schema.
+  patch: A JSONB object with the following keys:
+    - name: (optional) The new name of the schema
+    - description: (optional) The new description of the schema. To remove a description, pass an
+      empty string. Passing a NULL description will have no effect on the description.
 */
 BEGIN
-  RETURN __msar.comment_on_schema(quote_ident(sch_name), quote_literal(comment_));
+  PERFORM msar.rename_schema(sch_id, patch->>'name');
+  PERFORM msar.set_schema_description(sch_id, patch->>'description');
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
-CREATE OR REPLACE FUNCTION msar.comment_on_schema(sch_id oid, comment_ text) RETURNS TEXT AS $$/*
-Change the description of a schema, returning command executed.
+CREATE OR REPLACE FUNCTION msar.patch_schema(sch_name text, patch jsonb) RETURNS void AS $$/*
+Modify a schema according to the given patch.
 
 Args:
-  sch_id: The OID of the schema.
-  comment_: The new comment, UNQUOTED
+  sch_id: The name of the schema.
+  patch: A JSONB object as specified by msar.patch_schema(sch_id oid, patch jsonb)
 */
 BEGIN
-  RETURN __msar.comment_on_schema(__msar.get_schema_name(sch_id), quote_literal(comment_));
+  PERFORM msar.patch_schema(msar.get_schema_oid(sch_name), patch);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
@@ -979,7 +963,7 @@ DECLARE schema_oid oid;
 BEGIN
   EXECUTE 'CREATE SCHEMA ' || quote_ident(sch_name);
   schema_oid := msar.get_schema_oid(sch_name);
-  PERFORM msar.comment_on_schema(schema_oid, description);
+  PERFORM msar.set_schema_description(schema_oid, description);
   RETURN schema_oid;
 END;
 $$ LANGUAGE plpgsql;
@@ -1022,15 +1006,8 @@ Args:
   sch_id: The OID of the schema to drop
   cascade_: When true, dependent objects will be dropped automatically
 */
-DECLARE
-  sch_name text;
 BEGIN
-  SELECT nspname INTO sch_name FROM pg_namespace WHERE oid = sch_id;
-  IF sch_name IS NULL THEN
-    RAISE EXCEPTION 'No schema with OID % exists.', sch_id
-    USING ERRCODE = '3F000'; -- invalid_schema_name
-  END IF;
-  PERFORM msar.drop_schema(sch_name, cascade_);
+  PERFORM msar.drop_schema(msar.get_schema_name(sch_id), cascade_);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
@@ -2339,7 +2316,7 @@ DECLARE
   column_defs __msar.col_def[];
   constraint_defs __msar.con_def[];
 BEGIN
-  fq_table_name := format('%s.%s', __msar.get_schema_name(sch_oid), quote_ident(tab_name));
+  fq_table_name := format('%I.%I', msar.get_schema_name(sch_oid), tab_name);
   column_defs := msar.process_col_def_jsonb(0, col_defs, false, true);
   constraint_defs := msar.process_con_def_jsonb(0, con_defs);
   PERFORM __msar.add_table(fq_table_name, column_defs, constraint_defs);
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index db10bb73e5..9bce00d3cf 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -1310,47 +1310,40 @@ END;
 $$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION __setup_alter_schema() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION test_patch_schema() RETURNS SETOF TEXT AS $$
+DECLARE sch_oid oid;
 BEGIN
-  CREATE SCHEMA alter_me;
-END;
-$$ LANGUAGE plpgsql;
-
+  CREATE SCHEMA foo;
+  SELECT msar.get_schema_oid('foo') INTO sch_oid;
 
-CREATE OR REPLACE FUNCTION test_rename_schema() RETURNS SETOF TEXT AS $$
-BEGIN
-  PERFORM __setup_alter_schema();
-  PERFORM msar.rename_schema(
-    old_sch_name => 'alter_me',
-    new_sch_name => 'altered'
-  );
-  RETURN NEXT hasnt_schema('alter_me');
+  PERFORM msar.patch_schema('foo', '{"name": "altered"}');
+  RETURN NEXT hasnt_schema('foo');
   RETURN NEXT has_schema('altered');
-END;
-$$ LANGUAGE plpgsql;
+  RETURN NEXT is(obj_description(sch_oid), NULL);
+  RETURN NEXT is(msar.get_schema_name(sch_oid), 'altered');
 
+  PERFORM msar.patch_schema(sch_oid, '{"description": "yay"}');
+  RETURN NEXT is(obj_description(sch_oid), 'yay');
 
-CREATE OR REPLACE FUNCTION test_rename_schema_using_oid() RETURNS SETOF TEXT AS $$
-BEGIN
-  PERFORM __setup_alter_schema();
-  PERFORM msar.rename_schema(
-    sch_id => 'alter_me'::regnamespace::oid,
-    new_sch_name => 'altered'
-  );
-  RETURN NEXT hasnt_schema('alter_me');
-  RETURN NEXT has_schema('altered');
-END;
-$$ LANGUAGE plpgsql;
+  -- Edge case: setting the description to null doesn't actually remove it. This behavior is
+  -- debatable. I did it this way because it was easier to implement.
+  PERFORM msar.patch_schema(sch_oid, '{"description": null}');
+  RETURN NEXT is(obj_description(sch_oid), 'yay');
 
+  -- Description is removed when an empty string is passed.
+  PERFORM msar.patch_schema(sch_oid, '{"description": ""}');
+  RETURN NEXT is(obj_description(sch_oid), NULL);
 
-CREATE OR REPLACE FUNCTION test_comment_on_schema() RETURNS SETOF TEXT AS $$
-BEGIN
-  PERFORM __setup_alter_schema();
-  PERFORM msar.comment_on_schema(
-    sch_name => 'alter_me',
-    comment_ => 'test comment'
-  );
-  RETURN NEXT is(obj_description('alter_me'::regnamespace::oid), 'test comment');
+  PERFORM msar.patch_schema(sch_oid, '{"name": "NEW", "description": "WOW"}');
+  RETURN NEXT has_schema('NEW');
+  RETURN NEXT is(msar.get_schema_name(sch_oid), 'NEW');
+  RETURN NEXT is(obj_description(sch_oid), 'WOW');
+
+  -- Patching should be idempotent
+  PERFORM msar.patch_schema(sch_oid, '{"name": "NEW", "description": "WOW"}');
+  RETURN NEXT has_schema('NEW');
+  RETURN NEXT is(msar.get_schema_name(sch_oid), 'NEW');
+  RETURN NEXT is(obj_description(sch_oid), 'WOW');
 END;
 $$ LANGUAGE plpgsql;
 
diff --git a/db/tests/schemas/operations/test_alter.py b/db/tests/schemas/operations/test_alter.py
deleted file mode 100644
index 3cc3e7c995..0000000000
--- a/db/tests/schemas/operations/test_alter.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from unittest.mock import patch
-import db.schemas.operations.alter as sch_alter
-
-
-def test_rename_schema(engine_with_schema):
-    engine = engine_with_schema
-    with patch.object(sch_alter, 'execute_msar_func_with_engine') as mock_exec:
-        sch_alter.rename_schema('rename_me', engine, rename_to='renamed')
-    call_args = mock_exec.call_args_list[0][0]
-    assert call_args[0] == engine
-    assert call_args[1] == "rename_schema"
-    assert call_args[2] == "rename_me"
-    assert call_args[3] == "renamed"
-
-
-def test_comment_on_schema(engine_with_schema):
-    engine = engine_with_schema
-    with patch.object(sch_alter, 'execute_msar_func_with_engine') as mock_exec:
-        sch_alter.comment_on_schema(
-            schema_name='comment_on_me',
-            engine=engine,
-            comment='This is a comment'
-        )
-    call_args = mock_exec.call_args_list[0][0]
-    assert call_args[0] == engine
-    assert call_args[1] == "comment_on_schema"
-    assert call_args[2] == "comment_on_me"
-    assert call_args[3] == "This is a comment"
diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 1f2e5e0e30..2086e7d825 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -54,7 +54,9 @@ To use an RPC function:
       - list_
       - add
       - delete
+      - patch
       - SchemaInfo
+      - SchemaPatch
 
 ---
 
diff --git a/mathesar/rpc/schemas.py b/mathesar/rpc/schemas.py
index 890f5c5747..66bd1e4b97 100644
--- a/mathesar/rpc/schemas.py
+++ b/mathesar/rpc/schemas.py
@@ -10,6 +10,7 @@
 from db.schemas.operations.create import create_schema
 from db.schemas.operations.select import get_schemas
 from db.schemas.operations.drop import drop_schema_via_oid
+from db.schemas.operations.alter import patch_schema
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
 
@@ -30,6 +31,16 @@ class SchemaInfo(TypedDict):
     table_count: int
 
 
+class SchemaPatch(TypedDict):
+    """
+    Attributes:
+        name: The name of the schema
+        description: A description of the schema
+    """
+    name: Optional[str]
+    description: Optional[str]
+
+
 @rpc_method(name="schemas.add")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
@@ -82,13 +93,30 @@ def list_(*, database_id: int, **kwargs) -> list[SchemaInfo]:
 @rpc_method(name="schemas.delete")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def delete(*, schema_id: int, database_id: int, **kwargs) -> None:
+def delete(*, schema_oid: int, database_id: int, **kwargs) -> None:
     """
     Delete a schema, given its OID.
 
     Args:
-        schema_id: The OID of the schema to delete.
+        schema_oid: The OID of the schema to delete.
         database_id: The Django id of the database containing the schema.
     """
     with connect(database_id, kwargs.get(REQUEST_KEY).user) as conn:
-        drop_schema_via_oid(conn, schema_id)
+        drop_schema_via_oid(conn, schema_oid)
+
+
+@rpc_method(name="schemas.patch")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def patch(*, schema_oid: int, database_id: int, patch: SchemaPatch, **kwargs) -> None:
+    """
+    Patch a schema, given its OID.
+
+    Args:
+        schema_oid: The OID of the schema to delete.
+        database_id: The Django id of the database containing the schema.
+        patch: A SchemaPatch object containing the fields to update.
+    """
+    with connect(database_id, kwargs.get(REQUEST_KEY).user) as conn:
+        patch_schema(schema_oid, conn, patch)
+
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index c290cac843..d51ac78fa9 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -59,6 +59,11 @@
         "schemas.delete",
         [user_is_authenticated]
     ),
+    (
+        schemas.patch,
+        "schemas.patch",
+        [user_is_authenticated]
+    ),
     (
         tables.list_,
         "tables.list",
diff --git a/mathesar/utils/models.py b/mathesar/utils/models.py
index 6072f95bd5..85904a0847 100644
--- a/mathesar/utils/models.py
+++ b/mathesar/utils/models.py
@@ -7,7 +7,7 @@
 from rest_framework.exceptions import ValidationError
 
 from db.tables.operations.alter import alter_table, SUPPORTED_TABLE_ALTER_ARGS
-from db.schemas.operations.alter import alter_schema, SUPPORTED_SCHEMA_ALTER_ARGS
+from db.schemas.operations.alter import patch_schema_via_sql_alchemy
 from db.columns.exceptions import InvalidTypeError
 
 from mathesar.api.exceptions.error_codes import ErrorCodes
@@ -47,12 +47,12 @@ def update_sa_schema(schema, validated_data):
         ErrorCodes.UnsupportedAlter.value,
         message=f'Updating {arg} for schema is not supported.'
     )
-        for arg in set(validated_data) - SUPPORTED_SCHEMA_ALTER_ARGS]
+        for arg in set(validated_data) - {'name', 'description'}]
     if errors:
         raise base_api_exceptions.GenericAPIException(errors, status_code=status.HTTP_400_BAD_REQUEST)
     if errors:
         raise ValidationError(errors)
-    alter_schema(schema.name, schema._sa_engine, validated_data)
+    patch_schema_via_sql_alchemy(schema.name, schema._sa_engine, validated_data)
 
 
 def ensure_cached_engine_ready(engine):

From ecc6fe74da75bdfa56a2fee3538fe42daebbc758 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 17 Jun 2024 20:48:52 -0400
Subject: [PATCH 0269/1141] Fix linting error

---
 mathesar/rpc/schemas.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mathesar/rpc/schemas.py b/mathesar/rpc/schemas.py
index 66bd1e4b97..a372f3b8e0 100644
--- a/mathesar/rpc/schemas.py
+++ b/mathesar/rpc/schemas.py
@@ -119,4 +119,3 @@ def patch(*, schema_oid: int, database_id: int, patch: SchemaPatch, **kwargs) ->
     """
     with connect(database_id, kwargs.get(REQUEST_KEY).user) as conn:
         patch_schema(schema_oid, conn, patch)
-

From 85c87813906b4077208b37d03e9c233491b3ce87 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 18 Jun 2024 15:59:00 +0800
Subject: [PATCH 0270/1141] add connect method to map model, fix constraint

---
 .../migrations/0007_users_permissions_remodel.py  |  4 ++++
 mathesar/models/base.py                           | 15 +++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/mathesar/migrations/0007_users_permissions_remodel.py b/mathesar/migrations/0007_users_permissions_remodel.py
index f9d69b6212..7ee5e4a67b 100644
--- a/mathesar/migrations/0007_users_permissions_remodel.py
+++ b/mathesar/migrations/0007_users_permissions_remodel.py
@@ -77,6 +77,10 @@ class Migration(migrations.Migration):
                 'abstract': False,
             },
         ),
+        migrations.AddConstraint(
+            model_name='role',
+            constraint=models.UniqueConstraint(fields=('name', 'server'), name='unique_role'),
+        ),
         migrations.AddConstraint(
             model_name='role',
             constraint=models.UniqueConstraint(fields=('id', 'server'), name='role_id_server_index'),
diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index 1086f3c87a..971837219f 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -1,5 +1,6 @@
 from django.db import models
 from encrypted_fields.fields import EncryptedCharField
+import psycopg
 
 
 class BaseModel(models.Model):
@@ -41,6 +42,9 @@ class Role(BaseModel):
 
     class Meta:
         constraints = [
+            models.UniqueConstraint(
+                fields=["name", "server"], name="unique_role"
+            ),
             models.UniqueConstraint(
                 fields=["id", "server"], name="role_id_server_index"
             )
@@ -59,3 +63,14 @@ class Meta:
                 fields=["user", "database"], name="user_one_role_per_database"
             )
         ]
+
+
+    @property
+    def connection(self):
+        return psycopg.connect(
+            host=self.server.host,
+            port=self.server.port,
+            dbname=self.database.name,
+            user=self.role.name,
+            password=self.role.password,
+        )

From 4bd3487d39eac3d26bff4b55560b09a0a008b6e6 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 18 Jun 2024 16:12:35 +0800
Subject: [PATCH 0271/1141] add python function to migrate connections to new
 models

---
 mathesar/utils/permissions.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 mathesar/utils/permissions.py

diff --git a/mathesar/utils/permissions.py b/mathesar/utils/permissions.py
new file mode 100644
index 0000000000..c9272a036b
--- /dev/null
+++ b/mathesar/utils/permissions.py
@@ -0,0 +1,20 @@
+from mathesar.models.base import Server, Database, Role, UserDatabaseRoleMap
+from mathesar.models.deprecated import Connection
+from mathesar.models.users import User
+
+
+def create_user_database_role_map(connection_id, user_id):
+    """Move data from old-style connection model to new models."""
+    conn = Connection.current_objects.get(id=connection_id)
+
+    server = Server.objects.get_or_create(host=conn.host, port=conn.port)[0]
+    database = Database.objects.get_or_create(name=conn.db_name, server=server)[0]
+    role = Role.objects.get_or_create(
+        name=conn.username, server=server, password=conn.password
+    )[0]
+    return UserDatabaseRoleMap.objects.create(
+        user=User.objects.get(id=user_id),
+        database=database,
+        role=role,
+        server=server
+    )

From 386e93fa7a8758bcf9319a4b03f7b5063f766844 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 18 Jun 2024 16:17:12 +0800
Subject: [PATCH 0272/1141] add RPC utility function for migrating old
 connections

---
 mathesar/rpc/connections.py          | 21 ++++++++++++++++++++-
 mathesar/tests/rpc/test_endpoints.py |  5 +++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/mathesar/rpc/connections.py b/mathesar/rpc/connections.py
index 7972992a47..59be60a74f 100644
--- a/mathesar/rpc/connections.py
+++ b/mathesar/rpc/connections.py
@@ -6,7 +6,7 @@
 from modernrpc.core import rpc_method
 from modernrpc.auth.basic import http_basic_auth_superuser_required
 
-from mathesar.utils import connections
+from mathesar.utils import connections, permissions
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 
 
@@ -125,3 +125,22 @@ def add_from_scratch(
         user, password, host, port, nickname, database, sample_data
     )
     return DBModelReturn.from_db_model(db_model)
+
+
+@rpc_method(name='connections.grant_access_to_user')
+@http_basic_auth_superuser_required
+@handle_rpc_exceptions
+def grant_access_to_user(*, connection_id: int, user_id: int):
+    """
+    Migrate a connection to new models, grant access for a user.
+
+    This function is designed to be temporary, and should probably be
+    removed once we have completed the new users and permissions setup
+    for beta. You pass any conneciton id and user id. The function will
+    fill the required models as needed.
+
+    Args:
+        connection_id: The Django id of an old-style connection.
+        user_id: The Django id of a user.
+    """
+    permissions.create_user_database_role_map(connection_id, user_id)
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index c290cac843..35a7cd75e1 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -44,6 +44,11 @@
         "connections.add_from_scratch",
         [user_is_superuser]
     ),
+    (
+        connections.grant_access_to_user,
+        "connections.grant_access_to_user",
+        [user_is_superuser]
+    ),
     (
         schemas.add,
         "schemas.add",

From 000f3cd1606ef6f346533f866e00d47fc36c3a93 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 18 Jun 2024 16:17:44 +0800
Subject: [PATCH 0273/1141] use new models to get connections for db access

---
 mathesar/rpc/utils.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mathesar/rpc/utils.py b/mathesar/rpc/utils.py
index 57118f0f9b..c307a8986c 100644
--- a/mathesar/rpc/utils.py
+++ b/mathesar/rpc/utils.py
@@ -1,14 +1,14 @@
-from mathesar.database.base import get_psycopg_connection
-from mathesar.models.deprecated import Connection
+from mathesar.models.base import UserDatabaseRoleMap
 
 
-def connect(conn_id, user):
+def connect(database_id, user):
     """
     Return a psycopg connection, given a Connection model id.
 
     Args:
         conn_id: The Django id corresponding to the Connection.
     """
-    print("User is: ", user)
-    conn_model = Connection.current_objects.get(id=conn_id)
-    return get_psycopg_connection(conn_model)
+    user_database_role = UserDatabaseRoleMap.objects.get(
+        user=user, database__id=database_id
+    )
+    return user_database_role.connection

From effa934b47d2f6428d2171c0cd16acfa131ca5fc Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 18 Jun 2024 16:47:59 +0800
Subject: [PATCH 0274/1141] implement documentation for new RPC function

---
 docs/docs/api/rpc.md        | 1 +
 mathesar/rpc/connections.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 1f2e5e0e30..b149a9045d 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -44,6 +44,7 @@ To use an RPC function:
       members:
       - add_from_known_connection
       - add_from_scratch
+      - grant_access_to_user
       - DBModelReturn
 
 ---
diff --git a/mathesar/rpc/connections.py b/mathesar/rpc/connections.py
index 59be60a74f..578b56f061 100644
--- a/mathesar/rpc/connections.py
+++ b/mathesar/rpc/connections.py
@@ -132,7 +132,7 @@ def add_from_scratch(
 @handle_rpc_exceptions
 def grant_access_to_user(*, connection_id: int, user_id: int):
     """
-    Migrate a connection to new models, grant access for a user.
+    Migrate a connection to new models and grant access to a user.
 
     This function is designed to be temporary, and should probably be
     removed once we have completed the new users and permissions setup

From 68a82c312c1208f14a96dd10c17aadeb1f823f44 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 18 Jun 2024 16:49:12 +0800
Subject: [PATCH 0275/1141] fix formatting, make flake8 happy

---
 mathesar/models/base.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index 971837219f..bb4dd5e8b1 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -64,7 +64,6 @@ class Meta:
             )
         ]
 
-
     @property
     def connection(self):
         return psycopg.connect(

From edd9d0a82a57ddd4d2f5d597feab337bf96c530b Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 18 Jun 2024 17:02:31 +0530
Subject: [PATCH 0276/1141] fix python imports

---
 db/tables/operations/import_.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/tables/operations/import_.py b/db/tables/operations/import_.py
index 0b4a114e64..52f02d2fe8 100644
--- a/db/tables/operations/import_.py
+++ b/db/tables/operations/import_.py
@@ -4,7 +4,7 @@
 from db.tables.operations.create import prepare_table_for_import
 from db.tables.operations.select import get_fully_qualified_relation_name
 from db.encoding_utils import get_sql_compatible_encoding
-from mathesar.models.base import DataFile
+from mathesar.models.deprecated import DataFile
 from mathesar.imports.csv import get_file_encoding, get_sv_reader, process_column_names
 
 

From bc766fcc80c8fe9d3da1b378867076212a0c9b8e Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 18 Jun 2024 21:43:25 +0800
Subject: [PATCH 0277/1141] add unique constraint on server

---
 mathesar/migrations/0007_users_permissions_remodel.py | 4 ++++
 mathesar/models/base.py                               | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/mathesar/migrations/0007_users_permissions_remodel.py b/mathesar/migrations/0007_users_permissions_remodel.py
index 7ee5e4a67b..1f790a1622 100644
--- a/mathesar/migrations/0007_users_permissions_remodel.py
+++ b/mathesar/migrations/0007_users_permissions_remodel.py
@@ -45,6 +45,10 @@ class Migration(migrations.Migration):
                 'abstract': False,
             },
         ),
+        migrations.AddConstraint(
+            model_name='server',
+            constraint=models.UniqueConstraint(fields=('host', 'port'), name='unique_server'),
+        ),
         migrations.CreateModel(
             name='Database',
             fields=[
diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index bb4dd5e8b1..de7454dd6d 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -15,6 +15,13 @@ class Server(BaseModel):
     host = models.CharField(max_length=255)
     port = models.IntegerField()
 
+    class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["host", "port"], name="unique_server"
+            ),
+        ]
+
 
 class Database(BaseModel):
     name = models.CharField(max_length=128)

From defc2a1201864261dcd5314af9c9016c0af9c901 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 18 Jun 2024 21:43:55 +0800
Subject: [PATCH 0278/1141] correct documentation for function

---
 mathesar/rpc/utils.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mathesar/rpc/utils.py b/mathesar/rpc/utils.py
index c307a8986c..bffa807a73 100644
--- a/mathesar/rpc/utils.py
+++ b/mathesar/rpc/utils.py
@@ -3,10 +3,11 @@
 
 def connect(database_id, user):
     """
-    Return a psycopg connection, given a Connection model id.
+    Get a psycopg database connection.
 
     Args:
-        conn_id: The Django id corresponding to the Connection.
+        database_id: The Django id of the Database used for connecting.
+        user: A user model instance who'll connect to the database.
     """
     user_database_role = UserDatabaseRoleMap.objects.get(
         user=user, database__id=database_id

From 3b32521e9c6fe8bb3ff7b8eeceb5206e225826bd Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 18 Jun 2024 16:20:09 -0400
Subject: [PATCH 0279/1141] Improve SQL code docs and begin SQL standards

---
 db/sql/00_msar.sql  | 55 ------------------------------------------
 db/sql/README.md    | 47 ++++++++++++++++++++++++++++++++++++
 db/sql/STANDARDS.md | 59 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 106 insertions(+), 55 deletions(-)
 create mode 100644 db/sql/README.md
 create mode 100644 db/sql/STANDARDS.md

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 52e69e92e9..bbc026ec6e 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1,58 +1,3 @@
-/*
-This script defines a number of functions to be used for manipulating database objects (tables,
-columns, schemas) using Data Definition Language style queries.
-
-These are the schemas where the new functions will generally live:
-
-      __msar:  These functions aren't designed to be used except by other Mathesar functions.
-               Generally need preformatted strings as input, won't do quoting, etc.
-        msar:  These functions are designed to be used more easily. They'll format strings, quote
-               identifiers, and so on.
-
-The reason they're so abbreviated is to avoid namespace clashes, and also because making them longer
-would make using them quite tedious, since they're everywhere.
-
-The functions should each be overloaded to accept at a minimum the 'fixed' ID of a given object, as
-well as its name identifer(s).
-
-- Schemas should be identified by one of the following:
-  - OID, or
-  - Name
-- Tables should be identified by one of the following:
-  - OID, or
-  - Schema, Name pair (unquoted)
-- Columns should be identified by one of the following:
-  - OID, ATTNUM pair, or
-  - Schema, Table Name, Column Name triple (unquoted), or
-  - Table OID, Column Name pair (optional).
-
-Note that these identification schemes apply to the public-facing functions in the `msar` namespace,
-not necessarily the internal `__msar` functions.
-
-NAMING CONVENTIONS
-
-Because function signatures are used informationally in command-generated tables, horizontal space
-needs to be conserved. As a compromise between readability and terseness, we use the following
-conventions in variable naming:
-
-attribute  -> att
-schema     -> sch
-table      -> tab
-column     -> col
-constraint -> con
-object     -> obj
-relation   -> rel
-
-Textual names will have the suffix _name, and numeric identifiers will have the suffix _id.
-
-So, the OID of a table will be tab_id and the name of a column will be col_name. The attnum of a
-column will be col_id.
-
-Generally, we'll use snake_case for legibility and to avoid collisions with internal PostgreSQL
-naming conventions.
-
-*/
-
 CREATE SCHEMA IF NOT EXISTS __msar;
 CREATE SCHEMA IF NOT EXISTS msar;
 
diff --git a/db/sql/README.md b/db/sql/README.md
new file mode 100644
index 0000000000..08861b9904
--- /dev/null
+++ b/db/sql/README.md
@@ -0,0 +1,47 @@
+# SQL code
+
+A substantial amount of Mathesar's application logic is implemented directly in the PostgreSQL database layer. This directory holds the code for that logic, as written in PL/pgSQL.
+
+Also see our [SQL code standards](./STANDARDS.md) when making changes to the SQL code.
+
+
+## Schemas
+
+Mathesar installs multiple schemas in the PostgreSQL database for itself to run. We use these internal schemas to hold our custom functions and types.
+
+### msar
+
+This is the main schema where we define Mathesar-specific functionality.
+
+### __msar
+
+This is a legacy schema that is now **deprecated**. Try to avoid using it if you can.
+
+It was originally intended for private use within the Mathesar SQL layer (not to be called by the service layer). So if you do use this schema, don't call its functions from within the service layer.
+
+### mathesar_types
+
+This schema holds types which the user might utilize in their own tables as well as types for our internal use.
+
+
+## Testing
+
+SQL code is tested using [pgTAP](https://pgtap.org/).
+
+- Run all tests:
+
+    ```
+    docker exec mathesar_dev_db /bin/bash /sql/run_tests.sh -v
+    ```
+
+- Run tests having names which contain `foo_bar`:
+
+    ```
+    docker exec mathesar_dev_db /bin/bash /sql/run_tests.sh -v -x foo_bar
+    ```
+
+
+## When modifying the set of Mathesar-internal schemas
+
+The names of all schemas managed by Mathesar in this SQL is also duplicated in [constants.py](../constants.py). Any changes to these schema name (e.g. adding a new internal schema) must be propagated there too.
+
diff --git a/db/sql/STANDARDS.md b/db/sql/STANDARDS.md
new file mode 100644
index 0000000000..7310f20697
--- /dev/null
+++ b/db/sql/STANDARDS.md
@@ -0,0 +1,59 @@
+# SQL Code Standards
+
+## Naming conventions
+
+Because function signatures are used informationally in command-generated tables, horizontal space needs to be conserved. As a compromise between readability and terseness, we use the following conventions in variable naming:
+
+| Object     | Naming abbreviation |
+| --         | --                  |
+| attribute  | `att`               |
+| schema     | `sch`               |
+| table      | `tab`               |
+| column     | `col`               |
+| constraint | `con`               |
+| object     | `obj`               |
+| relation   | `rel`               |
+
+Textual names have the suffix `_name`, and numeric identifiers have the suffix `_id`.
+
+Examples
+
+- The OID of a table is `tab_id`
+- The name of a column is `col_name`
+- The attnum of a column is `col_id`
+
+## Casing
+
+We use `snake_case` for basically everything — schema names, function names, variables, and types.
+
+## Code documentation
+
+Every function should have a docstring-style code documentation block. Follow the syntax of existing functions when writing new ones.
+
+## Quoting, escaping, SQL injection, and security
+
+As of mid-2024, Mathesar is in the midst of a gradual transition from one pattern of quoting to another.
+
+- **The old pattern** is used for all functions within the (deprecated) `__msar` schema and will eventually be refactored out.
+
+    In this pattern, if the name of a database object is accepted as a function argument, stored as an intermediate variable, or returned from a function, then that name is _quoted_ in preparation for it to eventually be used in an SQL statement. For example, a table name of `foo bar` would be passed around as `"foo bar"`.
+
+- **The new pattern** is used for all functions within the `msar` schema, and will be used going forward.
+
+    In this pattern all names are passed around unquoted for as long as possible. Like above, this applies to names in function arguments, intermediate variables, and return values. They are only quoted at the latest possible point in their execution path, i.e. when they are put into SQL.
+
+    One way to think about this pattern is:
+
+    **If it _can_ be unquoted, then it _should_ be unquoted.**
+
+    For example, if you're dealing with a plain table name such as `foo bar`, then leave it unquoted. If you need to qualify that table name with a schema too, then either store both values unquoted in some composite type (e.g. jsonb, tuple, custom type, etc) or store them _quoted_ in a string like `"my schema"."foo bar"`. That string represents a fragment of SQL, and because of the dot there is no way to leave the values unquoted. With fragments of SQL like this, utilize descriptive naming and helpful code comments to be extra clear about when a string represents an SQL fragment. Try not to pass around too many fragments of SQL if you can avoid it. Prefer to pass around raw, unquoted values when possible/easy.
+
+From [OWASP](https://owasp.org/www-project-proactive-controls/v3/en/c4-encode-escape-data):
+
+> Output encoding is best applied **just before** the content is passed to the target interpreter. If this defense is performed too early in the processing of a request then the encoding or escaping may interfere with the use of the content in other parts of the program.
+
+## System catalog qualification
+
+Always qualify system catalog tables by prefixing them with `pg_catalog.`. If you don't, then user-defined tables can shadow the system catalog tables, breaking core functionality.
+
+

From 874868b428697eca5d35aa246f32ef1005caf56e Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 18 Jun 2024 16:22:58 -0400
Subject: [PATCH 0280/1141] Rename msar.get_fully_qualified_object_name

---
 db/sql/00_msar.sql       | 38 ++++++++++++--------------------------
 db/sql/20_msar_views.sql |  2 +-
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index bbc026ec6e..710e92704d 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -122,21 +122,7 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-__msar.get_fully_qualified_object_name(sch_name text, obj_name text) RETURNS text AS $$/*
-Return the fully-qualified name for a given database object (e.g., table).
-
-Args:
-  sch_name: The schema of the object, quoted.
-  obj_name: The name of the object, unqualified and quoted.
-*/
-BEGIN
-  RETURN format('%s.%s', sch_name, obj_name);
-END;
-$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
-
-
-CREATE OR REPLACE FUNCTION
-msar.get_fully_qualified_object_name(sch_name text, obj_name text) RETURNS text AS $$/*
+msar.build_qualified_name_sql(sch_name text, obj_name text) RETURNS text AS $$/*
 Return the fully-qualified, properly quoted, name for a given database object (e.g., table).
 
 Args:
@@ -144,7 +130,7 @@ Args:
   obj_name: The name of the object, unqualified and unquoted.
 */
 BEGIN
-  RETURN __msar.get_fully_qualified_object_name(quote_ident(sch_name), quote_ident(obj_name));
+  RETURN  format('%I.%I', sch_name, obj_name);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
@@ -199,7 +185,7 @@ Args:
   rel_name: The name of the relation, unqualified and unquoted.
 */
 BEGIN
-  RETURN msar.get_fully_qualified_object_name(sch_name, rel_name)::regclass::oid;
+  RETURN msar.build_qualified_name_sql(sch_name, rel_name)::regclass::oid;
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
@@ -1032,7 +1018,7 @@ Args:
 */
 DECLARE fullname text;
 BEGIN
-  fullname := msar.get_fully_qualified_object_name(sch_name, old_tab_name);
+  fullname := msar.build_qualified_name_sql(sch_name, old_tab_name);
   RETURN __msar.rename_table(fullname, quote_ident(new_tab_name));
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
@@ -1078,7 +1064,7 @@ Args:
   comment_: The new comment.
 */
 SELECT __msar.comment_on_table(
-  msar.get_fully_qualified_object_name(sch_name, tab_name),
+  msar.build_qualified_name_sql(sch_name, tab_name),
   quote_literal(comment_)
 );
 $$ LANGUAGE SQL;
@@ -1176,7 +1162,7 @@ Args:
 */
 DECLARE qualified_tab_name text;
 BEGIN
-  qualified_tab_name := msar.get_fully_qualified_object_name(sch_name, tab_name);
+  qualified_tab_name := msar.build_qualified_name_sql(sch_name, tab_name);
   RETURN __msar.update_pk_sequence_to_latest(qualified_tab_name, quote_ident(col_name));
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
@@ -1235,7 +1221,7 @@ DECLARE prepared_col_names text[];
 DECLARE fully_qualified_tab_name text;
 BEGIN
   SELECT array_agg(quote_ident(col)) FROM unnest(col_names) AS col INTO prepared_col_names;
-  fully_qualified_tab_name := msar.get_fully_qualified_object_name(sch_name, tab_name);
+  fully_qualified_tab_name := msar.build_qualified_name_sql(sch_name, tab_name);
   RETURN __msar.drop_columns(fully_qualified_tab_name, variadic prepared_col_names);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
@@ -1531,7 +1517,7 @@ SELECT COALESCE(
   -- Second choice is the type specified by string IDs.
   __msar.get_formatted_base_type(
     COALESCE(
-      msar.get_fully_qualified_object_name(typ_jsonb ->> 'schema', typ_jsonb ->> 'name'),
+      msar.build_qualified_name_sql(typ_jsonb ->> 'schema', typ_jsonb ->> 'name'),
       typ_jsonb ->> 'name',
       'text'  -- We fall back to 'text' when input is null or empty.
     ),
@@ -1892,7 +1878,7 @@ SELECT array_agg(
     -- Build the relation name where the constraint will be applied. Prefer numeric ID.
     COALESCE(
       __msar.get_relation_name((con_create_obj -> 'fkey_relation_id')::integer::oid),
-      msar.get_fully_qualified_object_name(
+      msar.build_qualified_name_sql(
         con_create_obj ->> 'fkey_relation_schema', con_create_obj ->> 'fkey_relation_name'
       )
     ),
@@ -2165,7 +2151,7 @@ Args:
 */
 DECLARE qualified_tab_name text;
 BEGIN
-  qualified_tab_name := msar.get_fully_qualified_object_name(sch_name, tab_name);
+  qualified_tab_name := msar.build_qualified_name_sql(sch_name, tab_name);
   RETURN __msar.drop_table(qualified_tab_name, cascade_, if_exists);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
@@ -2209,7 +2195,7 @@ Args:
 */
 BEGIN
   RETURN __msar.drop_constraint(
-    msar.get_fully_qualified_object_name(sch_name, tab_name), quote_ident(con_name)
+    msar.build_qualified_name_sql(sch_name, tab_name), quote_ident(con_name)
   );
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
@@ -2673,7 +2659,7 @@ Args:
   comment_: The new comment.
 */
 SELECT __msar.comment_on_column(
-  msar.get_fully_qualified_object_name(sch_name, tab_name),
+  msar.build_qualified_name_sql(sch_name, tab_name),
   quote_ident(col_name),
   quote_literal(comment_)
 );
diff --git a/db/sql/20_msar_views.sql b/db/sql/20_msar_views.sql
index ad15a60284..cccb08b737 100644
--- a/db/sql/20_msar_views.sql
+++ b/db/sql/20_msar_views.sql
@@ -32,7 +32,7 @@ Args:
   tab_id: The OID of the table whose associated view we want to name.
 */
 BEGIN
-  RETURN msar.get_fully_qualified_object_name('msar_views', format('mv%s', tab_id));
+  RETURN msar.build_qualified_name_sql('msar_views', format('mv%s', tab_id));
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 

From d715b14e7e7ce6fd315f7330d476d8828f36104d Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 18 Jun 2024 16:23:54 -0400
Subject: [PATCH 0281/1141] Rename msar.build_unique_column_name_unquoted

---
 db/sql/00_msar.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 710e92704d..4f0e27da9c 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1307,7 +1307,7 @@ $$ LANGUAGE sql RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-msar.build_unique_column_name_unquoted(tab_id oid, col_name text) RETURNS text AS $$/*
+msar.build_unique_column_name(tab_id oid, col_name text) RETURNS text AS $$/*
 Get a unique column name based on the given name.
 
 Args:
@@ -1342,7 +1342,7 @@ will be of the form: <frel_name>_id. Then, we apply some logic to ensure the res
 */
 BEGIN
   fk_col_name := COALESCE(fk_col_name, format('%s_id', frel_name));
-  RETURN msar.build_unique_column_name_unquoted(tab_id, fk_col_name);
+  RETURN msar.build_unique_column_name(tab_id, fk_col_name);
 END;
 $$ LANGUAGE plpgsql;
 

From 51eec9ce1f6e2f6051912f6570573f9162b140da Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 18 Jun 2024 16:25:10 -0400
Subject: [PATCH 0282/1141] Move get_duplicate_col_defs into __msar

---
 db/sql/00_msar.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 4f0e27da9c..498ccd6cef 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1267,7 +1267,7 @@ END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
-CREATE OR REPLACE FUNCTION msar.get_duplicate_col_defs(
+CREATE OR REPLACE FUNCTION __msar.get_duplicate_col_defs(
   tab_id oid,
   col_ids smallint[],
   new_names text[],
@@ -2021,7 +2021,7 @@ DECLARE
   col_name text;
   created_col_id smallint;
 BEGIN
-  col_defs := msar.get_duplicate_col_defs(
+  col_defs := __msar.get_duplicate_col_defs(
     tab_id, ARRAY[col_id], ARRAY[copy_name], copy_data
   );
   tab_name := __msar.get_relation_name(tab_id);

From 34b15bc338da6d23332ede571ebc486355d7df0d Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 18 Jun 2024 16:26:40 -0400
Subject: [PATCH 0283/1141] Move process_col_def_jsonb into __msar

---
 db/sql/00_msar.sql      | 12 ++++++------
 db/sql/test_00_msar.sql | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 498ccd6cef..bd8397e70d 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1351,7 +1351,7 @@ CREATE OR REPLACE FUNCTION
 msar.get_extracted_col_def_jsonb(tab_id oid, col_ids integer[]) RETURNS jsonb AS $$/*
 Get a JSON array of column definitions from given columns for creation of an extracted table.
 
-See the msar.process_col_def_jsonb for a description of the JSON.
+See the __msar.process_col_def_jsonb for a description of the JSON.
 
 Args:
   tab_id: The OID of the table containing the columns whose definitions we want.
@@ -1578,7 +1578,7 @@ $$ LANGUAGE SQL;
 
 
 CREATE OR REPLACE FUNCTION
-msar.process_col_def_jsonb(
+__msar.process_col_def_jsonb(
   tab_id oid,
   col_defs jsonb,
   raw_default boolean,
@@ -1687,14 +1687,14 @@ Add columns to a table.
 
 Args:
   tab_id: The OID of the table to which we'll add columns.
-  col_defs: a JSONB array defining columns to add. See msar.process_col_def_jsonb for details.
+  col_defs: a JSONB array defining columns to add. See __msar.process_col_def_jsonb for details.
   raw_default: Whether to treat defaults as raw SQL. DANGER!
 */
 DECLARE
   col_create_defs __msar.col_def[];
   fq_table_name text := __msar.get_relation_name(tab_id);
 BEGIN
-  col_create_defs := msar.process_col_def_jsonb(tab_id, col_defs, raw_default);
+  col_create_defs := __msar.process_col_def_jsonb(tab_id, col_defs, raw_default);
   PERFORM __msar.add_columns(fq_table_name, variadic col_create_defs);
 
   PERFORM
@@ -1722,7 +1722,7 @@ Add columns to a table.
 Args:
   sch_name: unquoted schema name of the table to which we'll add columns.
   tab_name: unquoted, unqualified name of the table to which we'll add columns.
-  col_defs: a JSONB array defining columns to add. See msar.process_col_def_jsonb for details.
+  col_defs: a JSONB array defining columns to add. See __msar.process_col_def_jsonb for details.
   raw_default: Whether to treat defaults as raw SQL. DANGER!
 */
 SELECT msar.add_columns(msar.get_relation_oid(sch_name, tab_name), col_defs, raw_default);
@@ -2271,7 +2271,7 @@ DECLARE
   constraint_defs __msar.con_def[];
 BEGIN
   fq_table_name := format('%s.%s', __msar.get_schema_name(sch_oid), quote_ident(tab_name));
-  column_defs := msar.process_col_def_jsonb(0, col_defs, false, true);
+  column_defs := __msar.process_col_def_jsonb(0, col_defs, false, true);
   constraint_defs := msar.process_con_def_jsonb(0, con_defs);
   PERFORM __msar.add_table(fq_table_name, column_defs, constraint_defs);
   created_table_id := fq_table_name::regclass::oid;
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index db10bb73e5..1fa87b46b7 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -169,12 +169,12 @@ END;
 $$ LANGUAGE plpgsql;
 
 
--- msar.process_col_def_jsonb ----------------------------------------------------------------------
+-- __msar.process_col_def_jsonb ----------------------------------------------------------------------
 
 CREATE OR REPLACE FUNCTION test_process_col_def_jsonb() RETURNS SETOF TEXT AS $f$
 BEGIN
   RETURN NEXT is(
-    msar.process_col_def_jsonb(0, '[{}, {}]'::jsonb, false),
+    __msar.process_col_def_jsonb(0, '[{}, {}]'::jsonb, false),
     ARRAY[
       ('"Column 1"', 'text', null, null, false, null),
       ('"Column 2"', 'text', null, null, false, null)
@@ -182,12 +182,12 @@ BEGIN
     'Empty columns should result in defaults'
   );
   RETURN NEXT is(
-    msar.process_col_def_jsonb(0, '[{"name": "id"}]'::jsonb, false),
+    __msar.process_col_def_jsonb(0, '[{"name": "id"}]'::jsonb, false),
     null,
     'Column definition processing should ignore "id" column'
   );
   RETURN NEXT is(
-    msar.process_col_def_jsonb(0, '[{}, {}]'::jsonb, false, true),
+    __msar.process_col_def_jsonb(0, '[{}, {}]'::jsonb, false, true),
     ARRAY[
       ('id', 'integer', true, null, true, 'Mathesar default ID column'),
       ('"Column 1"', 'text', null, null, false, null),
@@ -196,7 +196,7 @@ BEGIN
     'Column definition processing add "id" column'
   );
   RETURN NEXT is(
-    msar.process_col_def_jsonb(0, '[{"description": "Some comment"}]'::jsonb, false),
+    __msar.process_col_def_jsonb(0, '[{"description": "Some comment"}]'::jsonb, false),
     ARRAY[
       ('"Column 1"', 'text', null, null, false, '''Some comment''')
     ]::__msar.col_def[],

From dcacde00c58c482529b63c580eafd3404342db11 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 18 Jun 2024 16:27:17 -0400
Subject: [PATCH 0284/1141] Move process_con_def_jsonb into __msar

---
 db/sql/00_msar.sql | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index bd8397e70d..9295fb1d80 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1831,7 +1831,7 @@ $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-msar.process_con_def_jsonb(tab_id oid, con_create_arr jsonb)
+__msar.process_con_def_jsonb(tab_id oid, con_create_arr jsonb)
   RETURNS __msar.con_def[] AS $$/*
 Create an array of  __msar.con_def from a JSON array of constraint creation defining JSON.
 
@@ -1927,12 +1927,12 @@ Add constraints to a table.
 
 Args:
   tab_id: The OID of the table to which we'll add constraints.
-  col_defs: a JSONB array defining constraints to add. See msar.process_con_def_jsonb for details.
+  col_defs: a JSONB array defining constraints to add. See __msar.process_con_def_jsonb for details.
 */
 DECLARE
   con_create_defs __msar.con_def[];
 BEGIN
-  con_create_defs := msar.process_con_def_jsonb(tab_id, con_defs);
+  con_create_defs := __msar.process_con_def_jsonb(tab_id, con_defs);
   PERFORM __msar.add_constraints(__msar.get_relation_name(tab_id), variadic con_create_defs);
   RETURN array_agg(oid) FROM pg_constraint WHERE conrelid=tab_id;
 END;
@@ -1947,7 +1947,7 @@ Add constraints to a table.
 Args:
   sch_name: unquoted schema name of the table to which we'll add constraints.
   tab_name: unquoted, unqualified name of the table to which we'll add constraints.
-  con_defs: a JSONB array defining constraints to add. See msar.process_con_def_jsonb for details.
+  con_defs: a JSONB array defining constraints to add. See __msar.process_con_def_jsonb for details.
 */
 SELECT msar.add_constraints(msar.get_relation_oid(sch_name, tab_name), con_defs);
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
@@ -2054,7 +2054,7 @@ CREATE OR REPLACE FUNCTION
 msar.get_extracted_con_def_jsonb(tab_id oid, col_ids integer[]) RETURNS jsonb AS $$/*
 Get a JSON array of constraint definitions from given columns for creation of an extracted table.
 
-See the msar.process_con_def_jsonb for a description of the JSON.
+See the __msar.process_con_def_jsonb for a description of the JSON.
 
 Args:
   tab_id: The OID of the table containing the constraints whose definitions we want.
@@ -2272,7 +2272,7 @@ DECLARE
 BEGIN
   fq_table_name := format('%s.%s', __msar.get_schema_name(sch_oid), quote_ident(tab_name));
   column_defs := __msar.process_col_def_jsonb(0, col_defs, false, true);
-  constraint_defs := msar.process_con_def_jsonb(0, con_defs);
+  constraint_defs := __msar.process_con_def_jsonb(0, con_defs);
   PERFORM __msar.add_table(fq_table_name, column_defs, constraint_defs);
   created_table_id := fq_table_name::regclass::oid;
   PERFORM msar.comment_on_table(created_table_id, comment_);

From efe4cf2be743b8a4fe860d006f49ce8bd9431852 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 18 Jun 2024 17:02:50 -0400
Subject: [PATCH 0285/1141] Unquote msar.get_column_name return value

---
 db/sql/00_msar.sql | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 9295fb1d80..c22a7b838a 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -205,7 +205,7 @@ $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 CREATE OR REPLACE FUNCTION
 msar.get_column_name(rel_id oid, col_id integer) RETURNS text AS $$/*
-Return the name for a given column in a given relation (e.g., table).
+Return the UNQUOTED name for a given column in a given relation (e.g., table).
 
 More precisely, this function returns the name of attributes of any relation appearing in the
 pg_class catalog table (so you could find attributes of indices with this function).
@@ -214,13 +214,13 @@ Args:
   rel_id:  The OID of the relation.
   col_id:  The attnum of the column in the relation.
 */
-SELECT quote_ident(attname::text) FROM pg_attribute WHERE attrelid=rel_id AND attnum=col_id;
+SELECT attname::text FROM pg_attribute WHERE attrelid=rel_id AND attnum=col_id;
 $$ LANGUAGE sql RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
 msar.get_column_name(rel_id oid, col_name text) RETURNS text AS $$/*
-Return the name for a given column in a given relation (e.g., table).
+Return the UNQUOTED name for a given column in a given relation (e.g., table).
 
 More precisely, this function returns the quoted name of attributes of any relation appearing in the
 pg_class catalog table (so you could find attributes of indices with this function). If the given
@@ -233,7 +233,7 @@ Args:
   rel_id:  The OID of the relation.
   col_name:  The unquoted name of the column in the relation.
 */
-SELECT quote_ident(attname::text) FROM pg_attribute WHERE attrelid=rel_id AND attname=col_name;
+SELECT attname::text FROM pg_attribute WHERE attrelid=rel_id AND attname=col_name;
 $$ LANGUAGE sql RETURNS NULL ON NULL INPUT;
 
 
@@ -259,8 +259,8 @@ Args:
 SELECT array_agg(
   CASE
     WHEN rel_id=0 THEN quote_ident(col #>> '{}')
-    WHEN jsonb_typeof(col)='number' THEN msar.get_column_name(rel_id, col::integer)
-    WHEN jsonb_typeof(col)='string' THEN msar.get_column_name(rel_id, col #>> '{}')
+    WHEN jsonb_typeof(col)='number' THEN quote_ident(msar.get_column_name(rel_id, col::integer))
+    WHEN jsonb_typeof(col)='string' THEN quote_ident(msar.get_column_name(rel_id, col #>> '{}'))
   END
 )
 FROM jsonb_array_elements(columns) AS x(col);
@@ -1145,7 +1145,7 @@ DECLARE tab_name text;
 DECLARE col_name text;
 BEGIN
   tab_name :=  __msar.get_relation_name(tab_id);
-  col_name := msar.get_column_name(tab_id, col_id);
+  col_name := quote_ident(msar.get_column_name(tab_id, col_id));
   RETURN __msar.update_pk_sequence_to_latest(tab_name, col_name);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
@@ -2025,7 +2025,7 @@ BEGIN
     tab_id, ARRAY[col_id], ARRAY[copy_name], copy_data
   );
   tab_name := __msar.get_relation_name(tab_id);
-  col_name := msar.get_column_name(tab_id, col_id);
+  col_name := quote_ident(msar.get_column_name(tab_id, col_id));
   PERFORM __msar.add_columns(tab_name, VARIADIC col_defs);
   created_col_id := attnum
     FROM pg_attribute
@@ -2033,7 +2033,7 @@ BEGIN
   IF copy_data THEN
     PERFORM __msar.exec_ddl(
       'UPDATE %s SET %s=%s',
-      tab_name, col_defs[1].name_, msar.get_column_name(tab_id, col_id)
+      tab_name, col_defs[1].name_, quote_ident(msar.get_column_name(tab_id, col_id))
     );
   END IF;
   IF copy_constraints THEN
@@ -2326,7 +2326,7 @@ Args:
 BEGIN
   PERFORM __msar.rename_column(
     tab_name => __msar.get_relation_name(tab_id),
-    old_col_name => msar.get_column_name(tab_id, col_id),
+    old_col_name => quote_ident(msar.get_column_name(tab_id, col_id)),
     new_col_name => quote_ident(new_col_name)
   );
   RETURN col_id;
@@ -2376,7 +2376,7 @@ Args:
                column's default.
 */
 SELECT CASE WHEN new_type IS NOT NULL OR jsonb_typeof(new_default)='null' THEN
-  'ALTER COLUMN ' || msar.get_column_name(tab_id, col_id) || ' DROP DEFAULT'
+  'ALTER COLUMN ' || quote_ident(msar.get_column_name(tab_id, col_id)) || ' DROP DEFAULT'
  END;
 $$ LANGUAGE SQL;
 
@@ -2393,11 +2393,11 @@ Args:
   new_type: The target type to which we'll alter the column.
 */
 SELECT 'ALTER COLUMN '
-  || msar.get_column_name(tab_id, col_id)
+  || quote_ident(msar.get_column_name(tab_id, col_id))
   || ' TYPE '
   || new_type
   || ' USING '
-  || __msar.build_cast_expr(msar.get_column_name(tab_id, col_id), new_type);
+  || __msar.build_cast_expr(quote_ident(msar.get_column_name(tab_id, col_id)), new_type);
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
@@ -2452,7 +2452,7 @@ BEGIN
     default_expr := format('%L', raw_default_expr);
   END IF;
   RETURN
-    format('ALTER COLUMN %s SET DEFAULT ', msar.get_column_name(tab_id, col_id)) || default_expr;
+    format('ALTER COLUMN %I SET DEFAULT ', msar.get_column_name(tab_id, col_id)) || default_expr;
 END;
 $$ LANGUAGE plpgsql;
 
@@ -2467,7 +2467,7 @@ Args:
   not_null: If true, we 'SET NOT NULL'. If false, we 'DROP NOT NULL' if null, we do nothing.
 */
 SELECT 'ALTER COLUMN '
-  || msar.get_column_name(tab_id, col_id)
+  || quote_ident(msar.get_column_name(tab_id, col_id))
   || CASE WHEN not_null THEN ' SET ' ELSE ' DROP ' END
   || 'NOT NULL';
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
@@ -2482,7 +2482,7 @@ Args:
   col_id: The attnum of the column whose nullability we'll alter.
   col_delete: If true, we drop the column. If false or null, we do nothing.
 */
-SELECT CASE WHEN col_delete THEN 'DROP COLUMN ' || msar.get_column_name(tab_id, col_id) END;
+SELECT CASE WHEN col_delete THEN 'DROP COLUMN ' || quote_ident(msar.get_column_name(tab_id, col_id)) END;
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
@@ -2681,7 +2681,7 @@ Args:
 */
 SELECT __msar.comment_on_column(
   __msar.get_relation_name(tab_id),
-  msar.get_column_name(tab_id, col_id),
+  quote_ident(msar.get_column_name(tab_id, col_id)),
   comment_
 );
 $$ LANGUAGE SQL;

From 19509ad72df1bcaf0849139a0564edcc06a37298 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 18 Jun 2024 17:04:06 -0400
Subject: [PATCH 0286/1141] Move get_column_names into __msar

---
 db/sql/00_msar.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index c22a7b838a..a635625fb2 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -238,8 +238,8 @@ $$ LANGUAGE sql RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-msar.get_column_names(rel_id oid, columns jsonb) RETURNS text[] AS $$/*
-Return the names for given columns in a given relation (e.g., table).
+__msar.get_column_names(rel_id oid, columns jsonb) RETURNS text[] AS $$/*
+Return the QUOTED names for given columns in a given relation (e.g., table).
 
 - If the rel_id is given as 0, the assumption is that this is a new table, so we just apply normal
 quoting rules to a column without validating anything further.
@@ -1872,7 +1872,7 @@ SELECT array_agg(
     -- set the constraint type as a single char. See __msar.build_con_def_text for details.
     con_create_obj ->> 'type',
     -- Set the column names associated with the constraint.
-    msar.get_column_names(tab_id, con_create_obj -> 'columns'),
+    __msar.get_column_names(tab_id, con_create_obj -> 'columns'),
     -- Set whether the constraint is deferrable or not (boolean).
     con_create_obj ->> 'deferrable',
     -- Build the relation name where the constraint will be applied. Prefer numeric ID.
@@ -1883,7 +1883,7 @@ SELECT array_agg(
       )
     ),
     -- Build the array of foreign columns for an fkey constraint.
-    msar.get_column_names(
+    __msar.get_column_names(
       COALESCE(
         -- We validate that the given OID (if any) is correct.
         (con_create_obj -> 'fkey_relation_id')::integer::oid,

From 06d6ebb5ea5b3db2cfa53676dce80200846a59d9 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 18 Jun 2024 17:07:00 -0400
Subject: [PATCH 0287/1141] Unquote msar.get_constraint_name return value

---
 db/sql/00_msar.sql | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index a635625fb2..485476b227 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -379,13 +379,13 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 CREATE OR REPLACE FUNCTION
 msar.get_constraint_name(con_id oid) RETURNS text AS $$/*
-Return the quoted constraint name of the correponding constraint oid.
+Return the UNQUOTED constraint name of the corresponding constraint oid.
 
 Args:
   con_id: The OID of the constraint.
 */
 BEGIN
-  RETURN quote_ident(conname::text) FROM pg_constraint WHERE pg_constraint.oid = con_id;
+  RETURN conname::text FROM pg_constraint WHERE pg_constraint.oid = con_id;
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
@@ -2211,7 +2211,8 @@ Args:
 */
 BEGIN
   RETURN __msar.drop_constraint(
-    __msar.get_relation_name(tab_id), msar.get_constraint_name(con_id)
+    __msar.get_relation_name(tab_id),
+    quote_ident(msar.get_constraint_name(con_id))
   );
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;

From f2dd7bee725d1a28f3fdb77e795ea7b42c3c4960 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 18 Jun 2024 17:36:05 -0400
Subject: [PATCH 0288/1141] Adjust wording of standards

---
 db/sql/STANDARDS.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/db/sql/STANDARDS.md b/db/sql/STANDARDS.md
index 7310f20697..a02a5b04a7 100644
--- a/db/sql/STANDARDS.md
+++ b/db/sql/STANDARDS.md
@@ -46,7 +46,9 @@ As of mid-2024, Mathesar is in the midst of a gradual transition from one patter
 
     **If it _can_ be unquoted, then it _should_ be unquoted.**
 
-    For example, if you're dealing with a plain table name such as `foo bar`, then leave it unquoted. If you need to qualify that table name with a schema too, then either store both values unquoted in some composite type (e.g. jsonb, tuple, custom type, etc) or store them _quoted_ in a string like `"my schema"."foo bar"`. That string represents a fragment of SQL, and because of the dot there is no way to leave the values unquoted. With fragments of SQL like this, utilize descriptive naming and helpful code comments to be extra clear about when a string represents an SQL fragment. Try not to pass around too many fragments of SQL if you can avoid it. Prefer to pass around raw, unquoted values when possible/easy.
+    For example, if you're dealing with a plain table name such as `foo bar`, then definitely leave it unquoted.
+    
+    To hone in on an edge case, let's say you need to qualify that table name with a schema name too. In this case try to handle and store both values (schema name and table name) separately (unquoted) as much as possible. You can use separate variables, separate arguments, or a composite type for return values. As a last resort, you can store the qualified name quoted in an SQL fragment string like `"my schema"."foo bar"`. We have some code like this already, but it's not ideal. Because of the dot in that SQL fragment, there is no way to leave the values unquoted. With fragments of SQL like this, take care to utilize descriptive naming and helpful code comments to be extra clear about when a string represents an SQL fragment. But in general try to avoid passing around SQL fragments if you can. Prefer to pass around raw unquoted values. Or better yet, pass around unique identifiers like OIDs when possible.
 
 From [OWASP](https://owasp.org/www-project-proactive-controls/v3/en/c4-encode-escape-data):
 

From 2a6da8fbe21dc6a40428c1f84cb25a7ee462beed Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 18 Jun 2024 17:41:35 -0400
Subject: [PATCH 0289/1141] Move get_relation_name_or_null into __msar

---
 db/sql/00_msar.sql | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 485476b227..aad8e27e2d 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -154,7 +154,7 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-msar.get_relation_name_or_null(rel_id oid) RETURNS text AS $$/*
+__msar.get_relation_name_or_null(rel_id oid) RETURNS text AS $$/*
 Return the name for a given relation (e.g., table), qualified or quoted as appropriate.
 
 In cases where the relation is already included in the search path, the returned name will not be
@@ -1002,7 +1002,10 @@ Args:
   new_tab_name: unquoted, unqualified table name
 */
 BEGIN
-  RETURN __msar.rename_table(msar.get_relation_name_or_null(tab_id), quote_ident(new_tab_name));
+  RETURN __msar.rename_table(
+    __msar.get_relation_name_or_null(tab_id),
+    quote_ident(new_tab_name)
+  );
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
@@ -1050,7 +1053,7 @@ Args:
   tab_id: The OID of the table whose comment we will change.
   comment_: The new comment.
 */
-SELECT __msar.comment_on_table(msar.get_relation_name_or_null(tab_id), quote_literal(comment_));
+SELECT __msar.comment_on_table(__msar.get_relation_name_or_null(tab_id), quote_literal(comment_));
 $$ LANGUAGE SQL;
 
 
@@ -1097,7 +1100,7 @@ BEGIN
   PERFORM msar.rename_table(tab_id, new_tab_name);
   PERFORM msar.comment_on_table(tab_id, comment);
   PERFORM msar.alter_columns(tab_id, col_alters);
-  RETURN msar.get_relation_name_or_null(tab_id);
+  RETURN __msar.get_relation_name_or_null(tab_id);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
@@ -1202,7 +1205,7 @@ BEGIN
   FROM pg_catalog.pg_attribute
   WHERE attrelid=tab_id AND NOT attisdropped AND ARRAY[attnum::integer] <@ col_ids
   INTO col_names;
-  PERFORM __msar.drop_columns(msar.get_relation_name_or_null(tab_id), variadic col_names);
+  PERFORM __msar.drop_columns(__msar.get_relation_name_or_null(tab_id), variadic col_names);
   RETURN array_length(col_names, 1);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
@@ -2128,7 +2131,7 @@ Args:
 */
 DECLARE relation_name text;
 BEGIN
-  relation_name := msar.get_relation_name_or_null(tab_id);
+  relation_name := __msar.get_relation_name_or_null(tab_id);
   -- if_exists doesn't work while working with oids because
   -- the SQL query gets parameterized with tab_id instead of relation_name
   -- since we're unable to find the relation_name for a non existing table. 

From e1e17c080f9794350c97ad883adedd0897c68ccf Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 19 Jun 2024 17:40:39 +0530
Subject: [PATCH 0290/1141] fix flaky relation_name wrangling

---
 db/sql/00_msar.sql              | 66 +++++++++++++++++++++------------
 db/tables/operations/create.py  | 23 ++++++++----
 db/tables/operations/import_.py | 15 ++++----
 db/tables/operations/select.py  | 10 -----
 4 files changed, 64 insertions(+), 50 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 85965f84e1..2351a6e17e 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -222,30 +222,6 @@ END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
-CREATE OR REPLACE FUNCTION
-msar.get_fully_qualified_relation_name(rel_id oid) RETURNS text AS $$/*
-Return the fully-qualified name for a given relation (e.g., table).
-
-The relation *must* be in the pg_class table to use this function. This function will return NULL if
-no corresponding relation can be found.
-
-Args:
-  rel_id: The OID of the relation.
-*/
-DECLARE
-  sch_name text;
-  rel_name text;
-BEGIN
-  SELECT nspname, relname INTO sch_name, rel_name
-  FROM pg_catalog.pg_class AS pgc
-  LEFT JOIN pg_catalog.pg_namespace AS pgn
-  ON pgc.relnamespace = pgn.oid
-  WHERE pgc.oid = rel_id;
-  RETURN msar.get_fully_qualified_object_name(sch_name, rel_name);
-END;
-$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
-
-
 CREATE OR REPLACE FUNCTION
 msar.get_relation_name_or_null(rel_id oid) RETURNS text AS $$/*
 Return the name for a given relation (e.g., table), qualified or quoted as appropriate.
@@ -2374,6 +2350,48 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+CREATE OR REPLACE FUNCTION
+msar.prepare_table_for_import(
+  sch_oid oid,
+  tab_name text,
+  col_defs jsonb,
+  comment_ text
+) RETURNS jsonb AS $$/*
+Add a table, with a default id column, returning a JSON object describing the table.
+
+Each returned JSON object will have the form:
+  {
+    "schema_name": <str>,
+    "table_name": <str>,
+    "table_oid": <int>
+  }
+
+Args:
+  sch_oid: The OID of the schema where the table will be created.
+  tab_name: The unquoted name for the new table.
+  col_defs: The columns for the new table, in order.
+  comment_ (optional): The comment for the new table.
+*/
+DECLARE
+  sch_name text;
+  rel_name text;
+  rel_id oid;
+BEGIN
+  rel_id := msar.add_mathesar_table(sch_oid, tab_name, col_defs, NULL, comment_);
+  SELECT nspname, relname INTO sch_name, rel_name
+  FROM pg_catalog.pg_class AS pgc
+  LEFT JOIN pg_catalog.pg_namespace AS pgn
+  ON pgc.relnamespace = pgn.oid
+  WHERE pgc.oid = rel_id;
+  RETURN jsonb_build_object(
+    'schema_name', quote_ident(sch_name),
+    'table_name', quote_ident(rel_name),
+    'table_oid', rel_id
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 -- COLUMN ALTERATION FUNCTIONS
diff --git a/db/tables/operations/create.py b/db/tables/operations/create.py
index d93d4a7972..9db9cd64a3 100644
--- a/db/tables/operations/create.py
+++ b/db/tables/operations/create.py
@@ -87,21 +87,28 @@ def prepare_table_for_import(table_name, schema_oid, column_names, conn, comment
     """
     This method creates a Postgres table in the specified schema, with all
     columns being String type.
+
+    Returns the schema_name, table_name and table_oid of the created table.
     """
-    columns_ = [
+    column_data_list = [
         {
             "name": column_name,
             "type": {"name": PostgresType.TEXT.id}
         } for column_name in column_names
     ]
-    table_oid = create_table_on_database(
-        table_name=table_name,
-        schema_oid=schema_oid,
-        conn=conn,
-        column_data_list=columns_,
-        comment=comment
+    table_info = exec_msar_func(
+        conn,
+        'prepare_table_for_import',
+        schema_oid,
+        table_name,
+        json.dumps(column_data_list),
+        comment
+    ).fetchone()[0]
+    return (
+        table_info['schema_name'],
+        table_info['table_name'],
+        table_info['table_oid']
     )
-    return table_oid
 
 
 class CreateTableAs(DDLElement):
diff --git a/db/tables/operations/import_.py b/db/tables/operations/import_.py
index 52f02d2fe8..a22ec9121c 100644
--- a/db/tables/operations/import_.py
+++ b/db/tables/operations/import_.py
@@ -2,7 +2,6 @@
 import clevercsv as csv
 from psycopg import sql
 from db.tables.operations.create import prepare_table_for_import
-from db.tables.operations.select import get_fully_qualified_relation_name
 from db.encoding_utils import get_sql_compatible_encoding
 from mathesar.models.deprecated import DataFile
 from mathesar.imports.csv import get_file_encoding, get_sv_reader, process_column_names
@@ -21,7 +20,7 @@ def import_csv(data_file_id, table_name, schema_oid, conn, comment=None):
     with open(file_path, 'rb') as csv_file:
         csv_reader = get_sv_reader(csv_file, header, dialect)
         column_names = process_column_names(csv_reader.fieldnames)
-    table_oid = prepare_table_for_import(
+    schema_name, table_name, table_oid = prepare_table_for_import(
         table_name,
         schema_oid,
         column_names,
@@ -29,7 +28,8 @@ def import_csv(data_file_id, table_name, schema_oid, conn, comment=None):
         comment
     )
     insert_csv_records(
-        table_oid,
+        schema_name,
+        table_name,
         conn,
         file_path,
         column_names,
@@ -43,7 +43,8 @@ def import_csv(data_file_id, table_name, schema_oid, conn, comment=None):
 
 
 def insert_csv_records(
-    table_oid,
+    schema_name,
+    table_name,
     conn,
     file_path,
     column_names,
@@ -54,13 +55,11 @@ def insert_csv_records(
     encoding=None
 ):
     conversion_encoding, sql_encoding = get_sql_compatible_encoding(encoding)
-    schema_name, table_name = get_fully_qualified_relation_name(table_oid, conn).split('.')
     formatted_columns = sql.SQL(",").join(sql.Identifier(column_name) for column_name in column_names)
     copy_sql = sql.SQL(
-        "COPY {schema_name}.{table_name} ({formatted_columns}) FROM STDIN CSV {header} {delimiter} {escape} {quote} {encoding}"
+        "COPY {relation_name} ({formatted_columns}) FROM STDIN CSV {header} {delimiter} {escape} {quote} {encoding}"
     ).format(
-        schema_name=sql.Identifier(schema_name),
-        table_name=sql.Identifier(table_name),
+        relation_name=sql.Identifier(schema_name, table_name),
         formatted_columns=formatted_columns,
         header=sql.SQL("HEADER" if header else ""),
         delimiter=sql.SQL(f"DELIMITER E'{delimiter}'" if delimiter else ""),
diff --git a/db/tables/operations/select.py b/db/tables/operations/select.py
index 9008b25030..e25ad3c976 100644
--- a/db/tables/operations/select.py
+++ b/db/tables/operations/select.py
@@ -59,16 +59,6 @@ def get_table_info(schema, conn):
     return exec_msar_func(conn, 'get_table_info', schema).fetchone()[0]
 
 
-def get_fully_qualified_relation_name(table_oid, conn):
-    """
-    Return a fully qualified table name.
-
-    Args:
-        table_oid: The table oid for which we want fully qualified name.
-    """
-    return exec_msar_func(conn, 'get_fully_qualified_relation_name', table_oid).fetchone()[0]
-
-
 def reflect_table(name, schema, engine, metadata, connection_to_use=None, keep_existing=False):
     extend_existing = not keep_existing
     autoload_with = engine if connection_to_use is None else connection_to_use

From bf66a48c9a472b5381a5f42e264aae96dcbdcec8 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 19 Jun 2024 22:36:56 -0400
Subject: [PATCH 0291/1141] Improve function naming

---
 db/sql/00_msar.sql       | 47 ++++++++++++++++++++++++----------------
 db/sql/20_msar_views.sql |  2 +-
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index aad8e27e2d..f2c6ee6d4e 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -136,7 +136,7 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-__msar.get_relation_name(rel_id oid) RETURNS text AS $$/*
+__msar.get_qualified_relation_name(rel_id oid) RETURNS text AS $$/*
 Return the name for a given relation (e.g., table), qualified or quoted as appropriate.
 
 In cases where the relation is already included in the search path, the returned name will not be
@@ -154,7 +154,7 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-__msar.get_relation_name_or_null(rel_id oid) RETURNS text AS $$/*
+__msar.get_qualified_relation_name_or_null(rel_id oid) RETURNS text AS $$/*
 Return the name for a given relation (e.g., table), qualified or quoted as appropriate.
 
 In cases where the relation is already included in the search path, the returned name will not be
@@ -1003,7 +1003,7 @@ Args:
 */
 BEGIN
   RETURN __msar.rename_table(
-    __msar.get_relation_name_or_null(tab_id),
+    __msar.get_qualified_relation_name_or_null(tab_id),
     quote_ident(new_tab_name)
   );
 END;
@@ -1053,7 +1053,10 @@ Args:
   tab_id: The OID of the table whose comment we will change.
   comment_: The new comment.
 */
-SELECT __msar.comment_on_table(__msar.get_relation_name_or_null(tab_id), quote_literal(comment_));
+SELECT __msar.comment_on_table(
+  __msar.get_qualified_relation_name_or_null(tab_id),
+  quote_literal(comment_)
+);
 $$ LANGUAGE SQL;
 
 
@@ -1100,7 +1103,7 @@ BEGIN
   PERFORM msar.rename_table(tab_id, new_tab_name);
   PERFORM msar.comment_on_table(tab_id, comment);
   PERFORM msar.alter_columns(tab_id, col_alters);
-  RETURN __msar.get_relation_name_or_null(tab_id);
+  RETURN __msar.get_qualified_relation_name_or_null(tab_id);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
@@ -1147,7 +1150,7 @@ Args:
 DECLARE tab_name text;
 DECLARE col_name text;
 BEGIN
-  tab_name :=  __msar.get_relation_name(tab_id);
+  tab_name :=  __msar.get_qualified_relation_name(tab_id);
   col_name := quote_ident(msar.get_column_name(tab_id, col_id));
   RETURN __msar.update_pk_sequence_to_latest(tab_name, col_name);
 END;
@@ -1205,7 +1208,10 @@ BEGIN
   FROM pg_catalog.pg_attribute
   WHERE attrelid=tab_id AND NOT attisdropped AND ARRAY[attnum::integer] <@ col_ids
   INTO col_names;
-  PERFORM __msar.drop_columns(__msar.get_relation_name_or_null(tab_id), variadic col_names);
+  PERFORM __msar.drop_columns(
+    __msar.get_qualified_relation_name_or_null(tab_id),
+    variadic col_names
+  );
   RETURN array_length(col_names, 1);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
@@ -1695,7 +1701,7 @@ Args:
 */
 DECLARE
   col_create_defs __msar.col_def[];
-  fq_table_name text := __msar.get_relation_name(tab_id);
+  fq_table_name text := __msar.get_qualified_relation_name(tab_id);
 BEGIN
   col_create_defs := __msar.process_col_def_jsonb(tab_id, col_defs, raw_default);
   PERFORM __msar.add_columns(fq_table_name, variadic col_create_defs);
@@ -1880,7 +1886,7 @@ SELECT array_agg(
     con_create_obj ->> 'deferrable',
     -- Build the relation name where the constraint will be applied. Prefer numeric ID.
     COALESCE(
-      __msar.get_relation_name((con_create_obj -> 'fkey_relation_id')::integer::oid),
+      __msar.get_qualified_relation_name((con_create_obj -> 'fkey_relation_id')::integer::oid),
       msar.build_qualified_name_sql(
         con_create_obj ->> 'fkey_relation_schema', con_create_obj ->> 'fkey_relation_name'
       )
@@ -1936,7 +1942,10 @@ DECLARE
   con_create_defs __msar.con_def[];
 BEGIN
   con_create_defs := __msar.process_con_def_jsonb(tab_id, con_defs);
-  PERFORM __msar.add_constraints(__msar.get_relation_name(tab_id), variadic con_create_defs);
+  PERFORM __msar.add_constraints(
+    __msar.get_qualified_relation_name(tab_id),
+    variadic con_create_defs
+  );
   RETURN array_agg(oid) FROM pg_constraint WHERE conrelid=tab_id;
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
@@ -2027,7 +2036,7 @@ BEGIN
   col_defs := __msar.get_duplicate_col_defs(
     tab_id, ARRAY[col_id], ARRAY[copy_name], copy_data
   );
-  tab_name := __msar.get_relation_name(tab_id);
+  tab_name := __msar.get_qualified_relation_name(tab_id);
   col_name := quote_ident(msar.get_column_name(tab_id, col_id));
   PERFORM __msar.add_columns(tab_name, VARIADIC col_defs);
   created_col_id := attnum
@@ -2131,7 +2140,7 @@ Args:
 */
 DECLARE relation_name text;
 BEGIN
-  relation_name := __msar.get_relation_name_or_null(tab_id);
+  relation_name := __msar.get_qualified_relation_name_or_null(tab_id);
   -- if_exists doesn't work while working with oids because
   -- the SQL query gets parameterized with tab_id instead of relation_name
   -- since we're unable to find the relation_name for a non existing table. 
@@ -2214,7 +2223,7 @@ Args:
 */
 BEGIN
   RETURN __msar.drop_constraint(
-    __msar.get_relation_name(tab_id),
+    __msar.get_qualified_relation_name(tab_id),
     quote_ident(msar.get_constraint_name(con_id))
   );
 END;
@@ -2329,7 +2338,7 @@ Args:
 */
 BEGIN
   PERFORM __msar.rename_column(
-    tab_name => __msar.get_relation_name(tab_id),
+    tab_name => __msar.get_qualified_relation_name(tab_id),
     old_col_name => quote_ident(msar.get_column_name(tab_id, col_id)),
     new_col_name => quote_ident(new_col_name)
   );
@@ -2587,7 +2596,7 @@ BEGIN
   IF col_alter_str IS NOT NULL THEN
     PERFORM __msar.exec_ddl(
       'ALTER TABLE %s %s',
-      __msar.get_relation_name(tab_id),
+      __msar.get_qualified_relation_name(tab_id),
       msar.process_col_alter_jsonb(tab_id, col_alters)
     );
   END IF;
@@ -2684,7 +2693,7 @@ Args:
   comment_: The new comment.
 */
 SELECT __msar.comment_on_column(
-  __msar.get_relation_name(tab_id),
+  __msar.get_qualified_relation_name(tab_id),
   quote_ident(msar.get_column_name(tab_id, col_id)),
   comment_
 );
@@ -2845,7 +2854,7 @@ BEGIN
     new_tab_name,
     extracted_col_defs,
     extracted_con_defs,
-    format('Extracted from %s', __msar.get_relation_name(tab_id))
+    format('Extracted from %s', __msar.get_qualified_relation_name(tab_id))
   );
   -- Create a new fkey column and foreign key linking the original table to the extracted one.
   fkey_attnum := msar.create_many_to_one_link(extracted_table_id, tab_id, fkey_name);
@@ -2866,9 +2875,9 @@ BEGIN
     -- %1$s  This is a comma separated string of the extracted column names
     string_agg(quote_ident(col_def ->> 'name'), ', '),
     -- %2$s  This is the name of the original (remainder) table
-    __msar.get_relation_name(tab_id),
+    __msar.get_qualified_relation_name(tab_id),
     -- %3$s  This is the new extracted table name
-    __msar.get_relation_name(extracted_table_id),
+    __msar.get_qualified_relation_name(extracted_table_id),
     -- %4$I  This is the name of the fkey column in the remainder table.
     fkey_name
   ) FROM jsonb_array_elements(extracted_col_defs) AS col_def;
diff --git a/db/sql/20_msar_views.sql b/db/sql/20_msar_views.sql
index cccb08b737..48ad01ca8c 100644
--- a/db/sql/20_msar_views.sql
+++ b/db/sql/20_msar_views.sql
@@ -56,7 +56,7 @@ BEGIN
   INTO view_cols;
   RETURN __msar.exec_ddl(
     'CREATE OR REPLACE VIEW %s AS SELECT %s FROM %s',
-    view_name, view_cols, __msar.get_relation_name(tab_id)
+    view_name, view_cols, __msar.get_qualified_relation_name(tab_id)
   );
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;

From d3f7c82f15fd0a5e8992217ddd0a5ecfcac717ca Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 19 Jun 2024 22:53:27 -0400
Subject: [PATCH 0292/1141] Fix missing quotes in error message

---
 mathesar/api/exceptions/database_exceptions/exceptions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/api/exceptions/database_exceptions/exceptions.py b/mathesar/api/exceptions/database_exceptions/exceptions.py
index f9e7d3c089..07e2039cf6 100644
--- a/mathesar/api/exceptions/database_exceptions/exceptions.py
+++ b/mathesar/api/exceptions/database_exceptions/exceptions.py
@@ -159,7 +159,7 @@ def __init__(
     @staticmethod
     def err_msg(exception):
         if type(exception) is InvalidTypeError and exception.column_name and exception.new_type:
-            return f'{exception.column_name} cannot be cast to {exception.new_type}.'
+            return f'"{exception.column_name}" cannot be cast to {exception.new_type}.'
         return 'Invalid type cast requested.'
 
 

From bbfb54d95c67e3ef591bc9bca59e41ca08567adb Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 20 Jun 2024 16:20:50 +0800
Subject: [PATCH 0293/1141] add column metadata model

---
 .../migrations/0008_add_metadata_models.py    | 46 +++++++++++++++++++
 mathesar/models/base.py                       | 41 +++++++++++++++++
 2 files changed, 87 insertions(+)
 create mode 100644 mathesar/migrations/0008_add_metadata_models.py

diff --git a/mathesar/migrations/0008_add_metadata_models.py b/mathesar/migrations/0008_add_metadata_models.py
new file mode 100644
index 0000000000..13dd921ad3
--- /dev/null
+++ b/mathesar/migrations/0008_add_metadata_models.py
@@ -0,0 +1,46 @@
+# Generated by Django 4.2.11 on 2024-06-20 08:02
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mathesar', '0007_users_permissions_remodel'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ColumnMetaData',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('table_oid', models.PositiveIntegerField()),
+                ('attnum', models.PositiveIntegerField()),
+                ('bool_input', models.CharField(blank=True, choices=[('dropdown', 'dropdown'), ('checkbox', 'checkbox')])),
+                ('bool_true', models.CharField(default='True')),
+                ('bool_false', models.CharField(default='False')),
+                ('num_min_frac_digits', models.PositiveIntegerField(blank=True)),
+                ('num_max_frac_digits', models.PositiveIntegerField(blank=True)),
+                ('num_show_as_perc', models.BooleanField(default=False)),
+                ('mon_currency_symbol', models.CharField(default='$')),
+                ('mon_currency_location', models.CharField(choices=[('after-minus', 'after-minus'), ('end-with-space', 'end-with-space')], default='after-minus')),
+                ('time_format', models.CharField(blank=True)),
+                ('date_format', models.CharField(blank=True)),
+                ('duration_min', models.CharField(blank=True, max_length=255)),
+                ('duration_max', models.CharField(blank=True, max_length=255)),
+                ('duration_show_units', models.BooleanField(default=True)),
+                ('database', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mathesar.database')),
+            ],
+        ),
+        migrations.AddConstraint(
+            model_name='columnmetadata',
+            constraint=models.UniqueConstraint(fields=('database', 'table_oid', 'attnum'), name='unique_column_metadata'),
+        ),
+        migrations.AddConstraint(
+            model_name='columnmetadata',
+            constraint=models.CheckConstraint(check=models.Q(('num_max_frac_digits__lte', 20), ('num_min_frac_digits__lte', 20), ('num_min_frac_digits__lte', models.F('num_max_frac_digits'))), name='frac_digits_integrity'),
+        ),
+    ]
diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index de7454dd6d..43b9e1607e 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -80,3 +80,44 @@ def connection(self):
             user=self.role.name,
             password=self.role.password,
         )
+
+
+class ColumnMetaData(BaseModel):
+    database = models.ForeignKey('Database', on_delete=models.CASCADE)
+    table_oid = models.PositiveIntegerField()
+    attnum = models.PositiveIntegerField()
+    bool_input = models.CharField(
+        choices=[("dropdown", "dropdown"), ("checkbox", "checkbox")],
+        blank=True
+    )
+    bool_true = models.CharField(default='True')
+    bool_false = models.CharField(default='False')
+    num_min_frac_digits = models.PositiveIntegerField(blank=True)
+    num_max_frac_digits = models.PositiveIntegerField(blank=True)
+    num_show_as_perc = models.BooleanField(default=False)
+    mon_currency_symbol = models.CharField(default="$")
+    mon_currency_location = models.CharField(
+        choices=[("after-minus", "after-minus"), ("end-with-space", "end-with-space")],
+        default="after-minus"
+    )
+    time_format = models.CharField(blank=True)
+    date_format = models.CharField(blank=True)
+    duration_min = models.CharField(max_length=255, blank=True)
+    duration_max = models.CharField(max_length=255, blank=True)
+    duration_show_units = models.BooleanField(default=True)
+
+    class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["database", "table_oid", "attnum"],
+                name="unique_column_metadata"
+            ),
+            models.CheckConstraint(
+                check=(
+                    models.Q(num_max_frac_digits__lte=20)
+                    & models.Q(num_min_frac_digits__lte=20)
+                    & models.Q(num_min_frac_digits__lte=models.F("num_max_frac_digits"))
+                ),
+                name="frac_digits_integrity"
+            )
+        ]

From 162debe0da7ed7a23ac358e6b949d19f5c9432ca Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 20 Jun 2024 16:51:36 +0800
Subject: [PATCH 0294/1141] move column rpc module to make room for metadata

---
 mathesar/rpc/columns/__init__.py             |  1 +
 mathesar/rpc/{columns.py => columns/base.py} |  0
 mathesar/tests/rpc/test_columns.py           | 18 +++++++++---------
 3 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 mathesar/rpc/columns/__init__.py
 rename mathesar/rpc/{columns.py => columns/base.py} (100%)

diff --git a/mathesar/rpc/columns/__init__.py b/mathesar/rpc/columns/__init__.py
new file mode 100644
index 0000000000..3cd5390e65
--- /dev/null
+++ b/mathesar/rpc/columns/__init__.py
@@ -0,0 +1 @@
+from mathesar.rpc.columns.base import *
diff --git a/mathesar/rpc/columns.py b/mathesar/rpc/columns/base.py
similarity index 100%
rename from mathesar/rpc/columns.py
rename to mathesar/rpc/columns/base.py
diff --git a/mathesar/tests/rpc/test_columns.py b/mathesar/tests/rpc/test_columns.py
index 1afd813a33..3069f04d13 100644
--- a/mathesar/tests/rpc/test_columns.py
+++ b/mathesar/tests/rpc/test_columns.py
@@ -84,9 +84,9 @@ def mock_display_options(_database_id, _table_oid, attnums, user):
                 'minimum_fraction_digits': 2
             }
         ]
-    monkeypatch.setattr(columns, 'connect', mock_connect)
-    monkeypatch.setattr(columns, 'get_column_info_for_table', mock_column_info)
-    monkeypatch.setattr(columns, 'get_raw_display_options', mock_display_options)
+    monkeypatch.setattr(columns.base, 'connect', mock_connect)
+    monkeypatch.setattr(columns.base, 'get_column_info_for_table', mock_column_info)
+    monkeypatch.setattr(columns.base, 'get_raw_display_options', mock_display_options)
     expect_col_list = {
         'column_info': (
             {
@@ -160,8 +160,8 @@ def mock_column_alter(_table_oid, _column_data_list, conn):
             raise AssertionError('incorrect parameters passed')
         return 1
 
-    monkeypatch.setattr(columns, 'connect', mock_connect)
-    monkeypatch.setattr(columns, 'alter_columns_in_table', mock_column_alter)
+    monkeypatch.setattr(columns.base, 'connect', mock_connect)
+    monkeypatch.setattr(columns.base, 'alter_columns_in_table', mock_column_alter)
     actual_result = columns.patch(
         column_data_list=column_data_list,
         table_oid=table_oid,
@@ -193,8 +193,8 @@ def mock_column_create(_table_oid, _column_data_list, conn):
             raise AssertionError('incorrect parameters passed')
         return [3, 4]
 
-    monkeypatch.setattr(columns, 'connect', mock_connect)
-    monkeypatch.setattr(columns, 'add_columns_to_table', mock_column_create)
+    monkeypatch.setattr(columns.base, 'connect', mock_connect)
+    monkeypatch.setattr(columns.base, 'add_columns_to_table', mock_column_create)
     actual_result = columns.add(
         column_data_list=column_data_list,
         table_oid=table_oid,
@@ -226,8 +226,8 @@ def mock_column_drop(_table_oid, _column_attnums, conn):
             raise AssertionError('incorrect parameters passed')
         return 3
 
-    monkeypatch.setattr(columns, 'connect', mock_connect)
-    monkeypatch.setattr(columns, 'drop_columns_from_table', mock_column_drop)
+    monkeypatch.setattr(columns.base, 'connect', mock_connect)
+    monkeypatch.setattr(columns.base, 'drop_columns_from_table', mock_column_drop)
     actual_result = columns.delete(
         column_attnums=column_attnums,
         table_oid=table_oid,

From 910ccf226077781476696604ccc00361b06e0dd6 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 20 Jun 2024 16:55:46 +0800
Subject: [PATCH 0295/1141] wire up metadata list function

---
 config/settings/common_settings.py   |  1 +
 mathesar/rpc/columns/metadata.py     | 60 ++++++++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py |  5 +++
 mathesar/utils/columns.py            |  5 +++
 4 files changed, 71 insertions(+)
 create mode 100644 mathesar/rpc/columns/metadata.py

diff --git a/config/settings/common_settings.py b/config/settings/common_settings.py
index 7697ed053c..c37d6d23ca 100644
--- a/config/settings/common_settings.py
+++ b/config/settings/common_settings.py
@@ -67,6 +67,7 @@ def pipe_delim(pipe_string):
 MODERNRPC_METHODS_MODULES = [
     'mathesar.rpc.connections',
     'mathesar.rpc.columns',
+    'mathesar.rpc.columns.metadata',
     'mathesar.rpc.schemas',
     'mathesar.rpc.tables'
 ]
diff --git a/mathesar/rpc/columns/metadata.py b/mathesar/rpc/columns/metadata.py
new file mode 100644
index 0000000000..c3f3169d49
--- /dev/null
+++ b/mathesar/rpc/columns/metadata.py
@@ -0,0 +1,60 @@
+"""
+Classes and functions exposed to the RPC endpoint for managing column metadata.
+"""
+from typing import Literal, Optional, TypedDict
+
+from modernrpc.core import rpc_method, REQUEST_KEY
+from modernrpc.auth.basic import http_basic_auth_login_required
+
+from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+from mathesar.utils.columns import get_columns_meta_data
+
+
+class ColumnMetaData(TypedDict):
+    database: int
+    table_oid: int
+    attnum: int
+    bool_input: Optional[Literal["dropdown", "checkbox"]]
+    bool_true: Optional[str]
+    bool_false: Optional[str]
+    num_min_frac_digits: Optional[int]
+    num_max_frac_digits: Optional[int]
+    num_show_as_perc: Optional[bool]
+    mon_currency_symbol: Optional[str]
+    mon_currency_location: Optional[Literal["after-minus", "end-with-space"]]
+    time_format: Optional[str]
+    date_format: Optional[str]
+    duration_min: Optional[str]
+    duration_max: Optional[str]
+    duration_show_units: Optional[bool]
+
+    @classmethod
+    def from_db_model(cls, db_model):
+        return cls(
+            database=db_model.database.id,
+            table_oid=db_model.table_oid,
+            attnum=db_model.attnum,
+            bool_input=db_model.bool_input,
+            bool_true=db_model.bool_true,
+            bool_false=db_model.bool_false,
+            num_min_frac_digits=db_model.num_min_frac_digits,
+            num_max_frac_digits=db_model.num_max_frac_digits,
+            num_show_as_perc=db_model.num_show_as_perc,
+            mon_currency_symbol=db_model.mon_currency_symbol,
+            mon_currency_location=db_model.mon_currency_location,
+            time_format=db_model.time_format,
+            date_format=db_model.date_format,
+            duration_min=db_model.duration_min,
+            duration_max=db_model.duration_max,
+            duration_show_units=db_model.duration_show_units,
+        )
+
+
+@rpc_method(name="columns.metadata.list")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def list_(*, table_oid: int, database_id: int, **kwargs) -> list[ColumnMetaData]:
+    columns_meta_data = get_columns_meta_data(table_oid, database_id)
+    return [
+        ColumnMetaData.from_db_model(db_model) for db_model in columns_meta_data
+    ]
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 35a7cd75e1..6f940c272c 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -34,6 +34,11 @@
         "columns.add",
         [user_is_authenticated]
     ),
+    (
+        columns.metadata.list_,
+        "columns.metadata.list",
+        [user_is_authenticated]
+    ),
     (
         connections.add_from_known_connection,
         "connections.add_from_known_connection",
diff --git a/mathesar/utils/columns.py b/mathesar/utils/columns.py
index 97075a7d52..2429ad59e0 100644
--- a/mathesar/utils/columns.py
+++ b/mathesar/utils/columns.py
@@ -1,4 +1,5 @@
 from mathesar.models.deprecated import Column
+from mathesar.models.base import ColumnMetaData
 
 
 # This should be replaced once we have the ColumnMetadata model sorted out.
@@ -14,3 +15,7 @@ def get_raw_display_options(database_id, table_oid, attnums, user):
             )
             if c.display_options is not None
         ]
+
+
+def get_columns_meta_data(table_oid, database_id):
+    return ColumnMetaData.filter(database__id=database_id, table_oid=table_oid)

From 2fedad29d2ad846328e68ae4366080366523ef84 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 20 Jun 2024 17:31:27 +0800
Subject: [PATCH 0296/1141] set up metadata module for documentation

---
 mathesar/rpc/columns/__init__.py |  2 +-
 mathesar/rpc/columns/metadata.py | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/mathesar/rpc/columns/__init__.py b/mathesar/rpc/columns/__init__.py
index 3cd5390e65..4b40b38c84 100644
--- a/mathesar/rpc/columns/__init__.py
+++ b/mathesar/rpc/columns/__init__.py
@@ -1 +1 @@
-from mathesar.rpc.columns.base import *
+from .base import *  # noqa
diff --git a/mathesar/rpc/columns/metadata.py b/mathesar/rpc/columns/metadata.py
index c3f3169d49..60ac733fa7 100644
--- a/mathesar/rpc/columns/metadata.py
+++ b/mathesar/rpc/columns/metadata.py
@@ -3,7 +3,7 @@
 """
 from typing import Literal, Optional, TypedDict
 
-from modernrpc.core import rpc_method, REQUEST_KEY
+from modernrpc.core import rpc_method
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
@@ -54,6 +54,16 @@ def from_db_model(cls, db_model):
 @http_basic_auth_login_required
 @handle_rpc_exceptions
 def list_(*, table_oid: int, database_id: int, **kwargs) -> list[ColumnMetaData]:
+    """
+    List metadata associated with columns for a table. Exposed as `list`.
+
+    Args:
+        table_oid: Identity of the table in the user's database.
+        database_id: The Django id of the database containing the table.
+
+    Returns:
+        A list of column meta data objects.
+    """
     columns_meta_data = get_columns_meta_data(table_oid, database_id)
     return [
         ColumnMetaData.from_db_model(db_model) for db_model in columns_meta_data

From 0d5bee1e889e1eb76ce3e022c852282555111081 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 20 Jun 2024 17:31:56 +0800
Subject: [PATCH 0297/1141] add metadata module into documentation

---
 docs/docs/api/rpc.md | 15 +++++++++++----
 docs/mkdocs.yml      |  3 +--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index b149a9045d..8f2bfc6846 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -39,7 +39,7 @@ To use an RPC function:
 
 ---
 
-::: mathesar.rpc.connections
+::: connections
     options:
       members:
       - add_from_known_connection
@@ -49,7 +49,7 @@ To use an RPC function:
 
 ---
 
-::: mathesar.rpc.schemas
+::: schemas
     options:
       members:
       - list_
@@ -59,7 +59,7 @@ To use an RPC function:
 
 ---
 
-::: mathesar.rpc.tables
+::: tables
     options:
       members:
       - list_
@@ -72,7 +72,7 @@ To use an RPC function:
 
 ---
 
-::: mathesar.rpc.columns
+::: columns
     options:
       members:
       - list_
@@ -84,6 +84,13 @@ To use an RPC function:
       - SettableColumnInfo
       - TypeOptions
       - ColumnDefault
+ 
+---
+
+::: columns.metadata
+    options:
+      members:
+      - list_
 
 ## Responses
 
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 58875327c4..0db1e9c1e8 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -57,12 +57,11 @@ plugins:
   - mkdocstrings:
       handlers:
         python:
-          paths: [..]
+          paths: [../mathesar/rpc/]
           options:
             docstring_style: google
             separate_signature: true
             show_root_heading: true
-            show_root_full_path: false
             show_source: false
             show_symbol_type_heading: true
             group_by_category: false

From 03f3b07add3112cd33fd1f8a68f155e9355565bc Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 20 Jun 2024 17:54:06 +0800
Subject: [PATCH 0298/1141] improve docs formatting for RPC functions

---
 docs/docs/api/rpc.md | 11 ++++++-----
 docs/mkdocs.yml      |  5 +++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 8f2bfc6846..f2f4a0b214 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -37,7 +37,7 @@ To use an RPC function:
     }
     ```
 
----
+## Connections
 
 ::: connections
     options:
@@ -47,7 +47,7 @@ To use an RPC function:
       - grant_access_to_user
       - DBModelReturn
 
----
+## Schemas
 
 ::: schemas
     options:
@@ -57,7 +57,7 @@ To use an RPC function:
       - delete
       - SchemaInfo
 
----
+## Tables
 
 ::: tables
     options:
@@ -70,7 +70,7 @@ To use an RPC function:
       - TableInfo
       - SettableTableInfo
 
----
+## Columns
 
 ::: columns
     options:
@@ -85,12 +85,13 @@ To use an RPC function:
       - TypeOptions
       - ColumnDefault
  
----
+## Column Metadata
 
 ::: columns.metadata
     options:
       members:
       - list_
+      - ColumnMetaData
 
 ## Responses
 
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 0db1e9c1e8..e2488e3424 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -59,11 +59,12 @@ plugins:
         python:
           paths: [../mathesar/rpc/]
           options:
+            heading_level: 3
             docstring_style: google
             separate_signature: true
-            show_root_heading: true
+            show_root_toc_entry: false
+            show_root_members_full_path: true
             show_source: false
-            show_symbol_type_heading: true
             group_by_category: false
 
 theme:

From 2a9eddc3b75b8164ac8f9c593ffe2713a31812b9 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 20 Jun 2024 17:54:39 +0800
Subject: [PATCH 0299/1141] add documentation for metadata object, fix
 attribute name

---
 mathesar/rpc/columns/metadata.py | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/mathesar/rpc/columns/metadata.py b/mathesar/rpc/columns/metadata.py
index 60ac733fa7..e8268c7faf 100644
--- a/mathesar/rpc/columns/metadata.py
+++ b/mathesar/rpc/columns/metadata.py
@@ -11,7 +11,34 @@
 
 
 class ColumnMetaData(TypedDict):
-    database: int
+    """
+    Metadata for a column in a table.
+
+    Only the
+      - database,
+      - table_oid, and
+      - attnum
+    keys are required.
+
+    Attributes:
+        database_id: The Django id of the database containing the table.
+        table_oid: The OID of the table containing the column
+        attnum: The attnum of the column in the table.
+        bool_input: How the input for a boolean column should be shown.
+        bool_true: A string to display for `true` values.
+        bool_false: A string to display for `false` values.
+        num_min_frac_digits: Minimum digits shown after the decimal point.
+        num_max_frac_digits: Maximum digits shown after the decimal point.
+        num_show_as_perc: Whether to show a numeric value as a percentage.
+        mon_currency_symbol: The currency symbol shown for money value.
+        mon_currency_location: Where the currency symbol should be shown.
+        time_format: A string representing the format of time values.
+        date_format: A string representing the format of date values.
+        duration_min: Optional[str]
+        duration_max: Optional[str]
+        duration_show_units: Optional[bool]
+    """
+    database_id: int
     table_oid: int
     attnum: int
     bool_input: Optional[Literal["dropdown", "checkbox"]]
@@ -31,7 +58,7 @@ class ColumnMetaData(TypedDict):
     @classmethod
     def from_db_model(cls, db_model):
         return cls(
-            database=db_model.database.id,
+            database_id=db_model.database.id,
             table_oid=db_model.table_oid,
             attnum=db_model.attnum,
             bool_input=db_model.bool_input,

From 1c1b55a287fdae83fc1856d9ab48201cecc848f2 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 20 Jun 2024 13:14:15 -0400
Subject: [PATCH 0300/1141] Fix typos in code comments

---
 db/sql/00_msar.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index f242b84797..948dacfbf2 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -869,7 +869,7 @@ CREATE OR REPLACE FUNCTION msar.set_schema_description(
 Set the PostgreSQL description (aka COMMENT) of a schema.
 
 Descriptions are removed by passing an empty string. Passing a NULL description will cause
-this function to return NULL withou doing anything.
+this function to return NULL without doing anything.
 
 Args:
   sch_id: The OID of the schema.
@@ -902,7 +902,7 @@ CREATE OR REPLACE FUNCTION msar.patch_schema(sch_name text, patch jsonb) RETURNS
 Modify a schema according to the given patch.
 
 Args:
-  sch_id: The name of the schema.
+  sch_name: The name of the schema, UNQUOTED
   patch: A JSONB object as specified by msar.patch_schema(sch_id oid, patch jsonb)
 */
 BEGIN

From d55ce1b8ab63f58c25285110fbc047035fe09ff0 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 21 Jun 2024 16:59:25 +0800
Subject: [PATCH 0301/1141] complete documentation of column metadata object

---
 mathesar/rpc/columns/metadata.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/mathesar/rpc/columns/metadata.py b/mathesar/rpc/columns/metadata.py
index e8268c7faf..dd867608a5 100644
--- a/mathesar/rpc/columns/metadata.py
+++ b/mathesar/rpc/columns/metadata.py
@@ -14,11 +14,7 @@ class ColumnMetaData(TypedDict):
     """
     Metadata for a column in a table.
 
-    Only the
-      - database,
-      - table_oid, and
-      - attnum
-    keys are required.
+    Only the `database`, `table_oid`, and `attnum` keys are required.
 
     Attributes:
         database_id: The Django id of the database containing the table.
@@ -34,9 +30,9 @@ class ColumnMetaData(TypedDict):
         mon_currency_location: Where the currency symbol should be shown.
         time_format: A string representing the format of time values.
         date_format: A string representing the format of date values.
-        duration_min: Optional[str]
-        duration_max: Optional[str]
-        duration_show_units: Optional[bool]
+        duration_min: The smallest unit for displaying durations.
+        duration_max: The largest unit for displaying durations.
+        duration_show_units: Whether to show the units for durations.
     """
     database_id: int
     table_oid: int

From e3daa059e04d857c61adcd02955ae99e88529824 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 21 Jun 2024 23:10:29 +0530
Subject: [PATCH 0302/1141] implement sql and python functions for getting
 import preview

---
 db/sql/00_msar.sql                   | 50 +++++++++++++++++++++++++++-
 db/tables/operations/import_.py      | 10 ++++++
 mathesar/rpc/columns.py              |  6 ++++
 mathesar/rpc/tables.py               | 20 +++++++++--
 mathesar/tests/rpc/test_endpoints.py |  5 +++
 5 files changed, 88 insertions(+), 3 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 2351a6e17e..2ccf6d68ee 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -105,6 +105,18 @@ __msar.build_text_tuple(text[]) RETURNS text AS $$
 SELECT '(' || string_agg(col, ', ') || ')' FROM unnest($1) x(col);
 $$ LANGUAGE sql RETURNS NULL ON NULL INPUT;
 
+
+CREATE OR REPLACE FUNCTION
+__msar.exec_dql(command text) RETURNS jsonb AS $$
+DECLARE
+  records jsonb;
+BEGIN
+  EXECUTE 'WITH cte AS (' || command || ')
+  SELECT jsonb_agg(row_to_json(cte.*)) FROM cte' INTO records;
+  RETURN records;
+END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 -- INFO FUNCTIONS
@@ -1301,7 +1313,7 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 DROP TYPE IF EXISTS __msar.col_def CASCADE;
 CREATE TYPE __msar.col_def AS (
   name_ text, -- The name of the column to create, quoted.
-  type_ text, -- The type of the column to create, fully specced with arguments.
+  type_ jsonb, -- The type of the column to create, fully specced with arguments.
   not_null boolean, -- A boolean to describe whether the column is nullable or not.
   default_ text, -- Text SQL giving the default value for the column.
   identity_ boolean, -- A boolean giving whether the column is an identity pkey column.
@@ -2392,6 +2404,42 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+CREATE OR REPLACE FUNCTION
+msar.get_preview(
+  tab_id oid,
+  col_cast_def jsonb,
+  rec_limit integer
+) RETURNS jsonb AS $$
+DECLARE
+  tab_name text;
+  sel_query text;
+  result jsonb;
+BEGIN
+  tab_name := __msar.get_relation_name(tab_id);
+  WITH preview_cte AS (
+    SELECT string_agg(
+      'CAST(' ||
+      __msar.build_cast_expr(msar.get_column_name(tab_id, (col_cast ->> 'attnum')::integer), col_cast -> 'type' ->> 'name') ||
+      ' AS ' ||
+      msar.build_type_text(col_cast -> 'type') ||
+      ')'|| ' AS ' || msar.get_column_name(tab_id, (col_cast ->> 'attnum')::integer),
+      ', '
+    ) AS cast_expr
+    FROM jsonb_array_elements(col_cast_def) AS col_cast
+    WHERE NOT msar.is_mathesar_id_column(tab_id, (col_cast ->> 'attnum')::integer)
+  )
+  SELECT
+    CASE WHEN rec_limit IS NOT NULL THEN
+      format('SELECT id, %s FROM %s LIMIT %s', cast_expr, tab_name, rec_limit)
+    ELSE
+      format('SELECT id, %s FROM %s', cast_expr, tab_name)
+    END
+  INTO sel_query FROM preview_cte;
+  RETURN __msar.exec_dql(sel_query);
+END;
+$$ LANGUAGE plpgsql;
+
+
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 -- COLUMN ALTERATION FUNCTIONS
diff --git a/db/tables/operations/import_.py b/db/tables/operations/import_.py
index a22ec9121c..39ec1a2d77 100644
--- a/db/tables/operations/import_.py
+++ b/db/tables/operations/import_.py
@@ -1,6 +1,11 @@
+import json
 import tempfile
+
 import clevercsv as csv
 from psycopg import sql
+
+from db.connection import exec_msar_func
+from db.columns.operations.alter import _transform_column_alter_dict
 from db.tables.operations.create import prepare_table_for_import
 from db.encoding_utils import get_sql_compatible_encoding
 from mathesar.models.deprecated import DataFile
@@ -89,3 +94,8 @@ def insert_csv_records(
                 with cursor.copy(copy_sql) as copy:
                     while data := temp_file.read():
                         copy.write(data)
+
+
+def get_preview(table_oid, column_list, conn, limit=20):
+    transformed_column_data = [_transform_column_alter_dict(col) for col in column_list]
+    return exec_msar_func(conn, 'get_preview', table_oid, json.dumps(transformed_column_data), limit).fetchone()[0]
diff --git a/mathesar/rpc/columns.py b/mathesar/rpc/columns.py
index 6f198d8553..84890af53c 100644
--- a/mathesar/rpc/columns.py
+++ b/mathesar/rpc/columns.py
@@ -131,6 +131,12 @@ class SettableColumnInfo(TypedDict):
     description: Optional[str]
 
 
+class PreviewableColumnInfo(TypedDict):
+    id: int
+    type: Optional[str]
+    type_options: Optional[TypeOptions]
+
+
 class ColumnInfo(TypedDict):
     """
     Information about a column. Extends the settable fields.
diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index 1516e12ad6..ae692b8c56 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -7,8 +7,8 @@
 from db.tables.operations.drop import drop_table_from_database
 from db.tables.operations.create import create_table_on_database
 from db.tables.operations.alter import alter_table_on_database
-from db.tables.operations.import_ import import_csv
-from mathesar.rpc.columns import CreatableColumnInfo, SettableColumnInfo
+from db.tables.operations.import_ import import_csv, get_preview
+from mathesar.rpc.columns import CreatableColumnInfo, SettableColumnInfo, PreviewableColumnInfo
 from mathesar.rpc.constraints import CreatableConstraintInfo
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
@@ -200,3 +200,19 @@ def import_(
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
         return import_csv(data_file_id, table_name, schema_oid, conn, comment)
+
+
+@rpc_method(name="tables.get_import_preview")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def get_import_preview(
+    *,
+    table_oid: int,
+    columns: PreviewableColumnInfo,
+    database_id: int,
+    limit: int = 20,
+    **kwargs
+):
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        return get_preview(table_oid, columns, conn, limit)
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index ae18825f41..288aa6257c 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -93,6 +93,11 @@
         tables.import_,
         "tables.import",
         [user_is_authenticated]
+    ),
+    (
+        tables.get_import_preview,
+        "tables.get_import_preview",
+        [user_is_authenticated]
     )
 ]
 

From 21ea0dd69b3d813e2da1dc0bc668382e5738edd0 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 21 Jun 2024 23:23:24 +0530
Subject: [PATCH 0303/1141] revert col_def

---
 db/sql/00_msar.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 2ccf6d68ee..ca4799a570 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1313,7 +1313,7 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 DROP TYPE IF EXISTS __msar.col_def CASCADE;
 CREATE TYPE __msar.col_def AS (
   name_ text, -- The name of the column to create, quoted.
-  type_ jsonb, -- The type of the column to create, fully specced with arguments.
+  type_ text, -- The type of the column to create, fully specced with arguments.
   not_null boolean, -- A boolean to describe whether the column is nullable or not.
   default_ text, -- Text SQL giving the default value for the column.
   identity_ boolean, -- A boolean giving whether the column is an identity pkey column.

From d9371db00047c414b3b5263562b70bc177fb4608 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 21 Jun 2024 23:30:09 +0530
Subject: [PATCH 0304/1141] update docs

---
 docs/docs/api/rpc.md   | 5 ++++-
 mathesar/rpc/tables.py | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index d9a727120f..356cde63bc 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -68,6 +68,7 @@ To use an RPC function:
       - delete
       - patch
       - import_
+      - get_import_preview
       - TableInfo
       - SettableTableInfo
 
@@ -80,8 +81,10 @@ To use an RPC function:
       - add
       - patch
       - delete
-      - ColumnListReturn
       - ColumnInfo
+      - ColumnListReturn
+      - CreatableColumnInfo
+      - PreviewableColumnInfo
       - SettableColumnInfo
       - TypeOptions
       - ColumnDefault
diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index ae692b8c56..40837bfded 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -212,7 +212,7 @@ def get_import_preview(
     database_id: int,
     limit: int = 20,
     **kwargs
-):
+) -> list[dict]:
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
         return get_preview(table_oid, columns, conn, limit)

From 9bd73959ad2cee0776b7ebaf94e570b39ba15682 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Sat, 22 Jun 2024 00:46:23 +0530
Subject: [PATCH 0305/1141] add generate a table name if not given

---
 db/sql/00_msar.sql     | 15 ++++++++++++---
 mathesar/rpc/tables.py |  4 ++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 948dacfbf2..6db0bac0aa 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2300,23 +2300,32 @@ Add a table, with a default id column, returning the OID of the created table.
 
 Args:
   sch_oid: The OID of the schema where the table will be created.
-  tab_name: The unquoted name for the new table.
+  tab_name (optional): The unquoted name for the new table.
   col_defs (optional): The columns for the new table, in order.
   con_defs (optional): The constraints for the new table.
   comment_ (optional): The comment for the new table.
 
-Note that even if col_defs is null, we will still create a table with a default 'id' column. Also,
+Note that if tab_name is null, the table will be created with a name in the format 'Table <n>'.
+If col_defs is null, the table will still be created with a default 'id' column. Also,
 if an 'id' column is given in the input, it will be replaced with our default 'id' column. This is
 the behavior of the current python functions, so we're keeping it for now. In any case, the created
 table will always have our default 'id' column as its first column.
 */
 DECLARE
+  schema_name text;
+  table_count integer;
   fq_table_name text;
   created_table_id oid;
   column_defs __msar.col_def[];
   constraint_defs __msar.con_def[];
 BEGIN
-  fq_table_name := format('%I.%I', msar.get_schema_name(sch_oid), tab_name);
+  schema_name := __msar.get_schema_name(sch_oid);
+  IF NULLIF(tab_name, '') IS NOT NULL THEN
+    fq_table_name := format('%s.%s', schema_name, quote_ident(tab_name));
+  ELSE
+    SELECT COUNT(*) INTO table_count FROM pg_catalog.pg_class WHERE relkind = 'r' AND relnamespace = sch_oid;
+    fq_table_name := format('%s.%s', schema_name, quote_ident('Table ' || (table_count + 1)));
+  END IF;
   column_defs := msar.process_col_def_jsonb(0, col_defs, false, true);
   constraint_defs := msar.process_con_def_jsonb(0, con_defs);
   PERFORM __msar.add_table(fq_table_name, column_defs, constraint_defs);
diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index 0af725241d..3ba21c3b85 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -97,9 +97,9 @@ def get(*, table_oid: int, database_id: int, **kwargs) -> TableInfo:
 @handle_rpc_exceptions
 def add(
     *,
-    table_name: str,
     schema_oid: int,
     database_id: int,
+    table_name: str = None,
     column_data_list: list[CreatableColumnInfo] = [],
     constraint_data_list: list[CreatableConstraintInfo] = [],
     comment: str = None,
@@ -109,9 +109,9 @@ def add(
     Add a table with a default id column.
 
     Args:
-        table_name: Name of the table to be created.
         schema_oid: Identity of the schema in the user's database.
         database_id: The Django id of the database containing the table.
+        table_name: Name of the table to be created.
         column_data_list: A list describing columns to be created for the new table, in order.
         constraint_data_list: A list describing constraints to be created for the new table.
         comment: The comment for the new table.

From cb1ab23fbbfd3cf7c5363ba150c80c39ac903c74 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Sat, 22 Jun 2024 01:13:34 +0530
Subject: [PATCH 0306/1141] fix non existent function name

---
 db/sql/00_msar.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 6db0bac0aa..b5ebbd9f4b 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2319,7 +2319,7 @@ DECLARE
   column_defs __msar.col_def[];
   constraint_defs __msar.con_def[];
 BEGIN
-  schema_name := __msar.get_schema_name(sch_oid);
+  schema_name := msar.get_schema_name(sch_oid);
   IF NULLIF(tab_name, '') IS NOT NULL THEN
     fq_table_name := format('%s.%s', schema_name, quote_ident(tab_name));
   ELSE

From 6dfad5d8da87f603eebbf9eeb7246b3f0734fc31 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Sat, 22 Jun 2024 01:20:34 +0530
Subject: [PATCH 0307/1141] add sql test

---
 db/sql/test_00_msar.sql | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 9bce00d3cf..c7716225a8 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -1451,6 +1451,19 @@ END;
 $f$ LANGUAGE plpgsql;
 
 
+CREATE OR REPLACE FUNCTION test_add_mathesar_table_noname() RETURNS SETOF TEXT AS $f$
+DECLARE
+  generated_name text := 'Table 1';
+BEGIN
+  PERFORM __setup_create_table();
+  PERFORM msar.add_mathesar_table(
+    'tab_create_schema'::regnamespace::oid, null, null, null, null
+  );
+  RETURN NEXT has_table('tab_create_schema'::name, generated_name::name);
+END;
+$f$ LANGUAGE plpgsql;
+
+
 CREATE OR REPLACE FUNCTION test_add_mathesar_table_columns() RETURNS SETOF TEXT AS $f$
 DECLARE
   col_defs jsonb := $j$[

From 7560423b5332f68f69aad0abf565a07b6cf37ed4 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Sat, 22 Jun 2024 01:27:34 +0530
Subject: [PATCH 0308/1141] sch_oid -> sch_id

---
 db/sql/00_msar.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index b5ebbd9f4b..8126248805 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2294,12 +2294,12 @@ $$ LANGUAGE SQL;
 
 
 CREATE OR REPLACE FUNCTION
-msar.add_mathesar_table(sch_oid oid, tab_name text, col_defs jsonb, con_defs jsonb, comment_ text)
+msar.add_mathesar_table(sch_id oid, tab_name text, col_defs jsonb, con_defs jsonb, comment_ text)
   RETURNS oid AS $$/*
 Add a table, with a default id column, returning the OID of the created table.
 
 Args:
-  sch_oid: The OID of the schema where the table will be created.
+  sch_id: The OID of the schema where the table will be created.
   tab_name (optional): The unquoted name for the new table.
   col_defs (optional): The columns for the new table, in order.
   con_defs (optional): The constraints for the new table.
@@ -2319,11 +2319,11 @@ DECLARE
   column_defs __msar.col_def[];
   constraint_defs __msar.con_def[];
 BEGIN
-  schema_name := msar.get_schema_name(sch_oid);
+  schema_name := msar.get_schema_name(sch_id);
   IF NULLIF(tab_name, '') IS NOT NULL THEN
     fq_table_name := format('%s.%s', schema_name, quote_ident(tab_name));
   ELSE
-    SELECT COUNT(*) INTO table_count FROM pg_catalog.pg_class WHERE relkind = 'r' AND relnamespace = sch_oid;
+    SELECT COUNT(*) INTO table_count FROM pg_catalog.pg_class WHERE relkind = 'r' AND relnamespace = sch_id;
     fq_table_name := format('%s.%s', schema_name, quote_ident('Table ' || (table_count + 1)));
   END IF;
   column_defs := msar.process_col_def_jsonb(0, col_defs, false, true);

From e614f677972be5074324c10a302836012fa29e35 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Sat, 22 Jun 2024 01:31:28 +0530
Subject: [PATCH 0309/1141] sch_oid -> sch_id

---
 db/sql/00_msar.sql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 2351a6e17e..74e372b827 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2352,7 +2352,7 @@ $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION
 msar.prepare_table_for_import(
-  sch_oid oid,
+  sch_id oid,
   tab_name text,
   col_defs jsonb,
   comment_ text
@@ -2367,7 +2367,7 @@ Each returned JSON object will have the form:
   }
 
 Args:
-  sch_oid: The OID of the schema where the table will be created.
+  sch_id: The OID of the schema where the table will be created.
   tab_name: The unquoted name for the new table.
   col_defs: The columns for the new table, in order.
   comment_ (optional): The comment for the new table.
@@ -2377,7 +2377,7 @@ DECLARE
   rel_name text;
   rel_id oid;
 BEGIN
-  rel_id := msar.add_mathesar_table(sch_oid, tab_name, col_defs, NULL, comment_);
+  rel_id := msar.add_mathesar_table(sch_id, tab_name, col_defs, NULL, comment_);
   SELECT nspname, relname INTO sch_name, rel_name
   FROM pg_catalog.pg_class AS pgc
   LEFT JOIN pg_catalog.pg_namespace AS pgn

From 69fb14f2c077e403e724b699b78f76997003d08a Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Sat, 22 Jun 2024 01:45:40 +0530
Subject: [PATCH 0310/1141] use %I instead of %s

---
 db/sql/00_msar.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 8126248805..e853955f66 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2321,10 +2321,10 @@ DECLARE
 BEGIN
   schema_name := msar.get_schema_name(sch_id);
   IF NULLIF(tab_name, '') IS NOT NULL THEN
-    fq_table_name := format('%s.%s', schema_name, quote_ident(tab_name));
+    fq_table_name := format('%I.%I', schema_name, quote_ident(tab_name));
   ELSE
     SELECT COUNT(*) INTO table_count FROM pg_catalog.pg_class WHERE relkind = 'r' AND relnamespace = sch_id;
-    fq_table_name := format('%s.%s', schema_name, quote_ident('Table ' || (table_count + 1)));
+    fq_table_name := format('%I.%I', schema_name, quote_ident('Table ' || (table_count + 1)));
   END IF;
   column_defs := msar.process_col_def_jsonb(0, col_defs, false, true);
   constraint_defs := msar.process_con_def_jsonb(0, con_defs);

From c839ef956f2e9968529b2d527561a04b9b7c8f9e Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Sat, 22 Jun 2024 01:47:05 +0530
Subject: [PATCH 0311/1141] quote_ident no longer required

---
 db/sql/00_msar.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index e853955f66..fa204738aa 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2321,10 +2321,10 @@ DECLARE
 BEGIN
   schema_name := msar.get_schema_name(sch_id);
   IF NULLIF(tab_name, '') IS NOT NULL THEN
-    fq_table_name := format('%I.%I', schema_name, quote_ident(tab_name));
+    fq_table_name := format('%I.%I', schema_name, tab_name);
   ELSE
     SELECT COUNT(*) INTO table_count FROM pg_catalog.pg_class WHERE relkind = 'r' AND relnamespace = sch_id;
-    fq_table_name := format('%I.%I', schema_name, quote_ident('Table ' || (table_count + 1)));
+    fq_table_name := format('%I.%I', schema_name, 'Table ' || (table_count + 1));
   END IF;
   column_defs := msar.process_col_def_jsonb(0, col_defs, false, true);
   constraint_defs := msar.process_con_def_jsonb(0, con_defs);

From 38f5f763fea48197680f1e7216582f8f4c34c1d2 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Sat, 22 Jun 2024 02:20:44 +0530
Subject: [PATCH 0312/1141] improve formatting

---
 db/sql/00_msar.sql | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index ca4799a570..8e3e2d782f 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2419,7 +2419,9 @@ BEGIN
   WITH preview_cte AS (
     SELECT string_agg(
       'CAST(' ||
-      __msar.build_cast_expr(msar.get_column_name(tab_id, (col_cast ->> 'attnum')::integer), col_cast -> 'type' ->> 'name') ||
+      __msar.build_cast_expr(
+        msar.get_column_name(tab_id, (col_cast ->> 'attnum')::integer), col_cast -> 'type' ->> 'name'
+      ) ||
       ' AS ' ||
       msar.build_type_text(col_cast -> 'type') ||
       ')'|| ' AS ' || msar.get_column_name(tab_id, (col_cast ->> 'attnum')::integer),
@@ -2428,12 +2430,8 @@ BEGIN
     FROM jsonb_array_elements(col_cast_def) AS col_cast
     WHERE NOT msar.is_mathesar_id_column(tab_id, (col_cast ->> 'attnum')::integer)
   )
-  SELECT
-    CASE WHEN rec_limit IS NOT NULL THEN
-      format('SELECT id, %s FROM %s LIMIT %s', cast_expr, tab_name, rec_limit)
-    ELSE
-      format('SELECT id, %s FROM %s', cast_expr, tab_name)
-    END
+  SELECT 
+    format('SELECT id, %s FROM %s LIMIT %L', cast_expr, tab_name, rec_limit)
   INTO sel_query FROM preview_cte;
   RETURN __msar.exec_dql(sel_query);
 END;

From b64752e75dfd6e72d711dbf56a75de19700d061d Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 24 Jun 2024 14:35:31 +0800
Subject: [PATCH 0313/1141] remove display options from column list return

---
 docs/docs/api/rpc.md               |   1 -
 mathesar/rpc/columns/base.py       |  32 +--------
 mathesar/tests/rpc/test_columns.py | 101 ++++++++++-------------------
 3 files changed, 38 insertions(+), 96 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index f2f4a0b214..c0460a0a9a 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -79,7 +79,6 @@ To use an RPC function:
       - add
       - patch
       - delete
-      - ColumnListReturn
       - ColumnInfo
       - SettableColumnInfo
       - TypeOptions
diff --git a/mathesar/rpc/columns/base.py b/mathesar/rpc/columns/base.py
index 6f198d8553..f7e53704c5 100644
--- a/mathesar/rpc/columns/base.py
+++ b/mathesar/rpc/columns/base.py
@@ -12,7 +12,6 @@
 from db.columns.operations.select import get_column_info_for_table
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
-from mathesar.utils.columns import get_raw_display_options
 
 
 class TypeOptions(TypedDict, total=False):
@@ -171,49 +170,24 @@ def from_dict(cls, col_info):
         )
 
 
-class ColumnListReturn(TypedDict):
-    """
-    Information about the columns of a table.
-
-    Attributes:
-        column_info: Column information from the user's database.
-        display_options: Display metadata managed by Mathesar.
-    """
-    column_info: list[ColumnInfo]
-    display_options: list[dict]
-
-
 @rpc_method(name="columns.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def list_(*, table_oid: int, database_id: int, **kwargs) -> ColumnListReturn:
+def list_(*, table_oid: int, database_id: int, **kwargs) -> list[ColumnInfo]:
     """
     List information about columns for a table. Exposed as `list`.
 
-    Also return display options for each column, if they're defined.
-
     Args:
         table_oid: Identity of the table in the user's database.
         database_id: The Django id of the database containing the table.
 
     Returns:
-        A list of column details, and a separate list of display options.
+        A list of column details.
     """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
         raw_column_info = get_column_info_for_table(table_oid, conn)
-    column_info, attnums = tuple(
-        zip(
-            *[(ColumnInfo.from_dict(col), col['id']) for col in raw_column_info]
-        )
-    )
-    display_options = get_raw_display_options(
-        database_id, table_oid, attnums, user
-    )
-    return ColumnListReturn(
-        column_info=column_info,
-        display_options=display_options,
-    )
+    return [ColumnInfo.from_dict(col) for col in raw_column_info]
 
 
 @rpc_method(name="columns.add")
diff --git a/mathesar/tests/rpc/test_columns.py b/mathesar/tests/rpc/test_columns.py
index 3069f04d13..6c54a9df39 100644
--- a/mathesar/tests/rpc/test_columns.py
+++ b/mathesar/tests/rpc/test_columns.py
@@ -66,74 +66,43 @@ def mock_column_info(_table_oid, conn):
             },
         ]
 
-    def mock_display_options(_database_id, _table_oid, attnums, user):
-        if (
-                database_id != 2
-                or table_oid != 23457
-                or attnums != (1, 2, 4, 8, 10)
-                or user.username != 'alice'
-        ):
-            raise AssertionError("incorrect parameters passed")
-        return [
-            {
-                'id': 4,
-                'use_grouping': 'true',
-                'number_format': 'english',
-                'show_as_percentage': False,
-                'maximum_fraction_digits': 2,
-                'minimum_fraction_digits': 2
-            }
-        ]
     monkeypatch.setattr(columns.base, 'connect', mock_connect)
     monkeypatch.setattr(columns.base, 'get_column_info_for_table', mock_column_info)
-    monkeypatch.setattr(columns.base, 'get_raw_display_options', mock_display_options)
-    expect_col_list = {
-        'column_info': (
-            {
-                'id': 1, 'name': 'id', 'type': 'integer',
-                'default': {'value': 'identity', 'is_dynamic': True},
-                'nullable': False, 'description': None, 'primary_key': True,
-                'type_options': None,
-                'has_dependents': True
-            }, {
-                'id': 2, 'name': 'numcol', 'type': 'numeric',
-                'default': {'value': "'8'::numeric", 'is_dynamic': False},
-                'nullable': True,
-                'description': 'My super numeric column',
-                'primary_key': False,
-                'type_options': None,
-                'has_dependents': False
-            }, {
-                'id': 4, 'name': 'numcolmod', 'type': 'numeric',
-                'default': None,
-                'nullable': True, 'description': None, 'primary_key': False,
-                'type_options': {'scale': 3, 'precision': 5},
-                'has_dependents': False
-            }, {
-                'id': 8, 'name': 'ivlcolmod', 'type': 'interval',
-                'default': None,
-                'nullable': True, 'description': None, 'primary_key': False,
-                'type_options': {'fields': 'day to second'},
-                'has_dependents': False
-            }, {
-                'id': 10, 'name': 'arrcol', 'type': '_array',
-                'default': None,
-                'nullable': True, 'description': None, 'primary_key': False,
-                'type_options': {'item_type': 'character varying', 'length': 3},
-                'has_dependents': False
-            }
-        ),
-        'display_options': [
-            {
-                'id': 4,
-                'use_grouping': 'true',
-                'number_format': 'english',
-                'show_as_percentage': False,
-                'maximum_fraction_digits': 2,
-                'minimum_fraction_digits': 2
-            }
-        ]
-    }
+    expect_col_list = [
+        {
+            'id': 1, 'name': 'id', 'type': 'integer',
+            'default': {'value': 'identity', 'is_dynamic': True},
+            'nullable': False, 'description': None, 'primary_key': True,
+            'type_options': None,
+            'has_dependents': True
+        }, {
+            'id': 2, 'name': 'numcol', 'type': 'numeric',
+            'default': {'value': "'8'::numeric", 'is_dynamic': False},
+            'nullable': True,
+            'description': 'My super numeric column',
+            'primary_key': False,
+            'type_options': None,
+            'has_dependents': False
+        }, {
+            'id': 4, 'name': 'numcolmod', 'type': 'numeric',
+            'default': None,
+            'nullable': True, 'description': None, 'primary_key': False,
+            'type_options': {'scale': 3, 'precision': 5},
+            'has_dependents': False
+        }, {
+            'id': 8, 'name': 'ivlcolmod', 'type': 'interval',
+            'default': None,
+            'nullable': True, 'description': None, 'primary_key': False,
+            'type_options': {'fields': 'day to second'},
+            'has_dependents': False
+        }, {
+            'id': 10, 'name': 'arrcol', 'type': '_array',
+            'default': None,
+            'nullable': True, 'description': None, 'primary_key': False,
+            'type_options': {'item_type': 'character varying', 'length': 3},
+            'has_dependents': False
+        }
+    ]
     actual_col_list = columns.list_(table_oid=23457, database_id=2, request=request)
     assert actual_col_list == expect_col_list
 

From 183dfe4b0987e7eefb87c9925e6a33f0514c0ba4 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Mon, 24 Jun 2024 23:24:32 +0530
Subject: [PATCH 0314/1141] add docstrings

---
 db/sql/00_msar.sql              | 99 +++++++++++++++++++++++++++++++--
 db/tables/operations/import_.py | 11 ++++
 mathesar/rpc/columns.py         |  8 +++
 mathesar/rpc/tables.py          | 14 ++++-
 4 files changed, 125 insertions(+), 7 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 8e3e2d782f..50b64ea1f1 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -106,8 +106,33 @@ SELECT '(' || string_agg(col, ', ') || ')' FROM unnest($1) x(col);
 $$ LANGUAGE sql RETURNS NULL ON NULL INPUT;
 
 
+----------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------------------------------------
+-- GENERAL DQL FUNCTIONS
+--
+-- Functions in this section are quite general, and are the basis of the others.
+----------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------------------------------------
+
+
 CREATE OR REPLACE FUNCTION
-__msar.exec_dql(command text) RETURNS jsonb AS $$
+__msar.exec_dql(command text) RETURNS jsonb AS $$/*
+Execute the given command, returning a JSON object describing the records in the following form:
+[ 
+  {"id": 1, "col1_name": "value1", "col2_name": "value2"},
+  {"id": 2, "col1_name": "value1", "col2_name": "value2"},
+  {"id": 3, "col1_name": "value1", "col2_name": "value2"},
+  ...
+]
+
+Useful for SELECTing from tables. Most useful when you're performing DQL.
+
+Note that you always have to include the primary key column(`id` in case of a Mathesar table) in the
+command_template for the returned records to be uniquely identifiable.
+
+Args:
+  command: Raw string that will be executed as a command.
+*/
 DECLARE
   records jsonb;
 BEGIN
@@ -117,6 +142,35 @@ BEGIN
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
+
+CREATE OR REPLACE FUNCTION
+__msar.exec_dql(command_template text, arguments variadic anynonarray) RETURNS jsonb AS $$/*
+Execute a templated command, returning a JSON object describing the records in the following form:
+[ 
+  {"id": 1, "col1_name": "value1", "col2_name": "value2"},
+  {"id": 2, "col1_name": "value1", "col2_name": "value2"},
+  {"id": 3, "col1_name": "value1", "col2_name": "value2"},
+  ...
+]
+
+The template is given in the first argument, and all further arguments are used to fill in the
+template. Useful for SELECTing from tables. Most useful when you're performing DQL.
+
+Note that you always have to include the primary key column(`id` in case of a Mathesar table) in the
+command_template for the returned records to be uniquely identifiable.
+
+Args:
+  command_template: Raw string that will be executed as a command.
+  arguments: arguments that will be used to fill in the template.
+*/
+DECLARE formatted_command TEXT;
+BEGIN
+  formatted_command := format(command_template, VARIADIC arguments);
+  RETURN __msar.exec_dql(formatted_command);
+END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 -- INFO FUNCTIONS
@@ -2409,13 +2463,46 @@ msar.get_preview(
   tab_id oid,
   col_cast_def jsonb,
   rec_limit integer
-) RETURNS jsonb AS $$
+) RETURNS jsonb AS $$/*
+Preview a table, applying different type casts and options to the underlying columns before import,
+returning a JSON object describing the records of the table.
+
+Note that these casts are temporary and do not alter the data in the underlying table,
+if you wish to alter these settings permanantly for the columns see msar.alter_columns.
+
+Args:
+  tab_id: The OID of the table to preview.
+  col_cast_def: A JSON object describing the column settings to apply.
+  rec_limit (optional): The upper limit for the number of records to return.
+
+The col_cast_def JSONB should have the form:
+[
+  {
+    "attnum": <int>,
+    "type": {
+      "name": <str>,
+      "options": {
+        "length": <integer>,
+        "precision": <integer>,
+        "scale": <integer>
+        "fields": <str>,
+        "array": <boolean>
+      }
+    },
+  },
+  {
+    ...
+  },
+  ...
+]
+*/
 DECLARE
   tab_name text;
   sel_query text;
-  result jsonb;
+  records jsonb;
 BEGIN
   tab_name := __msar.get_relation_name(tab_id);
+  sel_query := 'SELECT id, %s FROM %s LIMIT %L';
   WITH preview_cte AS (
     SELECT string_agg(
       'CAST(' ||
@@ -2431,9 +2518,9 @@ BEGIN
     WHERE NOT msar.is_mathesar_id_column(tab_id, (col_cast ->> 'attnum')::integer)
   )
   SELECT 
-    format('SELECT id, %s FROM %s LIMIT %L', cast_expr, tab_name, rec_limit)
-  INTO sel_query FROM preview_cte;
-  RETURN __msar.exec_dql(sel_query);
+    __msar.exec_dql(sel_query, cast_expr, tab_name, rec_limit::text)
+  INTO records FROM preview_cte;
+  RETURN records;
 END;
 $$ LANGUAGE plpgsql;
 
diff --git a/db/tables/operations/import_.py b/db/tables/operations/import_.py
index 39ec1a2d77..70029587e7 100644
--- a/db/tables/operations/import_.py
+++ b/db/tables/operations/import_.py
@@ -97,5 +97,16 @@ def insert_csv_records(
 
 
 def get_preview(table_oid, column_list, conn, limit=20):
+    """
+    Preview an imported table. Returning the records from the specified columns of the table.
+
+    Args:
+        table_oid: Identity of the imported table in the user's database.
+        column_list: List of settings describing the casts to be applied to the columns.
+        limit: The upper limit for the number of records to return.
+
+    Note that these casts are temporary and do not alter the data in the underlying table,
+    if you wish to alter these settings permanantly for the columns see tables/alter.py.
+    """
     transformed_column_data = [_transform_column_alter_dict(col) for col in column_list]
     return exec_msar_func(conn, 'get_preview', table_oid, json.dumps(transformed_column_data), limit).fetchone()[0]
diff --git a/mathesar/rpc/columns.py b/mathesar/rpc/columns.py
index 84890af53c..b9833d7c8a 100644
--- a/mathesar/rpc/columns.py
+++ b/mathesar/rpc/columns.py
@@ -132,6 +132,14 @@ class SettableColumnInfo(TypedDict):
 
 
 class PreviewableColumnInfo(TypedDict):
+    """
+    Information needed to preview a column.
+
+    Attributes:
+        id: The `attnum` of the column in the table.
+        type: The new type to be applied to a column.
+        type_options: The options to be applied to the column type.
+    """
     id: int
     type: Optional[str]
     type_options: Optional[TypeOptions]
diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables.py
index 40837bfded..63f93dafe6 100644
--- a/mathesar/rpc/tables.py
+++ b/mathesar/rpc/tables.py
@@ -208,11 +208,23 @@ def import_(
 def get_import_preview(
     *,
     table_oid: int,
-    columns: PreviewableColumnInfo,
+    columns: list[PreviewableColumnInfo],
     database_id: int,
     limit: int = 20,
     **kwargs
 ) -> list[dict]:
+    """
+    Preview an imported table.
+
+    Args:
+        table_oid: Identity of the imported table in the user's database.
+        columns: List of settings describing the casts to be applied to the columns.
+        database_id: The Django id of the database containing the table.
+        limit: The upper limit for the number of records to return.
+
+    Returns:
+        The records from the specified columns of the table.
+    """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
         return get_preview(table_oid, columns, conn, limit)

From 7f09220662bda25727dee32e3a9f643c3c54002c Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 24 Jun 2024 15:14:32 -0400
Subject: [PATCH 0315/1141] Move build_qualified_name_sql to __msar

---
 db/sql/00_msar.sql       | 22 +++++++++++-----------
 db/sql/20_msar_views.sql |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 6971e80334..56b5d35d36 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -130,7 +130,7 @@ $$ LANGUAGE plpgsql;
 
 
 CREATE OR REPLACE FUNCTION
-msar.build_qualified_name_sql(sch_name text, obj_name text) RETURNS text AS $$/*
+__msar.build_qualified_name_sql(sch_name text, obj_name text) RETURNS text AS $$/*
 Return the fully-qualified, properly quoted, name for a given database object (e.g., table).
 
 Args:
@@ -193,7 +193,7 @@ Args:
   rel_name: The name of the relation, unqualified and unquoted.
 */
 BEGIN
-  RETURN msar.build_qualified_name_sql(sch_name, rel_name)::regclass::oid;
+  RETURN __msar.build_qualified_name_sql(sch_name, rel_name)::regclass::oid;
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
@@ -998,7 +998,7 @@ Args:
 */
 DECLARE fullname text;
 BEGIN
-  fullname := msar.build_qualified_name_sql(sch_name, old_tab_name);
+  fullname := __msar.build_qualified_name_sql(sch_name, old_tab_name);
   RETURN __msar.rename_table(fullname, quote_ident(new_tab_name));
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
@@ -1047,7 +1047,7 @@ Args:
   comment_: The new comment.
 */
 SELECT __msar.comment_on_table(
-  msar.build_qualified_name_sql(sch_name, tab_name),
+  __msar.build_qualified_name_sql(sch_name, tab_name),
   quote_literal(comment_)
 );
 $$ LANGUAGE SQL;
@@ -1145,7 +1145,7 @@ Args:
 */
 DECLARE qualified_tab_name text;
 BEGIN
-  qualified_tab_name := msar.build_qualified_name_sql(sch_name, tab_name);
+  qualified_tab_name := __msar.build_qualified_name_sql(sch_name, tab_name);
   RETURN __msar.update_pk_sequence_to_latest(qualified_tab_name, quote_ident(col_name));
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
@@ -1207,7 +1207,7 @@ DECLARE prepared_col_names text[];
 DECLARE fully_qualified_tab_name text;
 BEGIN
   SELECT array_agg(quote_ident(col)) FROM unnest(col_names) AS col INTO prepared_col_names;
-  fully_qualified_tab_name := msar.build_qualified_name_sql(sch_name, tab_name);
+  fully_qualified_tab_name := __msar.build_qualified_name_sql(sch_name, tab_name);
   RETURN __msar.drop_columns(fully_qualified_tab_name, variadic prepared_col_names);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
@@ -1503,7 +1503,7 @@ SELECT COALESCE(
   -- Second choice is the type specified by string IDs.
   __msar.get_formatted_base_type(
     COALESCE(
-      msar.build_qualified_name_sql(typ_jsonb ->> 'schema', typ_jsonb ->> 'name'),
+      __msar.build_qualified_name_sql(typ_jsonb ->> 'schema', typ_jsonb ->> 'name'),
       typ_jsonb ->> 'name',
       'text'  -- We fall back to 'text' when input is null or empty.
     ),
@@ -1864,7 +1864,7 @@ SELECT array_agg(
     -- Build the relation name where the constraint will be applied. Prefer numeric ID.
     COALESCE(
       __msar.get_qualified_relation_name((con_create_obj -> 'fkey_relation_id')::integer::oid),
-      msar.build_qualified_name_sql(
+      __msar.build_qualified_name_sql(
         con_create_obj ->> 'fkey_relation_schema', con_create_obj ->> 'fkey_relation_name'
       )
     ),
@@ -2140,7 +2140,7 @@ Args:
 */
 DECLARE qualified_tab_name text;
 BEGIN
-  qualified_tab_name := msar.build_qualified_name_sql(sch_name, tab_name);
+  qualified_tab_name := __msar.build_qualified_name_sql(sch_name, tab_name);
   RETURN __msar.drop_table(qualified_tab_name, cascade_, if_exists);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
@@ -2184,7 +2184,7 @@ Args:
 */
 BEGIN
   RETURN __msar.drop_constraint(
-    msar.build_qualified_name_sql(sch_name, tab_name), quote_ident(con_name)
+    __msar.build_qualified_name_sql(sch_name, tab_name), quote_ident(con_name)
   );
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
@@ -2649,7 +2649,7 @@ Args:
   comment_: The new comment.
 */
 SELECT __msar.comment_on_column(
-  msar.build_qualified_name_sql(sch_name, tab_name),
+  __msar.build_qualified_name_sql(sch_name, tab_name),
   quote_ident(col_name),
   quote_literal(comment_)
 );
diff --git a/db/sql/20_msar_views.sql b/db/sql/20_msar_views.sql
index 48ad01ca8c..6e4e4fb2cd 100644
--- a/db/sql/20_msar_views.sql
+++ b/db/sql/20_msar_views.sql
@@ -32,7 +32,7 @@ Args:
   tab_id: The OID of the table whose associated view we want to name.
 */
 BEGIN
-  RETURN msar.build_qualified_name_sql('msar_views', format('mv%s', tab_id));
+  RETURN __msar.build_qualified_name_sql('msar_views', format('mv%s', tab_id));
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 

From 0450fbef8169d905df752f669f34aa5a6c78c67f Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 25 Jun 2024 00:50:45 +0530
Subject: [PATCH 0316/1141] handle name collisions when previously generate
 tables get deleted

---
 db/sql/00_msar.sql      | 16 ++++++++++++++--
 db/sql/test_00_msar.sql | 29 +++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index fa204738aa..c3ea7b88c5 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2314,6 +2314,7 @@ table will always have our default 'id' column as its first column.
 DECLARE
   schema_name text;
   table_count integer;
+  uq_table_name text;
   fq_table_name text;
   created_table_id oid;
   column_defs __msar.col_def[];
@@ -2323,8 +2324,19 @@ BEGIN
   IF NULLIF(tab_name, '') IS NOT NULL THEN
     fq_table_name := format('%I.%I', schema_name, tab_name);
   ELSE
-    SELECT COUNT(*) INTO table_count FROM pg_catalog.pg_class WHERE relkind = 'r' AND relnamespace = sch_id;
-    fq_table_name := format('%I.%I', schema_name, 'Table ' || (table_count + 1));
+    -- generate a table name if one doesn't exist
+    SELECT COUNT(*) + 1 INTO table_count
+    FROM pg_catalog.pg_class
+    WHERE relkind = 'r' AND relnamespace = sch_id;
+    uq_table_name := 'Table ' || table_count;
+    -- avoid name collisions
+    WHILE EXISTS (
+      SELECT oid FROM pg_catalog.pg_class WHERE relname = uq_table_name AND relnamespace = sch_id
+    ) LOOP
+      table_count := table_count + 1;
+      uq_table_name := 'Table ' || table_count;
+    END LOOP;
+    fq_table_name := format('%I.%I', schema_name, uq_table_name);
   END IF;
   column_defs := msar.process_col_def_jsonb(0, col_defs, false, true);
   constraint_defs := msar.process_con_def_jsonb(0, con_defs);
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index c7716225a8..2d3332c89c 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -1464,6 +1464,35 @@ END;
 $f$ LANGUAGE plpgsql;
 
 
+CREATE OR REPLACE FUNCTION test_add_mathesar_table_noname_avoid_collision()
+RETURNS SETOF TEXT AS $f$
+DECLARE
+  generated_name text := 'Table 3';
+BEGIN
+  PERFORM __setup_create_table();
+  PERFORM msar.add_mathesar_table(
+    'tab_create_schema'::regnamespace::oid, null, null, null, null
+  );
+  PERFORM msar.add_mathesar_table(
+    'tab_create_schema'::regnamespace::oid, null, null, null, null
+  );
+  RETURN NEXT has_table('tab_create_schema'::name, 'Table 1'::name);
+  RETURN NEXT has_table('tab_create_schema'::name, 'Table 2'::name);
+  PERFORM msar.drop_table(
+    sch_name => 'tab_create_schema',
+    tab_name => 'Table 1',
+    cascade_ => false,
+    if_exists => false
+  );
+  RETURN NEXT hasnt_table('tab_create_schema'::name, 'Table 1'::name);
+  PERFORM msar.add_mathesar_table(
+    'tab_create_schema'::regnamespace::oid, null, null, null, null
+  );
+  RETURN NEXT has_table('tab_create_schema'::name, generated_name::name);
+END;
+$f$ LANGUAGE plpgsql;
+
+
 CREATE OR REPLACE FUNCTION test_add_mathesar_table_columns() RETURNS SETOF TEXT AS $f$
 DECLARE
   col_defs jsonb := $j$[

From 7ae93e60dfc210c6ef1794a13820f5601c6f5c91 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 25 Jun 2024 01:00:35 +0530
Subject: [PATCH 0317/1141] fix exec_dql

---
 db/sql/00_msar.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 50b64ea1f1..2382a1b014 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -144,7 +144,7 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-__msar.exec_dql(command_template text, arguments variadic anynonarray) RETURNS jsonb AS $$/*
+__msar.exec_dql(command_template text, arguments variadic anyarray) RETURNS jsonb AS $$/*
 Execute a templated command, returning a JSON object describing the records in the following form:
 [ 
   {"id": 1, "col1_name": "value1", "col2_name": "value2"},

From 55d4a3ba8d7e072c4b304989f61b179f9092bb34 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 25 Jun 2024 01:39:51 +0530
Subject: [PATCH 0318/1141] add pytest

---
 mathesar/tests/rpc/test_tables.py | 42 +++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/mathesar/tests/rpc/test_tables.py b/mathesar/tests/rpc/test_tables.py
index d0761730e5..1d25765168 100644
--- a/mathesar/tests/rpc/test_tables.py
+++ b/mathesar/tests/rpc/test_tables.py
@@ -5,6 +5,7 @@
     rf(pytest-django): Provides mocked `Request` objects.
     monkeypatch(pytest): Lets you monkeypatch an object for testing.
 """
+from decimal import Decimal
 from contextlib import contextmanager
 
 from mathesar.rpc import tables
@@ -225,3 +226,44 @@ def mock_table_import(_data_file_id, table_name, _schema_oid, conn, comment):
         request=request
     )
     assert imported_table_oid == 1964474
+
+
+def test_tables_preview(rf, monkeypatch):
+    request = rf.post('/api/rpc/v0', data={})
+    request.user = User(username='alice', password='pass1234')
+    table_oid = 1964474
+    database_id = 11
+
+    @contextmanager
+    def mock_connect(_database_id, user):
+        if _database_id == database_id and user.username == 'alice':
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_table_preview(_table_oid, columns, conn, limit):
+        if _table_oid != table_oid:
+            raise AssertionError('incorrect parameters passed')
+        return [
+            {'id': 1, 'length': Decimal('2.0')},
+            {'id': 2, 'length': Decimal('3.0')},
+            {'id': 3, 'length': Decimal('4.0')},
+            {'id': 4, 'length': Decimal('5.22')}
+        ]
+    monkeypatch.setattr(tables, 'connect', mock_connect)
+    monkeypatch.setattr(tables, 'get_preview', mock_table_preview)
+    records = tables.get_import_preview(
+        table_oid=1964474,
+        columns=[{'attnum': 2, 'type': {'name': 'numeric', 'options': {'precision': 3, 'scale': 2}}}],
+        database_id=11,
+        request=request
+    )
+    assert records == [
+        {'id': 1, 'length': Decimal('2.0')},
+        {'id': 2, 'length': Decimal('3.0')},
+        {'id': 3, 'length': Decimal('4.0')},
+        {'id': 4, 'length': Decimal('5.22')}
+    ]

From 146949775f3f613b7415d2526601c65fb16f2353 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 25 Jun 2024 02:16:36 +0530
Subject: [PATCH 0319/1141] add sql test

---
 db/sql/test_00_msar.sql | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index db10bb73e5..46fef76ece 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -1486,6 +1486,36 @@ END;
 $f$ LANGUAGE plpgsql;
 
 
+CREATE OR REPLACE FUNCTION test_get_preview() RETURNS SETOF TEXT AS $f$
+DECLARE
+  col_cast_def jsonb := $j$[
+    {
+      "attnum":2,
+      "type": {"name": "numeric", "options": {"precision":5, "scale":2}}
+    }
+  ]$j$;
+  want_records jsonb := $j$[
+    {"id": 1, "length": 2.00},
+    {"id": 2, "length": 3.00},
+    {"id": 3, "length": 4.00},
+    {"id": 4, "length": 5.22}
+  ]
+  $j$;
+  have_records jsonb;
+BEGIN
+  PERFORM __setup_create_table();
+  CREATE TABLE tab_create_schema.foo(id INTEGER GENERATED BY DEFAULT AS IDENTITY, length FLOAT8);
+  INSERT INTO tab_create_schema.foo(length) VALUES (2), (3), (4), (5.2225);
+  have_records := msar.get_preview(
+    tab_id => 'tab_create_schema.foo'::regclass::oid,
+    col_cast_def => col_cast_def,
+    rec_limit => NULL
+  );
+  RETURN NEXT is(have_records, want_records);
+END;
+$f$ LANGUAGE plpgsql;
+
+
 CREATE OR REPLACE FUNCTION test_add_mathesar_table_comment() RETURNS SETOF TEXT AS $f$
 DECLARE
   comment_ text := $c$my "Super;";'; DROP SCHEMA tab_create_schema;'$c$;

From a4f0a9b85a6ee760b0401e7cd7acdc8e7d050e41 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 25 Jun 2024 18:36:03 +0530
Subject: [PATCH 0320/1141] move sql creation logic from python to sql

---
 db/sql/00_msar.sql              | 39 +++++++++++++++++++++----
 db/tables/operations/create.py  | 27 +++++++++++++----
 db/tables/operations/import_.py | 52 ++++++++++-----------------------
 3 files changed, 70 insertions(+), 48 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 74e372b827..29b36485cf 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2355,14 +2355,19 @@ msar.prepare_table_for_import(
   sch_id oid,
   tab_name text,
   col_defs jsonb,
+  header boolean,
+  delimiter text,
+  escapechar text,
+  quotechar text,
+  encoding_ text,
   comment_ text
 ) RETURNS jsonb AS $$/*
-Add a table, with a default id column, returning a JSON object describing the table.
+Add a table, with a default id column, returning a JSON object containing
+a properly formatted SQL statement to carry out `COPY FROM` and also contains table_oid of the created table.
 
 Each returned JSON object will have the form:
   {
-    "schema_name": <str>,
-    "table_name": <str>,
+    "copy_sql": <str>,
     "table_oid": <int>
   }
 
@@ -2370,22 +2375,46 @@ Args:
   sch_id: The OID of the schema where the table will be created.
   tab_name: The unquoted name for the new table.
   col_defs: The columns for the new table, in order.
+  header: Whether or not the file contains a header line with the names of each column in the file.
+  delimiter: The character that separates columns within each row (line) of the file.
+  escapechar: The character that should appear before a data character that matches the `quotechar` value.
+  quotechar: The quoting character to be used when a data value is quoted.
+  encoding_: The encoding in which the file is encoded.
   comment_ (optional): The comment for the new table.
 */
 DECLARE
   sch_name text;
   rel_name text;
   rel_id oid;
+  col_names_sql text;
+  options_sql text;
+  copy_sql text;
 BEGIN
+  -- Create string table
   rel_id := msar.add_mathesar_table(sch_id, tab_name, col_defs, NULL, comment_);
+  -- Get unquoted schema and table name for the created table
   SELECT nspname, relname INTO sch_name, rel_name
   FROM pg_catalog.pg_class AS pgc
   LEFT JOIN pg_catalog.pg_namespace AS pgn
   ON pgc.relnamespace = pgn.oid
   WHERE pgc.oid = rel_id;
+  -- Aggregate TEXT type column names of the created table
+  SELECT string_agg(quote_ident(attname), ', ') INTO col_names_sql
+  FROM pg_catalog.pg_attribute
+  WHERE attrelid = rel_id AND atttypid = 'TEXT'::regtype::oid;
+  -- Form a substring for COPY related options
+  options_sql := concat_ws(
+    ' ',
+    CASE WHEN header THEN 'HEADER' END,
+    CASE WHEN delimiter IS NOT NULL THEN 'DELIMITER ' || quote_literal(delimiter) END,
+    CASE WHEN NULLIF(escapechar, '') IS NOT NULL THEN 'ESCAPE ' || quote_literal(escapechar) END,
+    CASE WHEN quotechar IS NOT NULL THEN 'QUOTE ' || quote_literal(quotechar) END,
+    CASE WHEN encoding_ IS NOT NULL THEN 'ENCODING '|| quote_literal(encoding_) END
+  );
+  -- Create a properly formatted COPY SQL string
+  copy_sql := format('COPY %I.%I (%s) FROM STDIN CSV %s', sch_name, rel_name, col_names_sql, options_sql);
   RETURN jsonb_build_object(
-    'schema_name', quote_ident(sch_name),
-    'table_name', quote_ident(rel_name),
+    'copy_sql', copy_sql,
     'table_oid', rel_id
   );
 END;
diff --git a/db/tables/operations/create.py b/db/tables/operations/create.py
index 9db9cd64a3..d2c486cbe5 100644
--- a/db/tables/operations/create.py
+++ b/db/tables/operations/create.py
@@ -83,12 +83,23 @@ def create_string_column_table(name, schema_oid, column_names, engine, comment=N
     return table
 
 
-def prepare_table_for_import(table_name, schema_oid, column_names, conn, comment=None):
+def prepare_table_for_import(
+    table_name,
+    schema_oid,
+    column_names,
+    header,
+    conn,
+    delimiter=None,
+    escapechar=None,
+    quotechar=None,
+    encoding=None,
+    comment=None
+):
     """
     This method creates a Postgres table in the specified schema, with all
     columns being String type.
 
-    Returns the schema_name, table_name and table_oid of the created table.
+    Returns the copy_sql and table_oid for carrying out import into the created table.
     """
     column_data_list = [
         {
@@ -96,18 +107,22 @@ def prepare_table_for_import(table_name, schema_oid, column_names, conn, comment
             "type": {"name": PostgresType.TEXT.id}
         } for column_name in column_names
     ]
-    table_info = exec_msar_func(
+    import_info = exec_msar_func(
         conn,
         'prepare_table_for_import',
         schema_oid,
         table_name,
         json.dumps(column_data_list),
+        header,
+        delimiter,
+        escapechar,
+        quotechar,
+        encoding,
         comment
     ).fetchone()[0]
     return (
-        table_info['schema_name'],
-        table_info['table_name'],
-        table_info['table_oid']
+        import_info['copy_sql'],
+        import_info['table_oid']
     )
 
 
diff --git a/db/tables/operations/import_.py b/db/tables/operations/import_.py
index a22ec9121c..9385afa67a 100644
--- a/db/tables/operations/import_.py
+++ b/db/tables/operations/import_.py
@@ -1,6 +1,5 @@
 import tempfile
 import clevercsv as csv
-from psycopg import sql
 from db.tables.operations.create import prepare_table_for_import
 from db.encoding_utils import get_sql_compatible_encoding
 from mathesar.models.deprecated import DataFile
@@ -17,60 +16,39 @@ def import_csv(data_file_id, table_name, schema_oid, conn, comment=None):
         data_file.escapechar
     )
     encoding = get_file_encoding(data_file.file)
+    conversion_encoding, sql_encoding = get_sql_compatible_encoding(encoding)
     with open(file_path, 'rb') as csv_file:
         csv_reader = get_sv_reader(csv_file, header, dialect)
         column_names = process_column_names(csv_reader.fieldnames)
-    schema_name, table_name, table_oid = prepare_table_for_import(
+    copy_sql, table_oid = prepare_table_for_import(
         table_name,
         schema_oid,
         column_names,
+        header,
         conn,
+        dialect.delimiter,
+        dialect.escapechar,
+        dialect.quotechar,
+        sql_encoding,
         comment
     )
     insert_csv_records(
-        schema_name,
-        table_name,
-        conn,
+        copy_sql,
         file_path,
-        column_names,
-        header,
-        dialect.delimiter,
-        dialect.escapechar,
-        dialect.quotechar,
-        encoding
+        encoding,
+        conversion_encoding,
+        conn
     )
     return table_oid
 
 
 def insert_csv_records(
-    schema_name,
-    table_name,
-    conn,
+    copy_sql,
     file_path,
-    column_names,
-    header,
-    delimiter=None,
-    escape=None,
-    quote=None,
-    encoding=None
+    encoding,
+    conversion_encoding,
+    conn
 ):
-    conversion_encoding, sql_encoding = get_sql_compatible_encoding(encoding)
-    formatted_columns = sql.SQL(",").join(sql.Identifier(column_name) for column_name in column_names)
-    copy_sql = sql.SQL(
-        "COPY {relation_name} ({formatted_columns}) FROM STDIN CSV {header} {delimiter} {escape} {quote} {encoding}"
-    ).format(
-        relation_name=sql.Identifier(schema_name, table_name),
-        formatted_columns=formatted_columns,
-        header=sql.SQL("HEADER" if header else ""),
-        delimiter=sql.SQL(f"DELIMITER E'{delimiter}'" if delimiter else ""),
-        escape=sql.SQL(f"ESCAPE '{escape}'" if escape else ""),
-        quote=sql.SQL(
-            ("QUOTE ''''" if quote == "'" else f"QUOTE '{quote}'")
-            if quote
-            else ""
-        ),
-        encoding=sql.SQL(f"ENCODING '{sql_encoding}'" if sql_encoding else ""),
-    )
     cursor = conn.cursor()
     with open(file_path, 'r', encoding=encoding) as csv_file:
         if conversion_encoding == encoding:

From 39defa03f68061d368f77e549b5049462cb6a06a Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 25 Jun 2024 19:01:25 +0530
Subject: [PATCH 0321/1141] add NULLIFs

---
 db/sql/00_msar.sql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 29b36485cf..5f93479513 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2406,10 +2406,10 @@ BEGIN
   options_sql := concat_ws(
     ' ',
     CASE WHEN header THEN 'HEADER' END,
-    CASE WHEN delimiter IS NOT NULL THEN 'DELIMITER ' || quote_literal(delimiter) END,
+    CASE WHEN NULLIF(delimiter, '') IS NOT NULL THEN 'DELIMITER ' || quote_literal(delimiter) END,
     CASE WHEN NULLIF(escapechar, '') IS NOT NULL THEN 'ESCAPE ' || quote_literal(escapechar) END,
-    CASE WHEN quotechar IS NOT NULL THEN 'QUOTE ' || quote_literal(quotechar) END,
-    CASE WHEN encoding_ IS NOT NULL THEN 'ENCODING '|| quote_literal(encoding_) END
+    CASE WHEN NULLIF(quotechar, '') IS NOT NULL THEN 'QUOTE ' || quote_literal(quotechar) END,
+    CASE WHEN NULLIF(encoding_, '') IS NOT NULL THEN 'ENCODING '|| quote_literal(encoding_) END
   );
   -- Create a properly formatted COPY SQL string
   copy_sql := format('COPY %I.%I (%s) FROM STDIN CSV %s', sch_name, rel_name, col_names_sql, options_sql);

From af82a18ffff300c03068aa810e712ef11c22b32b Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 25 Jun 2024 21:50:42 +0800
Subject: [PATCH 0322/1141] remove deprecated function and other cruft

---
 mathesar/tests/rpc/test_columns.py |  4 ++--
 mathesar/utils/columns.py          | 16 ----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/mathesar/tests/rpc/test_columns.py b/mathesar/tests/rpc/test_columns.py
index 6c54a9df39..70c21a8f2f 100644
--- a/mathesar/tests/rpc/test_columns.py
+++ b/mathesar/tests/rpc/test_columns.py
@@ -19,7 +19,7 @@ def test_columns_list(rf, monkeypatch):
 
     @contextmanager
     def mock_connect(_database_id, user):
-        if _database_id == 2 and user.username == 'alice':
+        if _database_id == database_id and user.username == 'alice':
             try:
                 yield True
             finally:
@@ -103,7 +103,7 @@ def mock_column_info(_table_oid, conn):
             'has_dependents': False
         }
     ]
-    actual_col_list = columns.list_(table_oid=23457, database_id=2, request=request)
+    actual_col_list = columns.list_(table_oid=23457, database_id=database_id, request=request)
     assert actual_col_list == expect_col_list
 
 
diff --git a/mathesar/utils/columns.py b/mathesar/utils/columns.py
index 2429ad59e0..7c48cd914e 100644
--- a/mathesar/utils/columns.py
+++ b/mathesar/utils/columns.py
@@ -1,21 +1,5 @@
-from mathesar.models.deprecated import Column
 from mathesar.models.base import ColumnMetaData
 
 
-# This should be replaced once we have the ColumnMetadata model sorted out.
-def get_raw_display_options(database_id, table_oid, attnums, user):
-    """Get display options for the columns from Django."""
-    if user.metadata_privileges(database_id) is not None:
-        return [
-            {"id": c.attnum} | c.display_options
-            for c in Column.current_objects.filter(
-                table__schema__database__id=database_id,
-                table__oid=table_oid,
-                attnum__in=attnums
-            )
-            if c.display_options is not None
-        ]
-
-
 def get_columns_meta_data(table_oid, database_id):
     return ColumnMetaData.filter(database__id=database_id, table_oid=table_oid)

From 022834ab1f3f70dba99aecb1995b4f8bb31a9715 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 25 Jun 2024 21:56:33 +0800
Subject: [PATCH 0323/1141] Move RPC columns tests to new namespace

---
 mathesar/tests/rpc/{test_columns.py => columns/test_base.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename mathesar/tests/rpc/{test_columns.py => columns/test_base.py} (100%)

diff --git a/mathesar/tests/rpc/test_columns.py b/mathesar/tests/rpc/columns/test_base.py
similarity index 100%
rename from mathesar/tests/rpc/test_columns.py
rename to mathesar/tests/rpc/columns/test_base.py

From 56fabcf4a63d8edad764c1ac01b8d8408e9ab84b Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 25 Jun 2024 22:47:03 +0800
Subject: [PATCH 0324/1141] add basic test for metadata RPC function

---
 mathesar/tests/rpc/columns/test_base.py     |  2 +-
 mathesar/tests/rpc/columns/test_metadata.py | 59 +++++++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 mathesar/tests/rpc/columns/test_metadata.py

diff --git a/mathesar/tests/rpc/columns/test_base.py b/mathesar/tests/rpc/columns/test_base.py
index 70c21a8f2f..657145f514 100644
--- a/mathesar/tests/rpc/columns/test_base.py
+++ b/mathesar/tests/rpc/columns/test_base.py
@@ -1,5 +1,5 @@
 """
-This file tests the column listing function.
+This file tests the column RPC functions.
 
 Fixtures:
     rf(pytest-django): Provides mocked `Request` objects.
diff --git a/mathesar/tests/rpc/columns/test_metadata.py b/mathesar/tests/rpc/columns/test_metadata.py
new file mode 100644
index 0000000000..f9b6e087c0
--- /dev/null
+++ b/mathesar/tests/rpc/columns/test_metadata.py
@@ -0,0 +1,59 @@
+"""
+This file tests the column metadata RPC functions.
+
+Fixtures:
+    monkeypatch(pytest): Lets you monkeypatch an object for testing.
+"""
+from mathesar.models.base import ColumnMetaData, Database, Server
+from mathesar.rpc.columns import metadata
+
+
+# TODO consider mocking out ColumnMetaData queryset for this test
+def test_columns_meta_data_list(monkeypatch):
+    database_id = 2
+    table_oid = 123456
+
+    def mock_get_columns_meta_data(_table_oid, _database_id):
+        server_model = Server(id=2, host='example.com', port=5432)
+        db_model = Database(id=_database_id, name='mymathesardb', server=server_model)
+        return [
+            ColumnMetaData(
+                database=db_model, table_oid=_table_oid, attnum=2,
+                bool_input="dropdown", bool_true="TRUE", bool_false="FALSE",
+                num_min_frac_digits=5, num_max_frac_digits=10, num_show_as_perc=False,
+                mon_currency_symbol="EUR", mon_currency_location="end-with-space",
+                time_format=None, date_format=None,
+                duration_min=None, duration_max=None, duration_show_units=True,
+            ),
+            ColumnMetaData(
+                database=db_model, table_oid=_table_oid, attnum=8,
+                bool_input="checkbox", bool_true="true", bool_false="false",
+                num_min_frac_digits=2, num_max_frac_digits=8, num_show_as_perc=True,
+                mon_currency_symbol="$", mon_currency_location="after-minus",
+                time_format=None, date_format=None,
+                duration_min=None, duration_max=None, duration_show_units=True,
+            )
+        ]
+
+    monkeypatch.setattr(metadata, "get_columns_meta_data", mock_get_columns_meta_data)
+
+    expect_metadata_list = [
+        metadata.ColumnMetaData(
+            database_id=database_id, table_oid=table_oid, attnum=2,
+            bool_input="dropdown", bool_true="TRUE", bool_false="FALSE",
+            num_min_frac_digits=5, num_max_frac_digits=10, num_show_as_perc=False,
+            mon_currency_symbol="EUR", mon_currency_location="end-with-space",
+            time_format=None, date_format=None,
+            duration_min=None, duration_max=None, duration_show_units=True,
+        ),
+        metadata.ColumnMetaData(
+            database_id=database_id, table_oid=table_oid, attnum=8,
+            bool_input="checkbox", bool_true="true", bool_false="false",
+            num_min_frac_digits=2, num_max_frac_digits=8, num_show_as_perc=True,
+            mon_currency_symbol="$", mon_currency_location="after-minus",
+            time_format=None, date_format=None,
+            duration_min=None, duration_max=None, duration_show_units=True,
+        ),
+    ]
+    actual_metadata_list = metadata.list_(table_oid=table_oid, database_id=database_id)
+    assert actual_metadata_list == expect_metadata_list

From ebc8b15ac349f8cbaf1b4ab2744d000ec1a1781c Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 25 Jun 2024 22:48:00 +0800
Subject: [PATCH 0325/1141] fix improperly copied variable name

---
 mathesar/rpc/columns/metadata.py | 36 ++++++++++++++++----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/mathesar/rpc/columns/metadata.py b/mathesar/rpc/columns/metadata.py
index dd867608a5..561355e04e 100644
--- a/mathesar/rpc/columns/metadata.py
+++ b/mathesar/rpc/columns/metadata.py
@@ -52,24 +52,24 @@ class ColumnMetaData(TypedDict):
     duration_show_units: Optional[bool]
 
     @classmethod
-    def from_db_model(cls, db_model):
+    def from_model(cls, model):
         return cls(
-            database_id=db_model.database.id,
-            table_oid=db_model.table_oid,
-            attnum=db_model.attnum,
-            bool_input=db_model.bool_input,
-            bool_true=db_model.bool_true,
-            bool_false=db_model.bool_false,
-            num_min_frac_digits=db_model.num_min_frac_digits,
-            num_max_frac_digits=db_model.num_max_frac_digits,
-            num_show_as_perc=db_model.num_show_as_perc,
-            mon_currency_symbol=db_model.mon_currency_symbol,
-            mon_currency_location=db_model.mon_currency_location,
-            time_format=db_model.time_format,
-            date_format=db_model.date_format,
-            duration_min=db_model.duration_min,
-            duration_max=db_model.duration_max,
-            duration_show_units=db_model.duration_show_units,
+            database_id=model.database.id,
+            table_oid=model.table_oid,
+            attnum=model.attnum,
+            bool_input=model.bool_input,
+            bool_true=model.bool_true,
+            bool_false=model.bool_false,
+            num_min_frac_digits=model.num_min_frac_digits,
+            num_max_frac_digits=model.num_max_frac_digits,
+            num_show_as_perc=model.num_show_as_perc,
+            mon_currency_symbol=model.mon_currency_symbol,
+            mon_currency_location=model.mon_currency_location,
+            time_format=model.time_format,
+            date_format=model.date_format,
+            duration_min=model.duration_min,
+            duration_max=model.duration_max,
+            duration_show_units=model.duration_show_units,
         )
 
 
@@ -89,5 +89,5 @@ def list_(*, table_oid: int, database_id: int, **kwargs) -> list[ColumnMetaData]
     """
     columns_meta_data = get_columns_meta_data(table_oid, database_id)
     return [
-        ColumnMetaData.from_db_model(db_model) for db_model in columns_meta_data
+        ColumnMetaData.from_model(model) for model in columns_meta_data
     ]

From a15f6fefbf7d269f5039b16bfa9c1fbb85a63f4e Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 25 Jun 2024 13:35:38 -0400
Subject: [PATCH 0326/1141] Fix typo in function doc

---
 db/sql/00_msar.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 56b5d35d36..950c403c24 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -230,7 +230,7 @@ CREATE OR REPLACE FUNCTION
 msar.get_column_name(rel_id oid, col_name text) RETURNS text AS $$/*
 Return the UNQUOTED name for a given column in a given relation (e.g., table).
 
-More precisely, this function returns the quoted name of attributes of any relation appearing in the
+More precisely, this function returns the unquoted name of attributes of any relation appearing in the
 pg_class catalog table (so you could find attributes of indices with this function). If the given
 col_name is not in the relation, we return null.
 

From b67da61df9337a7317815693d3a453ec8309d52a Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 25 Jun 2024 21:04:54 -0400
Subject: [PATCH 0327/1141] Add SQL code standard for casting OIDs to bigint

---
 db/sql/STANDARDS.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/db/sql/STANDARDS.md b/db/sql/STANDARDS.md
index a02a5b04a7..81ead6d690 100644
--- a/db/sql/STANDARDS.md
+++ b/db/sql/STANDARDS.md
@@ -58,4 +58,27 @@ From [OWASP](https://owasp.org/www-project-proactive-controls/v3/en/c4-encode-es
 
 Always qualify system catalog tables by prefixing them with `pg_catalog.`. If you don't, then user-defined tables can shadow the system catalog tables, breaking core functionality.
 
+## Casting OIDs to JSON
+
+Always cast OID values to `bigint` before putting them in JSON (or jsonb).
+
+_Don't_ cast OID values to `integer`.
+
+This is because the [`oid` type](https://www.postgresql.org/docs/current/datatype-oid.html) is an _unsigned_ 32-bit integer whereas the `integer` type is a _signed_ 32-bit integer. That means it's possible for a database to have OID values which don't fit into the `integer` type.
+
+For example, putting a large OID value into JSON by casting it to an integer will cause overflow:
+
+```SQL
+SELECT jsonb_build_object('foo', 3333333333::oid::integer); -- ❌ Bad
+```
+
+> `{"foo": -961633963}`
+
+Instead, cast it to `bigint`
+
+```SQL
+SELECT jsonb_build_object('foo', 3333333333::oid::bigint); -- ✅ Good
+```
+
+> `{"foo": 3333333333}`
 

From 084a4ee130db64d542bcdf94854eb42e54dd8167 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 26 Jun 2024 15:59:04 +0530
Subject: [PATCH 0328/1141] quote column names

---
 db/sql/00_msar.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 2382a1b014..931ec6afb2 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2507,11 +2507,11 @@ BEGIN
     SELECT string_agg(
       'CAST(' ||
       __msar.build_cast_expr(
-        msar.get_column_name(tab_id, (col_cast ->> 'attnum')::integer), col_cast -> 'type' ->> 'name'
+        quote_ident(msar.get_column_name(tab_id, (col_cast ->> 'attnum')::integer)), col_cast -> 'type' ->> 'name'
       ) ||
       ' AS ' ||
       msar.build_type_text(col_cast -> 'type') ||
-      ')'|| ' AS ' || msar.get_column_name(tab_id, (col_cast ->> 'attnum')::integer),
+      ')'|| ' AS ' || quote_ident(msar.get_column_name(tab_id, (col_cast ->> 'attnum')::integer)),
       ', '
     ) AS cast_expr
     FROM jsonb_array_elements(col_cast_def) AS col_cast

From ce0d8d2245a07c9fbc252d7935755164a9fc7530 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 26 Jun 2024 16:06:42 +0530
Subject: [PATCH 0329/1141] fix merge conflict

---
 db/tables/operations/import_.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/db/tables/operations/import_.py b/db/tables/operations/import_.py
index d9fde5d6dc..7929bff2e3 100644
--- a/db/tables/operations/import_.py
+++ b/db/tables/operations/import_.py
@@ -2,13 +2,9 @@
 import tempfile
 
 import clevercsv as csv
-<<<<<<< import_preview
-from psycopg import sql
 
 from db.connection import exec_msar_func
 from db.columns.operations.alter import _transform_column_alter_dict
-=======
->>>>>>> develop
 from db.tables.operations.create import prepare_table_for_import
 from db.encoding_utils import get_sql_compatible_encoding
 from mathesar.models.deprecated import DataFile

From 136b252a1ee59e2086b038d5223a276e2cd1d760 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 26 Jun 2024 16:10:23 +0530
Subject: [PATCH 0330/1141] fix function name

---
 db/sql/00_msar.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index cc0fd6ec4c..260c37d5e1 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2451,7 +2451,7 @@ DECLARE
   sel_query text;
   records jsonb;
 BEGIN
-  tab_name := __msar.get_relation_name(tab_id);
+  tab_name := __msar.get_qualified_relation_name(tab_id);
   sel_query := 'SELECT id, %s FROM %s LIMIT %L';
   WITH preview_cte AS (
     SELECT string_agg(

From a20e663cba091f27a20f4e7b4c1caa3e4aaac1a2 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 26 Jun 2024 16:18:42 +0530
Subject: [PATCH 0331/1141] remove id requirement

---
 db/sql/00_msar.sql      | 3 +--
 db/sql/test_00_msar.sql | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 260c37d5e1..be7c43f42f 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2452,7 +2452,7 @@ DECLARE
   records jsonb;
 BEGIN
   tab_name := __msar.get_qualified_relation_name(tab_id);
-  sel_query := 'SELECT id, %s FROM %s LIMIT %L';
+  sel_query := 'SELECT %s FROM %s LIMIT %L';
   WITH preview_cte AS (
     SELECT string_agg(
       'CAST(' ||
@@ -2465,7 +2465,6 @@ BEGIN
       ', '
     ) AS cast_expr
     FROM jsonb_array_elements(col_cast_def) AS col_cast
-    WHERE NOT msar.is_mathesar_id_column(tab_id, (col_cast ->> 'attnum')::integer)
   )
   SELECT 
     __msar.exec_dql(sel_query, cast_expr, tab_name, rec_limit::text)
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 86b59081e3..986e3a89e3 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -1482,6 +1482,10 @@ $f$ LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION test_get_preview() RETURNS SETOF TEXT AS $f$
 DECLARE
   col_cast_def jsonb := $j$[
+    {
+      "attnum": 1,
+      "type": {"name": "integer"}
+    },
     {
       "attnum":2,
       "type": {"name": "numeric", "options": {"precision":5, "scale":2}}

From cb78fe9f57d57e13d1282f7041fe83432a05dca0 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 26 Jun 2024 16:28:40 +0530
Subject: [PATCH 0332/1141] clear up documentation about id

---
 db/sql/00_msar.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index be7c43f42f..b175c85681 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -72,8 +72,8 @@ Execute the given command, returning a JSON object describing the records in the
 
 Useful for SELECTing from tables. Most useful when you're performing DQL.
 
-Note that you always have to include the primary key column(`id` in case of a Mathesar table) in the
-command_template for the returned records to be uniquely identifiable.
+Note that you must include the primary key column(`id` in case of a Mathesar table) in the
+command_template if you want the returned records to be uniquely identifiable.
 
 Args:
   command: Raw string that will be executed as a command.
@@ -101,8 +101,8 @@ Execute a templated command, returning a JSON object describing the records in t
 The template is given in the first argument, and all further arguments are used to fill in the
 template. Useful for SELECTing from tables. Most useful when you're performing DQL.
 
-Note that you always have to include the primary key column(`id` in case of a Mathesar table) in the
-command_template for the returned records to be uniquely identifiable.
+Note that you must include the primary key column(`id` in case of a Mathesar table) in the
+command_template if you want the returned records to be uniquely identifiable.
 
 Args:
   command_template: Raw string that will be executed as a command.

From 7c31e76cf4c9d41d5d5355f15c6fec255f01028f Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 28 Jun 2024 01:32:29 +0530
Subject: [PATCH 0333/1141] add table metadata model and rpc endpoint

---
 config/settings/common_settings.py            |  3 +-
 ...09_alter_columnmetadata_attnum_and_more.py | 43 ++++++++++++
 mathesar/models/base.py                       | 22 ++++++-
 mathesar/rpc/columns/metadata.py              |  2 +-
 mathesar/rpc/tables/__init__.py               |  1 +
 mathesar/rpc/{tables.py => tables/base.py}    |  0
 mathesar/rpc/tables/metadata.py               | 66 +++++++++++++++++++
 .../{test_tables.py => tables/test_base.py}   | 28 ++++----
 mathesar/tests/rpc/tables/test_metadata.py    |  0
 mathesar/tests/rpc/test_endpoints.py          |  5 ++
 mathesar/utils/tables.py                      |  5 ++
 11 files changed, 157 insertions(+), 18 deletions(-)
 create mode 100644 mathesar/migrations/0009_alter_columnmetadata_attnum_and_more.py
 create mode 100644 mathesar/rpc/tables/__init__.py
 rename mathesar/rpc/{tables.py => tables/base.py} (100%)
 create mode 100644 mathesar/rpc/tables/metadata.py
 rename mathesar/tests/rpc/{test_tables.py => tables/test_base.py} (89%)
 create mode 100644 mathesar/tests/rpc/tables/test_metadata.py

diff --git a/config/settings/common_settings.py b/config/settings/common_settings.py
index c37d6d23ca..c574b418d5 100644
--- a/config/settings/common_settings.py
+++ b/config/settings/common_settings.py
@@ -69,7 +69,8 @@ def pipe_delim(pipe_string):
     'mathesar.rpc.columns',
     'mathesar.rpc.columns.metadata',
     'mathesar.rpc.schemas',
-    'mathesar.rpc.tables'
+    'mathesar.rpc.tables',
+    'mathesar.rpc.tables.metadata'
 ]
 
 TEMPLATES = [
diff --git a/mathesar/migrations/0009_alter_columnmetadata_attnum_and_more.py b/mathesar/migrations/0009_alter_columnmetadata_attnum_and_more.py
new file mode 100644
index 0000000000..35481c0d02
--- /dev/null
+++ b/mathesar/migrations/0009_alter_columnmetadata_attnum_and_more.py
@@ -0,0 +1,43 @@
+# Generated by Django 4.2.11 on 2024-06-27 20:00
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mathesar', '0008_add_metadata_models'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='columnmetadata',
+            name='attnum',
+            field=models.SmallIntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='columnmetadata',
+            name='table_oid',
+            field=models.PositiveBigIntegerField(),
+        ),
+        migrations.CreateModel(
+            name='TableMetaData',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('schema_oid', models.PositiveBigIntegerField()),
+                ('table_oid', models.PositiveBigIntegerField()),
+                ('import_verified', models.BooleanField(default=False)),
+                ('column_order', models.JSONField(default=list)),
+                ('preview_customized', models.BooleanField(default=False)),
+                ('preview_template', models.CharField(blank=True, max_length=255)),
+                ('database', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mathesar.database')),
+            ],
+        ),
+        migrations.AddConstraint(
+            model_name='tablemetadata',
+            constraint=models.UniqueConstraint(fields=('database', 'schema_oid', 'table_oid'), name='unique_table_metadata'),
+        ),
+    ]
diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index 43b9e1607e..c900eb176a 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -84,8 +84,8 @@ def connection(self):
 
 class ColumnMetaData(BaseModel):
     database = models.ForeignKey('Database', on_delete=models.CASCADE)
-    table_oid = models.PositiveIntegerField()
-    attnum = models.PositiveIntegerField()
+    table_oid = models.PositiveBigIntegerField()
+    attnum = models.SmallIntegerField()
     bool_input = models.CharField(
         choices=[("dropdown", "dropdown"), ("checkbox", "checkbox")],
         blank=True
@@ -121,3 +121,21 @@ class Meta:
                 name="frac_digits_integrity"
             )
         ]
+
+
+class TableMetaData(BaseModel):
+    database = models.ForeignKey('Database', on_delete=models.CASCADE)
+    schema_oid = models.PositiveBigIntegerField()
+    table_oid = models.PositiveBigIntegerField()
+    import_verified = models.BooleanField(default=False)
+    column_order = models.JSONField(default=list)
+    preview_customized = models.BooleanField(default=False)
+    preview_template = models.CharField(max_length=255, blank=True)
+
+    class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["database", "schema_oid", "table_oid"],
+                name="unique_table_metadata"
+            )
+        ]
diff --git a/mathesar/rpc/columns/metadata.py b/mathesar/rpc/columns/metadata.py
index 561355e04e..f99118b6b5 100644
--- a/mathesar/rpc/columns/metadata.py
+++ b/mathesar/rpc/columns/metadata.py
@@ -18,7 +18,7 @@ class ColumnMetaData(TypedDict):
 
     Attributes:
         database_id: The Django id of the database containing the table.
-        table_oid: The OID of the table containing the column
+        table_oid: The OID of the table containing the column.
         attnum: The attnum of the column in the table.
         bool_input: How the input for a boolean column should be shown.
         bool_true: A string to display for `true` values.
diff --git a/mathesar/rpc/tables/__init__.py b/mathesar/rpc/tables/__init__.py
new file mode 100644
index 0000000000..79c539308a
--- /dev/null
+++ b/mathesar/rpc/tables/__init__.py
@@ -0,0 +1 @@
+from .base import * # noqa
\ No newline at end of file
diff --git a/mathesar/rpc/tables.py b/mathesar/rpc/tables/base.py
similarity index 100%
rename from mathesar/rpc/tables.py
rename to mathesar/rpc/tables/base.py
diff --git a/mathesar/rpc/tables/metadata.py b/mathesar/rpc/tables/metadata.py
new file mode 100644
index 0000000000..ac72a55f25
--- /dev/null
+++ b/mathesar/rpc/tables/metadata.py
@@ -0,0 +1,66 @@
+"""
+Classes and functions exposed to the RPC endpoint for managing table metadata.
+"""
+from typing import Optional, TypedDict
+
+from modernrpc.core import rpc_method
+from modernrpc.auth.basic import http_basic_auth_login_required
+
+from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+from mathesar.utils.tables import get_table_meta_data
+
+
+class TableMetaData(TypedDict):
+    """
+    Metadata for a table in a database.
+
+    Only the `database`, `schema_oid`, and `table_oid` keys are required.
+
+    Attributes:
+        database_id: The Django id of the database containing the table.
+        schema_oid: The OID of the schema containing the table.
+        table_oid: The OID of the table in the database.
+        import_verified: Specifies whether a file has been successfully imported into a table.
+        column_order: The order in which columns of a table are displayed.
+        preview_customized: Specifies whether the preview has been customized.
+        preview_template: Preview template for a referent column.
+    """
+    database_id: int
+    schema_oid: int
+    table_oid: int
+    import_verified: Optional[bool]
+    column_order: Optional[list[int]]
+    preview_customized: Optional[bool]
+    preview_template: Optional[str]
+
+    @classmethod
+    def from_model(cls, model):
+        return cls(
+            database_id=model.database.id,
+            schema_oid=model.schema_oid,
+            table_oid=model.table_oid,
+            import_verified=model.import_verified,
+            column_order=model.column_order,
+            preview_customized=model.preview_customized,
+            preview_template=model.preview_template,
+        )
+
+
+@rpc_method(name="tables.metadata.get")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def list(*, schema_oid: int, database_id: int, **kwargs) -> list[TableMetaData]:
+    """
+    List metadata associated with tables for a schema.
+
+    Args:
+        schema_oid: Identity of the schema in the user's database.
+        database_id: The Django id of the database containing the table.
+
+    Returns:
+        Metadata object for a given table oid.
+    """
+    table_meta_data = get_table_meta_data(schema_oid, database_id)
+    return [
+        TableMetaData.from_model(model) for model in table_meta_data
+    ]
diff --git a/mathesar/tests/rpc/test_tables.py b/mathesar/tests/rpc/tables/test_base.py
similarity index 89%
rename from mathesar/tests/rpc/test_tables.py
rename to mathesar/tests/rpc/tables/test_base.py
index 1d25765168..693f9b901d 100644
--- a/mathesar/tests/rpc/test_tables.py
+++ b/mathesar/tests/rpc/tables/test_base.py
@@ -45,8 +45,8 @@ def mock_table_info(_schema_oid, conn):
                 'description': None
             }
         ]
-    monkeypatch.setattr(tables, 'connect', mock_connect)
-    monkeypatch.setattr(tables, 'get_table_info', mock_table_info)
+    monkeypatch.setattr(tables.base, 'connect', mock_connect)
+    monkeypatch.setattr(tables.base, 'get_table_info', mock_table_info)
     expect_table_list = [
         {
             'oid': 17408,
@@ -90,8 +90,8 @@ def mock_table_get(_table_oid, conn):
             'schema': 2200,
             'description': 'a description on the authors table.'
         }
-    monkeypatch.setattr(tables, 'connect', mock_connect)
-    monkeypatch.setattr(tables, 'get_table', mock_table_get)
+    monkeypatch.setattr(tables.base, 'connect', mock_connect)
+    monkeypatch.setattr(tables.base, 'get_table', mock_table_get)
     expect_table_list = {
         'oid': table_oid,
         'name': 'Authors',
@@ -123,8 +123,8 @@ def mock_drop_table(_table_oid, conn, cascade):
             raise AssertionError('incorrect parameters passed')
         return 'public."Table 0"'
 
-    monkeypatch.setattr(tables, 'connect', mock_connect)
-    monkeypatch.setattr(tables, 'drop_table_from_database', mock_drop_table)
+    monkeypatch.setattr(tables.base, 'connect', mock_connect)
+    monkeypatch.setattr(tables.base, 'drop_table_from_database', mock_drop_table)
     deleted_table = tables.delete(table_oid=1964474, database_id=11, request=request)
     assert deleted_table == 'public."Table 0"'
 
@@ -149,8 +149,8 @@ def mock_table_add(table_name, _schema_oid, conn, column_data_list, constraint_d
         if _schema_oid != schema_oid:
             raise AssertionError('incorrect parameters passed')
         return 1964474
-    monkeypatch.setattr(tables, 'connect', mock_connect)
-    monkeypatch.setattr(tables, 'create_table_on_database', mock_table_add)
+    monkeypatch.setattr(tables.base, 'connect', mock_connect)
+    monkeypatch.setattr(tables.base, 'create_table_on_database', mock_table_add)
     actual_table_oid = tables.add(table_name='newtable', schema_oid=2200, database_id=11, request=request)
     assert actual_table_oid == 1964474
 
@@ -180,8 +180,8 @@ def mock_table_patch(_table_oid, _table_data_dict, conn):
         if _table_oid != table_oid and _table_data_dict != table_data_dict:
             raise AssertionError('incorrect parameters passed')
         return 'newtabname'
-    monkeypatch.setattr(tables, 'connect', mock_connect)
-    monkeypatch.setattr(tables, 'alter_table_on_database', mock_table_patch)
+    monkeypatch.setattr(tables.base, 'connect', mock_connect)
+    monkeypatch.setattr(tables.base, 'alter_table_on_database', mock_table_patch)
     altered_table_name = tables.patch(
         table_oid=1964474,
         table_data_dict={
@@ -216,8 +216,8 @@ def mock_table_import(_data_file_id, table_name, _schema_oid, conn, comment):
         if _schema_oid != schema_oid and _data_file_id != data_file_id:
             raise AssertionError('incorrect parameters passed')
         return 1964474
-    monkeypatch.setattr(tables, 'connect', mock_connect)
-    monkeypatch.setattr(tables, 'import_csv', mock_table_import)
+    monkeypatch.setattr(tables.base, 'connect', mock_connect)
+    monkeypatch.setattr(tables.base, 'import_csv', mock_table_import)
     imported_table_oid = tables.import_(
         data_file_id=10,
         table_name='imported_table',
@@ -253,8 +253,8 @@ def mock_table_preview(_table_oid, columns, conn, limit):
             {'id': 3, 'length': Decimal('4.0')},
             {'id': 4, 'length': Decimal('5.22')}
         ]
-    monkeypatch.setattr(tables, 'connect', mock_connect)
-    monkeypatch.setattr(tables, 'get_preview', mock_table_preview)
+    monkeypatch.setattr(tables.base, 'connect', mock_connect)
+    monkeypatch.setattr(tables.base, 'get_preview', mock_table_preview)
     records = tables.get_import_preview(
         table_oid=1964474,
         columns=[{'attnum': 2, 'type': {'name': 'numeric', 'options': {'precision': 3, 'scale': 2}}}],
diff --git a/mathesar/tests/rpc/tables/test_metadata.py b/mathesar/tests/rpc/tables/test_metadata.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index a3c63ab75a..9190647883 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -108,6 +108,11 @@
         tables.get_import_preview,
         "tables.get_import_preview",
         [user_is_authenticated]
+    ),
+    (
+        tables.metadata.list_,
+        "tables.metadata.list",
+        [user_is_authenticated]
     )
 ]
 
diff --git a/mathesar/utils/tables.py b/mathesar/utils/tables.py
index 1772d653d7..15b1e2ef9f 100644
--- a/mathesar/utils/tables.py
+++ b/mathesar/utils/tables.py
@@ -5,6 +5,7 @@
 from mathesar.database.base import create_mathesar_engine
 from mathesar.imports.base import create_table_from_data_file
 from mathesar.models.deprecated import Table
+from mathesar.models.base import TableMetaData
 from mathesar.state.django import reflect_columns_from_tables
 from mathesar.state import get_cached_metadata
 
@@ -83,3 +84,7 @@ def create_empty_table(name, schema, comment=None):
     table, _ = Table.current_objects.get_or_create(oid=db_table_oid, schema=schema)
     reflect_columns_from_tables([table], metadata=get_cached_metadata())
     return table
+
+
+def get_table_meta_data(schema_oid, database_id):
+    return TableMetaData.objects.filter(database__id=database_id, schema_oid=schema_oid)

From 6adf4e8230fb599b0c9af045b3b98f9d1a0f868b Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 28 Jun 2024 02:18:24 +0530
Subject: [PATCH 0334/1141] add test

---
 ...e.py => 0009_add_column_metadata_model.py} |  0
 mathesar/rpc/tables/__init__.py               |  2 +-
 mathesar/rpc/tables/metadata.py               |  8 ++--
 .../columns/{test_base.py => test_c_base.py}  |  0
 .../{test_metadata.py => test_c_metadata.py}  |  0
 mathesar/tests/rpc/tables/test_metadata.py    |  0
 .../tables/{test_base.py => test_t_base.py}   |  0
 mathesar/tests/rpc/tables/test_t_metadata.py  | 45 +++++++++++++++++++
 mathesar/utils/tables.py                      |  2 +-
 9 files changed, 51 insertions(+), 6 deletions(-)
 rename mathesar/migrations/{0009_alter_columnmetadata_attnum_and_more.py => 0009_add_column_metadata_model.py} (100%)
 rename mathesar/tests/rpc/columns/{test_base.py => test_c_base.py} (100%)
 rename mathesar/tests/rpc/columns/{test_metadata.py => test_c_metadata.py} (100%)
 delete mode 100644 mathesar/tests/rpc/tables/test_metadata.py
 rename mathesar/tests/rpc/tables/{test_base.py => test_t_base.py} (100%)
 create mode 100644 mathesar/tests/rpc/tables/test_t_metadata.py

diff --git a/mathesar/migrations/0009_alter_columnmetadata_attnum_and_more.py b/mathesar/migrations/0009_add_column_metadata_model.py
similarity index 100%
rename from mathesar/migrations/0009_alter_columnmetadata_attnum_and_more.py
rename to mathesar/migrations/0009_add_column_metadata_model.py
diff --git a/mathesar/rpc/tables/__init__.py b/mathesar/rpc/tables/__init__.py
index 79c539308a..44c8b96840 100644
--- a/mathesar/rpc/tables/__init__.py
+++ b/mathesar/rpc/tables/__init__.py
@@ -1 +1 @@
-from .base import * # noqa
\ No newline at end of file
+from .base import * # noqa
diff --git a/mathesar/rpc/tables/metadata.py b/mathesar/rpc/tables/metadata.py
index ac72a55f25..64b2b85891 100644
--- a/mathesar/rpc/tables/metadata.py
+++ b/mathesar/rpc/tables/metadata.py
@@ -7,7 +7,7 @@
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
-from mathesar.utils.tables import get_table_meta_data
+from mathesar.utils.tables import get_tables_meta_data
 
 
 class TableMetaData(TypedDict):
@@ -46,10 +46,10 @@ def from_model(cls, model):
         )
 
 
-@rpc_method(name="tables.metadata.get")
+@rpc_method(name="tables.metadata.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def list(*, schema_oid: int, database_id: int, **kwargs) -> list[TableMetaData]:
+def list_(*, schema_oid: int, database_id: int, **kwargs) -> list[TableMetaData]:
     """
     List metadata associated with tables for a schema.
 
@@ -60,7 +60,7 @@ def list(*, schema_oid: int, database_id: int, **kwargs) -> list[TableMetaData]:
     Returns:
         Metadata object for a given table oid.
     """
-    table_meta_data = get_table_meta_data(schema_oid, database_id)
+    table_meta_data = get_tables_meta_data(schema_oid, database_id)
     return [
         TableMetaData.from_model(model) for model in table_meta_data
     ]
diff --git a/mathesar/tests/rpc/columns/test_base.py b/mathesar/tests/rpc/columns/test_c_base.py
similarity index 100%
rename from mathesar/tests/rpc/columns/test_base.py
rename to mathesar/tests/rpc/columns/test_c_base.py
diff --git a/mathesar/tests/rpc/columns/test_metadata.py b/mathesar/tests/rpc/columns/test_c_metadata.py
similarity index 100%
rename from mathesar/tests/rpc/columns/test_metadata.py
rename to mathesar/tests/rpc/columns/test_c_metadata.py
diff --git a/mathesar/tests/rpc/tables/test_metadata.py b/mathesar/tests/rpc/tables/test_metadata.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/mathesar/tests/rpc/tables/test_base.py b/mathesar/tests/rpc/tables/test_t_base.py
similarity index 100%
rename from mathesar/tests/rpc/tables/test_base.py
rename to mathesar/tests/rpc/tables/test_t_base.py
diff --git a/mathesar/tests/rpc/tables/test_t_metadata.py b/mathesar/tests/rpc/tables/test_t_metadata.py
new file mode 100644
index 0000000000..ad12b09a61
--- /dev/null
+++ b/mathesar/tests/rpc/tables/test_t_metadata.py
@@ -0,0 +1,45 @@
+"""
+This file tests the table metadata RPC functions.
+
+Fixtures:
+    monkeypatch(pytest): Lets you monkeypatch an object for testing.
+"""
+from mathesar.models.base import TableMetaData, Database, Server
+from mathesar.rpc.tables import metadata
+
+
+def test_columns_meta_data_list(monkeypatch):
+    database_id = 2
+    schema_oid = 123456
+
+    def mock_get_tables_meta_data(_schema_oid, _database_id):
+        server_model = Server(id=2, host='example.com', port=5432)
+        db_model = Database(id=_database_id, name='mymathesardb', server=server_model)
+        return [
+            TableMetaData(
+                database=db_model, schema_oid=_schema_oid, table_oid=1234,
+                import_verified=True, column_order=[8, 9, 10], preview_customized=False,
+                preview_template="{5555}"
+            ),
+            TableMetaData(
+                database=db_model, schema_oid=_schema_oid, table_oid=4567,
+                import_verified=False, column_order=[], preview_customized=True,
+                preview_template="{5512} {1223}"
+            )
+        ]
+    monkeypatch.setattr(metadata, "get_tables_meta_data", mock_get_tables_meta_data)
+
+    expect_metadata_list = [
+        metadata.TableMetaData(
+            database_id=database_id, schema_oid=schema_oid, table_oid=1234,
+            import_verified=True, column_order=[8, 9, 10], preview_customized=False,
+            preview_template="{5555}"
+        ),
+        metadata.TableMetaData(
+            database_id=database_id, schema_oid=schema_oid, table_oid=4567,
+            import_verified=False, column_order=[], preview_customized=True,
+            preview_template="{5512} {1223}"
+        )
+    ]
+    actual_metadata_list = metadata.list_(schema_oid=schema_oid, database_id=database_id)
+    assert actual_metadata_list == expect_metadata_list
diff --git a/mathesar/utils/tables.py b/mathesar/utils/tables.py
index 15b1e2ef9f..b6d1db135d 100644
--- a/mathesar/utils/tables.py
+++ b/mathesar/utils/tables.py
@@ -86,5 +86,5 @@ def create_empty_table(name, schema, comment=None):
     return table
 
 
-def get_table_meta_data(schema_oid, database_id):
+def get_tables_meta_data(schema_oid, database_id):
     return TableMetaData.objects.filter(database__id=database_id, schema_oid=schema_oid)

From 42ef077056bbe0e4b63c387a03737552c553ce22 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 28 Jun 2024 02:25:37 +0530
Subject: [PATCH 0335/1141] fix test name

---
 mathesar/tests/rpc/tables/test_t_metadata.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/tests/rpc/tables/test_t_metadata.py b/mathesar/tests/rpc/tables/test_t_metadata.py
index ad12b09a61..fdaf7af638 100644
--- a/mathesar/tests/rpc/tables/test_t_metadata.py
+++ b/mathesar/tests/rpc/tables/test_t_metadata.py
@@ -8,7 +8,7 @@
 from mathesar.rpc.tables import metadata
 
 
-def test_columns_meta_data_list(monkeypatch):
+def test_tables_meta_data_list(monkeypatch):
     database_id = 2
     schema_oid = 123456
 

From ba96a91b66e8be49e17d1ee700354c682e6c6ce7 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 28 Jun 2024 14:08:58 +0530
Subject: [PATCH 0336/1141] add defaults for min and max frac digits

---
 .../migrations/0009_add_column_metadata_model.py     | 12 +++++++++++-
 mathesar/models/base.py                              |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/mathesar/migrations/0009_add_column_metadata_model.py b/mathesar/migrations/0009_add_column_metadata_model.py
index 35481c0d02..9d511c5922 100644
--- a/mathesar/migrations/0009_add_column_metadata_model.py
+++ b/mathesar/migrations/0009_add_column_metadata_model.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.11 on 2024-06-27 20:00
+# Generated by Django 4.2.11 on 2024-06-28 08:35
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -16,6 +16,16 @@ class Migration(migrations.Migration):
             name='attnum',
             field=models.SmallIntegerField(),
         ),
+        migrations.AlterField(
+            model_name='columnmetadata',
+            name='num_max_frac_digits',
+            field=models.PositiveIntegerField(default=20),
+        ),
+        migrations.AlterField(
+            model_name='columnmetadata',
+            name='num_min_frac_digits',
+            field=models.PositiveIntegerField(default=0),
+        ),
         migrations.AlterField(
             model_name='columnmetadata',
             name='table_oid',
diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index c900eb176a..1291516a79 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -92,8 +92,8 @@ class ColumnMetaData(BaseModel):
     )
     bool_true = models.CharField(default='True')
     bool_false = models.CharField(default='False')
-    num_min_frac_digits = models.PositiveIntegerField(blank=True)
-    num_max_frac_digits = models.PositiveIntegerField(blank=True)
+    num_min_frac_digits = models.PositiveIntegerField(default=0)
+    num_max_frac_digits = models.PositiveIntegerField(default=20)
     num_show_as_perc = models.BooleanField(default=False)
     mon_currency_symbol = models.CharField(default="$")
     mon_currency_location = models.CharField(

From 5b8bcbf2d7f08d431b578619286176d80f819e70 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 28 Jun 2024 17:38:18 +0530
Subject: [PATCH 0337/1141] add tables.metadata.patch endpoint

---
 mathesar/rpc/tables/metadata.py              | 41 +++++++++++++++++++-
 mathesar/tests/rpc/tables/test_t_metadata.py | 32 +++++++++++++--
 mathesar/utils/tables.py                     | 10 +++++
 3 files changed, 78 insertions(+), 5 deletions(-)

diff --git a/mathesar/rpc/tables/metadata.py b/mathesar/rpc/tables/metadata.py
index 64b2b85891..b177314b6c 100644
--- a/mathesar/rpc/tables/metadata.py
+++ b/mathesar/rpc/tables/metadata.py
@@ -7,7 +7,7 @@
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
-from mathesar.utils.tables import get_tables_meta_data
+from mathesar.utils.tables import get_tables_meta_data, patch_table_meta_data
 
 
 class TableMetaData(TypedDict):
@@ -17,6 +17,7 @@ class TableMetaData(TypedDict):
     Only the `database`, `schema_oid`, and `table_oid` keys are required.
 
     Attributes:
+        id: The Django id of the TableMetaData object.
         database_id: The Django id of the database containing the table.
         schema_oid: The OID of the schema containing the table.
         table_oid: The OID of the table in the database.
@@ -25,6 +26,7 @@ class TableMetaData(TypedDict):
         preview_customized: Specifies whether the preview has been customized.
         preview_template: Preview template for a referent column.
     """
+    id: int
     database_id: int
     schema_oid: int
     table_oid: int
@@ -36,6 +38,7 @@ class TableMetaData(TypedDict):
     @classmethod
     def from_model(cls, model):
         return cls(
+            id=model.id,
             database_id=model.database.id,
             schema_oid=model.schema_oid,
             table_oid=model.table_oid,
@@ -46,6 +49,22 @@ def from_model(cls, model):
         )
 
 
+class SettableTableMetaData(TypedDict):
+    """
+    Settable metadata fields for a table in a database.
+
+    Attributes:
+        import_verified: Specifies whether a file has been successfully imported into a table.
+        column_order: The order in which columns of a table are displayed.
+        preview_customized: Specifies whether the preview has been customized.
+        preview_template: Preview template for a referent column.
+    """
+    import_verified: Optional[bool]
+    column_order: Optional[list[int]]
+    preview_customized: Optional[bool]
+    preview_template: Optional[str]
+
+
 @rpc_method(name="tables.metadata.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
@@ -64,3 +83,23 @@ def list_(*, schema_oid: int, database_id: int, **kwargs) -> list[TableMetaData]
     return [
         TableMetaData.from_model(model) for model in table_meta_data
     ]
+
+
+@rpc_method(name="tables.metadata.patch")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def patch(
+    *, metadata_id: int, metadata_dict: SettableTableMetaData, **kwargs
+) -> TableMetaData:
+    """
+    Alter metadata settings associated with a table for a schema.
+
+    Args:
+        metadata_id: Identity of the table metadata in the user's database.
+        metadata_dict: The dict describing desired table metadata alterations.
+
+    Returns:
+        Altered metadata object.
+    """
+    table_meta_data = patch_table_meta_data(metadata_id, metadata_dict)
+    return TableMetaData.from_model(table_meta_data)
diff --git a/mathesar/tests/rpc/tables/test_t_metadata.py b/mathesar/tests/rpc/tables/test_t_metadata.py
index fdaf7af638..012edf6f85 100644
--- a/mathesar/tests/rpc/tables/test_t_metadata.py
+++ b/mathesar/tests/rpc/tables/test_t_metadata.py
@@ -17,12 +17,12 @@ def mock_get_tables_meta_data(_schema_oid, _database_id):
         db_model = Database(id=_database_id, name='mymathesardb', server=server_model)
         return [
             TableMetaData(
-                database=db_model, schema_oid=_schema_oid, table_oid=1234,
+                id=1, database=db_model, schema_oid=_schema_oid, table_oid=1234,
                 import_verified=True, column_order=[8, 9, 10], preview_customized=False,
                 preview_template="{5555}"
             ),
             TableMetaData(
-                database=db_model, schema_oid=_schema_oid, table_oid=4567,
+                id=2, database=db_model, schema_oid=_schema_oid, table_oid=4567,
                 import_verified=False, column_order=[], preview_customized=True,
                 preview_template="{5512} {1223}"
             )
@@ -31,15 +31,39 @@ def mock_get_tables_meta_data(_schema_oid, _database_id):
 
     expect_metadata_list = [
         metadata.TableMetaData(
-            database_id=database_id, schema_oid=schema_oid, table_oid=1234,
+            id=1, database_id=database_id, schema_oid=schema_oid, table_oid=1234,
             import_verified=True, column_order=[8, 9, 10], preview_customized=False,
             preview_template="{5555}"
         ),
         metadata.TableMetaData(
-            database_id=database_id, schema_oid=schema_oid, table_oid=4567,
+            id=2, database_id=database_id, schema_oid=schema_oid, table_oid=4567,
             import_verified=False, column_order=[], preview_customized=True,
             preview_template="{5512} {1223}"
         )
     ]
     actual_metadata_list = metadata.list_(schema_oid=schema_oid, database_id=database_id)
     assert actual_metadata_list == expect_metadata_list
+
+
+def test_tables_meta_data_patch(monkeypatch):
+    database_id = 2
+    schema_oid = 123456
+    metadata_dict = {'import_verified': True, 'column_order': [1, 4, 12]}
+
+    def mock_patch_tables_meta_data(metadata_id, metadata_dict):
+        server_model = Server(id=2, host='example.com', port=5432)
+        db_model = Database(id=database_id, name='mymathesardb', server=server_model)
+        return TableMetaData(
+            id=1, database=db_model, schema_oid=schema_oid, table_oid=1234,
+            import_verified=True, column_order=[1, 4, 12], preview_customized=False,
+            preview_template="{5555}"
+        )
+    monkeypatch.setattr(metadata, "patch_table_meta_data", mock_patch_tables_meta_data)
+
+    expect_metadata_object = metadata.TableMetaData(
+        id=1, database_id=database_id, schema_oid=schema_oid, table_oid=1234,
+        import_verified=True, column_order=[1, 4, 12], preview_customized=False,
+        preview_template="{5555}"
+    )
+    actual_metadata_object = metadata.patch(metadata_id=1, metadata_dict=metadata_dict)
+    assert actual_metadata_object == expect_metadata_object
diff --git a/mathesar/utils/tables.py b/mathesar/utils/tables.py
index b6d1db135d..1951f8bc19 100644
--- a/mathesar/utils/tables.py
+++ b/mathesar/utils/tables.py
@@ -88,3 +88,13 @@ def create_empty_table(name, schema, comment=None):
 
 def get_tables_meta_data(schema_oid, database_id):
     return TableMetaData.objects.filter(database__id=database_id, schema_oid=schema_oid)
+
+
+def patch_table_meta_data(metadata_id, metadata_dict):
+    metadata_model = TableMetaData.objects.get(id=metadata_id)
+    metadata_model.import_verified = metadata_dict.get('import_verified', metadata_model.import_verified)
+    metadata_model.column_order = metadata_dict.get('column_order', metadata_model.column_order)
+    metadata_model.preview_customized = metadata_dict.get('preview_customized', metadata_model.preview_customized)
+    metadata_model.preview_template = metadata_dict.get('preview_template', metadata_model.preview_template)
+    metadata_model.save()
+    return metadata_model

From c7a98eb525ad3a547a43e6a2904eadcac0055f55 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 28 Jun 2024 17:40:49 +0530
Subject: [PATCH 0338/1141] add test for patch endpoint

---
 mathesar/tests/rpc/test_endpoints.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 9190647883..b786e99027 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -113,6 +113,11 @@
         tables.metadata.list_,
         "tables.metadata.list",
         [user_is_authenticated]
+    ),
+    (
+        tables.metadata.patch,
+        "tables.metadata.patch",
+        [user_is_authenticated]
     )
 ]
 

From b6a899edb2f4435c645526fb1a555823b0d8d1af Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 28 Jun 2024 17:46:31 +0530
Subject: [PATCH 0339/1141] add docs

---
 docs/docs/api/rpc.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index aa3cd5e7f7..f3fd42eb25 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -74,6 +74,16 @@ To use an RPC function:
       - TableInfo
       - SettableTableInfo
 
+## Table Metadata
+
+::: tables.metadata
+    options:
+      members:
+      - list_
+      - patch
+      - TableMetaData
+      - SettableTableMetaData
+
 ## Columns
 
 ::: columns

From 6d171717641720b0edc361e3ff9cf7ada699661c Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Mon, 1 Jul 2024 23:41:33 +0530
Subject: [PATCH 0340/1141] rm schema_oid, rename preview_* to
 record_summary_*, refactor patch to use table_oid instead of metadata_id

---
 .../0009_add_column_metadata_model.py         |  9 ++--
 mathesar/models/base.py                       |  7 ++-
 mathesar/rpc/tables/metadata.py               | 41 ++++++++--------
 mathesar/tests/rpc/tables/test_t_metadata.py  | 48 +++++++++----------
 mathesar/utils/tables.py                      | 15 +++---
 5 files changed, 56 insertions(+), 64 deletions(-)

diff --git a/mathesar/migrations/0009_add_column_metadata_model.py b/mathesar/migrations/0009_add_column_metadata_model.py
index 9d511c5922..6b53e15f4f 100644
--- a/mathesar/migrations/0009_add_column_metadata_model.py
+++ b/mathesar/migrations/0009_add_column_metadata_model.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.11 on 2024-06-28 08:35
+# Generated by Django 4.2.11 on 2024-07-01 18:07
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -37,17 +37,16 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
-                ('schema_oid', models.PositiveBigIntegerField()),
                 ('table_oid', models.PositiveBigIntegerField()),
                 ('import_verified', models.BooleanField(default=False)),
                 ('column_order', models.JSONField(default=list)),
-                ('preview_customized', models.BooleanField(default=False)),
-                ('preview_template', models.CharField(blank=True, max_length=255)),
+                ('record_summary_customized', models.BooleanField(default=False)),
+                ('record_summary_template', models.CharField(blank=True, max_length=255)),
                 ('database', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mathesar.database')),
             ],
         ),
         migrations.AddConstraint(
             model_name='tablemetadata',
-            constraint=models.UniqueConstraint(fields=('database', 'schema_oid', 'table_oid'), name='unique_table_metadata'),
+            constraint=models.UniqueConstraint(fields=('database', 'table_oid'), name='unique_table_metadata'),
         ),
     ]
diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index 1291516a79..1ea3b0be70 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -125,17 +125,16 @@ class Meta:
 
 class TableMetaData(BaseModel):
     database = models.ForeignKey('Database', on_delete=models.CASCADE)
-    schema_oid = models.PositiveBigIntegerField()
     table_oid = models.PositiveBigIntegerField()
     import_verified = models.BooleanField(default=False)
     column_order = models.JSONField(default=list)
-    preview_customized = models.BooleanField(default=False)
-    preview_template = models.CharField(max_length=255, blank=True)
+    record_summary_customized = models.BooleanField(default=False)
+    record_summary_template = models.CharField(max_length=255, blank=True)
 
     class Meta:
         constraints = [
             models.UniqueConstraint(
-                fields=["database", "schema_oid", "table_oid"],
+                fields=["database", "table_oid"],
                 name="unique_table_metadata"
             )
         ]
diff --git a/mathesar/rpc/tables/metadata.py b/mathesar/rpc/tables/metadata.py
index b177314b6c..2bc28382c8 100644
--- a/mathesar/rpc/tables/metadata.py
+++ b/mathesar/rpc/tables/metadata.py
@@ -14,38 +14,35 @@ class TableMetaData(TypedDict):
     """
     Metadata for a table in a database.
 
-    Only the `database`, `schema_oid`, and `table_oid` keys are required.
+    Only the `database` and `table_oid` keys are required.
 
     Attributes:
         id: The Django id of the TableMetaData object.
         database_id: The Django id of the database containing the table.
-        schema_oid: The OID of the schema containing the table.
         table_oid: The OID of the table in the database.
         import_verified: Specifies whether a file has been successfully imported into a table.
         column_order: The order in which columns of a table are displayed.
-        preview_customized: Specifies whether the preview has been customized.
-        preview_template: Preview template for a referent column.
+        record_summary_customized: Specifies whether the record summary has been customized.
+        record_summary_template: Record summary template for a referent column.
     """
     id: int
     database_id: int
-    schema_oid: int
     table_oid: int
     import_verified: Optional[bool]
     column_order: Optional[list[int]]
-    preview_customized: Optional[bool]
-    preview_template: Optional[str]
+    record_summary_customized: Optional[bool]
+    record_summary_template: Optional[str]
 
     @classmethod
     def from_model(cls, model):
         return cls(
             id=model.id,
             database_id=model.database.id,
-            schema_oid=model.schema_oid,
             table_oid=model.table_oid,
             import_verified=model.import_verified,
             column_order=model.column_order,
-            preview_customized=model.preview_customized,
-            preview_template=model.preview_template,
+            record_summary_customized=model.record_summary_customized,
+            record_summary_template=model.record_summary_template,
         )
 
 
@@ -56,30 +53,29 @@ class SettableTableMetaData(TypedDict):
     Attributes:
         import_verified: Specifies whether a file has been successfully imported into a table.
         column_order: The order in which columns of a table are displayed.
-        preview_customized: Specifies whether the preview has been customized.
-        preview_template: Preview template for a referent column.
+        record_summary_customized: Specifies whether the record summary has been customized.
+        record_summary_template: Record summary template for a referent column.
     """
     import_verified: Optional[bool]
     column_order: Optional[list[int]]
-    preview_customized: Optional[bool]
-    preview_template: Optional[str]
+    record_summary_customized: Optional[bool]
+    record_summary_template: Optional[str]
 
 
 @rpc_method(name="tables.metadata.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def list_(*, schema_oid: int, database_id: int, **kwargs) -> list[TableMetaData]:
+def list_(*, database_id: int, **kwargs) -> list[TableMetaData]:
     """
-    List metadata associated with tables for a schema.
+    List metadata associated with tables for a database.
 
     Args:
-        schema_oid: Identity of the schema in the user's database.
         database_id: The Django id of the database containing the table.
 
     Returns:
         Metadata object for a given table oid.
     """
-    table_meta_data = get_tables_meta_data(schema_oid, database_id)
+    table_meta_data = get_tables_meta_data(database_id)
     return [
         TableMetaData.from_model(model) for model in table_meta_data
     ]
@@ -89,17 +85,18 @@ def list_(*, schema_oid: int, database_id: int, **kwargs) -> list[TableMetaData]
 @http_basic_auth_login_required
 @handle_rpc_exceptions
 def patch(
-    *, metadata_id: int, metadata_dict: SettableTableMetaData, **kwargs
+    *, table_oid: int, metadata_dict: SettableTableMetaData, database_id: int, **kwargs
 ) -> TableMetaData:
     """
-    Alter metadata settings associated with a table for a schema.
+    Alter metadata settings associated with a table for a database.
 
     Args:
-        metadata_id: Identity of the table metadata in the user's database.
+        table_oid: Identity of the table whose metadata we'll modify.
         metadata_dict: The dict describing desired table metadata alterations.
+        database_id: The Django id of the database containing the table.
 
     Returns:
         Altered metadata object.
     """
-    table_meta_data = patch_table_meta_data(metadata_id, metadata_dict)
+    table_meta_data = patch_table_meta_data(table_oid, metadata_dict, database_id)
     return TableMetaData.from_model(table_meta_data)
diff --git a/mathesar/tests/rpc/tables/test_t_metadata.py b/mathesar/tests/rpc/tables/test_t_metadata.py
index 012edf6f85..faad49b703 100644
--- a/mathesar/tests/rpc/tables/test_t_metadata.py
+++ b/mathesar/tests/rpc/tables/test_t_metadata.py
@@ -10,60 +10,58 @@
 
 def test_tables_meta_data_list(monkeypatch):
     database_id = 2
-    schema_oid = 123456
 
-    def mock_get_tables_meta_data(_schema_oid, _database_id):
+    def mock_get_tables_meta_data(_database_id):
         server_model = Server(id=2, host='example.com', port=5432)
         db_model = Database(id=_database_id, name='mymathesardb', server=server_model)
         return [
             TableMetaData(
-                id=1, database=db_model, schema_oid=_schema_oid, table_oid=1234,
-                import_verified=True, column_order=[8, 9, 10], preview_customized=False,
-                preview_template="{5555}"
+                id=1, database=db_model, table_oid=1234,
+                import_verified=True, column_order=[8, 9, 10], record_summary_customized=False,
+                record_summary_template="{5555}"
             ),
             TableMetaData(
-                id=2, database=db_model, schema_oid=_schema_oid, table_oid=4567,
-                import_verified=False, column_order=[], preview_customized=True,
-                preview_template="{5512} {1223}"
+                id=2, database=db_model, table_oid=4567,
+                import_verified=False, column_order=[], record_summary_customized=True,
+                record_summary_template="{5512} {1223}"
             )
         ]
     monkeypatch.setattr(metadata, "get_tables_meta_data", mock_get_tables_meta_data)
 
     expect_metadata_list = [
         metadata.TableMetaData(
-            id=1, database_id=database_id, schema_oid=schema_oid, table_oid=1234,
-            import_verified=True, column_order=[8, 9, 10], preview_customized=False,
-            preview_template="{5555}"
+            id=1, database_id=database_id, table_oid=1234,
+            import_verified=True, column_order=[8, 9, 10], record_summary_customized=False,
+            record_summary_template="{5555}"
         ),
         metadata.TableMetaData(
-            id=2, database_id=database_id, schema_oid=schema_oid, table_oid=4567,
-            import_verified=False, column_order=[], preview_customized=True,
-            preview_template="{5512} {1223}"
+            id=2, database_id=database_id, table_oid=4567,
+            import_verified=False, column_order=[], record_summary_customized=True,
+            record_summary_template="{5512} {1223}"
         )
     ]
-    actual_metadata_list = metadata.list_(schema_oid=schema_oid, database_id=database_id)
+    actual_metadata_list = metadata.list_(database_id=database_id)
     assert actual_metadata_list == expect_metadata_list
 
 
 def test_tables_meta_data_patch(monkeypatch):
     database_id = 2
-    schema_oid = 123456
     metadata_dict = {'import_verified': True, 'column_order': [1, 4, 12]}
 
-    def mock_patch_tables_meta_data(metadata_id, metadata_dict):
+    def mock_patch_tables_meta_data(table_oid, metadata_dict, _database_id):
         server_model = Server(id=2, host='example.com', port=5432)
-        db_model = Database(id=database_id, name='mymathesardb', server=server_model)
+        db_model = Database(id=_database_id, name='mymathesardb', server=server_model)
         return TableMetaData(
-            id=1, database=db_model, schema_oid=schema_oid, table_oid=1234,
-            import_verified=True, column_order=[1, 4, 12], preview_customized=False,
-            preview_template="{5555}"
+            id=1, database=db_model, table_oid=1234,
+            import_verified=True, column_order=[1, 4, 12], record_summary_customized=False,
+            record_summary_template="{5555}"
         )
     monkeypatch.setattr(metadata, "patch_table_meta_data", mock_patch_tables_meta_data)
 
     expect_metadata_object = metadata.TableMetaData(
-        id=1, database_id=database_id, schema_oid=schema_oid, table_oid=1234,
-        import_verified=True, column_order=[1, 4, 12], preview_customized=False,
-        preview_template="{5555}"
+        id=1, database_id=database_id, table_oid=1234,
+        import_verified=True, column_order=[1, 4, 12], record_summary_customized=False,
+        record_summary_template="{5555}"
     )
-    actual_metadata_object = metadata.patch(metadata_id=1, metadata_dict=metadata_dict)
+    actual_metadata_object = metadata.patch(table_oid=1234, metadata_dict=metadata_dict, database_id=2)
     assert actual_metadata_object == expect_metadata_object
diff --git a/mathesar/utils/tables.py b/mathesar/utils/tables.py
index 1951f8bc19..8b7875ea20 100644
--- a/mathesar/utils/tables.py
+++ b/mathesar/utils/tables.py
@@ -86,15 +86,14 @@ def create_empty_table(name, schema, comment=None):
     return table
 
 
-def get_tables_meta_data(schema_oid, database_id):
-    return TableMetaData.objects.filter(database__id=database_id, schema_oid=schema_oid)
+def get_tables_meta_data(database_id):
+    return TableMetaData.objects.filter(database__id=database_id)
 
 
-def patch_table_meta_data(metadata_id, metadata_dict):
-    metadata_model = TableMetaData.objects.get(id=metadata_id)
-    metadata_model.import_verified = metadata_dict.get('import_verified', metadata_model.import_verified)
-    metadata_model.column_order = metadata_dict.get('column_order', metadata_model.column_order)
-    metadata_model.preview_customized = metadata_dict.get('preview_customized', metadata_model.preview_customized)
-    metadata_model.preview_template = metadata_dict.get('preview_template', metadata_model.preview_template)
+def patch_table_meta_data(table_oid, metadata_dict, database_id):
+    metadata_model = TableMetaData.objects.get(database__id=database_id, table_oid=table_oid)
+    for field, value in metadata_dict.items():
+        if hasattr(metadata_model, field):
+            setattr(metadata_model, field, value)
     metadata_model.save()
     return metadata_model

From 55cc2a9185607732c5a45d8e59d325b1265c9838 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 1 Jul 2024 15:11:55 -0400
Subject: [PATCH 0341/1141] Refactor schemas APIs from REST to RPC

---
 mathesar_ui/src/AppTypes.ts                   |  12 --
 mathesar_ui/src/api/rest/schemas.ts           |  50 -------
 mathesar_ui/src/api/rest/types/queries.ts     |   4 +-
 mathesar_ui/src/api/rest/users.ts             |   7 +-
 mathesar_ui/src/api/rpc/index.ts              |   2 +
 mathesar_ui/src/api/rpc/schemas.ts            |  47 +++++++
 mathesar_ui/src/components/AppHeader.svelte   |   6 +-
 mathesar_ui/src/components/SchemaName.svelte  |   4 +-
 .../breadcrumb/BreadcrumbItem.svelte          |   8 +-
 .../breadcrumb/EntitySelector.svelte          |  11 +-
 .../breadcrumb/SchemaSelector.svelte          |  13 +-
 .../components/breadcrumb/breadcrumbTypes.ts  |  11 +-
 .../data-explorer/DataExplorerPage.svelte     |   9 +-
 .../pages/database/AddEditSchemaModal.svelte  |   5 +-
 .../src/pages/database/DatabaseDetails.svelte |  19 +--
 .../database/SchemaConstituentCounts.svelte   |  20 +--
 .../src/pages/database/SchemaRow.svelte       |   7 +-
 .../pages/exploration/ExplorationPage.svelte  |   7 +-
 .../src/pages/exploration/Header.svelte       |   7 +-
 .../preview/ImportPreviewContent.svelte       |  11 +-
 .../import/preview/ImportPreviewPage.svelte   |   7 +-
 .../import/preview/importPreviewPageUtils.ts  |   7 +-
 .../import/upload/ImportUploadPage.svelte     |   7 +-
 .../schema/CreateEmptyTableButton.svelte      |   7 +-
 .../CreateNewExplorationTutorial.svelte       |   7 +-
 .../pages/schema/CreateNewTableButton.svelte  |   9 +-
 .../schema/CreateNewTableTutorial.svelte      |   7 +-
 .../src/pages/schema/ExplorationItem.svelte   |   7 +-
 .../src/pages/schema/ExplorationsList.svelte  |   5 +-
 .../schema/SchemaAccessControlModal.svelte    |   5 +-
 .../pages/schema/SchemaExplorations.svelte    |   7 +-
 .../src/pages/schema/SchemaOverview.svelte    |  13 +-
 .../src/pages/schema/SchemaPage.svelte        |  13 +-
 .../src/pages/schema/SchemaTables.svelte      |   5 +-
 mathesar_ui/src/pages/schema/TableCard.svelte |  11 +-
 .../src/pages/schema/TablesList.svelte        |   5 +-
 .../src/routes/DataExplorerRoute.svelte       |  13 +-
 .../src/routes/ExplorationRoute.svelte        |   5 +-
 mathesar_ui/src/routes/ImportRoute.svelte     |   7 +-
 mathesar_ui/src/routes/RecordPageRoute.svelte |   5 +-
 mathesar_ui/src/routes/TableRoute.svelte      |   5 +-
 mathesar_ui/src/stores/queries.ts             |  18 ++-
 mathesar_ui/src/stores/schemas.ts             | 122 ++++++++----------
 mathesar_ui/src/stores/storeBasedUrls.ts      |   4 +-
 mathesar_ui/src/stores/tables.ts              |  27 ++--
 mathesar_ui/src/stores/users.ts               |  35 +++--
 .../result-pane/QueryRunErrors.svelte         |   2 +-
 .../table-inspector/table/TableActions.svelte |   6 +-
 mathesar_ui/src/utils/preloadData.ts          |   5 +-
 49 files changed, 313 insertions(+), 323 deletions(-)
 delete mode 100644 mathesar_ui/src/api/rest/schemas.ts
 create mode 100644 mathesar_ui/src/api/rpc/schemas.ts

diff --git a/mathesar_ui/src/AppTypes.ts b/mathesar_ui/src/AppTypes.ts
index 168d51b58d..a779ca063e 100644
--- a/mathesar_ui/src/AppTypes.ts
+++ b/mathesar_ui/src/AppTypes.ts
@@ -1,5 +1,3 @@
-import type { TreeItem } from '@mathesar-component-library/types';
-
 /** @deprecated in favor of Connection */
 export interface Database {
   id: number;
@@ -16,16 +14,6 @@ export interface DBObjectEntry {
   description: string | null;
 }
 
-export interface SchemaEntry extends DBObjectEntry {
-  has_dependencies: boolean;
-  num_tables: number;
-  num_queries: number;
-}
-
-export interface SchemaResponse extends SchemaEntry, TreeItem {
-  tables: DBObjectEntry[];
-}
-
 export type DbType = string;
 
 export interface FilterConfiguration {
diff --git a/mathesar_ui/src/api/rest/schemas.ts b/mathesar_ui/src/api/rest/schemas.ts
deleted file mode 100644
index 9940035c0b..0000000000
--- a/mathesar_ui/src/api/rest/schemas.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import type { SchemaEntry, SchemaResponse } from '@mathesar/AppTypes';
-
-import type { Connection } from './connections';
-import {
-  type PaginatedResponse,
-  deleteAPI,
-  getAPI,
-  patchAPI,
-  postAPI,
-} from './utils/requestUtils';
-
-function list(connectionId: Connection['id']) {
-  return getAPI<PaginatedResponse<SchemaResponse>>(
-    `/api/db/v0/schemas/?connection_id=${connectionId}&limit=500`,
-  );
-}
-
-function add(props: {
-  name: SchemaEntry['name'];
-  description: SchemaEntry['description'];
-  connectionId: Connection['id'];
-}) {
-  return postAPI<SchemaResponse>('/api/db/v0/schemas/', {
-    name: props.name,
-    description: props.description,
-    connection_id: props.connectionId,
-  });
-}
-
-function update(schema: {
-  id: SchemaEntry['id'];
-  name?: SchemaEntry['name'];
-  description?: SchemaEntry['description'];
-}) {
-  return patchAPI<SchemaResponse>(`/api/db/v0/schemas/${schema.id}/`, {
-    name: schema.name,
-    description: schema.description,
-  });
-}
-
-function deleteSchema(schemaId: SchemaEntry['id']) {
-  return deleteAPI(`/api/db/v0/schemas/${schemaId}/`);
-}
-
-export default {
-  list,
-  add,
-  update,
-  delete: deleteSchema,
-};
diff --git a/mathesar_ui/src/api/rest/types/queries.ts b/mathesar_ui/src/api/rest/types/queries.ts
index 713f32c96a..6517eef56a 100644
--- a/mathesar_ui/src/api/rest/types/queries.ts
+++ b/mathesar_ui/src/api/rest/types/queries.ts
@@ -1,7 +1,7 @@
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { JpPath } from '@mathesar/api/rest/types/tables/joinable_tables';
 import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
-import type { SchemaEntry } from '@mathesar/AppTypes';
+import type { Schema } from '@mathesar/api/rpc/schemas';
 
 export type QueryColumnAlias = string;
 
@@ -182,7 +182,7 @@ export interface QueryResultsResponse {
 
 export interface QueryRunResponse extends QueryResultsResponse {
   query: {
-    schema: SchemaEntry['id'];
+    schema: Schema['oid'];
     base_table: QueryInstance['base_table'];
     initial_columns: QueryInstanceInitialColumn[];
     transformations?: QueryInstanceTransformation[];
diff --git a/mathesar_ui/src/api/rest/users.ts b/mathesar_ui/src/api/rest/users.ts
index 1020ccc448..477d881d68 100644
--- a/mathesar_ui/src/api/rest/users.ts
+++ b/mathesar_ui/src/api/rest/users.ts
@@ -1,4 +1,5 @@
-import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+import type { Schema } from '@mathesar/api/rpc/schemas';
+import type { Database } from '@mathesar/AppTypes';
 import type { Language } from '@mathesar/i18n/languages/utils';
 
 import {
@@ -27,7 +28,7 @@ export interface DatabaseRole {
 
 export interface SchemaRole {
   id: number;
-  schema: SchemaEntry['id'];
+  schema: Schema['oid'];
   role: UserRole;
 }
 
@@ -92,7 +93,7 @@ function deleteDatabaseRole(roleId: DatabaseRole['id']) {
 
 function addSchemaRole(
   userId: User['id'],
-  schemaId: SchemaEntry['id'],
+  schemaId: Schema['oid'],
   role: UserRole,
 ) {
   return postAPI<SchemaRole>('/api/ui/v0/schema_roles/', {
diff --git a/mathesar_ui/src/api/rpc/index.ts b/mathesar_ui/src/api/rpc/index.ts
index 0ed7c027c2..e9a3b3c531 100644
--- a/mathesar_ui/src/api/rpc/index.ts
+++ b/mathesar_ui/src/api/rpc/index.ts
@@ -3,6 +3,7 @@ import Cookies from 'js-cookie';
 import { buildRpcApi } from '@mathesar/packages/json-rpc-client-builder';
 
 import { connections } from './connections';
+import { schemas } from './schemas';
 
 /** Mathesar's JSON-RPC API */
 export const api = buildRpcApi({
@@ -10,5 +11,6 @@ export const api = buildRpcApi({
   getHeaders: () => ({ 'X-CSRFToken': Cookies.get('csrftoken') }),
   methodTree: {
     connections,
+    schemas,
   },
 });
diff --git a/mathesar_ui/src/api/rpc/schemas.ts b/mathesar_ui/src/api/rpc/schemas.ts
new file mode 100644
index 0000000000..486a7d4728
--- /dev/null
+++ b/mathesar_ui/src/api/rpc/schemas.ts
@@ -0,0 +1,47 @@
+import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
+
+export interface Schema {
+  oid: number;
+  name: string;
+  description: string;
+  table_count: number;
+}
+
+export const schemas = {
+  list: rpcMethodTypeContainer<
+    {
+      database_id: number;
+    },
+    Schema[]
+  >(),
+
+  /** Returns the OID of the newly-created schema */
+  add: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      name: string;
+      description?: string;
+    },
+    number
+  >(),
+
+  patch: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      schema_oid: number;
+      patch: {
+        name?: string;
+        description?: string;
+      };
+    },
+    void
+  >(),
+
+  delete: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      schema_oid: number;
+    },
+    void
+  >(),
+};
diff --git a/mathesar_ui/src/components/AppHeader.svelte b/mathesar_ui/src/components/AppHeader.svelte
index 0fa38e1483..3bc094ebca 100644
--- a/mathesar_ui/src/components/AppHeader.svelte
+++ b/mathesar_ui/src/components/AppHeader.svelte
@@ -62,7 +62,7 @@
     isCreatingNewEmptyTable = true;
     const tableInfo = await createTable(database, schema, {});
     isCreatingNewEmptyTable = false;
-    router.goto(getTablePageUrl(database.id, schema.id, tableInfo.id), false);
+    router.goto(getTablePageUrl(database.id, schema.oid, tableInfo.id), false);
   }
 </script>
 
@@ -90,14 +90,14 @@
             </ButtonMenuItem>
             <LinkMenuItem
               icon={iconAddNew}
-              href={getImportPageUrl(database.id, schema.id)}
+              href={getImportPageUrl(database.id, schema.oid)}
             >
               {$_('new_table_from_data_import')}
             </LinkMenuItem>
           {/if}
           <LinkMenuItem
             icon={iconExploration}
-            href={getDataExplorerPageUrl(database.id, schema.id)}
+            href={getDataExplorerPageUrl(database.id, schema.oid)}
           >
             {$_('open_data_explorer')}
           </LinkMenuItem>
diff --git a/mathesar_ui/src/components/SchemaName.svelte b/mathesar_ui/src/components/SchemaName.svelte
index e6fa7cf638..d3a0199027 100644
--- a/mathesar_ui/src/components/SchemaName.svelte
+++ b/mathesar_ui/src/components/SchemaName.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-  import type { SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
   import { iconSchema } from '@mathesar/icons';
 
   import NameWithIcon from './NameWithIcon.svelte';
 
-  export let schema: SchemaEntry;
+  export let schema: Schema;
   export let iconHasBox = false;
 
   $: isLocked = schema.name === 'public';
diff --git a/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte b/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
index 0ff6ccf992..df897dfb2c 100644
--- a/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
+++ b/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
@@ -48,7 +48,7 @@
 {:else if item.type === 'schema'}
   <SchemaSelector database={item.database} />
   <div class="breadcrumb-item truncate">
-    <BreadcrumbLink href={getSchemaPageUrl(item.database.id, item.schema.id)}>
+    <BreadcrumbLink href={getSchemaPageUrl(item.database.id, item.schema.oid)}>
       <SchemaName schema={item.schema} />
     </BreadcrumbLink>
   </div>
@@ -56,7 +56,7 @@
   <EntitySelector database={item.database} schema={item.schema} />
   <div class="breadcrumb-item truncate">
     <BreadcrumbLink
-      href={getLinkForTableItem(item.database.id, item.schema.id, item.table)}
+      href={getLinkForTableItem(item.database.id, item.schema.oid, item.table)}
     >
       <TableName table={item.table} />
     </BreadcrumbLink>
@@ -67,7 +67,7 @@
     <BreadcrumbLink
       href={getRecordPageUrl(
         item.database.id,
-        item.schema.id,
+        item.schema.oid,
         item.table.id,
         item.record.pk,
       )}
@@ -83,7 +83,7 @@
     <BreadcrumbLink
       href={getExplorationPageUrl(
         item.database.id,
-        item.schema.id,
+        item.schema.oid,
         item.query.id,
       )}
     >
diff --git a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
index 59febd3af3..c3c182f93a 100644
--- a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
@@ -4,7 +4,8 @@
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import { iconTable } from '@mathesar/icons';
   import { getExplorationPageUrl } from '@mathesar/routes/urls';
   import { queries as queriesStore } from '@mathesar/stores/queries';
@@ -22,7 +23,7 @@
   } from './breadcrumbTypes';
 
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
 
   function makeTableBreadcrumbSelectorItem(
     table: TableEntry,
@@ -31,7 +32,7 @@
       type: 'table',
       table,
       label: table.name,
-      href: getLinkForTableItem(database.id, schema.id, table),
+      href: getLinkForTableItem(database.id, schema.oid, table),
       icon: iconTable,
       isActive() {
         return table.id === $currentTableId;
@@ -47,13 +48,13 @@
     return {
       type: 'simple',
       label: queryInstance.name,
-      href: getExplorationPageUrl(database.id, schema.id, queryInstance.id),
+      href: getExplorationPageUrl(database.id, schema.oid, queryInstance.id),
       icon: iconTable,
       isActive() {
         // TODO we don't have a store for what the current query is, so we fallback to comparing hrefs.
         const entryhref = getExplorationPageUrl(
           database.id,
-          schema.id,
+          schema.oid,
           queryInstance.id,
         );
         const currentHref = $currentRoute.url;
diff --git a/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte b/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte
index 81d71206af..d9c11af8d7 100644
--- a/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import { iconSchema } from '@mathesar/icons';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
   import {
@@ -14,16 +15,14 @@
 
   export let database: Database;
 
-  function makeBreadcrumbSelectorItem(
-    schemaEntry: SchemaEntry,
-  ): BreadcrumbSelectorEntry {
+  function makeBreadcrumbSelectorItem(schema: Schema): BreadcrumbSelectorEntry {
     return {
       type: 'simple',
-      label: schemaEntry.name,
-      href: getSchemaPageUrl(database.id, schemaEntry.id),
+      label: schema.name,
+      href: getSchemaPageUrl(database.id, schema.oid),
       icon: iconSchema,
       isActive() {
-        return schemaEntry.id === $currentSchemaId;
+        return schema.oid === $currentSchemaId;
       },
     };
   }
diff --git a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
index 66ac54f1a3..3e761149fa 100644
--- a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
+++ b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
@@ -1,6 +1,7 @@
 import type { QueryInstance } from '@mathesar/api/rest/types/queries';
 import type { TableEntry } from '@mathesar/api/rest/types/tables';
-import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+import type { Schema } from '@mathesar/api/rpc/schemas';
+import type { Database } from '@mathesar/AppTypes';
 import type {
   ComponentAndProps,
   IconProps,
@@ -18,13 +19,13 @@ export interface BreadcrumbItemDatabase {
 export interface BreadcrumbItemSchema {
   type: 'schema';
   database: Database;
-  schema: SchemaEntry;
+  schema: Schema;
 }
 
 export interface BreadcrumbItemTable {
   type: 'table';
   database: Database;
-  schema: SchemaEntry;
+  schema: Schema;
   table: TableEntry;
 }
 
@@ -38,7 +39,7 @@ export interface BreadcrumbItemSimple {
 export interface BreadcrumbItemRecord {
   type: 'record';
   database: Database;
-  schema: SchemaEntry;
+  schema: Schema;
   table: TableEntry;
   record: {
     pk: string;
@@ -49,7 +50,7 @@ export interface BreadcrumbItemRecord {
 export interface BreadcrumbItemExploration {
   type: 'exploration';
   database: Database;
-  schema: SchemaEntry;
+  schema: Schema;
   query: Pick<QueryInstance, 'id' | 'name'>;
 }
 
diff --git a/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte b/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte
index 084fd9815c..1292d67bae 100644
--- a/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte
+++ b/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte
@@ -2,7 +2,8 @@
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
 
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import {
@@ -16,7 +17,7 @@
   const userProfile = getUserProfileStoreFromContext();
 
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
   export let queryManager: QueryManager;
 
   $: ({ query } = queryManager);
@@ -25,12 +26,12 @@
     false;
 
   function gotoSchemaPage() {
-    router.goto(getSchemaPageUrl(database.id, schema.id));
+    router.goto(getSchemaPageUrl(database.id, schema.oid));
   }
 
   function gotoExplorationPage() {
     if ($query.id) {
-      router.goto(getExplorationPageUrl(database.id, schema.id, $query.id));
+      router.goto(getExplorationPageUrl(database.id, schema.oid, $query.id));
     }
   }
 </script>
diff --git a/mathesar_ui/src/pages/database/AddEditSchemaModal.svelte b/mathesar_ui/src/pages/database/AddEditSchemaModal.svelte
index 734923fb38..477ec9ee99 100644
--- a/mathesar_ui/src/pages/database/AddEditSchemaModal.svelte
+++ b/mathesar_ui/src/pages/database/AddEditSchemaModal.svelte
@@ -2,7 +2,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import Identifier from '@mathesar/components/Identifier.svelte';
   import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
   import NameAndDescInputModalForm from '@mathesar/components/NameAndDescInputModalForm.svelte';
@@ -17,7 +18,7 @@
 
   export let database: Database;
   export let controller: ModalController;
-  export let schema: SchemaEntry | undefined = undefined;
+  export let schema: Schema | undefined = undefined;
 
   function nameIsDuplicate(name: string) {
     // Handling the condition when the new name is equal to the current name
diff --git a/mathesar_ui/src/pages/database/DatabaseDetails.svelte b/mathesar_ui/src/pages/database/DatabaseDetails.svelte
index 6a1b655a3c..24a0805c52 100644
--- a/mathesar_ui/src/pages/database/DatabaseDetails.svelte
+++ b/mathesar_ui/src/pages/database/DatabaseDetails.svelte
@@ -3,7 +3,8 @@
   import { router } from 'tinro';
 
   import { reflectApi } from '@mathesar/api/rest/reflect';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import AppSecondaryHeader from '@mathesar/components/AppSecondaryHeader.svelte';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
@@ -65,14 +66,14 @@
   );
 
   let filterQuery = '';
-  let targetSchema: SchemaEntry | undefined;
+  let targetSchema: Schema | undefined;
   let isReflectionRunning = false;
 
   function filterSchemas(
     schemaData: DBSchemaStoreData['data'],
     filter: string,
-  ): SchemaEntry[] {
-    const filtered: SchemaEntry[] = [];
+  ): Schema[] {
+    const filtered: Schema[] = [];
     schemaData.forEach((schema) => {
       if (schema.name?.toLowerCase().includes(filter.toLowerCase())) {
         filtered.push(schema);
@@ -88,20 +89,20 @@
     addEditModal.open();
   }
 
-  function editSchema(schema: SchemaEntry) {
+  function editSchema(schema: Schema) {
     targetSchema = schema;
     addEditModal.open();
   }
 
-  function deleteSchema(schema: SchemaEntry) {
+  function deleteSchema(schema: Schema) {
     void confirmDelete({
       identifierType: $_('schema'),
       identifierName: schema.name,
       body: [$_('schema_delete_warning'), $_('are_you_sure_to_proceed')],
       onProceed: async () => {
-        await deleteSchemaAPI(database.id, schema.id);
+        await deleteSchemaAPI(database.id, schema.oid);
         // TODO: Create common util to handle data clearing & sync between stores
-        removeTablesInSchemaTablesStore(schema.id);
+        removeTablesInSchemaTablesStore(schema.oid);
       },
     });
   }
@@ -221,7 +222,7 @@
     </p>
     <ul class="schema-list" slot="content">
       {#if schemasRequestStatus.state === 'success'}
-        {#each displayList as schema (schema.id)}
+        {#each displayList as schema (schema.oid)}
           <li class="schema-list-item">
             <SchemaRow
               {database}
diff --git a/mathesar_ui/src/pages/database/SchemaConstituentCounts.svelte b/mathesar_ui/src/pages/database/SchemaConstituentCounts.svelte
index 561e5d130d..d9677f567b 100644
--- a/mathesar_ui/src/pages/database/SchemaConstituentCounts.svelte
+++ b/mathesar_ui/src/pages/database/SchemaConstituentCounts.svelte
@@ -1,23 +1,19 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
 
-  export let schema: SchemaEntry;
+  export let schema: Schema;
 </script>
 
 <div class="container">
-  <p class="constituent">
-    {$_('count_tables', { values: { count: schema.num_tables } })}
-  </p>
-  <span class="divider" />
-  <p class="constituent">
-    {$_('count_explorations', { values: { count: schema.num_queries } })}
+  <p class="table-count">
+    {$_('count_tables', { values: { count: schema.table_count } })}
   </p>
 </div>
 
 <style lang="scss">
-  .constituent {
+  .table-count {
     font-size: var(--text-size-base);
     font-weight: 400;
     margin: 0;
@@ -31,10 +27,4 @@
       margin-left: 0.5rem;
     }
   }
-  .divider {
-    width: 4px;
-    height: 4px;
-    background-color: var(--slate-500);
-    border-radius: var(--border-radius-m);
-  }
 </style>
diff --git a/mathesar_ui/src/pages/database/SchemaRow.svelte b/mathesar_ui/src/pages/database/SchemaRow.svelte
index 6eb6c24f72..534cec6534 100644
--- a/mathesar_ui/src/pages/database/SchemaRow.svelte
+++ b/mathesar_ui/src/pages/database/SchemaRow.svelte
@@ -2,7 +2,8 @@
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
 
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import DropdownMenu from '@mathesar/component-library/dropdown-menu/DropdownMenu.svelte';
   import MenuDivider from '@mathesar/component-library/menu/MenuDivider.svelte';
   import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
@@ -21,13 +22,13 @@
   const dispatch = createEventDispatcher();
 
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
   export let canExecuteDDL = true;
 
   let isHovered = false;
   let isFocused = false;
 
-  $: href = getSchemaPageUrl(database.id, schema.id);
+  $: href = getSchemaPageUrl(database.id, schema.oid);
   $: isDefault = schema.name === 'public';
   $: isLocked = schema.name === 'public';
 </script>
diff --git a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
index c5372c4f36..be676788a6 100644
--- a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
+++ b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
@@ -3,7 +3,8 @@
   import { router } from 'tinro';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
@@ -22,7 +23,7 @@
   const userProfile = getUserProfileStoreFromContext();
 
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
   export let query: QueryInstance;
   export let shareConsumer: ShareConsumer | undefined = undefined;
 
@@ -51,7 +52,7 @@
   $: createQueryRunner(query, $currentDbAbstractTypes.data);
 
   function gotoSchemaPage() {
-    router.goto(getSchemaPageUrl(database.id, schema.id));
+    router.goto(getSchemaPageUrl(database.id, schema.oid));
   }
 </script>
 
diff --git a/mathesar_ui/src/pages/exploration/Header.svelte b/mathesar_ui/src/pages/exploration/Header.svelte
index 5a96c39484..d3ec06a273 100644
--- a/mathesar_ui/src/pages/exploration/Header.svelte
+++ b/mathesar_ui/src/pages/exploration/Header.svelte
@@ -2,7 +2,8 @@
   import { _ } from 'svelte-i18n';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import EntityPageHeader from '@mathesar/components/EntityPageHeader.svelte';
   import { iconExploration, iconInspector } from '@mathesar/icons';
   import { getExplorationEditorPageUrl } from '@mathesar/routes/urls';
@@ -11,7 +12,7 @@
   import ShareExplorationDropdown from './ShareExplorationDropdown.svelte';
 
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
   export let query: QueryInstance;
   export let isInspectorOpen = true;
   export let canEditMetadata: boolean;
@@ -30,7 +31,7 @@
       {#if canEditMetadata}
         <a
           class="btn btn-primary"
-          href={getExplorationEditorPageUrl(database.id, schema.id, query.id)}
+          href={getExplorationEditorPageUrl(database.id, schema.oid, query.id)}
         >
           <span>{$_('edit_in_data_explorer')}</span>
         </a>
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index b6359e8e2c..838161b297 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -6,7 +6,8 @@
   import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import type { Column } from '@mathesar/api/rest/types/tables/columns';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import {
     Field,
     FieldLayout,
@@ -60,7 +61,7 @@
   const cancelationRequest = makeDeleteTableRequest();
 
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
   export let table: TableEntry;
   export let dataFile: DataFile;
   export let useColumnTypeInference = false;
@@ -108,7 +109,7 @@
   }) {
     const tableId = props.table?.id ?? table.id;
     router.goto(
-      getImportPreviewPageUrl(database.id, schema.id, tableId, {
+      getImportPreviewPageUrl(database.id, schema.oid, tableId, {
         useColumnTypeInference:
           props.useColumnTypeInference ?? useColumnTypeInference,
       }),
@@ -146,7 +147,7 @@
   async function cancel() {
     const response = await cancelationRequest.run({ database, schema, table });
     if (response.isOk) {
-      router.goto(getSchemaPageUrl(database.id, schema.id), true);
+      router.goto(getSchemaPageUrl(database.id, schema.oid), true);
     } else {
       toast.fromError(response.error);
     }
@@ -159,7 +160,7 @@
         import_verified: true,
         columns: finalizeColumns(columns, columnPropertiesMap),
       });
-      router.goto(getTablePageUrl(database.id, schema.id, table.id), true);
+      router.goto(getTablePageUrl(database.id, schema.oid, table.id), true);
     } catch (err) {
       toast.fromError(err);
     }
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
index d67efa353b..775b6d0712 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
@@ -3,7 +3,8 @@
   import { router } from 'tinro';
 
   import { dataFilesApi } from '@mathesar/api/rest/dataFiles';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { getTablePageUrl } from '@mathesar/routes/urls';
@@ -19,12 +20,12 @@
   const dataFileFetch = new AsyncStore(dataFilesApi.get);
 
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
   export let tableId: number;
   export let useColumnTypeInference = false;
 
   function redirectToTablePage() {
-    router.goto(getTablePageUrl(database.id, schema.id, tableId));
+    router.goto(getTablePageUrl(database.id, schema.oid, tableId));
   }
 
   $: void (async () => {
diff --git a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
index 262ae59480..6d7474ca8c 100644
--- a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
+++ b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
@@ -5,7 +5,8 @@ import type {
   TableEntry,
 } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
-import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+import type { Schema } from '@mathesar/api/rpc/schemas';
+import type { Database } from '@mathesar/AppTypes';
 import { getCellCap } from '@mathesar/components/cell-fabric/utils';
 import { getAbstractTypeForDbType } from '@mathesar/stores/abstract-types';
 import type {
@@ -51,7 +52,7 @@ export function processColumns(
 export function makeHeaderUpdateRequest() {
   interface Props {
     database: Database;
-    schema: SchemaEntry;
+    schema: Schema;
     table: Pick<TableEntry, 'id'>;
     dataFile: Pick<DataFile, 'id'>;
     firstRowIsHeader: boolean;
@@ -73,7 +74,7 @@ export function makeHeaderUpdateRequest() {
 export function makeDeleteTableRequest() {
   interface Props {
     database: Database;
-    schema: SchemaEntry;
+    schema: Schema;
     table: Pick<TableEntry, 'id'>;
   }
   return new AsyncStore((props: Props) =>
diff --git a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
index 35704c6d47..64c670d4d1 100644
--- a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
+++ b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
@@ -4,7 +4,8 @@
 
   import { dataFilesApi } from '@mathesar/api/rest/dataFiles';
   import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import Spinner from '@mathesar/component-library/spinner/Spinner.svelte';
   import DocsLink from '@mathesar/components/DocsLink.svelte';
   import {
@@ -37,7 +38,7 @@
   import DataFileInput from './DataFileInput.svelte';
 
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
 
   interface UploadMethod {
     key: 'file' | 'url' | 'clipboard';
@@ -117,7 +118,7 @@
       });
       const previewPage = getImportPreviewPageUrl(
         database.id,
-        schema.id,
+        schema.oid,
         table.id,
         { useColumnTypeInference: $useColumnTypeInference },
       );
diff --git a/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte b/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
index 1d95dcea92..6e288c5312 100644
--- a/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
+++ b/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
@@ -1,13 +1,14 @@
 <script lang="ts">
   import { router } from 'tinro';
 
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import { getTablePageUrl } from '@mathesar/routes/urls';
   import { createTable } from '@mathesar/stores/tables';
   import { Button, Spinner } from '@mathesar-component-library';
 
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
 
   let classes = '';
   export { classes as class };
@@ -18,7 +19,7 @@
     isCreatingNewTable = true;
     const tableInfo = await createTable(database, schema, {});
     isCreatingNewTable = false;
-    router.goto(getTablePageUrl(database.id, schema.id, tableInfo.id), false);
+    router.goto(getTablePageUrl(database.id, schema.oid, tableInfo.id), false);
   }
 </script>
 
diff --git a/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte b/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte
index 9592e2677a..ea2eebf2f6 100644
--- a/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte
+++ b/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte
@@ -1,12 +1,13 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
   import { AnchorButton, Tutorial } from '@mathesar-component-library';
 
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
 </script>
 
 <Tutorial>
@@ -18,7 +19,7 @@
   </span>
   <AnchorButton
     slot="footer"
-    href={getDataExplorerPageUrl(database.id, schema.id)}
+    href={getDataExplorerPageUrl(database.id, schema.oid)}
   >
     {$_('open_data_explorer')}
   </AnchorButton>
diff --git a/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte b/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
index 2bb296e493..9a22b3733e 100644
--- a/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
+++ b/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
@@ -2,7 +2,8 @@
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
 
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import Icon from '@mathesar/component-library/icon/Icon.svelte';
   import LinkMenuItem from '@mathesar/component-library/menu/LinkMenuItem.svelte';
   import { iconAddNew } from '@mathesar/icons';
@@ -15,7 +16,7 @@
   } from '@mathesar-component-library';
 
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
 
   let isCreatingNewTable = false;
 
@@ -23,7 +24,7 @@
     isCreatingNewTable = true;
     const tableInfo = await createTable(database, schema, {});
     isCreatingNewTable = false;
-    router.goto(getTablePageUrl(database.id, schema.id, tableInfo.id), false);
+    router.goto(getTablePageUrl(database.id, schema.oid, tableInfo.id), false);
   }
 </script>
 
@@ -44,7 +45,7 @@
   <ButtonMenuItem on:click={handleCreateEmptyTable}>
     {$_('from_scratch')}
   </ButtonMenuItem>
-  <LinkMenuItem href={getImportPageUrl(database.id, schema.id)}>
+  <LinkMenuItem href={getImportPageUrl(database.id, schema.oid)}>
     {$_('from_data_import')}
   </LinkMenuItem>
 </DropdownMenu>
diff --git a/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte b/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte
index 230dcfd739..241bb17bb9 100644
--- a/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte
+++ b/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte
@@ -1,14 +1,15 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import { getImportPageUrl } from '@mathesar/routes/urls';
   import { AnchorButton, Tutorial } from '@mathesar-component-library';
 
   import CreateEmptyTableButton from './CreateEmptyTableButton.svelte';
 
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
 </script>
 
 <Tutorial>
@@ -22,7 +23,7 @@
       <CreateEmptyTableButton class="padding-zero" {database} {schema}>
         <span>{$_('from_scratch')}</span>
       </CreateEmptyTableButton>
-      <AnchorButton href={getImportPageUrl(database.id, schema.id)}>
+      <AnchorButton href={getImportPageUrl(database.id, schema.oid)}>
         {$_('import_from_file')}
       </AnchorButton>
     </div>
diff --git a/mathesar_ui/src/pages/schema/ExplorationItem.svelte b/mathesar_ui/src/pages/schema/ExplorationItem.svelte
index ade361c335..dc2a346478 100644
--- a/mathesar_ui/src/pages/schema/ExplorationItem.svelte
+++ b/mathesar_ui/src/pages/schema/ExplorationItem.svelte
@@ -2,7 +2,8 @@
   import { _ } from 'svelte-i18n';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import TableName from '@mathesar/components/TableName.svelte';
   import { iconExploration } from '@mathesar/icons';
   import { getExplorationPageUrl } from '@mathesar/routes/urls';
@@ -11,14 +12,14 @@
 
   export let exploration: QueryInstance;
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
 
   $: baseTable = $tablesStore.data.get(exploration.base_table);
 </script>
 
 <a
   class="link-container"
-  href={getExplorationPageUrl(database.id, schema.id, exploration.id)}
+  href={getExplorationPageUrl(database.id, schema.oid, exploration.id)}
 >
   <div class="container">
     <div class="horizontal-container name-and-icon">
diff --git a/mathesar_ui/src/pages/schema/ExplorationsList.svelte b/mathesar_ui/src/pages/schema/ExplorationsList.svelte
index 6dd223f709..8fa27682a5 100644
--- a/mathesar_ui/src/pages/schema/ExplorationsList.svelte
+++ b/mathesar_ui/src/pages/schema/ExplorationsList.svelte
@@ -2,7 +2,8 @@
   import { _ } from 'svelte-i18n';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import { iconExploration } from '@mathesar/icons';
 
   import EmptyEntity from './EmptyEntity.svelte';
@@ -10,7 +11,7 @@
 
   export let explorations: QueryInstance[];
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
   export let bordered = true;
 </script>
 
diff --git a/mathesar_ui/src/pages/schema/SchemaAccessControlModal.svelte b/mathesar_ui/src/pages/schema/SchemaAccessControlModal.svelte
index cb22a2a557..b4dc77cf9c 100644
--- a/mathesar_ui/src/pages/schema/SchemaAccessControlModal.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaAccessControlModal.svelte
@@ -2,7 +2,8 @@
   import { _ } from 'svelte-i18n';
 
   import type { UserRole } from '@mathesar/api/rest/users';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import Identifier from '@mathesar/components/Identifier.svelte';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { RichText } from '@mathesar/components/rich-text';
@@ -19,7 +20,7 @@
 
   export let controller: ModalController;
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
 
   const usersStore = setUsersStoreInContext();
   const { requestStatus } = usersStore;
diff --git a/mathesar_ui/src/pages/schema/SchemaExplorations.svelte b/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
index 4cfee93bce..bf947784f2 100644
--- a/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
@@ -2,7 +2,8 @@
   import { _ } from 'svelte-i18n';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
@@ -12,7 +13,7 @@
   import ExplorationsList from './ExplorationsList.svelte';
 
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
   export let explorationsMap: Map<number, QueryInstance>;
   export let hasTablesToExplore: boolean;
   export let canEditMetadata: boolean;
@@ -47,7 +48,7 @@
   on:clear={clearQuery}
 >
   <svelte:fragment slot="action">
-    <AnchorButton href={getDataExplorerPageUrl(database.id, schema.id)}>
+    <AnchorButton href={getDataExplorerPageUrl(database.id, schema.oid)}>
       {$_('open_data_explorer')}
     </AnchorButton>
   </svelte:fragment>
diff --git a/mathesar_ui/src/pages/schema/SchemaOverview.svelte b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
index 4385fc2de7..ad9d8cd6ca 100644
--- a/mathesar_ui/src/pages/schema/SchemaOverview.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
@@ -4,7 +4,8 @@
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import SpinnerButton from '@mathesar/component-library/spinner-button/SpinnerButton.svelte';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { iconRefresh } from '@mathesar/icons';
@@ -31,7 +32,7 @@
   export let canEditMetadata: boolean;
 
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
 
   $: hasTables = tablesMap.size > 0;
   $: hasExplorations = explorationsMap.size > 0;
@@ -53,14 +54,14 @@
       </svelte:fragment>
     </OverviewHeader>
     {#if tablesRequestStatus.state === 'processing'}
-      <TableSkeleton numTables={schema.num_tables} />
+      <TableSkeleton numTables={schema.table_count} />
     {:else if tablesRequestStatus.state === 'failure'}
       <ErrorBox>
         <p>{tablesRequestStatus.errors[0]}</p>
         <div>
           <SpinnerButton
             onClick={async () => {
-              await refetchTablesForSchema(schema.id);
+              await refetchTablesForSchema(schema.oid);
             }}
             label={$_('retry')}
             icon={iconRefresh}
@@ -94,7 +95,7 @@
           <div>
             <SpinnerButton
               onClick={async () => {
-                await refetchQueriesForSchema(schema.id);
+                await refetchQueriesForSchema(schema.oid);
               }}
               label={$_('retry')}
               icon={iconRefresh}
@@ -125,7 +126,7 @@
           {$_('what_is_an_exploration_mini')}
         </span>
         <div>
-          <AnchorButton href={getDataExplorerPageUrl(database.id, schema.id)}>
+          <AnchorButton href={getDataExplorerPageUrl(database.id, schema.oid)}>
             {$_('open_data_explorer')}
           </AnchorButton>
         </div>
diff --git a/mathesar_ui/src/pages/schema/SchemaPage.svelte b/mathesar_ui/src/pages/schema/SchemaPage.svelte
index fab522012b..e7bc1d4149 100644
--- a/mathesar_ui/src/pages/schema/SchemaPage.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPage.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import AppSecondaryHeader from '@mathesar/components/AppSecondaryHeader.svelte';
   import { iconEdit, iconManageAccess, iconSchema } from '@mathesar/icons';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
@@ -31,7 +32,7 @@
   import TableSkeleton from './TableSkeleton.svelte';
 
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
   export let section: string;
 
   const userProfileStore = getUserProfileStoreFromContext();
@@ -68,19 +69,19 @@
     {
       label: $_('overview'),
       id: 'overview',
-      href: getSchemaPageUrl(database.id, schema.id),
+      href: getSchemaPageUrl(database.id, schema.oid),
     },
     {
       label: $_('tables'),
       id: 'tables',
       count: tablesMap.size,
-      href: getSchemaPageTablesSectionUrl(database.id, schema.id),
+      href: getSchemaPageTablesSectionUrl(database.id, schema.oid),
     },
     {
       label: $_('explorations'),
       id: 'explorations',
       count: explorationsMap.size,
-      href: getSchemaPageExplorationsSectionUrl(database.id, schema.id),
+      href: getSchemaPageExplorationsSectionUrl(database.id, schema.oid),
     },
   ] as TabItem[];
 
@@ -167,7 +168,7 @@
     {:else if activeTab?.id === 'tables'}
       <div class="tab-container">
         {#if tablesRequestStatus.state === 'processing'}
-          <TableSkeleton numTables={schema.num_tables} />
+          <TableSkeleton numTables={schema.table_count} />
         {:else}
           <SchemaTables {canExecuteDDL} {tablesMap} {database} {schema} />
         {/if}
diff --git a/mathesar_ui/src/pages/schema/SchemaTables.svelte b/mathesar_ui/src/pages/schema/SchemaTables.svelte
index a82ca506e9..c9f6316426 100644
--- a/mathesar_ui/src/pages/schema/SchemaTables.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaTables.svelte
@@ -2,7 +2,8 @@
   import { _ } from 'svelte-i18n';
 
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
 
@@ -13,7 +14,7 @@
   export let tablesMap: Map<number, TableEntry>;
 
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
   export let canExecuteDDL: boolean;
 
   $: showTutorial = tablesMap.size === 0 && canExecuteDDL;
diff --git a/mathesar_ui/src/pages/schema/TableCard.svelte b/mathesar_ui/src/pages/schema/TableCard.svelte
index 727b1702e8..106c76eede 100644
--- a/mathesar_ui/src/pages/schema/TableCard.svelte
+++ b/mathesar_ui/src/pages/schema/TableCard.svelte
@@ -2,7 +2,8 @@
   import { _ } from 'svelte-i18n';
 
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import LinkMenuItem from '@mathesar/component-library/menu/LinkMenuItem.svelte';
   import TableName from '@mathesar/components/TableName.svelte';
   import {
@@ -37,7 +38,7 @@
 
   export let table: TableEntry;
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
   export let canExecuteDDL: boolean;
 
   let isHoveringMenuTrigger = false;
@@ -46,13 +47,13 @@
 
   $: isTableImportConfirmationNeeded = isTableImportConfirmationRequired(table);
   $: tablePageUrl = isTableImportConfirmationNeeded
-    ? getImportPreviewPageUrl(database.id, schema.id, table.id, {
+    ? getImportPreviewPageUrl(database.id, schema.oid, table.id, {
         useColumnTypeInference: true,
       })
-    : getTablePageUrl(database.id, schema.id, table.id);
+    : getTablePageUrl(database.id, schema.oid, table.id);
   $: explorationPageUrl = createDataExplorerUrlToExploreATable(
     database.id,
-    schema.id,
+    schema.oid,
     table,
   );
   $: description = table.description ?? '';
diff --git a/mathesar_ui/src/pages/schema/TablesList.svelte b/mathesar_ui/src/pages/schema/TablesList.svelte
index 1776506bbb..2969bb0b06 100644
--- a/mathesar_ui/src/pages/schema/TablesList.svelte
+++ b/mathesar_ui/src/pages/schema/TablesList.svelte
@@ -2,7 +2,8 @@
   import { _ } from 'svelte-i18n';
 
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import { iconTable } from '@mathesar/icons';
 
   import EmptyEntity from './EmptyEntity.svelte';
@@ -10,7 +11,7 @@
 
   export let tables: TableEntry[];
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
   export let canExecuteDDL: boolean;
 </script>
 
diff --git a/mathesar_ui/src/routes/DataExplorerRoute.svelte b/mathesar_ui/src/routes/DataExplorerRoute.svelte
index 0bbd7b7f67..6e792991fd 100644
--- a/mathesar_ui/src/routes/DataExplorerRoute.svelte
+++ b/mathesar_ui/src/routes/DataExplorerRoute.svelte
@@ -4,7 +4,8 @@
   import { router } from 'tinro';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import type { CancellablePromise } from '@mathesar/component-library';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import { iconEdit, iconExploration } from '@mathesar/icons';
@@ -24,7 +25,7 @@
   } from '@mathesar/systems/data-explorer';
 
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
   export let queryId: number | undefined;
 
   let is404 = false;
@@ -42,7 +43,7 @@
         try {
           const url = getExplorationEditorPageUrl(
             database.id,
-            schema.id,
+            schema.oid,
             instance.id,
           );
           router.goto(url, true);
@@ -134,7 +135,7 @@
     <AppendBreadcrumb
       item={{
         type: 'simple',
-        href: getExplorationEditorPageUrl(database.id, schema.id, $query.id),
+        href: getExplorationEditorPageUrl(database.id, schema.oid, $query.id),
         label: $_('edit'),
         icon: iconEdit,
       }}
@@ -143,7 +144,7 @@
     <AppendBreadcrumb
       item={{
         type: 'simple',
-        href: getExplorationEditorPageUrl(database.id, schema.id, $query.id),
+        href: getExplorationEditorPageUrl(database.id, schema.oid, $query.id),
         label: $_('data_explorer'),
         icon: iconExploration,
       }}
@@ -153,7 +154,7 @@
   <AppendBreadcrumb
     item={{
       type: 'simple',
-      href: getDataExplorerPageUrl(database.id, schema.id),
+      href: getDataExplorerPageUrl(database.id, schema.oid),
       label: $_('data_explorer'),
       icon: iconExploration,
     }}
diff --git a/mathesar_ui/src/routes/ExplorationRoute.svelte b/mathesar_ui/src/routes/ExplorationRoute.svelte
index cb973f1b57..c8354d2a1c 100644
--- a/mathesar_ui/src/routes/ExplorationRoute.svelte
+++ b/mathesar_ui/src/routes/ExplorationRoute.svelte
@@ -1,14 +1,15 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import ExplorationPage from '@mathesar/pages/exploration/ExplorationPage.svelte';
   import { queries } from '@mathesar/stores/queries';
 
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
   export let queryId: number;
 
   $: query = $queries.data.get(queryId);
diff --git a/mathesar_ui/src/routes/ImportRoute.svelte b/mathesar_ui/src/routes/ImportRoute.svelte
index 3690eaa72e..7d92797891 100644
--- a/mathesar_ui/src/routes/ImportRoute.svelte
+++ b/mathesar_ui/src/routes/ImportRoute.svelte
@@ -2,7 +2,8 @@
   import { _ } from 'svelte-i18n';
   import { Route } from 'tinro';
 
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import { iconImportData } from '@mathesar/icons';
   import ImportPreviewPage from '@mathesar/pages/import/preview/ImportPreviewPage.svelte';
@@ -11,13 +12,13 @@
   import { getImportPageUrl, getImportPreviewPageQueryParams } from './urls';
 
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
 </script>
 
 <AppendBreadcrumb
   item={{
     type: 'simple',
-    href: getImportPageUrl(database.id, schema.id),
+    href: getImportPageUrl(database.id, schema.oid),
     label: $_('import'),
     icon: iconImportData,
   }}
diff --git a/mathesar_ui/src/routes/RecordPageRoute.svelte b/mathesar_ui/src/routes/RecordPageRoute.svelte
index 650c26ce21..82f16ba0f7 100644
--- a/mathesar_ui/src/routes/RecordPageRoute.svelte
+++ b/mathesar_ui/src/routes/RecordPageRoute.svelte
@@ -1,12 +1,13 @@
 <script lang="ts">
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import RecordPage from '@mathesar/pages/record/RecordPage.svelte';
   import RecordStore from '@mathesar/pages/record/RecordStore';
 
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
   export let table: TableEntry;
   export let recordPk: string;
 
diff --git a/mathesar_ui/src/routes/TableRoute.svelte b/mathesar_ui/src/routes/TableRoute.svelte
index 21359c159b..f75cc14cb3 100644
--- a/mathesar_ui/src/routes/TableRoute.svelte
+++ b/mathesar_ui/src/routes/TableRoute.svelte
@@ -3,7 +3,8 @@
   import { _ } from 'svelte-i18n';
   import { Route } from 'tinro';
 
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/AppTypes';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import TablePage from '@mathesar/pages/table/TablePage.svelte';
@@ -12,7 +13,7 @@
   import RecordPageRoute from './RecordPageRoute.svelte';
 
   export let database: Database;
-  export let schema: SchemaEntry;
+  export let schema: Schema;
   export let tableId: number;
 
   $: $currentTableId = tableId;
diff --git a/mathesar_ui/src/stores/queries.ts b/mathesar_ui/src/stores/queries.ts
index 1aa0ed73d5..5dc21f936c 100644
--- a/mathesar_ui/src/stores/queries.ts
+++ b/mathesar_ui/src/stores/queries.ts
@@ -53,32 +53,32 @@ import {
   postAPI,
   putAPI,
 } from '@mathesar/api/rest/utils/requestUtils';
-import type { SchemaEntry } from '@mathesar/AppTypes';
+import type { Schema } from '@mathesar/api/rpc/schemas';
 import CacheManager from '@mathesar/utils/CacheManager';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import { SHARED_LINK_UUID_QUERY_PARAM } from '@mathesar/utils/shares';
 import { CancellablePromise } from '@mathesar-component-library';
 
-import { addCountToSchemaNumExplorations, currentSchemaId } from './schemas';
+import { currentSchemaId } from './schemas';
 
 const commonData = preloadCommonData();
 
 export type UnsavedQueryInstance = Partial<QueryInstance>;
 
 export interface QueriesStoreSubstance {
-  schemaId: SchemaEntry['id'];
+  schemaId: Schema['oid'];
   requestStatus: RequestStatus;
   data: Map<QueryInstance['id'], QueryInstance>;
 }
 
 // Cache the query list of the last 3 opened schemas
 const schemasCacheManager = new CacheManager<
-  SchemaEntry['id'],
+  Schema['oid'],
   Writable<QueriesStoreSubstance>
 >(3);
 
 const requestMap: Map<
-  SchemaEntry['id'],
+  Schema['oid'],
   CancellablePromise<PaginatedResponse<QueryInstance>>
 > = new Map();
 
@@ -87,7 +87,7 @@ function sortedQueryEntries(queryEntries: QueryInstance[]): QueryInstance[] {
 }
 
 function setSchemaQueriesStore(
-  schemaId: SchemaEntry['id'],
+  schemaId: Schema['oid'],
   queryEntries?: QueryInstance[],
 ): Writable<QueriesStoreSubstance> {
   const queries: QueriesStoreSubstance['data'] = new Map();
@@ -120,7 +120,7 @@ function findSchemaStoreForQuery(id: QueryInstance['id']) {
 }
 
 export async function refetchQueriesForSchema(
-  schemaId: SchemaEntry['id'],
+  schemaId: Schema['oid'],
 ): Promise<QueriesStoreSubstance | undefined> {
   const store = schemasCacheManager.get(schemaId);
   if (!store) {
@@ -164,7 +164,7 @@ export async function refetchQueriesForSchema(
 let preload = true;
 
 export function getQueriesStoreForSchema(
-  schemaId: SchemaEntry['id'],
+  schemaId: Schema['oid'],
 ): Writable<QueriesStoreSubstance> {
   let store = schemasCacheManager.get(schemaId);
   if (!store) {
@@ -212,7 +212,6 @@ export function createQuery(
 ): CancellablePromise<QueryGetResponse> {
   const promise = postAPI<QueryGetResponse>('/api/db/v0/queries/', newQuery);
   void promise.then((instance) => {
-    addCountToSchemaNumExplorations(instance.schema, 1);
     void refetchQueriesForSchema(instance.schema);
     return instance;
   });
@@ -306,7 +305,6 @@ export function deleteQuery(queryId: number): CancellablePromise<void> {
         storeData.data.delete(queryId);
         return { ...storeData, data: new Map(storeData.data) };
       });
-      addCountToSchemaNumExplorations(get(store).schemaId, -1);
     }
     return undefined;
   });
diff --git a/mathesar_ui/src/stores/schemas.ts b/mathesar_ui/src/stores/schemas.ts
index 774cd840f1..2a5d31374a 100644
--- a/mathesar_ui/src/stores/schemas.ts
+++ b/mathesar_ui/src/stores/schemas.ts
@@ -2,12 +2,9 @@ import type { Readable, Unsubscriber, Writable } from 'svelte/store';
 import { derived, get, writable } from 'svelte/store';
 
 import type { Connection } from '@mathesar/api/rest/connections';
-import schemasApi from '@mathesar/api/rest/schemas';
-import type {
-  PaginatedResponse,
-  RequestStatus,
-} from '@mathesar/api/rest/utils/requestUtils';
-import type { SchemaEntry, SchemaResponse } from '@mathesar/AppTypes';
+import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+import { api } from '@mathesar/api/rpc';
+import type { Schema } from '@mathesar/api/rpc/schemas';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import type { CancellablePromise } from '@mathesar-component-library';
 
@@ -15,12 +12,13 @@ import { connectionsStore } from './databases';
 
 const commonData = preloadCommonData();
 
-export const currentSchemaId: Writable<SchemaEntry['id'] | undefined> =
-  writable(commonData.current_schema ?? undefined);
+export const currentSchemaId: Writable<Schema['oid'] | undefined> = writable(
+  commonData.current_schema ?? undefined,
+);
 
 export interface DBSchemaStoreData {
   requestStatus: RequestStatus;
-  data: Map<SchemaEntry['id'], SchemaEntry>;
+  data: Map<Schema['oid'], Schema>;
 }
 
 const dbSchemaStoreMap: Map<
@@ -29,22 +27,16 @@ const dbSchemaStoreMap: Map<
 > = new Map();
 const dbSchemasRequestMap: Map<
   Connection['id'],
-  CancellablePromise<PaginatedResponse<SchemaResponse> | undefined>
+  CancellablePromise<Schema[]>
 > = new Map();
 
-function findStoreBySchemaId(id: SchemaEntry['id']) {
-  return [...dbSchemaStoreMap.values()].find((entry) =>
-    get(entry).data.has(id),
-  );
-}
-
 function setDBSchemaStore(
   connectionId: Connection['id'],
-  schemas: SchemaResponse[],
+  schemas: Schema[],
 ): Writable<DBSchemaStoreData> {
   const schemaMap: DBSchemaStoreData['data'] = new Map();
   schemas.forEach((schema) => {
-    schemaMap.set(schema.id, schema);
+    schemaMap.set(schema.oid, schema);
   });
   const storeValue: DBSchemaStoreData = {
     requestStatus: { state: 'success' },
@@ -63,12 +55,12 @@ function setDBSchemaStore(
 
 function updateSchemaInDBSchemaStore(
   connectionId: Connection['id'],
-  schema: SchemaResponse,
+  schema: Schema,
 ) {
   const store = dbSchemaStoreMap.get(connectionId);
   if (store) {
     store.update((value) => {
-      value.data?.set(schema.id, schema);
+      value.data?.set(schema.oid, schema);
       return {
         ...value,
         data: new Map(value.data),
@@ -79,7 +71,7 @@ function updateSchemaInDBSchemaStore(
 
 function removeSchemaInDBSchemaStore(
   connectionId: Connection['id'],
-  schemaId: SchemaEntry['id'],
+  schemaId: Schema['oid'],
 ) {
   const store = dbSchemaStoreMap.get(connectionId);
   if (store) {
@@ -95,36 +87,16 @@ function removeSchemaInDBSchemaStore(
 
 export function addCountToSchemaNumTables(
   connection: Connection,
-  schema: SchemaEntry,
+  schema: Schema,
   count: number,
 ) {
   const store = dbSchemaStoreMap.get(connection.id);
   if (store) {
     store.update((value) => {
-      const schemaToModify = value.data.get(schema.id);
-      if (schemaToModify) {
-        schemaToModify.num_tables += count;
-        value.data.set(schema.id, schemaToModify);
-      }
-      return {
-        ...value,
-        data: new Map(value.data),
-      };
-    });
-  }
-}
-
-export function addCountToSchemaNumExplorations(
-  schemaId: SchemaEntry['id'],
-  count: number,
-) {
-  const store = findStoreBySchemaId(schemaId);
-  if (store) {
-    store.update((value) => {
-      const schemaToModify = value.data.get(schemaId);
+      const schemaToModify = value.data.get(schema.oid);
       if (schemaToModify) {
-        schemaToModify.num_queries += count;
-        value.data.set(schemaId, schemaToModify);
+        schemaToModify.table_count += count;
+        value.data.set(schema.oid, schemaToModify);
       }
       return {
         ...value,
@@ -153,10 +125,9 @@ async function refetchSchemasForDB(
 
     dbSchemasRequestMap.get(connectionId)?.cancel();
 
-    const schemaRequest = schemasApi.list(connectionId);
+    const schemaRequest = api.schemas.list({ database_id: connectionId }).run();
     dbSchemasRequestMap.set(connectionId, schemaRequest);
-    const response = await schemaRequest;
-    const schemas = response?.results || [];
+    const schemas = await schemaRequest;
 
     const dbSchemasStore = setDBSchemaStore(connectionId, schemas);
 
@@ -201,8 +172,8 @@ function getSchemasStoreForDB(
 
 export function getSchemaInfo(
   connectionId: Connection['id'],
-  schemaId: SchemaEntry['id'],
-): SchemaEntry | undefined {
+  schemaId: Schema['oid'],
+): Schema | undefined {
   const store = dbSchemaStoreMap.get(connectionId);
   if (!store) {
     return undefined;
@@ -212,32 +183,51 @@ export function getSchemaInfo(
 
 export async function createSchema(
   connectionId: Connection['id'],
-  schemaName: SchemaEntry['name'],
-  description: SchemaEntry['description'],
-): Promise<SchemaResponse> {
-  const response = await schemasApi.add({
-    name: schemaName,
+  name: Schema['name'],
+  description: Schema['description'],
+): Promise<void> {
+  const schemaOid = await api.schemas
+    .add({
+      database_id: connectionId,
+      name,
+      description,
+    })
+    .run();
+  updateSchemaInDBSchemaStore(connectionId, {
+    oid: schemaOid,
+    name,
     description,
-    connectionId,
+    table_count: 0,
   });
-  updateSchemaInDBSchemaStore(connectionId, response);
-  return response;
 }
 
 export async function updateSchema(
   connectionId: Connection['id'],
-  schema: SchemaEntry,
-): Promise<SchemaResponse> {
-  const response = await schemasApi.update(schema);
-  updateSchemaInDBSchemaStore(connectionId, response);
-  return response;
+  schema: Schema,
+): Promise<void> {
+  await api.schemas
+    .patch({
+      database_id: connectionId,
+      schema_oid: schema.oid,
+      patch: {
+        name: schema.name,
+        description: schema.description,
+      },
+    })
+    .run();
+  updateSchemaInDBSchemaStore(connectionId, schema);
 }
 
 export async function deleteSchema(
   connectionId: Connection['id'],
-  schemaId: SchemaEntry['id'],
+  schemaId: Schema['oid'],
 ): Promise<void> {
-  await schemasApi.delete(schemaId);
+  await api.schemas
+    .delete({
+      database_id: connectionId,
+      schema_oid: schemaId,
+    })
+    .run();
   removeSchemaInDBSchemaStore(connectionId, schemaId);
 }
 
@@ -264,7 +254,7 @@ export const schemas: Readable<DBSchemaStoreData> = derived(
   },
 );
 
-export const currentSchema: Readable<SchemaEntry | undefined> = derived(
+export const currentSchema: Readable<Schema | undefined> = derived(
   [currentSchemaId, schemas],
   ([$currentSchemaId, $schemas]) =>
     $currentSchemaId ? $schemas.data.get($currentSchemaId) : undefined,
diff --git a/mathesar_ui/src/stores/storeBasedUrls.ts b/mathesar_ui/src/stores/storeBasedUrls.ts
index 2ac9ba02a5..7c858b6bd2 100644
--- a/mathesar_ui/src/stores/storeBasedUrls.ts
+++ b/mathesar_ui/src/stores/storeBasedUrls.ts
@@ -31,7 +31,7 @@ export const storeToGetRecordPageUrl = derived(
       recordId: unknown;
     }): string | undefined {
       const d = connectionId ?? connection?.id;
-      const s = schemaId ?? schema?.id;
+      const s = schemaId ?? schema?.oid;
       const t = tableId ?? table?.id;
       const r = recordId ?? undefined;
       if (
@@ -61,7 +61,7 @@ export const storeToGetTablePageUrl = derived(
       tableId?: number;
     }): string | undefined {
       const d = connectionId ?? connection?.id;
-      const s = schemaId ?? schema?.id;
+      const s = schemaId ?? schema?.oid;
       const t = tableId ?? table?.id;
       if (d === undefined || s === undefined || t === undefined) {
         return undefined;
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index 047d37d183..219cc4407c 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -35,7 +35,8 @@ import {
   patchAPI,
   postAPI,
 } from '@mathesar/api/rest/utils/requestUtils';
-import type { DBObjectEntry, Database, SchemaEntry } from '@mathesar/AppTypes';
+import type { Schema } from '@mathesar/api/rpc/schemas';
+import type { DBObjectEntry, Database } from '@mathesar/AppTypes';
 import { invalidIf } from '@mathesar/components/form';
 import type { AtLeastOne } from '@mathesar/typeUtils';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
@@ -55,11 +56,11 @@ export interface DBTablesStoreData {
 }
 
 const schemaTablesStoreMap: Map<
-  SchemaEntry['id'],
+  Schema['oid'],
   Writable<DBTablesStoreData>
 > = new Map();
 const schemaTablesRequestMap: Map<
-  SchemaEntry['id'],
+  Schema['oid'],
   CancellablePromise<PaginatedResponse<TableEntry>>
 > = new Map();
 
@@ -68,7 +69,7 @@ function sortedTableEntries(tableEntries: TableEntry[]): TableEntry[] {
 }
 
 function setSchemaTablesStore(
-  schemaId: SchemaEntry['id'],
+  schemaId: Schema['oid'],
   tableEntries?: TableEntry[],
 ): Writable<DBTablesStoreData> {
   const tables: DBTablesStoreData['data'] = new Map();
@@ -93,14 +94,12 @@ function setSchemaTablesStore(
   return store;
 }
 
-export function removeTablesInSchemaTablesStore(
-  schemaId: SchemaEntry['id'],
-): void {
+export function removeTablesInSchemaTablesStore(schemaId: Schema['oid']): void {
   schemaTablesStoreMap.delete(schemaId);
 }
 
 export async function refetchTablesForSchema(
-  schemaId: SchemaEntry['id'],
+  schemaId: Schema['oid'],
 ): Promise<DBTablesStoreData | undefined> {
   const store = schemaTablesStoreMap.get(schemaId);
   if (!store) {
@@ -143,7 +142,7 @@ export async function refetchTablesForSchema(
 let preload = true;
 
 export function getTablesStoreForSchema(
-  schemaId: SchemaEntry['id'],
+  schemaId: Schema['oid'],
 ): Writable<DBTablesStoreData> {
   let store = schemaTablesStoreMap.get(schemaId);
   if (!store) {
@@ -195,7 +194,7 @@ function findAndUpdateTableStore(id: TableEntry['id'], tableEntry: TableEntry) {
 
 export function deleteTable(
   database: Database,
-  schema: SchemaEntry,
+  schema: Schema,
   tableId: TableEntry['id'],
 ): CancellablePromise<TableEntry> {
   const promise = deleteAPI<TableEntry>(`/api/db/v0/tables/${tableId}/`);
@@ -203,7 +202,7 @@ export function deleteTable(
     (resolve, reject) => {
       void promise.then((value) => {
         addCountToSchemaNumTables(database, schema, -1);
-        schemaTablesStoreMap.get(schema.id)?.update((tableStoreData) => {
+        schemaTablesStoreMap.get(schema.oid)?.update((tableStoreData) => {
           tableStoreData.data.delete(tableId);
           return {
             ...tableStoreData,
@@ -242,14 +241,14 @@ export function updateTableMetaData(
 
 export function createTable(
   database: Database,
-  schema: SchemaEntry,
+  schema: Schema,
   tableArgs: {
     name?: string;
     dataFiles?: [number, ...number[]];
   },
 ): CancellablePromise<TableEntry> {
   const promise = postAPI<TableEntry>('/api/db/v0/tables/', {
-    schema: schema.id,
+    schema: schema.oid,
     name: tableArgs.name,
     data_files: tableArgs.dataFiles,
   });
@@ -257,7 +256,7 @@ export function createTable(
     (resolve, reject) => {
       void promise.then((value) => {
         addCountToSchemaNumTables(database, schema, 1);
-        schemaTablesStoreMap.get(schema.id)?.update((existing) => {
+        schemaTablesStoreMap.get(schema.oid)?.update((existing) => {
           const tableEntryMap: DBTablesStoreData['data'] = new Map();
           sortedTableEntries([...existing.data.values(), value]).forEach(
             (entry) => {
diff --git a/mathesar_ui/src/stores/users.ts b/mathesar_ui/src/stores/users.ts
index 8609761322..90e4c07a82 100644
--- a/mathesar_ui/src/stores/users.ts
+++ b/mathesar_ui/src/stores/users.ts
@@ -11,7 +11,8 @@ import userApi, {
   type UserRole,
 } from '@mathesar/api/rest/users';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
-import type { Database, SchemaEntry } from '@mathesar/AppTypes';
+import type { Schema } from '@mathesar/api/rpc/schemas';
+import type { Database } from '@mathesar/AppTypes';
 import { getErrorMessage } from '@mathesar/utils/errors';
 import {
   type AccessOperation,
@@ -54,7 +55,7 @@ export class UserModel {
   hasPermission(
     dbObject: {
       database?: Pick<Database, 'id'>;
-      schema?: Pick<SchemaEntry, 'id'>;
+      schema?: Pick<Schema, 'oid'>;
     },
     operation: AccessOperation,
   ): boolean {
@@ -69,7 +70,7 @@ export class UserModel {
     }
     const roles: UserRole[] = [];
     if (schema) {
-      const userSchemaRole = this.schemaRoles.get(schema.id);
+      const userSchemaRole = this.schemaRoles.get(schema.oid);
       if (userSchemaRole) {
         roles.push(userSchemaRole.role);
       }
@@ -87,8 +88,8 @@ export class UserModel {
     return this.databaseRoles.get(database.id);
   }
 
-  getRoleForSchema(schema: Pick<SchemaEntry, 'id'>) {
-    return this.schemaRoles.get(schema.id);
+  getRoleForSchema(schema: Pick<Schema, 'oid'>) {
+    return this.schemaRoles.get(schema.oid);
   }
 
   hasDirectDbAccess(database: Pick<Database, 'id'>) {
@@ -99,14 +100,11 @@ export class UserModel {
     return this.hasDirectDbAccess(database) || this.isSuperUser;
   }
 
-  hasDirectSchemaAccess(schema: Pick<SchemaEntry, 'id'>) {
-    return this.schemaRoles.has(schema.id);
+  hasDirectSchemaAccess(schema: Pick<Schema, 'oid'>) {
+    return this.schemaRoles.has(schema.oid);
   }
 
-  hasSchemaAccess(
-    database: Pick<Database, 'id'>,
-    schema: Pick<SchemaEntry, 'id'>,
-  ) {
+  hasSchemaAccess(database: Pick<Database, 'id'>, schema: Pick<Schema, 'oid'>) {
     return this.hasDbAccess(database) || this.hasDirectSchemaAccess(schema);
   }
 
@@ -298,10 +296,10 @@ class WritableUsersStore {
 
   async addSchemaRoleForUser(
     userId: number,
-    schema: Pick<SchemaEntry, 'id'>,
+    schema: Pick<Schema, 'oid'>,
     role: UserRole,
   ) {
-    const schemaRole = await userApi.addSchemaRole(userId, schema.id, role);
+    const schemaRole = await userApi.addSchemaRole(userId, schema.oid, role);
     this.users.update((users) =>
       users.map((user) => {
         if (user.id === userId) {
@@ -313,10 +311,7 @@ class WritableUsersStore {
     void this.fetchUsersSilently();
   }
 
-  async removeSchemaAccessForUser(
-    userId: number,
-    schema: Pick<SchemaEntry, 'id'>,
-  ) {
+  async removeSchemaAccessForUser(userId: number, schema: Pick<Schema, 'oid'>) {
     const user = get(this.users).find((entry) => entry.id === userId);
     const schemaRole = user?.getRoleForSchema(schema);
     if (schemaRole) {
@@ -345,7 +340,7 @@ class WritableUsersStore {
     );
   }
 
-  getNormalUsersWithDirectSchemaRole(schema: Pick<SchemaEntry, 'id'>) {
+  getNormalUsersWithDirectSchemaRole(schema: Pick<Schema, 'oid'>) {
     return derived(this.users, ($users) =>
       $users.filter(
         (user) => !user.isSuperUser && user.hasDirectSchemaAccess(schema),
@@ -353,7 +348,7 @@ class WritableUsersStore {
     );
   }
 
-  getNormalUsersWithoutDirectSchemaRole(schema: Pick<SchemaEntry, 'id'>) {
+  getNormalUsersWithoutDirectSchemaRole(schema: Pick<Schema, 'oid'>) {
     return derived(this.users, ($users) =>
       $users.filter(
         (user) => !user.isSuperUser && !user.hasDirectSchemaAccess(schema),
@@ -363,7 +358,7 @@ class WritableUsersStore {
 
   getUsersWithAccessToSchema(
     database: Pick<Database, 'id'>,
-    schema: Pick<SchemaEntry, 'id'>,
+    schema: Pick<Schema, 'oid'>,
   ) {
     return derived(this.users, ($users) =>
       $users.filter((user) => user.hasSchemaAccess(database, schema)),
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/QueryRunErrors.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/QueryRunErrors.svelte
index cca067558f..6efc59e488 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/QueryRunErrors.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/QueryRunErrors.svelte
@@ -89,7 +89,7 @@
                     class="btn btn-secondary"
                     href={getExplorationEditorPageUrl(
                       $currentDatabase.id,
-                      $currentSchema.id,
+                      $currentSchema.oid,
                       $query.id,
                     )}
                   >
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
index f24e68428b..4c36f76d7a 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
@@ -34,7 +34,7 @@
     $currentDatabase && $currentSchema
       ? createDataExplorerUrlToExploreATable(
           $currentDatabase?.id,
-          $currentSchema.id,
+          $currentSchema.oid,
           {
             id: $tabularData.id,
             name: $tables.data.get($tabularData.id)?.name ?? '',
@@ -47,7 +47,7 @@
     }
     return constructDataExplorerUrlToSummarizeFromGroup(
       $currentDatabase.id,
-      $currentSchema.id,
+      $currentSchema.oid,
       {
         baseTable: { id, name: $currentTable.name },
         columns: $columns,
@@ -72,7 +72,7 @@
         const schema = $currentSchema;
         if (database && schema) {
           await deleteTable(database, schema, $tabularData.id);
-          router.goto(getSchemaPageUrl(database.id, schema.id), true);
+          router.goto(getSchemaPageUrl(database.id, schema.oid), true);
         }
       },
     });
diff --git a/mathesar_ui/src/utils/preloadData.ts b/mathesar_ui/src/utils/preloadData.ts
index 09a3acc76e..c857d24128 100644
--- a/mathesar_ui/src/utils/preloadData.ts
+++ b/mathesar_ui/src/utils/preloadData.ts
@@ -2,11 +2,12 @@ import type { Connection } from '@mathesar/api/rest/connections';
 import type { QueryInstance } from '@mathesar/api/rest/types/queries';
 import type { TableEntry } from '@mathesar/api/rest/types/tables';
 import type { User } from '@mathesar/api/rest/users';
-import type { AbstractTypeResponse, SchemaResponse } from '@mathesar/AppTypes';
+import type { Schema } from '@mathesar/api/rpc/schemas';
+import type { AbstractTypeResponse } from '@mathesar/AppTypes';
 
 export interface CommonData {
   connections: Connection[];
-  schemas: SchemaResponse[];
+  schemas: Schema[];
   tables: TableEntry[];
   queries: QueryInstance[];
   current_connection: Connection['id'] | null;

From d8e44fb0eec6f3e852c839dc9a900e76a74c8373 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 2 Jul 2024 11:10:43 +0530
Subject: [PATCH 0342/1141] allow only alterable fields in patch

---
 mathesar/utils/tables.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mathesar/utils/tables.py b/mathesar/utils/tables.py
index 8b7875ea20..2b7cd65229 100644
--- a/mathesar/utils/tables.py
+++ b/mathesar/utils/tables.py
@@ -92,8 +92,11 @@ def get_tables_meta_data(database_id):
 
 def patch_table_meta_data(table_oid, metadata_dict, database_id):
     metadata_model = TableMetaData.objects.get(database__id=database_id, table_oid=table_oid)
+    alterable_fields = (
+        'import_verified', 'column_order', 'record_summary_customized', 'record_summary_template'
+    )
     for field, value in metadata_dict.items():
-        if hasattr(metadata_model, field):
+        if hasattr(metadata_model, field) and field in alterable_fields:
             setattr(metadata_model, field, value)
     metadata_model.save()
     return metadata_model

From b8d138300f10625e7946fcc090842d9eedac4368 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 2 Jul 2024 11:21:10 +0530
Subject: [PATCH 0343/1141] minor change

---
 mathesar/utils/tables.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/utils/tables.py b/mathesar/utils/tables.py
index 2b7cd65229..87d350a20e 100644
--- a/mathesar/utils/tables.py
+++ b/mathesar/utils/tables.py
@@ -96,7 +96,7 @@ def patch_table_meta_data(table_oid, metadata_dict, database_id):
         'import_verified', 'column_order', 'record_summary_customized', 'record_summary_template'
     )
     for field, value in metadata_dict.items():
-        if hasattr(metadata_model, field) and field in alterable_fields:
+        if field in alterable_fields:
             setattr(metadata_model, field, value)
     metadata_model.save()
     return metadata_model

From b4a759629e8695dd98338ff181b8776e4982b07c Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 2 Jul 2024 12:27:28 +0530
Subject: [PATCH 0344/1141] allow unsetting schema comment using NULL

---
 db/sql/00_msar.sql | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 08382616fd..8933e44e29 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -865,8 +865,7 @@ CREATE OR REPLACE FUNCTION msar.set_schema_description(
 ) RETURNS void AS $$/*
 Set the PostgreSQL description (aka COMMENT) of a schema.
 
-Descriptions are removed by passing an empty string. Passing a NULL description will cause
-this function to return NULL without doing anything.
+Descriptions are removed by passing an empty string or NULL.
 
 Args:
   sch_id: The OID of the schema.
@@ -875,7 +874,7 @@ Args:
 BEGIN
   EXECUTE format('COMMENT ON SCHEMA %I IS %L', msar.get_schema_name(sch_id), description);
 END;
-$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE plpgsql;
 
 
 CREATE OR REPLACE FUNCTION msar.patch_schema(sch_id oid, patch jsonb) RETURNS void AS $$/*

From 9ffc737542bb6a5a441fa6f845d01421f9e9e622 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 2 Jul 2024 12:35:40 +0530
Subject: [PATCH 0345/1141] fix sql test

---
 db/sql/test_00_msar.sql | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 8636345229..4e053e42d1 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -1325,10 +1325,9 @@ BEGIN
   PERFORM msar.patch_schema(sch_oid, '{"description": "yay"}');
   RETURN NEXT is(obj_description(sch_oid), 'yay');
 
-  -- Edge case: setting the description to null doesn't actually remove it. This behavior is
-  -- debatable. I did it this way because it was easier to implement.
+  -- Description is removed when NULL is passed.
   PERFORM msar.patch_schema(sch_oid, '{"description": null}');
-  RETURN NEXT is(obj_description(sch_oid), 'yay');
+  RETURN NEXT is(obj_description(sch_oid), NULL);
 
   -- Description is removed when an empty string is passed.
   PERFORM msar.patch_schema(sch_oid, '{"description": ""}');

From f59cb471e33399260b9794708324d59551fb591d Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 2 Jul 2024 17:55:49 +0800
Subject: [PATCH 0346/1141] add metadata patch utility function

---
 mathesar/utils/columns.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/mathesar/utils/columns.py b/mathesar/utils/columns.py
index 7c48cd914e..9b555701f5 100644
--- a/mathesar/utils/columns.py
+++ b/mathesar/utils/columns.py
@@ -1,5 +1,19 @@
-from mathesar.models.base import ColumnMetaData
+from mathesar.models.base import ColumnMetaData, Database
 
 
 def get_columns_meta_data(table_oid, database_id):
-    return ColumnMetaData.filter(database__id=database_id, table_oid=table_oid)
+    return ColumnMetaData.objects.filter(
+        database__id=database_id, table_oid=table_oid
+    )
+
+
+def patch_column_meta_data(column_meta_data_list, table_oid, database_id):
+    db_model = Database.objects.get(id=database_id)
+    for meta_data_dict in column_meta_data_list:
+        ColumnMetaData.objects.update_or_create(
+            database=db_model,
+            table_oid=table_oid,
+            attnum=meta_data_dict["attnum"],
+            defaults=meta_data_dict
+        )
+    return get_columns_meta_data(table_oid, database_id)

From d197737e5b8b26fe98071d167ab52de208f13bc5 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 2 Jul 2024 18:14:54 +0800
Subject: [PATCH 0347/1141] wire column metadata patching up to RPC endpoint

---
 mathesar/rpc/columns/metadata.py     | 63 ++++++++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py |  5 +++
 2 files changed, 68 insertions(+)

diff --git a/mathesar/rpc/columns/metadata.py b/mathesar/rpc/columns/metadata.py
index f99118b6b5..d97f81778d 100644
--- a/mathesar/rpc/columns/metadata.py
+++ b/mathesar/rpc/columns/metadata.py
@@ -73,6 +73,42 @@ def from_model(cls, model):
         )
 
 
+class SettableColumnMetaData(TypedDict):
+    """
+    Settable metadata fields for a column in a table.
+
+    Attributes:
+        attnum: The attnum of the column in the table.
+        bool_input: How the input for a boolean column should be shown.
+        bool_true: A string to display for `true` values.
+        bool_false: A string to display for `false` values.
+        num_min_frac_digits: Minimum digits shown after the decimal point.
+        num_max_frac_digits: Maximum digits shown after the decimal point.
+        num_show_as_perc: Whether to show a numeric value as a percentage.
+        mon_currency_symbol: The currency symbol shown for money value.
+        mon_currency_location: Where the currency symbol should be shown.
+        time_format: A string representing the format of time values.
+        date_format: A string representing the format of date values.
+        duration_min: The smallest unit for displaying durations.
+        duration_max: The largest unit for displaying durations.
+        duration_show_units: Whether to show the units for durations.
+    """
+    attnum: int
+    bool_input: Optional[Literal["dropdown", "checkbox"]]
+    bool_true: Optional[str]
+    bool_false: Optional[str]
+    num_min_frac_digits: Optional[int]
+    num_max_frac_digits: Optional[int]
+    num_show_as_perc: Optional[bool]
+    mon_currency_symbol: Optional[str]
+    mon_currency_location: Optional[Literal["after-minus", "end-with-space"]]
+    time_format: Optional[str]
+    date_format: Optional[str]
+    duration_min: Optional[str]
+    duration_max: Optional[str]
+    duration_show_units: Optional[bool]
+
+
 @rpc_method(name="columns.metadata.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
@@ -91,3 +127,30 @@ def list_(*, table_oid: int, database_id: int, **kwargs) -> list[ColumnMetaData]
     return [
         ColumnMetaData.from_model(model) for model in columns_meta_data
     ]
+
+
+@rpc_method(name="columns.metadata.patch")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def patch(
+        *,
+        column_meta_data_list: list[SettableColumnMetaData],
+        table_oid: int,
+        database_id: int,
+        **kwargs
+) -> ColumnMetaData:
+    """
+    Alter metadata settings associated with columns of a table for a database.
+
+    Args:
+        column_meta_data_list: A list describing desired metadata alterations.
+        table_oid: Identity of the table whose metadata we'll modify.
+        database_id: The Django id of the database containing the table.
+
+    Returns:
+        List of altered metadata objects.
+    """
+    column_meta_data = patch_column_meta_data(
+        column_meta_data_list, table_oid, database_id
+    )
+    return ColumnMetaData.from_model(table_meta_data)
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index b786e99027..0d6c28a4e8 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -39,6 +39,11 @@
         "columns.metadata.list",
         [user_is_authenticated]
     ),
+    (
+        columns.metadata.patch,
+        "columns.metadata.patch",
+        [user_is_authenticated]
+    ),
     (
         connections.add_from_known_connection,
         "connections.add_from_known_connection",

From d2b0b827e685a27d65f05d819f343a36026d65f1 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 2 Jul 2024 11:37:18 -0400
Subject: [PATCH 0348/1141] Drop old function signature

---
 db/sql/00_msar.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 08382616fd..92abbc41a8 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2302,6 +2302,8 @@ SELECT __msar.exec_ddl(
 FROM col_cte, con_cte;
 $$ LANGUAGE SQL;
 
+-- Drop function defined in Mathesar 0.1.7 with different argument names
+DROP FUNCTION IF EXISTS msar.add_mathesar_table(oid, text, jsonb, jsonb, text);
 
 CREATE OR REPLACE FUNCTION
 msar.add_mathesar_table(sch_id oid, tab_name text, col_defs jsonb, con_defs jsonb, comment_ text)

From a2529ce809ecadc6eea3403bfe4f74ce72e74a40 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 2 Jul 2024 23:43:46 +0530
Subject: [PATCH 0349/1141] alter description for schemas and tables only when
 description key exists

---
 db/sql/00_msar.sql | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 8933e44e29..599cdeaf2f 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -885,11 +885,12 @@ Args:
   patch: A JSONB object with the following keys:
     - name: (optional) The new name of the schema
     - description: (optional) The new description of the schema. To remove a description, pass an
-      empty string. Passing a NULL description will have no effect on the description.
+      empty string or NULL.
 */
 BEGIN
   PERFORM msar.rename_schema(sch_id, patch->>'name');
-  PERFORM msar.set_schema_description(sch_id, patch->>'description');
+  PERFORM CASE WHEN patch ? 'description'
+  THEN msar.set_schema_description(sch_id, patch->>'description') END;
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
@@ -1136,14 +1137,13 @@ Args:
 */
 DECLARE
   new_tab_name text;
-  comment text;
   col_alters jsonb;
 BEGIN
   new_tab_name := tab_alters->>'name';
-  comment := tab_alters->>'description';
   col_alters := tab_alters->'columns';
   PERFORM msar.rename_table(tab_id, new_tab_name);
-  PERFORM msar.comment_on_table(tab_id, comment);
+  PERFORM CASE WHEN tab_alters ? 'description'
+  THEN msar.comment_on_table(tab_id, tab_alters->>'description') END;
   PERFORM msar.alter_columns(tab_id, col_alters);
   RETURN __msar.get_qualified_relation_name_or_null(tab_id);
 END;

From 66d963ad15e95c97f13c994b1070feb2b4e5d9db Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 3 Jul 2024 01:34:26 +0530
Subject: [PATCH 0350/1141] fix common_data

---
 mathesar/urls.py  |  2 +-
 mathesar/views.py | 37 ++++++-------------------------------
 2 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/mathesar/urls.py b/mathesar/urls.py
index a0b438376d..8f80565ad0 100644
--- a/mathesar/urls.py
+++ b/mathesar/urls.py
@@ -61,7 +61,7 @@
     path('i18n/', include('django.conf.urls.i18n')),
     re_path(
         r'^db/(?P<connection_id>\w+)/(?P<schema_id>\w+)/',
-        views.schema_home,
+        views.schemas,
         name='schema_home'
     ),
 ]
diff --git a/mathesar/views.py b/mathesar/views.py
index e88b596881..4199ee79ee 100644
--- a/mathesar/views.py
+++ b/mathesar/views.py
@@ -7,6 +7,7 @@
 from rest_framework.decorators import api_view
 from rest_framework.response import Response
 
+from mathesar.rpc.schemas import list_ as schemas_list
 from mathesar.api.db.permissions.database import DatabaseAccessPolicy
 from mathesar.api.db.permissions.query import QueryAccessPolicy
 from mathesar.api.db.permissions.schema import SchemaAccessPolicy
@@ -26,14 +27,10 @@
 
 
 def get_schema_list(request, database):
-    qs = Schema.objects.filter(database=database)
-    permission_restricted_qs = SchemaAccessPolicy.scope_queryset(request, qs)
-    schema_serializer = SchemaSerializer(
-        permission_restricted_qs,
-        many=True,
-        context={'request': request}
-    )
-    return schema_serializer.data
+    if database is not None:
+        return schemas_list(request=request, database_id=database.id)
+    else:
+        return []
 
 
 def _get_permissible_db_queryset(request):
@@ -180,19 +177,6 @@ def get_current_database(request, connection_id):
     return current_database
 
 
-def get_current_schema(request, schema_id, database):
-    # if there's a schema ID passed in, try to retrieve the schema, or return a 404 error.
-    if schema_id is not None:
-        permitted_schemas = SchemaAccessPolicy.scope_queryset(request, Schema.objects.all())
-        return get_object_or_404(permitted_schemas, id=schema_id)
-    else:
-        try:
-            # Try to get the first schema in the DB
-            return Schema.objects.filter(database=database).order_by('id').first()
-        except Schema.DoesNotExist:
-            return None
-
-
 def render_schema(request, database, schema):
     # if there's no schema available, redirect to the schemas page.
     if not schema:
@@ -300,16 +284,7 @@ def admin_home(request, **kwargs):
 
 
 @login_required
-def schema_home(request, connection_id, schema_id, **kwargs):
-    database = get_current_database(request, connection_id)
-    schema = get_current_schema(request, schema_id, database)
-    return render(request, 'mathesar/index.html', {
-        'common_data': get_common_data(request, database, schema)
-    })
-
-
-@login_required
-def schemas(request, connection_id):
+def schemas(request, connection_id, **kwargs):
     database = get_current_database(request, connection_id)
     return render(request, 'mathesar/index.html', {
         'common_data': get_common_data(request, database, None)

From ce43b90c22bc9b35f02cb8d44f157b25fd983604 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 2 Jul 2024 21:49:08 -0400
Subject: [PATCH 0351/1141] Begin creating constraints RPC methods

---
 config/settings/common_settings.py            |   1 +
 db/connection.py                              |  17 +++
 db/constraints/operations/create.py           |  21 ++-
 db/constraints/operations/select.py           |   7 +-
 db/sql/00_msar.sql                            | 135 ++++++++++++++----
 .../constraints/operations/test_create.py     |   2 +-
 db/tests/dependents/test_dependents.py        |   6 +-
 docs/docs/api/rpc.md                          |  10 ++
 mathesar/models/deprecated.py                 |   4 +-
 mathesar/rpc/constraints.py                   |  45 +++++-
 mathesar/tests/rpc/test_endpoints.py          |   6 +
 11 files changed, 213 insertions(+), 41 deletions(-)

diff --git a/config/settings/common_settings.py b/config/settings/common_settings.py
index c574b418d5..7ff925588f 100644
--- a/config/settings/common_settings.py
+++ b/config/settings/common_settings.py
@@ -66,6 +66,7 @@ def pipe_delim(pipe_string):
 
 MODERNRPC_METHODS_MODULES = [
     'mathesar.rpc.connections',
+    'mathesar.rpc.constraints',
     'mathesar.rpc.columns',
     'mathesar.rpc.columns.metadata',
     'mathesar.rpc.schemas',
diff --git a/db/connection.py b/db/connection.py
index 5af890107f..2f6f64a56b 100644
--- a/db/connection.py
+++ b/db/connection.py
@@ -1,5 +1,6 @@
 from sqlalchemy import text
 import psycopg
+from psycopg.rows import dict_row
 
 
 def execute_msar_func_with_engine(engine, func_name, *args):
@@ -55,6 +56,22 @@ def exec_msar_func(conn, func_name, *args):
     )
 
 
+def select_from_msar_func(conn, func_name, *args):
+    """
+    Select all records from an msar function using a psycopg (3) connection.
+
+    Args:
+        conn: a psycopg connection
+        func_name: The unqualified msar_function name (danger; not sanitized)
+        *args: The list of parameters to pass
+    """
+    cursor = conn.execute(
+        f"SELECT * FROM msar.{func_name}({','.join(['%s']*len(args))})", args
+    )
+    cursor.row_factory = dict_row
+    return cursor.fetchall()
+
+
 def load_file_with_engine(engine, file_handle):
     """Run an SQL script from a file, using psycopg."""
     conn_str = str(engine.url)
diff --git a/db/constraints/operations/create.py b/db/constraints/operations/create.py
index d12d8591a5..738b65db55 100644
--- a/db/constraints/operations/create.py
+++ b/db/constraints/operations/create.py
@@ -1,13 +1,12 @@
-from db.connection import execute_msar_func_with_engine
+from db.connection import execute_msar_func_with_engine, exec_msar_func
 
 
-def add_constraint(constraint_obj, engine):
+def add_constraint_via_sql_alchemy(constraint_obj, engine):
     """
     Add a constraint.
 
     Args:
-        constraint_obj: A constraint object instantiatated with appropriate
-                        params.
+        constraint_obj: (See __msar.process_con_def_jsonb for details)
         engine: SQLAlchemy engine object for connecting.
 
     Returns:
@@ -19,3 +18,17 @@ def add_constraint(constraint_obj, engine):
         constraint_obj.table_oid,
         constraint_obj.get_constraint_def_json()
     ).fetchone()[0]
+
+
+def create_constraint(constraint_obj, conn):
+    """
+    Create a constraint using a psycopg connection.
+
+    Args:
+        constraint_obj: (See __msar.process_con_def_jsonb for details)
+        conn: a psycopg connection
+
+    Returns:
+        Returns a list of oid(s) of constraints for a given table.
+    """
+    return exec_msar_func(conn, 'add_constraints', constraint_obj).fetchone()[0]
diff --git a/db/constraints/operations/select.py b/db/constraints/operations/select.py
index df0e73fc9d..de47bacb1d 100644
--- a/db/constraints/operations/select.py
+++ b/db/constraints/operations/select.py
@@ -1,7 +1,12 @@
+from sqlalchemy import select, and_
+
+from db.connection import select_from_msar_func
 from db.utils import get_pg_catalog_table
 from db.metadata import get_empty_metadata
 
-from sqlalchemy import select, and_
+
+def get_constraints_for_table(table_oid, conn):
+    return select_from_msar_func(conn, 'get_constraints_for_table', table_oid)
 
 
 def get_constraints_with_oids(engine, table_oid=None):
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 08382616fd..a9ee34a207 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -246,6 +246,52 @@ END
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION msar.get_relation_name(rel_oid oid) RETURNS TEXT AS $$/*
+Return the UNQUOTED name of a given relation (e.g., table).
+
+If the relation does not exist, an exception will be raised.
+
+Args:
+  rel_oid: The OID of the relation.
+*/
+DECLARE rel_name text;
+BEGIN
+  SELECT relname INTO rel_name FROM pg_class WHERE oid=rel_oid;
+
+  IF rel_name IS NULL THEN
+    RAISE EXCEPTION 'Relation with OID % does not exist', rel_oid
+    USING ERRCODE = '42P01'; -- undefined_table
+  END IF;
+
+  RETURN rel_name;
+END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION msar.get_relation_schema_name(rel_oid oid) RETURNS TEXT AS $$/*
+Return the UNQUOTED name of the schema which contains a given relation (e.g., table).
+
+If the relation does not exist, an exception will be raised.
+
+Args:
+  rel_oid: The OID of the relation.
+*/
+DECLARE sch_name text;
+BEGIN
+  SELECT n.nspname INTO sch_name
+  FROM pg_catalog.pg_class c
+  JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace 
+  WHERE c.oid = rel_oid;
+
+  IF sch_name IS NULL THEN
+    RAISE EXCEPTION 'Relation with OID % does not exist', rel_oid
+    USING ERRCODE = '42P01'; -- undefined_table
+  END IF;
+
+  RETURN sch_name;
+END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
 
 DROP FUNCTION IF EXISTS msar.get_relation_oid(text, text) CASCADE;
 CREATE OR REPLACE FUNCTION
@@ -451,6 +497,59 @@ END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION msar.get_constraint_type_api_code(contype "char") RETURNS TEXT AS $$/*
+This function returns a string that represents the constraint type code used to describe
+constraints when listing them within the Mathesar API.
+
+PostgreSQL constraint types are documented by the `contype` field here:
+https://www.postgresql.org/docs/current/catalog-pg-constraint.html
+
+Notably, we don't include 't' (trigger) because triggers a bit different structurally and we don't
+support working with them (yet?) in Mathesar.
+*/
+SELECT CASE contype
+  WHEN 'c' THEN 'check'
+  WHEN 'f' THEN 'foreignkey'
+  WHEN 'p' THEN 'primary'
+  WHEN 'u' THEN 'unique'
+  WHEN 'x' THEN 'exclude'
+END;
+$$ LANGUAGE sql;
+
+
+CREATE OR REPLACE FUNCTION msar.get_constraints_for_table(tab_id oid) RETURNS TABLE
+(
+  oid oid,
+  name text,
+  columns smallint[],
+  type text,
+  referent_table_oid oid,
+  referent_columns smallint[]
+)
+AS $$/*
+Return data describing the constraints set on a given table.
+
+Args:
+  tab_id: The OID of the table.
+*/
+WITH constraints AS (
+  SELECT
+    oid,
+    conname AS name,
+    conkey AS columns,
+    msar.get_constraint_type_api_code(contype) AS type,
+    confrelid AS referent_table_oid,
+    confkey AS referent_columns
+  FROM pg_catalog.pg_constraint
+  WHERE conrelid = tab_id
+)
+SELECT *
+FROM constraints
+-- Only return constraints with types that we're able to classify
+WHERE type IS NOT NULL
+$$ LANGUAGE sql;
+
+
 CREATE OR REPLACE FUNCTION
 msar.get_constraint_name(con_id oid) RETURNS text AS $$/*
 Return the UNQUOTED constraint name of the corresponding constraint oid.
@@ -2220,28 +2319,9 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 
--- Drop constraint ---------------------------------------------------------------------------------
-
-
-CREATE OR REPLACE FUNCTION
-__msar.drop_constraint(tab_name text, con_name text) RETURNS text AS $$/*
-Drop a constraint, returning the command executed.
-
-Args:
-  tab_name: A qualified & quoted name of the table that has the constraint to be dropped.
-  con_name: Name of the constraint to drop, properly quoted.
-*/
-BEGIN
-  RETURN __msar.exec_ddl(
-    'ALTER TABLE %s DROP CONSTRAINT %s', tab_name, con_name
-  );
-END;
-$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
-
-
 CREATE OR REPLACE FUNCTION
-msar.drop_constraint(sch_name text, tab_name text, con_name text) RETURNS text AS $$/*
-Drop a constraint, returning the command executed.
+msar.drop_constraint(sch_name text, tab_name text, con_name text) RETURNS void AS $$/*
+Drop a constraint
 
 Args:
   sch_name: The name of the schema where the table with constraint to be dropped resides, unquoted.
@@ -2249,25 +2329,24 @@ Args:
   con_name: Name of the constraint to drop, unquoted.
 */
 BEGIN
-  RETURN __msar.drop_constraint(
-    __msar.build_qualified_name_sql(sch_name, tab_name), quote_ident(con_name)
-  );
+  EXECUTE format('ALTER TABLE %I.%I DROP CONSTRAINT %I', sch_name, tab_name, con_name);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
 msar.drop_constraint(tab_id oid, con_id oid) RETURNS TEXT AS $$/*
-Drop a constraint, returning the command executed.
+Drop a constraint
 
 Args:
   tab_id: OID of the table that has the constraint to be dropped.
   con_id: OID of the constraint to be dropped.
 */
 BEGIN
-  RETURN __msar.drop_constraint(
-    __msar.get_qualified_relation_name(tab_id),
-    quote_ident(msar.get_constraint_name(con_id))
+  PERFORM msar.drop_constraint(
+    msar.get_relation_schema_name(tab_id),
+    msar.get_relation_name(tab_id),
+    msar.get_constraint_name(con_id)
   );
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
diff --git a/db/tests/constraints/operations/test_create.py b/db/tests/constraints/operations/test_create.py
index da59b1afe6..476ef1c74b 100644
--- a/db/tests/constraints/operations/test_create.py
+++ b/db/tests/constraints/operations/test_create.py
@@ -23,7 +23,7 @@
 def test_add_constraint_db(engine_with_schema, constraint_obj):
     engine = engine_with_schema
     with patch.object(con_create, 'execute_msar_func_with_engine') as mock_exec:
-        con_create.add_constraint(
+        con_create.add_constraint_via_sql_alchemy(
             engine=engine,
             constraint_obj=constraint_obj
         )
diff --git a/db/tests/dependents/test_dependents.py b/db/tests/dependents/test_dependents.py
index 1b8e0f5afa..fc838bec23 100644
--- a/db/tests/dependents/test_dependents.py
+++ b/db/tests/dependents/test_dependents.py
@@ -1,7 +1,7 @@
 import pytest
 from sqlalchemy import MetaData, select, Index
 from sqlalchemy_utils import create_view
-from db.constraints.operations.create import add_constraint
+from db.constraints.operations.create import add_constraint_via_sql_alchemy
 from db.constraints.base import ForeignKeyConstraint
 from db.dependents.dependents_utils import get_dependents_graph
 from db.constraints.operations.select import get_constraint_oid_by_name_and_table_oid
@@ -93,7 +93,7 @@ def test_self_reference(engine_with_schema, library_tables_oids):
     fk_column_attnum = create_column(engine, publishers_oid, {'name': 'Parent Publisher', 'type': PostgresType.INTEGER.id})[0]
     pk_column_attnum = get_column_attnum_from_name(publishers_oid, 'id', engine, metadata=get_empty_metadata())
     fk_constraint = ForeignKeyConstraint('Publishers_Publisher_fkey', publishers_oid, [fk_column_attnum], publishers_oid, [pk_column_attnum], {})
-    add_constraint(fk_constraint, engine)
+    add_constraint_via_sql_alchemy(fk_constraint, engine)
 
     publishers_oid = library_tables_oids['Publishers']
     publishers_dependents_graph = get_dependents_graph(publishers_oid, engine, [])
@@ -114,7 +114,7 @@ def test_circular_reference(engine_with_schema, library_tables_oids):
     fk_column_attnum = create_column(engine, publishers_oid, {'name': 'Top Publication', 'type': PostgresType.INTEGER.id})[0]
     publications_pk_column_attnum = get_column_attnum_from_name(publications_oid, 'id', engine, metadata=get_empty_metadata())
     fk_constraint = ForeignKeyConstraint('Publishers_Publications_fkey', publishers_oid, [fk_column_attnum], publications_oid, [publications_pk_column_attnum], {})
-    add_constraint(fk_constraint, engine)
+    add_constraint_via_sql_alchemy(fk_constraint, engine)
 
     publishers_dependents_graph = get_dependents_graph(publishers_oid, engine, [])
     publications_dependents_oids = _get_object_dependents_oids(publishers_dependents_graph, publications_oid)
diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index f3fd42eb25..90753fb728 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -47,6 +47,16 @@ To use an RPC function:
       - grant_access_to_user
       - DBModelReturn
 
+## Constraints
+
+::: mathesar.rpc.constraints
+    options:
+      members:
+      - add_from_known_connection
+      - add_from_scratch
+      - grant_access_to_user
+      - DBModelReturn
+
 ## Schemas
 
 ::: schemas
diff --git a/mathesar/models/deprecated.py b/mathesar/models/deprecated.py
index 510bc92ca4..68087f3fae 100644
--- a/mathesar/models/deprecated.py
+++ b/mathesar/models/deprecated.py
@@ -17,7 +17,7 @@
     get_column_attnum_from_names_as_map, get_column_name_from_attnum,
     get_map_of_attnum_to_column_name, get_map_of_attnum_and_table_oid_to_column_name,
 )
-from db.constraints.operations.create import add_constraint
+from db.constraints.operations.create import add_constraint_via_sql_alchemy
 from db.constraints.operations.drop import drop_constraint
 from db.constraints.operations.select import get_constraint_record_from_oid
 from db.constraints import utils as constraint_utils
@@ -558,7 +558,7 @@ def add_constraint(self, constraint_obj):
         # the most newly-created constraint. Other methods (e.g., trying to get
         # a constraint by name when it wasn't set here) are even less robust.
         constraint_oid = max(
-            add_constraint(constraint_obj, engine=self._sa_engine)
+            add_constraint_via_sql_alchemy(constraint_obj, engine=self._sa_engine)
         )
         result = Constraint.current_objects.create(oid=constraint_oid, table=self)
         reset_reflection(db_name=self.schema.database.name)
diff --git a/mathesar/rpc/constraints.py b/mathesar/rpc/constraints.py
index fe726464d0..0a04e696bf 100644
--- a/mathesar/rpc/constraints.py
+++ b/mathesar/rpc/constraints.py
@@ -1,8 +1,49 @@
 """
 Classes and functions exposed to the RPC endpoint for managing table constraints.
 """
-from typing import TypedDict
+from typing import *
 
+from modernrpc.core import rpc_method, REQUEST_KEY
+from modernrpc.auth.basic import http_basic_auth_login_required
+
+from db.constraints.operations.select import get_constraints_for_table
+from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+from mathesar.rpc.utils import connect
 
 class CreatableConstraintInfo(TypedDict):
-    pass
+    name: Optional[str]
+    # TODO
+
+
+class Constraint(TypedDict):
+    """
+    Information about a constraint
+
+    Attributes:
+        oid: The OID of the schema
+        name: The name of the schema
+        description: A description of the schema
+        table_count: The number of tables in the schema
+    """
+    oid: int
+    table_oid: int
+    # TODO
+
+
+@rpc_method(name="constraints.list")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def list_(*, table_oid: int, database_id: int, **kwargs) -> list[Constraint]:
+    """
+    List information about constraints in a table. Exposed as `list`.
+
+    Args:
+        database_id: The Django id of the database containing the table.
+        table_oid: The oid of the table to list constraints for.
+
+    Returns:
+        A list of Constraint objects
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        return get_constraints_for_table(table_oid, conn)
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index b786e99027..cd8efc3dbd 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -10,6 +10,7 @@
 
 from mathesar.rpc import columns
 from mathesar.rpc import connections
+from mathesar.rpc import constraints
 from mathesar.rpc import schemas
 from mathesar.rpc import tables
 
@@ -54,6 +55,11 @@
         "connections.grant_access_to_user",
         [user_is_superuser]
     ),
+    (
+        constraints.list_,
+        "constraints.list",
+        [user_is_authenticated]
+    ),
     (
         schemas.add,
         "schemas.add",

From 4004345cecbe493ceeb50e55a82fd93807a1d4bd Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 3 Jul 2024 12:13:14 +0800
Subject: [PATCH 0352/1141] fix bug and signature for RPC function

---
 mathesar/rpc/columns/metadata.py | 8 +++++---
 mathesar/utils/columns.py        | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/mathesar/rpc/columns/metadata.py b/mathesar/rpc/columns/metadata.py
index d97f81778d..e9fbe86f61 100644
--- a/mathesar/rpc/columns/metadata.py
+++ b/mathesar/rpc/columns/metadata.py
@@ -138,7 +138,7 @@ def patch(
         table_oid: int,
         database_id: int,
         **kwargs
-) -> ColumnMetaData:
+) -> list[ColumnMetaData]:
     """
     Alter metadata settings associated with columns of a table for a database.
 
@@ -150,7 +150,9 @@ def patch(
     Returns:
         List of altered metadata objects.
     """
-    column_meta_data = patch_column_meta_data(
+    columns_meta_data = patch_column_meta_data(
         column_meta_data_list, table_oid, database_id
     )
-    return ColumnMetaData.from_model(table_meta_data)
+    return [
+        ColumnMetaData.from_model(model) for model in columns_meta_data
+    ]
diff --git a/mathesar/utils/columns.py b/mathesar/utils/columns.py
index 9b555701f5..371901199e 100644
--- a/mathesar/utils/columns.py
+++ b/mathesar/utils/columns.py
@@ -10,6 +10,7 @@ def get_columns_meta_data(table_oid, database_id):
 def patch_column_meta_data(column_meta_data_list, table_oid, database_id):
     db_model = Database.objects.get(id=database_id)
     for meta_data_dict in column_meta_data_list:
+        # TODO decide if this is worth the trouble of doing in bulk.
         ColumnMetaData.objects.update_or_create(
             database=db_model,
             table_oid=table_oid,

From 31c72e6f366bcf96399d2a5d88fa212e41a145af Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 3 Jul 2024 12:36:39 +0800
Subject: [PATCH 0353/1141] fix import issue, change name to match getter

---
 mathesar/rpc/columns/metadata.py | 4 ++--
 mathesar/utils/columns.py        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mathesar/rpc/columns/metadata.py b/mathesar/rpc/columns/metadata.py
index e9fbe86f61..3dd8df5931 100644
--- a/mathesar/rpc/columns/metadata.py
+++ b/mathesar/rpc/columns/metadata.py
@@ -7,7 +7,7 @@
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
-from mathesar.utils.columns import get_columns_meta_data
+from mathesar.utils.columns import get_columns_meta_data, patch_columns_meta_data
 
 
 class ColumnMetaData(TypedDict):
@@ -150,7 +150,7 @@ def patch(
     Returns:
         List of altered metadata objects.
     """
-    columns_meta_data = patch_column_meta_data(
+    columns_meta_data = patch_columns_meta_data(
         column_meta_data_list, table_oid, database_id
     )
     return [
diff --git a/mathesar/utils/columns.py b/mathesar/utils/columns.py
index 371901199e..67b3deec75 100644
--- a/mathesar/utils/columns.py
+++ b/mathesar/utils/columns.py
@@ -7,7 +7,7 @@ def get_columns_meta_data(table_oid, database_id):
     )
 
 
-def patch_column_meta_data(column_meta_data_list, table_oid, database_id):
+def patch_columns_meta_data(column_meta_data_list, table_oid, database_id):
     db_model = Database.objects.get(id=database_id)
     for meta_data_dict in column_meta_data_list:
         # TODO decide if this is worth the trouble of doing in bulk.

From 2a658a272a31e8e92e0fff122e66ef2904982e19 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 3 Jul 2024 12:37:29 +0800
Subject: [PATCH 0354/1141] add test for metadata.patch RPC function

---
 mathesar/tests/rpc/columns/test_c_metadata.py | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/mathesar/tests/rpc/columns/test_c_metadata.py b/mathesar/tests/rpc/columns/test_c_metadata.py
index f9b6e087c0..6e3ea21244 100644
--- a/mathesar/tests/rpc/columns/test_c_metadata.py
+++ b/mathesar/tests/rpc/columns/test_c_metadata.py
@@ -57,3 +57,57 @@ def mock_get_columns_meta_data(_table_oid, _database_id):
     ]
     actual_metadata_list = metadata.list_(table_oid=table_oid, database_id=database_id)
     assert actual_metadata_list == expect_metadata_list
+
+
+# TODO consider mocking out ColumnMetaData queryset for this test
+def test_columns_meta_data_patch(monkeypatch):
+    database_id = 2
+    table_oid = 123456
+    expect_metadata_list = [
+        metadata.ColumnMetaData(
+            database_id=database_id, table_oid=table_oid, attnum=2,
+            bool_input="dropdown", bool_true="TRUE", bool_false="FALSE",
+            num_min_frac_digits=5, num_max_frac_digits=10, num_show_as_perc=False,
+            mon_currency_symbol="EUR", mon_currency_location="end-with-space",
+            time_format=None, date_format=None,
+            duration_min=None, duration_max=None, duration_show_units=True,
+        ),
+        metadata.ColumnMetaData(
+            database_id=database_id, table_oid=table_oid, attnum=8,
+            bool_input="checkbox", bool_true="true", bool_false="false",
+            num_min_frac_digits=2, num_max_frac_digits=8, num_show_as_perc=True,
+            mon_currency_symbol="$", mon_currency_location="after-minus",
+            time_format=None, date_format=None,
+            duration_min=None, duration_max=None, duration_show_units=True,
+        ),
+    ]
+
+    def mock_patch_columns_meta_data(column_meta_data_list, _table_oid, _database_id):
+        server_model = Server(id=2, host='example.com', port=5432)
+        db_model = Database(id=_database_id, name='mymathesardb', server=server_model)
+        return [
+            ColumnMetaData(
+                database=db_model, table_oid=_table_oid, attnum=2,
+                bool_input="dropdown", bool_true="TRUE", bool_false="FALSE",
+                num_min_frac_digits=5, num_max_frac_digits=10, num_show_as_perc=False,
+                mon_currency_symbol="EUR", mon_currency_location="end-with-space",
+                time_format=None, date_format=None,
+                duration_min=None, duration_max=None, duration_show_units=True,
+            ),
+            ColumnMetaData(
+                database=db_model, table_oid=_table_oid, attnum=8,
+                bool_input="checkbox", bool_true="true", bool_false="false",
+                num_min_frac_digits=2, num_max_frac_digits=8, num_show_as_perc=True,
+                mon_currency_symbol="$", mon_currency_location="after-minus",
+                time_format=None, date_format=None,
+                duration_min=None, duration_max=None, duration_show_units=True,
+            )
+        ]
+
+    monkeypatch.setattr(metadata, "patch_columns_meta_data", mock_patch_columns_meta_data)
+    actual_metadata_list = metadata.patch(
+        column_meta_data_list=expect_metadata_list,
+        table_oid=table_oid,
+        database_id=database_id
+    )
+    assert actual_metadata_list == expect_metadata_list

From 51fa9dc89f6cac59c2c8094c9606dcf5b8f86002 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 3 Jul 2024 14:04:31 +0800
Subject: [PATCH 0355/1141] update docs with metadata patch function

---
 docs/docs/api/rpc.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index f3fd42eb25..27dcf9d911 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -107,7 +107,9 @@ To use an RPC function:
     options:
       members:
       - list_
+      - patch
       - ColumnMetaData
+      - SettableColumnMetaData
 
 ## Responses
 

From 346702d4ec08c078498c6c04b361daaee81e5841 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 3 Jul 2024 16:44:44 +0530
Subject: [PATCH 0356/1141] Implement endpoint for retrieving roles

---
 config/settings/common_settings.py |  1 +
 db/roles/__init__.py               |  0
 db/roles/operations/__init__.py    |  0
 db/roles/operations/select.py      |  5 +++
 db/sql/00_msar.sql                 | 51 ++++++++++++++++++++++++++++++
 mathesar/rpc/roles.py              | 47 +++++++++++++++++++++++++++
 6 files changed, 104 insertions(+)
 create mode 100644 db/roles/__init__.py
 create mode 100644 db/roles/operations/__init__.py
 create mode 100644 db/roles/operations/select.py
 create mode 100644 mathesar/rpc/roles.py

diff --git a/config/settings/common_settings.py b/config/settings/common_settings.py
index c574b418d5..a28c482e5c 100644
--- a/config/settings/common_settings.py
+++ b/config/settings/common_settings.py
@@ -68,6 +68,7 @@ def pipe_delim(pipe_string):
     'mathesar.rpc.connections',
     'mathesar.rpc.columns',
     'mathesar.rpc.columns.metadata',
+    'mathesar.rpc.roles',
     'mathesar.rpc.schemas',
     'mathesar.rpc.tables',
     'mathesar.rpc.tables.metadata'
diff --git a/db/roles/__init__.py b/db/roles/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/db/roles/operations/__init__.py b/db/roles/operations/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/db/roles/operations/select.py b/db/roles/operations/select.py
new file mode 100644
index 0000000000..46ea86526c
--- /dev/null
+++ b/db/roles/operations/select.py
@@ -0,0 +1,5 @@
+from db.connection import exec_msar_func
+
+
+def get_roles(conn):
+    return exec_msar_func(conn, 'get_roles').fetchone()[0]
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 08382616fd..1419dd16f1 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -792,6 +792,57 @@ FROM (
 $$ LANGUAGE sql;
 
 
+CREATE OR REPLACE FUNCTION msar.get_roles() RETURNS jsonb AS $$/*
+Return a json array of objects with the list of roles in a database server,
+excluding pg system roles.
+
+Each returned JSON object in the array has the form:
+  {
+    "oid": <int>
+    "name": <str>
+    "super": <bool>
+    "inherits": <bool>
+    "create_role": <bool>
+    "create_db": <bool>
+    "login": <bool>
+    "description": <str|null>
+    "members": <[
+        { "oid": <int>, "admin": <bool> }
+      ]|null>
+  }
+*/
+WITH rolemembers as (
+  SELECT
+    pgr.oid AS oid,
+    jsonb_agg(
+      jsonb_build_object(
+        'oid', pgm.member,
+        'admin', pgm.admin_option
+      )
+    ) AS members
+    FROM pg_catalog.pg_roles pgr
+      INNER JOIN pg_catalog.pg_auth_members pgm ON pgr.oid=pgm.roleid
+    GROUP BY pgr.oid
+)
+SELECT jsonb_agg(role_data)
+FROM (
+  SELECT
+    r.oid AS oid,
+    r.rolname AS name,
+    r.rolsuper AS super,
+    r.rolinherit AS inherits,
+    r.rolcreaterole AS create_role,
+    r.rolcreatedb AS create_db,
+    r.rolcanlogin AS login,
+    pg_catalog.obj_description(r.oid) AS description,
+    rolemembers.members AS members
+  FROM pg_catalog.pg_roles r
+    LEFT OUTER JOIN rolemembers ON r.oid = rolemembers.oid
+  WHERE r.rolname NOT LIKE 'pg_%'
+) AS role_data;
+$$ LANGUAGE sql;
+
+
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 -- ROLE MANIPULATION FUNCTIONS
diff --git a/mathesar/rpc/roles.py b/mathesar/rpc/roles.py
new file mode 100644
index 0000000000..16a02d4ea1
--- /dev/null
+++ b/mathesar/rpc/roles.py
@@ -0,0 +1,47 @@
+"""
+Classes and functions exposed to the RPC endpoint for managing table columns.
+"""
+from typing import Optional, TypedDict
+
+from modernrpc.core import rpc_method, REQUEST_KEY
+from modernrpc.auth.basic import http_basic_auth_login_required
+
+from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+from mathesar.rpc.utils import connect
+from db.roles.operations.select import get_roles
+
+
+class RoleMembers(TypedDict):
+    oid: int
+    admin: bool
+
+
+class RoleInfo(TypedDict):
+    oid: int
+    name: str
+    super: bool
+    inherits: bool
+    create_role: bool
+    create_db: bool
+    login: bool
+    description: Optional[str]
+    members: Optional[list[RoleMembers]]
+
+
+@rpc_method(name="roles.list")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def list_(*, database_id: int, **kwargs) -> list[RoleInfo]:
+    """
+    List information about roles for a database server. Exposed as `list`.
+    Requires a database id inorder to connect to the server.
+    Args:
+        database_id: The Django id of the database containing the table.
+    Returns:
+        A list of roles present on the database server.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        roles = get_roles(conn)
+
+    return roles

From 58e550e92a0ac9b099f4d5e2d9160c5241e0dca4 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 4 Jul 2024 00:39:01 +0530
Subject: [PATCH 0357/1141] some cleanups and update docstrings

---
 db/sql/00_msar.sql          | 10 +++++-----
 mathesar/rpc/constraints.py | 20 +++++++++++++-------
 mathesar/rpc/tables/base.py |  3 +++
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index a9ee34a207..2406607bc0 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -280,7 +280,7 @@ DECLARE sch_name text;
 BEGIN
   SELECT n.nspname INTO sch_name
   FROM pg_catalog.pg_class c
-  JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace 
+  JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
   WHERE c.oid = rel_oid;
 
   IF sch_name IS NULL THEN
@@ -497,7 +497,7 @@ END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
-CREATE OR REPLACE FUNCTION msar.get_constraint_type_api_code(contype "char") RETURNS TEXT AS $$/*
+CREATE OR REPLACE FUNCTION msar.get_constraint_type_api_code(contype char) RETURNS TEXT AS $$/*
 This function returns a string that represents the constraint type code used to describe
 constraints when listing them within the Mathesar API.
 
@@ -521,8 +521,8 @@ CREATE OR REPLACE FUNCTION msar.get_constraints_for_table(tab_id oid) RETURNS TA
 (
   oid oid,
   name text,
-  columns smallint[],
   type text,
+  columns smallint[],
   referent_table_oid oid,
   referent_columns smallint[]
 )
@@ -536,8 +536,8 @@ WITH constraints AS (
   SELECT
     oid,
     conname AS name,
-    conkey AS columns,
     msar.get_constraint_type_api_code(contype) AS type,
+    conkey AS columns,
     confrelid AS referent_table_oid,
     confkey AS referent_columns
   FROM pg_catalog.pg_constraint
@@ -547,7 +547,7 @@ SELECT *
 FROM constraints
 -- Only return constraints with types that we're able to classify
 WHERE type IS NOT NULL
-$$ LANGUAGE sql;
+$$ LANGUAGE SQL;
 
 
 CREATE OR REPLACE FUNCTION
diff --git a/mathesar/rpc/constraints.py b/mathesar/rpc/constraints.py
index 0a04e696bf..69d359a851 100644
--- a/mathesar/rpc/constraints.py
+++ b/mathesar/rpc/constraints.py
@@ -1,7 +1,7 @@
 """
 Classes and functions exposed to the RPC endpoint for managing table constraints.
 """
-from typing import *
+from typing import Optional, TypedDict
 
 from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
@@ -10,6 +10,7 @@
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
 
+
 class CreatableConstraintInfo(TypedDict):
     name: Optional[str]
     # TODO
@@ -20,14 +21,19 @@ class Constraint(TypedDict):
     Information about a constraint
 
     Attributes:
-        oid: The OID of the schema
-        name: The name of the schema
-        description: A description of the schema
-        table_count: The number of tables in the schema
+        oid: The OID of the constraint.
+        name: The name of the constraint.
+        type: The type of the constraint.
+        columns: List of constrained columns.
+        referent_table_oid: The OID of the referent table.
+        referent_columns: List of referent column(s).
     """
     oid: int
     table_oid: int
-    # TODO
+    type: str
+    columns: list[int]
+    referent_table_oid: Optional[int]
+    referent_columns: Optional[list[int]]
 
 
 @rpc_method(name="constraints.list")
@@ -38,8 +44,8 @@ def list_(*, table_oid: int, database_id: int, **kwargs) -> list[Constraint]:
     List information about constraints in a table. Exposed as `list`.
 
     Args:
-        database_id: The Django id of the database containing the table.
         table_oid: The oid of the table to list constraints for.
+        database_id: The Django id of the database containing the table.
 
     Returns:
         A list of Constraint objects
diff --git a/mathesar/rpc/tables/base.py b/mathesar/rpc/tables/base.py
index c73e5a35bc..408e6dbff9 100644
--- a/mathesar/rpc/tables/base.py
+++ b/mathesar/rpc/tables/base.py
@@ -1,3 +1,6 @@
+"""
+Classes and functions exposed to the RPC endpoint for managing tables in a database.
+"""
 from typing import Optional, TypedDict
 
 from modernrpc.core import rpc_method, REQUEST_KEY

From ce089b76b76c71371134de727e2a1fe122234a82 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 4 Jul 2024 00:48:03 +0530
Subject: [PATCH 0358/1141] fix docs

---
 docs/docs/api/rpc.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 90753fb728..f2c91ce82a 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -49,13 +49,12 @@ To use an RPC function:
 
 ## Constraints
 
-::: mathesar.rpc.constraints
+::: constraints
     options:
       members:
-      - add_from_known_connection
-      - add_from_scratch
-      - grant_access_to_user
-      - DBModelReturn
+      - list_
+      - Constraint
+      - CreatableConstraintInfo
 
 ## Schemas
 

From e3dda1b3fc09863eccab357e5b1367ab389ea7dc Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 4 Jul 2024 01:17:17 +0530
Subject: [PATCH 0359/1141] add return in drop_constraint

---
 db/sql/00_msar.sql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 9b08266bb6..873d119eb2 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -514,7 +514,7 @@ SELECT CASE contype
   WHEN 'u' THEN 'unique'
   WHEN 'x' THEN 'exclude'
 END;
-$$ LANGUAGE sql;
+$$ LANGUAGE SQL;
 
 
 CREATE OR REPLACE FUNCTION msar.get_constraints_for_table(tab_id oid) RETURNS TABLE
@@ -536,7 +536,7 @@ WITH constraints AS (
   SELECT
     oid,
     conname AS name,
-    msar.get_constraint_type_api_code(contype) AS type,
+    msar.get_constraint_type_api_code(contype::char) AS type,
     conkey AS columns,
     confrelid AS referent_table_oid,
     confkey AS referent_columns
@@ -2342,7 +2342,7 @@ Args:
   con_id: OID of the constraint to be dropped.
 */
 BEGIN
-  PERFORM msar.drop_constraint(
+  RETURN msar.drop_constraint(
     msar.get_relation_schema_name(tab_id),
     msar.get_relation_name(tab_id),
     msar.get_constraint_name(con_id)

From 2417cf343a56acd9ed63e1c7f2d3b1ac24618b5b Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 4 Jul 2024 18:52:09 +0530
Subject: [PATCH 0360/1141] Fix retrieval of role description

---
 db/sql/00_msar.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index fe5949144f..38c8adf11a 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -834,7 +834,7 @@ FROM (
     r.rolcreaterole AS create_role,
     r.rolcreatedb AS create_db,
     r.rolcanlogin AS login,
-    pg_catalog.obj_description(r.oid) AS description,
+    pg_catalog.shobj_description(r.oid, 'pg_authid') AS description,
     rolemembers.members AS members
   FROM pg_catalog.pg_roles r
     LEFT OUTER JOIN rolemembers ON r.oid = rolemembers.oid

From 5046e927aefb10bee003e389eb04e719aaa12ecb Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 4 Jul 2024 18:52:23 +0530
Subject: [PATCH 0361/1141] Add sql tests for fetching roles

---
 db/sql/test_00_msar.sql | 56 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 4e053e42d1..b12fda83be 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2738,3 +2738,59 @@ BEGIN
   RETURN NEXT is(jsonb_array_length(msar.get_schemas()), initial_schema_count);
 END;
 $$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_get_roles() RETURNS SETOF TEXT AS $$
+DECLARE
+  initial_role_count int;
+  foo_role jsonb;
+  bar_role jsonb;
+BEGIN
+  SELECT jsonb_array_length(msar.get_roles()) INTO initial_role_count;
+
+  -- Create role and check if role is present in response & count is increased
+  CREATE ROLE foo;
+  RETURN NEXT is(jsonb_array_length(msar.get_roles()), initial_role_count + 1);
+  SELECT jsonb_path_query(msar.get_roles(), '$[*] ? (@.name == "foo")') INTO foo_role;
+
+  -- Check if role has expected properties
+  RETURN NEXT is(jsonb_typeof(foo_role), 'object');
+  RETURN NEXT is((foo_role->>'super')::boolean, false);
+  RETURN NEXT is((foo_role->>'inherits')::boolean, true);
+  RETURN NEXT is((foo_role->>'create_role')::boolean, false);
+  RETURN NEXT is((foo_role->>'create_db')::boolean, false);
+  RETURN NEXT is((foo_role->>'login')::boolean, false);
+  RETURN NEXT is(jsonb_typeof(foo_role->'description'), 'null');
+  RETURN NEXT is(jsonb_typeof(foo_role->'members'), 'null');
+
+  -- Modify properties and check role again
+  ALTER ROLE foo WITH CREATEDB CREATEROLE LOGIN NOINHERIT;
+  SELECT jsonb_path_query(msar.get_roles(), '$[*] ? (@.name == "foo")') INTO foo_role;
+  RETURN NEXT is((foo_role->>'super')::boolean, false);
+  RETURN NEXT is((foo_role->>'inherits')::boolean, false);
+  RETURN NEXT is((foo_role->>'create_role')::boolean, true);
+  RETURN NEXT is((foo_role->>'create_db')::boolean, true);
+  RETURN NEXT is((foo_role->>'login')::boolean, true);
+
+  -- Add comment and check if comment is present
+  COMMENT ON ROLE foo IS 'A test role';
+  SELECT jsonb_path_query(msar.get_roles(), '$[*] ? (@.name == "foo")') INTO foo_role;
+  RETURN NEXT is(foo_role->'description'#>>'{}', 'A test role');
+
+  -- Add members and check result
+  CREATE ROLE bar;
+  GRANT foo TO bar;
+  RETURN NEXT is(jsonb_array_length(msar.get_roles()), initial_role_count + 2);
+  SELECT jsonb_path_query(msar.get_roles(), '$[*] ? (@.name == "foo")') INTO foo_role;
+  SELECT jsonb_path_query(msar.get_roles(), '$[*] ? (@.name == "bar")') INTO bar_role;
+  RETURN NEXT is(jsonb_typeof(foo_role->'members'), 'array');
+  RETURN NEXT is(
+    foo_role->'members'->0->>'oid', bar_role->>'oid'
+  );
+  DROP ROLE bar;
+
+  -- Drop role and ensure role is not present in response
+  DROP ROLE foo;
+  RETURN NEXT ok(NOT jsonb_path_exists(msar.get_roles(), '$[*] ? (@.name == "foo")'));
+END;
+$$ LANGUAGE plpgsql;

From 17b5c1d02a2ffc98deb8b08a1acd7c70c8f0c030 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 4 Jul 2024 19:12:21 +0530
Subject: [PATCH 0362/1141] add constraints delete and add endpoints

---
 db/constraints/operations/create.py  |   6 +-
 db/constraints/operations/drop.py    |  18 +++-
 db/sql/00_msar.sql                   |   3 +-
 docs/docs/api/rpc.md                 |  23 +++--
 mathesar/rpc/constraints.py          | 133 +++++++++++++++++++++++++--
 mathesar/tests/rpc/test_endpoints.py |  10 ++
 6 files changed, 173 insertions(+), 20 deletions(-)

diff --git a/db/constraints/operations/create.py b/db/constraints/operations/create.py
index 738b65db55..d6e4d0c305 100644
--- a/db/constraints/operations/create.py
+++ b/db/constraints/operations/create.py
@@ -20,15 +20,15 @@ def add_constraint_via_sql_alchemy(constraint_obj, engine):
     ).fetchone()[0]
 
 
-def create_constraint(constraint_obj, conn):
+def create_constraint(table_oid, constraint_obj_list, conn):
     """
     Create a constraint using a psycopg connection.
 
     Args:
-        constraint_obj: (See __msar.process_con_def_jsonb for details)
+        constraint_obj_list: (See __msar.process_con_def_jsonb for details)
         conn: a psycopg connection
 
     Returns:
         Returns a list of oid(s) of constraints for a given table.
     """
-    return exec_msar_func(conn, 'add_constraints', constraint_obj).fetchone()[0]
+    return exec_msar_func(conn, 'add_constraints', table_oid, constraint_obj_list).fetchone()[0]
diff --git a/db/constraints/operations/drop.py b/db/constraints/operations/drop.py
index c2f4807098..5faeb1bba9 100644
--- a/db/constraints/operations/drop.py
+++ b/db/constraints/operations/drop.py
@@ -1,4 +1,4 @@
-from db.connection import execute_msar_func_with_engine
+from db.connection import execute_msar_func_with_engine, exec_msar_func
 
 
 def drop_constraint(table_name, schema_name, engine, constraint_name):
@@ -17,3 +17,19 @@ def drop_constraint(table_name, schema_name, engine, constraint_name):
     return execute_msar_func_with_engine(
         engine, 'drop_constraint', schema_name, table_name, constraint_name
     ).fetchone()[0]
+
+
+def drop_constraint_via_oid(table_oid, constraint_oid, conn):
+    """
+    Drop a constraint.
+
+    Args:
+        table_oid: Identity of the table to delete constraint for.
+        constraint_oid: The OID of the constraint to delete.
+
+    Returns:
+        The name of the dropped constraint.
+    """
+    return exec_msar_func(
+        conn, 'drop_constraint', table_oid, constraint_oid
+    ).fetchone()[0]
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 873d119eb2..cc57971b26 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2319,7 +2319,7 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 ----------------------------------------------------------------------------------------------------
 
 CREATE OR REPLACE FUNCTION
-msar.drop_constraint(sch_name text, tab_name text, con_name text) RETURNS void AS $$/*
+msar.drop_constraint(sch_name text, tab_name text, con_name text) RETURNS TEXT AS $$/*
 Drop a constraint
 
 Args:
@@ -2329,6 +2329,7 @@ Args:
 */
 BEGIN
   EXECUTE format('ALTER TABLE %I.%I DROP CONSTRAINT %I', sch_name, tab_name, con_name);
+  RETURN con_name;
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 6dd18e048c..3ad8d6eeee 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -47,15 +47,6 @@ To use an RPC function:
       - grant_access_to_user
       - DBModelReturn
 
-## Constraints
-
-::: constraints
-    options:
-      members:
-      - list_
-      - Constraint
-      - CreatableConstraintInfo
-
 ## Schemas
 
 ::: schemas
@@ -120,6 +111,20 @@ To use an RPC function:
       - ColumnMetaData
       - SettableColumnMetaData
 
+## Constraints
+
+::: constraints
+    options:
+      members:
+      - list_
+      - add
+      - delete
+      - Constraint
+      - ForeignKeyConstraint
+      - PrimaryKeyConstraint
+      - UniqueConstraint
+      - CreatableConstraintInfo
+
 ## Responses
 
 ### Success
diff --git a/mathesar/rpc/constraints.py b/mathesar/rpc/constraints.py
index 69d359a851..d2d992332f 100644
--- a/mathesar/rpc/constraints.py
+++ b/mathesar/rpc/constraints.py
@@ -7,16 +7,80 @@
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from db.constraints.operations.select import get_constraints_for_table
+from db.constraints.operations.create import create_constraint
+from db.constraints.operations.drop import drop_constraint_via_oid
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
 
 
-class CreatableConstraintInfo(TypedDict):
+class ForeignKeyConstraint(TypedDict):
+    """
+    Information about a foreign key constraint.
+
+    Attributes:
+        name: The name of the constraint.
+        type: The type of the constraint(`'f'` for foreign key constraint).
+        columns: List of columns to set a foreign key on.
+        deferrable: Whether to postpone constraint checking until the end of the transaction.
+        fkey_relation_id: The OID of the referent table.
+        fkey_columns: List of referent column(s).
+        fkey_update_action: Specifies what action should be taken when the referenced key is updated.
+            Valid options include `'a'(no action)`(default behavior), `'r'(restrict)`, `'c'(cascade)`, `'n'(set null)`, `'d'(set default)`
+        fkey_delete_action: Specifies what action should be taken when the referenced key is deleted.
+            Valid options include `'a'(no action)`(default behavior), `'r'(restrict)`, `'c'(cascade)`, `'n'(set null)`, `'d'(set default)`
+        fkey_match_type: Specifies how the foreign key matching should be performed.
+            Valid options include `'f'(full match)`, `'s'(simple match)`(default behavior).
+    """
+    name: Optional[str]
+    type: str = 'f'
+    columns: list[int]
+    deferrable: Optional[bool]
+    fkey_relation_id: int
+    fkey_columns: list[int]
+    fkey_update_action: str = 'a' | 'r' | 'c' | 'n' | 'd'
+    fkey_delete_action: str = 'a' | 'r' | 'c' | 'n' | 'd'
+    fkey_match_type: str = 's' | 'f'
+
+
+class PrimaryKeyConstraint(TypedDict):
+    """
+    Information about a primary key constraint.
+
+    Attributes:
+        name: The name of the constraint.
+        type: The type of the constraint(`'p'` for primary key constraint).
+        columns: List of columns to set a primary key on.
+        deferrable: Whether to postpone constraint checking until the end of the transaction.
+    """
     name: Optional[str]
-    # TODO
+    type: str = 'p'
+    columns: list[int]
+    deferrable: Optional[bool]
+
+
+class UniqueConstraint(TypedDict):
+    """
+    Information about a unique constraint.
+
+    Attributes:
+        name: The name of the constraint.
+        type: The type of the constraint(`'u'` for unique constraint).
+        columns: List of columns to set a unique constraint on.
+        deferrable: Whether to postpone constraint checking until the end of the transaction.
+    """
+    name: Optional[str]
+    type: str = 'u'
+    columns: list[int]
+    deferrable: Optional[bool]
+
+
+CreatableConstraintInfo = list[ForeignKeyConstraint | PrimaryKeyConstraint | UniqueConstraint]
+"""
+Type alias for a list of createable constraints which can be unique, primary key, or foreign key constraints.
+"""
 
 
-class Constraint(TypedDict):
+class ConstraintInfo(TypedDict):
     """
     Information about a constraint
 
@@ -35,11 +99,22 @@ class Constraint(TypedDict):
     referent_table_oid: Optional[int]
     referent_columns: Optional[list[int]]
 
+    @classmethod
+    def from_dict(cls, con_info):
+        return cls(
+            oid=con_info["oid"],
+            table_oid=con_info["table_oid"],
+            type=con_info["type"],
+            columns=con_info["columns"],
+            referent_table_oid=con_info["referent_table_oid"],
+            referent_columns=con_info["referent_columns"]
+        )
+
 
 @rpc_method(name="constraints.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def list_(*, table_oid: int, database_id: int, **kwargs) -> list[Constraint]:
+def list_(*, table_oid: int, database_id: int, **kwargs) -> list[ConstraintInfo]:
     """
     List information about constraints in a table. Exposed as `list`.
 
@@ -48,8 +123,54 @@ def list_(*, table_oid: int, database_id: int, **kwargs) -> list[Constraint]:
         database_id: The Django id of the database containing the table.
 
     Returns:
-        A list of Constraint objects
+        A list of constraint details.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        con_info = get_constraints_for_table(table_oid, conn)
+        return [ConstraintInfo.from_dict(con) for con in con_info]
+
+
+@rpc_method(name="constraints.add")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def add(
+    *,
+    table_oid: int,
+    constraint_def_list: CreatableConstraintInfo,
+    database_id: int, **kwargs
+) -> list[int]:
+    """
+    Add constraint(s) on a table in bulk.
+
+    Args:
+        table_oid: Identity of the table to delete constraint for.
+        constraint_def_list: A list describing the constraints to add.
+        database_id: The Django id of the database containing the table.
+
+    Returns:
+        The oid(s) of the created constraints.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        return create_constraint(table_oid, constraint_def_list, conn)
+
+
+@rpc_method(name="constraints.delete")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def delete(*, table_oid: int, constraint_oid: int, database_id: int, **kwargs) -> str:
+    """
+    Delete a constraint from a table.
+
+    Args:
+        table_oid: Identity of the table to delete constraint for.
+        constraint_oid: The OID of the constraint to delete.
+        database_id: The Django id of the database containing the table.
+
+    Returns:
+        The name of the dropped constraint.
     """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
-        return get_constraints_for_table(table_oid, conn)
+        return drop_constraint_via_oid(table_oid, constraint_oid, conn)
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 93eb4b8ed3..a9e8661982 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -65,6 +65,16 @@
         "constraints.list",
         [user_is_authenticated]
     ),
+    (
+        constraints.add,
+        "constraints.add"
+        [user_is_authenticated]
+    ),
+    (
+        constraints.delete,
+        "constraints.delete"
+        [user_is_authenticated]
+    ),
     (
         schemas.add,
         "schemas.add",

From 6c8fe6083379e336b3a2e69d7a3c6fe209308c0f Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 4 Jul 2024 19:27:04 +0530
Subject: [PATCH 0363/1141] fix docstrings

---
 mathesar/rpc/constraints.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mathesar/rpc/constraints.py b/mathesar/rpc/constraints.py
index d2d992332f..30e936e70c 100644
--- a/mathesar/rpc/constraints.py
+++ b/mathesar/rpc/constraints.py
@@ -1,7 +1,7 @@
 """
 Classes and functions exposed to the RPC endpoint for managing table constraints.
 """
-from typing import Optional, TypedDict
+from typing import Optional, TypedDict, Union
 
 from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
@@ -37,9 +37,9 @@ class ForeignKeyConstraint(TypedDict):
     deferrable: Optional[bool]
     fkey_relation_id: int
     fkey_columns: list[int]
-    fkey_update_action: str = 'a' | 'r' | 'c' | 'n' | 'd'
-    fkey_delete_action: str = 'a' | 'r' | 'c' | 'n' | 'd'
-    fkey_match_type: str = 's' | 'f'
+    fkey_update_action: str
+    fkey_delete_action: str
+    fkey_match_type: str
 
 
 class PrimaryKeyConstraint(TypedDict):
@@ -74,7 +74,7 @@ class UniqueConstraint(TypedDict):
     deferrable: Optional[bool]
 
 
-CreatableConstraintInfo = list[ForeignKeyConstraint | PrimaryKeyConstraint | UniqueConstraint]
+CreatableConstraintInfo = list[Union[ForeignKeyConstraint, PrimaryKeyConstraint, UniqueConstraint]]
 """
 Type alias for a list of createable constraints which can be unique, primary key, or foreign key constraints.
 """

From f92677d65879e0e958812fc930f6623601b469ad Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 5 Jul 2024 10:23:34 +0800
Subject: [PATCH 0364/1141] add basic utilities to set up a new DB

---
 mathesar/rpc/connections.py   |  2 +-
 mathesar/utils/permissions.py | 57 ++++++++++++++++++++++++++++++-----
 2 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/mathesar/rpc/connections.py b/mathesar/rpc/connections.py
index 578b56f061..8c3fdf4ed0 100644
--- a/mathesar/rpc/connections.py
+++ b/mathesar/rpc/connections.py
@@ -143,4 +143,4 @@ def grant_access_to_user(*, connection_id: int, user_id: int):
         connection_id: The Django id of an old-style connection.
         user_id: The Django id of a user.
     """
-    permissions.create_user_database_role_map(connection_id, user_id)
+    permissions.migrate_connection_for_user(connection_id, user_id)
diff --git a/mathesar/utils/permissions.py b/mathesar/utils/permissions.py
index c9272a036b..c05b53d53c 100644
--- a/mathesar/utils/permissions.py
+++ b/mathesar/utils/permissions.py
@@ -1,20 +1,63 @@
+from django.db import transaction
+from django.conf import settings
+
+from db import install
 from mathesar.models.base import Server, Database, Role, UserDatabaseRoleMap
 from mathesar.models.deprecated import Connection
 from mathesar.models.users import User
+from mathesar.utils.connections import BadInstallationTarget
+
+INTERNAL_DB_KEY = 'default'
 
 
-def create_user_database_role_map(connection_id, user_id):
+@transaction.atomic
+def migrate_connection_for_user(connection_id, user_id):
     """Move data from old-style connection model to new models."""
     conn = Connection.current_objects.get(id=connection_id)
-
-    server = Server.objects.get_or_create(host=conn.host, port=conn.port)[0]
-    database = Database.objects.get_or_create(name=conn.db_name, server=server)[0]
-    role = Role.objects.get_or_create(
-        name=conn.username, server=server, password=conn.password
-    )[0]
+    server, database, role = _setup_connection_models(
+        conn.host, conn.port, conn.db_name, conn.username, conn.password
+    )
     return UserDatabaseRoleMap.objects.create(
         user=User.objects.get(id=user_id),
         database=database,
         role=role,
         server=server
     )
+
+
+@transaction.atomic
+def set_up_new_database_on_internal_server(database_name):
+    """Create a database on the internal server, install Mathesar."""
+    conn_info = settings.DATABASES[INTERNAL_DB_KEY]
+    if database_name == conn_info["NAME"]:
+        raise BadInstallationTarget(
+            "Mathesar can't be installed in the internal database."
+        )
+    _setup_connection_models(
+        conn_info["HOST"],
+        conn_info["PORT"],
+        conn_info["NAME"],
+        conn_info["USER"],
+        conn_info["PASSWORD"],
+    )
+    install.install_mathesar(
+        database_name,
+        conn_info["USER"],
+        conn_info["PASSWORD"],
+        conn_info["HOST"],
+        conn_info["PORT"],
+        True,
+        root_db=conn_info["NAME"],
+    )
+
+
+
+def _setup_connection_models(host, port, db_name, role_name, password):
+    server, _ = Server.objects.get_or_create(host=host, port=port)
+    database, _ = Database.objects.get_or_create(name=db_name, server=server)
+    role, _ = Role.objects.get_or_create(
+        name=role_name,
+        server=server,
+        defaults={"password": password},
+    )
+    return server, database, role

From 96c87569e9439a7e53803e721ed260b9d05c1602 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 5 Jul 2024 10:37:08 +0800
Subject: [PATCH 0365/1141] move user mapping into setup function

---
 mathesar/utils/permissions.py | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/mathesar/utils/permissions.py b/mathesar/utils/permissions.py
index c05b53d53c..de87a196e0 100644
--- a/mathesar/utils/permissions.py
+++ b/mathesar/utils/permissions.py
@@ -10,24 +10,22 @@
 INTERNAL_DB_KEY = 'default'
 
 
-@transaction.atomic
 def migrate_connection_for_user(connection_id, user_id):
     """Move data from old-style connection model to new models."""
     conn = Connection.current_objects.get(id=connection_id)
-    server, database, role = _setup_connection_models(
-        conn.host, conn.port, conn.db_name, conn.username, conn.password
-    )
-    return UserDatabaseRoleMap.objects.create(
-        user=User.objects.get(id=user_id),
-        database=database,
-        role=role,
-        server=server
+    user = User.objects.get(id=user_id)
+    return _setup_connection_models(
+        conn.host, conn.port, conn.db_name, conn.username, conn.password, user
     )
 
 
 @transaction.atomic
-def set_up_new_database_on_internal_server(database_name):
-    """Create a database on the internal server, install Mathesar."""
+def set_up_new_database_for_user_on_internal_server(database_name, user):
+    """
+    Create a database on the internal server and install Mathesar.
+
+    This database will be set up to be accessible for the given user.
+    """
     conn_info = settings.DATABASES[INTERNAL_DB_KEY]
     if database_name == conn_info["NAME"]:
         raise BadInstallationTarget(
@@ -39,6 +37,7 @@ def set_up_new_database_on_internal_server(database_name):
         conn_info["NAME"],
         conn_info["USER"],
         conn_info["PASSWORD"],
+        user
     )
     install.install_mathesar(
         database_name,
@@ -51,8 +50,8 @@ def set_up_new_database_on_internal_server(database_name):
     )
 
 
-
-def _setup_connection_models(host, port, db_name, role_name, password):
+@transaction.atomic
+def _setup_connection_models(host, port, db_name, role_name, password, user):
     server, _ = Server.objects.get_or_create(host=host, port=port)
     database, _ = Database.objects.get_or_create(name=db_name, server=server)
     role, _ = Role.objects.get_or_create(
@@ -60,4 +59,9 @@ def _setup_connection_models(host, port, db_name, role_name, password):
         server=server,
         defaults={"password": password},
     )
-    return server, database, role
+    return UserDatabaseRoleMap.objects.create(
+        user=user,
+        database=database,
+        role=role,
+        server=server
+    )

From 7c354c3a04475d2af8be74f177f3826111e4e47b Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 5 Jul 2024 13:58:13 +0800
Subject: [PATCH 0366/1141] rename connection object to match deprecated model

---
 mathesar/rpc/connections.py            | 32 +++++++++++++-------------
 mathesar/tests/rpc/test_connections.py |  4 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/mathesar/rpc/connections.py b/mathesar/rpc/connections.py
index 8c3fdf4ed0..c0486b1498 100644
--- a/mathesar/rpc/connections.py
+++ b/mathesar/rpc/connections.py
@@ -10,12 +10,12 @@
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 
 
-class DBModelReturn(TypedDict):
+class ConnectionReturn(TypedDict):
     """
-    Information about a database model.
+    Information about a connection model.
 
     Attributes:
-        id (int): The Django id of the Database object added.
+        id (int): The Django id of the Connection object added.
         nickname (str): Used to identify the added connection.
         database (str): The name of the database on the server.
         username (str): The username of the role for the connection.
@@ -30,14 +30,14 @@ class DBModelReturn(TypedDict):
     port: int
 
     @classmethod
-    def from_db_model(cls, db_model):
+    def from_model(cls, connection):
         return cls(
-            id=db_model.id,
-            nickname=db_model.name,
-            database=db_model.db_name,
-            username=db_model.username,
-            host=db_model.host,
-            port=db_model.port
+            id=connection.id,
+            nickname=connection.name,
+            database=connection.db_name,
+            username=connection.username,
+            host=connection.host,
+            port=connection.port
         )
 
 
@@ -51,7 +51,7 @@ def add_from_known_connection(
         create_db: bool = False,
         connection_id: int = None,
         sample_data: list[str] = [],
-) -> DBModelReturn:
+) -> ConnectionReturn:
     """
     Add a new connection from an already existing one.
 
@@ -80,10 +80,10 @@ def add_from_known_connection(
         'connection_type': connection_type,
         'connection_id': connection_id
     }
-    db_model = connections.copy_connection_from_preexisting(
+    connection_model = connections.copy_connection_from_preexisting(
         connection, nickname, database, create_db, sample_data
     )
-    return DBModelReturn.from_db_model(db_model)
+    return ConnectionReturn.from_model(connection_model)
 
 
 @rpc_method(name='connections.add_from_scratch')
@@ -98,7 +98,7 @@ def add_from_scratch(
         host: str,
         port: int,
         sample_data: list[str] = [],
-) -> DBModelReturn:
+) -> ConnectionReturn:
     """
     Add a new connection to a PostgreSQL server from scratch.
 
@@ -121,10 +121,10 @@ def add_from_scratch(
     Returns:
         Metadata about the Database associated with the connection.
     """
-    db_model = connections.create_connection_from_scratch(
+    connection_model = connections.create_connection_from_scratch(
         user, password, host, port, nickname, database, sample_data
     )
-    return DBModelReturn.from_db_model(db_model)
+    return ConnectionReturn.from_model(connection_model)
 
 
 @rpc_method(name='connections.grant_access_to_user')
diff --git a/mathesar/tests/rpc/test_connections.py b/mathesar/tests/rpc/test_connections.py
index da884c6daf..ea6cf14661 100644
--- a/mathesar/tests/rpc/test_connections.py
+++ b/mathesar/tests/rpc/test_connections.py
@@ -18,7 +18,7 @@
     ]
 )
 def test_add_from_known_connection(create_db, connection_id, sample_data):
-    with patch.object(rpc_conn, 'DBModelReturn'):
+    with patch.object(rpc_conn, 'ConnectionReturn'):
         with patch.object(
             rpc_conn.connections,
             'copy_connection_from_preexisting'
@@ -56,7 +56,7 @@ def test_add_from_known_connection(create_db, connection_id, sample_data):
     ]
 )
 def test_add_from_scratch(port, sample_data):
-    with patch.object(rpc_conn, 'DBModelReturn'):
+    with patch.object(rpc_conn, 'ConnectionReturn'):
         with patch.object(
             rpc_conn.connections,
             'create_connection_from_scratch'

From de1f46a2b3af3e0e1a4ec50a8272b14490cf413e Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 5 Jul 2024 14:11:59 +0800
Subject: [PATCH 0367/1141] use correct database name in models

---
 mathesar/utils/permissions.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mathesar/utils/permissions.py b/mathesar/utils/permissions.py
index de87a196e0..eaf67812d7 100644
--- a/mathesar/utils/permissions.py
+++ b/mathesar/utils/permissions.py
@@ -31,10 +31,10 @@ def set_up_new_database_for_user_on_internal_server(database_name, user):
         raise BadInstallationTarget(
             "Mathesar can't be installed in the internal database."
         )
-    _setup_connection_models(
+    user_db_role_map = _setup_connection_models(
         conn_info["HOST"],
         conn_info["PORT"],
-        conn_info["NAME"],
+        database_name,
         conn_info["USER"],
         conn_info["PASSWORD"],
         user
@@ -48,6 +48,7 @@ def set_up_new_database_for_user_on_internal_server(database_name, user):
         True,
         root_db=conn_info["NAME"],
     )
+    return user_db_role_map
 
 
 @transaction.atomic

From 8f691a0b4127d11b2d3ef85d07c93d77c6f5e991 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 5 Jul 2024 15:19:23 +0800
Subject: [PATCH 0368/1141] move data sample loading to new functions

---
 mathesar/examples/library_dataset.py | 30 ++++++++++++--------------
 mathesar/examples/movies_dataset.py  | 32 ++++++++++++++--------------
 mathesar/utils/connections.py        | 16 +-------------
 mathesar/utils/permissions.py        | 32 +++++++++++++++++++++++-----
 4 files changed, 58 insertions(+), 52 deletions(-)

diff --git a/mathesar/examples/library_dataset.py b/mathesar/examples/library_dataset.py
index 1c04a52907..0afeae0efa 100644
--- a/mathesar/examples/library_dataset.py
+++ b/mathesar/examples/library_dataset.py
@@ -1,29 +1,27 @@
 """This module contains functions to load the Library Management dataset."""
 
-from sqlalchemy import text
+from psycopg import sql
 from mathesar.examples.base import LIBRARY_MANAGEMENT, LIBRARY_ONE, LIBRARY_TWO
 
 
-def load_library_dataset(engine, safe_mode=False):
+def load_library_dataset(conn):
     """
     Load the library dataset into a "Library Management" schema.
 
     Args:
-        engine: an SQLAlchemy engine defining the connection to load data into.
-        safe_mode: When True, we will throw an error if the "Library Management"
-                   schema already exists instead of dropping it.
+        conn: a psycopg (3) connection for loading the data.
 
-    Uses given engine to define database to load into.
-    Destructive, and will knock out any previous "Library Management"
-    schema in the given database, unless safe_mode=True.
+    Uses given connection to define database to load into. Raises an
+    Exception if the "Library Management" schema already exists.
     """
-    drop_schema_query = text(f"""DROP SCHEMA IF EXISTS "{LIBRARY_MANAGEMENT}" CASCADE;""")
-    create_schema_query = text(f"""CREATE SCHEMA "{LIBRARY_MANAGEMENT}";""")
-    set_search_path = text(f"""SET search_path="{LIBRARY_MANAGEMENT}";""")
-    with engine.begin() as conn, open(LIBRARY_ONE) as f1, open(LIBRARY_TWO) as f2:
-        if safe_mode is False:
-            conn.execute(drop_schema_query)
+    create_schema_query = sql.SQL("CREATE SCHEMA {}").format(
+        sql.Identifier(LIBRARY_MANAGEMENT)
+    )
+    set_search_path = sql.SQL("SET search_path={}").format(
+        sql.Identifier(LIBRARY_MANAGEMENT)
+    )
+    with open(LIBRARY_ONE) as f1, open(LIBRARY_TWO) as f2:
         conn.execute(create_schema_query)
         conn.execute(set_search_path)
-        conn.execute(text(f1.read()))
-        conn.execute(text(f2.read()))
+        conn.execute(f1.read())
+        conn.execute(f2.read())
diff --git a/mathesar/examples/movies_dataset.py b/mathesar/examples/movies_dataset.py
index 854a3d80c4..735ed24611 100644
--- a/mathesar/examples/movies_dataset.py
+++ b/mathesar/examples/movies_dataset.py
@@ -1,31 +1,31 @@
 """This module contains functions to load the Movie Collection dataset."""
 import os
-from sqlalchemy import text
+from psycopg import sql
 
 from mathesar.examples.base import (
     MOVIE_COLLECTION, MOVIES_SQL_TABLES, MOVIES_CSV, MOVIES_SQL_FKS
 )
 
 
-def load_movies_dataset(engine, safe_mode=False):
+def load_movies_dataset(conn):
     """
     Load the movie example data set.
 
     Args:
-        engine: an SQLAlchemy engine defining the connection to load data into.
-        safe_mode: When True, we will throw an error if the "Movie Collection"
-                   schema already exists instead of dropping it.
+        conn: a psycopg (3) connection for loading the data.
+
+    Uses given connection to define database to load into. Raises an
+    Exception if the "Movie Collection" schema already exists.
     """
-    drop_schema_query = text(f"""DROP SCHEMA IF EXISTS "{MOVIE_COLLECTION}" CASCADE;""")
-    with engine.begin() as conn, open(MOVIES_SQL_TABLES) as f, open(MOVIES_SQL_FKS) as f2:
-        if safe_mode is False:
-            conn.execute(drop_schema_query)
-        conn.execute(text(f.read()))
+    with open(MOVIES_SQL_TABLES) as f, open(MOVIES_SQL_FKS) as f2:
+        conn.execute(f.read())
         for file in os.scandir(MOVIES_CSV):
             table_name = file.name.split('.csv')[0]
-            with open(file, 'r') as csv_file:
-                conn.connection.cursor().copy_expert(
-                    f"""COPY "{MOVIE_COLLECTION}"."{table_name}" FROM STDIN DELIMITER ',' CSV HEADER""",
-                    csv_file
-                )
-        conn.execute(text(f2.read()))
+            copy_sql = sql.SQL(
+                "COPY {}.{} FROM STDIN DELIMITER ',' CSV HEADER"
+            ).format(
+                sql.Identifier(MOVIE_COLLECTION), sql.Identifier(table_name)
+            )
+            with open(file, 'r') as csv, conn.cursor().copy(copy_sql) as copy:
+                copy.write(csv.read())
+        conn.execute(f2.read())
diff --git a/mathesar/utils/connections.py b/mathesar/utils/connections.py
index 95fd15bd79..ae5add0224 100644
--- a/mathesar/utils/connections.py
+++ b/mathesar/utils/connections.py
@@ -4,8 +4,6 @@
 from mathesar.models.deprecated import Connection
 from db import install, connection as dbconn
 from mathesar.state import reset_reflection
-from mathesar.examples.library_dataset import load_library_dataset
-from mathesar.examples.movies_dataset import load_movies_dataset
 
 
 class BadInstallationTarget(Exception):
@@ -85,19 +83,7 @@ def _save_and_install(
 
 
 def _load_sample_data(engine, sample_data):
-    DATASET_MAP = {
-        'library_management': load_library_dataset,
-        'movie_collection': load_movies_dataset,
-    }
-    for key in sample_data:
-        try:
-            DATASET_MAP[key](engine, safe_mode=True)
-        except ProgrammingError as e:
-            if isinstance(e.orig, DuplicateSchema):
-                # We swallow this error, since otherwise we'll raise an error on the
-                # front end even though installation generally succeeded.
-                continue
-    reset_reflection()
+    pass
 
 
 def _validate_conn_model(conn_model):
diff --git a/mathesar/utils/permissions.py b/mathesar/utils/permissions.py
index eaf67812d7..bfa22e0555 100644
--- a/mathesar/utils/permissions.py
+++ b/mathesar/utils/permissions.py
@@ -1,7 +1,9 @@
 from django.db import transaction
 from django.conf import settings
 
-from db import install
+from db.install import install_mathesar
+from mathesar.examples.library_dataset import load_library_dataset
+from mathesar.examples.movies_dataset import load_movies_dataset
 from mathesar.models.base import Server, Database, Role, UserDatabaseRoleMap
 from mathesar.models.deprecated import Connection
 from mathesar.models.users import User
@@ -20,7 +22,9 @@ def migrate_connection_for_user(connection_id, user_id):
 
 
 @transaction.atomic
-def set_up_new_database_for_user_on_internal_server(database_name, user):
+def set_up_new_database_for_user_on_internal_server(
+        database_name, user, sample_data=[]
+):
     """
     Create a database on the internal server and install Mathesar.
 
@@ -31,7 +35,7 @@ def set_up_new_database_for_user_on_internal_server(database_name, user):
         raise BadInstallationTarget(
             "Mathesar can't be installed in the internal database."
         )
-    user_db_role_map = _setup_connection_models(
+    user_database_role = _setup_connection_models(
         conn_info["HOST"],
         conn_info["PORT"],
         database_name,
@@ -39,7 +43,7 @@ def set_up_new_database_for_user_on_internal_server(database_name, user):
         conn_info["PASSWORD"],
         user
     )
-    install.install_mathesar(
+    install_mathesar(
         database_name,
         conn_info["USER"],
         conn_info["PASSWORD"],
@@ -48,7 +52,9 @@ def set_up_new_database_for_user_on_internal_server(database_name, user):
         True,
         root_db=conn_info["NAME"],
     )
-    return user_db_role_map
+    with user_database_role.connection as conn:
+        _load_sample_data(conn, sample_data)
+    return user_database_role
 
 
 @transaction.atomic
@@ -66,3 +72,19 @@ def _setup_connection_models(host, port, db_name, role_name, password, user):
         role=role,
         server=server
     )
+
+
+def _load_sample_data(conn, sample_data):
+    DATASET_MAP = {
+        'library_management': load_library_dataset,
+        'movie_collection': load_movies_dataset,
+    }
+    for key in sample_data:
+        try:
+            DATASET_MAP[key](conn)
+        except ProgrammingError as e:
+            if isinstance(e.orig, DuplicateSchema):
+                # We swallow this error, since otherwise we'll raise an
+                # error on the front end even though installation
+                # generally succeeded.
+                continue

From 0dc212a7239a00b5b90718769133e452954df5f0 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 5 Jul 2024 16:24:50 +0800
Subject: [PATCH 0369/1141] wire up create_new to the RPC endpoint

---
 config/settings/common_settings.py   |  1 +
 mathesar/rpc/database_setup.py       | 62 ++++++++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py |  6 +++
 3 files changed, 69 insertions(+)
 create mode 100644 mathesar/rpc/database_setup.py

diff --git a/config/settings/common_settings.py b/config/settings/common_settings.py
index c574b418d5..3eb67f194e 100644
--- a/config/settings/common_settings.py
+++ b/config/settings/common_settings.py
@@ -68,6 +68,7 @@ def pipe_delim(pipe_string):
     'mathesar.rpc.connections',
     'mathesar.rpc.columns',
     'mathesar.rpc.columns.metadata',
+    'mathesar.rpc.database_setup',
     'mathesar.rpc.schemas',
     'mathesar.rpc.tables',
     'mathesar.rpc.tables.metadata'
diff --git a/mathesar/rpc/database_setup.py b/mathesar/rpc/database_setup.py
new file mode 100644
index 0000000000..ea48b1f194
--- /dev/null
+++ b/mathesar/rpc/database_setup.py
@@ -0,0 +1,62 @@
+"""
+RPC functions for setting up database connections.
+"""
+from typing import TypedDict
+
+from modernrpc.core import rpc_method, REQUEST_KEY
+from modernrpc.auth.basic import http_basic_auth_superuser_required
+
+from mathesar.utils import permissions
+from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+
+
+class DatabaseConnectionResult(TypedDict):
+    """
+    Info about the objects resulting from calling the setup functions.
+
+    These functions will get or create an instance of the Server,
+    Database, and Role models, as well as a UserDatabaseRoleMap entry.
+
+    Attributes:
+        server_id: The Django ID of the Server model instance.
+        database_id: The Django ID of the Database model instance.
+        role_id: The Django ID of the Role model instance.
+    """
+    server_id: int
+    database_id: int
+    role_id: int
+
+    @classmethod
+    def from_model(cls, model):
+        return cls(
+            server_id=model.server.id,
+            database_id=model.database.id,
+            role_id=model.role.id,
+        )
+
+@rpc_method(name='database_setup.create_new')
+@http_basic_auth_superuser_required
+@handle_rpc_exceptions
+def create_new(
+        *,
+        database_name: str,
+        sample_data: list[str] = [],
+        **kwargs
+) -> DatabaseConnectionResult:
+    """
+    Set up a new database on the internal server.
+
+    The calling user will get access to that database using the default
+    role stored in Django settings.
+
+    Args:
+        database_name: The name of the new database.
+        sample_data: A list of strings requesting that some example data
+            sets be installed on the underlying database. Valid list
+            members are 'library_management' and 'movie_collection'.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    result = permissions.set_up_new_database_for_user_on_internal_server(
+        database_name, user, sample_data=sample_data
+    )
+    return DatabaseConnectionResult.from_model(result)
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index b786e99027..890e7d4538 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -10,6 +10,7 @@
 
 from mathesar.rpc import columns
 from mathesar.rpc import connections
+from mathesar.rpc import database_setup
 from mathesar.rpc import schemas
 from mathesar.rpc import tables
 
@@ -54,6 +55,11 @@
         "connections.grant_access_to_user",
         [user_is_superuser]
     ),
+    (
+        database_setup.create_new,
+        "database_setup.create_new",
+        [user_is_superuser]
+    ),
     (
         schemas.add,
         "schemas.add",

From c11ad16b36c92e03079337489776950fa3b5cd44 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 5 Jul 2024 14:45:50 +0530
Subject: [PATCH 0370/1141] fix typo

---
 mathesar/tests/rpc/test_endpoints.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index a9e8661982..6328340408 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -67,12 +67,12 @@
     ),
     (
         constraints.add,
-        "constraints.add"
+        "constraints.add",
         [user_is_authenticated]
     ),
     (
         constraints.delete,
-        "constraints.delete"
+        "constraints.delete",
         [user_is_authenticated]
     ),
     (

From 47bbb6eb27b30280c681497b5277f569aef4c62a Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 5 Jul 2024 15:06:10 +0530
Subject: [PATCH 0371/1141] Add unit tests

---
 db/tests/roles/__init__.py               |  0
 db/tests/roles/operations/__init__.py    |  0
 db/tests/roles/operations/test_select.py | 10 ++++++++++
 mathesar/tests/rpc/test_endpoints.py     |  6 ++++++
 4 files changed, 16 insertions(+)
 create mode 100644 db/tests/roles/__init__.py
 create mode 100644 db/tests/roles/operations/__init__.py
 create mode 100644 db/tests/roles/operations/test_select.py

diff --git a/db/tests/roles/__init__.py b/db/tests/roles/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/db/tests/roles/operations/__init__.py b/db/tests/roles/operations/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/db/tests/roles/operations/test_select.py b/db/tests/roles/operations/test_select.py
new file mode 100644
index 0000000000..40579e99ac
--- /dev/null
+++ b/db/tests/roles/operations/test_select.py
@@ -0,0 +1,10 @@
+from unittest.mock import patch
+from db.roles.operations import select as ma_sel
+
+
+def test_get_roles():
+    with patch.object(ma_sel, 'exec_msar_func') as mock_exec:
+        mock_exec.return_value.fetchone = lambda: ('a', 'b')
+        result = ma_sel.get_roles('conn')
+    mock_exec.assert_called_once_with('conn', 'get_roles')
+    assert result == 'a'
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index b786e99027..50f109d1ac 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -10,6 +10,7 @@
 
 from mathesar.rpc import columns
 from mathesar.rpc import connections
+from mathesar.rpc import roles
 from mathesar.rpc import schemas
 from mathesar.rpc import tables
 
@@ -54,6 +55,11 @@
         "connections.grant_access_to_user",
         [user_is_superuser]
     ),
+    (
+        roles.list_,
+        "roles.list",
+        [user_is_authenticated]
+    ),
     (
         schemas.add,
         "schemas.add",

From c381e3cb189f3129a14653fe2e2bce790e8187fa Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 5 Jul 2024 15:35:01 +0530
Subject: [PATCH 0372/1141] Add documentation

---
 docs/docs/api/rpc.md  |  9 +++++++++
 mathesar/rpc/roles.py | 32 ++++++++++++++++++++++++++++++--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 27dcf9d911..dbcbe9b315 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -111,6 +111,15 @@ To use an RPC function:
       - ColumnMetaData
       - SettableColumnMetaData
 
+## Roles
+
+::: roles
+    options:
+      members:
+      - list_
+      - RoleInfo
+      - RoleMember
+
 ## Responses
 
 ### Success
diff --git a/mathesar/rpc/roles.py b/mathesar/rpc/roles.py
index 16a02d4ea1..0db0c10c3c 100644
--- a/mathesar/rpc/roles.py
+++ b/mathesar/rpc/roles.py
@@ -11,12 +11,38 @@
 from db.roles.operations.select import get_roles
 
 
-class RoleMembers(TypedDict):
+class RoleMember(TypedDict):
+    """
+    Information about a member role of an inherited role.
+
+    Attributes:
+        oid: The OID of the member role.
+        admin: Whether the member role has ADMIN option on the inherited role.
+    """
     oid: int
     admin: bool
 
 
 class RoleInfo(TypedDict):
+    """
+    Information about a role.
+
+    Attributes:
+        oid: The OID of the role.
+        name: Name of the role.
+        super: Whether the role has SUPERUSER status.
+        inherits: Whether the role has INHERIT attribute.
+        create_role: Whether the role has CREATEROLE attribute.
+        create_db: Whether the role has CREATEDB attribute.
+        login: Whether the role has LOGIN attribute.
+        description: A description of the role
+        members: The member roles that inherit the role.
+
+    Refer PostgreSQL documenation on:
+        - [pg_roles table](https://www.postgresql.org/docs/current/view-pg-roles.html).
+        - [Role attributes](https://www.postgresql.org/docs/current/role-attributes.html)
+        - [Role membership](https://www.postgresql.org/docs/current/role-membership.html)
+    """
     oid: int
     name: str
     super: bool
@@ -25,7 +51,7 @@ class RoleInfo(TypedDict):
     create_db: bool
     login: bool
     description: Optional[str]
-    members: Optional[list[RoleMembers]]
+    members: Optional[list[RoleMember]]
 
 
 @rpc_method(name="roles.list")
@@ -35,8 +61,10 @@ def list_(*, database_id: int, **kwargs) -> list[RoleInfo]:
     """
     List information about roles for a database server. Exposed as `list`.
     Requires a database id inorder to connect to the server.
+
     Args:
         database_id: The Django id of the database containing the table.
+
     Returns:
         A list of roles present on the database server.
     """

From 80940a302803cd6d30397879c532c530ce1bc55a Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 5 Jul 2024 18:11:59 +0530
Subject: [PATCH 0373/1141] fix create_constraint

---
 db/constraints/operations/create.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/db/constraints/operations/create.py b/db/constraints/operations/create.py
index d6e4d0c305..45b9b4600f 100644
--- a/db/constraints/operations/create.py
+++ b/db/constraints/operations/create.py
@@ -1,3 +1,5 @@
+import json
+
 from db.connection import execute_msar_func_with_engine, exec_msar_func
 
 
@@ -31,4 +33,4 @@ def create_constraint(table_oid, constraint_obj_list, conn):
     Returns:
         Returns a list of oid(s) of constraints for a given table.
     """
-    return exec_msar_func(conn, 'add_constraints', table_oid, constraint_obj_list).fetchone()[0]
+    return exec_msar_func(conn, 'add_constraints', table_oid, json.dumps(constraint_obj_list)).fetchone()[0]

From 18329ecedca03f28069f62e7dd3c1440785c9261 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 5 Jul 2024 18:23:27 +0530
Subject: [PATCH 0374/1141] specify optionals in docstrings

---
 mathesar/rpc/constraints.py            | 10 +++++-----
 mathesar/tests/rpc/test_constraints.py |  0
 2 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 mathesar/tests/rpc/test_constraints.py

diff --git a/mathesar/rpc/constraints.py b/mathesar/rpc/constraints.py
index 30e936e70c..fe021540bf 100644
--- a/mathesar/rpc/constraints.py
+++ b/mathesar/rpc/constraints.py
@@ -37,9 +37,9 @@ class ForeignKeyConstraint(TypedDict):
     deferrable: Optional[bool]
     fkey_relation_id: int
     fkey_columns: list[int]
-    fkey_update_action: str
-    fkey_delete_action: str
-    fkey_match_type: str
+    fkey_update_action: Optional[str]
+    fkey_delete_action: Optional[str]
+    fkey_match_type: Optional[str]
 
 
 class PrimaryKeyConstraint(TypedDict):
@@ -93,7 +93,7 @@ class ConstraintInfo(TypedDict):
         referent_columns: List of referent column(s).
     """
     oid: int
-    table_oid: int
+    name: str
     type: str
     columns: list[int]
     referent_table_oid: Optional[int]
@@ -103,7 +103,7 @@ class ConstraintInfo(TypedDict):
     def from_dict(cls, con_info):
         return cls(
             oid=con_info["oid"],
-            table_oid=con_info["table_oid"],
+            name=con_info["name"],
             type=con_info["type"],
             columns=con_info["columns"],
             referent_table_oid=con_info["referent_table_oid"],
diff --git a/mathesar/tests/rpc/test_constraints.py b/mathesar/tests/rpc/test_constraints.py
new file mode 100644
index 0000000000..e69de29bb2

From bc6e7790d20b98facfb9a2e0beead1dc10430201 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 5 Jul 2024 18:26:53 +0530
Subject: [PATCH 0375/1141] reorder arguments

---
 mathesar/rpc/constraints.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/mathesar/rpc/constraints.py b/mathesar/rpc/constraints.py
index fe021540bf..2cdaaee322 100644
--- a/mathesar/rpc/constraints.py
+++ b/mathesar/rpc/constraints.py
@@ -18,12 +18,12 @@ class ForeignKeyConstraint(TypedDict):
     Information about a foreign key constraint.
 
     Attributes:
-        name: The name of the constraint.
         type: The type of the constraint(`'f'` for foreign key constraint).
         columns: List of columns to set a foreign key on.
-        deferrable: Whether to postpone constraint checking until the end of the transaction.
         fkey_relation_id: The OID of the referent table.
         fkey_columns: List of referent column(s).
+        name: The name of the constraint.
+        deferrable: Whether to postpone constraint checking until the end of the transaction.
         fkey_update_action: Specifies what action should be taken when the referenced key is updated.
             Valid options include `'a'(no action)`(default behavior), `'r'(restrict)`, `'c'(cascade)`, `'n'(set null)`, `'d'(set default)`
         fkey_delete_action: Specifies what action should be taken when the referenced key is deleted.
@@ -31,12 +31,12 @@ class ForeignKeyConstraint(TypedDict):
         fkey_match_type: Specifies how the foreign key matching should be performed.
             Valid options include `'f'(full match)`, `'s'(simple match)`(default behavior).
     """
-    name: Optional[str]
     type: str = 'f'
     columns: list[int]
-    deferrable: Optional[bool]
     fkey_relation_id: int
     fkey_columns: list[int]
+    name: Optional[str]
+    deferrable: Optional[bool]
     fkey_update_action: Optional[str]
     fkey_delete_action: Optional[str]
     fkey_match_type: Optional[str]
@@ -47,14 +47,14 @@ class PrimaryKeyConstraint(TypedDict):
     Information about a primary key constraint.
 
     Attributes:
-        name: The name of the constraint.
         type: The type of the constraint(`'p'` for primary key constraint).
         columns: List of columns to set a primary key on.
+        name: The name of the constraint.
         deferrable: Whether to postpone constraint checking until the end of the transaction.
     """
-    name: Optional[str]
     type: str = 'p'
     columns: list[int]
+    name: Optional[str]
     deferrable: Optional[bool]
 
 
@@ -63,14 +63,14 @@ class UniqueConstraint(TypedDict):
     Information about a unique constraint.
 
     Attributes:
-        name: The name of the constraint.
         type: The type of the constraint(`'u'` for unique constraint).
         columns: List of columns to set a unique constraint on.
+        name: The name of the constraint.
         deferrable: Whether to postpone constraint checking until the end of the transaction.
     """
-    name: Optional[str]
     type: str = 'u'
     columns: list[int]
+    name: Optional[str]
     deferrable: Optional[bool]
 
 

From 2a4e78c59ee4e7a84e0b7da762b6800d2005f87f Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 5 Jul 2024 18:54:19 +0530
Subject: [PATCH 0376/1141] add pytests

---
 mathesar/rpc/constraints.py            |   2 +-
 mathesar/tests/rpc/test_constraints.py | 156 +++++++++++++++++++++++++
 2 files changed, 157 insertions(+), 1 deletion(-)

diff --git a/mathesar/rpc/constraints.py b/mathesar/rpc/constraints.py
index 2cdaaee322..dd5aef8fb4 100644
--- a/mathesar/rpc/constraints.py
+++ b/mathesar/rpc/constraints.py
@@ -149,7 +149,7 @@ def add(
         database_id: The Django id of the database containing the table.
 
     Returns:
-        The oid(s) of the created constraints.
+        The oid(s) of all the constraints on the table.
     """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
diff --git a/mathesar/tests/rpc/test_constraints.py b/mathesar/tests/rpc/test_constraints.py
index e69de29bb2..6153594dd0 100644
--- a/mathesar/tests/rpc/test_constraints.py
+++ b/mathesar/tests/rpc/test_constraints.py
@@ -0,0 +1,156 @@
+"""
+This file tests the constraint RPC functions.
+
+Fixtures:
+    monkeypatch(pytest): Lets you monkeypatch an object for testing.
+"""
+from contextlib import contextmanager
+
+from mathesar.rpc import constraints
+from mathesar.models.users import User
+
+
+def test_constraints_list(rf, monkeypatch):
+    request = rf.post('/api/rpc/v0', data={})
+    request.user = User(username='alice', password='pass1234')
+    table_oid = 2254444
+    database_id = 11
+
+    @contextmanager
+    def mock_connect(_database_id, user):
+        if _database_id == database_id and user.username == 'alice':
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_constaints_list(_table_oid, conn):
+        if _table_oid != table_oid:
+            raise AssertionError('incorrect parameters passed')
+        return [
+            {
+                'oid': 2254567,
+                'name': 'Movie Cast Map_Cast Member_fkey',
+                'type': 'foreignkey',
+                'columns': [4],
+                'referent_table_oid': 2254492,
+                'referent_columns': [1]
+            },
+            {
+                'oid': 2254572,
+                'name': 'Movie Cast Map_Movie_fkey',
+                'type': 'foreignkey',
+                'columns': [3],
+                'referent_table_oid': 2254483,
+                'referent_columns': [1]
+            },
+            {
+                'oid': 2254544,
+                'name': 'Movie Cast Map_pkey',
+                'type': 'primary',
+                'columns': [1],
+                'referent_table_oid': 0,
+                'referent_columns': None
+            }
+        ]
+    monkeypatch.setattr(constraints, 'connect', mock_connect)
+    monkeypatch.setattr(constraints, 'get_constraints_for_table', mock_constaints_list)
+    expect_constraints_list = [
+        {
+            'oid': 2254567,
+            'name': 'Movie Cast Map_Cast Member_fkey',
+            'type': 'foreignkey',
+            'columns': [4],
+            'referent_table_oid': 2254492,
+            'referent_columns': [1]
+        },
+        {
+            'oid': 2254572,
+            'name': 'Movie Cast Map_Movie_fkey',
+            'type': 'foreignkey',
+            'columns': [3],
+            'referent_table_oid': 2254483,
+            'referent_columns': [1]
+        },
+        {
+            'oid': 2254544,
+            'name': 'Movie Cast Map_pkey',
+            'type': 'primary',
+            'columns': [1],
+            'referent_table_oid': 0,
+            'referent_columns': None
+        }
+    ]
+    actual_constraint_list = constraints.list_(table_oid=table_oid, database_id=11, request=request)
+    assert actual_constraint_list == expect_constraints_list
+
+
+def test_constraints_drop(rf, monkeypatch):
+    request = rf.post('/api/rpc/v0', data={})
+    request.user = User(username='alice', password='pass1234')
+    table_oid = 2254444
+    constraint_oid = 2254567
+    database_id = 11
+
+    @contextmanager
+    def mock_connect(_database_id, user):
+        if _database_id == database_id and user.username == 'alice':
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_constaints_delete(_table_oid, _constraint_oid, conn):
+        if _table_oid != table_oid and _constraint_oid != constraint_oid:
+            raise AssertionError('incorrect parameters passed')
+        return 'Movie Cast Map_Cast Member_fkey'
+    monkeypatch.setattr(constraints, 'connect', mock_connect)
+    monkeypatch.setattr(constraints, 'drop_constraint_via_oid', mock_constaints_delete)
+    constraint_name = constraints.delete(
+        table_oid=table_oid, constraint_oid=constraint_oid, database_id=11, request=request
+    )
+    assert constraint_name == 'Movie Cast Map_Cast Member_fkey'
+
+
+def test_constraints_create(rf, monkeypatch):
+    request = rf.post('/api/rpc/v0', data={})
+    request.user = User(username='alice', password='pass1234')
+    table_oid = 2254444
+    constraint_def_list = [
+        {
+            'name': 'Movie Cast Map_Movie_fkey',
+            'type': 'f',
+            'columns': [3],
+            'fkey_relation_id': 2254483,
+            'fkey_columns': [1],
+            'fkey_update_actions': 'a',
+            'fkey_delete_action': 'a',
+            'fkey_match_type': 's'
+        }
+    ]
+    database_id = 11
+
+    @contextmanager
+    def mock_connect(_database_id, user):
+        if _database_id == database_id and user.username == 'alice':
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_constaints_create(_table_oid, _constraint_def_list, conn):
+        if _table_oid != table_oid and _constraint_def_list != constraint_def_list:
+            raise AssertionError('incorrect parameters passed')
+        return [2254833, 2254567, 2254544]
+    monkeypatch.setattr(constraints, 'connect', mock_connect)
+    monkeypatch.setattr(constraints, 'create_constraint', mock_constaints_create)
+    constraint_oids = constraints.add(
+        table_oid=table_oid, constraint_def_list=constraint_def_list, database_id=11, request=request
+    )
+    assert constraint_oids == [2254833, 2254567, 2254544]

From 8e50a96f97ac754203385dac70168ee7ccc29907 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 8 Jul 2024 15:14:33 +0800
Subject: [PATCH 0377/1141] add function for setting up preexisting DB for a
 user

---
 mathesar/rpc/database_setup.py |  1 +
 mathesar/utils/connections.py  |  4 +---
 mathesar/utils/permissions.py  | 44 +++++++++++++++++++++++++++-------
 3 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/mathesar/rpc/database_setup.py b/mathesar/rpc/database_setup.py
index ea48b1f194..27439f6287 100644
--- a/mathesar/rpc/database_setup.py
+++ b/mathesar/rpc/database_setup.py
@@ -34,6 +34,7 @@ def from_model(cls, model):
             role_id=model.role.id,
         )
 
+
 @rpc_method(name='database_setup.create_new')
 @http_basic_auth_superuser_required
 @handle_rpc_exceptions
diff --git a/mathesar/utils/connections.py b/mathesar/utils/connections.py
index ae5add0224..000efb7ea5 100644
--- a/mathesar/utils/connections.py
+++ b/mathesar/utils/connections.py
@@ -1,9 +1,7 @@
 """Utilities to help with creating and managing connections in Mathesar."""
-from psycopg2.errors import DuplicateSchema
-from sqlalchemy.exc import OperationalError, ProgrammingError
+from sqlalchemy.exc import OperationalError
 from mathesar.models.deprecated import Connection
 from db import install, connection as dbconn
-from mathesar.state import reset_reflection
 
 
 class BadInstallationTarget(Exception):
diff --git a/mathesar/utils/permissions.py b/mathesar/utils/permissions.py
index bfa22e0555..1c3ae45d82 100644
--- a/mathesar/utils/permissions.py
+++ b/mathesar/utils/permissions.py
@@ -1,5 +1,6 @@
 from django.db import transaction
 from django.conf import settings
+from psycopg.errors import DuplicateSchema
 
 from db.install import install_mathesar
 from mathesar.examples.library_dataset import load_library_dataset
@@ -58,9 +59,37 @@ def set_up_new_database_for_user_on_internal_server(
 
 
 @transaction.atomic
-def _setup_connection_models(host, port, db_name, role_name, password, user):
+def set_up_preexisting_database_for_user(
+        host, port, database_name, role_name, password, user, sample_data=[]
+):
+    internal_conn_info = settings.DATABASES[INTERNAL_DB_KEY]
+    if (
+            host == internal_conn_info["HOST"]
+            and port == internal_conn_info["PORT"]
+            and database_name == internal_conn_info["NAME"]
+    ):
+        raise BadInstallationTarget(
+            "Mathesar can't be installed in the internal database."
+        )
+    user_database_role = _setup_connection_models(
+        host, port, database_name, role_name, password, user
+    )
+    install_mathesar(
+        database_name, role_name, password, host, port, True, create_db=False,
+    )
+    with user_database_role.connection as conn:
+        _load_sample_data(conn, sample_data)
+    return user_database_role
+
+
+@transaction.atomic
+def _setup_connection_models(
+        host, port, database_name, role_name, password, user
+):
     server, _ = Server.objects.get_or_create(host=host, port=port)
-    database, _ = Database.objects.get_or_create(name=db_name, server=server)
+    database, _ = Database.objects.get_or_create(
+        name=database_name, server=server
+    )
     role, _ = Role.objects.get_or_create(
         name=role_name,
         server=server,
@@ -82,9 +111,8 @@ def _load_sample_data(conn, sample_data):
     for key in sample_data:
         try:
             DATASET_MAP[key](conn)
-        except ProgrammingError as e:
-            if isinstance(e.orig, DuplicateSchema):
-                # We swallow this error, since otherwise we'll raise an
-                # error on the front end even though installation
-                # generally succeeded.
-                continue
+        except DuplicateSchema:
+            # We swallow this error, since otherwise we'll raise an
+            # error on the front end even though installation
+            # generally succeeded.
+            continue

From bd1ddf07126c8805dc0ce6a54af278e213a31ba8 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 8 Jul 2024 16:10:12 +0800
Subject: [PATCH 0378/1141] wire up new create_existing to RPC endpoint

---
 mathesar/rpc/database_setup.py       | 42 ++++++++++++++++++++++++++--
 mathesar/tests/rpc/test_endpoints.py |  5 ++++
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/mathesar/rpc/database_setup.py b/mathesar/rpc/database_setup.py
index 27439f6287..37ea89969b 100644
--- a/mathesar/rpc/database_setup.py
+++ b/mathesar/rpc/database_setup.py
@@ -40,7 +40,7 @@ def from_model(cls, model):
 @handle_rpc_exceptions
 def create_new(
         *,
-        database_name: str,
+        database: str,
         sample_data: list[str] = [],
         **kwargs
 ) -> DatabaseConnectionResult:
@@ -51,13 +51,49 @@ def create_new(
     role stored in Django settings.
 
     Args:
-        database_name: The name of the new database.
+        database: The name of the new database.
         sample_data: A list of strings requesting that some example data
             sets be installed on the underlying database. Valid list
             members are 'library_management' and 'movie_collection'.
     """
     user = kwargs.get(REQUEST_KEY).user
     result = permissions.set_up_new_database_for_user_on_internal_server(
-        database_name, user, sample_data=sample_data
+        database, user, sample_data=sample_data
+    )
+    return DatabaseConnectionResult.from_model(result)
+
+
+@rpc_method(name='database_setup.connect_existing')
+@http_basic_auth_superuser_required
+@handle_rpc_exceptions
+def connect_existing(
+        *,
+        host: str,
+        port: int,
+        database: str,
+        role: str,
+        password: str,
+        sample_data: list[str] = [],
+        **kwargs
+) -> DatabaseConnectionResult:
+    """
+    Connect Mathesar to an existing database on a server.
+
+    The calling user will get access to that database using the
+    credentials passed to this function.
+
+    Args:
+        host: The host of the database server.
+        port: The port of the database server.
+        database: The name of the database on the server.
+        role: The role on the server to use for the connection.
+        password: A password valid for the role.
+        sample_data: A list of strings requesting that some example data
+            sets be installed on the underlying database. Valid list
+            members are 'library_management' and 'movie_collection'.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    result = permissions.set_up_preexisting_database_for_user(
+        host, port, database, role, password, user, sample_data=sample_data
     )
     return DatabaseConnectionResult.from_model(result)
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 890e7d4538..e010d544ca 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -60,6 +60,11 @@
         "database_setup.create_new",
         [user_is_superuser]
     ),
+    (
+        database_setup.connect_existing,
+        "database_setup.connect_existing",
+        [user_is_superuser]
+    ),
     (
         schemas.add,
         "schemas.add",

From 2f046ca3a0ee45d5ecc2b77a42c268eafa521f56 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 8 Jul 2024 17:34:38 +0800
Subject: [PATCH 0379/1141] add wiring tests for database setup functions

---
 mathesar/tests/rpc/test_database_setup.py | 91 +++++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 mathesar/tests/rpc/test_database_setup.py

diff --git a/mathesar/tests/rpc/test_database_setup.py b/mathesar/tests/rpc/test_database_setup.py
new file mode 100644
index 0000000000..1e30679fbd
--- /dev/null
+++ b/mathesar/tests/rpc/test_database_setup.py
@@ -0,0 +1,91 @@
+"""
+This file tests the database_setup RPC functions.
+
+Fixtures:
+    rf(pytest-django): Provides mocked `Request` objects.
+    monkeypatch(pytest): Lets you monkeypatch an object for testing.
+"""
+from mathesar.models.users import User
+from mathesar.models.base import Database, Role, Server, UserDatabaseRoleMap
+from mathesar.rpc import database_setup
+
+
+def test_create_new(monkeypatch, rf):
+    test_sample_data = ["movie_collection"]
+    test_database = "mathesar42"
+    request = rf.post("/api/rpc/v0/", data={})
+    request.user = User(username="alice", password="pass1234")
+
+    def mock_set_up_new_for_user(database, user, sample_data=[]):
+        if not (
+                database == test_database
+                and user == request.user
+                and sample_data == test_sample_data
+        ):
+            raise AssertionError("incorrect parameters passed")
+        server_model = Server(id=2, host="example.com", port=5432)
+        db_model = Database(id=3, name=test_database, server=server_model)
+        role_model = Role(id=4, name="matheuser", server=server_model)
+        return UserDatabaseRoleMap(
+            user=user, database=db_model, role=role_model, server=server_model
+        )
+
+    monkeypatch.setattr(
+        database_setup.permissions,
+        "set_up_new_database_for_user_on_internal_server",
+        mock_set_up_new_for_user,
+    )
+    expect_response = database_setup.DatabaseConnectionResult(
+        server_id=2, database_id=3, role_id=4
+    )
+
+    actual_response = database_setup.create_new(
+        database=test_database, sample_data=test_sample_data, request=request
+    )
+    assert actual_response == expect_response
+
+
+def test_connect_existing(monkeypatch, rf):
+    test_sample_data = ["movie_collection"]
+    test_database = "mathesar42"
+    test_host = "example.com"
+    test_port = 6543
+    test_role = "ernie"
+    test_password = "ernie1234"
+    request = rf.post("/api/rpc/v0/", data={})
+    request.user = User(username="alice", password="pass1234")
+
+    def mock_set_up_preexisting_database_for_user(
+            host, port, database_name, role_name, password, user, sample_data=[]
+    ):
+        if not (
+                host == test_host
+                and port == test_port
+                and database_name == test_database
+                and role_name == test_role
+                and password == test_password
+                and user == request.user
+                and sample_data == test_sample_data
+        ):
+            raise AssertionError("incorrect parameters passed")
+        server_model = Server(id=2, host="example.com", port=5432)
+        db_model = Database(id=3, name=test_database, server=server_model)
+        role_model = Role(id=4, name="matheuser", server=server_model)
+        return UserDatabaseRoleMap(
+            user=user, database=db_model, role=role_model, server=server_model
+        )
+
+    monkeypatch.setattr(
+        database_setup.permissions,
+        "set_up_preexisting_database_for_user",
+        mock_set_up_preexisting_database_for_user,
+    )
+    expect_response = database_setup.DatabaseConnectionResult(
+        server_id=2, database_id=3, role_id=4
+    )
+
+    actual_response = database_setup.connect_existing(
+        host=test_host, port=test_port, database=test_database, role=test_role,
+        password=test_password, sample_data=test_sample_data, request=request
+    )
+    assert actual_response == expect_response

From b2aa9c16bbe96889557b1a652ca2ec92e66f718f Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 8 Jul 2024 18:04:46 +0800
Subject: [PATCH 0380/1141] add databases.list RPC function

---
 config/settings/common_settings.py   |  1 +
 mathesar/rpc/databases/__init__.py   |  1 +
 mathesar/rpc/databases/base.py       | 51 ++++++++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py |  6 ++++
 4 files changed, 59 insertions(+)
 create mode 100644 mathesar/rpc/databases/__init__.py
 create mode 100644 mathesar/rpc/databases/base.py

diff --git a/config/settings/common_settings.py b/config/settings/common_settings.py
index 3eb67f194e..db01dd848c 100644
--- a/config/settings/common_settings.py
+++ b/config/settings/common_settings.py
@@ -69,6 +69,7 @@ def pipe_delim(pipe_string):
     'mathesar.rpc.columns',
     'mathesar.rpc.columns.metadata',
     'mathesar.rpc.database_setup',
+    'mathesar.rpc.databases',
     'mathesar.rpc.schemas',
     'mathesar.rpc.tables',
     'mathesar.rpc.tables.metadata'
diff --git a/mathesar/rpc/databases/__init__.py b/mathesar/rpc/databases/__init__.py
new file mode 100644
index 0000000000..4b40b38c84
--- /dev/null
+++ b/mathesar/rpc/databases/__init__.py
@@ -0,0 +1 @@
+from .base import *  # noqa
diff --git a/mathesar/rpc/databases/base.py b/mathesar/rpc/databases/base.py
new file mode 100644
index 0000000000..f4f89ed0e4
--- /dev/null
+++ b/mathesar/rpc/databases/base.py
@@ -0,0 +1,51 @@
+from typing import TypedDict
+
+from modernrpc.core import rpc_method
+from modernrpc.auth.basic import http_basic_auth_login_required
+
+from mathesar.models.base import Database
+from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+
+
+class DatabaseInfo(TypedDict):
+    """
+    Information about a database.
+
+    id: the Django ID of the database model instance.
+    name: The name of the database on the server.
+    server_id: the Django ID of the server model instance for the database.
+    """
+    id: int
+    name: str
+    server_id: int
+
+    @classmethod
+    def from_model(cls, model):
+        return cls(
+            id=model.id,
+            name=model.name,
+            server_id=model.server.id
+        )
+
+
+@rpc_method(name="databases.list")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def list_(*, server_id: int = None, **kwargs) -> list[DatabaseInfo]:
+    """
+    List information about databases for a server. Exposed as `list`.
+
+    If called with no `server_id`, all databases for all servers are listed.
+
+    Args:
+        server_id: The Django id of the server containing the databases.
+
+    Returns:
+        A list of database details.
+    """
+    if server_id is not None:
+        database_qs = Database.objects.filter(server__id=server_id)
+    else:
+        database_qs = Database.objects.all()
+
+    return [DatabaseInfo.from_model(db_model) for db_model in database_qs]
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index e010d544ca..8f863e4cf7 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -11,6 +11,7 @@
 from mathesar.rpc import columns
 from mathesar.rpc import connections
 from mathesar.rpc import database_setup
+from mathesar.rpc import databases
 from mathesar.rpc import schemas
 from mathesar.rpc import tables
 
@@ -65,6 +66,11 @@
         "database_setup.connect_existing",
         [user_is_superuser]
     ),
+    (
+        databases.list_,
+        "databases.list",
+        [user_is_authenticated]
+    ),
     (
         schemas.add,
         "schemas.add",

From 5feae6cedf8a354553da7c9479ee7aaa09cacfd5 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 8 Jul 2024 18:21:21 +0800
Subject: [PATCH 0381/1141] integrate new functions into docs

---
 docs/docs/api/rpc.md           | 19 ++++++++++++++++++-
 mathesar/rpc/databases/base.py |  7 ++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index f3fd42eb25..05a66b6778 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -45,7 +45,24 @@ To use an RPC function:
       - add_from_known_connection
       - add_from_scratch
       - grant_access_to_user
-      - DBModelReturn
+      - ConnectionReturn
+
+## Databases
+
+::: databases
+    options:
+      members:
+      - list_
+      - DatabaseInfo
+
+## Database Setup
+
+::: database_setup
+    options:
+      members:
+      - create_new
+      - connect_existing
+      - DatabaseConnectionResult
 
 ## Schemas
 
diff --git a/mathesar/rpc/databases/base.py b/mathesar/rpc/databases/base.py
index f4f89ed0e4..abc9d43b89 100644
--- a/mathesar/rpc/databases/base.py
+++ b/mathesar/rpc/databases/base.py
@@ -11,9 +11,10 @@ class DatabaseInfo(TypedDict):
     """
     Information about a database.
 
-    id: the Django ID of the database model instance.
-    name: The name of the database on the server.
-    server_id: the Django ID of the server model instance for the database.
+    Attributes:
+        id: the Django ID of the database model instance.
+        name: The name of the database on the server.
+        server_id: the Django ID of the server model instance for the database.
     """
     id: int
     name: str

From ddf2704aef7d757a00203375090455ae1487e822 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 8 Jul 2024 21:13:53 -0400
Subject: [PATCH 0382/1141] Cast OIDs to bigint before putting in json

---
 db/sql/00_msar.sql | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index e5fce3cf1a..56194ca149 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -716,9 +716,9 @@ Args:
   tab_id: The OID or name of the table.
 */
 SELECT jsonb_build_object(
-  'oid', oid,
+  'oid', oid::bigint,
   'name', relname,
-  'schema', relnamespace,
+  'schema', relnamespace::bigint,
   'description', msar.obj_description(oid, 'pg_class')
 ) FROM pg_catalog.pg_class WHERE oid = tab_id;
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
@@ -740,9 +740,9 @@ Args:
 */
 SELECT jsonb_agg(
   jsonb_build_object(
-    'oid', pgc.oid,
+    'oid', pgc.oid::bigint,
     'name', pgc.relname,
-    'schema', pgc.relnamespace,
+    'schema', pgc.relnamespace::bigint,
     'description', msar.obj_description(pgc.oid, 'pg_class')
   )
 )
@@ -772,7 +772,7 @@ Each returned JSON object in the array will have the form:
 SELECT jsonb_agg(schema_data)
 FROM (
   SELECT 
-    s.oid AS oid,
+    s.oid::bigint AS oid,
     s.nspname AS name,
     pg_catalog.obj_description(s.oid) AS description,
     COALESCE(count(c.oid), 0) AS table_count
@@ -2120,7 +2120,7 @@ SELECT jsonb_agg(
     'type', contype,
     'columns', ARRAY[attname],
     'deferrable', condeferrable,
-    'fkey_relation_id', confrelid::integer,
+    'fkey_relation_id', confrelid::bigint,
     'fkey_columns', confkey,
     'fkey_update_action', confupdtype,
     'fkey_delete_action', confdeltype,

From 4900cd2ca48228606f1fa4b3b7da45bb90c417ea Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 8 Jul 2024 22:14:30 -0400
Subject: [PATCH 0383/1141] Improve standard on casting OIDs to JSON

---
 db/sql/STANDARDS.md | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/db/sql/STANDARDS.md b/db/sql/STANDARDS.md
index 81ead6d690..93f12bf518 100644
--- a/db/sql/STANDARDS.md
+++ b/db/sql/STANDARDS.md
@@ -62,23 +62,35 @@ Always qualify system catalog tables by prefixing them with `pg_catalog.`. If yo
 
 Always cast OID values to `bigint` before putting them in JSON (or jsonb).
 
-_Don't_ cast OID values to `integer`.
+- _Don't_ leave OID values in JSON without casting.
 
-This is because the [`oid` type](https://www.postgresql.org/docs/current/datatype-oid.html) is an _unsigned_ 32-bit integer whereas the `integer` type is a _signed_ 32-bit integer. That means it's possible for a database to have OID values which don't fit into the `integer` type.
+    This is because (strangely!) raw OID values become _strings_ in JSON unless you cast them.
 
-For example, putting a large OID value into JSON by casting it to an integer will cause overflow:
+    ```sql
+    SELECT jsonb_build_object('foo', 42::oid); -- ❌ Bad
+    ```
 
-```SQL
-SELECT jsonb_build_object('foo', 3333333333::oid::integer); -- ❌ Bad
-```
+    > `{"foo": "42"}`
 
-> `{"foo": -961633963}`
+    If you keep OID values as strings in JSON, it can cause bugs. For example, a client may later feed a received OID value back to the DB layer when making a modification to a DB object. If the client sends a stringifed OID back to the DB layer, it might get treated as a _name_ instead of an OID due to function overloading.
+    
+- _Don't_ cast OID values to `integer`.
+
+    This is because the [`oid` type](https://www.postgresql.org/docs/current/datatype-oid.html) is an _unsigned_ 32-bit integer whereas the `integer` type is a _signed_ 32-bit integer. That means it's possible for a database to have OID values which don't fit into the `integer` type.
+
+    For example, putting a large OID value into JSON by casting it to an integer will cause overflow:
+
+    ```SQL
+    SELECT jsonb_build_object('foo', 3333333333::oid::integer); -- ❌ Bad
+    ```
+
+    > `{"foo": -961633963}`
 
-Instead, cast it to `bigint`
+    Instead, cast it to `bigint`
 
-```SQL
-SELECT jsonb_build_object('foo', 3333333333::oid::bigint); -- ✅ Good
-```
+    ```SQL
+    SELECT jsonb_build_object('foo', 3333333333::oid::bigint); -- ✅ Good
+    ```
 
-> `{"foo": 3333333333}`
+    > `{"foo": 3333333333}`
 

From 4b89b3696540e0e6aae507062d5d7a77b0859a81 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 9 Jul 2024 18:56:39 +0530
Subject: [PATCH 0384/1141] add python functions for joinable tables

---
 db/tables/operations/select.py       |  6 ++-
 mathesar/rpc/tables/base.py          | 74 +++++++++++++++++++++++++++-
 mathesar/tests/rpc/test_endpoints.py |  5 ++
 3 files changed, 83 insertions(+), 2 deletions(-)

diff --git a/db/tables/operations/select.py b/db/tables/operations/select.py
index e25ad3c976..e0d4b7365e 100644
--- a/db/tables/operations/select.py
+++ b/db/tables/operations/select.py
@@ -3,7 +3,7 @@
 )
 from sqlalchemy.dialects.postgresql import JSONB
 
-from db.connection import exec_msar_func
+from db.connection import exec_msar_func, select_from_msar_func
 from db.utils import execute_statement, get_pg_catalog_table
 
 BASE = 'base'
@@ -59,6 +59,10 @@ def get_table_info(schema, conn):
     return exec_msar_func(conn, 'get_table_info', schema).fetchone()[0]
 
 
+def list_joinable_tables(table_oid, conn, max_depth):
+    return select_from_msar_func(conn, 'get_joinable_tables', max_depth, table_oid)
+
+
 def reflect_table(name, schema, engine, metadata, connection_to_use=None, keep_existing=False):
     extend_existing = not keep_existing
     autoload_with = engine if connection_to_use is None else connection_to_use
diff --git a/mathesar/rpc/tables/base.py b/mathesar/rpc/tables/base.py
index 408e6dbff9..f4d09d5e29 100644
--- a/mathesar/rpc/tables/base.py
+++ b/mathesar/rpc/tables/base.py
@@ -6,7 +6,7 @@
 from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
 
-from db.tables.operations.select import get_table_info, get_table
+from db.tables.operations.select import get_table_info, get_table, list_joinable_tables
 from db.tables.operations.drop import drop_table_from_database
 from db.tables.operations.create import create_table_on_database
 from db.tables.operations.alter import alter_table_on_database
@@ -54,6 +54,52 @@ class SettableTableInfo(TypedDict):
     columns: Optional[list[SettableColumnInfo]]
 
 
+class JoinableTableInfo(TypedDict):
+    """
+    Information about a joinable table.
+
+    Attributes:
+        base: The OID of the table from which the paths start
+        target: The OID of the table where the paths end.
+        join_path: A list describing joinable paths in the following form:
+            [
+              [[L_oid0, L_attnum0], [R_oid0, R_attnum0]],
+              [[L_oid1, L_attnum1], [R_oid1, R_attnum1]],
+              [[L_oid2, L_attnum2], [R_oid2, R_attnum2]],
+              ...
+            ]
+
+            Here, [L_oidN, L_attnumN] represents the left column of a join, and [R_oidN, R_attnumN] the right.
+        fkey_path: Same as `join_path` expressed in terms of foreign key constraints in the following form:
+            [
+                [constraint_id0, reversed],
+                [constraint_id1, reversed],
+            ]
+
+            In this form, `constraint_idN` is a foreign key constraint, and `reversed` is a boolean giving
+            whether to travel from referrer to referant (when False) or from referant to referrer (when True).
+        depth: Specifies how far to search for joinable tables.
+        multiple_results: Specifies whether the path included is reversed.
+    """
+    base: int
+    target: int
+    join_path: list[list[list[int, int], list[int, int]]]
+    fkey_path: list[list[int, str]]
+    depth: int
+    multiple_results: bool
+
+    @classmethod
+    def from_dict(cls, joinables):
+        return cls(
+            base=joinables["base"],
+            target=joinables["target"],
+            join_path=joinables["join_path"],
+            fkey_path=joinables["fkey_path"],
+            depth=joinables["depth"],
+            multiple_results=joinables["multiple_reslults"]
+        )
+
+
 @rpc_method(name="tables.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
@@ -231,3 +277,29 @@ def get_import_preview(
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
         return get_preview(table_oid, columns, conn, limit)
+
+
+@rpc_method(name="tables.list_joinable")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def list_joinable(
+    *,
+    table_oid: int,
+    database_id: int,
+    max_depth: int = 3,
+    **kwargs
+) -> JoinableTableInfo:
+    """
+    List details for joinable tables.
+
+    Args:
+        table_oid: Identity of the table to get joinable tables for.
+        database_id: The Django id of the database containing the table.
+        max_depth: Specifies how far to search for joinable tables.
+
+    Returns:
+        Joinable table details for a given table.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        return list_joinable_tables(table_oid, conn, max_depth)
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index ca91d17b2e..87f4c95f90 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -136,6 +136,11 @@
         "tables.get_import_preview",
         [user_is_authenticated]
     ),
+    (
+        tables.list_joinable,
+        "tables.list_joinable",
+        [user_is_authenticated]
+    ),
     (
         tables.metadata.list_,
         "tables.metadata.list",

From a096c0934ed8c58b2ce3863381cd0cc4b69a23ae Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 9 Jul 2024 19:01:42 +0530
Subject: [PATCH 0385/1141] add docs

---
 docs/docs/api/rpc.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 37efba2c64..3284f38223 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -71,8 +71,10 @@ To use an RPC function:
       - patch
       - import_
       - get_import_preview
+      - list_joinable
       - TableInfo
       - SettableTableInfo
+      - JoinableTableInfo
 
 ## Table Metadata
 

From 4d580cda3189e467bbb1122fb038af9535fb3243 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 9 Jul 2024 09:43:34 -0400
Subject: [PATCH 0386/1141] Cast OID values to bigint in msar.get_roles

---
 db/sql/00_msar.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 366b4d2aaa..666c07a534 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -915,7 +915,7 @@ WITH rolemembers as (
     pgr.oid AS oid,
     jsonb_agg(
       jsonb_build_object(
-        'oid', pgm.member,
+        'oid', pgm.member::bigint,
         'admin', pgm.admin_option
       )
     ) AS members
@@ -926,7 +926,7 @@ WITH rolemembers as (
 SELECT jsonb_agg(role_data)
 FROM (
   SELECT
-    r.oid AS oid,
+    r.oid::bigint AS oid,
     r.rolname AS name,
     r.rolsuper AS super,
     r.rolinherit AS inherits,

From 5e35ffa23d5dd1f85e8bd1f3a7074c9d3e3c8083 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 9 Jul 2024 19:14:59 +0530
Subject: [PATCH 0387/1141] install joinable_tables sql

---
 db/sql/install.py           | 3 +++
 mathesar/rpc/tables/base.py | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/db/sql/install.py b/db/sql/install.py
index 8de4c7e2f2..eb46915338 100644
--- a/db/sql/install.py
+++ b/db/sql/install.py
@@ -3,6 +3,7 @@
 
 FILE_DIR = os.path.abspath(os.path.dirname(__file__))
 MSAR_SQL = os.path.join(FILE_DIR, '00_msar.sql')
+MSAR_JOIN_SQL = os.path.join(FILE_DIR, '10_msar_joinable_tables.sql')
 MSAR_AGGREGATE_SQL = os.path.join(FILE_DIR, '30_msar_custom_aggregates.sql')
 
 
@@ -10,5 +11,7 @@ def install(engine):
     """Install SQL pieces using the given engine."""
     with open(MSAR_SQL) as file_handle:
         load_file_with_engine(engine, file_handle)
+    with open(MSAR_JOIN_SQL) as file_handle:
+        load_file_with_engine(engine, file_handle)
     with open(MSAR_AGGREGATE_SQL) as custom_aggregates:
         load_file_with_engine(engine, custom_aggregates)
diff --git a/mathesar/rpc/tables/base.py b/mathesar/rpc/tables/base.py
index f4d09d5e29..76b8bba731 100644
--- a/mathesar/rpc/tables/base.py
+++ b/mathesar/rpc/tables/base.py
@@ -83,8 +83,8 @@ class JoinableTableInfo(TypedDict):
     """
     base: int
     target: int
-    join_path: list[list[list[int, int], list[int, int]]]
-    fkey_path: list[list[int, str]]
+    join_path: list
+    fkey_path: list
     depth: int
     multiple_results: bool
 
@@ -302,4 +302,5 @@ def list_joinable(
     """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
-        return list_joinable_tables(table_oid, conn, max_depth)
+        joinables = list_joinable_tables(table_oid, conn, max_depth)
+        return [JoinableTableInfo.from_dict(joinable) for joinable in joinables]

From 1a2742940462675082d0e79773c69d9456d1f4bc Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 9 Jul 2024 19:34:42 +0530
Subject: [PATCH 0388/1141] add tests

---
 mathesar/tests/rpc/tables/test_t_base.py | 125 +++++++++++++++++++++++
 1 file changed, 125 insertions(+)

diff --git a/mathesar/tests/rpc/tables/test_t_base.py b/mathesar/tests/rpc/tables/test_t_base.py
index 693f9b901d..26ce8ece30 100644
--- a/mathesar/tests/rpc/tables/test_t_base.py
+++ b/mathesar/tests/rpc/tables/test_t_base.py
@@ -267,3 +267,128 @@ def mock_table_preview(_table_oid, columns, conn, limit):
         {'id': 3, 'length': Decimal('4.0')},
         {'id': 4, 'length': Decimal('5.22')}
     ]
+
+
+def test_list_joinable(rf, monkeypatch):
+    request = rf.post('/api/rpc/v0', data={})
+    request.user = User(username='alice', password='pass1234')
+    table_oid = 2254329
+    database_id = 11
+
+    @contextmanager
+    def mock_connect(_database_id, user):
+        if _database_id == database_id and user.username == 'alice':
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_list_joinable_tables(_table_oid, conn, max_depth):
+        if _table_oid != table_oid:
+            raise AssertionError('incorrect parameters passed')
+        return [
+            {
+                'base': 2254329,
+                'target': 2254334,
+                'join_path': [[[2254329, 2], [2254334, 1]]],
+                'fkey_path': [['2254406', False]],
+                'depth': 1,
+                'multiple_results': False
+            },
+            {
+                'base': 2254329,
+                'target': 2254350,
+                'join_path': [[[2254329, 3], [2254350, 1]]],
+                'fkey_path': [['2254411', False]],
+                'depth': 1,
+                'multiple_results': False
+            },
+            {
+                'base': 2254329,
+                'target': 2254321,
+                'join_path': [[[2254329, 2], [2254334, 1]], [[2254334, 5], [2254321, 1]]],
+                'fkey_path': [['2254406', False], ['2254399', False]],
+                'depth': 2,
+                'multiple_results': False
+            },
+            {
+                'base': 2254329,
+                'target': 2254358,
+                'join_path': [
+                    [[2254329, 2], [2254334, 1]],
+                    [[2254334, 5], [2254321, 1]],
+                    [[2254321, 11], [2254358, 1]]
+                ],
+                'fkey_path': [['2254406', False], ['2254399', False], ['2254394', False]],
+                'depth': 3,
+                'multiple_results': False
+            },
+            {
+                'base': 2254329,
+                'target': 2254313,
+                'join_path': [
+                    [[2254329, 2], [2254334, 1]],
+                    [[2254334, 5], [2254321, 1]],
+                    [[2254321, 10], [2254313, 1]]
+                ],
+                'fkey_path': [['2254406', False], ['2254399', False], ['2254389', False]],
+                'depth': 3,
+                'multiple_results': False
+            }
+        ]
+    expected_list = [
+        {
+            'base': 2254329,
+            'target': 2254334,
+            'join_path': [[[2254329, 2], [2254334, 1]]],
+            'fkey_path': [['2254406', False]],
+            'depth': 1,
+            'multiple_results': False
+        },
+        {
+            'base': 2254329,
+            'target': 2254350,
+            'join_path': [[[2254329, 3], [2254350, 1]]],
+            'fkey_path': [['2254411', False]],
+            'depth': 1,
+            'multiple_results': False
+        },
+        {
+            'base': 2254329,
+            'target': 2254321,
+            'join_path': [[[2254329, 2], [2254334, 1]], [[2254334, 5], [2254321, 1]]],
+            'fkey_path': [['2254406', False], ['2254399', False]],
+            'depth': 2,
+            'multiple_results': False
+        },
+        {
+            'base': 2254329,
+            'target': 2254358,
+            'join_path': [
+                [[2254329, 2], [2254334, 1]],
+                [[2254334, 5], [2254321, 1]],
+                [[2254321, 11], [2254358, 1]]
+            ],
+            'fkey_path': [['2254406', False], ['2254399', False], ['2254394', False]],
+            'depth': 3,
+            'multiple_results': False
+        },
+        {
+            'base': 2254329,
+            'target': 2254313,
+            'join_path': [
+                [[2254329, 2], [2254334, 1]],
+                [[2254334, 5], [2254321, 1]],
+                [[2254321, 10], [2254313, 1]]
+            ],
+            'fkey_path': [['2254406', False], ['2254399', False], ['2254389', False]],
+            'depth': 3,
+            'multiple_results': False
+        }
+    ]
+    monkeypatch.setattr(tables.base, 'connect', mock_connect)
+    monkeypatch.setattr(tables.base, 'list_joinable_tables', mock_list_joinable_tables)
+    actual_list = tables.list_joinable(table_oid=2254329, database_id=11, max_depth=3)
+    assert expected_list == actual_list

From 625ed0d49494a57fb4fd562ba4308f6105ee49f3 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 9 Jul 2024 20:07:40 +0530
Subject: [PATCH 0389/1141] change namespace for joinable_tables type

---
 db/sql/10_msar_joinable_tables.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/db/sql/10_msar_joinable_tables.sql b/db/sql/10_msar_joinable_tables.sql
index 96e255a4fd..dd62775216 100644
--- a/db/sql/10_msar_joinable_tables.sql
+++ b/db/sql/10_msar_joinable_tables.sql
@@ -29,7 +29,7 @@ whether to travel from referrer to referant (when False) or from referant to ref
 */
 
 
-CREATE TYPE mathesar_types.joinable_tables AS (
+CREATE TYPE __msar.joinable_tables AS (
   base integer, -- The OID of the table from which the paths start
   target integer, -- The OID of the table where the paths end
   join_path jsonb, -- A JSONB array of arrays of arrays
@@ -40,8 +40,8 @@ CREATE TYPE mathesar_types.joinable_tables AS (
 
 
 CREATE OR REPLACE FUNCTION
-msar.get_joinable_tables(max_depth integer) RETURNS SETOF mathesar_types.joinable_tables AS $$/*
-This function returns a table of mathesar_types.joinable_tables objects, giving paths to various
+msar.get_joinable_tables(max_depth integer) RETURNS SETOF __msar.joinable_tables AS $$/*
+This function returns a table of __msar.joinable_tables objects, giving paths to various
 joinable tables.
 
 Args:
@@ -132,6 +132,6 @@ $$ LANGUAGE sql;
 
 CREATE OR REPLACE FUNCTION
 msar.get_joinable_tables(max_depth integer, table_id oid) RETURNS
-  SETOF mathesar_types.joinable_tables AS $$
+  SETOF __msar.joinable_tables AS $$
   SELECT * FROM msar.get_joinable_tables(max_depth) WHERE base=table_id
 $$ LANGUAGE sql;

From fa2e7d56755cbe802eaac28783e9c4511ec14629 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 9 Jul 2024 20:23:10 +0530
Subject: [PATCH 0390/1141] fix test

---
 mathesar/rpc/tables/base.py              | 2 +-
 mathesar/tests/rpc/tables/test_t_base.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mathesar/rpc/tables/base.py b/mathesar/rpc/tables/base.py
index 76b8bba731..606bbd7d11 100644
--- a/mathesar/rpc/tables/base.py
+++ b/mathesar/rpc/tables/base.py
@@ -96,7 +96,7 @@ def from_dict(cls, joinables):
             join_path=joinables["join_path"],
             fkey_path=joinables["fkey_path"],
             depth=joinables["depth"],
-            multiple_results=joinables["multiple_reslults"]
+            multiple_results=joinables["multiple_results"]
         )
 
 
diff --git a/mathesar/tests/rpc/tables/test_t_base.py b/mathesar/tests/rpc/tables/test_t_base.py
index 26ce8ece30..16bcb24bf1 100644
--- a/mathesar/tests/rpc/tables/test_t_base.py
+++ b/mathesar/tests/rpc/tables/test_t_base.py
@@ -390,5 +390,5 @@ def mock_list_joinable_tables(_table_oid, conn, max_depth):
     ]
     monkeypatch.setattr(tables.base, 'connect', mock_connect)
     monkeypatch.setattr(tables.base, 'list_joinable_tables', mock_list_joinable_tables)
-    actual_list = tables.list_joinable(table_oid=2254329, database_id=11, max_depth=3)
+    actual_list = tables.list_joinable(table_oid=2254329, database_id=11, max_depth=3, request=request)
     assert expected_list == actual_list

From b1bc21ff666583b3dd104e633adbccdeee9a2a2c Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 9 Jul 2024 22:11:46 +0530
Subject: [PATCH 0391/1141] move joinable_tables type from __msar to msar

---
 db/sql/10_msar_joinable_tables.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/db/sql/10_msar_joinable_tables.sql b/db/sql/10_msar_joinable_tables.sql
index dd62775216..c1877903e9 100644
--- a/db/sql/10_msar_joinable_tables.sql
+++ b/db/sql/10_msar_joinable_tables.sql
@@ -29,7 +29,7 @@ whether to travel from referrer to referant (when False) or from referant to ref
 */
 
 
-CREATE TYPE __msar.joinable_tables AS (
+CREATE TYPE msar.joinable_tables AS (
   base integer, -- The OID of the table from which the paths start
   target integer, -- The OID of the table where the paths end
   join_path jsonb, -- A JSONB array of arrays of arrays
@@ -40,8 +40,8 @@ CREATE TYPE __msar.joinable_tables AS (
 
 
 CREATE OR REPLACE FUNCTION
-msar.get_joinable_tables(max_depth integer) RETURNS SETOF __msar.joinable_tables AS $$/*
-This function returns a table of __msar.joinable_tables objects, giving paths to various
+msar.get_joinable_tables(max_depth integer) RETURNS SETOF msar.joinable_tables AS $$/*
+This function returns a table of msar.joinable_tables objects, giving paths to various
 joinable tables.
 
 Args:
@@ -132,6 +132,6 @@ $$ LANGUAGE sql;
 
 CREATE OR REPLACE FUNCTION
 msar.get_joinable_tables(max_depth integer, table_id oid) RETURNS
-  SETOF __msar.joinable_tables AS $$
+  SETOF msar.joinable_tables AS $$
   SELECT * FROM msar.get_joinable_tables(max_depth) WHERE base=table_id
 $$ LANGUAGE sql;

From 1b473ab65d73ab8e4b371aaa244eb7e76920612b Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 10 Jul 2024 18:10:41 +0530
Subject: [PATCH 0392/1141] convert oids from text -> bigint

---
 db/sql/10_msar_joinable_tables.sql       | 12 ++++++------
 mathesar/tests/rpc/tables/test_t_base.py | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/db/sql/10_msar_joinable_tables.sql b/db/sql/10_msar_joinable_tables.sql
index c1877903e9..cf51e772a9 100644
--- a/db/sql/10_msar_joinable_tables.sql
+++ b/db/sql/10_msar_joinable_tables.sql
@@ -53,9 +53,9 @@ restrictions in either way.
 */
 WITH RECURSIVE symmetric_fkeys AS (
   SELECT
-    c.oid fkey_oid,
-    c.conrelid::INTEGER left_rel,
-    c.confrelid::INTEGER right_rel,
+    c.oid::BIGINT fkey_oid,
+    c.conrelid::BIGINT left_rel,
+    c.confrelid::BIGINT right_rel,
     c.conkey[1]::INTEGER left_col,
     c.confkey[1]::INTEGER right_col,
     false multiple_results,
@@ -64,9 +64,9 @@ WITH RECURSIVE symmetric_fkeys AS (
   WHERE c.contype='f' and array_length(c.conkey, 1)=1
 UNION ALL
   SELECT
-    c.oid fkey_oid,
-    c.confrelid::INTEGER left_rel,
-    c.conrelid::INTEGER right_rel,
+    c.oid::BIGINT fkey_oid,
+    c.confrelid::BIGINT left_rel,
+    c.conrelid::BIGINT right_rel,
     c.confkey[1]::INTEGER left_col,
     c.conkey[1]::INTEGER right_col,
     true multiple_results,
diff --git a/mathesar/tests/rpc/tables/test_t_base.py b/mathesar/tests/rpc/tables/test_t_base.py
index 16bcb24bf1..3190502f9b 100644
--- a/mathesar/tests/rpc/tables/test_t_base.py
+++ b/mathesar/tests/rpc/tables/test_t_base.py
@@ -293,7 +293,7 @@ def mock_list_joinable_tables(_table_oid, conn, max_depth):
                 'base': 2254329,
                 'target': 2254334,
                 'join_path': [[[2254329, 2], [2254334, 1]]],
-                'fkey_path': [['2254406', False]],
+                'fkey_path': [[2254406, False]],
                 'depth': 1,
                 'multiple_results': False
             },
@@ -301,7 +301,7 @@ def mock_list_joinable_tables(_table_oid, conn, max_depth):
                 'base': 2254329,
                 'target': 2254350,
                 'join_path': [[[2254329, 3], [2254350, 1]]],
-                'fkey_path': [['2254411', False]],
+                'fkey_path': [[2254411, False]],
                 'depth': 1,
                 'multiple_results': False
             },
@@ -309,7 +309,7 @@ def mock_list_joinable_tables(_table_oid, conn, max_depth):
                 'base': 2254329,
                 'target': 2254321,
                 'join_path': [[[2254329, 2], [2254334, 1]], [[2254334, 5], [2254321, 1]]],
-                'fkey_path': [['2254406', False], ['2254399', False]],
+                'fkey_path': [[2254406, False], [2254399, False]],
                 'depth': 2,
                 'multiple_results': False
             },
@@ -321,7 +321,7 @@ def mock_list_joinable_tables(_table_oid, conn, max_depth):
                     [[2254334, 5], [2254321, 1]],
                     [[2254321, 11], [2254358, 1]]
                 ],
-                'fkey_path': [['2254406', False], ['2254399', False], ['2254394', False]],
+                'fkey_path': [[2254406, False], [2254399, False], [2254394, False]],
                 'depth': 3,
                 'multiple_results': False
             },
@@ -333,7 +333,7 @@ def mock_list_joinable_tables(_table_oid, conn, max_depth):
                     [[2254334, 5], [2254321, 1]],
                     [[2254321, 10], [2254313, 1]]
                 ],
-                'fkey_path': [['2254406', False], ['2254399', False], ['2254389', False]],
+                'fkey_path': [[2254406, False], [2254399, False], [2254389, False]],
                 'depth': 3,
                 'multiple_results': False
             }
@@ -343,7 +343,7 @@ def mock_list_joinable_tables(_table_oid, conn, max_depth):
             'base': 2254329,
             'target': 2254334,
             'join_path': [[[2254329, 2], [2254334, 1]]],
-            'fkey_path': [['2254406', False]],
+            'fkey_path': [[2254406, False]],
             'depth': 1,
             'multiple_results': False
         },
@@ -351,7 +351,7 @@ def mock_list_joinable_tables(_table_oid, conn, max_depth):
             'base': 2254329,
             'target': 2254350,
             'join_path': [[[2254329, 3], [2254350, 1]]],
-            'fkey_path': [['2254411', False]],
+            'fkey_path': [[2254411, False]],
             'depth': 1,
             'multiple_results': False
         },
@@ -359,7 +359,7 @@ def mock_list_joinable_tables(_table_oid, conn, max_depth):
             'base': 2254329,
             'target': 2254321,
             'join_path': [[[2254329, 2], [2254334, 1]], [[2254334, 5], [2254321, 1]]],
-            'fkey_path': [['2254406', False], ['2254399', False]],
+            'fkey_path': [[2254406, False], [2254399, False]],
             'depth': 2,
             'multiple_results': False
         },
@@ -371,7 +371,7 @@ def mock_list_joinable_tables(_table_oid, conn, max_depth):
                 [[2254334, 5], [2254321, 1]],
                 [[2254321, 11], [2254358, 1]]
             ],
-            'fkey_path': [['2254406', False], ['2254399', False], ['2254394', False]],
+            'fkey_path': [[2254406, False], [2254399, False], [2254394, False]],
             'depth': 3,
             'multiple_results': False
         },
@@ -383,7 +383,7 @@ def mock_list_joinable_tables(_table_oid, conn, max_depth):
                 [[2254334, 5], [2254321, 1]],
                 [[2254321, 10], [2254313, 1]]
             ],
-            'fkey_path': [['2254406', False], ['2254399', False], ['2254389', False]],
+            'fkey_path': [[2254406, False], [2254399, False], [2254389, False]],
             'depth': 3,
             'multiple_results': False
         }

From 3240918db1758b1a13b8d87e1d4684ef074596c8 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 10 Jul 2024 18:19:12 +0530
Subject: [PATCH 0393/1141] add drop statement

---
 db/sql/10_msar_joinable_tables.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/sql/10_msar_joinable_tables.sql b/db/sql/10_msar_joinable_tables.sql
index cf51e772a9..eab50b25ec 100644
--- a/db/sql/10_msar_joinable_tables.sql
+++ b/db/sql/10_msar_joinable_tables.sql
@@ -29,6 +29,7 @@ whether to travel from referrer to referant (when False) or from referant to ref
 */
 
 
+DROP TYPE IF EXISTS msar.joinable_tables CASCADE;
 CREATE TYPE msar.joinable_tables AS (
   base integer, -- The OID of the table from which the paths start
   target integer, -- The OID of the table where the paths end

From a7630b9d64d5c57189fcc5f06822202088a32780 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 10 Jul 2024 14:00:26 -0400
Subject: [PATCH 0394/1141] Fix setting of table metadata via RPC

- Rename from patch to set
- Make it work when no metadata record exists yet
- Rename the metadata_dict parameter to metadata
---
 docs/docs/api/rpc.md                         |  6 ++--
 mathesar/models/base.py                      |  8 +++++
 mathesar/rpc/tables/metadata.py              | 32 +++++++++-----------
 mathesar/tests/rpc/tables/test_t_metadata.py | 17 +++++------
 mathesar/tests/rpc/test_endpoints.py         |  4 +--
 mathesar/utils/tables.py                     | 16 ++++------
 6 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 37efba2c64..2ec24382f0 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -80,9 +80,9 @@ To use an RPC function:
     options:
       members:
       - list_
-      - patch
-      - TableMetaData
-      - SettableTableMetaData
+      - set_
+      - TableMetaDataBlob
+      - TableMetaDataRecord
 
 ## Columns
 
diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index 1ea3b0be70..ae6186b486 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -138,3 +138,11 @@ class Meta:
                 name="unique_table_metadata"
             )
         ]
+
+
+table_metadata_fields = {
+    'import_verified',
+    'column_order',
+    'record_summary_customized',
+    'record_summary_template',
+}
diff --git a/mathesar/rpc/tables/metadata.py b/mathesar/rpc/tables/metadata.py
index 2bc28382c8..f477bc44ee 100644
--- a/mathesar/rpc/tables/metadata.py
+++ b/mathesar/rpc/tables/metadata.py
@@ -7,10 +7,10 @@
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
-from mathesar.utils.tables import get_tables_meta_data, patch_table_meta_data
+from mathesar.utils.tables import get_tables_meta_data, set_table_meta_data
 
 
-class TableMetaData(TypedDict):
+class TableMetaDataRecord(TypedDict):
     """
     Metadata for a table in a database.
 
@@ -46,9 +46,9 @@ def from_model(cls, model):
         )
 
 
-class SettableTableMetaData(TypedDict):
+class TableMetaDataBlob(TypedDict):
     """
-    Settable metadata fields for a table in a database.
+    The metadata fields which can be set on a table
 
     Attributes:
         import_verified: Specifies whether a file has been successfully imported into a table.
@@ -65,7 +65,7 @@ class SettableTableMetaData(TypedDict):
 @rpc_method(name="tables.metadata.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def list_(*, database_id: int, **kwargs) -> list[TableMetaData]:
+def list_(*, database_id: int, **kwargs) -> list[TableMetaDataRecord]:
     """
     List metadata associated with tables for a database.
 
@@ -77,26 +77,22 @@ def list_(*, database_id: int, **kwargs) -> list[TableMetaData]:
     """
     table_meta_data = get_tables_meta_data(database_id)
     return [
-        TableMetaData.from_model(model) for model in table_meta_data
+        TableMetaDataRecord.from_model(model) for model in table_meta_data
     ]
 
 
-@rpc_method(name="tables.metadata.patch")
+@rpc_method(name="tables.metadata.set")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def patch(
-    *, table_oid: int, metadata_dict: SettableTableMetaData, database_id: int, **kwargs
-) -> TableMetaData:
+def set_(
+    *, table_oid: int, metadata: TableMetaDataBlob, database_id: int, **kwargs
+) -> TableMetaDataRecord:
     """
-    Alter metadata settings associated with a table for a database.
+    Set metadata for a table.
 
     Args:
-        table_oid: Identity of the table whose metadata we'll modify.
-        metadata_dict: The dict describing desired table metadata alterations.
+        table_oid: The PostgreSQL OID of the table.
+        metadata: A TableMetaDataBlob object describing desired table metadata to set.
         database_id: The Django id of the database containing the table.
-
-    Returns:
-        Altered metadata object.
     """
-    table_meta_data = patch_table_meta_data(table_oid, metadata_dict, database_id)
-    return TableMetaData.from_model(table_meta_data)
+    set_table_meta_data(table_oid, metadata, database_id)
diff --git a/mathesar/tests/rpc/tables/test_t_metadata.py b/mathesar/tests/rpc/tables/test_t_metadata.py
index faad49b703..b7ec9629e2 100644
--- a/mathesar/tests/rpc/tables/test_t_metadata.py
+++ b/mathesar/tests/rpc/tables/test_t_metadata.py
@@ -29,12 +29,12 @@ def mock_get_tables_meta_data(_database_id):
     monkeypatch.setattr(metadata, "get_tables_meta_data", mock_get_tables_meta_data)
 
     expect_metadata_list = [
-        metadata.TableMetaData(
+        metadata.TableMetaDataRecord(
             id=1, database_id=database_id, table_oid=1234,
             import_verified=True, column_order=[8, 9, 10], record_summary_customized=False,
             record_summary_template="{5555}"
         ),
-        metadata.TableMetaData(
+        metadata.TableMetaDataRecord(
             id=2, database_id=database_id, table_oid=4567,
             import_verified=False, column_order=[], record_summary_customized=True,
             record_summary_template="{5512} {1223}"
@@ -44,11 +44,11 @@ def mock_get_tables_meta_data(_database_id):
     assert actual_metadata_list == expect_metadata_list
 
 
-def test_tables_meta_data_patch(monkeypatch):
+def test_tables_meta_data_set(monkeypatch):
     database_id = 2
-    metadata_dict = {'import_verified': True, 'column_order': [1, 4, 12]}
+    metadata_values = {'import_verified': True, 'column_order': [1, 4, 12]}
 
-    def mock_patch_tables_meta_data(table_oid, metadata_dict, _database_id):
+    def mock_set_tables_meta_data(table_oid, metadata, _database_id):
         server_model = Server(id=2, host='example.com', port=5432)
         db_model = Database(id=_database_id, name='mymathesardb', server=server_model)
         return TableMetaData(
@@ -56,12 +56,11 @@ def mock_patch_tables_meta_data(table_oid, metadata_dict, _database_id):
             import_verified=True, column_order=[1, 4, 12], record_summary_customized=False,
             record_summary_template="{5555}"
         )
-    monkeypatch.setattr(metadata, "patch_table_meta_data", mock_patch_tables_meta_data)
+    monkeypatch.setattr(metadata, "set_table_meta_data", mock_set_tables_meta_data)
 
-    expect_metadata_object = metadata.TableMetaData(
+    expect_metadata_object = metadata.TableMetaDataRecord(
         id=1, database_id=database_id, table_oid=1234,
         import_verified=True, column_order=[1, 4, 12], record_summary_customized=False,
         record_summary_template="{5555}"
     )
-    actual_metadata_object = metadata.patch(table_oid=1234, metadata_dict=metadata_dict, database_id=2)
-    assert actual_metadata_object == expect_metadata_object
+    metadata.set_(table_oid=1234, metadata=metadata_values, database_id=2)
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index ca91d17b2e..8527b068ff 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -142,8 +142,8 @@
         [user_is_authenticated]
     ),
     (
-        tables.metadata.patch,
-        "tables.metadata.patch",
+        tables.metadata.set_,
+        "tables.metadata.set",
         [user_is_authenticated]
     )
 ]
diff --git a/mathesar/utils/tables.py b/mathesar/utils/tables.py
index 87d350a20e..ab3c56d1e0 100644
--- a/mathesar/utils/tables.py
+++ b/mathesar/utils/tables.py
@@ -5,7 +5,7 @@
 from mathesar.database.base import create_mathesar_engine
 from mathesar.imports.base import create_table_from_data_file
 from mathesar.models.deprecated import Table
-from mathesar.models.base import TableMetaData
+from mathesar.models.base import Database, TableMetaData, table_metadata_fields
 from mathesar.state.django import reflect_columns_from_tables
 from mathesar.state import get_cached_metadata
 
@@ -90,13 +90,9 @@ def get_tables_meta_data(database_id):
     return TableMetaData.objects.filter(database__id=database_id)
 
 
-def patch_table_meta_data(table_oid, metadata_dict, database_id):
-    metadata_model = TableMetaData.objects.get(database__id=database_id, table_oid=table_oid)
-    alterable_fields = (
-        'import_verified', 'column_order', 'record_summary_customized', 'record_summary_template'
+def set_table_meta_data(table_oid, metadata, database_id):
+    TableMetaData.objects.update_or_create(
+        database=Database.objects.get(id=database_id),
+        table_oid=table_oid,
+        defaults={f: v for f, v in metadata.items() if f in table_metadata_fields}
     )
-    for field, value in metadata_dict.items():
-        if field in alterable_fields:
-            setattr(metadata_model, field, value)
-    metadata_model.save()
-    return metadata_model

From 1625a6b8fa5e47905f0f631dda7b50f07d0c45d4 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 10 Jul 2024 14:17:37 -0400
Subject: [PATCH 0395/1141] Remove default values for table metadata

---
 ...ter_tablemetadata_column_order_and_more.py | 33 +++++++++++++++++++
 mathesar/models/base.py                       |  8 ++---
 2 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 mathesar/migrations/0010_alter_tablemetadata_column_order_and_more.py

diff --git a/mathesar/migrations/0010_alter_tablemetadata_column_order_and_more.py b/mathesar/migrations/0010_alter_tablemetadata_column_order_and_more.py
new file mode 100644
index 0000000000..8c11c8fdf3
--- /dev/null
+++ b/mathesar/migrations/0010_alter_tablemetadata_column_order_and_more.py
@@ -0,0 +1,33 @@
+# Generated by Django 4.2.11 on 2024-07-10 18:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mathesar', '0009_add_column_metadata_model'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='tablemetadata',
+            name='column_order',
+            field=models.JSONField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='tablemetadata',
+            name='import_verified',
+            field=models.BooleanField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='tablemetadata',
+            name='record_summary_customized',
+            field=models.BooleanField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='tablemetadata',
+            name='record_summary_template',
+            field=models.CharField(max_length=255, null=True),
+        ),
+    ]
diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index ae6186b486..a912db0eed 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -126,10 +126,10 @@ class Meta:
 class TableMetaData(BaseModel):
     database = models.ForeignKey('Database', on_delete=models.CASCADE)
     table_oid = models.PositiveBigIntegerField()
-    import_verified = models.BooleanField(default=False)
-    column_order = models.JSONField(default=list)
-    record_summary_customized = models.BooleanField(default=False)
-    record_summary_template = models.CharField(max_length=255, blank=True)
+    import_verified = models.BooleanField(null=True)
+    column_order = models.JSONField(null=True)
+    record_summary_customized = models.BooleanField(null=True)
+    record_summary_template = models.CharField(max_length=255, null=True)
 
     class Meta:
         constraints = [

From 168e8b63638e27896bedbed19eca9a17c3e5bdd9 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 10 Jul 2024 15:06:43 -0400
Subject: [PATCH 0396/1141] Add tables.list_with_metadata RPC method

---
 mathesar/rpc/tables/base.py          | 28 ++++++++++++++++++++++++++++
 mathesar/rpc/tables/metadata.py      |  9 +++++++++
 mathesar/tests/rpc/test_endpoints.py |  5 +++++
 3 files changed, 42 insertions(+)

diff --git a/mathesar/rpc/tables/base.py b/mathesar/rpc/tables/base.py
index 408e6dbff9..30f3710a0a 100644
--- a/mathesar/rpc/tables/base.py
+++ b/mathesar/rpc/tables/base.py
@@ -14,7 +14,9 @@
 from mathesar.rpc.columns import CreatableColumnInfo, SettableColumnInfo, PreviewableColumnInfo
 from mathesar.rpc.constraints import CreatableConstraintInfo
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+from mathesar.rpc.tables.metadata import TableMetaDataBlob
 from mathesar.rpc.utils import connect
+from mathesar.utils.tables import get_tables_meta_data
 
 
 class TableInfo(TypedDict):
@@ -231,3 +233,29 @@ def get_import_preview(
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
         return get_preview(table_oid, columns, conn, limit)
+
+
+@rpc_method(name="tables.list_with_metadata")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def list_with_metadata(*, schema_oid: int, database_id: int, **kwargs) -> list:
+    """
+    List tables in a schema, along with the metadata associated with each table
+
+    Args:
+        schema_oid: PostgreSQL OID of the schema containing the tables.
+        database_id: The Django id of the database containing the table.
+
+    Returns:
+        A list of table details.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        tables = get_table_info(schema_oid, conn)
+
+    metadata_records = get_tables_meta_data(database_id)
+    metadata_map = {
+        r.table_oid: TableMetaDataBlob.from_model(r) for r in metadata_records
+    }
+
+    return [table | {"metadata": metadata_map.get(table["oid"])} for table in tables]
diff --git a/mathesar/rpc/tables/metadata.py b/mathesar/rpc/tables/metadata.py
index f477bc44ee..7ff9926995 100644
--- a/mathesar/rpc/tables/metadata.py
+++ b/mathesar/rpc/tables/metadata.py
@@ -61,6 +61,15 @@ class TableMetaDataBlob(TypedDict):
     record_summary_customized: Optional[bool]
     record_summary_template: Optional[str]
 
+    @classmethod
+    def from_model(cls, model):
+        return cls(
+            import_verified=model.import_verified,
+            column_order=model.column_order,
+            record_summary_customized=model.record_summary_customized,
+            record_summary_template=model.record_summary_template,
+        )
+
 
 @rpc_method(name="tables.metadata.list")
 @http_basic_auth_login_required
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 8527b068ff..1ff2f365d4 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -106,6 +106,11 @@
         "tables.list",
         [user_is_authenticated]
     ),
+    (
+        tables.list_with_metadata,
+        "tables.list_with_metadata",
+        [user_is_authenticated]
+    ),
     (
         tables.get,
         "tables.get",

From 243823f8ce7be40199b4d137ad6b4268da89ec10 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 10 Jul 2024 15:08:25 -0400
Subject: [PATCH 0397/1141] Remove test

---
 mathesar/tests/rpc/tables/test_t_metadata.py | 22 --------------------
 1 file changed, 22 deletions(-)

diff --git a/mathesar/tests/rpc/tables/test_t_metadata.py b/mathesar/tests/rpc/tables/test_t_metadata.py
index b7ec9629e2..c25753ffbc 100644
--- a/mathesar/tests/rpc/tables/test_t_metadata.py
+++ b/mathesar/tests/rpc/tables/test_t_metadata.py
@@ -42,25 +42,3 @@ def mock_get_tables_meta_data(_database_id):
     ]
     actual_metadata_list = metadata.list_(database_id=database_id)
     assert actual_metadata_list == expect_metadata_list
-
-
-def test_tables_meta_data_set(monkeypatch):
-    database_id = 2
-    metadata_values = {'import_verified': True, 'column_order': [1, 4, 12]}
-
-    def mock_set_tables_meta_data(table_oid, metadata, _database_id):
-        server_model = Server(id=2, host='example.com', port=5432)
-        db_model = Database(id=_database_id, name='mymathesardb', server=server_model)
-        return TableMetaData(
-            id=1, database=db_model, table_oid=1234,
-            import_verified=True, column_order=[1, 4, 12], record_summary_customized=False,
-            record_summary_template="{5555}"
-        )
-    monkeypatch.setattr(metadata, "set_table_meta_data", mock_set_tables_meta_data)
-
-    expect_metadata_object = metadata.TableMetaDataRecord(
-        id=1, database_id=database_id, table_oid=1234,
-        import_verified=True, column_order=[1, 4, 12], record_summary_customized=False,
-        record_summary_template="{5555}"
-    )
-    metadata.set_(table_oid=1234, metadata=metadata_values, database_id=2)

From b8d6de5672712ad8a1e1bdeaed801c902a631fd5 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 11 Jul 2024 07:32:06 +0800
Subject: [PATCH 0398/1141] add record getter function in DB

---
 db/sql/00_msar.sql | 79 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 77 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 366b4d2aaa..2038713a56 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3207,8 +3207,7 @@ BEGIN
     $t$,
     -- %1$s  This is a comma separated string of the extracted column names
     string_agg(quote_ident(col_def ->> 'name'), ', '),
-    -- %2$s  This is the name of the original (remainder) table
-    __msar.get_qualified_relation_name(tab_id),
+    -- %2$s  This is the name of the original (remainder) table __msar.get_qualified_relation_name(tab_id),
     -- %3$s  This is the new extracted table name
     __msar.get_qualified_relation_name(extracted_table_id),
     -- %4$I  This is the name of the fkey column in the remainder table.
@@ -3228,3 +3227,79 @@ BEGIN
   RETURN jsonb_build_array(extracted_table_id, fkey_attnum);
 END;
 $f$ LANGUAGE plpgsql;
+
+
+----------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------------------------------------
+-- DQL FUNCTIONS
+--
+-- This set of functions is for getting records from python.
+----------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------------------------------------
+
+
+CREATE OR REPLACE FUNCTION
+msar.sanitize_direction(direction text) RETURNS text AS $$/*
+*/
+SELECT CASE lower(direction)
+  WHEN 'asc' THEN 'ASC'
+  WHEN 'desc' THEN 'DESC'
+END;
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.build_order_by_expr(tab_id oid, order_ jsonb) RETURNS text AS $$/*
+*/
+SELECT 'ORDER BY ' || string_agg(format('%I %s', field, msar.sanitize_direction(direction)), ', ')
+FROM jsonb_to_recordset(order_) AS x(field integer, direction text);
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION
+msar.build_selectable_column_expr(tab_id oid) RETURNS text AS $$/*
+*/
+SELECT string_agg(format('%I AS %I', attname, attnum), ', ')
+FROM pg_catalog.pg_attribute
+WHERE
+  attrelid = tab_id AND attnum > 0 AND has_column_privilege(attrelid, attnum, 'SELECT');
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.get_records_from_table(
+  tab_id oid,
+  limit_ integer,
+  offset_ integer,
+  order_ jsonb,
+  filter_ jsonb,
+  group_ jsonb,
+  search_ jsonb
+) RETURNS jsonb AS $$/*
+*/
+DECLARE
+  records jsonb;
+BEGIN
+  EXECUTE format(
+    $q$
+    WITH count_cte AS (
+      SELECT count(1) AS count FROM %2$I.%3$I
+    ), results_cte AS (
+      SELECT %1$s FROM %2$I.%3$I %6$s LIMIT %4$L OFFSET %5$L
+    )
+    SELECT jsonb_build_object(
+      'results', jsonb_agg(row_to_json(results_cte.*)),
+      'count', max(count_cte.count)
+    )
+    FROM results_cte, count_cte
+    $q$,
+    msar.build_selectable_column_expr(tab_id),
+    msar.get_relation_schema_name(tab_id),
+    msar.get_relation_name(tab_id),
+    limit_,
+    offset_,
+    msar.build_order_by_expr(tab_id, order_)
+  ) INTO records;
+  RETURN records;
+END;
+$$ LANGUAGE plpgsql;

From 90f34f48199de9fa7d9295f8f844059e5b83c54f Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 11 Jul 2024 13:29:59 +0800
Subject: [PATCH 0399/1141] remove field validation from utility function

---
 mathesar/models/base.py  | 8 --------
 mathesar/utils/tables.py | 4 ++--
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index a912db0eed..3781f5d98c 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -138,11 +138,3 @@ class Meta:
                 name="unique_table_metadata"
             )
         ]
-
-
-table_metadata_fields = {
-    'import_verified',
-    'column_order',
-    'record_summary_customized',
-    'record_summary_template',
-}
diff --git a/mathesar/utils/tables.py b/mathesar/utils/tables.py
index ab3c56d1e0..8c0664fa63 100644
--- a/mathesar/utils/tables.py
+++ b/mathesar/utils/tables.py
@@ -5,7 +5,7 @@
 from mathesar.database.base import create_mathesar_engine
 from mathesar.imports.base import create_table_from_data_file
 from mathesar.models.deprecated import Table
-from mathesar.models.base import Database, TableMetaData, table_metadata_fields
+from mathesar.models.base import Database, TableMetaData
 from mathesar.state.django import reflect_columns_from_tables
 from mathesar.state import get_cached_metadata
 
@@ -94,5 +94,5 @@ def set_table_meta_data(table_oid, metadata, database_id):
     TableMetaData.objects.update_or_create(
         database=Database.objects.get(id=database_id),
         table_oid=table_oid,
-        defaults={f: v for f, v in metadata.items() if f in table_metadata_fields}
+        defaults=metadata,
     )

From e2cd90f45ad26524ab4a390df2898c00eeca0cf3 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 11 Jul 2024 16:55:24 +0800
Subject: [PATCH 0400/1141] add functions to make order deterministic

---
 db/sql/00_msar.sql | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 2038713a56..449deeffa0 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3248,12 +3248,39 @@ END;
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION msar.get_pkey_order(tab_id oid) RETURNS jsonb AS $$
+SELECT jsonb_agg(jsonb_build_object('field', f, 'direction', 'asc'))
+FROM pg_constraint, LATERAL unnest(conkey) f WHERE contype='p' AND conrelid=tab_id;
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION msar.get_total_order(tab_id oid) RETURNS jsonb AS $$
+WITH orderable_cte AS (
+  SELECT DISTINCT attnum
+  FROM pg_catalog.pg_attribute
+    INNER JOIN pg_catalog.pg_cast ON atttypid=castsource
+    INNER JOIN pg_catalog.pg_operator ON casttarget=oprleft
+  WHERE attrelid=tab_id AND attnum>0 AND castcontext='i' AND oprname='<'
+  ORDER BY attnum
+)
+SELECT COALESCE(jsonb_agg(jsonb_build_object('field', attnum, 'direction', 'asc')), '[]'::jsonb)
+FROM orderable_cte;
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
 CREATE OR REPLACE FUNCTION
 msar.build_order_by_expr(tab_id oid, order_ jsonb) RETURNS text AS $$/*
 */
 SELECT 'ORDER BY ' || string_agg(format('%I %s', field, msar.sanitize_direction(direction)), ', ')
-FROM jsonb_to_recordset(order_) AS x(field integer, direction text);
-$$ LANGUAGE plpgsql;
+FROM jsonb_to_recordset(
+    COALESCE(
+      COALESCE(order_, '[]'::jsonb) || msar.get_pkey_order(tab_id),
+      COALESCE(order_, '[]'::jsonb) || msar.get_total_order(tab_id)
+    )
+)
+  AS x(field smallint, direction text)
+WHERE has_column_privilege(tab_id, field, 'SELECT');
+$$ LANGUAGE SQL;
 
 
 CREATE OR REPLACE FUNCTION

From 9cf8bbe87d8cd2fb87b19cfed8bc3f2123441317 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 11 Jul 2024 18:13:58 +0530
Subject: [PATCH 0401/1141] add types.list rpc endpoint

---
 config/settings/common_settings.py   |  3 ++-
 mathesar/rpc/types.py                | 35 ++++++++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py |  6 +++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 mathesar/rpc/types.py

diff --git a/config/settings/common_settings.py b/config/settings/common_settings.py
index 51a2786480..77efbb70e7 100644
--- a/config/settings/common_settings.py
+++ b/config/settings/common_settings.py
@@ -72,7 +72,8 @@ def pipe_delim(pipe_string):
     'mathesar.rpc.roles',
     'mathesar.rpc.schemas',
     'mathesar.rpc.tables',
-    'mathesar.rpc.tables.metadata'
+    'mathesar.rpc.tables.metadata',
+    'mathesar.rpc.types'
 ]
 
 TEMPLATES = [
diff --git a/mathesar/rpc/types.py b/mathesar/rpc/types.py
new file mode 100644
index 0000000000..055b885cf3
--- /dev/null
+++ b/mathesar/rpc/types.py
@@ -0,0 +1,35 @@
+"""
+Classes and functions exposed to the RPC endpoint for listing types in a database.
+"""
+
+from typing import Optional, TypedDict
+
+from modernrpc.core import rpc_method
+from modernrpc.auth.basic import http_basic_auth_login_required
+
+from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+from mathesar.database.types import UIType
+from mathesar.api.display_options import DISPLAY_OPTIONS_BY_UI_TYPE
+
+
+class TypeInfo(TypedDict):
+    identifier: str
+    name: str
+    db_types: list
+    display_options: Optional[dict]
+
+    @classmethod
+    def from_dict(cls, type):
+        return cls(
+            identifier=type.id,
+            name=type.display_name,
+            db_types=[db_type.id for db_type in type.db_types],
+            display_options=DISPLAY_OPTIONS_BY_UI_TYPE.get(type, None)
+        )
+
+
+@rpc_method(name="types.list")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def list_() -> TypeInfo:
+    return [TypeInfo.from_dict(type) for type in UIType]
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index ca91d17b2e..b87df24f6e 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -14,6 +14,7 @@
 from mathesar.rpc import roles
 from mathesar.rpc import schemas
 from mathesar.rpc import tables
+from mathesar.rpc import types
 
 METHODS = [
     (
@@ -101,6 +102,11 @@
         "schemas.patch",
         [user_is_authenticated]
     ),
+    (
+        types.list_,
+        "types.list",
+        [user_is_authenticated]
+    ),
     (
         tables.list_,
         "tables.list",

From ae64517f308767faed6f991a8ff16dc6e2e2e300 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 11 Jul 2024 18:34:45 +0530
Subject: [PATCH 0402/1141] add docstrings

---
 docs/docs/api/rpc.md  |  8 ++++++++
 mathesar/rpc/types.py | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 37efba2c64..eab7f37785 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -111,6 +111,14 @@ To use an RPC function:
       - ColumnMetaData
       - SettableColumnMetaData
 
+## Types
+
+::: types
+    options:
+      members:
+      - list_
+      - TypeInfo
+
 ## Constraints
 
 ::: constraints
diff --git a/mathesar/rpc/types.py b/mathesar/rpc/types.py
index 055b885cf3..970d357408 100644
--- a/mathesar/rpc/types.py
+++ b/mathesar/rpc/types.py
@@ -13,6 +13,15 @@
 
 
 class TypeInfo(TypedDict):
+    """
+    Information about a type.
+
+    Attributes:
+        identifier: Specifies the type class that db_type(s) belongs to.
+        name: Specifies the UI name for a type class.
+        db_types: Specifies the name(s) of types present on the database.
+        display_options: Specifies metadata related to a type class.
+    """
     identifier: str
     name: str
     db_types: list
@@ -32,4 +41,7 @@ def from_dict(cls, type):
 @http_basic_auth_login_required
 @handle_rpc_exceptions
 def list_() -> TypeInfo:
+    """
+    List information about types available on the database. Exposed as `list`.
+    """
     return [TypeInfo.from_dict(type) for type in UIType]

From fb5b48707bcdf6eb1e44da1d4b37c5114d3343ba Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 11 Jul 2024 18:36:42 +0530
Subject: [PATCH 0403/1141] fix the return type

---
 mathesar/rpc/types.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/rpc/types.py b/mathesar/rpc/types.py
index 970d357408..016b59b7a7 100644
--- a/mathesar/rpc/types.py
+++ b/mathesar/rpc/types.py
@@ -40,7 +40,7 @@ def from_dict(cls, type):
 @rpc_method(name="types.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def list_() -> TypeInfo:
+def list_() -> list[TypeInfo]:
     """
     List information about types available on the database. Exposed as `list`.
     """

From 3396114bd98f0898b93943ea5c8c75b3fbc6ee67 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 11 Jul 2024 09:39:09 -0400
Subject: [PATCH 0404/1141] Fix return type annotation

---
 mathesar/rpc/tables/metadata.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/rpc/tables/metadata.py b/mathesar/rpc/tables/metadata.py
index 7ff9926995..7a6481b81b 100644
--- a/mathesar/rpc/tables/metadata.py
+++ b/mathesar/rpc/tables/metadata.py
@@ -95,7 +95,7 @@ def list_(*, database_id: int, **kwargs) -> list[TableMetaDataRecord]:
 @handle_rpc_exceptions
 def set_(
     *, table_oid: int, metadata: TableMetaDataBlob, database_id: int, **kwargs
-) -> TableMetaDataRecord:
+) -> None:
     """
     Set metadata for a table.
 

From 022819f453100fd995375a0340451efcc77309e1 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 11 Jul 2024 19:32:14 +0530
Subject: [PATCH 0405/1141] Add servers.list endpoint

---
 config/settings/common_settings.py   |  1 +
 docs/docs/api/rpc.md                 |  8 +++++
 mathesar/rpc/servers.py              | 44 ++++++++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py |  6 ++++
 4 files changed, 59 insertions(+)
 create mode 100644 mathesar/rpc/servers.py

diff --git a/config/settings/common_settings.py b/config/settings/common_settings.py
index f116f98f15..3309363645 100644
--- a/config/settings/common_settings.py
+++ b/config/settings/common_settings.py
@@ -73,6 +73,7 @@ def pipe_delim(pipe_string):
     'mathesar.rpc.databases',
     'mathesar.rpc.roles',
     'mathesar.rpc.schemas',
+    'mathesar.rpc.servers',
     'mathesar.rpc.tables',
     'mathesar.rpc.tables.metadata'
 ]
diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index d5733d843d..36f9326cd7 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -151,6 +151,14 @@ To use an RPC function:
       - RoleInfo
       - RoleMember
 
+## Servers
+
+::: servers
+    options:
+      members:
+      - list_
+      - ServerInfo
+
 ## Responses
 
 ### Success
diff --git a/mathesar/rpc/servers.py b/mathesar/rpc/servers.py
new file mode 100644
index 0000000000..71602e9a39
--- /dev/null
+++ b/mathesar/rpc/servers.py
@@ -0,0 +1,44 @@
+from typing import TypedDict
+
+from modernrpc.core import rpc_method
+from modernrpc.auth.basic import http_basic_auth_login_required
+
+from mathesar.models.base import Server
+from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+
+
+class ServerInfo(TypedDict):
+    """
+    Information about a database server.
+
+    Attributes:
+        id: the Django ID of the server model instance.
+        host: The host of the database server.
+        port: the port of the database server.
+    """
+    id: int
+    host: str
+    port: int
+
+    @classmethod
+    def from_model(cls, model):
+        return cls(
+            id=model.id,
+            host=model.host,
+            port=model.port
+        )
+
+
+@rpc_method(name="servers.list")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def list_() -> list[ServerInfo]:
+    """
+    List information about servers. Exposed as `list`.
+
+    Returns:
+        A list of server details.
+    """
+    server_qs = Server.objects.all()
+
+    return [ServerInfo.from_model(db_model) for db_model in server_qs]
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 87db102c57..9f619c11ef 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -15,6 +15,7 @@
 from mathesar.rpc import databases
 from mathesar.rpc import roles
 from mathesar.rpc import schemas
+from mathesar.rpc import servers
 from mathesar.rpc import tables
 
 METHODS = [
@@ -118,6 +119,11 @@
         "schemas.patch",
         [user_is_authenticated]
     ),
+    (
+        servers.list_,
+        "servers.list",
+        [user_is_authenticated]
+    ),
     (
         tables.list_,
         "tables.list",

From b72436d8ecb5f7e43dec6efbcb17da30d88513ed Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 11 Jul 2024 20:02:11 +0530
Subject: [PATCH 0406/1141] fix install script

---
 mathesar/install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/install.py b/mathesar/install.py
index e026bd9591..74c2c8c482 100644
--- a/mathesar/install.py
+++ b/mathesar/install.py
@@ -42,7 +42,6 @@ def main(skip_static_collection=False):
 def install_on_db_with_key(database_key, skip_confirm):
     from mathesar.models.deprecated import Connection
     db_model = Connection.create_from_settings_key(database_key)
-    db_model.save()
     try:
         install.install_mathesar(
             database_name=db_model.db_name,
@@ -55,6 +54,7 @@ def install_on_db_with_key(database_key, skip_confirm):
     except OperationalError as e:
         db_model.delete()
         raise e
+    db_model.save()
 
 
 if __name__ == "__main__":

From 4196340f32920a9b0fa8622de50bb8aa597a0587 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 11 Jul 2024 20:36:09 +0530
Subject: [PATCH 0407/1141] Add endpoint for listing collaborators

---
 config/settings/common_settings.py     |  1 +
 docs/docs/api/rpc.md                   |  8 ++++
 mathesar/rpc/collaborators/__init__.py |  1 +
 mathesar/rpc/collaborators/base.py     | 55 ++++++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py   |  6 +++
 5 files changed, 71 insertions(+)
 create mode 100644 mathesar/rpc/collaborators/__init__.py
 create mode 100644 mathesar/rpc/collaborators/base.py

diff --git a/config/settings/common_settings.py b/config/settings/common_settings.py
index 3309363645..be2ed7edb1 100644
--- a/config/settings/common_settings.py
+++ b/config/settings/common_settings.py
@@ -65,6 +65,7 @@ def pipe_delim(pipe_string):
 ROOT_URLCONF = "config.urls"
 
 MODERNRPC_METHODS_MODULES = [
+    'mathesar.rpc.collaborators',
     'mathesar.rpc.connections',
     'mathesar.rpc.constraints',
     'mathesar.rpc.columns',
diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 36f9326cd7..08be0e398d 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -37,6 +37,14 @@ To use an RPC function:
     }
     ```
 
+## Collaborators
+
+::: collaborators
+    options:
+      members:
+      - list_
+      - CollaboratorInfo
+
 ## Connections
 
 ::: connections
diff --git a/mathesar/rpc/collaborators/__init__.py b/mathesar/rpc/collaborators/__init__.py
new file mode 100644
index 0000000000..4b40b38c84
--- /dev/null
+++ b/mathesar/rpc/collaborators/__init__.py
@@ -0,0 +1 @@
+from .base import *  # noqa
diff --git a/mathesar/rpc/collaborators/base.py b/mathesar/rpc/collaborators/base.py
new file mode 100644
index 0000000000..b7393b54d5
--- /dev/null
+++ b/mathesar/rpc/collaborators/base.py
@@ -0,0 +1,55 @@
+from typing import TypedDict
+
+from modernrpc.core import rpc_method
+from modernrpc.auth.basic import http_basic_auth_login_required
+
+from mathesar.models.base import UserDatabaseRoleMap
+from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+
+
+class CollaboratorInfo(TypedDict):
+    """
+    Information about a collaborator.
+
+    Attributes:
+        id: the Django ID of the UserDatabaseRoleMap model instance.
+        user_id: The Django ID of the User model instance of the collaborator.
+        database_id: the Django ID of the Database model instance for the collaborator.
+        role_id: The Django ID of the Role model instance for the collaborator.
+    """
+    id: int
+    user_id: int
+    database_id: int
+    role_id: int
+
+    @classmethod
+    def from_model(cls, model):
+        return cls(
+            id=model.id,
+            user_id=model.user.id,
+            database_id=model.database.id,
+            role_id=model.role.id
+        )
+
+
+@rpc_method(name="collaborators.list")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def list_(*, database_id: int = None, **kwargs) -> list[CollaboratorInfo]:
+    """
+    List information about collaborators. Exposed as `list`.
+
+    If called with no `database_id`, all collaborators for all databases are listed.
+
+    Args:
+        database_id: The Django id of the database associated with the collaborators.
+
+    Returns:
+        A list of collaborators.
+    """
+    if database_id is not None:
+        user_database_role_map_qs = UserDatabaseRoleMap.objects.filter(database__id=database_id)
+    else:
+        user_database_role_map_qs = UserDatabaseRoleMap.objects.all()
+
+    return [CollaboratorInfo.from_model(db_model) for db_model in user_database_role_map_qs]
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 9f619c11ef..8f0192ec7d 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -8,6 +8,7 @@
 import pytest
 from modernrpc.auth import user_is_authenticated, user_is_superuser
 
+from mathesar.rpc import collaborators
 from mathesar.rpc import columns
 from mathesar.rpc import connections
 from mathesar.rpc import constraints
@@ -19,6 +20,11 @@
 from mathesar.rpc import tables
 
 METHODS = [
+    (
+        collaborators.list_,
+        "collaborators.list",
+        [user_is_authenticated]
+    ),
     (
         columns.delete,
         "columns.delete",

From c1784dd80fd7272415c41f6052e1e6d8e3edf865 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 11 Jul 2024 20:51:07 +0530
Subject: [PATCH 0408/1141] Make rpc/collaborators an individual file instead
 of a module

---
 mathesar/rpc/{collaborators/base.py => collaborators.py} | 0
 mathesar/rpc/collaborators/__init__.py                   | 1 -
 2 files changed, 1 deletion(-)
 rename mathesar/rpc/{collaborators/base.py => collaborators.py} (100%)
 delete mode 100644 mathesar/rpc/collaborators/__init__.py

diff --git a/mathesar/rpc/collaborators/base.py b/mathesar/rpc/collaborators.py
similarity index 100%
rename from mathesar/rpc/collaborators/base.py
rename to mathesar/rpc/collaborators.py
diff --git a/mathesar/rpc/collaborators/__init__.py b/mathesar/rpc/collaborators/__init__.py
deleted file mode 100644
index 4b40b38c84..0000000000
--- a/mathesar/rpc/collaborators/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from .base import *  # noqa

From 4aa6a5cdeae6f930c3051b1a65d4e363e57f4c44 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 12 Jul 2024 00:15:10 +0530
Subject: [PATCH 0409/1141] Implement collaborators add, delete, and set_role 
 endpoints

---
 mathesar/rpc/collaborators.py | 72 ++++++++++++++++++++++++++++++++++-
 1 file changed, 70 insertions(+), 2 deletions(-)

diff --git a/mathesar/rpc/collaborators.py b/mathesar/rpc/collaborators.py
index b7393b54d5..27e683cb6b 100644
--- a/mathesar/rpc/collaborators.py
+++ b/mathesar/rpc/collaborators.py
@@ -1,9 +1,10 @@
 from typing import TypedDict
 
 from modernrpc.core import rpc_method
-from modernrpc.auth.basic import http_basic_auth_login_required
+from modernrpc.auth.basic import http_basic_auth_login_required, http_basic_auth_superuser_required
 
-from mathesar.models.base import UserDatabaseRoleMap
+from mathesar.models.base import UserDatabaseRoleMap, Database, Role
+from mathesar.models.users import User
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 
 
@@ -53,3 +54,70 @@ def list_(*, database_id: int = None, **kwargs) -> list[CollaboratorInfo]:
         user_database_role_map_qs = UserDatabaseRoleMap.objects.all()
 
     return [CollaboratorInfo.from_model(db_model) for db_model in user_database_role_map_qs]
+
+
+@rpc_method(name='collaborators.add')
+@http_basic_auth_superuser_required
+@handle_rpc_exceptions
+def add(
+        *,
+        database_id: int,
+        user_id: int,
+        role_id: int,
+        **kwargs
+) -> CollaboratorInfo:
+    """
+    Set up a new collaborator for a database.
+
+    Args:
+        database_id: The Django id of the Database to associate with the collaborator.
+        user_id: The Django id of the User who'd be the collaborator.
+        role_id: The Django id of the Role to associate with the collaborator.
+    """
+    database = Database.objects.get(id=database_id)
+    user = User.objects.get(id=user_id)
+    role = Role.objects.get(id=role_id)
+    collaborator = UserDatabaseRoleMap.objects.create(
+        database=database,
+        user=user,
+        role=role,
+        server=role.server
+    )
+    return CollaboratorInfo.from_model(collaborator)
+
+
+@rpc_method(name='collaborators.delete')
+@http_basic_auth_superuser_required
+@handle_rpc_exceptions
+def delete(*, collaborator_id: int, **kwargs):
+    """
+    Delete a collaborator from a database.
+
+    Args:
+        collaborator_id: The Django id of the UserDatabaseRoleMap model instance of the collaborator.
+    """
+    collaborator = UserDatabaseRoleMap.objects.get(id=collaborator_id)
+    collaborator.delete()
+
+
+@rpc_method(name='collaborators.set_role')
+@http_basic_auth_superuser_required
+@handle_rpc_exceptions
+def set_role(
+        *,
+        collaborator_id: int,
+        role_id: int,
+        **kwargs
+) -> CollaboratorInfo:
+    """
+    Set the role of a collaborator for a database.
+
+    Args:
+        collaborator_id: The Django id of the UserDatabaseRoleMap model instance of the collaborator.
+        role_id: The Django id of the Role to associate with the collaborator.
+    """
+    collaborator = UserDatabaseRoleMap.objects.get(id=collaborator_id)
+    role = Role.objects.get(id=role_id)
+    collaborator.role = role
+    collaborator.save()
+    return CollaboratorInfo.from_model(collaborator)

From 56a1fa3636c69a181519130e7301adf77a3a31c9 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 12 Jul 2024 00:23:50 +0530
Subject: [PATCH 0410/1141] Add endpoint tests and docs for collaborators

---
 docs/docs/api/rpc.md                 |  3 +++
 mathesar/tests/rpc/test_endpoints.py | 15 +++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 08be0e398d..926d080540 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -43,6 +43,9 @@ To use an RPC function:
     options:
       members:
       - list_
+      - add
+      - delete
+      - set_role
       - CollaboratorInfo
 
 ## Connections
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 8f0192ec7d..3d2e7cfe4a 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -20,11 +20,26 @@
 from mathesar.rpc import tables
 
 METHODS = [
+    (
+        collaborators.add,
+        "collaborators.add",
+        [user_is_superuser]
+    ),
+    (
+        collaborators.delete,
+        "collaborators.delete",
+        [user_is_superuser]
+    ),
     (
         collaborators.list_,
         "collaborators.list",
         [user_is_authenticated]
     ),
+    (
+        collaborators.set_role,
+        "collaborators.set_role",
+        [user_is_superuser]
+    ),
     (
         columns.delete,
         "columns.delete",

From 8eba96332d8227f2103b1342d7039ce0acce92a8 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 12 Jul 2024 01:04:34 +0530
Subject: [PATCH 0411/1141] Rename Role model to ConfiguredRole

---
 .../0011_rename_role_configuredrole.py          | 17 +++++++++++++++++
 mathesar/models/base.py                         |  4 ++--
 mathesar/rpc/collaborators.py                   | 14 +++++++-------
 mathesar/tests/rpc/test_database_setup.py       |  6 +++---
 mathesar/utils/permissions.py                   |  4 ++--
 5 files changed, 31 insertions(+), 14 deletions(-)
 create mode 100644 mathesar/migrations/0011_rename_role_configuredrole.py

diff --git a/mathesar/migrations/0011_rename_role_configuredrole.py b/mathesar/migrations/0011_rename_role_configuredrole.py
new file mode 100644
index 0000000000..752d6012be
--- /dev/null
+++ b/mathesar/migrations/0011_rename_role_configuredrole.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.11 on 2024-07-11 19:32
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mathesar', '0010_alter_tablemetadata_column_order_and_more'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='Role',
+            new_name='ConfiguredRole',
+        ),
+    ]
diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index 3781f5d98c..98f1d2829b 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -40,7 +40,7 @@ class Meta:
         ]
 
 
-class Role(BaseModel):
+class ConfiguredRole(BaseModel):
     name = models.CharField(max_length=255)
     server = models.ForeignKey(
         'Server', on_delete=models.CASCADE, related_name='roles'
@@ -61,7 +61,7 @@ class Meta:
 class UserDatabaseRoleMap(BaseModel):
     user = models.ForeignKey('User', on_delete=models.CASCADE)
     database = models.ForeignKey('Database', on_delete=models.CASCADE)
-    role = models.ForeignKey('Role', on_delete=models.CASCADE)
+    role = models.ForeignKey('ConfiguredRole', on_delete=models.CASCADE)
     server = models.ForeignKey('Server', on_delete=models.CASCADE)
 
     class Meta:
diff --git a/mathesar/rpc/collaborators.py b/mathesar/rpc/collaborators.py
index 27e683cb6b..1851d03051 100644
--- a/mathesar/rpc/collaborators.py
+++ b/mathesar/rpc/collaborators.py
@@ -3,7 +3,7 @@
 from modernrpc.core import rpc_method
 from modernrpc.auth.basic import http_basic_auth_login_required, http_basic_auth_superuser_required
 
-from mathesar.models.base import UserDatabaseRoleMap, Database, Role
+from mathesar.models.base import UserDatabaseRoleMap, Database, ConfiguredRole
 from mathesar.models.users import User
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 
@@ -16,7 +16,7 @@ class CollaboratorInfo(TypedDict):
         id: the Django ID of the UserDatabaseRoleMap model instance.
         user_id: The Django ID of the User model instance of the collaborator.
         database_id: the Django ID of the Database model instance for the collaborator.
-        role_id: The Django ID of the Role model instance for the collaborator.
+        role_id: The Django ID of the ConfiguredRole model instance for the collaborator.
     """
     id: int
     user_id: int
@@ -71,12 +71,12 @@ def add(
 
     Args:
         database_id: The Django id of the Database to associate with the collaborator.
-        user_id: The Django id of the User who'd be the collaborator.
-        role_id: The Django id of the Role to associate with the collaborator.
+        user_id: The Django id of the User model instance who'd be the collaborator.
+        role_id: The Django id of the ConfiguredRole model instance to associate with the collaborator.
     """
     database = Database.objects.get(id=database_id)
     user = User.objects.get(id=user_id)
-    role = Role.objects.get(id=role_id)
+    role = ConfiguredRole.objects.get(id=role_id)
     collaborator = UserDatabaseRoleMap.objects.create(
         database=database,
         user=user,
@@ -114,10 +114,10 @@ def set_role(
 
     Args:
         collaborator_id: The Django id of the UserDatabaseRoleMap model instance of the collaborator.
-        role_id: The Django id of the Role to associate with the collaborator.
+        role_id: The Django id of the ConfiguredRole model instance to associate with the collaborator.
     """
     collaborator = UserDatabaseRoleMap.objects.get(id=collaborator_id)
-    role = Role.objects.get(id=role_id)
+    role = ConfiguredRole.objects.get(id=role_id)
     collaborator.role = role
     collaborator.save()
     return CollaboratorInfo.from_model(collaborator)
diff --git a/mathesar/tests/rpc/test_database_setup.py b/mathesar/tests/rpc/test_database_setup.py
index 1e30679fbd..e77cd92b8d 100644
--- a/mathesar/tests/rpc/test_database_setup.py
+++ b/mathesar/tests/rpc/test_database_setup.py
@@ -6,7 +6,7 @@
     monkeypatch(pytest): Lets you monkeypatch an object for testing.
 """
 from mathesar.models.users import User
-from mathesar.models.base import Database, Role, Server, UserDatabaseRoleMap
+from mathesar.models.base import Database, ConfiguredRole, Server, UserDatabaseRoleMap
 from mathesar.rpc import database_setup
 
 
@@ -25,7 +25,7 @@ def mock_set_up_new_for_user(database, user, sample_data=[]):
             raise AssertionError("incorrect parameters passed")
         server_model = Server(id=2, host="example.com", port=5432)
         db_model = Database(id=3, name=test_database, server=server_model)
-        role_model = Role(id=4, name="matheuser", server=server_model)
+        role_model = ConfiguredRole(id=4, name="matheuser", server=server_model)
         return UserDatabaseRoleMap(
             user=user, database=db_model, role=role_model, server=server_model
         )
@@ -70,7 +70,7 @@ def mock_set_up_preexisting_database_for_user(
             raise AssertionError("incorrect parameters passed")
         server_model = Server(id=2, host="example.com", port=5432)
         db_model = Database(id=3, name=test_database, server=server_model)
-        role_model = Role(id=4, name="matheuser", server=server_model)
+        role_model = ConfiguredRole(id=4, name="matheuser", server=server_model)
         return UserDatabaseRoleMap(
             user=user, database=db_model, role=role_model, server=server_model
         )
diff --git a/mathesar/utils/permissions.py b/mathesar/utils/permissions.py
index 1c3ae45d82..b3beee022e 100644
--- a/mathesar/utils/permissions.py
+++ b/mathesar/utils/permissions.py
@@ -5,7 +5,7 @@
 from db.install import install_mathesar
 from mathesar.examples.library_dataset import load_library_dataset
 from mathesar.examples.movies_dataset import load_movies_dataset
-from mathesar.models.base import Server, Database, Role, UserDatabaseRoleMap
+from mathesar.models.base import Server, Database, ConfiguredRole, UserDatabaseRoleMap
 from mathesar.models.deprecated import Connection
 from mathesar.models.users import User
 from mathesar.utils.connections import BadInstallationTarget
@@ -90,7 +90,7 @@ def _setup_connection_models(
     database, _ = Database.objects.get_or_create(
         name=database_name, server=server
     )
-    role, _ = Role.objects.get_or_create(
+    role, _ = ConfiguredRole.objects.get_or_create(
         name=role_name,
         server=server,
         defaults={"password": password},

From badf3d1813d415d58bd7fd77ce53ab4cc148c639 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 12 Jul 2024 01:35:13 +0530
Subject: [PATCH 0412/1141] Add endpoints for configured_roles

---
 config/settings/common_settings.py   |   1 +
 mathesar/rpc/configured_roles.py     | 109 +++++++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py |  21 ++++++
 3 files changed, 131 insertions(+)
 create mode 100644 mathesar/rpc/configured_roles.py

diff --git a/config/settings/common_settings.py b/config/settings/common_settings.py
index be2ed7edb1..3d47107fb5 100644
--- a/config/settings/common_settings.py
+++ b/config/settings/common_settings.py
@@ -66,6 +66,7 @@ def pipe_delim(pipe_string):
 
 MODERNRPC_METHODS_MODULES = [
     'mathesar.rpc.collaborators',
+    'mathesar.rpc.configured_roles',
     'mathesar.rpc.connections',
     'mathesar.rpc.constraints',
     'mathesar.rpc.columns',
diff --git a/mathesar/rpc/configured_roles.py b/mathesar/rpc/configured_roles.py
new file mode 100644
index 0000000000..3943e39cca
--- /dev/null
+++ b/mathesar/rpc/configured_roles.py
@@ -0,0 +1,109 @@
+from typing import TypedDict
+
+from modernrpc.core import rpc_method
+from modernrpc.auth.basic import http_basic_auth_login_required, http_basic_auth_superuser_required
+
+from mathesar.models.base import ConfiguredRole, Server
+from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+
+
+class ConfiguredRoleInfo(TypedDict):
+    """
+    Information about a role configured in Mathesar.
+
+    Attributes:
+        id: the Django ID of the ConfiguredRole model instance.
+        name: The name of the role.
+        server: The Django ID of the Server model instance for the role.
+    """
+    id: int
+    name: str
+    server_id: int
+
+    @classmethod
+    def from_model(cls, model):
+        return cls(
+            id=model.id,
+            name=model.name,
+            server_id=model.server.id
+        )
+
+
+@rpc_method(name="configured_roles.list")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def list_(*, server_id: int, **kwargs) -> list[ConfiguredRoleInfo]:
+    """
+    List information about roles configured in Mathesar. Exposed as `list`.
+
+    Args:
+        server_id: The Django id of the Server containing the configured roles.
+
+    Returns:
+        A list of configured roles.
+    """
+    configured_role_qs = ConfiguredRole.objects.filter(server__id=server_id)
+
+    return [ConfiguredRoleInfo.from_model(db_model) for db_model in configured_role_qs]
+
+
+@rpc_method(name='configured_roles.add')
+@http_basic_auth_superuser_required
+@handle_rpc_exceptions
+def add(
+        *,
+        server_id: str,
+        name: str,
+        password: str,
+        **kwargs
+) -> ConfiguredRoleInfo:
+    """
+    Configure a role in Mathesar for a database server.
+
+    Args:
+        server_id: The Django id of the Server to contain the configured role.
+        name: The name of the role.
+        password: The password for the role.
+    """
+    server = Server.objects.get(id=server_id)
+    configured_role = ConfiguredRole.objects.create(
+        server=server,
+        name=name,
+        password=password
+    )
+    return ConfiguredRoleInfo.from_model(configured_role)
+
+
+@rpc_method(name='configured_roles.delete')
+@http_basic_auth_superuser_required
+@handle_rpc_exceptions
+def delete(*, configured_role_id: int, **kwargs):
+    """
+    Delete a configured role for a server.
+
+    Args:
+        configured_role_id: The Django id of the ConfiguredRole model instance.
+    """
+    configured_role = ConfiguredRole.objects.get(id=configured_role_id)
+    configured_role.delete()
+
+
+@rpc_method(name='configured_roles.set_password')
+@http_basic_auth_superuser_required
+@handle_rpc_exceptions
+def set_password(
+        *,
+        configured_role_id: int,
+        password: str,
+        **kwargs
+):
+    """
+    Set the password of a configured role for a server.
+
+    Args:
+        configured_role_id: The Django id of the ConfiguredRole model instance.
+        password: The password for the role.
+    """
+    configured_role = ConfiguredRole.objects.get(id=configured_role_id)
+    configured_role.password = password
+    configured_role.save()
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index e7e413e90c..938ca9b2d5 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -10,6 +10,7 @@
 
 from mathesar.rpc import collaborators
 from mathesar.rpc import columns
+from mathesar.rpc import configured_roles
 from mathesar.rpc import connections
 from mathesar.rpc import constraints
 from mathesar.rpc import database_setup
@@ -70,6 +71,26 @@
         "columns.metadata.patch",
         [user_is_authenticated]
     ),
+    (
+        configured_roles.add,
+        "configured_roles.add",
+        [user_is_superuser]
+    ),
+    (
+        configured_roles.list_,
+        "configured_roles.list",
+        [user_is_authenticated]
+    ),
+    (
+        configured_roles.delete,
+        "configured_roles.delete",
+        [user_is_superuser]
+    ),
+    (
+        configured_roles.set_password,
+        "configured_roles.set_password",
+        [user_is_superuser]
+    ),
     (
         connections.add_from_known_connection,
         "connections.add_from_known_connection",

From 7233cd96271eb128c2d48bce1c80907c539f4508 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 12 Jul 2024 01:36:36 +0530
Subject: [PATCH 0413/1141] Add docs for ConfiguredRoles

---
 docs/docs/api/rpc.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 36369c57f3..9af62f0141 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -48,6 +48,17 @@ To use an RPC function:
       - set_role
       - CollaboratorInfo
 
+## ConfiguredRoles
+
+::: configured_roles
+    options:
+      members:
+      - list_
+      - add
+      - delete
+      - set_password
+      - ConfiguredRoleInfo
+
 ## Connections
 
 ::: connections

From 75f20c43e462e679ea9d3fd2798332c2cbc2ff6e Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 12 Jul 2024 14:01:37 +0800
Subject: [PATCH 0414/1141] improve documentation, change field -> attnum

---
 db/sql/00_msar.sql | 41 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 449deeffa0..e6a4216c06 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3249,7 +3249,7 @@ $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION msar.get_pkey_order(tab_id oid) RETURNS jsonb AS $$
-SELECT jsonb_agg(jsonb_build_object('field', f, 'direction', 'asc'))
+SELECT jsonb_agg(jsonb_build_object('attnum', f, 'direction', 'asc'))
 FROM pg_constraint, LATERAL unnest(conkey) f WHERE contype='p' AND conrelid=tab_id;
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
@@ -3263,28 +3263,46 @@ WITH orderable_cte AS (
   WHERE attrelid=tab_id AND attnum>0 AND castcontext='i' AND oprname='<'
   ORDER BY attnum
 )
-SELECT COALESCE(jsonb_agg(jsonb_build_object('field', attnum, 'direction', 'asc')), '[]'::jsonb)
+SELECT COALESCE(jsonb_agg(jsonb_build_object('attnum', attnum, 'direction', 'asc')), '[]'::jsonb)
 FROM orderable_cte;
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
 msar.build_order_by_expr(tab_id oid, order_ jsonb) RETURNS text AS $$/*
+Build an ORDER BY expression for the given table and order JSON.
+
+The ORDER BY expression will refer to columns by their attnum. This is designed to work together
+with `msar.build_selectable_column_expr`. It will only use the columns to which the user has access.
+Finally, this function will append either a primary key, or all columns to the produced ORDER BY so
+the resulting ordering is totally defined (i.e., deterministic).
+
+Args:
+  tab_id: The OID of the table whose columns we'll order by.
 */
-SELECT 'ORDER BY ' || string_agg(format('%I %s', field, msar.sanitize_direction(direction)), ', ')
+SELECT 'ORDER BY ' || string_agg(format('%I %s', attnum, msar.sanitize_direction(direction)), ', ')
 FROM jsonb_to_recordset(
     COALESCE(
       COALESCE(order_, '[]'::jsonb) || msar.get_pkey_order(tab_id),
       COALESCE(order_, '[]'::jsonb) || msar.get_total_order(tab_id)
     )
 )
-  AS x(field smallint, direction text)
-WHERE has_column_privilege(tab_id, field, 'SELECT');
+  AS x(attnum smallint, direction text)
+WHERE has_column_privilege(tab_id, attnum, 'SELECT');
 $$ LANGUAGE SQL;
 
 
 CREATE OR REPLACE FUNCTION
 msar.build_selectable_column_expr(tab_id oid) RETURNS text AS $$/*
+Build an SQL select-target expression of only columns to which the user has access.
+
+Given columns with attnums 2, 3, and 4, and assuming the user has access only to columns 2 and 4,
+this function will return an expression of the form:
+
+column_name AS "2", another_column_name AS "4"
+
+Args:
+  tab_id: The OID of the table containing the columns to select.
 */
 SELECT string_agg(format('%I AS %I', attname, attnum), ', ')
 FROM pg_catalog.pg_attribute
@@ -3303,6 +3321,19 @@ msar.get_records_from_table(
   group_ jsonb,
   search_ jsonb
 ) RETURNS jsonb AS $$/*
+Get records from a table. Only columns to which the user has access are returned.
+
+Args:
+  tab_id: The OID of the table whose records we'll get
+  limit_: The maximum number of rows we'll return
+  offset_: The number of rows to skip before returning records from following rows.
+  order_: An array of ordering definition objects.
+  filter_: An array of filter definition objects.
+  group_: An array of group definition objects.
+  search_: An array of search definition objects.
+
+The order definition objects should have the form
+  {"attnum": <int>, "direction": <text>}
 */
 DECLARE
   records jsonb;

From 67c70a176099e985751827681417e96ccb4bf1ef Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 12 Jul 2024 14:02:58 +0800
Subject: [PATCH 0415/1141] fix linting mistake made by GH editor

---
 mathesar/rpc/tables/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/rpc/tables/base.py b/mathesar/rpc/tables/base.py
index 62b553fa8d..8b076a94e5 100644
--- a/mathesar/rpc/tables/base.py
+++ b/mathesar/rpc/tables/base.py
@@ -331,4 +331,4 @@ def list_with_metadata(*, schema_oid: int, database_id: int, **kwargs) -> list:
         r.table_oid: TableMetaDataBlob.from_model(r) for r in metadata_records
     }
 
-    return [table | {"metadata": metadata_map.get(table["oid"])} for table in tables]
\ No newline at end of file
+    return [table | {"metadata": metadata_map.get(table["oid"])} for table in tables]

From 0f7d96073c5113326aeb48cb788c637a2c4fb3a2 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 12 Jul 2024 15:49:36 +0800
Subject: [PATCH 0416/1141] fix column extraction bug, rename to 'list'

---
 db/sql/00_msar.sql | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index ceb4bfff53..0ff571226d 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3207,7 +3207,8 @@ BEGIN
     $t$,
     -- %1$s  This is a comma separated string of the extracted column names
     string_agg(quote_ident(col_def ->> 'name'), ', '),
-    -- %2$s  This is the name of the original (remainder) table __msar.get_qualified_relation_name(tab_id),
+    -- %2$s  This is the name of the original (remainder) table
+    __msar.get_qualified_relation_name(tab_id),
     -- %3$s  This is the new extracted table name
     __msar.get_qualified_relation_name(extracted_table_id),
     -- %4$I  This is the name of the fkey column in the remainder table.
@@ -3249,8 +3250,9 @@ $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION msar.get_pkey_order(tab_id oid) RETURNS jsonb AS $$
-SELECT jsonb_agg(jsonb_build_object('attnum', f, 'direction', 'asc'))
-FROM pg_constraint, LATERAL unnest(conkey) f WHERE contype='p' AND conrelid=tab_id;
+SELECT jsonb_agg(jsonb_build_object('attnum', attnum, 'direction', 'asc'))
+FROM pg_constraint, LATERAL unnest(conkey) attnum
+WHERE contype='p' AND conrelid=tab_id AND has_column_privilege(tab_id, attnum, 'SELECT');
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
@@ -3260,7 +3262,13 @@ WITH orderable_cte AS (
   FROM pg_catalog.pg_attribute
     INNER JOIN pg_catalog.pg_cast ON atttypid=castsource
     INNER JOIN pg_catalog.pg_operator ON casttarget=oprleft
-  WHERE attrelid=tab_id AND attnum>0 AND castcontext='i' AND oprname='<'
+  WHERE
+    attrelid=tab_id
+    AND attnum>0
+    AND castcontext='i'
+    AND oprname='<'
+    -- This privilege check is redundant in context, but may be useful for other callers.
+    AND has_column_privilege(tab_id, attnum, 'SELECT')
   ORDER BY attnum
 )
 SELECT COALESCE(jsonb_agg(jsonb_build_object('attnum', attnum, 'direction', 'asc')), '[]'::jsonb)
@@ -3312,7 +3320,7 @@ $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-msar.get_records_from_table(
+msar.list_records_from_table(
   tab_id oid,
   limit_ integer,
   offset_ integer,

From 4546f260f0994cf727e728d568eabe8c860ea6a2 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 12 Jul 2024 15:59:08 +0800
Subject: [PATCH 0417/1141] add tests for building ORDER BY

---
 db/sql/test_00_msar.sql | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index b12fda83be..6542c2bad5 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2794,3 +2794,34 @@ BEGIN
   RETURN NEXT ok(NOT jsonb_path_exists(msar.get_roles(), '$[*] ? (@.name == "foo")'));
 END;
 $$ LANGUAGE plpgsql;
+
+
+-- msar.build_order_by_expr ------------------------------------------------------------------------
+
+CREATE OR REPLACE FUNCTION __setup_order_by_table() RETURNS SETOF TEXT AS $$
+BEGIN
+  CREATE TABLE atable (id integer PRIMARY KEY, col1 integer, col2 varchar, col3 json, col4 jsonb);
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_build_order_by_expr() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+  order_by_expr text;
+BEGIN
+  PERFORM __setup_order_by_table();
+  rel_id := 'atable'::regclass::oid;
+  RETURN NEXT is(msar.build_order_by_expr(rel_id, null), 'ORDER BY "1" ASC');
+  RETURN NEXT is(
+    msar.build_order_by_expr(rel_id, '[{"attnum": 1, "direction": "desc"}]'),
+    'ORDER BY "1" DESC, "1" ASC'
+  );
+  RETURN NEXT is(
+    msar.build_order_by_expr(
+      rel_id, '[{"attnum": 3, "direction": "asc"}, {"attnum": 5, "direction": "DESC"}]'
+    ),
+    'ORDER BY "3" ASC, "5" DESC, "1" ASC'
+  );
+END;
+$$ LANGUAGE plpgsql;

From 9a50dafcee60cdee938b054803676cfae3ce82f7 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 12 Jul 2024 17:27:49 +0800
Subject: [PATCH 0418/1141] add tests for permissions fix jsonb ordering bug

---
 db/sql/00_msar.sql      | 18 +++++++++++++-----
 db/sql/test_00_msar.sql | 12 ++++++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 0ff571226d..ded714e73c 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3208,7 +3208,7 @@ BEGIN
     -- %1$s  This is a comma separated string of the extracted column names
     string_agg(quote_ident(col_def ->> 'name'), ', '),
     -- %2$s  This is the name of the original (remainder) table
-    __msar.get_qualified_relation_name(tab_id),
+    -- __msar.get_qualified_relation_name(tab_id),
     -- %3$s  This is the new extracted table name
     __msar.get_qualified_relation_name(extracted_table_id),
     -- %4$I  This is the name of the fkey column in the remainder table.
@@ -3258,7 +3258,7 @@ $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 CREATE OR REPLACE FUNCTION msar.get_total_order(tab_id oid) RETURNS jsonb AS $$
 WITH orderable_cte AS (
-  SELECT DISTINCT attnum
+  SELECT attnum
   FROM pg_catalog.pg_attribute
     INNER JOIN pg_catalog.pg_cast ON atttypid=castsource
     INNER JOIN pg_catalog.pg_operator ON casttarget=oprleft
@@ -3267,12 +3267,20 @@ WITH orderable_cte AS (
     AND attnum>0
     AND castcontext='i'
     AND oprname='<'
-    -- This privilege check is redundant in context, but may be useful for other callers.
-    AND has_column_privilege(tab_id, attnum, 'SELECT')
+  UNION SELECT attnum
+  FROM pg_catalog.pg_attribute
+    INNER JOIN pg_catalog.pg_operator ON atttypid=oprleft
+  WHERE
+    attrelid=tab_id
+    AND attnum>0
+    AND oprname='<'
   ORDER BY attnum
 )
 SELECT COALESCE(jsonb_agg(jsonb_build_object('attnum', attnum, 'direction', 'asc')), '[]'::jsonb)
-FROM orderable_cte;
+-- This privilege check is redundant in context, but may be useful for other callers.
+FROM orderable_cte
+-- This privilege check is redundant in context, but may be useful for other callers.
+WHERE has_column_privilege(tab_id, attnum, 'SELECT');
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 6542c2bad5..2f13ea1f18 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2823,5 +2823,17 @@ BEGIN
     ),
     'ORDER BY "3" ASC, "5" DESC, "1" ASC'
   );
+  CREATE ROLE intern_no_pkey;
+  GRANT USAGE ON SCHEMA msar, __msar TO intern_no_pkey;
+  GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA msar, __msar TO intern_no_pkey;
+  GRANT SELECT (col1, col2, col3, col4) ON TABLE atable TO intern_no_pkey;
+  SET ROLE intern_no_pkey;
+  RETURN NEXT is(
+    msar.build_order_by_expr(rel_id, null), 'ORDER BY "2" ASC, "3" ASC, "5" ASC'
+  );
+  SET ROLE NONE;
+  REVOKE ALL ON TABLE atable FROM intern_no_pkey;
+  SET ROLE intern_no_pkey;
+  RETURN NEXT is(msar.build_order_by_expr(rel_id, null), null);
 END;
 $$ LANGUAGE plpgsql;

From 8821bf2050b889bf654206c8cbbb28427664b997 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 12 Jul 2024 17:56:57 +0800
Subject: [PATCH 0419/1141] add tests for record listing

---
 db/sql/test_00_msar.sql | 100 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 95 insertions(+), 5 deletions(-)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 2f13ea1f18..66a330f9bd 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2796,21 +2796,111 @@ END;
 $$ LANGUAGE plpgsql;
 
 
--- msar.build_order_by_expr ------------------------------------------------------------------------
 
-CREATE OR REPLACE FUNCTION __setup_order_by_table() RETURNS SETOF TEXT AS $$
+-- msar.list_records_from_table --------------------------------------------------------------------
+
+CREATE OR REPLACE FUNCTION __setup_list_records_table() RETURNS SETOF TEXT AS $$
 BEGIN
-  CREATE TABLE atable (id integer PRIMARY KEY, col1 integer, col2 varchar, col3 json, col4 jsonb);
+  CREATE TABLE atable (
+    id integer PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
+    col1 integer,
+    col2 varchar,
+    col3 json,
+    col4 jsonb
+  );
+  INSERT INTO atable (col1, col2, col3, col4) VALUES
+    (5, 'sdflkj', '"s"', '{"a": "val"}'),
+    (34, 'sdflfflsk', null, '[1, 2, 3, 4]'),
+    (2, 'abcde', '{"k": 3242348}', 'true');
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_list_records_from_table() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+BEGIN
+  PERFORM __setup_list_records_table();
+  rel_id := 'atable'::regclass::oid;
+  RETURN NEXT is(
+    msar.list_records_from_table(rel_id, null, null, null, null, null, null),
+    $j${
+      "count": 3,
+      "results": [
+        {"1": 1, "2": 5, "3": "sdflkj", "4": "s", "5": {"a": "val"}},
+        {"1": 2, "2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]},
+        {"1": 3, "2": 2, "3": "abcde", "4": {"k": 3242348}, "5": true}
+      ]
+    }$j$
+  );
+  RETURN NEXT is(
+    msar.list_records_from_table(
+      rel_id, 2, null, '[{"attnum": 2, "direction": "desc"}]', null, null, null
+    ),
+    $j${
+      "count": 3,
+      "results": [
+        {"1": 2, "2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]},
+        {"1": 1, "2": 5, "3": "sdflkj", "4": "s", "5": {"a": "val"}}
+      ]
+    }$j$
+  );
+  RETURN NEXT is(
+    msar.list_records_from_table(
+      rel_id, null, 1, '[{"attnum": 1, "direction": "desc"}]', null, null, null
+    ),
+    $j${
+      "count": 3,
+      "results": [
+        {"1": 2, "2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]},
+        {"1": 1, "2": 5, "3": "sdflkj", "4": "s", "5": {"a": "val"}}
+      ]
+    }$j$
+  );
+  CREATE ROLE intern_no_pkey;
+  GRANT USAGE ON SCHEMA msar, __msar TO intern_no_pkey;
+  GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA msar, __msar TO intern_no_pkey;
+  GRANT SELECT (col1, col2, col3, col4) ON TABLE atable TO intern_no_pkey;
+  SET ROLE intern_no_pkey;
+  RETURN NEXT is(
+    msar.list_records_from_table(rel_id, null, null, null, null, null, null),
+    $j${
+      "count": 3,
+      "results": [
+        {"2": 2, "3": "abcde", "4": {"k": 3242348}, "5": true},
+        {"2": 5, "3": "sdflkj", "4": "s", "5": {"a": "val"}},
+        {"2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]}
+      ]
+    }$j$
+  );
+  RETURN NEXT is(
+    msar.list_records_from_table(
+      rel_id, null, null, '[{"attnum": 3, "direction": "desc"}]', null, null, null
+    ),
+    $j${
+      "count": 3,
+      "results": [
+        {"2": 5, "3": "sdflkj", "4": "s", "5": {"a": "val"}},
+        {"2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]},
+        {"2": 2, "3": "abcde", "4": {"k": 3242348}, "5": true}
+      ]
+    }$j$
+  );
+--   SET ROLE NONE;
+--   REVOKE ALL ON TABLE atable FROM intern_no_pkey;
+--   SET ROLE intern_no_pkey;
+--   RETURN NEXT is(msar.build_order_by_expr(rel_id, null), null);
 END;
 $$ LANGUAGE plpgsql;
 
 
+-- msar.build_order_by_expr ------------------------------------------------------------------------
+
 CREATE OR REPLACE FUNCTION test_build_order_by_expr() RETURNS SETOF TEXT AS $$
 DECLARE
   rel_id oid;
-  order_by_expr text;
 BEGIN
-  PERFORM __setup_order_by_table();
+  PERFORM __setup_list_records_table();
   rel_id := 'atable'::regclass::oid;
   RETURN NEXT is(msar.build_order_by_expr(rel_id, null), 'ORDER BY "1" ASC');
   RETURN NEXT is(

From aeaef994abbef58c7c6d746cf15a152526c53ea0 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 12 Jul 2024 17:58:39 +0800
Subject: [PATCH 0420/1141] remove cruft

---
 db/sql/test_00_msar.sql | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 66a330f9bd..fa45d24949 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2886,10 +2886,6 @@ BEGIN
       ]
     }$j$
   );
---   SET ROLE NONE;
---   REVOKE ALL ON TABLE atable FROM intern_no_pkey;
---   SET ROLE intern_no_pkey;
---   RETURN NEXT is(msar.build_order_by_expr(rel_id, null), null);
 END;
 $$ LANGUAGE plpgsql;
 

From 2cb6d344a144e3afcc2e18a9208587d84e299980 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 12 Jul 2024 22:08:51 +0800
Subject: [PATCH 0421/1141] use get_or_create for the role map creation

---
 mathesar/utils/permissions.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mathesar/utils/permissions.py b/mathesar/utils/permissions.py
index 1c3ae45d82..3a907dd642 100644
--- a/mathesar/utils/permissions.py
+++ b/mathesar/utils/permissions.py
@@ -95,12 +95,12 @@ def _setup_connection_models(
         server=server,
         defaults={"password": password},
     )
-    return UserDatabaseRoleMap.objects.create(
+    return UserDatabaseRoleMap.objects.get_or_create(
         user=user,
         database=database,
         role=role,
         server=server
-    )
+    )[0]
 
 
 def _load_sample_data(conn, sample_data):

From 221408115735b7f67cfc590757548a4fd84f6a94 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Sun, 14 Jul 2024 03:13:23 +0530
Subject: [PATCH 0422/1141] Rename role to configured_role for all Role model
 references

---
 .../0011_rename_role_configuredrole.py        |  5 ++++
 mathesar/models/base.py                       |  6 ++---
 mathesar/rpc/collaborators.py                 | 24 +++++++++----------
 mathesar/rpc/database_setup.py                |  8 +++----
 mathesar/tests/rpc/test_database_setup.py     |  8 +++----
 mathesar/utils/permissions.py                 |  4 ++--
 6 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/mathesar/migrations/0011_rename_role_configuredrole.py b/mathesar/migrations/0011_rename_role_configuredrole.py
index 752d6012be..7dc768960e 100644
--- a/mathesar/migrations/0011_rename_role_configuredrole.py
+++ b/mathesar/migrations/0011_rename_role_configuredrole.py
@@ -14,4 +14,9 @@ class Migration(migrations.Migration):
             old_name='Role',
             new_name='ConfiguredRole',
         ),
+        migrations.RenameField(
+            model_name='userdatabaserolemap',
+            old_name='role',
+            new_name='configured_role',
+        ),
     ]
diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index 98f1d2829b..ab34e92d75 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -61,7 +61,7 @@ class Meta:
 class UserDatabaseRoleMap(BaseModel):
     user = models.ForeignKey('User', on_delete=models.CASCADE)
     database = models.ForeignKey('Database', on_delete=models.CASCADE)
-    role = models.ForeignKey('ConfiguredRole', on_delete=models.CASCADE)
+    configured_role = models.ForeignKey('ConfiguredRole', on_delete=models.CASCADE)
     server = models.ForeignKey('Server', on_delete=models.CASCADE)
 
     class Meta:
@@ -77,8 +77,8 @@ def connection(self):
             host=self.server.host,
             port=self.server.port,
             dbname=self.database.name,
-            user=self.role.name,
-            password=self.role.password,
+            user=self.configured_role.name,
+            password=self.configured_role.password,
         )
 
 
diff --git a/mathesar/rpc/collaborators.py b/mathesar/rpc/collaborators.py
index 1851d03051..8273f9d4b7 100644
--- a/mathesar/rpc/collaborators.py
+++ b/mathesar/rpc/collaborators.py
@@ -16,12 +16,12 @@ class CollaboratorInfo(TypedDict):
         id: the Django ID of the UserDatabaseRoleMap model instance.
         user_id: The Django ID of the User model instance of the collaborator.
         database_id: the Django ID of the Database model instance for the collaborator.
-        role_id: The Django ID of the ConfiguredRole model instance for the collaborator.
+        configured_role_id: The Django ID of the ConfiguredRole model instance for the collaborator.
     """
     id: int
     user_id: int
     database_id: int
-    role_id: int
+    configured_role_id: int
 
     @classmethod
     def from_model(cls, model):
@@ -29,7 +29,7 @@ def from_model(cls, model):
             id=model.id,
             user_id=model.user.id,
             database_id=model.database.id,
-            role_id=model.role.id
+            configured_role_id=model.configured_role.id
         )
 
 
@@ -63,7 +63,7 @@ def add(
         *,
         database_id: int,
         user_id: int,
-        role_id: int,
+        configured_role_id: int,
         **kwargs
 ) -> CollaboratorInfo:
     """
@@ -72,16 +72,16 @@ def add(
     Args:
         database_id: The Django id of the Database to associate with the collaborator.
         user_id: The Django id of the User model instance who'd be the collaborator.
-        role_id: The Django id of the ConfiguredRole model instance to associate with the collaborator.
+        configured_role_id: The Django id of the ConfiguredRole model instance to associate with the collaborator.
     """
     database = Database.objects.get(id=database_id)
     user = User.objects.get(id=user_id)
-    role = ConfiguredRole.objects.get(id=role_id)
+    configured_role = ConfiguredRole.objects.get(id=configured_role_id)
     collaborator = UserDatabaseRoleMap.objects.create(
         database=database,
         user=user,
-        role=role,
-        server=role.server
+        configured_role=configured_role,
+        server=configured_role.server
     )
     return CollaboratorInfo.from_model(collaborator)
 
@@ -106,7 +106,7 @@ def delete(*, collaborator_id: int, **kwargs):
 def set_role(
         *,
         collaborator_id: int,
-        role_id: int,
+        configured_role_id: int,
         **kwargs
 ) -> CollaboratorInfo:
     """
@@ -114,10 +114,10 @@ def set_role(
 
     Args:
         collaborator_id: The Django id of the UserDatabaseRoleMap model instance of the collaborator.
-        role_id: The Django id of the ConfiguredRole model instance to associate with the collaborator.
+        configured_role_id: The Django id of the ConfiguredRole model instance to associate with the collaborator.
     """
     collaborator = UserDatabaseRoleMap.objects.get(id=collaborator_id)
-    role = ConfiguredRole.objects.get(id=role_id)
-    collaborator.role = role
+    configured_role = ConfiguredRole.objects.get(id=configured_role_id)
+    collaborator.configured_role = configured_role
     collaborator.save()
     return CollaboratorInfo.from_model(collaborator)
diff --git a/mathesar/rpc/database_setup.py b/mathesar/rpc/database_setup.py
index 37ea89969b..ce2ac09fb0 100644
--- a/mathesar/rpc/database_setup.py
+++ b/mathesar/rpc/database_setup.py
@@ -15,23 +15,23 @@ class DatabaseConnectionResult(TypedDict):
     Info about the objects resulting from calling the setup functions.
 
     These functions will get or create an instance of the Server,
-    Database, and Role models, as well as a UserDatabaseRoleMap entry.
+    Database, and ConfiguredRole models, as well as a UserDatabaseRoleMap entry.
 
     Attributes:
         server_id: The Django ID of the Server model instance.
         database_id: The Django ID of the Database model instance.
-        role_id: The Django ID of the Role model instance.
+        configured_role_id: The Django ID of the ConfiguredRole model instance.
     """
     server_id: int
     database_id: int
-    role_id: int
+    configured_role_id: int
 
     @classmethod
     def from_model(cls, model):
         return cls(
             server_id=model.server.id,
             database_id=model.database.id,
-            role_id=model.role.id,
+            configured_role_id=model.configured_role.id,
         )
 
 
diff --git a/mathesar/tests/rpc/test_database_setup.py b/mathesar/tests/rpc/test_database_setup.py
index e77cd92b8d..d9de031afc 100644
--- a/mathesar/tests/rpc/test_database_setup.py
+++ b/mathesar/tests/rpc/test_database_setup.py
@@ -27,7 +27,7 @@ def mock_set_up_new_for_user(database, user, sample_data=[]):
         db_model = Database(id=3, name=test_database, server=server_model)
         role_model = ConfiguredRole(id=4, name="matheuser", server=server_model)
         return UserDatabaseRoleMap(
-            user=user, database=db_model, role=role_model, server=server_model
+            user=user, database=db_model, configured_role=role_model, server=server_model
         )
 
     monkeypatch.setattr(
@@ -36,7 +36,7 @@ def mock_set_up_new_for_user(database, user, sample_data=[]):
         mock_set_up_new_for_user,
     )
     expect_response = database_setup.DatabaseConnectionResult(
-        server_id=2, database_id=3, role_id=4
+        server_id=2, database_id=3, configured_role_id=4
     )
 
     actual_response = database_setup.create_new(
@@ -72,7 +72,7 @@ def mock_set_up_preexisting_database_for_user(
         db_model = Database(id=3, name=test_database, server=server_model)
         role_model = ConfiguredRole(id=4, name="matheuser", server=server_model)
         return UserDatabaseRoleMap(
-            user=user, database=db_model, role=role_model, server=server_model
+            user=user, database=db_model, configured_role=role_model, server=server_model
         )
 
     monkeypatch.setattr(
@@ -81,7 +81,7 @@ def mock_set_up_preexisting_database_for_user(
         mock_set_up_preexisting_database_for_user,
     )
     expect_response = database_setup.DatabaseConnectionResult(
-        server_id=2, database_id=3, role_id=4
+        server_id=2, database_id=3, configured_role_id=4
     )
 
     actual_response = database_setup.connect_existing(
diff --git a/mathesar/utils/permissions.py b/mathesar/utils/permissions.py
index e0a156fae6..34e2363be4 100644
--- a/mathesar/utils/permissions.py
+++ b/mathesar/utils/permissions.py
@@ -90,7 +90,7 @@ def _setup_connection_models(
     database, _ = Database.objects.get_or_create(
         name=database_name, server=server
     )
-    role, _ = ConfiguredRole.objects.get_or_create(
+    configured_role, _ = ConfiguredRole.objects.get_or_create(
         name=role_name,
         server=server,
         defaults={"password": password},
@@ -98,7 +98,7 @@ def _setup_connection_models(
     return UserDatabaseRoleMap.objects.get_or_create(
         user=user,
         database=database,
-        role=role,
+        configured_role=configured_role,
         server=server
     )[0]
 

From 004db00ce97684956abf93426cffcbd9fdcab889 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Sun, 14 Jul 2024 16:19:56 +0530
Subject: [PATCH 0423/1141] Remove existing Access control models

---
 mathesar_ui/src/i18n/languages/en/dict.json   |   1 -
 .../src/pages/database/DatabaseDetails.svelte |  14 -
 .../database/DbAccessControlModal.svelte      |  68 -----
 .../schema/SchemaAccessControlModal.svelte    |  85 ------
 .../src/pages/schema/SchemaPage.svelte        |  19 +-
 .../AccessControlRow.svelte                   | 266 ------------------
 .../AccessControlView.svelte                  | 192 -------------
 .../systems/users-and-permissions/index.ts    |   1 -
 8 files changed, 1 insertion(+), 645 deletions(-)
 delete mode 100644 mathesar_ui/src/pages/database/DbAccessControlModal.svelte
 delete mode 100644 mathesar_ui/src/pages/schema/SchemaAccessControlModal.svelte
 delete mode 100644 mathesar_ui/src/systems/users-and-permissions/AccessControlRow.svelte
 delete mode 100644 mathesar_ui/src/systems/users-and-permissions/AccessControlView.svelte

diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index c2edf16583..cb35003739 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -278,7 +278,6 @@
   "loading_release_data": "Loading release data",
   "loading_spinner_no_progress_bar": "You will see a loading spinner but no progress bar.",
   "log_out": "Log Out",
-  "manage_access": "Manage Access",
   "manage_connections": "Manage Connections",
   "manage_database_access": "Manage [databaseName] Database Access",
   "manage_schema_access": "Manage [databaseName] Schema Access",
diff --git a/mathesar_ui/src/pages/database/DatabaseDetails.svelte b/mathesar_ui/src/pages/database/DatabaseDetails.svelte
index 6a1b655a3c..f66455305b 100644
--- a/mathesar_ui/src/pages/database/DatabaseDetails.svelte
+++ b/mathesar_ui/src/pages/database/DatabaseDetails.svelte
@@ -13,7 +13,6 @@
     iconDatabase,
     iconDeleteMajor,
     iconEdit,
-    iconManageAccess,
     iconMoreActions,
     iconRefresh,
   } from '@mathesar/icons';
@@ -46,7 +45,6 @@
   import SchemaRow from './SchemaRow.svelte';
 
   const addEditModal = modal.spawnModalController();
-  const accessControlModal = modal.spawnModalController();
   const editConnectionModal = modal.spawnModalController();
   const deleteConnectionModal = modal.spawnModalController();
 
@@ -106,10 +104,6 @@
     });
   }
 
-  function manageAccess() {
-    accessControlModal.open();
-  }
-
   function handleClearFilterQuery() {
     filterQuery = '';
   }
@@ -137,12 +131,6 @@
   <svelte:fragment slot="action">
     {#if canExecuteDDL || canEditPermissions}
       <div>
-        {#if canEditPermissions}
-          <Button on:click={manageAccess} appearance="secondary">
-            <Icon {...iconManageAccess} />
-            <span>{$_('manage_access')}</span>
-          </Button>
-        {/if}
         <DropdownMenu
           showArrow={false}
           triggerAppearance="plain"
@@ -254,8 +242,6 @@
   schema={targetSchema}
 />
 
-<DbAccessControlModal controller={accessControlModal} {database} />
-
 <EditConnectionModal controller={editConnectionModal} connection={database} />
 <DeleteConnectionModal
   controller={deleteConnectionModal}
diff --git a/mathesar_ui/src/pages/database/DbAccessControlModal.svelte b/mathesar_ui/src/pages/database/DbAccessControlModal.svelte
deleted file mode 100644
index cfa2c09c82..0000000000
--- a/mathesar_ui/src/pages/database/DbAccessControlModal.svelte
+++ /dev/null
@@ -1,68 +0,0 @@
-<script lang="ts">
-  import { _ } from 'svelte-i18n';
-
-  import type { UserRole } from '@mathesar/api/rest/users';
-  import type { Database } from '@mathesar/AppTypes';
-  import Identifier from '@mathesar/components/Identifier.svelte';
-  import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
-  import { RichText } from '@mathesar/components/rich-text';
-  import {
-    type UserModel,
-    setUsersStoreInContext,
-  } from '@mathesar/stores/users';
-  import { AccessControlView } from '@mathesar/systems/users-and-permissions';
-  import type { ObjectRoleMap } from '@mathesar/utils/permissions';
-  import {
-    ControlledModal,
-    type ModalController,
-  } from '@mathesar-component-library';
-
-  export let controller: ModalController;
-  export let database: Database;
-
-  const usersStore = setUsersStoreInContext();
-  const { requestStatus } = usersStore;
-
-  $: usersWithoutAccess = usersStore.getUsersWithoutAccessToDb(database);
-  $: usersWithAccess = usersStore.getUsersWithAccessToDb(database);
-
-  async function addAccessForUser(user: UserModel, role: UserRole) {
-    await usersStore.addDatabaseRoleForUser(user.id, database, role);
-  }
-
-  async function removeAccessForUser(user: UserModel) {
-    await usersStore.removeDatabaseAccessForUser(user.id, database);
-  }
-
-  function getUserRoles(user: UserModel): ObjectRoleMap | undefined {
-    const dbRole = user.getRoleForDb(database);
-    return dbRole ? new Map([['database', dbRole.role]]) : undefined;
-  }
-</script>
-
-<ControlledModal {controller} closeOn={['button', 'esc', 'overlay']}>
-  <svelte:fragment slot="title">
-    <RichText text={$_('manage_database_access')} let:slotName>
-      {#if slotName === 'databaseName'}
-        <Identifier>{database.nickname}</Identifier>
-      {/if}
-    </RichText>
-  </svelte:fragment>
-
-  {#if $requestStatus?.state === 'success'}
-    <AccessControlView
-      accessControlObject="database"
-      usersWithAccess={$usersWithAccess}
-      usersWithoutAccess={$usersWithoutAccess}
-      {addAccessForUser}
-      {removeAccessForUser}
-      {getUserRoles}
-    />
-  {:else if $requestStatus?.state === 'processing'}
-    <div>{$_('loading')}</div>
-  {:else if $requestStatus?.state === 'failure'}
-    <ErrorBox>
-      {$requestStatus.errors.join(', ')}
-    </ErrorBox>
-  {/if}
-</ControlledModal>
diff --git a/mathesar_ui/src/pages/schema/SchemaAccessControlModal.svelte b/mathesar_ui/src/pages/schema/SchemaAccessControlModal.svelte
deleted file mode 100644
index cb22a2a557..0000000000
--- a/mathesar_ui/src/pages/schema/SchemaAccessControlModal.svelte
+++ /dev/null
@@ -1,85 +0,0 @@
-<script lang="ts">
-  import { _ } from 'svelte-i18n';
-
-  import type { UserRole } from '@mathesar/api/rest/users';
-  import type { Database, SchemaEntry } from '@mathesar/AppTypes';
-  import Identifier from '@mathesar/components/Identifier.svelte';
-  import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
-  import { RichText } from '@mathesar/components/rich-text';
-  import {
-    type UserModel,
-    setUsersStoreInContext,
-  } from '@mathesar/stores/users';
-  import { AccessControlView } from '@mathesar/systems/users-and-permissions';
-  import type { ObjectRoleMap } from '@mathesar/utils/permissions';
-  import {
-    ControlledModal,
-    type ModalController,
-  } from '@mathesar-component-library';
-
-  export let controller: ModalController;
-  export let database: Database;
-  export let schema: SchemaEntry;
-
-  const usersStore = setUsersStoreInContext();
-  const { requestStatus } = usersStore;
-
-  $: usersWithoutDirectAccessToSchema =
-    usersStore.getNormalUsersWithoutDirectSchemaRole(schema);
-  $: usersWithAccessToSchema = usersStore.getUsersWithAccessToSchema(
-    database,
-    schema,
-  );
-
-  async function addAccessForUser(user: UserModel, role: UserRole) {
-    await usersStore.addSchemaRoleForUser(user.id, schema, role);
-  }
-
-  async function removeAccessForUser(user: UserModel) {
-    await usersStore.removeSchemaAccessForUser(user.id, schema);
-  }
-
-  function getUserRoles(user: UserModel): ObjectRoleMap | undefined {
-    const objectRoleMap: ObjectRoleMap = new Map();
-    const dbRole = user.getRoleForDb(database);
-    if (dbRole) {
-      objectRoleMap.set('database', dbRole.role);
-    }
-    const schemaRole = user.getRoleForSchema(schema);
-    if (schemaRole) {
-      objectRoleMap.set('schema', schemaRole.role);
-    }
-    return objectRoleMap.size ? objectRoleMap : undefined;
-  }
-</script>
-
-<ControlledModal
-  {controller}
-  size="medium"
-  closeOn={['button', 'esc', 'overlay']}
->
-  <svelte:fragment slot="title">
-    <RichText text={$_('manage_schema_access')} let:slotName>
-      {#if slotName === 'databaseName'}
-        <Identifier>{schema.name}</Identifier>
-      {/if}
-    </RichText>
-  </svelte:fragment>
-
-  {#if $requestStatus?.state === 'success'}
-    <AccessControlView
-      accessControlObject="schema"
-      usersWithAccess={$usersWithAccessToSchema}
-      usersWithoutAccess={$usersWithoutDirectAccessToSchema}
-      {addAccessForUser}
-      {removeAccessForUser}
-      {getUserRoles}
-    />
-  {:else if $requestStatus?.state === 'processing'}
-    <div>{$_('loading')}</div>
-  {:else if $requestStatus?.state === 'failure'}
-    <ErrorBox>
-      {$requestStatus.errors.join(', ')}
-    </ErrorBox>
-  {/if}
-</ControlledModal>
diff --git a/mathesar_ui/src/pages/schema/SchemaPage.svelte b/mathesar_ui/src/pages/schema/SchemaPage.svelte
index fab522012b..6802f85a07 100644
--- a/mathesar_ui/src/pages/schema/SchemaPage.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPage.svelte
@@ -3,7 +3,7 @@
 
   import type { Database, SchemaEntry } from '@mathesar/AppTypes';
   import AppSecondaryHeader from '@mathesar/components/AppSecondaryHeader.svelte';
-  import { iconEdit, iconManageAccess, iconSchema } from '@mathesar/icons';
+  import { iconEdit, iconSchema } from '@mathesar/icons';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import {
@@ -24,7 +24,6 @@
   import AddEditSchemaModal from '../database/AddEditSchemaModal.svelte';
 
   import ExplorationSkeleton from './ExplorationSkeleton.svelte';
-  import SchemaAccessControlModal from './SchemaAccessControlModal.svelte';
   import SchemaExplorations from './SchemaExplorations.svelte';
   import SchemaOverview from './SchemaOverview.svelte';
   import SchemaTables from './SchemaTables.svelte';
@@ -42,13 +41,8 @@
   $: canEditMetadata =
     userProfile?.hasPermission({ database, schema }, 'canEditMetadata') ??
     false;
-  $: canEditPermissions = userProfile?.hasPermission(
-    { database, schema },
-    'canEditPermissions',
-  );
 
   const addEditModal = modal.spawnModalController();
-  const accessControlModal = modal.spawnModalController();
 
   // NOTE: This has to be same as the name key in the paths prop of Route component
   type TabsKey = 'overview' | 'tables' | 'explorations';
@@ -92,10 +86,6 @@
 
   $: isDefault = schema.name === 'public';
 
-  function manageAccess() {
-    accessControlModal.open();
-  }
-
   logEvent('opened_schema', {
     database_name: database.nickname,
     schema_name: schema.name,
@@ -127,12 +117,6 @@
           <span>{$_('edit_schema')}</span>
         </Button>
       {/if}
-      {#if canEditPermissions}
-        <Button on:click={manageAccess} appearance="secondary">
-          <Icon {...iconManageAccess} />
-          <span>{$_('manage_access')}</span>
-        </Button>
-      {/if}
     </div>
 
     <svelte:fragment slot="bottom">
@@ -191,7 +175,6 @@
 </LayoutWithHeader>
 
 <AddEditSchemaModal controller={addEditModal} {database} {schema} />
-<SchemaAccessControlModal controller={accessControlModal} {database} {schema} />
 
 <style lang="scss">
   .tab-container {
diff --git a/mathesar_ui/src/systems/users-and-permissions/AccessControlRow.svelte b/mathesar_ui/src/systems/users-and-permissions/AccessControlRow.svelte
deleted file mode 100644
index 1d3be23413..0000000000
--- a/mathesar_ui/src/systems/users-and-permissions/AccessControlRow.svelte
+++ /dev/null
@@ -1,266 +0,0 @@
-<script lang="ts">
-  import { _ } from 'svelte-i18n';
-
-  import type { UserRole } from '@mathesar/api/rest/users';
-  import {
-    iconDatabase,
-    iconDeleteMajor,
-    iconSchema,
-    iconUser,
-  } from '@mathesar/icons';
-  import type { UserModel } from '@mathesar/stores/users';
-  import {
-    type AccessControlObject,
-    type ObjectRoleMap,
-    getDescriptionForRole,
-    getDisplayNameForRole,
-    getObjectWithHighestPrecedenceByRoles,
-  } from '@mathesar/utils/permissions';
-  import {
-    Button,
-    Chip,
-    Help,
-    Icon,
-    SpinnerButton,
-    Tooltip,
-  } from '@mathesar-component-library';
-
-  export let userProfile: UserModel | undefined;
-  export let userModel: UserModel;
-  export let accessControlObject: AccessControlObject;
-  export let getUserRoles: (user: UserModel) => ObjectRoleMap | undefined;
-  export let removeAccessForUser: (user: UserModel) => Promise<void>;
-
-  $: roleMap = getUserRoles(userModel);
-  $: roles = roleMap && roleMap.size > 0 ? [...roleMap.entries()] : [];
-  $: userRoleRows = (() => {
-    const rows: ['admin' | AccessControlObject, UserRole][] =
-      userModel.isSuperUser ? [['admin', 'manager']] : roles;
-    return rows;
-  })();
-  $: hasMultipleRoles = userRoleRows.length > 1;
-  $: objectWithHighestPrecedence = roleMap
-    ? getObjectWithHighestPrecedenceByRoles(roleMap)
-    : undefined;
-  $: isUserEditingTheirOwnAccess = userProfile?.id === userModel.id;
-
-  async function removeAccess() {
-    await removeAccessForUser(userModel);
-  }
-
-  function isRoleInherited(aclObject: AccessControlObject): boolean {
-    return accessControlObject !== aclObject;
-  }
-
-  function getRoleStatusText(
-    aclObject: AccessControlObject,
-    isOverridden: boolean,
-  ): string {
-    const status: string[] = [];
-    if (isRoleInherited(aclObject)) {
-      status.push($_('inherited'));
-    }
-    if (isOverridden) {
-      status.push($_('overridden'));
-    }
-    return status.length > 0 ? `(${status.join(', ')})` : '';
-  }
-
-  function getRoleHelpText(
-    aclObject: AccessControlObject,
-    isOverridden: boolean,
-  ): string {
-    const aclObjectLabel =
-      aclObject === 'database' ? $_('database') : $_('schema');
-    const comparedAclObjectLabel =
-      aclObject === 'database' ? $_('schema') : $_('database');
-    const isInherited = isRoleInherited(aclObject);
-    if (isInherited && isOverridden) {
-      return $_('access_level_inheritance_is_overridden_help', {
-        values: {
-          aclObject: aclObjectLabel,
-          comparedAclObject: comparedAclObjectLabel,
-        },
-      });
-    }
-    if (isInherited) {
-      return $_('access_level_inheritance_help', {
-        values: {
-          aclObject: aclObjectLabel,
-        },
-      });
-    }
-    if (isOverridden) {
-      return $_('access_level_is_overridden_help', {
-        values: {
-          comparedAclObject: comparedAclObjectLabel,
-        },
-      });
-    }
-    return $_('access_level_overrides_help', {
-      values: {
-        comparedAclObject: comparedAclObjectLabel,
-      },
-    });
-  }
-
-  function getDisabledDeleteHelpText(
-    level: 'admin' | AccessControlObject,
-  ): string {
-    if (level === 'admin') {
-      return $_('individual_permissions_admin_modify_warning');
-    }
-    if (isUserEditingTheirOwnAccess) {
-      return $_('cannot_modify_own_access_warning');
-    }
-    if (isRoleInherited(level)) {
-      return $_('inherited_access_level_cannot_remove_warning');
-    }
-    return $_('access_level_cannot_remove_warning');
-  }
-</script>
-
-<div class="wrapper">
-  <div class="cell has-border" style:grid-row="span {userRoleRows.length}">
-    <div class="name-and-info">
-      <div class="name">{userModel.username}</div>
-      <div class="info">
-        {#if userModel.fullName}
-          <span>{userModel.fullName}</span>
-        {/if}
-        {#if userModel.fullName && userModel.email}
-          <span class="divider" />
-        {/if}
-        {#if userModel.email}
-          <span>{userModel.email}</span>
-        {/if}
-      </div>
-    </div>
-  </div>
-  {#each userRoleRows as [level, role], index (`${level}-${role}`)}
-    {@const isOverridden =
-      hasMultipleRoles && objectWithHighestPrecedence !== level}
-    {@const hasBorder = (hasMultipleRoles && index === 0) || !hasMultipleRoles}
-    <div class="access-wrapper">
-      <div
-        class="cell access-level"
-        class:disabled={isOverridden}
-        class:has-border={hasBorder}
-      >
-        <div>
-          {#if level === 'admin'}
-            {$_('admin_access')}
-          {:else}
-            {getDescriptionForRole(role)}
-          {/if}
-          {#if hasMultipleRoles && level !== 'admin'}
-            {getRoleStatusText(level, isOverridden)}
-            <Help>
-              {getRoleHelpText(level, isOverridden)}
-            </Help>
-          {/if}
-        </div>
-      </div>
-      <div
-        class="cell access-level-chip"
-        class:disabled={isOverridden}
-        class:has-border={hasBorder}
-      >
-        <Chip background="var(--slate-200)" display="inline-flex">
-          {#if level === 'admin'}
-            <Icon {...iconUser} size="0.8em" />
-            <span>{$_('admin')}</span>
-          {:else}
-            {#if level === 'database'}
-              <Icon {...iconDatabase} size="0.8em" />
-            {:else if level === 'schema'}
-              <Icon {...iconSchema} size="0.8em" />
-            {/if}
-            <span>{getDisplayNameForRole(role)}</span>
-          {/if}
-        </Chip>
-      </div>
-      <div class="cell" class:has-border={hasBorder}>
-        {#if level === 'admin' || isRoleInherited(level) || isUserEditingTheirOwnAccess}
-          <Tooltip>
-            <Button slot="trigger" disabled>
-              <Icon {...iconDeleteMajor} size="0.75em" />
-            </Button>
-            <span slot="content">
-              {getDisabledDeleteHelpText(level)}
-            </span>
-          </Tooltip>
-        {:else}
-          <SpinnerButton
-            onClick={removeAccess}
-            label=""
-            icon={{ ...iconDeleteMajor, size: '0.75em' }}
-            appearance="outline-primary"
-          />
-        {/if}
-      </div>
-    </div>
-  {/each}
-</div>
-
-<style lang="scss">
-  .wrapper {
-    display: contents;
-
-    & + :global(.wrapper .cell.has-border) {
-      border-top: 1px solid var(--slate-200);
-    }
-
-    .cell {
-      height: 100%;
-      display: flex;
-      align-items: center;
-      padding: var(--size-xx-small);
-
-      &.disabled {
-        color: var(--color-text-muted);
-      }
-    }
-
-    .name-and-info {
-      align-self: start;
-
-      .name {
-        font-weight: 500;
-      }
-      .info {
-        display: flex;
-        align-items: center;
-        color: var(--slate-500);
-
-        .divider {
-          display: inline-block;
-          margin: 0 0.4rem;
-          width: 0.25rem;
-          height: 0.25rem;
-          border-radius: 50%;
-          background: var(--slate-800);
-        }
-      }
-    }
-    .access-level-chip {
-      justify-content: end;
-
-      :global(.chip) {
-        min-width: 4.15rem;
-        justify-content: center;
-      }
-
-      :global(.chip + .chip) {
-        margin-left: 0.2rem;
-      }
-    }
-    .access-wrapper {
-      display: contents;
-
-      & + :global(.access-wrapper .cell) {
-        padding-top: 0;
-      }
-    }
-  }
-</style>
diff --git a/mathesar_ui/src/systems/users-and-permissions/AccessControlView.svelte b/mathesar_ui/src/systems/users-and-permissions/AccessControlView.svelte
deleted file mode 100644
index 9aa9679357..0000000000
--- a/mathesar_ui/src/systems/users-and-permissions/AccessControlView.svelte
+++ /dev/null
@@ -1,192 +0,0 @@
-<script lang="ts">
-  import { _ } from 'svelte-i18n';
-
-  import type { UserRole } from '@mathesar/api/rest/users';
-  import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
-  import { iconAddNew } from '@mathesar/icons';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
-  import type { UserModel } from '@mathesar/stores/users';
-  import { getErrorMessage } from '@mathesar/utils/errors';
-  import {
-    type AccessControlObject,
-    type ObjectRoleMap,
-    getDisplayNameForRole,
-  } from '@mathesar/utils/permissions';
-  import {
-    Button,
-    Help,
-    Icon,
-    LabeledInput,
-    Select,
-    SpinnerButton,
-  } from '@mathesar-component-library';
-
-  import AccessControlRow from './AccessControlRow.svelte';
-
-  const roles: UserRole[] = ['viewer', 'editor', 'manager'];
-
-  const userProfileStore = getUserProfileStoreFromContext();
-  $: userProfile = $userProfileStore;
-
-  export let usersWithAccess: UserModel[];
-  export let usersWithoutAccess: UserModel[];
-  export let addAccessForUser: (
-    user: UserModel,
-    role: UserRole,
-  ) => Promise<void>;
-  export let removeAccessForUser: (user: UserModel) => Promise<void>;
-  export let accessControlObject: AccessControlObject;
-  export let getUserRoles: (user: UserModel) => ObjectRoleMap | undefined;
-
-  $: usersAllowedToBeAdded = usersWithoutAccess.filter(
-    (user) => user.id !== userProfile?.id,
-  );
-
-  let isRequestInProcess = false;
-  let showAddForm = false;
-  let error: string | undefined;
-
-  let user: UserModel | undefined = undefined;
-  let role: UserRole = 'viewer';
-
-  async function addAccess() {
-    error = undefined;
-    if (user) {
-      try {
-        isRequestInProcess = true;
-        await addAccessForUser(user, role);
-        user = undefined;
-      } catch (err) {
-        error = getErrorMessage(err);
-      } finally {
-        isRequestInProcess = false;
-      }
-    }
-  }
-</script>
-
-<div>
-  {#if !showAddForm}
-    <Button
-      appearance="secondary"
-      on:click={() => {
-        showAddForm = true;
-        error = undefined;
-      }}
-    >
-      <Icon {...iconAddNew} />
-      <span>{$_('add')}</span>
-    </Button>
-  {/if}
-
-  {#if showAddForm}
-    <div class="add-user">
-      <div class="add-user-form">
-        <LabeledInput label={$_('user')} layout="stacked">
-          <Select
-            autoSelect="none"
-            options={usersAllowedToBeAdded}
-            bind:value={user}
-            disabled={isRequestInProcess}
-            let:option
-          >
-            {#if option}
-              {option.username}
-            {:else}
-              <span class="placeholder">{$_('select_user')}</span>
-            {/if}
-            <div class="no-users" slot="empty">{$_('no_users_found')}</div>
-          </Select>
-        </LabeledInput>
-        <LabeledInput label={$_('permission')} layout="stacked">
-          <Select
-            options={roles}
-            bind:value={role}
-            getLabel={(option) =>
-              option ? getDisplayNameForRole(option) : $_('select_permission')}
-            disabled={isRequestInProcess}
-          />
-        </LabeledInput>
-        <div class="add-button">
-          <SpinnerButton
-            disabled={!user || isRequestInProcess}
-            onClick={addAccess}
-            icon={iconAddNew}
-            label={$_('add')}
-            appearance="secondary"
-          />
-        </div>
-      </div>
-
-      {#if error}
-        <ErrorBox>{error}</ErrorBox>
-      {/if}
-    </div>
-  {/if}
-</div>
-<div class="users-with-access">
-  <div class="header">
-    <span>{$_('users_with_access')}</span>
-    {#if accessControlObject === 'schema'}
-      <Help>
-        {$_('access_level_precedence_help')}
-      </Help>
-    {/if}
-  </div>
-  <div class="list">
-    {#each usersWithAccess as userWithAccess (userWithAccess.id)}
-      <AccessControlRow
-        {userProfile}
-        {getUserRoles}
-        userModel={userWithAccess}
-        {accessControlObject}
-        {removeAccessForUser}
-      />
-    {/each}
-  </div>
-</div>
-
-<style lang="scss">
-  .add-user {
-    padding: var(--size-x-small);
-    border: 1px solid var(--slate-300);
-    border-radius: var(--border-radius-m);
-
-    .add-user-form {
-      display: grid;
-      grid-template-columns: 4fr 3fr 1fr;
-      grid-gap: 0.5rem;
-
-      .placeholder {
-        color: var(--slate-600);
-      }
-
-      .add-button {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: flex-end;
-      }
-    }
-  }
-
-  .users-with-access {
-    margin-top: var(--size-large);
-
-    .header {
-      font-weight: 500;
-    }
-    .list {
-      margin-top: var(--size-base);
-      display: grid;
-      grid-template-columns: 6fr 5fr 1fr 3rem;
-      align-items: center;
-      border: 1px solid var(--slate-200);
-      border-radius: var(--border-radius-m);
-      background: var(--white);
-    }
-  }
-  .no-users {
-    padding: var(--size-xx-small);
-  }
-</style>
diff --git a/mathesar_ui/src/systems/users-and-permissions/index.ts b/mathesar_ui/src/systems/users-and-permissions/index.ts
index 8a3571b4cd..a4671afb6f 100644
--- a/mathesar_ui/src/systems/users-and-permissions/index.ts
+++ b/mathesar_ui/src/systems/users-and-permissions/index.ts
@@ -1,4 +1,3 @@
 export { default as UserDetailsForm } from './UserDetailsForm.svelte';
 export { default as PasswordChangeForm } from './PasswordChangeForm.svelte';
-export { default as AccessControlView } from './AccessControlView.svelte';
 export { getUserTypeInfoFromUserModel } from './utils';

From 8be6311affb9081aaf387c1dd10d4591ff344827 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Sun, 14 Jul 2024 16:30:59 +0530
Subject: [PATCH 0424/1141] Remove existing permissions utility file and
 database_roles, schema_roles

---
 mathesar_ui/src/api/rest/users.ts             |  38 ---
 .../src/pages/database/DatabaseDetails.svelte |   1 -
 mathesar_ui/src/stores/users.ts               | 216 +-----------------
 mathesar_ui/src/utils/permissions.ts          | 122 ----------
 4 files changed, 3 insertions(+), 374 deletions(-)
 delete mode 100644 mathesar_ui/src/utils/permissions.ts

diff --git a/mathesar_ui/src/api/rest/users.ts b/mathesar_ui/src/api/rest/users.ts
index 1020ccc448..a921da5426 100644
--- a/mathesar_ui/src/api/rest/users.ts
+++ b/mathesar_ui/src/api/rest/users.ts
@@ -34,8 +34,6 @@ export interface SchemaRole {
 export interface User extends Omit<UnsavedUser, 'password'> {
   readonly id: number;
   readonly is_superuser: boolean;
-  readonly database_roles: DatabaseRole[];
-  readonly schema_roles: SchemaRole[];
 }
 
 function list() {
@@ -74,38 +72,6 @@ function resetPassword(userId: User['id'], password: string) {
   });
 }
 
-function addDatabaseRole(
-  userId: User['id'],
-  databaseId: Database['id'],
-  role: UserRole,
-) {
-  return postAPI<DatabaseRole>('/api/ui/v0/database_roles/', {
-    user: userId,
-    database: databaseId,
-    role,
-  });
-}
-
-function deleteDatabaseRole(roleId: DatabaseRole['id']) {
-  return deleteAPI(`/api/ui/v0/database_roles/${roleId}/`);
-}
-
-function addSchemaRole(
-  userId: User['id'],
-  schemaId: SchemaEntry['id'],
-  role: UserRole,
-) {
-  return postAPI<SchemaRole>('/api/ui/v0/schema_roles/', {
-    user: userId,
-    schema: schemaId,
-    role,
-  });
-}
-
-function deleteSchemaRole(roleId: SchemaRole['id']) {
-  return deleteAPI(`/api/ui/v0/schema_roles/${roleId}/`);
-}
-
 export default {
   list,
   get,
@@ -114,8 +80,4 @@ export default {
   update,
   changePassword,
   resetPassword,
-  addDatabaseRole,
-  deleteDatabaseRole,
-  addSchemaRole,
-  deleteSchemaRole,
 };
diff --git a/mathesar_ui/src/pages/database/DatabaseDetails.svelte b/mathesar_ui/src/pages/database/DatabaseDetails.svelte
index f66455305b..ad10e921cc 100644
--- a/mathesar_ui/src/pages/database/DatabaseDetails.svelte
+++ b/mathesar_ui/src/pages/database/DatabaseDetails.svelte
@@ -40,7 +40,6 @@
   } from '@mathesar-component-library';
 
   import AddEditSchemaModal from './AddEditSchemaModal.svelte';
-  import DbAccessControlModal from './DbAccessControlModal.svelte';
   import SchemaListSkeleton from './SchemaListSkeleton.svelte';
   import SchemaRow from './SchemaRow.svelte';
 
diff --git a/mathesar_ui/src/stores/users.ts b/mathesar_ui/src/stores/users.ts
index 8609761322..77760b5b63 100644
--- a/mathesar_ui/src/stores/users.ts
+++ b/mathesar_ui/src/stores/users.ts
@@ -1,22 +1,15 @@
 /* eslint-disable max-classes-per-file */
 
 import { getContext, setContext } from 'svelte';
-import { type Writable, derived, get, writable } from 'svelte/store';
+import { type Writable, get, writable } from 'svelte/store';
 
 import userApi, {
-  type DatabaseRole,
-  type SchemaRole,
   type UnsavedUser,
   type User,
-  type UserRole,
 } from '@mathesar/api/rest/users';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import type { Database, SchemaEntry } from '@mathesar/AppTypes';
 import { getErrorMessage } from '@mathesar/utils/errors';
-import {
-  type AccessOperation,
-  rolesAllowOperation,
-} from '@mathesar/utils/permissions';
 import type { MakeWritablePropertiesReadable } from '@mathesar/utils/typeUtils';
 
 export class UserModel {
@@ -32,19 +25,9 @@ export class UserModel {
 
   readonly displayLanguage: User['display_language'];
 
-  private databaseRoles: Map<DatabaseRole['database'], DatabaseRole>;
-
-  private schemaRoles: Map<SchemaRole['schema'], SchemaRole>;
-
   constructor(userDetails: User) {
     this.id = userDetails.id;
     this.isSuperUser = userDetails.is_superuser;
-    this.databaseRoles = new Map(
-      userDetails.database_roles.map((role) => [role.database, role]),
-    );
-    this.schemaRoles = new Map(
-      userDetails.schema_roles.map((role) => [role.schema, role]),
-    );
     this.fullName = userDetails.full_name;
     this.email = userDetails.email;
     this.username = userDetails.username;
@@ -56,58 +39,12 @@ export class UserModel {
       database?: Pick<Database, 'id'>;
       schema?: Pick<SchemaEntry, 'id'>;
     },
-    operation: AccessOperation,
+    operation: unknown,
   ): boolean {
     if (this.isSuperUser) {
       return true;
     }
-    const { database, schema } = dbObject;
-    if (schema && !database) {
-      throw new Error(
-        'Schema needs to be accompanied by the database for permission checks',
-      );
-    }
-    const roles: UserRole[] = [];
-    if (schema) {
-      const userSchemaRole = this.schemaRoles.get(schema.id);
-      if (userSchemaRole) {
-        roles.push(userSchemaRole.role);
-      }
-    }
-    if (database) {
-      const userDatabaseRole = this.databaseRoles.get(database.id);
-      if (userDatabaseRole) {
-        roles.push(userDatabaseRole.role);
-      }
-    }
-    return rolesAllowOperation(operation, roles);
-  }
-
-  getRoleForDb(database: Pick<Database, 'id'>) {
-    return this.databaseRoles.get(database.id);
-  }
-
-  getRoleForSchema(schema: Pick<SchemaEntry, 'id'>) {
-    return this.schemaRoles.get(schema.id);
-  }
-
-  hasDirectDbAccess(database: Pick<Database, 'id'>) {
-    return this.databaseRoles.has(database.id);
-  }
-
-  hasDbAccess(database: Pick<Database, 'id'>) {
-    return this.hasDirectDbAccess(database) || this.isSuperUser;
-  }
-
-  hasDirectSchemaAccess(schema: Pick<SchemaEntry, 'id'>) {
-    return this.schemaRoles.has(schema.id);
-  }
-
-  hasSchemaAccess(
-    database: Pick<Database, 'id'>,
-    schema: Pick<SchemaEntry, 'id'>,
-  ) {
-    return this.hasDbAccess(database) || this.hasDirectSchemaAccess(schema);
+    return true;
   }
 
   getDisplayName(): string {
@@ -119,8 +56,6 @@ export class UserModel {
       id: this.id,
       is_superuser: this.isSuperUser,
       username: this.username,
-      database_roles: [...this.databaseRoles.values()],
-      schema_roles: [...this.schemaRoles.values()],
       full_name: this.fullName,
       email: this.email,
       display_language: this.displayLanguage,
@@ -133,38 +68,6 @@ export class UserModel {
       ...userDetails,
     });
   }
-
-  withNewDatabaseRole(dbRole: DatabaseRole) {
-    return new UserModel({
-      ...this.getUser(),
-      database_roles: [...this.databaseRoles.values(), dbRole],
-    });
-  }
-
-  withoutDatabaseRole(dbRole: Pick<DatabaseRole, 'database'>) {
-    return new UserModel({
-      ...this.getUser(),
-      database_roles: [...this.databaseRoles.values()].filter(
-        (entry) => entry.database !== dbRole.database,
-      ),
-    });
-  }
-
-  withNewSchemaRole(schemaRole: SchemaRole) {
-    return new UserModel({
-      ...this.getUser(),
-      schema_roles: [...this.schemaRoles.values(), schemaRole],
-    });
-  }
-
-  withoutSchemaRole(schemaRole: Pick<SchemaRole, 'schema'>) {
-    return new UserModel({
-      ...this.getUser(),
-      schema_roles: [...this.schemaRoles.values()].filter(
-        (entry) => entry.schema !== schemaRole.schema,
-      ),
-    });
-  }
 }
 
 export class AnonymousViewerUserModel extends UserModel {
@@ -172,8 +75,6 @@ export class AnonymousViewerUserModel extends UserModel {
     super({
       id: 0,
       is_superuser: false,
-      database_roles: [],
-      schema_roles: [],
       username: 'Anonymous',
       full_name: 'Anonymous',
       email: null,
@@ -258,117 +159,6 @@ class WritableUsersStore {
     // since it's a good opportunity to ensure the UI is up-to-date.
     void this.fetchUsersSilently();
   }
-
-  async addDatabaseRoleForUser(
-    userId: number,
-    database: Pick<Database, 'id'>,
-    role: UserRole,
-  ) {
-    const dbRole = await userApi.addDatabaseRole(userId, database.id, role);
-    this.users.update((users) =>
-      users.map((user) => {
-        if (user.id === userId) {
-          return user.withNewDatabaseRole(dbRole);
-        }
-        return user;
-      }),
-    );
-    void this.fetchUsersSilently();
-  }
-
-  async removeDatabaseAccessForUser(
-    userId: number,
-    database: Pick<Database, 'id'>,
-  ) {
-    const user = get(this.users).find((entry) => entry.id === userId);
-    const dbRole = user?.getRoleForDb(database);
-    if (dbRole) {
-      await userApi.deleteDatabaseRole(dbRole.id);
-      this.users.update((users) =>
-        users.map((entry) => {
-          if (entry.id === userId) {
-            return entry.withoutDatabaseRole(dbRole);
-          }
-          return entry;
-        }),
-      );
-      void this.fetchUsersSilently();
-    }
-  }
-
-  async addSchemaRoleForUser(
-    userId: number,
-    schema: Pick<SchemaEntry, 'id'>,
-    role: UserRole,
-  ) {
-    const schemaRole = await userApi.addSchemaRole(userId, schema.id, role);
-    this.users.update((users) =>
-      users.map((user) => {
-        if (user.id === userId) {
-          return user.withNewSchemaRole(schemaRole);
-        }
-        return user;
-      }),
-    );
-    void this.fetchUsersSilently();
-  }
-
-  async removeSchemaAccessForUser(
-    userId: number,
-    schema: Pick<SchemaEntry, 'id'>,
-  ) {
-    const user = get(this.users).find((entry) => entry.id === userId);
-    const schemaRole = user?.getRoleForSchema(schema);
-    if (schemaRole) {
-      await userApi.deleteSchemaRole(schemaRole.id);
-      this.users.update((users) =>
-        users.map((entry) => {
-          if (entry.id === userId) {
-            return entry.withoutSchemaRole(schemaRole);
-          }
-          return entry;
-        }),
-      );
-      void this.fetchUsersSilently();
-    }
-  }
-
-  getUsersWithAccessToDb(database: Pick<Database, 'id'>) {
-    return derived(this.users, ($users) =>
-      $users.filter((user) => user.hasDbAccess(database)),
-    );
-  }
-
-  getUsersWithoutAccessToDb(database: Pick<Database, 'id'>) {
-    return derived(this.users, ($users) =>
-      $users.filter((user) => !user.hasDbAccess(database)),
-    );
-  }
-
-  getNormalUsersWithDirectSchemaRole(schema: Pick<SchemaEntry, 'id'>) {
-    return derived(this.users, ($users) =>
-      $users.filter(
-        (user) => !user.isSuperUser && user.hasDirectSchemaAccess(schema),
-      ),
-    );
-  }
-
-  getNormalUsersWithoutDirectSchemaRole(schema: Pick<SchemaEntry, 'id'>) {
-    return derived(this.users, ($users) =>
-      $users.filter(
-        (user) => !user.isSuperUser && !user.hasDirectSchemaAccess(schema),
-      ),
-    );
-  }
-
-  getUsersWithAccessToSchema(
-    database: Pick<Database, 'id'>,
-    schema: Pick<SchemaEntry, 'id'>,
-  ) {
-    return derived(this.users, ($users) =>
-      $users.filter((user) => user.hasSchemaAccess(database, schema)),
-    );
-  }
 }
 
 export type UsersStore = MakeWritablePropertiesReadable<WritableUsersStore>;
diff --git a/mathesar_ui/src/utils/permissions.ts b/mathesar_ui/src/utils/permissions.ts
deleted file mode 100644
index e2a281014f..0000000000
--- a/mathesar_ui/src/utils/permissions.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-import { get } from 'svelte/store';
-import { _ } from 'svelte-i18n';
-
-import type { UserRole } from '@mathesar/api/rest/users';
-import { assertExhaustive } from '@mathesar-component-library';
-
-/**
- * - `canEditTableRecords`: DML operations on table rows and cells.
- * - `canEditMetadata`: CRUD operations on data stored on our internal database.
- *   - This includes column display options, record summary etc.,
- *   - This also includes all operations on Explorations.
- * - `canExecuteDDL`: DDL operations on objects stored directly on user database,
- *   including schemas, tables, columns, links, constraints etc.,
- *   This also includes:
- *    - Descriptions for schemas and tables: Because these are stored
- *    in the user database.
- *    - Importing data: Because this creates a new table.
- * - `editPermissions`: Changes to user access.
- */
-export type AccessOperation =
-  | 'canEditTableRecords'
-  | 'canEditMetadata'
-  | 'canExecuteDDL'
-  | 'canEditPermissions'
-  | 'canViewLinkedEntities';
-
-const operationsForViewer: Set<AccessOperation> = new Set([
-  'canViewLinkedEntities',
-]);
-
-const operationsForEditor: Set<AccessOperation> = new Set([
-  ...operationsForViewer,
-  'canEditTableRecords',
-  'canEditMetadata',
-]);
-
-export function roleAllowsOperation(
-  userRole: UserRole,
-  operation: AccessOperation,
-): boolean {
-  switch (userRole) {
-    case 'manager':
-      return true;
-    case 'editor':
-      return operationsForEditor.has(operation);
-    case 'viewer':
-      return operationsForViewer.has(operation);
-    default:
-      return assertExhaustive(userRole);
-  }
-}
-
-export function rolesAllowOperation(
-  accessOperation: AccessOperation,
-  roles: UserRole[],
-): boolean {
-  return roles.some((role) => roleAllowsOperation(role, accessOperation));
-}
-
-export function getDisplayNameForRole(userRole: UserRole): string {
-  switch (userRole) {
-    case 'manager':
-      return get(_)('manager');
-    case 'editor':
-      return get(_)('editor');
-    case 'viewer':
-      return get(_)('viewer');
-    default:
-      return assertExhaustive(userRole);
-  }
-}
-
-export function getDescriptionForRole(userRole: UserRole): string {
-  switch (userRole) {
-    case 'manager':
-      return get(_)('manager_access');
-    case 'editor':
-      return get(_)('editor_access');
-    case 'viewer':
-      return get(_)('readonly_access');
-    default:
-      return assertExhaustive(userRole);
-  }
-}
-
-export type AccessControlObject = 'database' | 'schema';
-
-export type ObjectRoleMap = Map<AccessControlObject, UserRole>;
-
-/**
- * Orders roles for numerical comparison. Highest number means higher
- * access levels.
- */
-const userRoleToLevelInInteger = {
-  viewer: 1,
-  editor: 2,
-  manager: 3,
-};
-
-export function getObjectWithHighestPrecedenceByRoles(
-  objectRoleMap: ObjectRoleMap,
-): AccessControlObject {
-  const schemaRole = objectRoleMap.get('schema');
-  const databaseRole = objectRoleMap.get('database');
-  if (schemaRole && databaseRole) {
-    if (
-      userRoleToLevelInInteger[schemaRole] >
-      userRoleToLevelInInteger[databaseRole]
-    ) {
-      return 'schema';
-    }
-    return 'database';
-  }
-  if (schemaRole) {
-    return 'schema';
-  }
-  if (databaseRole) {
-    return 'database';
-  }
-  // Defaults to database when both roles are undefined
-  return 'database';
-}

From 41957357408595858391d0521d9a8ba4115cf9c5 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 15 Jul 2024 08:48:39 +0800
Subject: [PATCH 0425/1141] fix bug introduced via errant vim commands

---
 db/sql/00_msar.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index ded714e73c..50bc3f0757 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3208,7 +3208,7 @@ BEGIN
     -- %1$s  This is a comma separated string of the extracted column names
     string_agg(quote_ident(col_def ->> 'name'), ', '),
     -- %2$s  This is the name of the original (remainder) table
-    -- __msar.get_qualified_relation_name(tab_id),
+    __msar.get_qualified_relation_name(tab_id),
     -- %3$s  This is the new extracted table name
     __msar.get_qualified_relation_name(extracted_table_id),
     -- %4$I  This is the name of the fkey column in the remainder table.

From 863c8b222d5c05f415a8c2a24629caaae5e0a37a Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 15 Jul 2024 16:25:28 +0530
Subject: [PATCH 0426/1141] Remove user.hasPermission method and usage

---
 mathesar_ui/src/components/AppHeader.svelte   |  24 ++--
 .../data-explorer/DataExplorerPage.svelte     |   7 --
 .../src/pages/database/DatabaseDetails.svelte | 102 +++++++--------
 .../src/pages/database/SchemaRow.svelte       |   3 +-
 .../pages/exploration/ExplorationPage.svelte  |  17 +--
 .../src/pages/exploration/Header.svelte       |  15 +--
 .../src/pages/record/DirectField.svelte       |  12 +-
 .../pages/schema/SchemaExplorations.svelte    |   3 +-
 .../src/pages/schema/SchemaOverview.svelte    |  18 +--
 .../src/pages/schema/SchemaPage.svelte        |  24 +---
 .../src/pages/schema/SchemaTables.svelte      |   9 +-
 mathesar_ui/src/pages/schema/TableCard.svelte |  23 ++--
 .../src/pages/schema/TablesList.svelte        |   3 +-
 mathesar_ui/src/routes/SchemaRoute.svelte     |  34 ++---
 mathesar_ui/src/stores/users.ts               |  17 ---
 .../systems/data-explorer/ActionsPane.svelte  |  61 +++++----
 .../systems/data-explorer/DataExplorer.svelte |   3 -
 .../ExplorationInspector.svelte               |   2 -
 .../ExplorationTab.svelte                     |  33 +++--
 .../WithExplorationInspector.svelte           |   8 +-
 .../RecordSelectorContent.svelte              |  12 +-
 .../src/systems/table-view/Body.svelte        |  13 +-
 .../src/systems/table-view/StatusPane.svelte  |  13 +-
 .../src/systems/table-view/TableView.svelte   |  13 +-
 .../actions-pane/ActionsPane.svelte           |  18 +--
 .../actions-pane/MiniActionsPane.svelte       |  10 +-
 .../constraints/ConstraintTypeSection.svelte  |   9 +-
 .../constraints/TableConstraints.svelte       |  14 ---
 .../ColumnHeaderContextMenu.svelte            |  10 +-
 .../src/systems/table-view/row/RowCell.svelte |  40 ++----
 .../table-view/row/RowContextOptions.svelte   |  24 +---
 .../column/ColumnFormatting.svelte            |   4 +-
 .../table-inspector/column/ColumnMode.svelte  |  37 ++----
 .../column/ColumnNameAndDescription.svelte    |   3 -
 .../column/ColumnOptions.svelte               |   5 +-
 .../table-inspector/column/ColumnType.svelte  |   4 +-
 .../column/SetDefaultValue.svelte             |   3 +-
 .../record-summary/RecordSummaryConfig.svelte | 119 ++++++++----------
 .../table-inspector/record/RecordMode.svelte  |  11 --
 .../table-inspector/record/RowActions.svelte  |  24 +---
 .../table-inspector/table/TableActions.svelte |  12 +-
 .../table-inspector/table/TableMode.svelte    |  20 +--
 .../table/links/LinksSectionContainer.svelte  |  17 ++-
 .../table/links/TableLinks.svelte             |   3 -
 44 files changed, 246 insertions(+), 610 deletions(-)

diff --git a/mathesar_ui/src/components/AppHeader.svelte b/mathesar_ui/src/components/AppHeader.svelte
index 0fa38e1483..617f63b60e 100644
--- a/mathesar_ui/src/components/AppHeader.svelte
+++ b/mathesar_ui/src/components/AppHeader.svelte
@@ -46,10 +46,6 @@
 
   $: database = $currentDatabase;
   $: schema = $currentSchema;
-  $: canExecuteDDL = $userProfile?.hasPermission(
-    { database, schema },
-    'canExecuteDDL',
-  );
   $: upgradable = $releaseDataStore?.value?.upgradeStatus === 'upgradable';
   $: isNormalRoutingContext = commonData.routing_context === 'normal';
 
@@ -84,17 +80,15 @@
             <span class="icon"><Icon {...iconShortcuts} /></span>
             <span class="text">{$_('shortcuts')}</span>
           </span>
-          {#if canExecuteDDL}
-            <ButtonMenuItem icon={iconAddNew} on:click={handleCreateEmptyTable}>
-              {$_('new_table_from_scratch')}
-            </ButtonMenuItem>
-            <LinkMenuItem
-              icon={iconAddNew}
-              href={getImportPageUrl(database.id, schema.id)}
-            >
-              {$_('new_table_from_data_import')}
-            </LinkMenuItem>
-          {/if}
+          <ButtonMenuItem icon={iconAddNew} on:click={handleCreateEmptyTable}>
+            {$_('new_table_from_scratch')}
+          </ButtonMenuItem>
+          <LinkMenuItem
+            icon={iconAddNew}
+            href={getImportPageUrl(database.id, schema.id)}
+          >
+            {$_('new_table_from_data_import')}
+          </LinkMenuItem>
           <LinkMenuItem
             icon={iconExploration}
             href={getDataExplorerPageUrl(database.id, schema.id)}
diff --git a/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte b/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte
index 084fd9815c..a92cdde063 100644
--- a/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte
+++ b/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte
@@ -9,20 +9,14 @@
     getExplorationPageUrl,
     getSchemaPageUrl,
   } from '@mathesar/routes/urls';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { DataExplorer } from '@mathesar/systems/data-explorer';
   import type { QueryManager } from '@mathesar/systems/data-explorer/types';
 
-  const userProfile = getUserProfileStoreFromContext();
-
   export let database: Database;
   export let schema: SchemaEntry;
   export let queryManager: QueryManager;
 
   $: ({ query } = queryManager);
-  $: canEditMetadata =
-    $userProfile?.hasPermission({ database, schema }, 'canEditMetadata') ??
-    false;
 
   function gotoSchemaPage() {
     router.goto(getSchemaPageUrl(database.id, schema.id));
@@ -42,7 +36,6 @@
 <LayoutWithHeader fitViewport>
   <DataExplorer
     {queryManager}
-    {canEditMetadata}
     on:close={gotoExplorationPage}
     on:delete={gotoSchemaPage}
   />
diff --git a/mathesar_ui/src/pages/database/DatabaseDetails.svelte b/mathesar_ui/src/pages/database/DatabaseDetails.svelte
index ad10e921cc..e6d37a84fa 100644
--- a/mathesar_ui/src/pages/database/DatabaseDetails.svelte
+++ b/mathesar_ui/src/pages/database/DatabaseDetails.svelte
@@ -55,12 +55,6 @@
   $: schemasMap = $schemasStore.data;
   $: schemasRequestStatus = $schemasStore.requestStatus;
 
-  $: canExecuteDDL = userProfile?.hasPermission({ database }, 'canExecuteDDL');
-  $: canEditPermissions = userProfile?.hasPermission(
-    { database },
-    'canEditPermissions',
-  );
-
   let filterQuery = '';
   let targetSchema: SchemaEntry | undefined;
   let isReflectionRunning = false;
@@ -128,52 +122,50 @@
   }}
 >
   <svelte:fragment slot="action">
-    {#if canExecuteDDL || canEditPermissions}
-      <div>
-        <DropdownMenu
-          showArrow={false}
-          triggerAppearance="plain"
-          label=""
-          closeOnInnerClick={false}
-          icon={iconMoreActions}
-          preferredPlacement="bottom-end"
-          menuStyle="--spacing-y:0.8em;"
+    <div>
+      <DropdownMenu
+        showArrow={false}
+        triggerAppearance="plain"
+        label=""
+        closeOnInnerClick={false}
+        icon={iconMoreActions}
+        preferredPlacement="bottom-end"
+        menuStyle="--spacing-y:0.8em;"
+      >
+        <ButtonMenuItem
+          icon={{ ...iconRefresh, spin: isReflectionRunning }}
+          disabled={isReflectionRunning}
+          on:click={reflect}
         >
+          <div class="reflect">
+            {$_('sync_external_changes')}
+            <Help>
+              <p>
+                {$_('sync_external_changes_structure_help')}
+              </p>
+              <p>
+                {$_('sync_external_changes_data_help')}
+              </p>
+            </Help>
+          </div>
+        </ButtonMenuItem>
+        {#if userProfile?.isSuperUser}
           <ButtonMenuItem
-            icon={{ ...iconRefresh, spin: isReflectionRunning }}
-            disabled={isReflectionRunning}
-            on:click={reflect}
+            icon={iconEdit}
+            on:click={() => editConnectionModal.open()}
           >
-            <div class="reflect">
-              {$_('sync_external_changes')}
-              <Help>
-                <p>
-                  {$_('sync_external_changes_structure_help')}
-                </p>
-                <p>
-                  {$_('sync_external_changes_data_help')}
-                </p>
-              </Help>
-            </div>
+            {$_('edit_connection')}
           </ButtonMenuItem>
-          {#if userProfile?.isSuperUser}
-            <ButtonMenuItem
-              icon={iconEdit}
-              on:click={() => editConnectionModal.open()}
-            >
-              {$_('edit_connection')}
-            </ButtonMenuItem>
-            <ButtonMenuItem
-              icon={iconDeleteMajor}
-              danger
-              on:click={() => deleteConnectionModal.open()}
-            >
-              {$_('delete_connection')}
-            </ButtonMenuItem>
-          {/if}
-        </DropdownMenu>
-      </div>
-    {/if}
+          <ButtonMenuItem
+            icon={iconDeleteMajor}
+            danger
+            on:click={() => deleteConnectionModal.open()}
+          >
+            {$_('delete_connection')}
+          </ButtonMenuItem>
+        {/if}
+      </DropdownMenu>
+    </div>
   </svelte:fragment>
 </AppSecondaryHeader>
 
@@ -187,12 +179,10 @@
     on:clear={handleClearFilterQuery}
   >
     <svelte:fragment slot="action">
-      {#if canExecuteDDL}
-        <Button on:click={addSchema} appearance="primary">
-          <Icon {...iconAddNew} />
-          <span>{$_('create_schema')}</span>
-        </Button>
-      {/if}
+      <Button on:click={addSchema} appearance="primary">
+        <Icon {...iconAddNew} />
+        <span>{$_('create_schema')}</span>
+      </Button>
     </svelte:fragment>
     <p slot="resultInfo">
       <RichText
@@ -213,10 +203,6 @@
             <SchemaRow
               {database}
               {schema}
-              canExecuteDDL={userProfile?.hasPermission(
-                { database, schema },
-                'canExecuteDDL',
-              )}
               on:edit={() => editSchema(schema)}
               on:delete={() => deleteSchema(schema)}
             />
diff --git a/mathesar_ui/src/pages/database/SchemaRow.svelte b/mathesar_ui/src/pages/database/SchemaRow.svelte
index 6eb6c24f72..0ec5795139 100644
--- a/mathesar_ui/src/pages/database/SchemaRow.svelte
+++ b/mathesar_ui/src/pages/database/SchemaRow.svelte
@@ -22,7 +22,6 @@
 
   export let database: Database;
   export let schema: SchemaEntry;
-  export let canExecuteDDL = true;
 
   let isHovered = false;
   let isFocused = false;
@@ -43,7 +42,7 @@
 
     {#if isLocked}
       <div class="lock"><Icon {...iconNotEditable} /></div>
-    {:else if canExecuteDDL}
+    {:else}
       <div class="menu-trigger">
         <DropdownMenu
           showArrow={false}
diff --git a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
index c5372c4f36..f2090eb67d 100644
--- a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
+++ b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
@@ -8,7 +8,6 @@
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
   import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import {
     ExplorationResult,
     QueryModel,
@@ -19,17 +18,11 @@
 
   import Header from './Header.svelte';
 
-  const userProfile = getUserProfileStoreFromContext();
-
   export let database: Database;
   export let schema: SchemaEntry;
   export let query: QueryInstance;
   export let shareConsumer: ShareConsumer | undefined = undefined;
 
-  $: canEditMetadata =
-    $userProfile?.hasPermission({ database, schema }, 'canEditMetadata') ??
-    false;
-
   let queryRunner: QueryRunner | undefined;
   let isInspectorOpen = true;
 
@@ -62,18 +55,10 @@
 <LayoutWithHeader fitViewport>
   {#if queryRunner}
     <div class="exploration-page">
-      <Header
-        bind:isInspectorOpen
-        {query}
-        {database}
-        {schema}
-        {canEditMetadata}
-        {context}
-      />
+      <Header bind:isInspectorOpen {query} {database} {schema} {context} />
       <WithExplorationInspector
         {isInspectorOpen}
         queryHandler={queryRunner}
-        {canEditMetadata}
         on:delete={gotoSchemaPage}
       >
         <ExplorationResult queryHandler={queryRunner} isExplorationPage />
diff --git a/mathesar_ui/src/pages/exploration/Header.svelte b/mathesar_ui/src/pages/exploration/Header.svelte
index 5a96c39484..4fb03e0f6e 100644
--- a/mathesar_ui/src/pages/exploration/Header.svelte
+++ b/mathesar_ui/src/pages/exploration/Header.svelte
@@ -14,7 +14,6 @@
   export let schema: SchemaEntry;
   export let query: QueryInstance;
   export let isInspectorOpen = true;
-  export let canEditMetadata: boolean;
   export let context: 'page' | 'shared-consumer-page' = 'page';
 </script>
 
@@ -27,14 +26,12 @@
 >
   <svelte:fragment slot="actions-right">
     {#if context !== 'shared-consumer-page'}
-      {#if canEditMetadata}
-        <a
-          class="btn btn-primary"
-          href={getExplorationEditorPageUrl(database.id, schema.id, query.id)}
-        >
-          <span>{$_('edit_in_data_explorer')}</span>
-        </a>
-      {/if}
+      <a
+        class="btn btn-primary"
+        href={getExplorationEditorPageUrl(database.id, schema.id, query.id)}
+      >
+        <span>{$_('edit_in_data_explorer')}</span>
+      </a>
       <ShareExplorationDropdown id={query.id} />
     {/if}
     <Button
diff --git a/mathesar_ui/src/pages/record/DirectField.svelte b/mathesar_ui/src/pages/record/DirectField.svelte
index d03a0bc59a..8fe6e239c9 100644
--- a/mathesar_ui/src/pages/record/DirectField.svelte
+++ b/mathesar_ui/src/pages/record/DirectField.svelte
@@ -8,10 +8,7 @@
   import FieldErrors from '@mathesar/components/form/FieldErrors.svelte';
   import Null from '@mathesar/components/Null.svelte';
   import { iconSetToNull } from '@mathesar/icons';
-  import { currentDatabase } from '@mathesar/stores/databases';
-  import { currentSchema } from '@mathesar/stores/schemas';
   import type { ProcessedColumn } from '@mathesar/stores/table-data';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import {
     ButtonMenuItem,
     DropdownMenu,
@@ -22,8 +19,6 @@
 
   import type RecordStore from './RecordStore';
 
-  const userProfile = getUserProfileStoreFromContext();
-
   /**
    * This is used to determine whether to display a `NULL` overlay indicator.
    * For text data types the indicator is important because otherwise the user
@@ -50,17 +45,12 @@
   export let processedColumn: ProcessedColumn;
   export let field: FieldStore;
 
-  $: database = $currentDatabase;
-  $: schema = $currentSchema;
-  $: canEditTableRecords =
-    $userProfile?.hasPermission({ database, schema }, 'canEditTableRecords') ??
-    false;
   $: ({ recordSummaries } = record);
   $: ({ column, abstractType } = processedColumn);
   $: value = $field;
   $: fieldIsDisabled = field.disabled;
   $: ({ showsError } = field);
-  $: disabled = column.primary_key || !canEditTableRecords || $fieldIsDisabled;
+  $: disabled = column.primary_key || $fieldIsDisabled;
   $: shouldDisplayNullOverlay = !cellDataTypesThatUsePlaceholderText.has(
     abstractType.cellInfo.type,
   );
diff --git a/mathesar_ui/src/pages/schema/SchemaExplorations.svelte b/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
index 4cfee93bce..2ffd8711a4 100644
--- a/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
@@ -15,10 +15,9 @@
   export let schema: SchemaEntry;
   export let explorationsMap: Map<number, QueryInstance>;
   export let hasTablesToExplore: boolean;
-  export let canEditMetadata: boolean;
 
   $: showTutorial =
-    explorationsMap.size === 0 && hasTablesToExplore && canEditMetadata;
+    explorationsMap.size === 0 && hasTablesToExplore;
 
   let explorationsSearchQuery = '';
 
diff --git a/mathesar_ui/src/pages/schema/SchemaOverview.svelte b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
index 4385fc2de7..ae479f392a 100644
--- a/mathesar_ui/src/pages/schema/SchemaOverview.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
@@ -27,16 +27,13 @@
   export let tablesRequestStatus: RequestStatus;
   export let explorationsRequestStatus: RequestStatus;
 
-  export let canExecuteDDL: boolean;
-  export let canEditMetadata: boolean;
-
   export let database: Database;
   export let schema: SchemaEntry;
 
   $: hasTables = tablesMap.size > 0;
   $: hasExplorations = explorationsMap.size > 0;
-  $: showTableCreationTutorial = !hasTables && canExecuteDDL;
-  $: showExplorationTutorial = hasTables && !hasExplorations && canEditMetadata;
+  $: showTableCreationTutorial = !hasTables;
+  $: showExplorationTutorial = hasTables && !hasExplorations;
   $: isExplorationsLoading = explorationsRequestStatus.state === 'processing';
 
   // Viewers can explore, they cannot save explorations
@@ -47,9 +44,7 @@
   <div class="vertical-container tables">
     <OverviewHeader title={$_('tables')}>
       <svelte:fragment slot="action">
-        {#if canExecuteDDL}
-          <CreateNewTableButton {database} {schema} />
-        {/if}
+        <CreateNewTableButton {database} {schema} />
       </svelte:fragment>
     </OverviewHeader>
     {#if tablesRequestStatus.state === 'processing'}
@@ -75,12 +70,7 @@
     {:else if showTableCreationTutorial}
       <CreateNewTableTutorial {database} {schema} />
     {:else}
-      <TablesList
-        {canExecuteDDL}
-        tables={[...tablesMap.values()]}
-        {database}
-        {schema}
-      />
+      <TablesList tables={[...tablesMap.values()]} {database} {schema} />
     {/if}
   </div>
   <div class="vertical-container explorations">
diff --git a/mathesar_ui/src/pages/schema/SchemaPage.svelte b/mathesar_ui/src/pages/schema/SchemaPage.svelte
index 6802f85a07..568250c7db 100644
--- a/mathesar_ui/src/pages/schema/SchemaPage.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPage.svelte
@@ -13,11 +13,7 @@
   } from '@mathesar/routes/urls';
   import { modal } from '@mathesar/stores/modal';
   import { queries } from '@mathesar/stores/queries';
-  import {
-    importVerifiedTables as importVerifiedTablesStore,
-    tables as tablesStore,
-  } from '@mathesar/stores/tables';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
+  import { tables as tablesStore } from '@mathesar/stores/tables';
   import { logEvent } from '@mathesar/utils/telemetry';
   import { Button, Icon, TabContainer } from '@mathesar-component-library';
 
@@ -33,15 +29,6 @@
   export let schema: SchemaEntry;
   export let section: string;
 
-  const userProfileStore = getUserProfileStoreFromContext();
-  $: userProfile = $userProfileStore;
-
-  $: canExecuteDDL =
-    userProfile?.hasPermission({ database, schema }, 'canExecuteDDL') ?? false;
-  $: canEditMetadata =
-    userProfile?.hasPermission({ database, schema }, 'canEditMetadata') ??
-    false;
-
   const addEditModal = modal.spawnModalController();
 
   // NOTE: This has to be same as the name key in the paths prop of Route component
@@ -53,7 +40,7 @@
     href: string;
   };
 
-  $: tablesMap = canExecuteDDL ? $tablesStore.data : $importVerifiedTablesStore;
+  $: tablesMap = $tablesStore.data;
   $: explorationsMap = $queries.data;
   $: tablesRequestStatus = $tablesStore.requestStatus;
   $: explorationsRequestStatus = $queries.requestStatus;
@@ -111,7 +98,7 @@
     }}
   >
     <div slot="action">
-      {#if !isDefault && canExecuteDDL}
+      {#if !isDefault}
         <Button on:click={handleEditSchema} appearance="secondary">
           <Icon {...iconEdit} />
           <span>{$_('edit_schema')}</span>
@@ -138,8 +125,6 @@
     {#if activeTab?.id === 'overview'}
       <div class="tab-container">
         <SchemaOverview
-          {canExecuteDDL}
-          {canEditMetadata}
           {tablesRequestStatus}
           {tablesMap}
           {explorationsMap}
@@ -153,7 +138,7 @@
         {#if tablesRequestStatus.state === 'processing'}
           <TableSkeleton numTables={schema.num_tables} />
         {:else}
-          <SchemaTables {canExecuteDDL} {tablesMap} {database} {schema} />
+          <SchemaTables {tablesMap} {database} {schema} />
         {/if}
       </div>
     {:else if activeTab?.id === 'explorations'}
@@ -162,7 +147,6 @@
           <ExplorationSkeleton />
         {:else}
           <SchemaExplorations
-            {canEditMetadata}
             hasTablesToExplore={!!tablesMap.size}
             {explorationsMap}
             {database}
diff --git a/mathesar_ui/src/pages/schema/SchemaTables.svelte b/mathesar_ui/src/pages/schema/SchemaTables.svelte
index a82ca506e9..18c2ca180e 100644
--- a/mathesar_ui/src/pages/schema/SchemaTables.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaTables.svelte
@@ -14,9 +14,8 @@
 
   export let database: Database;
   export let schema: SchemaEntry;
-  export let canExecuteDDL: boolean;
 
-  $: showTutorial = tablesMap.size === 0 && canExecuteDDL;
+  $: showTutorial = tablesMap.size === 0;
 
   let tableSearchQuery = '';
 
@@ -42,9 +41,7 @@
   on:clear={clearQuery}
 >
   <svelte:fragment slot="action">
-    {#if canExecuteDDL}
-      <CreateNewTableButton {database} {schema} />
-    {/if}
+    <CreateNewTableButton {database} {schema} />
   </svelte:fragment>
   <svelte:fragment slot="resultInfo">
     <p>
@@ -64,7 +61,7 @@
     {#if showTutorial}
       <CreateNewTableTutorial {database} {schema} />
     {:else}
-      <TablesList {canExecuteDDL} tables={filteredTables} {database} {schema} />
+      <TablesList tables={filteredTables} {database} {schema} />
     {/if}
   </svelte:fragment>
 </EntityContainerWithFilterBar>
diff --git a/mathesar_ui/src/pages/schema/TableCard.svelte b/mathesar_ui/src/pages/schema/TableCard.svelte
index 727b1702e8..89a30ed485 100644
--- a/mathesar_ui/src/pages/schema/TableCard.svelte
+++ b/mathesar_ui/src/pages/schema/TableCard.svelte
@@ -38,7 +38,6 @@
   export let table: TableEntry;
   export let database: Database;
   export let schema: SchemaEntry;
-  export let canExecuteDDL: boolean;
 
   let isHoveringMenuTrigger = false;
   let isHoveringBottomButton = false;
@@ -141,21 +140,17 @@
         <LinkMenuItem href={explorationPageUrl} icon={iconExploration}>
           {$_('explore_table')}
         </LinkMenuItem>
-        {#if canExecuteDDL}
-          <ButtonMenuItem on:click={handleEditTable} icon={iconEdit}>
-            {$_('edit_table')}
-          </ButtonMenuItem>
-        {/if}
-      {/if}
-      {#if canExecuteDDL}
-        <ButtonMenuItem
-          on:click={handleDeleteTable}
-          danger
-          icon={iconDeleteMajor}
-        >
-          {$_('delete_table')}
+        <ButtonMenuItem on:click={handleEditTable} icon={iconEdit}>
+          {$_('edit_table')}
         </ButtonMenuItem>
       {/if}
+      <ButtonMenuItem
+        on:click={handleDeleteTable}
+        danger
+        icon={iconDeleteMajor}
+      >
+        {$_('delete_table')}
+      </ButtonMenuItem>
     </DropdownMenu>
   </div>
   {#if !isTableImportConfirmationNeeded}
diff --git a/mathesar_ui/src/pages/schema/TablesList.svelte b/mathesar_ui/src/pages/schema/TablesList.svelte
index 1776506bbb..7ea4cc5675 100644
--- a/mathesar_ui/src/pages/schema/TablesList.svelte
+++ b/mathesar_ui/src/pages/schema/TablesList.svelte
@@ -11,12 +11,11 @@
   export let tables: TableEntry[];
   export let database: Database;
   export let schema: SchemaEntry;
-  export let canExecuteDDL: boolean;
 </script>
 
 <div class="container">
   {#each tables as table (table.id)}
-    <TableCard {canExecuteDDL} {table} {database} {schema} />
+    <TableCard {table} {database} {schema} />
   {:else}
     <EmptyEntity icon={iconTable}>
       <p>{$_('no_tables')}</p>
diff --git a/mathesar_ui/src/routes/SchemaRoute.svelte b/mathesar_ui/src/routes/SchemaRoute.svelte
index 7096a66552..bcd533d64c 100644
--- a/mathesar_ui/src/routes/SchemaRoute.svelte
+++ b/mathesar_ui/src/routes/SchemaRoute.svelte
@@ -9,33 +9,17 @@
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import SchemaPage from '@mathesar/pages/schema/SchemaPage.svelte';
   import { currentSchemaId, schemas } from '@mathesar/stores/schemas';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
 
   import DataExplorerRoute from './DataExplorerRoute.svelte';
   import ExplorationRoute from './ExplorationRoute.svelte';
   import ImportRoute from './ImportRoute.svelte';
   import TableRoute from './TableRoute.svelte';
 
-  const userProfile = getUserProfileStoreFromContext();
-
   export let database: Database;
   export let schemaId: number;
 
   $: $currentSchemaId = schemaId;
   $: schema = $schemas.data.get(schemaId);
-  $: canExecuteDDL = $userProfile?.hasPermission(
-    { database, schema },
-    'canExecuteDDL',
-  );
-  $: canEditMetadata = $userProfile?.hasPermission(
-    { database, schema },
-    'canEditMetadata',
-  );
-
-  const newExplorationRoute = {
-    name: 'new-exploration',
-    path: '/data-explorer/',
-  };
 
   function handleUnmount() {
     $currentSchemaId = undefined;
@@ -47,11 +31,9 @@
 {#if schema}
   <AppendBreadcrumb item={{ type: 'schema', database, schema }} />
 
-  {#if canExecuteDDL}
-    <Route path="/import/*" firstmatch>
-      <ImportRoute {database} {schema} />
-    </Route>
-  {/if}
+  <Route path="/import/*" firstmatch>
+    <ImportRoute {database} {schema} />
+  </Route>
 
   <Route path="/tables/:tableId/*" let:meta firstmatch>
     <TableRoute
@@ -70,12 +52,10 @@
   </Route>
 
   <MultiPathRoute
-    paths={canEditMetadata
-      ? [
-          { name: 'edit-exploration', path: '/explorations/:queryId/edit/' },
-          newExplorationRoute,
-        ]
-      : [newExplorationRoute]}
+    paths={[
+      { name: 'edit-exploration', path: '/explorations/:queryId/edit/' },
+      { name: 'new-exploration', path: '/data-explorer/' },
+    ]}
     let:path
     let:meta
   >
diff --git a/mathesar_ui/src/stores/users.ts b/mathesar_ui/src/stores/users.ts
index 77760b5b63..73aef0e03e 100644
--- a/mathesar_ui/src/stores/users.ts
+++ b/mathesar_ui/src/stores/users.ts
@@ -34,19 +34,6 @@ export class UserModel {
     this.displayLanguage = userDetails.display_language;
   }
 
-  hasPermission(
-    dbObject: {
-      database?: Pick<Database, 'id'>;
-      schema?: Pick<SchemaEntry, 'id'>;
-    },
-    operation: unknown,
-  ): boolean {
-    if (this.isSuperUser) {
-      return true;
-    }
-    return true;
-  }
-
   getDisplayName(): string {
     return this.username;
   }
@@ -81,10 +68,6 @@ export class AnonymousViewerUserModel extends UserModel {
       display_language: 'en',
     });
   }
-
-  hasPermission() {
-    return false;
-  }
 }
 
 const contextKey = Symbol('users list store');
diff --git a/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte b/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
index fdda3a127f..b0867c1b87 100644
--- a/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
+++ b/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
@@ -39,7 +39,6 @@
   export let linkCollapsibleOpenState: Record<ColumnWithLink['id'], boolean> =
     {};
   export let isInspectorOpen: boolean;
-  export let canEditMetadata: boolean;
 
   $: ({ query, state, queryHasUnsavedChanges } = queryManager);
   $: currentTable = $query.base_table
@@ -155,37 +154,35 @@
 
     <svelte:fragment slot="actions-right">
       {#if currentTable}
-        {#if canEditMetadata}
-          <InputGroup>
-            <!-- TODO: Change disabled condition to is_valid(query) -->
-            <SpinnerButton
-              label={querySaveRequestStatus === 'processing'
-                ? $_('saving')
-                : $_('save')}
-              disabled={!$query.base_table ||
-                hasNoColumns ||
-                querySaveRequestStatus === 'processing'}
-              onClick={saveExistingOrCreateNew}
-            />
-            {#if isSaved}
-              <DropdownMenu
-                triggerAppearance="primary"
-                placements={['bottom-end']}
-                closeOnInnerClick={true}
-                icon={{
-                  ...iconExpandDown,
-                  size: '0.8em',
-                }}
-                showArrow={false}
-              >
-                <ButtonMenuItem on:click={save}>{$_('save')}</ButtonMenuItem>
-                <ButtonMenuItem on:click={saveAndClose}>
-                  {$_('save_and_close')}
-                </ButtonMenuItem>
-              </DropdownMenu>
-            {/if}
-          </InputGroup>
-        {/if}
+        <InputGroup>
+          <!-- TODO: Change disabled condition to is_valid(query) -->
+          <SpinnerButton
+            label={querySaveRequestStatus === 'processing'
+              ? $_('saving')
+              : $_('save')}
+            disabled={!$query.base_table ||
+              hasNoColumns ||
+              querySaveRequestStatus === 'processing'}
+            onClick={saveExistingOrCreateNew}
+          />
+          {#if isSaved}
+            <DropdownMenu
+              triggerAppearance="primary"
+              placements={['bottom-end']}
+              closeOnInnerClick={true}
+              icon={{
+                ...iconExpandDown,
+                size: '0.8em',
+              }}
+              showArrow={false}
+            >
+              <ButtonMenuItem on:click={save}>{$_('save')}</ButtonMenuItem>
+              <ButtonMenuItem on:click={saveAndClose}>
+                {$_('save_and_close')}
+              </ButtonMenuItem>
+            </DropdownMenu>
+          {/if}
+        </InputGroup>
 
         <InputGroup>
           <Button
diff --git a/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte b/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte
index a8118e14d0..8a203fb6df 100644
--- a/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte
+++ b/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte
@@ -14,7 +14,6 @@
   export let queryManager: QueryManager;
   export let linkCollapsibleOpenState: Record<ColumnWithLink['id'], boolean> =
     {};
-  export let canEditMetadata: boolean;
 
   $: ({ query } = queryManager);
   $: hasNoColumns = $query.initial_columns.length === 0;
@@ -25,7 +24,6 @@
 <div class="data-explorer">
   <ActionsPane
     {queryManager}
-    {canEditMetadata}
     bind:linkCollapsibleOpenState
     bind:isInspectorOpen
     on:close
@@ -59,7 +57,6 @@
           <WithExplorationInspector
             {isInspectorOpen}
             queryHandler={queryManager}
-            {canEditMetadata}
             on:delete
           >
             <ResultPane queryHandler={queryManager} />
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte
index cc8fb8dc09..020482c93c 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationInspector.svelte
@@ -11,7 +11,6 @@
   import ExplorationTab from './ExplorationTab.svelte';
 
   export let queryHandler: QueryRunner | QueryManager;
-  export let canEditMetadata: boolean;
 
   $: ({ inspector, query } = queryHandler);
   $: ({ tabs, activeTab } = inspector);
@@ -36,7 +35,6 @@
         {queryHandler}
         name={$query.name}
         description={$query.description}
-        {canEditMetadata}
         on:delete
       />
     {:else if $activeTab.id === 'column'}
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte
index e6001b2a66..714924618a 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte
@@ -28,7 +28,6 @@
   export let queryHandler: QueryRunner | QueryManager;
   export let name: string | undefined;
   export let description: string | undefined;
-  export let canEditMetadata: boolean;
 
   $: ({ query } = queryHandler);
   $: hasManager = queryHandler instanceof QueryManager;
@@ -109,7 +108,6 @@
             aria-label={$_('name')}
             on:change={handleNameChange}
             on:input={setHasChangesToTrue}
-            disabled={!canEditMetadata}
           />
         </LabeledInput>
       </FormField>
@@ -120,12 +118,11 @@
             aria-label={$_('description')}
             on:change={handleDescriptionChange}
             on:input={setHasChangesToTrue}
-            disabled={!canEditMetadata}
           />
         </LabeledInput>
       </FormField>
 
-      {#if !hasManager && hasChanges && canEditMetadata}
+      {#if !hasManager && hasChanges}
         <FormField>
           <CancelOrProceedButtonPair
             cancelButton={{ icon: undefined }}
@@ -139,18 +136,16 @@
   </div>
 </Collapsible>
 
-{#if canEditMetadata}
-  <Collapsible isOpen triggerAppearance="plain">
-    <span slot="header">{$_('actions')}</span>
-    <div slot="content" class="section-content actions">
-      <Button
-        class="delete-button"
-        appearance="outline-primary"
-        on:click={handleDeleteExploration}
-      >
-        <Icon {...iconDeleteMajor} />
-        <span>{$_('delete_exploration')}</span>
-      </Button>
-    </div>
-  </Collapsible>
-{/if}
+<Collapsible isOpen triggerAppearance="plain">
+  <span slot="header">{$_('actions')}</span>
+  <div slot="content" class="section-content actions">
+    <Button
+      class="delete-button"
+      appearance="outline-primary"
+      on:click={handleDeleteExploration}
+    >
+      <Icon {...iconDeleteMajor} />
+      <span>{$_('delete_exploration')}</span>
+    </Button>
+  </div>
+</Collapsible>
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/WithExplorationInspector.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/WithExplorationInspector.svelte
index b03250fb52..3226e0f1e2 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/WithExplorationInspector.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/WithExplorationInspector.svelte
@@ -8,7 +8,6 @@
 
   export let isInspectorOpen: boolean;
   export let queryHandler: QueryRunner | QueryManager;
-  export let canEditMetadata: boolean;
 </script>
 
 <WithPanel
@@ -18,10 +17,5 @@
   maxSizePx={600}
 >
   <slot />
-  <ExplorationInspector
-    slot="panel"
-    {queryHandler}
-    {canEditMetadata}
-    on:delete
-  />
+  <ExplorationInspector slot="panel" {queryHandler} on:delete />
 </WithPanel>
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
index 4f34d7bd3c..83b51073fd 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
@@ -5,8 +5,6 @@
   import type { Response as ApiRecordsResponse } from '@mathesar/api/rest/types/tables/records';
   import { States, postAPI } from '@mathesar/api/rest/utils/requestUtils';
   import { iconAddNew } from '@mathesar/icons';
-  import { currentDatabase } from '@mathesar/stores/databases';
-  import { currentSchema } from '@mathesar/stores/schemas';
   import { storeToGetRecordPageUrl } from '@mathesar/stores/storeBasedUrls';
   import type { TabularData } from '@mathesar/stores/table-data';
   import {
@@ -17,7 +15,6 @@
   import { getPkValueInRecord } from '@mathesar/stores/table-data/records';
   import { tables } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { getErrorMessage } from '@mathesar/utils/errors';
   import { Button, Icon, Spinner } from '@mathesar-component-library';
 
@@ -27,8 +24,6 @@
   } from './RecordSelectorController';
   import RecordSelectorTable from './RecordSelectorTable.svelte';
 
-  const userProfile = getUserProfileStoreFromContext();
-
   export let controller: RecordSelectorController;
   export let tabularData: TabularData;
   export let nestedController: RecordSelectorController;
@@ -38,11 +33,6 @@
   /** true when the user is hover on the "Create new record" button. */
   let isHoveringCreate = false;
 
-  $: database = $currentDatabase;
-  $: schema = $currentSchema;
-  $: canEditTableRecords =
-    $userProfile?.hasPermission({ database, schema }, 'canEditTableRecords') ??
-    false;
   $: ({
     constraintsDataStore,
     meta,
@@ -151,7 +141,7 @@
   {/if}
 
   <div class="footer">
-    {#if hasSearchQueries && canEditTableRecords}
+    {#if hasSearchQueries}
       <div class="button">
         <Button
           size="small"
diff --git a/mathesar_ui/src/systems/table-view/Body.svelte b/mathesar_ui/src/systems/table-view/Body.svelte
index 7df9ccc832..1cba547258 100644
--- a/mathesar_ui/src/systems/table-view/Body.svelte
+++ b/mathesar_ui/src/systems/table-view/Body.svelte
@@ -5,8 +5,6 @@
     helpTextRowHeightPx,
     rowHeightPx,
   } from '@mathesar/geometry';
-  import { currentDatabase } from '@mathesar/stores/databases';
-  import { currentSchema } from '@mathesar/stores/schemas';
   import {
     type Row as RowType,
     getRowKey,
@@ -15,20 +13,11 @@
     isHelpTextRow,
     isPlaceholderRow,
   } from '@mathesar/stores/table-data';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
 
   import Row from './row/Row.svelte';
   import ScrollAndResetHandler from './ScrollAndResetHandler.svelte';
 
   const tabularData = getTabularDataStoreFromContext();
-  const userProfile = getUserProfileStoreFromContext();
-
-  $: database = $currentDatabase;
-  $: schema = $currentSchema;
-  $: canEditTableRecords = !!$userProfile?.hasPermission(
-    { database, schema },
-    'canEditTableRecords',
-  );
 
   export let usesVirtualList = false;
 
@@ -72,7 +61,7 @@
     >
       <ScrollAndResetHandler {api} />
       {#each items as item (item.key)}
-        {#if $displayableRecords[item.index] && !(isPlaceholderRow($displayableRecords[item.index]) && !canEditTableRecords)}
+        {#if $displayableRecords[item.index] && !isPlaceholderRow($displayableRecords[item.index])}
           <Row style={item.style} bind:row={$displayableRecords[item.index]} />
         {/if}
       {/each}
diff --git a/mathesar_ui/src/systems/table-view/StatusPane.svelte b/mathesar_ui/src/systems/table-view/StatusPane.svelte
index 1b404872eb..47cc809848 100644
--- a/mathesar_ui/src/systems/table-view/StatusPane.svelte
+++ b/mathesar_ui/src/systems/table-view/StatusPane.svelte
@@ -5,10 +5,7 @@
   import PaginationGroup from '@mathesar/components/PaginationGroup.svelte';
   import RefreshButton from '@mathesar/components/RefreshButton.svelte';
   import { iconAddNew } from '@mathesar/icons';
-  import { currentDatabase } from '@mathesar/stores/databases';
-  import { currentSchema } from '@mathesar/stores/schemas';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import {
     Button,
     Icon,
@@ -16,14 +13,6 @@
   } from '@mathesar-component-library';
 
   const tabularData = getTabularDataStoreFromContext();
-  const userProfile = getUserProfileStoreFromContext();
-
-  $: database = $currentDatabase;
-  $: schema = $currentSchema;
-  $: canEditTableRecords = !!$userProfile?.hasPermission(
-    { database, schema },
-    'canEditTableRecords',
-  );
 
   export let context: 'page' | 'widget' | 'shared-consumer-page' = 'page';
 
@@ -40,7 +29,7 @@
     $columnsFetchStatus?.state === 'failure' ||
     recordState === States.Error ||
     $constraintsDataStore.state === States.Error;
-  $: hasNewRecordButton = context !== 'widget' && canEditTableRecords;
+  $: hasNewRecordButton = context !== 'widget';
   $: refreshButtonState = (() => {
     let buttonState: 'loading' | 'error' | undefined = undefined;
     if ($isLoading) {
diff --git a/mathesar_ui/src/systems/table-view/TableView.svelte b/mathesar_ui/src/systems/table-view/TableView.svelte
index 833a2d7368..c49b166f18 100644
--- a/mathesar_ui/src/systems/table-view/TableView.svelte
+++ b/mathesar_ui/src/systems/table-view/TableView.svelte
@@ -8,15 +8,12 @@
   import { Sheet } from '@mathesar/components/sheet';
   import { SheetClipboardHandler } from '@mathesar/components/sheet/SheetClipboardHandler';
   import { rowHeaderWidthPx } from '@mathesar/geometry';
-  import { currentDatabase } from '@mathesar/stores/databases';
-  import { currentSchema } from '@mathesar/stores/schemas';
   import {
     ID_ADD_NEW_COLUMN,
     ID_ROW_CONTROL_COLUMN,
     getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
   import { toast } from '@mathesar/stores/toast';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { stringifyMapKeys } from '@mathesar/utils/collectionUtils';
 
   import Body from './Body.svelte';
@@ -27,14 +24,6 @@
   type Context = 'page' | 'widget' | 'shared-consumer-page';
 
   const tabularData = getTabularDataStoreFromContext();
-  const userProfile = getUserProfileStoreFromContext();
-
-  $: database = $currentDatabase;
-  $: schema = $currentSchema;
-  $: canExecuteDDL = !!$userProfile?.hasPermission(
-    { database, schema },
-    'canExecuteDDL',
-  );
 
   export let context: Context = 'page';
   export let table: Pick<TableEntry, 'id' | 'settings' | 'schema'>;
@@ -44,7 +33,7 @@
     'table';
 
   $: usesVirtualList = context !== 'widget';
-  $: allowsDdlOperations = context !== 'widget' && canExecuteDDL;
+  $: allowsDdlOperations = context !== 'widget';
   $: sheetHasBorder = context === 'widget';
   $: ({ processedColumns, display, isLoading, selection, recordsData } =
     $tabularData);
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte b/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
index a7277b088b..09567744ac 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
@@ -5,10 +5,7 @@
   import EntityPageHeader from '@mathesar/components/EntityPageHeader.svelte';
   import ModificationStatus from '@mathesar/components/ModificationStatus.svelte';
   import { iconInspector, iconTable } from '@mathesar/icons';
-  import { currentDatabase } from '@mathesar/stores/databases';
-  import { currentSchema } from '@mathesar/stores/schemas';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { Button, Icon } from '@mathesar-component-library';
 
   import FilterDropdown from './record-operations/filter/FilterDropdown.svelte';
@@ -19,7 +16,6 @@
   type TableActionsContext = 'page' | 'shared-consumer-page';
 
   const tabularData = getTabularDataStoreFromContext();
-  const userProfile = getUserProfileStoreFromContext();
 
   export let context: TableActionsContext = 'page';
   export let table: Pick<TableEntry, 'name' | 'description'>;
@@ -27,14 +23,8 @@
   $: ({ id, meta, isLoading, display } = $tabularData);
   $: ({ filtering, sorting, grouping, sheetState } = meta);
   $: ({ isTableInspectorVisible } = display);
-  $: canEditMetadata = !!$userProfile?.hasPermission(
-    { database: $currentDatabase, schema: $currentSchema },
-    'canEditMetadata',
-  );
-  $: canViewLinkedEntities = !!$userProfile?.hasPermission(
-    { database: $currentDatabase, schema: $currentSchema },
-    'canViewLinkedEntities',
-  );
+
+  const canViewLinkedEntities = true;
 
   function toggleTableInspector() {
     isTableInspectorVisible.set(!$isTableInspectorVisible);
@@ -60,9 +50,7 @@
 
   <div class="aux-actions" slot="actions-right">
     {#if context === 'page'}
-      {#if canEditMetadata}
-        <ShareTableDropdown {id} />
-      {/if}
+      <ShareTableDropdown {id} />
 
       <Button
         appearance="secondary"
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/MiniActionsPane.svelte b/mathesar_ui/src/systems/table-view/actions-pane/MiniActionsPane.svelte
index 4bafe9bae0..07427d7b1f 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/MiniActionsPane.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/MiniActionsPane.svelte
@@ -2,21 +2,13 @@
   import type { ComponentProps } from 'svelte';
 
   import type { Dropdown } from '@mathesar/component-library';
-  import { currentDatabase } from '@mathesar/stores/databases';
-  import { currentSchema } from '@mathesar/stores/schemas';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
 
   import FilterDropdown from './record-operations/filter/FilterDropdown.svelte';
   import GroupDropdown from './record-operations/group/GroupDropdown.svelte';
   import SortDropdown from './record-operations/sort/SortDropdown.svelte';
 
-  const userProfile = getUserProfileStoreFromContext();
-
-  $: canViewLinkedEntities = !!$userProfile?.hasPermission(
-    { database: $currentDatabase, schema: $currentSchema },
-    'canViewLinkedEntities',
-  );
+  const canViewLinkedEntities = true;
 
   const dropdownProps: Partial<ComponentProps<Dropdown>> = {
     placement: 'bottom-end',
diff --git a/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte b/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
index 09a85d67e7..093c147951 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
@@ -16,7 +16,6 @@
 
   export let constraintType: ConstraintType;
   export let constraints: Constraint[];
-  export let canExecuteDDL: boolean;
 
   const tabularData = getTabularDataStoreFromContext();
 
@@ -66,12 +65,8 @@
     });
   }
 
-  $: canAdd =
-    CONSTRAINT_TYPE_SUPPORTING_CAN_ADD.includes(constraintType) &&
-    canExecuteDDL;
-  $: canDrop =
-    CONSTRAINT_TYPE_SUPPORTING_CAN_DROP.includes(constraintType) &&
-    canExecuteDDL;
+  $: canAdd = CONSTRAINT_TYPE_SUPPORTING_CAN_ADD.includes(constraintType);
+  $: canDrop = CONSTRAINT_TYPE_SUPPORTING_CAN_DROP.includes(constraintType);
 </script>
 
 <div class="constraint-type-section">
diff --git a/mathesar_ui/src/systems/table-view/constraints/TableConstraints.svelte b/mathesar_ui/src/systems/table-view/constraints/TableConstraints.svelte
index ac4c4ffae6..70d97683cc 100644
--- a/mathesar_ui/src/systems/table-view/constraints/TableConstraints.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/TableConstraints.svelte
@@ -3,22 +3,16 @@
 
   import type { ConstraintType } from '@mathesar/api/rest/types/tables/constraints';
   import { States } from '@mathesar/api/rest/utils/requestUtils';
-  import { currentDatabase } from '@mathesar/stores/databases';
-  import { currentSchema } from '@mathesar/stores/schemas';
   import {
     type Constraint,
     getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { Icon, iconLoading } from '@mathesar-component-library';
 
   import ConstraintTypeSection from './ConstraintTypeSection.svelte';
 
   const tabularData = getTabularDataStoreFromContext();
-  const userProfile = getUserProfileStoreFromContext();
 
-  $: database = $currentDatabase;
-  $: schema = $currentSchema;
   $: constraintsDataStore = $tabularData.constraintsDataStore;
   $: state = $constraintsDataStore.state;
   $: errorMsg = $constraintsDataStore.error;
@@ -48,11 +42,6 @@
   // subsequent updates so that we can rely on the spinner used on the button
   // for the more specific update.
   $: shouldShowLoadingSpinner = isEmpty && isLoading;
-
-  $: canExecuteDDL = !!$userProfile?.hasPermission(
-    { database, schema },
-    'canExecuteDDL',
-  );
 </script>
 
 <div class="table-constraints">
@@ -68,17 +57,14 @@
       <ConstraintTypeSection
         constraintType="primary"
         constraints={constraintsGroupedByType.get('primary') || []}
-        {canExecuteDDL}
       />
       <ConstraintTypeSection
         constraintType="foreignkey"
         constraints={constraintsGroupedByType.get('foreignkey') || []}
-        {canExecuteDDL}
       />
       <ConstraintTypeSection
         constraintType="unique"
         constraints={constraintsGroupedByType.get('unique') || []}
-        {canExecuteDDL}
       />
     </div>
   {/if}
diff --git a/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte b/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte
index 2d426179ba..942ae0274b 100644
--- a/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte
+++ b/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte
@@ -16,25 +16,17 @@
     iconTable,
   } from '@mathesar/icons';
   import { getImperativeFilterControllerFromContext } from '@mathesar/pages/table/ImperativeFilterController';
-  import { currentDatabase } from '@mathesar/stores/databases';
-  import { currentSchema } from '@mathesar/stores/schemas';
   import { storeToGetTablePageUrl } from '@mathesar/stores/storeBasedUrls';
   import {
     type ProcessedColumn,
     getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
   import { tables } from '@mathesar/stores/tables';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { ButtonMenuItem, LinkMenuItem } from '@mathesar-component-library';
 
-  const userProfile = getUserProfileStoreFromContext();
-
   export let processedColumn: ProcessedColumn;
 
-  $: canViewLinkedEntities = !!$userProfile?.hasPermission(
-    { database: $currentDatabase, schema: $currentSchema },
-    'canViewLinkedEntities',
-  );
+  const canViewLinkedEntities = true;
 
   $: columnAllowsFiltering = processedColumn.linkFk
     ? canViewLinkedEntities
diff --git a/mathesar_ui/src/systems/table-view/row/RowCell.svelte b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
index 6240c92b8c..3bfbb3d143 100644
--- a/mathesar_ui/src/systems/table-view/row/RowCell.svelte
+++ b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
@@ -15,8 +15,6 @@
   import type SheetSelection from '@mathesar/components/sheet/selection/SheetSelection';
   import { handleKeyboardEventOnCell } from '@mathesar/components/sheet/sheetKeyboardUtils';
   import { iconLinkToRecordPage, iconSetToNull } from '@mathesar/icons';
-  import { currentDatabase } from '@mathesar/stores/databases';
-  import { currentSchema } from '@mathesar/stores/schemas';
   import { storeToGetRecordPageUrl } from '@mathesar/stores/storeBasedUrls';
   import {
     type CellKey,
@@ -26,7 +24,6 @@
     rowHasNewRecord,
   } from '@mathesar/stores/table-data';
   import { getRowSelectionId } from '@mathesar/stores/table-data/records';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import {
     ButtonMenuItem,
     ContextMenu,
@@ -52,19 +49,8 @@
   export let value: unknown = undefined;
   export let rowKey: string;
 
-  const userProfile = getUserProfileStoreFromContext();
-
   $: cellId = makeCellId(getRowSelectionId(row), String(processedColumn.id));
-  $: database = $currentDatabase;
-  $: schema = $currentSchema;
-  $: canEditTableRecords = !!$userProfile?.hasPermission(
-    { database, schema },
-    'canEditTableRecords',
-  );
-  $: canViewLinkedEntities = !!$userProfile?.hasPermission(
-    { database, schema },
-    'canViewLinkedEntities',
-  );
+  const canViewLinkedEntities = true;
   $: recordsDataState = recordsData.state;
   $: ({ recordSummaries } = recordsData);
   $: ({ column, linkFk } = processedColumn);
@@ -77,7 +63,7 @@
   $: canSetNull = column.nullable && value !== null;
   $: hasError = !!errors.length;
   $: isProcessing = modificationStatus?.state === 'processing';
-  $: isEditable = !column.primary_key && canEditTableRecords;
+  $: isEditable = !column.primary_key;
   $: getRecordPageUrl = $storeToGetRecordPageUrl;
   $: linkedRecordHref = linkFk
     ? getRecordPageUrl({ tableId: linkFk.referent_table, recordId: value })
@@ -142,18 +128,16 @@
     lightText={hasError || isProcessing}
   />
   <ContextMenu>
-    {#if canEditTableRecords || showLinkedRecordHyperLink}
+    {#if showLinkedRecordHyperLink}
       <MenuHeading>{$_('cell')}</MenuHeading>
-      {#if canEditTableRecords}
-        <ButtonMenuItem
-          icon={iconSetToNull}
-          disabled={!canSetNull}
-          on:click={() => setValue(null)}
-        >
-          {$_('set_to')}
-          <Null />
-        </ButtonMenuItem>
-      {/if}
+      <ButtonMenuItem
+        icon={iconSetToNull}
+        disabled={!canSetNull}
+        on:click={() => setValue(null)}
+      >
+        {$_('set_to')}
+        <Null />
+      </ButtonMenuItem>
       {#if showLinkedRecordHyperLink && linkedRecordHref}
         <LinkMenuItem icon={iconLinkToRecordPage} href={linkedRecordHref}>
           <RichText text={$_('open_named_record')} let:slotName>
@@ -171,7 +155,7 @@
     <ColumnHeaderContextMenu {processedColumn} />
 
     <!-- Row -->
-    {#if canEditTableRecords || showLinkedRecordHyperLink}
+    {#if showLinkedRecordHyperLink}
       <MenuDivider />
       <MenuHeading>{$_('row')}</MenuHeading>
       <RowContextOptions recordPk={rowKey} {recordsData} {row} />
diff --git a/mathesar_ui/src/systems/table-view/row/RowContextOptions.svelte b/mathesar_ui/src/systems/table-view/row/RowContextOptions.svelte
index cd0cd83d7e..f163e9266b 100644
--- a/mathesar_ui/src/systems/table-view/row/RowContextOptions.svelte
+++ b/mathesar_ui/src/systems/table-view/row/RowContextOptions.svelte
@@ -3,8 +3,6 @@
 
   import { iconDeleteMajor } from '@mathesar/icons';
   import { confirmDelete } from '@mathesar/stores/confirmation';
-  import { currentDatabase } from '@mathesar/stores/databases';
-  import { currentSchema } from '@mathesar/stores/schemas';
   import { storeToGetRecordPageUrl } from '@mathesar/stores/storeBasedUrls';
   import {
     type RecordRow,
@@ -13,7 +11,6 @@
   } from '@mathesar/stores/table-data';
   import { getRowSelectionId } from '@mathesar/stores/table-data/records';
   import { toast } from '@mathesar/stores/toast';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import {
     ButtonMenuItem,
     LinkMenuItem,
@@ -24,18 +21,7 @@
   export let recordPk: string;
   export let recordsData: RecordsData;
 
-  const userProfile = getUserProfileStoreFromContext();
-
-  $: database = $currentDatabase;
-  $: schema = $currentSchema;
-  $: canEditTableRecords = !!$userProfile?.hasPermission(
-    { database, schema },
-    'canEditTableRecords',
-  );
-  $: canViewLinkedEntities = !!$userProfile?.hasPermission(
-    { database, schema },
-    'canViewLinkedEntities',
-  );
+  const canViewLinkedEntities = true;
 
   async function handleDeleteRecords() {
     if (rowHasRecord(row)) {
@@ -64,8 +50,6 @@
     {$_('go_to_record_page')}
   </LinkMenuItem>
 {/if}
-{#if canEditTableRecords}
-  <ButtonMenuItem on:click={handleDeleteRecords} icon={iconDeleteMajor}>
-    {$_('delete_records', { values: { count: 1 } })}
-  </ButtonMenuItem>
-{/if}
+<ButtonMenuItem on:click={handleDeleteRecords} icon={iconDeleteMajor}>
+  {$_('delete_records', { values: { count: 1 } })}
+</ButtonMenuItem>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte
index 3ed265bb0f..b2e2a4859b 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte
@@ -14,7 +14,6 @@
   import { toast } from '@mathesar/stores/toast';
 
   export let column: ProcessedColumn;
-  export let canEditMetadata: boolean;
 
   let actionButtonsVisible = false;
 
@@ -67,8 +66,7 @@
   }
 
   $: isFkOrPk = column.column.primary_key || !!column.linkFk;
-  $: isFormDisabled =
-    typeChangeState?.state === 'processing' || !canEditMetadata;
+  $: isFormDisabled = typeChangeState?.state === 'processing';
 </script>
 
 {#if displayOptionsConfig && displayForm && !isFkOrPk}
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
index fd9af53489..980c574a4d 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
@@ -1,11 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import { currentDatabase } from '@mathesar/stores/databases';
-  import { currentSchema } from '@mathesar/stores/schemas';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import { tables } from '@mathesar/stores/tables';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import FkRecordSummaryConfig from '@mathesar/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte';
   import { Collapsible } from '@mathesar-component-library';
 
@@ -20,10 +17,7 @@
   import SetDefaultValue from './SetDefaultValue.svelte';
 
   const tabularData = getTabularDataStoreFromContext();
-  const userProfile = getUserProfileStoreFromContext();
 
-  $: database = $currentDatabase;
-  $: schema = $currentSchema;
   $: ({ processedColumns, selection } = $tabularData);
   $: selectedColumns = (() => {
     const ids = $selection.columnIds;
@@ -47,15 +41,6 @@
   })();
   /** When only one column is selected */
   $: column = selectedColumns.length === 1 ? selectedColumns[0] : undefined;
-
-  $: canExecuteDDL = !!$userProfile?.hasPermission(
-    { database, schema },
-    'canExecuteDDL',
-  );
-  $: canEditMetadata = !!$userProfile?.hasPermission(
-    { database, schema },
-    'canEditMetadata',
-  );
 </script>
 
 <div class="column-mode-container">
@@ -83,7 +68,6 @@
             <ColumnNameAndDescription
               {column}
               columnsDataStore={$tabularData.columnsDataStore}
-              {canExecuteDDL}
             />
             {#if column.column.primary_key}
               <ColumnTypeSpecifierTag {column} type="primaryKey" />
@@ -95,7 +79,6 @@
                 {column}
                 columnsDataStore={$tabularData.columnsDataStore}
                 constraintsDataStore={$tabularData.constraintsDataStore}
-                {canExecuteDDL}
               />
             {/if}
           </div>
@@ -111,7 +94,7 @@
           isDbLevelConfiguration
         />
         <div slot="content" class="content-container">
-          <ColumnType {column} {canExecuteDDL} />
+          <ColumnType {column} />
         </div>
       </Collapsible>
     {/if}
@@ -124,7 +107,7 @@
           isDbLevelConfiguration
         />
         <div slot="content" class="content-container">
-          <SetDefaultValue {column} {canExecuteDDL} />
+          <SetDefaultValue {column} />
         </div>
       </Collapsible>
     {/if}
@@ -134,7 +117,7 @@
         <CollapsibleHeader slot="header" title={$_('formatting')} />
         <div slot="content" class="content-container">
           {#key column}
-            <ColumnFormatting {column} {canEditMetadata} />
+            <ColumnFormatting {column} />
           {/key}
         </div>
       </Collapsible>
@@ -159,14 +142,12 @@
       {/if}
     {/if}
 
-    {#if canExecuteDDL}
-      <Collapsible isOpen triggerAppearance="plain">
-        <CollapsibleHeader slot="header" title={$_('actions')} />
-        <div slot="content" class="content-container">
-          <ColumnActions columns={selectedColumns} />
-        </div>
-      </Collapsible>
-    {/if}
+    <Collapsible isOpen triggerAppearance="plain">
+      <CollapsibleHeader slot="header" title={$_('actions')} />
+      <div slot="content" class="content-container">
+        <ColumnActions columns={selectedColumns} />
+      </div>
+    </Collapsible>
   {/if}
 </div>
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnNameAndDescription.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnNameAndDescription.svelte
index 58f552d10c..4873d8cb04 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnNameAndDescription.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnNameAndDescription.svelte
@@ -11,7 +11,6 @@
 
   export let column: ProcessedColumn;
   export let columnsDataStore: ColumnsDataStore;
-  export let canExecuteDDL: boolean;
 
   $: ({ columns } = columnsDataStore);
 
@@ -56,7 +55,6 @@
     initialValue={column.column.name}
     onSubmit={handleColumnNameChange}
     {getValidationErrors}
-    disabled={!canExecuteDDL}
   />
 </div>
 
@@ -66,7 +64,6 @@
     initialValue={column.column.description ?? ''}
     onSubmit={handleColumnDescriptionChange}
     isLongText
-    disabled={!canExecuteDDL}
   />
 </div>
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnOptions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnOptions.svelte
index d2fcec6a54..d4cac113b7 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnOptions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnOptions.svelte
@@ -21,7 +21,6 @@
   export let column: ProcessedColumn;
   export let columnsDataStore: ColumnsDataStore;
   export let constraintsDataStore: ConstraintsDataStore;
-  export let canExecuteDDL: boolean;
 
   let isRequestingToggleAllowNull = false;
   let isRequestingToggleAllowDuplicates = false;
@@ -113,7 +112,7 @@
       <Icon class="opt" {...iconLoading} />
     {:else}
       <Checkbox
-        disabled={isRequestingToggleAllowDuplicates || !canExecuteDDL}
+        disabled={isRequestingToggleAllowDuplicates}
         checked={!allowsDuplicates}
         on:change={toggleAllowDuplicates}
       />
@@ -135,7 +134,7 @@
       <Icon class="opt" {...iconLoading} />
     {:else}
       <Checkbox
-        disabled={isRequestingToggleAllowNull || !canExecuteDDL}
+        disabled={isRequestingToggleAllowNull}
         checked={!allowsNull}
         on:change={toggleAllowNull}
       />
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnType.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnType.svelte
index 9000c3b47b..9e1bd69cbd 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnType.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnType.svelte
@@ -14,7 +14,6 @@
   $: ({ columnsDataStore } = $tabularData);
 
   export let column: ProcessedColumn;
-  export let canExecuteDDL: boolean;
 
   async function save(
     columnInfo: Pick<ColumnTypeOptionsSaveArgs, 'type' | 'type_options'>,
@@ -26,8 +25,7 @@
       default: null,
     });
   }
-  $: disallowDataTypeChange =
-    column.column.primary_key || !!column.linkFk || !canExecuteDDL;
+  $: disallowDataTypeChange = column.column.primary_key || !!column.linkFk;
   $: columnWithAbstractType = {
     ...column.column,
     abstractType: column.abstractType,
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte
index eb98ec1f1a..77043b98c9 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte
@@ -15,7 +15,6 @@
   } from '@mathesar-component-library';
 
   export let column: ProcessedColumn;
-  export let canExecuteDDL: boolean;
 
   const tabularData = getTabularDataStoreFromContext();
   $: ({ columnsDataStore, recordsData } = $tabularData);
@@ -86,7 +85,7 @@
     }
   }
 
-  $: disabled = !canExecuteDDL || typeChangeState?.state === 'processing';
+  $: disabled = typeChangeState?.state === 'processing';
 </script>
 
 <div class="default-value-container">
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
index a9d6fe83d8..8b1271b524 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
@@ -13,13 +13,10 @@
   import LinkedRecord from '@mathesar/components/LinkedRecord.svelte';
   import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
   import { RichText } from '@mathesar/components/rich-text';
-  import { currentDatabase } from '@mathesar/stores/databases';
-  import { currentSchema } from '@mathesar/stores/schemas';
   import type { RecordRow, TabularData } from '@mathesar/stores/table-data';
   import { renderRecordSummaryForRow } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
   import { saveRecordSummaryTemplate } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { getErrorMessage } from '@mathesar/utils/errors';
   import { RadioGroup, Spinner } from '@mathesar-component-library';
 
@@ -33,10 +30,6 @@
   export let table: TableEntry;
   export let tabularData: TabularData;
 
-  const userProfile = getUserProfileStoreFromContext();
-
-  $: database = $currentDatabase;
-  $: schema = $currentSchema;
   $: ({ recordsData, columnsDataStore, isLoading } = tabularData);
   $: ({ columns } = columnsDataStore);
   $: ({ savedRecords, recordSummaries } = recordsData);
@@ -62,14 +55,6 @@
       transitiveData: $recordSummaries,
     });
   })();
-  $: canEditMetadata = $userProfile?.hasPermission(
-    {
-      database,
-      schema,
-    },
-    'canEditMetadata',
-  );
-  $: showNullState = !canEditMetadata && !previewRecordSummary;
 
   async function save() {
     try {
@@ -98,65 +83,61 @@
       </div>
     {/if}
 
-    {#if canEditMetadata}
-      <div class="heading">{$_('template')}</div>
-      <div class="content">
-        <RadioGroup
-          options={[false, true]}
-          getRadioLabel={(v) => (v ? $_('custom') : $_('default'))}
-          ariaLabel={$_('template_type')}
-          isInline
-          bind:value={$customized}
-          disabled={$customizedDisabled}
-        />
+    <div class="heading">{$_('template')}</div>
+    <div class="content">
+      <RadioGroup
+        options={[false, true]}
+        getRadioLabel={(v) => (v ? $_('custom') : $_('default'))}
+        ariaLabel={$_('template_type')}
+        isInline
+        bind:value={$customized}
+        disabled={$customizedDisabled}
+      />
 
-        {#if $customized}
-          <Field
-            field={template}
-            input={{ component: TemplateInput, props: { columns: $columns } }}
-          />
+      {#if $customized}
+        <Field
+          field={template}
+          input={{ component: TemplateInput, props: { columns: $columns } }}
+        />
 
-          {#if nonconformantColumns.length}
-            <InfoBox>
-              <div class="nonconformant-columns">
-                <p>
-                  {$_('record_summary_non_conformant_columns_help')}:
-                </p>
-                <ul>
-                  {#each nonconformantColumns as column}
-                    <li>
-                      <RichText
-                        text={$_('column_id_references_column_name')}
-                        let:slotName
-                      >
-                        {#if slotName === 'columnId'}
-                          <Identifier>{column.id}</Identifier>
-                        {:else if slotName === 'columnName'}
-                          <Identifier>{column.name}</Identifier>
-                        {/if}
-                      </RichText>
-                    </li>
-                  {/each}
-                </ul>
-              </div>
-            </InfoBox>
-          {/if}
+        {#if nonconformantColumns.length}
+          <InfoBox>
+            <div class="nonconformant-columns">
+              <p>
+                {$_('record_summary_non_conformant_columns_help')}:
+              </p>
+              <ul>
+                {#each nonconformantColumns as column}
+                  <li>
+                    <RichText
+                      text={$_('column_id_references_column_name')}
+                      let:slotName
+                    >
+                      {#if slotName === 'columnId'}
+                        <Identifier>{column.id}</Identifier>
+                      {:else if slotName === 'columnName'}
+                        <Identifier>{column.name}</Identifier>
+                      {/if}
+                    </RichText>
+                  </li>
+                {/each}
+              </ul>
+            </div>
+          </InfoBox>
         {/if}
+      {/if}
 
-        <FormSubmit
-          {form}
-          onProceed={save}
-          onCancel={form.reset}
-          proceedButton={{ label: $_('save') }}
-          initiallyHidden
-          size="small"
-        />
-      </div>
-    {/if}
+      <FormSubmit
+        {form}
+        onProceed={save}
+        onCancel={form.reset}
+        proceedButton={{ label: $_('save') }}
+        initiallyHidden
+        size="small"
+      />
+    </div>
 
-    {#if showNullState}
-      <span class="null-text">{$_('no_record_summary_available')}</span>
-    {/if}
+    <span class="null-text">{$_('no_record_summary_available')}</span>
   {/if}
 </div>
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
index 9eea8d2635..8f133a18ef 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
@@ -1,10 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import { currentDatabase } from '@mathesar/stores/databases';
-  import { currentSchema } from '@mathesar/stores/schemas';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { Collapsible } from '@mathesar-component-library';
 
   import CollapsibleHeader from '../CollapsibleHeader.svelte';
@@ -12,15 +9,8 @@
   import RowActions from './RowActions.svelte';
 
   const tabularData = getTabularDataStoreFromContext();
-  const userProfile = getUserProfileStoreFromContext();
 
-  $: database = $currentDatabase;
-  $: schema = $currentSchema;
   $: ({ selection, recordsData } = $tabularData);
-  $: canEditTableRecords = !!$userProfile?.hasPermission(
-    { database, schema },
-    'canEditTableRecords',
-  );
   $: selectedRowIds = $selection.rowIds;
   $: selectedRowCount = selectedRowIds.size;
 </script>
@@ -41,7 +31,6 @@
           {selectedRowIds}
           {recordsData}
           columnsDataStore={$tabularData.columnsDataStore}
-          {canEditTableRecords}
         />
       </div>
     </Collapsible>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
index 53ed8b9708..377bd933c7 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
@@ -22,7 +22,6 @@
   export let selectedRowIds: ImmutableSet<string>;
   export let recordsData: RecordsData;
   export let columnsDataStore: ColumnsDataStore;
-  export let canEditTableRecords: boolean;
 
   $: selectedRowCount = selectedRowIds.size;
   $: ({ columns } = columnsDataStore);
@@ -39,8 +38,6 @@
       return undefined;
     }
   })();
-  $: showDeleteRecordButton = canEditTableRecords;
-  $: showNullStateText = !showDeleteRecordButton && !recordPageLink;
 
   async function handleDeleteRecords() {
     void confirmDelete({
@@ -78,19 +75,12 @@
       </div>
     </AnchorButton>
   {/if}
-  {#if showDeleteRecordButton}
-    <Button on:click={handleDeleteRecords}>
-      <Icon {...iconDeleteMajor} />
-      <span>
-        {$_('delete_records', { values: { count: selectedRowCount } })}
-      </span>
-    </Button>
-  {/if}
-  {#if showNullStateText}
-    <span class="null-text">
-      {$_('no_actions_selected_record')}
+  <Button on:click={handleDeleteRecords}>
+    <Icon {...iconDeleteMajor} />
+    <span>
+      {$_('delete_records', { values: { count: selectedRowCount } })}
     </span>
-  {/if}
+  </Button>
 </div>
 
 <style lang="scss">
@@ -109,8 +99,4 @@
     align-items: center;
     justify-content: space-between;
   }
-
-  .null-text {
-    color: var(--color-text-muted);
-  }
 </style>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
index f24e68428b..0d5f5204c6 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
@@ -23,8 +23,6 @@
 
   import TableDeleteConfirmationBody from './TableDeleteConfirmationBody.svelte';
 
-  export let canExecuteDDL: boolean;
-
   const tabularData = getTabularDataStoreFromContext();
 
   $: ({ id, columnsDataStore, meta } = $tabularData);
@@ -108,12 +106,10 @@
     {/if}
   {/if}
 
-  {#if canExecuteDDL}
-    <Button appearance="outline-primary" on:click={handleDeleteTable}>
-      <Icon {...iconDeleteMajor} />
-      <span>{$_('delete_table')}</span>
-    </Button>
-  {/if}
+  <Button appearance="outline-primary" on:click={handleDeleteTable}>
+    <Icon {...iconDeleteMajor} />
+    <span>{$_('delete_table')}</span>
+  </Button>
 </div>
 
 <style lang="scss">
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
index eac7f41abb..1bd8fe7f25 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
@@ -1,11 +1,8 @@
 <script>
   import { _ } from 'svelte-i18n';
 
-  import { currentDatabase } from '@mathesar/stores/databases';
-  import { currentSchema } from '@mathesar/stores/schemas';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import { currentTable } from '@mathesar/stores/tables';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import RecordSummaryConfig from '@mathesar/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte';
   import { Collapsible } from '@mathesar-component-library';
 
@@ -18,15 +15,6 @@
   import TableName from './TableName.svelte';
 
   const tabularData = getTabularDataStoreFromContext();
-  const userProfile = getUserProfileStoreFromContext();
-
-  $: database = $currentDatabase;
-  $: schema = $currentSchema;
-
-  $: canExecuteDDL = !!$userProfile?.hasPermission(
-    { database, schema },
-    'canExecuteDDL',
-  );
 </script>
 
 <div class="table-mode-container">
@@ -37,8 +25,8 @@
       isDbLevelConfiguration
     />
     <div slot="content" class="content-container">
-      <TableName disabled={!canExecuteDDL} />
-      <TableDescription disabled={!canExecuteDDL} />
+      <TableName />
+      <TableDescription />
     </div>
   </Collapsible>
 
@@ -49,7 +37,7 @@
       isDbLevelConfiguration
     />
     <div slot="content" class="content-container">
-      <TableLinks {canExecuteDDL} />
+      <TableLinks />
     </div>
   </Collapsible>
 
@@ -63,7 +51,7 @@
   <Collapsible isOpen triggerAppearance="plain">
     <CollapsibleHeader slot="header" title={$_('actions')} />
     <div slot="content" class="content-container">
-      <TableActions {canExecuteDDL} />
+      <TableActions />
     </div>
   </Collapsible>
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinksSectionContainer.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinksSectionContainer.svelte
index 5089033ad3..c580b6bcb0 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinksSectionContainer.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinksSectionContainer.svelte
@@ -11,7 +11,6 @@
 
   export let linksInThisTable: TableLink[];
   export let linksFromOtherTables: TableLink[];
-  export let canExecuteDDL: boolean;
 
   const linkTableModal = modal.spawnModalController();
   $: showNullState = !linksInThisTable.length && !linksFromOtherTables.length;
@@ -27,15 +26,13 @@
   {#if showNullState}
     <span class="null-text">{$_('table_does_not_link')}</span>
   {/if}
-  {#if canExecuteDDL}
-    <div>
-      <Button on:click={() => linkTableModal.open()} appearance="secondary">
-        <Icon {...iconAddNew} />
-        <span>{$_('create_link')}</span>
-      </Button>
-      <LinkTableModal controller={linkTableModal} />
-    </div>
-  {/if}
+  <div>
+    <Button on:click={() => linkTableModal.open()} appearance="secondary">
+      <Icon {...iconAddNew} />
+      <span>{$_('create_link')}</span>
+    </Button>
+    <LinkTableModal controller={linkTableModal} />
+  </div>
 </div>
 
 <style lang="scss">
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/links/TableLinks.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/links/TableLinks.svelte
index c1b86ad8fe..c359aab5bd 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/links/TableLinks.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/links/TableLinks.svelte
@@ -6,8 +6,6 @@
   import LinksSectionContainer from './LinksSectionContainer.svelte';
   import { getTableLinks } from './utils';
 
-  export let canExecuteDDL: boolean;
-
   const tabularData = getTabularDataStoreFromContext();
 
   $: tableId = $tabularData.id;
@@ -29,7 +27,6 @@
         joinableTablesResult,
         $columns,
       )}
-      {canExecuteDDL}
     />
   {/await}
 </div>

From 4c7f43145909f79c8ef4b3a16fd55a19430acf42 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 15 Jul 2024 16:36:26 +0530
Subject: [PATCH 0427/1141] Fix formatting errors

---
 mathesar_ui/src/pages/schema/SchemaExplorations.svelte | 3 +--
 mathesar_ui/src/stores/users.ts                        | 6 +-----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/mathesar_ui/src/pages/schema/SchemaExplorations.svelte b/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
index 2ffd8711a4..e723ff510f 100644
--- a/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
@@ -16,8 +16,7 @@
   export let explorationsMap: Map<number, QueryInstance>;
   export let hasTablesToExplore: boolean;
 
-  $: showTutorial =
-    explorationsMap.size === 0 && hasTablesToExplore;
+  $: showTutorial = explorationsMap.size === 0 && hasTablesToExplore;
 
   let explorationsSearchQuery = '';
 
diff --git a/mathesar_ui/src/stores/users.ts b/mathesar_ui/src/stores/users.ts
index 73aef0e03e..70e749c08a 100644
--- a/mathesar_ui/src/stores/users.ts
+++ b/mathesar_ui/src/stores/users.ts
@@ -3,12 +3,8 @@
 import { getContext, setContext } from 'svelte';
 import { type Writable, get, writable } from 'svelte/store';
 
-import userApi, {
-  type UnsavedUser,
-  type User,
-} from '@mathesar/api/rest/users';
+import userApi, { type UnsavedUser, type User } from '@mathesar/api/rest/users';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
-import type { Database, SchemaEntry } from '@mathesar/AppTypes';
 import { getErrorMessage } from '@mathesar/utils/errors';
 import type { MakeWritablePropertiesReadable } from '@mathesar/utils/typeUtils';
 

From 039f0748d7b5f94e5419fd133ca592fe80b3b5d4 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 15 Jul 2024 16:40:36 +0530
Subject: [PATCH 0428/1141] Remove types related to database & schema role

---
 mathesar_ui/src/api/rest/users.ts | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/mathesar_ui/src/api/rest/users.ts b/mathesar_ui/src/api/rest/users.ts
index a921da5426..6649efe8e6 100644
--- a/mathesar_ui/src/api/rest/users.ts
+++ b/mathesar_ui/src/api/rest/users.ts
@@ -1,4 +1,3 @@
-import type { Database, SchemaEntry } from '@mathesar/AppTypes';
 import type { Language } from '@mathesar/i18n/languages/utils';
 
 import {
@@ -17,20 +16,6 @@ export interface UnsavedUser {
   display_language: Language;
 }
 
-export type UserRole = 'viewer' | 'editor' | 'manager';
-
-export interface DatabaseRole {
-  id: number;
-  database: Database['id'];
-  role: UserRole;
-}
-
-export interface SchemaRole {
-  id: number;
-  schema: SchemaEntry['id'];
-  role: UserRole;
-}
-
 export interface User extends Omit<UnsavedUser, 'password'> {
   readonly id: number;
   readonly is_superuser: boolean;

From 5104523fc02a9ee4c12be46a9a501abb35024aee Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 15 Jul 2024 19:48:46 +0530
Subject: [PATCH 0429/1141] Fix type of server_id in configured_roles.add

---
 mathesar/rpc/configured_roles.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/rpc/configured_roles.py b/mathesar/rpc/configured_roles.py
index 3943e39cca..e813019793 100644
--- a/mathesar/rpc/configured_roles.py
+++ b/mathesar/rpc/configured_roles.py
@@ -52,7 +52,7 @@ def list_(*, server_id: int, **kwargs) -> list[ConfiguredRoleInfo]:
 @handle_rpc_exceptions
 def add(
         *,
-        server_id: str,
+        server_id: int,
         name: str,
         password: str,
         **kwargs

From 23d408d798a2b0389b4e3c1c8a3a542327f7192c Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 15 Jul 2024 23:57:43 +0800
Subject: [PATCH 0430/1141] add caller for record listing in Python

---
 db/records/operations/select.py | 44 +++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/db/records/operations/select.py b/db/records/operations/select.py
index 4da11f90f5..fb5b7fad62 100644
--- a/db/records/operations/select.py
+++ b/db/records/operations/select.py
@@ -1,6 +1,8 @@
+import json
 from sqlalchemy import select
 from sqlalchemy.sql.functions import count
 
+from db import connection as db_conn
 from db.columns.base import MathesarColumn
 from db.tables.utils import get_primary_key_column
 from db.types.operations.cast import get_column_cast_expression
@@ -9,6 +11,48 @@
 from db.transforms.operations.apply import apply_transformations_deprecated
 
 
+def list_records_from_table(
+        conn,
+        table_oid,
+        limit=None,
+        offset=None,
+        order=None,
+        filter=None,
+        group=None,
+        search=None,
+):
+    """
+    Get records from a table.
+
+    The order definition objects should have the form
+    {"attnum": <int>, "direction": <text>}
+
+    Only data from which the user is granted `SELECT` is returned.
+
+    Args:
+        tab_id: The OID of the table whose records we'll get.
+        limit: The maximum number of rows we'll return.
+        offset: The number of rows to skip before returning records from
+                 following rows.
+        order: An array of ordering definition objects.
+        filter: An array of filter definition objects.
+        group: An array of group definition objects.
+        search: An array of search definition objects.
+    """
+    result = db_conn.exec_msar_func(
+        conn,
+        'list_records_from_table',
+        table_oid,
+        limit,
+        offset,
+        json.dumps(order) if order is not None else None,
+        json.dumps(filter) if filter is not None else None,
+        json.dumps(group) if group is not None else None,
+        json.dumps(search) if search is not None else None,
+    ).fetchone()[0]
+    return result
+
+
 def get_record(table, engine, id_value):
     primary_key_column = get_primary_key_column(table)
     pg_query = select(table).where(primary_key_column == id_value)

From 4901235ae603595a3b7294153804c5c5b9ca0b62 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 15 Jul 2024 23:58:14 +0800
Subject: [PATCH 0431/1141] wire record listing up to RPC endpoint

---
 config/settings/common_settings.py   |  1 +
 mathesar/rpc/records.py              | 75 ++++++++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py |  6 +++
 3 files changed, 82 insertions(+)
 create mode 100644 mathesar/rpc/records.py

diff --git a/config/settings/common_settings.py b/config/settings/common_settings.py
index 4155531dce..1bb410ceff 100644
--- a/config/settings/common_settings.py
+++ b/config/settings/common_settings.py
@@ -71,6 +71,7 @@ def pipe_delim(pipe_string):
     'mathesar.rpc.columns.metadata',
     'mathesar.rpc.database_setup',
     'mathesar.rpc.databases',
+    'mathesar.rpc.records',
     'mathesar.rpc.roles',
     'mathesar.rpc.schemas',
     'mathesar.rpc.tables',
diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
new file mode 100644
index 0000000000..156f76398e
--- /dev/null
+++ b/mathesar/rpc/records.py
@@ -0,0 +1,75 @@
+"""
+Classes and functions exposed to the RPC endpoint for managing table records.
+"""
+from typing import TypedDict
+
+from modernrpc.core import rpc_method, REQUEST_KEY
+from modernrpc.auth.basic import http_basic_auth_login_required
+
+from db.records.operations.select import list_records_from_table
+from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+from mathesar.rpc.utils import connect
+
+
+class RecordListReturn(TypedDict):
+    """
+    Records from a table, along with some meta data
+
+    The form of the objects in the `results` array is determined by the
+    underlying records being listed. The keys of each object are the
+    attnums of the retrieved columns. The values are the value for the
+    given row, for the given column. The general form is:
+
+    [
+        {"<attnum1>": <val1,1>, "<attnum2>": <val1,2>, "<attnum3>": <val1,3>, ...},
+        {"<attnum1>": <val2,1>, "<attnum2>": <val2,2>, "<attnum3>": <val2,3>, ...},
+        {"<attnum1>": <val3,1>, "<attnum2>": <val3,2>, "<attnum3>": <val3,3>, ...},
+        ...
+    ]
+
+    Attributes:
+        count: The total number of records in the table.
+        results: An array of record objects.
+    """
+    count: int
+    results: list[dict]
+
+
+@rpc_method(name="records.list")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def list_(
+        *,
+        table_oid: int,
+        database_id: int,
+        limit: int = None,
+        offset: int = None,
+        order: list[dict] = None,
+        filter: list[dict] = None,
+        group: list[dict] = None,
+        search: list[dict] = None,
+        **kwargs
+) -> dict:
+    """
+    List records from a table, and its row count. Exposed as `list`.
+
+    Args:
+        table_oid: Identity of the table in the user's database.
+        database_id: The Django id of the database containing the table.
+
+    Returns:
+        The requested records, along with some metadata.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        record_info = list_records_from_table(
+            conn,
+            table_oid,
+            limit=limit,
+            offset=offset,
+            order=order,
+            filter=filter,
+            group=group,
+            search=search,
+        )
+    return RecordListReturn(count=record_info["count"], results=record_info["results"])
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 4e09892736..aac1f9ff9a 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -13,6 +13,7 @@
 from mathesar.rpc import constraints
 from mathesar.rpc import database_setup
 from mathesar.rpc import databases
+from mathesar.rpc import records
 from mathesar.rpc import roles
 from mathesar.rpc import schemas
 from mathesar.rpc import tables
@@ -94,6 +95,11 @@
         "databases.list",
         [user_is_authenticated]
     ),
+    (
+        records.list_,
+        "records.list",
+        [user_is_authenticated]
+    ),
     (
         roles.list_,
         "roles.list",

From 105cd0bbe81676ab9bb011f09dc02f58b6da364e Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 15 Jul 2024 21:53:22 +0530
Subject: [PATCH 0432/1141] Update docs: Fix attribute name and add return type

---
 mathesar/rpc/configured_roles.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mathesar/rpc/configured_roles.py b/mathesar/rpc/configured_roles.py
index e813019793..6c587b4905 100644
--- a/mathesar/rpc/configured_roles.py
+++ b/mathesar/rpc/configured_roles.py
@@ -14,7 +14,7 @@ class ConfiguredRoleInfo(TypedDict):
     Attributes:
         id: the Django ID of the ConfiguredRole model instance.
         name: The name of the role.
-        server: The Django ID of the Server model instance for the role.
+        server_id: The Django ID of the Server model instance for the role.
     """
     id: int
     name: str
@@ -64,6 +64,9 @@ def add(
         server_id: The Django id of the Server to contain the configured role.
         name: The name of the role.
         password: The password for the role.
+
+    Returns:
+        The newly configured role.
     """
     server = Server.objects.get(id=server_id)
     configured_role = ConfiguredRole.objects.create(

From 063525f7c86129844887eaa3309ded4d7219a4e4 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 16 Jul 2024 00:36:39 +0800
Subject: [PATCH 0433/1141] add from_dict to validate return info

---
 mathesar/rpc/records.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index 156f76398e..4a4bdc34f2 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -34,6 +34,10 @@ class RecordListReturn(TypedDict):
     count: int
     results: list[dict]
 
+    @classmethod
+    def from_dict(cls, d):
+        return cls(count=d["count"], results=d["results"])
+
 
 @rpc_method(name="records.list")
 @http_basic_auth_login_required
@@ -72,4 +76,4 @@ def list_(
             group=group,
             search=search,
         )
-    return RecordListReturn(count=record_info["count"], results=record_info["results"])
+    return RecordListReturn.from_dict(record_info)

From 47d9b9c01891b8b0a253e81c1e86a1df7211f76d Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 16 Jul 2024 00:45:38 +0800
Subject: [PATCH 0434/1141] add wiring test for records.list_ function

---
 mathesar/tests/rpc/test_records.py | 58 ++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 mathesar/tests/rpc/test_records.py

diff --git a/mathesar/tests/rpc/test_records.py b/mathesar/tests/rpc/test_records.py
new file mode 100644
index 0000000000..2eeda43609
--- /dev/null
+++ b/mathesar/tests/rpc/test_records.py
@@ -0,0 +1,58 @@
+"""
+This file tests the record RPC functions.
+
+Fixtures:
+    rf(pytest-django): Provides mocked `Request` objects.
+    monkeypatch(pytest): Lets you monkeypatch an object for testing.
+"""
+from contextlib import contextmanager
+
+from mathesar.rpc import records
+from mathesar.models.users import User
+
+
+def test_records_list(rf, monkeypatch):
+    username = 'alice'
+    password = 'pass1234'
+    table_oid = 23457
+    database_id = 2
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=username, password=password)
+
+    @contextmanager
+    def mock_connect(_database_id, user):
+        if _database_id == database_id and user.username == username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_list_records(
+            conn,
+            _table_oid,
+            limit=None,
+            offset=None,
+            order=None,
+            filter=None,
+            group=None,
+            search=None,
+        ):
+        if _table_oid != table_oid:
+            raise AssertionError('incorrect parameters passed')
+        return {
+            "count": 50123,
+            "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}]
+        }
+
+    monkeypatch.setattr(records, 'connect', mock_connect)
+    monkeypatch.setattr(records, 'list_records_from_table', mock_list_records)
+    expect_records_list = {
+        "count": 50123,
+        "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}]
+    }
+    actual_records_list = records.list_(
+        table_oid=table_oid, database_id=database_id, request=request
+    )
+    assert actual_records_list == expect_records_list

From 55a018f85b3c70859abbadd177f6088fc00802cd Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 16 Jul 2024 00:47:02 +0530
Subject: [PATCH 0435/1141] add rpc endpoints for explorations list and delete

---
 config/settings/common_settings.py       |  3 +-
 mathesar/migrations/0011_explorations.py | 33 +++++++++++++++
 mathesar/models/base.py                  | 11 +++++
 mathesar/rpc/explorations.py             | 51 ++++++++++++++++++++++++
 mathesar/utils/explorations.py           |  9 +++++
 5 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 mathesar/migrations/0011_explorations.py
 create mode 100644 mathesar/rpc/explorations.py
 create mode 100644 mathesar/utils/explorations.py

diff --git a/config/settings/common_settings.py b/config/settings/common_settings.py
index 4155531dce..aeda54a9e5 100644
--- a/config/settings/common_settings.py
+++ b/config/settings/common_settings.py
@@ -75,7 +75,8 @@ def pipe_delim(pipe_string):
     'mathesar.rpc.schemas',
     'mathesar.rpc.tables',
     'mathesar.rpc.tables.metadata',
-    'mathesar.rpc.types'
+    'mathesar.rpc.types',
+    'mathesar.rpc.explorations'
 ]
 
 TEMPLATES = [
diff --git a/mathesar/migrations/0011_explorations.py b/mathesar/migrations/0011_explorations.py
new file mode 100644
index 0000000000..371d83d800
--- /dev/null
+++ b/mathesar/migrations/0011_explorations.py
@@ -0,0 +1,33 @@
+# Generated by Django 4.2.11 on 2024-07-15 19:14
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mathesar', '0010_alter_tablemetadata_column_order_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Explorations',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('base_table_oid', models.PositiveBigIntegerField()),
+                ('name', models.CharField(max_length=128, unique=True)),
+                ('description', models.CharField(null=True)),
+                ('initial_columns', models.JSONField()),
+                ('transformations', models.JSONField(null=True)),
+                ('display_options', models.JSONField(null=True)),
+                ('display_names', models.JSONField()),
+                ('database', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mathesar.database')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]
diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index 3781f5d98c..422e3696a5 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -138,3 +138,14 @@ class Meta:
                 name="unique_table_metadata"
             )
         ]
+
+
+class Explorations(BaseModel):
+    database = models.ForeignKey('Database', on_delete=models.CASCADE)
+    base_table_oid = models.PositiveBigIntegerField()
+    name = models.CharField(max_length=128, unique=True)
+    description = models.CharField(null=True)
+    initial_columns = models.JSONField()
+    transformations = models.JSONField(null=True)
+    display_options = models.JSONField(null=True)
+    display_names = models.JSONField(null=False)
diff --git a/mathesar/rpc/explorations.py b/mathesar/rpc/explorations.py
new file mode 100644
index 0000000000..01ad74af1d
--- /dev/null
+++ b/mathesar/rpc/explorations.py
@@ -0,0 +1,51 @@
+"""
+Classes and functions exposed to the RPC endpoint for managing explorations.
+"""
+from typing import TypedDict
+
+from modernrpc.core import rpc_method
+from modernrpc.auth.basic import http_basic_auth_login_required
+
+from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+from mathesar.utils.explorations import get_explorations, delete_exploration
+
+
+class ExplorationInfo(TypedDict):
+    id: int
+    database: int
+    base_table_oid: int
+    name: str
+    description: str
+    initial_columns: list
+    transformations: dict
+    display_options: list
+    display_names: dict
+
+    @classmethod
+    def from_model(cls, model):
+        return cls(
+            id=model.id,
+            database=model.database,
+            base_table_oid=model.base_table_oid,
+            name=model.name,
+            description=model.description,
+            initial_columns=model.initial_columns,
+            transformations=model.transformations,
+            display_options=model.display_options,
+            display_names=model.display_names,
+        )
+
+
+@rpc_method(name="explorations.list")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def list_(*, database_id: int, **kwargs) -> list[ExplorationInfo]:
+    explorations = get_explorations(database_id)
+    return [ExplorationInfo.from_model(exploration) for exploration in explorations]
+
+
+@rpc_method(name="explorations.delete")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def delete(*, exploration_id: int, **kwargs) -> None:
+    delete_exploration(exploration_id)
diff --git a/mathesar/utils/explorations.py b/mathesar/utils/explorations.py
new file mode 100644
index 0000000000..db29594623
--- /dev/null
+++ b/mathesar/utils/explorations.py
@@ -0,0 +1,9 @@
+from mathesar.models.base import Explorations
+
+
+def get_explorations(database_id):
+    return Explorations.objects.filter(database__id=database_id)
+
+
+def delete_exploration(exploration_id):
+    Explorations.objects.get(id=exploration_id).delete()

From 418fb5ed5c96d0a2800b5ee108b2e922c3dccc4b Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 16 Jul 2024 12:33:16 +0800
Subject: [PATCH 0436/1141] add empty keys for return value

---
 mathesar/rpc/records.py            | 9 ++++++++-
 mathesar/tests/rpc/test_records.py | 6 ++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index 4a4bdc34f2..07a5d24de1 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -33,10 +33,17 @@ class RecordListReturn(TypedDict):
     """
     count: int
     results: list[dict]
+    group: dict
+    preview_data: list[dict]
 
     @classmethod
     def from_dict(cls, d):
-        return cls(count=d["count"], results=d["results"])
+        return cls(
+            count=d["count"],
+            results=d["results"],
+            group=None,
+            preview_data=[],
+        )
 
 
 @rpc_method(name="records.list")
diff --git a/mathesar/tests/rpc/test_records.py b/mathesar/tests/rpc/test_records.py
index 2eeda43609..df0afc407d 100644
--- a/mathesar/tests/rpc/test_records.py
+++ b/mathesar/tests/rpc/test_records.py
@@ -38,7 +38,7 @@ def mock_list_records(
             filter=None,
             group=None,
             search=None,
-        ):
+    ):
         if _table_oid != table_oid:
             raise AssertionError('incorrect parameters passed')
         return {
@@ -50,7 +50,9 @@ def mock_list_records(
     monkeypatch.setattr(records, 'list_records_from_table', mock_list_records)
     expect_records_list = {
         "count": 50123,
-        "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}]
+        "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],
+        "group": None,
+        "preview_data": []
     }
     actual_records_list = records.list_(
         table_oid=table_oid, database_id=database_id, request=request

From 825aa71de64fb240289d40384251cfd95083285f Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 16 Jul 2024 14:50:08 +0800
Subject: [PATCH 0437/1141] add/improve documentation for record listing

---
 docs/docs/api/rpc.md    |  9 +++++++++
 mathesar/rpc/records.py | 40 +++++++++++++++++++++++++++-------------
 2 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index ed08c3c843..2dbe5fec3a 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -152,6 +152,15 @@ To use an RPC function:
       - UniqueConstraint
       - CreatableConstraintInfo
 
+## Records
+
+:::records
+    options:
+      members:
+      - list_
+      - OrderBy
+      - RecordList
+
 ## Roles
 
 ::: roles
diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index 07a5d24de1..863bc70db8 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -1,7 +1,7 @@
 """
 Classes and functions exposed to the RPC endpoint for managing table records.
 """
-from typing import TypedDict
+from typing import TypedDict, Literal
 
 from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
@@ -11,25 +11,32 @@
 from mathesar.rpc.utils import connect
 
 
-class RecordListReturn(TypedDict):
+class OrderBy(TypedDict):
+    """
+    An object defining an `ORDER BY` clause.
+
+    Attributes:
+        attnum: The attnum of the column to order by.
+        direction: The direction to order by.
+    """
+    attnum: int
+    direction: Literal["asc", "desc"]
+
+
+class RecordList(TypedDict):
     """
     Records from a table, along with some meta data
 
     The form of the objects in the `results` array is determined by the
     underlying records being listed. The keys of each object are the
     attnums of the retrieved columns. The values are the value for the
-    given row, for the given column. The general form is:
-
-    [
-        {"<attnum1>": <val1,1>, "<attnum2>": <val1,2>, "<attnum3>": <val1,3>, ...},
-        {"<attnum1>": <val2,1>, "<attnum2>": <val2,2>, "<attnum3>": <val2,3>, ...},
-        {"<attnum1>": <val3,1>, "<attnum2>": <val3,2>, "<attnum3>": <val3,3>, ...},
-        ...
-    ]
-
+    given row, for the given column.
+   
     Attributes:
         count: The total number of records in the table.
         results: An array of record objects.
+        group: Information for displaying the records grouped in some way.
+        preview_data: Information for previewing foreign key values.
     """
     count: int
     results: list[dict]
@@ -55,7 +62,7 @@ def list_(
         database_id: int,
         limit: int = None,
         offset: int = None,
-        order: list[dict] = None,
+        order: list[OrderBy] = None,
         filter: list[dict] = None,
         group: list[dict] = None,
         search: list[dict] = None,
@@ -67,6 +74,13 @@ def list_(
     Args:
         table_oid: Identity of the table in the user's database.
         database_id: The Django id of the database containing the table.
+        limit: The maximum number of rows we'll return.
+        offset: The number of rows to skip before returning records from
+                 following rows.
+        order: An array of ordering definition objects.
+        filter: An array of filter definition objects.
+        group: An array of group definition objects.
+        search: An array of search definition objects.
 
     Returns:
         The requested records, along with some metadata.
@@ -83,4 +97,4 @@ def list_(
             group=group,
             search=search,
         )
-    return RecordListReturn.from_dict(record_info)
+    return RecordList.from_dict(record_info)

From 0be951962cabc593666421671551ec7f4463e0da Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 16 Jul 2024 15:47:41 +0800
Subject: [PATCH 0438/1141] remove errant whitespace

---
 mathesar/rpc/records.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index 863bc70db8..07e0b88a8c 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -31,7 +31,7 @@ class RecordList(TypedDict):
     underlying records being listed. The keys of each object are the
     attnums of the retrieved columns. The values are the value for the
     given row, for the given column.
-   
+
     Attributes:
         count: The total number of records in the table.
         results: An array of record objects.

From cfd59fe1c749e8a6da2f20d63ede1f1a9ddc6ffd Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 16 Jul 2024 18:41:27 +0530
Subject: [PATCH 0439/1141] add docs and minor args change

---
 docs/docs/api/rpc.md                     |  9 +++++
 mathesar/migrations/0011_explorations.py |  6 +--
 mathesar/models/base.py                  |  4 +-
 mathesar/rpc/explorations.py             | 49 +++++++++++++++++++-----
 4 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index ed08c3c843..53817655de 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -152,6 +152,15 @@ To use an RPC function:
       - UniqueConstraint
       - CreatableConstraintInfo
 
+## Explorations
+
+::: explorations
+    options:
+      members:
+      - list_
+      - delete
+      - ExplorationInfo
+
 ## Roles
 
 ::: roles
diff --git a/mathesar/migrations/0011_explorations.py b/mathesar/migrations/0011_explorations.py
index 371d83d800..5d7a951cd6 100644
--- a/mathesar/migrations/0011_explorations.py
+++ b/mathesar/migrations/0011_explorations.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.11 on 2024-07-15 19:14
+# Generated by Django 4.2.11 on 2024-07-16 13:07
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -17,13 +17,13 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
-                ('base_table_oid', models.PositiveBigIntegerField()),
                 ('name', models.CharField(max_length=128, unique=True)),
-                ('description', models.CharField(null=True)),
+                ('base_table_oid', models.PositiveBigIntegerField()),
                 ('initial_columns', models.JSONField()),
                 ('transformations', models.JSONField(null=True)),
                 ('display_options', models.JSONField(null=True)),
                 ('display_names', models.JSONField()),
+                ('description', models.CharField(null=True)),
                 ('database', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mathesar.database')),
             ],
             options={
diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index 422e3696a5..ac4dafceab 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -142,10 +142,10 @@ class Meta:
 
 class Explorations(BaseModel):
     database = models.ForeignKey('Database', on_delete=models.CASCADE)
-    base_table_oid = models.PositiveBigIntegerField()
     name = models.CharField(max_length=128, unique=True)
-    description = models.CharField(null=True)
+    base_table_oid = models.PositiveBigIntegerField()
     initial_columns = models.JSONField()
     transformations = models.JSONField(null=True)
     display_options = models.JSONField(null=True)
     display_names = models.JSONField(null=False)
+    description = models.CharField(null=True)
diff --git a/mathesar/rpc/explorations.py b/mathesar/rpc/explorations.py
index 01ad74af1d..5ac9bfc168 100644
--- a/mathesar/rpc/explorations.py
+++ b/mathesar/rpc/explorations.py
@@ -1,7 +1,7 @@
 """
 Classes and functions exposed to the RPC endpoint for managing explorations.
 """
-from typing import TypedDict
+from typing import Optional, TypedDict
 
 from modernrpc.core import rpc_method
 from modernrpc.auth.basic import http_basic_auth_login_required
@@ -11,28 +11,42 @@
 
 
 class ExplorationInfo(TypedDict):
+    """
+    Information about a Exploration.
+
+    Attributes:
+        id: The Django id of an exploration.
+        database_id: The Django id of the database containing the exploration.
+        name: The name of the exploration.
+        base_table_oid: The OID of the base table of the exploration on the database.
+        initial_columns: A list describing the columns to be included in the exploration.
+        transformations: A list describing the transformations to be made on the included columns.
+        display_options: A list desrcibing metadata for the columns in the explorations.
+        display_names: A map between the actual column names on the database and the alias to be displayed(if any).
+        description: The description of the exploration.
+    """
     id: int
-    database: int
-    base_table_oid: int
+    database_id: int
     name: str
-    description: str
+    base_table_oid: int
     initial_columns: list
-    transformations: dict
-    display_options: list
-    display_names: dict
+    transformations: Optional[list]
+    display_options: Optional[list]
+    display_names: Optional[dict]
+    description: Optional[str]
 
     @classmethod
     def from_model(cls, model):
         return cls(
             id=model.id,
-            database=model.database,
-            base_table_oid=model.base_table_oid,
+            database_id=model.database.id,
             name=model.name,
-            description=model.description,
+            base_table_oid=model.base_table_oid,
             initial_columns=model.initial_columns,
             transformations=model.transformations,
             display_options=model.display_options,
             display_names=model.display_names,
+            description=model.description,
         )
 
 
@@ -40,6 +54,15 @@ def from_model(cls, model):
 @http_basic_auth_login_required
 @handle_rpc_exceptions
 def list_(*, database_id: int, **kwargs) -> list[ExplorationInfo]:
+    """
+    List information about explorations for a database. Exposed as `list`.
+
+    Args:
+        database_id: The Django id of the database containing the explorations.
+
+    Returns:
+        A list of exploration details.
+    """
     explorations = get_explorations(database_id)
     return [ExplorationInfo.from_model(exploration) for exploration in explorations]
 
@@ -48,4 +71,10 @@ def list_(*, database_id: int, **kwargs) -> list[ExplorationInfo]:
 @http_basic_auth_login_required
 @handle_rpc_exceptions
 def delete(*, exploration_id: int, **kwargs) -> None:
+    """
+    Delete an exploration.
+
+    Args:
+        exploration_id: The Django id of the exploration to delete.
+    """
     delete_exploration(exploration_id)

From 7e36a9ff251b1dc0641c60471154b7568cb8c5cc Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 17 Jul 2024 17:49:50 +0530
Subject: [PATCH 0440/1141] add tests

---
 mathesar/tests/rpc/test_endpoints.py    |  11 ++
 mathesar/tests/rpc/test_explorations.py | 134 ++++++++++++++++++++++++
 2 files changed, 145 insertions(+)
 create mode 100644 mathesar/tests/rpc/test_explorations.py

diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 4e09892736..12f4117c23 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -13,6 +13,7 @@
 from mathesar.rpc import constraints
 from mathesar.rpc import database_setup
 from mathesar.rpc import databases
+from mathesar.rpc import explorations
 from mathesar.rpc import roles
 from mathesar.rpc import schemas
 from mathesar.rpc import tables
@@ -94,6 +95,16 @@
         "databases.list",
         [user_is_authenticated]
     ),
+    (
+        explorations.list_,
+        "explorations.list",
+        [user_is_authenticated]
+    ),
+    (
+        explorations.delete,
+        "explorations.delete",
+        [user_is_authenticated]
+    ),
     (
         roles.list_,
         "roles.list",
diff --git a/mathesar/tests/rpc/test_explorations.py b/mathesar/tests/rpc/test_explorations.py
new file mode 100644
index 0000000000..f43d15462a
--- /dev/null
+++ b/mathesar/tests/rpc/test_explorations.py
@@ -0,0 +1,134 @@
+"""
+This file tests the explorations RPC functions.
+
+Fixtures:
+    rf(pytest-django): Provides mocked `Request` objects.
+    monkeypatch(pytest): Lets you monkeypatch an object for testing.
+"""
+from mathesar.rpc import explorations
+from mathesar.models.users import User
+from mathesar.models.base import Database, Explorations
+
+
+def test_explorations_list(rf, monkeypatch):
+    request = rf.post('/api/rpc/v0', data={})
+    request.user = User(username='alice', password='pass1234')
+    database_id = 11
+
+    def mock_exploration_info(_database_id):
+        if _database_id != database_id:
+            raise AssertionError('incorrect parameters passed')
+        return [
+            Explorations(
+                id=2,
+                database=Database(id=1),
+                name='page count',
+                base_table_oid=12375,
+                initial_columns=[
+                    {'id': 51586, 'alias': 'Items_Acquisition Date'},
+                    {'id': 51598, 'alias': 'Items_id'},
+                    {'id': 51572, 'alias': 'Books_Media', 'jp_path': [[51588, 51596]]},
+                    {'id': 51573, 'alias': 'Books_Page Count', 'jp_path': [[51588, 51596]]}
+                ],
+                transformations=[
+                    {'spec': {'greater': [{'column_name': ['Books_Page Count']}, {'literal': ['50']}]}, 'type': 'filter'}
+                ],
+                display_options=None,
+                display_names={
+                    'Items_id': 'Items_id',
+                    'Items_Book': 'Items_Book',
+                    'Books_Media': 'Books_Media',
+                    'Items_Book_1': 'Items_Book_1',
+                    'Books_Page Count': 'Books_Page Count',
+                    'Items_Acquisition Date': 'Items_Acquisition Date'
+                },
+                description=None
+            ),
+            Explorations(
+                id=3,
+                database=Database(id=1),
+                name='ISBN',
+                base_table_oid=12356,
+                initial_columns=[
+                    {'id': 51594, 'alias': 'Publishers_Name'},
+                    {'id': 51575, 'alias': 'Books_ISBN', 'jp_path': [[51593, 51579]]}
+                ],
+                transformations=[
+                    {
+                        'spec': {
+                            'base_grouping_column': 'Publishers_Name',
+                            'grouping_expressions': [
+                                {'input_alias': 'Publishers_Name', 'output_alias': 'Publishers_Name_grouped'}
+                            ],
+                            'aggregation_expressions': [{
+                                'function': 'distinct_aggregate_to_array',
+                                'input_alias': 'Books_ISBN',
+                                'output_alias': 'Books_ISBN_agged'}]
+                        },
+                        'type': 'summarize'}
+                ],
+                display_options=None,
+                display_names={
+                    'Books_ISBN': 'Books_ISBN', 'Publishers_Name': 'Publishers_Name'
+                },
+                description=None
+            )
+        ]
+    monkeypatch.setattr(explorations, 'get_explorations', mock_exploration_info)
+    expect_explorations_list = [
+        {
+            'id': 2,
+            'database_id': 1,
+            'name': 'page count',
+            'base_table_oid': 12375,
+            'initial_columns': [
+                {'id': 51586, 'alias': 'Items_Acquisition Date'},
+                {'id': 51598, 'alias': 'Items_id'},
+                {'id': 51572, 'alias': 'Books_Media', 'jp_path': [[51588, 51596]]},
+                {'id': 51573, 'alias': 'Books_Page Count', 'jp_path': [[51588, 51596]]}
+            ],
+            'transformations': [
+                {'spec': {'greater': [{'column_name': ['Books_Page Count']}, {'literal': ['50']}]}, 'type': 'filter'}],
+            'display_options': None,
+            'display_names': {
+                'Items_id': 'Items_id',
+                'Items_Book': 'Items_Book',
+                'Books_Media': 'Books_Media',
+                'Items_Book_1': 'Items_Book_1',
+                'Books_Page Count': 'Books_Page Count',
+                'Items_Acquisition Date': 'Items_Acquisition Date'
+            },
+            'description': None
+        },
+        {
+            'id': 3,
+            'database_id': 1,
+            'name': 'ISBN',
+            'base_table_oid': 12356,
+            'initial_columns': [
+                {'id': 51594, 'alias': 'Publishers_Name'},
+                {'id': 51575, 'alias': 'Books_ISBN', 'jp_path': [[51593, 51579]]}
+            ],
+            'transformations': [
+                {
+                    'spec': {
+                        'base_grouping_column': 'Publishers_Name',
+                        'grouping_expressions': [
+                            {'input_alias': 'Publishers_Name', 'output_alias': 'Publishers_Name_grouped'}
+                        ],
+                        'aggregation_expressions': [{
+                            'function': 'distinct_aggregate_to_array',
+                            'input_alias': 'Books_ISBN',
+                            'output_alias': 'Books_ISBN_agged'}]
+                    },
+                    'type': 'summarize'}
+            ],
+            'display_options': None,
+            'display_names': {
+                'Books_ISBN': 'Books_ISBN', 'Publishers_Name': 'Publishers_Name'
+            },
+            'description': None
+        }
+    ]
+    actual_explorations_list = explorations.list_(database_id=11)
+    assert actual_explorations_list == expect_explorations_list

From dc94de13cb8927086dd490a4e95f6c3921380189 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 17 Jul 2024 22:44:27 +0800
Subject: [PATCH 0441/1141] add data formatting to record selection function

---
 db/sql/00_msar.sql | 90 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 89 insertions(+), 1 deletion(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 50bc3f0757..bd7d007a51 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3238,6 +3238,76 @@ $f$ LANGUAGE plpgsql;
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 
+-- Data type formatting functions
+
+
+CREATE OR REPLACE FUNCTION msar.format_data(val date) RETURNS text AS $$
+SELECT to_char(val, 'YYYY-MM-DD AD');
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION msar.format_data(val time without time zone) RETURNS text AS $$
+SELECT concat(to_char(val, 'HH24:MI'), ':', to_char(date_part('seconds', val), 'FM00.0999999999'));
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION msar.format_data(val time with time zone) RETURNS text AS $$
+SELECT CASE
+  WHEN date_part('timezone_hour', val) = 0 AND date_part('timezone_minute', val) = 0
+    THEN concat(
+      to_char(date_part('hour', val), 'FM00'), ':', to_char(date_part('minute', val), 'FM00'),
+      ':', to_char(date_part('seconds', val), 'FM00.0999999999'), 'Z'
+    )
+  ELSE
+    concat(
+      to_char(date_part('hour', val), 'FM00'), ':', to_char(date_part('minute', val), 'FM00'),
+      ':', to_char(date_part('seconds', val), 'FM00.0999999999'),
+      to_char(date_part('timezone_hour', val), 'S00'), ':',
+      ltrim(to_char(date_part('timezone_minute', val), '00'), '+- ')
+    )
+END;
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION msar.format_data(val timestamp without time zone) RETURNS text AS $$
+SELECT
+  concat(
+    to_char(val, 'YYYY-MM-DD"T"HH24:MI'),
+    ':', to_char(date_part('seconds', val), 'FM00.0999999999'),
+    to_char(val, ' BC')
+  );
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION msar.format_data(val timestamp with time zone) RETURNS text AS $$
+SELECT CASE
+  WHEN date_part('timezone_hour', val) = 0 AND date_part('timezone_minute', val) = 0
+    THEN concat(
+      to_char(val, 'YYYY-MM-DD"T"HH24:MI'),
+      ':', to_char(date_part('seconds', val), 'FM00.0999999999'), 'Z', to_char(val, ' BC')
+    )
+  ELSE
+    concat(
+      to_char(val, 'YYYY-MM-DD"T"HH24:MI'),
+      ':', to_char(date_part('seconds', val), 'FM00.0999999999'),
+      to_char(date_part('timezone_hour', val), 'S00'),
+      ':', ltrim(to_char(date_part('timezone_minute', val), '00'), '+- '), to_char(val, ' BC')
+    )
+END;
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION msar.format_data(val interval) returns text AS $$
+SELECT concat(
+  to_char(val, 'PFMYYYY"Y"FMMM"M"FMDD"D""T"FMHH24"H"FMMI"M"'), date_part('seconds', val), 'S'
+);
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION msar.format_data(val anyelement) returns anyelement AS $$
+SELECT val;
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
 
 CREATE OR REPLACE FUNCTION
 msar.sanitize_direction(direction text) RETURNS text AS $$/*
@@ -3308,6 +3378,24 @@ WHERE has_column_privilege(tab_id, attnum, 'SELECT');
 $$ LANGUAGE SQL;
 
 
+CREATE OR REPLACE FUNCTION
+msar.get_column_expr_template(typ_id oid) RETURNS text AS $$/*
+*/
+SELECT CASE typ_id
+  WHEN 1082 THEN  -- date
+    'to_char(%1$I, ''YYYY-MM-DD AD'') AS %2$I'
+  WHEN 1083 THEN  -- time without time zone
+    'to_char(%1$I, ''HH24:MI'') || '':''
+    || to_char(date_part(''seconds'', %1$I), ''FM00.0999999999'')'
+  WHEN 1186 THEN  -- ISO 8601 formatting for intervals
+    'to_char(%1$I, ''PFMYYYY"Y"FMMM"M"FMDD"D""T"FMHH24"H"FMMI"M"'')
+    || date_part(''seconds'', %1$I)::text || ''S'' AS %2$I'
+  ELSE
+    '%1$I AS %2$I'
+  END;
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
 CREATE OR REPLACE FUNCTION
 msar.build_selectable_column_expr(tab_id oid) RETURNS text AS $$/*
 Build an SQL select-target expression of only columns to which the user has access.
@@ -3320,7 +3408,7 @@ column_name AS "2", another_column_name AS "4"
 Args:
   tab_id: The OID of the table containing the columns to select.
 */
-SELECT string_agg(format('%I AS %I', attname, attnum), ', ')
+SELECT string_agg(format('msar.format_data(%I) AS %I', attname, attnum), ', ')
 FROM pg_catalog.pg_attribute
 WHERE
   attrelid = tab_id AND attnum > 0 AND has_column_privilege(attrelid, attnum, 'SELECT');

From 50dae44fef75682c5218b2782787d55e4de436dd Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 17 Jul 2024 22:49:18 +0800
Subject: [PATCH 0442/1141] remove unused formatting function

---
 db/sql/00_msar.sql | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index bd7d007a51..1829cacc5c 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3378,24 +3378,6 @@ WHERE has_column_privilege(tab_id, attnum, 'SELECT');
 $$ LANGUAGE SQL;
 
 
-CREATE OR REPLACE FUNCTION
-msar.get_column_expr_template(typ_id oid) RETURNS text AS $$/*
-*/
-SELECT CASE typ_id
-  WHEN 1082 THEN  -- date
-    'to_char(%1$I, ''YYYY-MM-DD AD'') AS %2$I'
-  WHEN 1083 THEN  -- time without time zone
-    'to_char(%1$I, ''HH24:MI'') || '':''
-    || to_char(date_part(''seconds'', %1$I), ''FM00.0999999999'')'
-  WHEN 1186 THEN  -- ISO 8601 formatting for intervals
-    'to_char(%1$I, ''PFMYYYY"Y"FMMM"M"FMDD"D""T"FMHH24"H"FMMI"M"'')
-    || date_part(''seconds'', %1$I)::text || ''S'' AS %2$I'
-  ELSE
-    '%1$I AS %2$I'
-  END;
-$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
-
-
 CREATE OR REPLACE FUNCTION
 msar.build_selectable_column_expr(tab_id oid) RETURNS text AS $$/*
 Build an SQL select-target expression of only columns to which the user has access.

From 50ac36837b410736860b76f7ad0a434eda1d4b59 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 17 Jul 2024 23:30:57 +0800
Subject: [PATCH 0443/1141] add tests for data formatting functions

---
 db/sql/test_00_msar.sql | 52 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index fa45d24949..0b1c9a4dd3 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2796,6 +2796,58 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+-- msar.format_data --------------------------------------------------------------------------------
+
+CREATE OR REPLACE FUNCTION test_format_data() RETURNS SETOF TEXT AS $$
+BEGIN
+  RETURN NEXT is(msar.format_data('3 Jan, 2021'::date), '2021-01-03 AD');
+  RETURN NEXT is(msar.format_data('3 Jan, 23 BC'::date), '0023-01-03 BC');
+  RETURN NEXT is(msar.format_data('1 day'::interval), 'P0Y0M1DT0H0M0S');
+  RETURN NEXT is(
+    msar.format_data('1 year 2 months 3 days 4 hours 5 minutes 6 seconds'::interval),
+    'P1Y2M3DT4H5M6S'
+  );
+  RETURN NEXT is(msar.format_data('1 day 3 hours ago'::interval), 'P0Y0M-1DT-3H0M0S');
+  RETURN NEXT is(msar.format_data('1 day -3 hours'::interval), 'P0Y0M1DT-3H0M0S');
+  RETURN NEXT is(
+    msar.format_data('1 year -1 month 3 days 14 hours -10 minutes 30.4 seconds'::interval),
+    'P0Y11M3DT13H50M30.4S'
+  );
+  RETURN NEXT is(
+    msar.format_data('1 year -1 month 3 days 14 hours -10 minutes 30.4 seconds ago'::interval),
+    'P0Y-11M-3DT-13H-50M-30.4S'
+  );
+  RETURN NEXT is(msar.format_data('45 hours 70 seconds'::interval), 'P0Y0M0DT45H1M10S');
+  RETURN NEXT is(
+    msar.format_data('5 decades 22 years 14 months 1 week 3 days'::interval),
+    'P73Y2M10DT0H0M0S'
+  );
+  RETURN NEXT is(msar.format_data('1 century'::interval), 'P100Y0M0DT0H0M0S');
+  RETURN NEXT is(msar.format_data('2 millennia'::interval), 'P2000Y0M0DT0H0M0S');
+  RETURN NEXT is(msar.format_data('12:30:45+05:30'::time with time zone), '12:30:45.0+05:30');
+  RETURN NEXT is(msar.format_data('12:30:45'::time with time zone), '12:30:45.0Z');
+  RETURN NEXT is(
+    msar.format_data('12:30:45.123456-08'::time with time zone), '12:30:45.123456-08:00'
+  );
+  RETURN NEXT is(msar.format_data('12:30'::time without time zone), '12:30:00.0');
+  RETURN NEXT is(
+    msar.format_data('30 July, 2000 19:15:03.65'::timestamp with time zone),
+    '2000-07-30T19:15:03.65Z AD'
+  );
+  RETURN NEXT is(
+    msar.format_data('10000-01-01 00:00:00'::timestamp with time zone),
+    '10000-01-01T00:00:00.0Z AD'
+  );
+  RETURN NEXT is(
+    msar.format_data('3 March, 25 BC, 17:30:15+01'::timestamp with time zone),
+    '0025-03-03T16:30:15.0Z BC'
+  );
+  RETURN NEXT is(
+    msar.format_data('17654-03-02 01:00:00'::timestamp without time zone),
+    '17654-03-02T01:00:00.0 AD'
+  );
+END;
+$$ LANGUAGE plpgsql;
 
 -- msar.list_records_from_table --------------------------------------------------------------------
 

From 7e61e90587e741a638dc89311be7781178abf279 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 18 Jul 2024 14:36:39 +0800
Subject: [PATCH 0444/1141] Fix mistake introduced by merge

---
 mathesar/tests/rpc/test_endpoints.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index a9decd38fb..7b64967ff5 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -144,6 +144,7 @@
         "records.list",
         [user_is_authenticated]
     ),
+    (
         explorations.list_,
         "explorations.list",
         [user_is_authenticated]

From 42235d21abf2f6b7c87fa83b1d6912edba8a7aff Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 19 Jul 2024 00:50:48 +0800
Subject: [PATCH 0445/1141] add initial where building function and filters

---
 db/sql/00_msar.sql | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 1829cacc5c..0a02700b79 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3309,6 +3309,32 @@ SELECT val;
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
+DROP TABLE msar.filter_templates;
+CREATE TABLE msar.filter_templates (filter_key text PRIMARY KEY, filter_template text);
+INSERT INTO msar.filter_templates VALUES
+  ('and', '%s AND %s'),
+  ('or', '%s OR %s'),
+  ('lesser', '%s < %s'),
+  ('greater', '%s > %s');
+
+
+CREATE OR REPLACE FUNCTION msar.build_filter_expr(rel_id oid, tree jsonb) RETURNS text AS $$
+SELECT CASE tree ->> 'type'
+  WHEN 'literal' THEN format('%L', tree ->> 'value')
+  WHEN 'column_id' THEN format('%I', msar.get_column_name(rel_id, (tree ->> 'value')::smallint))
+  ELSE
+    format(max(filter_template), VARIADIC array_agg(msar.build_filter_expr(rel_id, inner_tree)))
+END
+FROM jsonb_array_elements(tree -> 'args') inner_tree, msar.filter_templates
+WHERE tree ->> 'type' = filter_key
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION msar.build_where_clause(rel_id oid, tree jsonb) RETURNS text AS $$
+SELECT 'WHERE ' || msar.build_filter_expr(rel_id, tree);
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
 CREATE OR REPLACE FUNCTION
 msar.sanitize_direction(direction text) RETURNS text AS $$/*
 */
@@ -3427,9 +3453,9 @@ BEGIN
   EXECUTE format(
     $q$
     WITH count_cte AS (
-      SELECT count(1) AS count FROM %2$I.%3$I
+      SELECT count(1) AS count FROM %2$I.%3$I %7$s
     ), results_cte AS (
-      SELECT %1$s FROM %2$I.%3$I %6$s LIMIT %4$L OFFSET %5$L
+      SELECT %1$s FROM %2$I.%3$I %7$s %6$s LIMIT %4$L OFFSET %5$L
     )
     SELECT jsonb_build_object(
       'results', jsonb_agg(row_to_json(results_cte.*)),
@@ -3442,7 +3468,8 @@ BEGIN
     msar.get_relation_name(tab_id),
     limit_,
     offset_,
-    msar.build_order_by_expr(tab_id, order_)
+    msar.build_order_by_expr(tab_id, order_),
+    msar.build_where_clause(tab_id, filter_)
   ) INTO records;
   RETURN records;
 END;

From 6fe4cdc06b2deb2b4f090e6c79dcc9c30211e0c7 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 19 Jul 2024 03:57:41 +0530
Subject: [PATCH 0446/1141] add initial scaffolding for running an exploration

---
 mathesar/utils/explorations.py | 82 ++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/mathesar/utils/explorations.py b/mathesar/utils/explorations.py
index db29594623..f5a9e9ca22 100644
--- a/mathesar/utils/explorations.py
+++ b/mathesar/utils/explorations.py
@@ -1,4 +1,7 @@
 from mathesar.models.base import Explorations
+from db.queries.base import DBQuery, InitialColumn, JoinParameter
+from db.engine import create_future_engine_with_custom_types
+from mathesar.state import get_cached_metadata
 
 
 def get_explorations(database_id):
@@ -7,3 +10,82 @@ def get_explorations(database_id):
 
 def delete_exploration(exploration_id):
     Explorations.objects.get(id=exploration_id).delete()
+
+
+def run_exploration(exploration_def, conn):
+    engine = create_future_engine_with_custom_types(
+        conn.info.user,
+        conn.info.password,
+        conn.info.host,
+        conn.info.dbname,
+        conn.info.port
+    )
+    initial_columns = exploration_def.get('initial_columns')
+    processed_initial_columns = []
+    for column in initial_columns:
+        jp_path = column.get("join_path")
+        if jp_path is not None:
+            join_path = [
+                JoinParameter(
+                    left_oid=i[0][0],
+                    left_attnum=i[0][1],
+                    right_oid=i[1][0],
+                    right_attnum=i[1][1]
+                ) for i in jp_path
+            ]
+        processed_initial_columns.append(
+            InitialColumn(
+                reloid=column["table_oid"],
+                attnum=column["attnum"],
+                alias=column["alias"],
+                jp_path=join_path
+            )
+        )
+    db_query = DBQuery(
+        base_table_oid=exploration_def["base_table_oid"],
+        initial_columns=processed_initial_columns,
+        engine=engine,
+        transformations=exploration_def.get("transformations", []),
+        name=None,
+        metadata=get_cached_metadata()
+    )
+    return {
+        "query": (),
+        "records": db_query.get_records(),
+        "output_columns": (),
+        "column_metadata": (),
+        "parameters": {},
+    }
+
+# {
+#     "base_table": 7,
+#     "initial_columns": [
+#         {
+#             "id": 13,
+#             "alias": "Checkouts_Item"
+#         },
+#         { 
+#             "id": 6,
+#             "alias": "Books_Page Count",
+#             "join_path": [
+#                 [
+#                     13,
+#                     29
+#                 ],
+#                 [
+#                     20,
+#                     27
+#                 ]
+#             ]
+#         }
+#     ],
+#     "transformations": [],
+#     "display_names": {
+#         "Checkouts_Item": "Checkouts_Item",
+#         "Books_Page Count": "Books_Page Count"
+#     },
+#     "parameters": {
+#         "limit": 100,
+#         "offset": 0 
+#     }
+# }

From 6abb6814e8326ed0d264feced0aabe53ebe54a90 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 19 Jul 2024 14:18:33 +0800
Subject: [PATCH 0447/1141] add more filtering functions

---
 db/sql/00_msar.sql | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 0a02700b79..89e157bcfd 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3314,6 +3314,12 @@ CREATE TABLE msar.filter_templates (filter_key text PRIMARY KEY, filter_template
 INSERT INTO msar.filter_templates VALUES
   ('and', '%s AND %s'),
   ('or', '%s OR %s'),
+  ('equal', '%s = %s'),
+  ('null', '%s IS NULL'),
+  ('not_null', '%s IS NOT NULL'),
+  ('contains_case_insensitive', '%s ILIKE ''%%'' || %s || ''%%'''),
+  ('starts_with_case_insensitive', '%s ILIKE %s || ''%%'''),
+  ('uri_scheme_equals', 'mathesar_types.uri_scheme(%s) = %s'),
   ('lesser', '%s < %s'),
   ('greater', '%s > %s');
 

From a127f18f7103218038c2f24612c18681cc47f71c Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 19 Jul 2024 14:19:42 +0800
Subject: [PATCH 0448/1141] add debugging output about what query ran to
 response

---
 db/sql/00_msar.sql      | 3 ++-
 mathesar/rpc/records.py | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 89e157bcfd..27f232654d 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3465,7 +3465,8 @@ BEGIN
     )
     SELECT jsonb_build_object(
       'results', jsonb_agg(row_to_json(results_cte.*)),
-      'count', max(count_cte.count)
+      'count', max(count_cte.count),
+      'query', $iq$SELECT %1$s FROM %2$I.%3$I %7$s %6$s LIMIT %4$L OFFSET %5$L$iq$
     )
     FROM results_cte, count_cte
     $q$,
diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index 07e0b88a8c..147b88aa5f 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -50,6 +50,7 @@ def from_dict(cls, d):
             results=d["results"],
             group=None,
             preview_data=[],
+            query=d["query"],
         )
 
 

From 08beaed6d62594de9789376fb19add9d8f91242c Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 19 Jul 2024 15:11:56 +0800
Subject: [PATCH 0449/1141] implement remaining filtering functions

---
 db/sql/00_msar.sql | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 27f232654d..2fe8b624ff 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3312,17 +3312,35 @@ $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 DROP TABLE msar.filter_templates;
 CREATE TABLE msar.filter_templates (filter_key text PRIMARY KEY, filter_template text);
 INSERT INTO msar.filter_templates VALUES
+  -- basic composition operators
   ('and', '%s AND %s'),
   ('or', '%s OR %s'),
+  -- general comparison operators
   ('equal', '%s = %s'),
+  ('lesser', '%s < %s'),
+  ('greater', '%s > %s'),
+  ('lesser_or_equal', '%s <= %s'),
+  ('greater_or_equal', '%s >= %s'),
   ('null', '%s IS NULL'),
   ('not_null', '%s IS NOT NULL'),
+  -- string specific filters
   ('contains_case_insensitive', '%s ILIKE ''%%'' || %s || ''%%'''),
   ('starts_with_case_insensitive', '%s ILIKE %s || ''%%'''),
+  -- json(b) filters
+  ('json_array_length_equals', 'jsonb_array_length(%s::jsonb) = %s'),
+  ('json_array_length_greater_than', 'jsonb_array_length(%s::jsonb) > %s'),
+  ('json_array_length_greater_or_equal', 'jsonb_array_length(%s::jsonb) >= %s'),
+  ('json_array_length_less_than', 'jsonb_array_length(%s::jsonb) < %s'),
+  ('json_array_length_less_or_equal', 'jsonb_array_length(%s::jsonb) <= %s'),
+  ('json_array_not_empty', 'jsonb_array_length(%s::jsonb) > 0'),
+  ('json_array_contains', '%s @> %s'),
+  -- URI filters
   ('uri_scheme_equals', 'mathesar_types.uri_scheme(%s) = %s'),
-  ('lesser', '%s < %s'),
-  ('greater', '%s > %s');
-
+  ('uri_authority_contains', 'mathesar_types.uri_authority(%s) LIKE ''%%'' || %s || ''%%'''),
+  -- Email filters
+  ('email_domain_equals', 'mathesar_types.email_domain_name(%s) = %s'),
+  ('email_domain_contains', 'mathesar_types.email_domain_name(%s) LIKE ''%%'' || %s || ''%%''')
+;
 
 CREATE OR REPLACE FUNCTION msar.build_filter_expr(rel_id oid, tree jsonb) RETURNS text AS $$
 SELECT CASE tree ->> 'type'

From 62944580e1b38cc0be25f9289912abcbb3eb4b49 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 19 Jul 2024 18:12:46 +0800
Subject: [PATCH 0450/1141] add test for each leaf filter function

---
 db/sql/00_msar.sql      |   2 +-
 db/sql/test_00_msar.sql | 190 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 191 insertions(+), 1 deletion(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 2fe8b624ff..ec9703d74e 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3309,7 +3309,7 @@ SELECT val;
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
-DROP TABLE msar.filter_templates;
+DROP TABLE IF EXISTS msar.filter_templates;
 CREATE TABLE msar.filter_templates (filter_key text PRIMARY KEY, filter_template text);
 INSERT INTO msar.filter_templates VALUES
   -- basic composition operators
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 0b1c9a4dd3..7b14574e07 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2975,3 +2975,193 @@ BEGIN
   RETURN NEXT is(msar.build_order_by_expr(rel_id, null), null);
 END;
 $$ LANGUAGE plpgsql;
+
+
+-- msar.build_filter_expr --------------------------------------------------------------------------
+
+CREATE OR REPLACE FUNCTION test_build_filter_expr() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+BEGIN
+  PERFORM __setup_list_records_table();
+  rel_id := 'atable'::regclass::oid;
+  RETURN NEXT is(
+    msar.build_filter_expr(
+      rel_id,
+      jsonb_build_object(
+        'type', 'equal', 'args', jsonb_build_array(
+          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'literal', 'value', 500)))),
+    'col1 = ''500'''
+  );
+  RETURN NEXT is(
+    msar.build_filter_expr(
+      rel_id,
+      jsonb_build_object(
+        'type', 'lesser', 'args', jsonb_build_array(
+          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'literal', 'value', 500)))),
+    'col1 < ''500'''
+  );
+  RETURN NEXT is(
+    msar.build_filter_expr(
+      rel_id,
+      jsonb_build_object(
+        'type', 'greater', 'args', jsonb_build_array(
+          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'literal', 'value', 500)))),
+    'col1 > ''500'''
+  );
+  RETURN NEXT is(
+    msar.build_filter_expr(
+      rel_id,
+      jsonb_build_object(
+        'type', 'lesser_or_equal', 'args', jsonb_build_array(
+          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'literal', 'value', 500)))),
+    'col1 <= ''500'''
+  );
+  RETURN NEXT is(
+    msar.build_filter_expr(
+      rel_id,
+      jsonb_build_object(
+        'type', 'greater_or_equal', 'args', jsonb_build_array(
+          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'literal', 'value', 500)))),
+    'col1 >= ''500'''
+  );
+  RETURN NEXT is(
+    msar.build_filter_expr(
+      rel_id,
+      jsonb_build_object(
+        'type', 'null', 'args', jsonb_build_array(
+          jsonb_build_object('type', 'column_id', 'value', 2)))),
+    'col1 IS NULL'
+  );
+  RETURN NEXT is(
+    msar.build_filter_expr(
+      rel_id,
+      jsonb_build_object(
+        'type', 'not_null', 'args', jsonb_build_array(
+          jsonb_build_object('type', 'column_id', 'value', 2)))),
+    'col1 IS NOT NULL'
+  );
+  RETURN NEXT is(
+    msar.build_filter_expr(
+      rel_id,
+      jsonb_build_object(
+        'type', 'contains_case_insensitive', 'args', jsonb_build_array(
+          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'literal', 'value', 'ABc')))),
+    'col1 ILIKE ''%'' || ''ABc'' || ''%'''
+  );
+  RETURN NEXT is(
+    msar.build_filter_expr(
+      rel_id,
+      jsonb_build_object(
+        'type', 'starts_with_case_insensitive', 'args', jsonb_build_array(
+          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'literal', 'value', 'a''bc')))),
+    'col1 ILIKE ''a''''bc'' || ''%'''
+  );
+  RETURN NEXT is(
+    msar.build_filter_expr(
+      rel_id,
+      jsonb_build_object(
+        'type', 'json_array_length_equals', 'args', jsonb_build_array(
+          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'literal', 'value', 500)))),
+    'jsonb_array_length(col1::jsonb) = ''500'''
+  );
+  RETURN NEXT is(
+    msar.build_filter_expr(
+      rel_id,
+      jsonb_build_object(
+        'type', 'json_array_length_greater_than', 'args', jsonb_build_array(
+          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'literal', 'value', 500)))),
+    'jsonb_array_length(col1::jsonb) > ''500'''
+  );
+  RETURN NEXT is(
+    msar.build_filter_expr(
+      rel_id,
+      jsonb_build_object(
+        'type', 'json_array_length_greater_or_equal', 'args', jsonb_build_array(
+          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'literal', 'value', 500)))),
+    'jsonb_array_length(col1::jsonb) >= ''500'''
+  );
+  RETURN NEXT is(
+    msar.build_filter_expr(
+      rel_id,
+      jsonb_build_object(
+        'type', 'json_array_length_less_than', 'args', jsonb_build_array(
+          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'literal', 'value', 500)))),
+    'jsonb_array_length(col1::jsonb) < ''500'''
+  );
+  RETURN NEXT is(
+    msar.build_filter_expr(
+      rel_id,
+      jsonb_build_object(
+        'type', 'json_array_length_less_or_equal', 'args', jsonb_build_array(
+          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'literal', 'value', 500)))),
+    'jsonb_array_length(col1::jsonb) <= ''500'''
+  );
+  RETURN NEXT is(
+    msar.build_filter_expr(
+      rel_id,
+      jsonb_build_object(
+        'type', 'json_array_not_empty', 'args', jsonb_build_array(
+          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'literal', 'value', 500)))),
+    'jsonb_array_length(col1::jsonb) > 0'
+  );
+  RETURN NEXT is(
+    msar.build_filter_expr(
+      rel_id,
+      jsonb_build_object(
+        'type', 'json_array_contains', 'args', jsonb_build_array(
+          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'literal', 'value', '"500"')))),
+    'col1 @> ''"500"'''
+  );
+  RETURN NEXT is(
+    msar.build_filter_expr(
+      rel_id,
+      jsonb_build_object(
+        'type', 'uri_scheme_equals', 'args', jsonb_build_array(
+          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'literal', 'value', 'https')))),
+    'mathesar_types.uri_scheme(col1) = ''https'''
+  );
+  RETURN NEXT is(
+    msar.build_filter_expr(
+      rel_id,
+      jsonb_build_object(
+        'type', 'uri_authority_contains', 'args', jsonb_build_array(
+          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'literal', 'value', 'google')))),
+    'mathesar_types.uri_authority(col1) LIKE ''%'' || ''google'' || ''%'''
+  );
+  RETURN NEXT is(
+    msar.build_filter_expr(
+      rel_id,
+      jsonb_build_object(
+        'type', 'email_domain_equals', 'args', jsonb_build_array(
+          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'literal', 'value', 'gmail.com')))),
+    'mathesar_types.email_domain_name(col1) = ''gmail.com'''
+  );
+  RETURN NEXT is(
+    msar.build_filter_expr(
+      rel_id,
+      jsonb_build_object(
+        'type', 'email_domain_contains', 'args', jsonb_build_array(
+          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'literal', 'value', 'mail')))),
+    'mathesar_types.email_domain_name(col1) LIKE ''%'' || ''mail'' || ''%'''
+  );
+END;
+$$ LANGUAGE plpgsql;

From f670520defb1611b0613c775b327be104a0ede0f Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 19 Jul 2024 18:27:31 +0800
Subject: [PATCH 0451/1141] fix bug when column is dropped from table

---
 db/sql/00_msar.sql      | 21 +++++++++++++--------
 db/sql/test_00_msar.sql |  4 +++-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 1829cacc5c..1c73adc5db 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3333,17 +3333,19 @@ WITH orderable_cte AS (
     INNER JOIN pg_catalog.pg_cast ON atttypid=castsource
     INNER JOIN pg_catalog.pg_operator ON casttarget=oprleft
   WHERE
-    attrelid=tab_id
-    AND attnum>0
-    AND castcontext='i'
-    AND oprname='<'
+    attrelid = tab_id
+    AND attnum > 0
+    AND NOT attisdropped
+    AND castcontext = 'i'
+    AND oprname = '<'
   UNION SELECT attnum
   FROM pg_catalog.pg_attribute
     INNER JOIN pg_catalog.pg_operator ON atttypid=oprleft
   WHERE
-    attrelid=tab_id
-    AND attnum>0
-    AND oprname='<'
+    attrelid = tab_id
+    AND attnum > 0
+    AND NOT attisdropped
+    AND oprname = '<'
   ORDER BY attnum
 )
 SELECT COALESCE(jsonb_agg(jsonb_build_object('attnum', attnum, 'direction', 'asc')), '[]'::jsonb)
@@ -3393,7 +3395,10 @@ Args:
 SELECT string_agg(format('msar.format_data(%I) AS %I', attname, attnum), ', ')
 FROM pg_catalog.pg_attribute
 WHERE
-  attrelid = tab_id AND attnum > 0 AND has_column_privilege(attrelid, attnum, 'SELECT');
+  attrelid = tab_id
+  AND attnum > 0
+  AND NOT attisdropped
+  AND has_column_privilege(attrelid, attnum, 'SELECT');
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 0b1c9a4dd3..91efd314ab 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2858,8 +2858,10 @@ BEGIN
     col1 integer,
     col2 varchar,
     col3 json,
-    col4 jsonb
+    col4 jsonb,
+    coltodrop integer
   );
+  ALTER TABLE atable DROP COLUMN coltodrop;
   INSERT INTO atable (col1, col2, col3, col4) VALUES
     (5, 'sdflkj', '"s"', '{"a": "val"}'),
     (34, 'sdflfflsk', null, '[1, 2, 3, 4]'),

From 2082424cf6e72a5b6f38e5b50c7509eaa2eddc1f Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 19 Jul 2024 16:09:44 +0530
Subject: [PATCH 0452/1141] change return type from dict -> RecordList

---
 mathesar/rpc/records.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index 07e0b88a8c..f7e085fa43 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -67,7 +67,7 @@ def list_(
         group: list[dict] = None,
         search: list[dict] = None,
         **kwargs
-) -> dict:
+) -> RecordList:
     """
     List records from a table, and its row count. Exposed as `list`.
 

From b59608ed84f61126feb8c2f750f7297747c9f66f Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 19 Jul 2024 14:16:00 -0400
Subject: [PATCH 0453/1141] Rename `TableEntry` to `Table` and `id` to `oid`

---
 mathesar_ui/src/api/rest/columns.ts           |  4 +-
 mathesar_ui/src/api/rest/types/tables.ts      | 41 ++++-----
 .../api/rest/types/tables/joinable_tables.ts  |  6 +-
 mathesar_ui/src/components/AppHeader.svelte   |  2 +-
 .../src/components/EditTableHOC.svelte        |  2 +-
 mathesar_ui/src/components/SelectTable.svelte | 13 ++-
 .../SelectTableWithinCurrentSchema.svelte     |  7 +-
 mathesar_ui/src/components/TableName.svelte   |  8 +-
 .../breadcrumb/BreadcrumbItem.svelte          |  2 +-
 .../BreadcrumbRecordSelector.svelte           |  6 +-
 .../breadcrumb/EntitySelector.svelte          |  6 +-
 .../components/breadcrumb/breadcrumbTypes.ts  |  8 +-
 .../src/components/cell-fabric/utils.ts       | 10 +--
 .../preview/ImportPreviewContent.svelte       | 21 ++---
 .../import/preview/importPreviewPageUtils.ts  | 15 ++--
 .../import/upload/ImportUploadPage.svelte     |  2 +-
 .../src/pages/record/RecordPage.svelte        |  6 +-
 .../src/pages/record/RecordPageContent.svelte |  6 +-
 mathesar_ui/src/pages/record/RecordStore.ts   |  8 +-
 .../src/pages/record/TableWidget.svelte       |  6 +-
 mathesar_ui/src/pages/record/Widgets.svelte   |  2 +-
 .../schema/CreateEmptyTableButton.svelte      |  2 +-
 .../pages/schema/CreateNewTableButton.svelte  |  2 +-
 mathesar_ui/src/pages/schema/EditTable.svelte |  6 +-
 .../src/pages/schema/SchemaOverview.svelte    |  4 +-
 .../src/pages/schema/SchemaTables.svelte      |  9 +-
 mathesar_ui/src/pages/schema/TableCard.svelte | 12 +--
 .../src/pages/schema/TablesList.svelte        |  6 +-
 mathesar_ui/src/pages/table/TablePage.svelte  |  6 +-
 mathesar_ui/src/routes/RecordPageRoute.svelte |  4 +-
 mathesar_ui/src/stores/storeBasedUrls.ts      |  4 +-
 mathesar_ui/src/stores/table-data/columns.ts  |  6 +-
 .../src/stores/table-data/constraints.ts      |  6 +-
 .../src/stores/table-data/processedColumns.ts |  4 +-
 mathesar_ui/src/stores/table-data/records.ts  |  6 +-
 .../src/stores/table-data/tabularData.ts      |  6 +-
 mathesar_ui/src/stores/tables.ts              | 86 +++++++++----------
 .../systems/data-explorer/ActionsPane.svelte  |  6 +-
 .../src/systems/data-explorer/QueryManager.ts |  4 +-
 .../data-explorer/urlSerializationUtils.ts    | 12 +--
 .../src/systems/data-explorer/utils.ts        | 18 ++--
 .../RecordSelectorContent.svelte              |  4 +-
 .../RecordSelectorNavigationButton.svelte     |  8 +-
 .../record-selector/recordSelectorUtils.ts    |  4 +-
 .../src/systems/table-view/TableView.svelte   |  4 +-
 .../actions-pane/ActionsPane.svelte           |  4 +-
 .../actions-pane/ShareTableDropdown.svelte    |  4 +-
 .../constraints/NewFkConstraint.svelte        |  8 +-
 .../systems/table-view/header/Header.svelte   |  4 +-
 .../ColumnHeaderContextMenu.svelte            |  2 +-
 .../link-table/LinkTableForm.svelte           | 24 +++---
 .../link-table/LinkTablePill.svelte           |  4 +-
 .../link-table/LinkTypeOption.svelte          |  6 +-
 .../table-view/link-table/NewColumn.svelte    |  6 +-
 .../link-table/SelectLinkType.svelte          |  6 +-
 .../table-view/link-table/linkTableUtils.ts   |  8 +-
 .../ExtractColumnsModal.svelte                |  2 +-
 .../columnExtractionTypes.ts                  |  4 +-
 .../columnExtractionUtils.ts                  |  6 +-
 .../FkRecordSummaryConfig.svelte              |  6 +-
 .../record-summary/RecordSummaryConfig.svelte |  4 +-
 .../table-inspector/table/TableActions.svelte |  4 +-
 mathesar_ui/src/utils/columnUtils.ts          |  4 +-
 mathesar_ui/src/utils/preloadData.ts          |  4 +-
 mathesar_ui/src/utils/tables.ts               | 14 +--
 65 files changed, 254 insertions(+), 280 deletions(-)

diff --git a/mathesar_ui/src/api/rest/columns.ts b/mathesar_ui/src/api/rest/columns.ts
index bbe7c8429b..2c8e113a8f 100644
--- a/mathesar_ui/src/api/rest/columns.ts
+++ b/mathesar_ui/src/api/rest/columns.ts
@@ -1,8 +1,8 @@
-import type { TableEntry } from './types/tables';
+import type { Table } from './types/tables';
 import type { Column } from './types/tables/columns';
 import { type PaginatedResponse, getAPI } from './utils/requestUtils';
 
-function list(tableId: TableEntry['id']) {
+function list(tableId: Table['oid']) {
   const url = `/api/db/v0/tables/${tableId}/columns/?limit=500`;
   return getAPI<PaginatedResponse<Column>>(url);
 }
diff --git a/mathesar_ui/src/api/rest/types/tables.ts b/mathesar_ui/src/api/rest/types/tables.ts
index cd11e1cc5e..3173585142 100644
--- a/mathesar_ui/src/api/rest/types/tables.ts
+++ b/mathesar_ui/src/api/rest/types/tables.ts
@@ -2,38 +2,29 @@ import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
 
 import type { Column } from './tables/columns';
 
-export type MinimalColumnDetails = Pick<
-  Column,
-  'id' | 'name' | 'type' | 'type_options' | 'display_options'
->;
-
-export interface TableSettings {
-  /** This is the settings id, not the table id */
-  id: number;
-  preview_settings: {
-    customized: boolean;
-    template: string;
-  };
-  column_order: number[];
-}
-
-/**
- * This is the GET response for: `/api/db/v0/tables/<table_id>/`
- *
- * TODO: Rename this to TableInstance
- */
-export interface TableEntry {
-  id: number;
+export interface Table {
+  oid: number;
   name: string;
   schema: number;
   import_verified: boolean | null;
   data_files?: number[];
-  columns: MinimalColumnDetails[];
-  settings: TableSettings;
+  columns: Pick<
+    Column,
+    'id' | 'name' | 'type' | 'type_options' | 'display_options'
+  >[];
+  settings: {
+    /** This is the settings id, not the table id */
+    id: number;
+    preview_settings: {
+      customized: boolean;
+      template: string;
+    };
+    column_order: number[];
+  };
   description: string | null;
 }
 
 /**
  * This is the GET response for: `/api/db/v0/tables/`
  */
-export type TablesList = PaginatedResponse<TableEntry>;
+export type TablesList = PaginatedResponse<Table>;
diff --git a/mathesar_ui/src/api/rest/types/tables/joinable_tables.ts b/mathesar_ui/src/api/rest/types/tables/joinable_tables.ts
index cc295e9e2d..645bcc5413 100644
--- a/mathesar_ui/src/api/rest/types/tables/joinable_tables.ts
+++ b/mathesar_ui/src/api/rest/types/tables/joinable_tables.ts
@@ -4,7 +4,7 @@
  * endpoint: /api/db/v0/tables/<table_id>/joinable_tables/
  */
 
-import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rest/types/tables';
 
 import type { Column } from './columns';
 
@@ -13,7 +13,7 @@ type IsLinkReversed = boolean;
 export type JpPath = [Column['id'], Column['id']][];
 
 export interface JoinableTable {
-  target: TableEntry['id']; // baseTableId
+  target: Table['oid']; // baseTableId
   jp_path: JpPath;
   fk_path: [ForeignKeyId, IsLinkReversed][];
   depth: number;
@@ -25,7 +25,7 @@ export interface JoinableTablesResult {
   tables: Record<
     string, // tableId
     {
-      name: TableEntry['name'];
+      name: Table['name'];
       columns: Column['id'][];
     }
   >;
diff --git a/mathesar_ui/src/components/AppHeader.svelte b/mathesar_ui/src/components/AppHeader.svelte
index 3bc094ebca..bb961de878 100644
--- a/mathesar_ui/src/components/AppHeader.svelte
+++ b/mathesar_ui/src/components/AppHeader.svelte
@@ -62,7 +62,7 @@
     isCreatingNewEmptyTable = true;
     const tableInfo = await createTable(database, schema, {});
     isCreatingNewEmptyTable = false;
-    router.goto(getTablePageUrl(database.id, schema.oid, tableInfo.id), false);
+    router.goto(getTablePageUrl(database.id, schema.oid, tableInfo.oid), false);
   }
 </script>
 
diff --git a/mathesar_ui/src/components/EditTableHOC.svelte b/mathesar_ui/src/components/EditTableHOC.svelte
index 3e8ac9ca50..f08be77f39 100644
--- a/mathesar_ui/src/components/EditTableHOC.svelte
+++ b/mathesar_ui/src/components/EditTableHOC.svelte
@@ -17,7 +17,7 @@
       (current) => current.name === name,
     );
 
-    return tablesUsingName.length > 0 && tablesUsingName[0].id !== tableId;
+    return tablesUsingName.length > 0 && tablesUsingName[0].oid !== tableId;
   }
 
   function getNameValidationErrors(name: string): string[] {
diff --git a/mathesar_ui/src/components/SelectTable.svelte b/mathesar_ui/src/components/SelectTable.svelte
index 797d791798..b2671f67f2 100644
--- a/mathesar_ui/src/components/SelectTable.svelte
+++ b/mathesar_ui/src/components/SelectTable.svelte
@@ -1,27 +1,26 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import { Select } from '@mathesar-component-library';
   import type { SelectProps } from '@mathesar-component-library/types';
 
   import TableName from './TableName.svelte';
 
-  type $$Events = Select<TableEntry | undefined>['$$events_def'];
+  type $$Events = Select<Table | undefined>['$$events_def'];
 
-  export let tables: TableEntry[];
-  export let value: TableEntry | undefined = undefined;
+  export let tables: Table[];
+  export let value: Table | undefined = undefined;
   /** TODO: Discuss, do we need prependBlank? */
   export let prependBlank = false;
-  export let autoSelect: SelectProps<TableEntry | undefined>['autoSelect'] =
-    'first';
+  export let autoSelect: SelectProps<Table | undefined>['autoSelect'] = 'first';
 
   $: tableList = prependBlank ? [undefined, ...tables] : tables;
 </script>
 
 <Select
   options={tableList}
-  valuesAreEqual={(a, b) => a?.id === b?.id}
+  valuesAreEqual={(a, b) => a?.oid === b?.oid}
   {autoSelect}
   bind:value
   on:change
diff --git a/mathesar_ui/src/components/SelectTableWithinCurrentSchema.svelte b/mathesar_ui/src/components/SelectTableWithinCurrentSchema.svelte
index 1c3c7b51f8..258c1bec27 100644
--- a/mathesar_ui/src/components/SelectTableWithinCurrentSchema.svelte
+++ b/mathesar_ui/src/components/SelectTableWithinCurrentSchema.svelte
@@ -1,14 +1,13 @@
 <script lang="ts">
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import { importVerifiedTables } from '@mathesar/stores/tables';
   import type { SelectProps } from '@mathesar-component-library/types';
 
   import SelectTable from './SelectTable.svelte';
 
-  export let value: TableEntry | undefined = undefined;
+  export let value: Table | undefined = undefined;
   export let prependBlank = false;
-  export let autoSelect: SelectProps<TableEntry | undefined>['autoSelect'] =
-    'first';
+  export let autoSelect: SelectProps<Table | undefined>['autoSelect'] = 'first';
 
   $: tables = [...$importVerifiedTables.values()];
 </script>
diff --git a/mathesar_ui/src/components/TableName.svelte b/mathesar_ui/src/components/TableName.svelte
index 80cb9b2de5..70705713f8 100644
--- a/mathesar_ui/src/components/TableName.svelte
+++ b/mathesar_ui/src/components/TableName.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import type { ComponentProps } from 'svelte';
 
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import { iconTable } from '@mathesar/icons';
   import { isTableImportConfirmationRequired } from '@mathesar/utils/tables';
 
@@ -9,9 +9,9 @@
 
   interface $$Props extends Omit<ComponentProps<NameWithIcon>, 'icon'> {
     table: {
-      name: TableEntry['name'];
-      data_files?: TableEntry['data_files'];
-      import_verified?: TableEntry['import_verified'];
+      name: Table['name'];
+      data_files?: Table['data_files'];
+      import_verified?: Table['import_verified'];
     };
     isLoading?: boolean;
   }
diff --git a/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte b/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
index df897dfb2c..2ae08d7468 100644
--- a/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
+++ b/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
@@ -68,7 +68,7 @@
       href={getRecordPageUrl(
         item.database.id,
         item.schema.oid,
-        item.table.id,
+        item.table.oid,
         item.record.pk,
       )}
     >
diff --git a/mathesar_ui/src/components/breadcrumb/BreadcrumbRecordSelector.svelte b/mathesar_ui/src/components/breadcrumb/BreadcrumbRecordSelector.svelte
index 1dda15f858..aebb0e61ab 100644
--- a/mathesar_ui/src/components/breadcrumb/BreadcrumbRecordSelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/BreadcrumbRecordSelector.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import { iconExpandRight } from '@mathesar/icons';
   import { getRecordSelectorFromContext } from '@mathesar/systems/record-selector/RecordSelectorController';
   import { Button, Icon, iconSearch } from '@mathesar-component-library';
 
   const recordSelector = getRecordSelectorFromContext();
-  export let table: TableEntry;
+  export let table: Table;
 
   function handleClick() {
-    recordSelector.navigateToRecordPage({ tableId: table.id });
+    recordSelector.navigateToRecordPage({ tableId: table.oid });
   }
 </script>
 
diff --git a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
index c3c182f93a..5232e8d356 100644
--- a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
@@ -3,7 +3,7 @@
   import { meta } from 'tinro';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Database } from '@mathesar/AppTypes';
   import { iconTable } from '@mathesar/icons';
@@ -26,7 +26,7 @@
   export let schema: Schema;
 
   function makeTableBreadcrumbSelectorItem(
-    table: TableEntry,
+    table: Table,
   ): BreadcrumbSelectorEntryForTable {
     return {
       type: 'table',
@@ -35,7 +35,7 @@
       href: getLinkForTableItem(database.id, schema.oid, table),
       icon: iconTable,
       isActive() {
-        return table.id === $currentTableId;
+        return table.oid === $currentTableId;
       },
     };
   }
diff --git a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
index 3e761149fa..b9a437894f 100644
--- a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
+++ b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
@@ -1,5 +1,5 @@
 import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Schema } from '@mathesar/api/rpc/schemas';
 import type { Database } from '@mathesar/AppTypes';
 import type {
@@ -26,7 +26,7 @@ export interface BreadcrumbItemTable {
   type: 'table';
   database: Database;
   schema: Schema;
-  table: TableEntry;
+  table: Table;
 }
 
 export interface BreadcrumbItemSimple {
@@ -40,7 +40,7 @@ export interface BreadcrumbItemRecord {
   type: 'record';
   database: Database;
   schema: Schema;
-  table: TableEntry;
+  table: Table;
   record: {
     pk: string;
     summary: string;
@@ -78,7 +78,7 @@ export interface SimpleBreadcrumbSelectorEntry
 export interface BreadcrumbSelectorEntryForTable
   extends BaseBreadcrumbSelectorEntry {
   type: 'table';
-  table: TableEntry;
+  table: Table;
 }
 
 export type BreadcrumbSelectorEntry =
diff --git a/mathesar_ui/src/components/cell-fabric/utils.ts b/mathesar_ui/src/components/cell-fabric/utils.ts
index f70664dccc..3e9a501731 100644
--- a/mathesar_ui/src/components/cell-fabric/utils.ts
+++ b/mathesar_ui/src/components/cell-fabric/utils.ts
@@ -1,4 +1,4 @@
-import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { CellInfo } from '@mathesar/stores/abstract-types/types';
 import type { RecordSummariesForSheet } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
@@ -24,12 +24,12 @@ export function getCellCap({
    * When the cell falls within an FK column, this value will give the id of the
    * table to which the FK points.
    */
-  fkTargetTableId?: TableEntry['id'];
+  fkTargetTableId?: Table['oid'];
   /**
    * When the cell falls within a PK column, this value will give the id of the
    * table.
    */
-  pkTargetTableId?: TableEntry['id'];
+  pkTargetTableId?: Table['oid'];
 }): ComponentAndProps {
   if (fkTargetTableId) {
     const props: LinkedRecordCellExternalProps = {
@@ -52,7 +52,7 @@ export function getCellCap({
 
 export function getDbTypeBasedInputCap(
   column: CellColumnLike,
-  fkTargetTableId?: TableEntry['id'],
+  fkTargetTableId?: Table['oid'],
   optionalCellInfo?: CellInfo,
 ): ComponentAndProps {
   if (fkTargetTableId) {
@@ -71,7 +71,7 @@ export function getDbTypeBasedInputCap(
 
 export function getInitialInputValue(
   column: CellColumnLike,
-  fkTargetTableId?: TableEntry['id'],
+  fkTargetTableId?: Table['oid'],
   optionalCellInfo?: CellInfo,
 ): unknown {
   if (fkTargetTableId) {
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index 838161b297..9e123b5897 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -4,7 +4,7 @@
 
   import { columnsApi } from '@mathesar/api/rest/columns';
   import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import type { Column } from '@mathesar/api/rest/types/tables/columns';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Database } from '@mathesar/AppTypes';
@@ -62,7 +62,7 @@
 
   export let database: Database;
   export let schema: Schema;
-  export let table: TableEntry;
+  export let table: Table;
   export let dataFile: DataFile;
   export let useColumnTypeInference = false;
 
@@ -70,7 +70,7 @@
   let columnPropertiesMap = buildColumnPropertiesMap([]);
 
   $: otherTableNames = [...$tables.data.values()]
-    .filter((t) => t.id !== table.id)
+    .filter((t) => t.oid !== table.oid)
     .map((t) => t.name);
   $: customizedTableName = requiredField(table.name, [
     uniqueWith(otherTableNames, $_('table_name_already_exists')),
@@ -82,7 +82,7 @@
   $: processedColumns = processColumns(columns, $currentDbAbstractTypes.data);
 
   async function init() {
-    const columnsResponse = await columnsFetch.run(table.id);
+    const columnsResponse = await columnsFetch.run(table.oid);
     const fetchedColumns = columnsResponse?.resolvedValue?.results;
     if (!fetchedColumns) {
       return;
@@ -90,7 +90,7 @@
     columns = fetchedColumns;
     columnPropertiesMap = buildColumnPropertiesMap(columns);
     if (useColumnTypeInference) {
-      const response = await typeSuggestionsRequest.run(table.id);
+      const response = await typeSuggestionsRequest.run(table.oid);
       if (response.settlement?.state === 'resolved') {
         const typeSuggestions = response.settlement.value;
         columns = columns.map((column) => ({
@@ -103,11 +103,8 @@
   }
   $: table, useColumnTypeInference, void init();
 
-  function reload(props: {
-    table?: TableEntry;
-    useColumnTypeInference?: boolean;
-  }) {
-    const tableId = props.table?.id ?? table.id;
+  function reload(props: { table?: Table; useColumnTypeInference?: boolean }) {
+    const tableId = props.table?.oid ?? table.oid;
     router.goto(
       getImportPreviewPageUrl(database.id, schema.oid, tableId, {
         useColumnTypeInference:
@@ -155,12 +152,12 @@
 
   async function finishImport() {
     try {
-      await patchTable(table.id, {
+      await patchTable(table.oid, {
         name: $customizedTableName,
         import_verified: true,
         columns: finalizeColumns(columns, columnPropertiesMap),
       });
-      router.goto(getTablePageUrl(database.id, schema.oid, table.id), true);
+      router.goto(getTablePageUrl(database.id, schema.oid, table.oid), true);
     } catch (err) {
       toast.fromError(err);
     }
diff --git a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
index 6d7474ca8c..e544c240e6 100644
--- a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
+++ b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
@@ -1,9 +1,6 @@
 import { dataFilesApi } from '@mathesar/api/rest/dataFiles';
 import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
-import type {
-  MinimalColumnDetails,
-  TableEntry,
-} from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { Schema } from '@mathesar/api/rpc/schemas';
 import type { Database } from '@mathesar/AppTypes';
@@ -53,14 +50,14 @@ export function makeHeaderUpdateRequest() {
   interface Props {
     database: Database;
     schema: Schema;
-    table: Pick<TableEntry, 'id'>;
+    table: Pick<Table, 'oid'>;
     dataFile: Pick<DataFile, 'id'>;
     firstRowIsHeader: boolean;
     customizedTableName: string;
   }
   async function updateHeader(p: Props) {
     await Promise.all([
-      deleteTable(p.database, p.schema, p.table.id),
+      deleteTable(p.database, p.schema, p.table.oid),
       dataFilesApi.update(p.dataFile.id, { header: p.firstRowIsHeader }),
     ]);
     return createTable(p.database, p.schema, {
@@ -75,10 +72,10 @@ export function makeDeleteTableRequest() {
   interface Props {
     database: Database;
     schema: Schema;
-    table: Pick<TableEntry, 'id'>;
+    table: Pick<Table, 'oid'>;
   }
   return new AsyncStore((props: Props) =>
-    deleteTable(props.database, props.schema, props.table.id),
+    deleteTable(props.database, props.schema, props.table.oid),
   );
 }
 
@@ -104,7 +101,7 @@ export function buildColumnPropertiesMap(
 export function finalizeColumns(
   columns: Column[],
   columnPropertiesMap: ColumnPropertiesMap,
-): MinimalColumnDetails[] {
+): Table['columns'] {
   return columns
     .filter((column) => columnPropertiesMap[column.id]?.selected)
     .map((column) => ({
diff --git a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
index 64c670d4d1..75896e172a 100644
--- a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
+++ b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
@@ -119,7 +119,7 @@
       const previewPage = getImportPreviewPageUrl(
         database.id,
         schema.oid,
-        table.id,
+        table.oid,
         { useColumnTypeInference: $useColumnTypeInference },
       );
       router.goto(previewPage, true);
diff --git a/mathesar_ui/src/pages/record/RecordPage.svelte b/mathesar_ui/src/pages/record/RecordPage.svelte
index bde3ee3ab9..ae9b4fe4af 100644
--- a/mathesar_ui/src/pages/record/RecordPage.svelte
+++ b/mathesar_ui/src/pages/record/RecordPage.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
@@ -13,9 +13,9 @@
 
   export let record: RecordStore;
 
-  $: table = $currentTable as TableEntry;
+  $: table = $currentTable as Table;
   $: tableStructure = new TableStructure({
-    id: table.id,
+    id: table.oid,
     abstractTypesMap: $currentDbAbstractTypes.data,
   });
   $: tableStructureIsLoading = tableStructure.isLoading;
diff --git a/mathesar_ui/src/pages/record/RecordPageContent.svelte b/mathesar_ui/src/pages/record/RecordPageContent.svelte
index d504fdb71a..7a651f7513 100644
--- a/mathesar_ui/src/pages/record/RecordPageContent.svelte
+++ b/mathesar_ui/src/pages/record/RecordPageContent.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
   import { getDetailedRecordsErrors } from '@mathesar/api/rest/utils/recordUtils';
   import { getAPI } from '@mathesar/api/rest/utils/requestUtils';
@@ -28,7 +28,7 @@
   export let record: RecordStore;
   export let tableStructure: TableStructure;
 
-  $: table = $currentTable as TableEntry;
+  $: table = $currentTable as Table;
   $: ({ processedColumns } = tableStructure);
   $: ({ recordPk, summary, fieldValues } = record);
   $: fieldPropsObjects = [...$processedColumns.values()].map((c) => ({
@@ -88,7 +88,7 @@
     </div>
   </InsetPageLayout>
 
-  {#await getJoinableTablesResult(table.id)}
+  {#await getJoinableTablesResult(table.oid)}
     <RecordPageLoadingSpinner />
   {:then joinableTablesResult}
     <Widgets {joinableTablesResult} {recordPk} recordSummary={$summary} />
diff --git a/mathesar_ui/src/pages/record/RecordStore.ts b/mathesar_ui/src/pages/record/RecordStore.ts
index efe8ff0300..f1a7350c5b 100644
--- a/mathesar_ui/src/pages/record/RecordStore.ts
+++ b/mathesar_ui/src/pages/record/RecordStore.ts
@@ -1,6 +1,6 @@
 import { type Readable, derived, writable } from 'svelte/store';
 
-import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Response as ApiResponse } from '@mathesar/api/rest/types/tables/records';
 import {
   type RequestStatus,
@@ -26,16 +26,16 @@ export default class RecordStore {
 
   summary: Readable<string>;
 
-  table: TableEntry;
+  table: Table;
 
   recordPk: string;
 
   private url: string;
 
-  constructor({ table, recordPk }: { table: TableEntry; recordPk: string }) {
+  constructor({ table, recordPk }: { table: Table; recordPk: string }) {
     this.table = table;
     this.recordPk = recordPk;
-    this.url = `/api/db/v0/tables/${this.table.id}/records/${this.recordPk}/`;
+    this.url = `/api/db/v0/tables/${this.table.oid}/records/${this.recordPk}/`;
     const { template } = this.table.settings.preview_settings;
     this.summary = derived(
       [this.fieldValues, this.recordSummaries],
diff --git a/mathesar_ui/src/pages/record/TableWidget.svelte b/mathesar_ui/src/pages/record/TableWidget.svelte
index cdb7ab686b..524ebe0583 100644
--- a/mathesar_ui/src/pages/record/TableWidget.svelte
+++ b/mathesar_ui/src/pages/record/TableWidget.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import type { Column } from '@mathesar/api/rest/types/tables/columns';
   import TableName from '@mathesar/components/TableName.svelte';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
@@ -22,12 +22,12 @@
   });
 
   export let recordPk: string;
-  export let table: TableEntry;
+  export let table: Table;
   export let fkColumn: Pick<Column, 'id' | 'name'>;
 
   $: abstractTypesMap = $currentDbAbstractTypes.data;
   $: tabularData = new TabularData({
-    id: table.id,
+    id: table.oid,
     abstractTypesMap,
     meta,
     contextualFilters: new Map([[fkColumn.id, recordPk]]),
diff --git a/mathesar_ui/src/pages/record/Widgets.svelte b/mathesar_ui/src/pages/record/Widgets.svelte
index 2e4c562be1..6a808cc796 100644
--- a/mathesar_ui/src/pages/record/Widgets.svelte
+++ b/mathesar_ui/src/pages/record/Widgets.svelte
@@ -54,7 +54,7 @@
       </Help>
     </h2>
     <div class="widgets">
-      {#each tableWidgetInputs as { table, fkColumn } (`${table.id}-${fkColumn.id}`)}
+      {#each tableWidgetInputs as { table, fkColumn } (`${table.oid}-${fkColumn.id}`)}
         <section class="table-widget-positioner">
           <TableWidget {recordPk} {table} {fkColumn} />
         </section>
diff --git a/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte b/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
index 6e288c5312..5ecc9637a2 100644
--- a/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
+++ b/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
@@ -19,7 +19,7 @@
     isCreatingNewTable = true;
     const tableInfo = await createTable(database, schema, {});
     isCreatingNewTable = false;
-    router.goto(getTablePageUrl(database.id, schema.oid, tableInfo.id), false);
+    router.goto(getTablePageUrl(database.id, schema.oid, tableInfo.oid), false);
   }
 </script>
 
diff --git a/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte b/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
index 9a22b3733e..343b3812a2 100644
--- a/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
+++ b/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
@@ -24,7 +24,7 @@
     isCreatingNewTable = true;
     const tableInfo = await createTable(database, schema, {});
     isCreatingNewTable = false;
-    router.goto(getTablePageUrl(database.id, schema.oid, tableInfo.id), false);
+    router.goto(getTablePageUrl(database.id, schema.oid, tableInfo.oid), false);
   }
 </script>
 
diff --git a/mathesar_ui/src/pages/schema/EditTable.svelte b/mathesar_ui/src/pages/schema/EditTable.svelte
index 88c61ffa2f..0007deb56d 100644
--- a/mathesar_ui/src/pages/schema/EditTable.svelte
+++ b/mathesar_ui/src/pages/schema/EditTable.svelte
@@ -1,18 +1,18 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import EditTableHoc from '@mathesar/components/EditTableHOC.svelte';
   import Identifier from '@mathesar/components/Identifier.svelte';
   import NameAndDescInputModalForm from '@mathesar/components/NameAndDescInputModalForm.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import type { ModalController } from '@mathesar-component-library';
 
-  export let table: TableEntry;
+  export let table: Table;
   export let modalController: ModalController;
 </script>
 
-<EditTableHoc let:getNameValidationErrors let:onUpdate tableId={table.id}>
+<EditTableHoc let:getNameValidationErrors let:onUpdate tableId={table.oid}>
   <NameAndDescInputModalForm
     controller={modalController}
     save={(name, description) => onUpdate({ name, description })}
diff --git a/mathesar_ui/src/pages/schema/SchemaOverview.svelte b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
index ad9d8cd6ca..20d5094024 100644
--- a/mathesar_ui/src/pages/schema/SchemaOverview.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
@@ -2,7 +2,7 @@
   import { _ } from 'svelte-i18n';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Database } from '@mathesar/AppTypes';
@@ -23,7 +23,7 @@
   import TableSkeleton from './TableSkeleton.svelte';
   import TablesList from './TablesList.svelte';
 
-  export let tablesMap: Map<number, TableEntry>;
+  export let tablesMap: Map<number, Table>;
   export let explorationsMap: Map<number, QueryInstance>;
   export let tablesRequestStatus: RequestStatus;
   export let explorationsRequestStatus: RequestStatus;
diff --git a/mathesar_ui/src/pages/schema/SchemaTables.svelte b/mathesar_ui/src/pages/schema/SchemaTables.svelte
index c9f6316426..4937dad7d2 100644
--- a/mathesar_ui/src/pages/schema/SchemaTables.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaTables.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Database } from '@mathesar/AppTypes';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
@@ -11,7 +11,7 @@
   import CreateNewTableTutorial from './CreateNewTableTutorial.svelte';
   import TablesList from './TablesList.svelte';
 
-  export let tablesMap: Map<number, TableEntry>;
+  export let tablesMap: Map<number, Table>;
 
   export let database: Database;
   export let schema: Schema;
@@ -21,10 +21,7 @@
 
   let tableSearchQuery = '';
 
-  function filterTables(
-    _tablesMap: Map<number, TableEntry>,
-    searchQuery: string,
-  ) {
+  function filterTables(_tablesMap: Map<number, Table>, searchQuery: string) {
     return [..._tablesMap.values()].filter((table) =>
       table.name.toLowerCase().includes(searchQuery.trim().toLowerCase()),
     );
diff --git a/mathesar_ui/src/pages/schema/TableCard.svelte b/mathesar_ui/src/pages/schema/TableCard.svelte
index 106c76eede..6712bed832 100644
--- a/mathesar_ui/src/pages/schema/TableCard.svelte
+++ b/mathesar_ui/src/pages/schema/TableCard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Database } from '@mathesar/AppTypes';
   import LinkMenuItem from '@mathesar/component-library/menu/LinkMenuItem.svelte';
@@ -36,7 +36,7 @@
   const recordSelector = getRecordSelectorFromContext();
   const editTableModalController = modal.spawnModalController();
 
-  export let table: TableEntry;
+  export let table: Table;
   export let database: Database;
   export let schema: Schema;
   export let canExecuteDDL: boolean;
@@ -47,10 +47,10 @@
 
   $: isTableImportConfirmationNeeded = isTableImportConfirmationRequired(table);
   $: tablePageUrl = isTableImportConfirmationNeeded
-    ? getImportPreviewPageUrl(database.id, schema.oid, table.id, {
+    ? getImportPreviewPageUrl(database.id, schema.oid, table.oid, {
         useColumnTypeInference: true,
       })
-    : getTablePageUrl(database.id, schema.oid, table.id);
+    : getTablePageUrl(database.id, schema.oid, table.oid);
   $: explorationPageUrl = createDataExplorerUrlToExploreATable(
     database.id,
     schema.oid,
@@ -68,7 +68,7 @@
         },
       },
       onProceed: async () => {
-        await deleteTable(database, schema, table.id);
+        await deleteTable(database, schema, table.oid);
       },
     });
   }
@@ -78,7 +78,7 @@
   }
 
   function handleFindRecord() {
-    recordSelector.navigateToRecordPage({ tableId: table.id });
+    recordSelector.navigateToRecordPage({ tableId: table.oid });
   }
 </script>
 
diff --git a/mathesar_ui/src/pages/schema/TablesList.svelte b/mathesar_ui/src/pages/schema/TablesList.svelte
index 2969bb0b06..bbc766f9c1 100644
--- a/mathesar_ui/src/pages/schema/TablesList.svelte
+++ b/mathesar_ui/src/pages/schema/TablesList.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Database } from '@mathesar/AppTypes';
   import { iconTable } from '@mathesar/icons';
@@ -9,14 +9,14 @@
   import EmptyEntity from './EmptyEntity.svelte';
   import TableCard from './TableCard.svelte';
 
-  export let tables: TableEntry[];
+  export let tables: Table[];
   export let database: Database;
   export let schema: Schema;
   export let canExecuteDDL: boolean;
 </script>
 
 <div class="container">
-  {#each tables as table (table.id)}
+  {#each tables as table (table.oid)}
     <TableCard {canExecuteDDL} {table} {database} {schema} />
   {:else}
     <EmptyEntity icon={iconTable}>
diff --git a/mathesar_ui/src/pages/table/TablePage.svelte b/mathesar_ui/src/pages/table/TablePage.svelte
index a72515d1f5..ec4c1471ca 100644
--- a/mathesar_ui/src/pages/table/TablePage.svelte
+++ b/mathesar_ui/src/pages/table/TablePage.svelte
@@ -2,7 +2,7 @@
   import { tick } from 'svelte';
   import { router } from 'tinro';
 
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import { focusActiveCell } from '@mathesar/components/sheet/utils';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
@@ -27,7 +27,7 @@
   );
   setNewImperativeFilterControllerInContext();
 
-  export let table: TableEntry;
+  export let table: Table;
   export let shareConsumer: ShareConsumer | undefined = undefined;
 
   let sheetElement: HTMLElement;
@@ -36,7 +36,7 @@
   $: ({ query } = $router);
   $: meta = Meta.fromSerialization(query[metaSerializationQueryKey] ?? '');
   $: tabularData = new TabularData({
-    id: table.id,
+    id: table.oid,
     abstractTypesMap,
     meta,
     table,
diff --git a/mathesar_ui/src/routes/RecordPageRoute.svelte b/mathesar_ui/src/routes/RecordPageRoute.svelte
index 82f16ba0f7..d5456249f2 100644
--- a/mathesar_ui/src/routes/RecordPageRoute.svelte
+++ b/mathesar_ui/src/routes/RecordPageRoute.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Database } from '@mathesar/AppTypes';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
@@ -8,7 +8,7 @@
 
   export let database: Database;
   export let schema: Schema;
-  export let table: TableEntry;
+  export let table: Table;
   export let recordPk: string;
 
   $: record = new RecordStore({ table, recordPk });
diff --git a/mathesar_ui/src/stores/storeBasedUrls.ts b/mathesar_ui/src/stores/storeBasedUrls.ts
index 7c858b6bd2..330d95ee43 100644
--- a/mathesar_ui/src/stores/storeBasedUrls.ts
+++ b/mathesar_ui/src/stores/storeBasedUrls.ts
@@ -32,7 +32,7 @@ export const storeToGetRecordPageUrl = derived(
     }): string | undefined {
       const d = connectionId ?? connection?.id;
       const s = schemaId ?? schema?.oid;
-      const t = tableId ?? table?.id;
+      const t = tableId ?? table?.oid;
       const r = recordId ?? undefined;
       if (
         d === undefined ||
@@ -62,7 +62,7 @@ export const storeToGetTablePageUrl = derived(
     }): string | undefined {
       const d = connectionId ?? connection?.id;
       const s = schemaId ?? schema?.oid;
-      const t = tableId ?? table?.id;
+      const t = tableId ?? table?.oid;
       if (d === undefined || s === undefined || t === undefined) {
         return undefined;
       }
diff --git a/mathesar_ui/src/stores/table-data/columns.ts b/mathesar_ui/src/stores/table-data/columns.ts
index 23774937a2..c860a71a68 100644
--- a/mathesar_ui/src/stores/table-data/columns.ts
+++ b/mathesar_ui/src/stores/table-data/columns.ts
@@ -1,6 +1,6 @@
 import { type Readable, derived, writable } from 'svelte/store';
 
-import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type {
   PaginatedResponse,
@@ -46,7 +46,7 @@ export class ColumnsDataStore extends EventHandler<{
   columnPatched: Partial<Column>;
   columnsFetched: Column[];
 }> {
-  private tableId: TableEntry['id'];
+  private tableId: Table['oid'];
 
   private promise: CancellablePromise<PaginatedResponse<Column>> | undefined;
 
@@ -70,7 +70,7 @@ export class ColumnsDataStore extends EventHandler<{
     hiddenColumns,
     shareConsumer,
   }: {
-    tableId: TableEntry['id'];
+    tableId: Table['oid'];
     /** Values are column ids */
     hiddenColumns?: Iterable<number>;
     shareConsumer?: ShareConsumer;
diff --git a/mathesar_ui/src/stores/table-data/constraints.ts b/mathesar_ui/src/stores/table-data/constraints.ts
index 50ed5ec1e7..48ed985e94 100644
--- a/mathesar_ui/src/stores/table-data/constraints.ts
+++ b/mathesar_ui/src/stores/table-data/constraints.ts
@@ -7,7 +7,7 @@ import type {
 } from 'svelte/store';
 import { derived, get as getStoreValue, writable } from 'svelte/store';
 
-import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { Constraint as ApiConstraint } from '@mathesar/api/rest/types/tables/constraints';
 import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
@@ -90,7 +90,7 @@ function api(url: string) {
 }
 
 export class ConstraintsDataStore implements Writable<ConstraintsData> {
-  private tableId: TableEntry['id'];
+  private tableId: Table['oid'];
 
   private store: Writable<ConstraintsData>;
 
@@ -115,7 +115,7 @@ export class ConstraintsDataStore implements Writable<ConstraintsData> {
     tableId,
     shareConsumer,
   }: {
-    tableId: TableEntry['id'];
+    tableId: Table['oid'];
     shareConsumer?: ShareConsumer;
   }) {
     this.tableId = tableId;
diff --git a/mathesar_ui/src/stores/table-data/processedColumns.ts b/mathesar_ui/src/stores/table-data/processedColumns.ts
index dbd2978ec6..aaae15f7e2 100644
--- a/mathesar_ui/src/stores/table-data/processedColumns.ts
+++ b/mathesar_ui/src/stores/table-data/processedColumns.ts
@@ -1,6 +1,6 @@
 import type { Readable } from 'svelte/store';
 
-import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { Constraint } from '@mathesar/api/rest/types/tables/constraints';
 import type { CellColumnFabric } from '@mathesar/components/cell-fabric/types';
@@ -61,7 +61,7 @@ export function processColumn({
   abstractTypeMap,
   hasEnhancedPrimaryKeyCell,
 }: {
-  tableId: TableEntry['id'];
+  tableId: Table['oid'];
   column: Column;
   columnIndex: number;
   constraints: Constraint[];
diff --git a/mathesar_ui/src/stores/table-data/records.ts b/mathesar_ui/src/stores/table-data/records.ts
index e25b0bf904..38767fa584 100644
--- a/mathesar_ui/src/stores/table-data/records.ts
+++ b/mathesar_ui/src/stores/table-data/records.ts
@@ -7,7 +7,7 @@ import {
   writable,
 } from 'svelte/store';
 
-import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type {
   GetRequestParams as ApiGetRequestParams,
@@ -279,7 +279,7 @@ function preprocessRecords({
 }
 
 export class RecordsData {
-  private tableId: TableEntry['id'];
+  private tableId: Table['oid'];
 
   private url: string;
 
@@ -333,7 +333,7 @@ export class RecordsData {
     contextualFilters,
     shareConsumer,
   }: {
-    tableId: TableEntry['id'];
+    tableId: Table['oid'];
     meta: Meta;
     columnsDataStore: ColumnsDataStore;
     contextualFilters: Map<number, number | string>;
diff --git a/mathesar_ui/src/stores/table-data/tabularData.ts b/mathesar_ui/src/stores/table-data/tabularData.ts
index 7a2edfec4a..81cd538e03 100644
--- a/mathesar_ui/src/stores/table-data/tabularData.ts
+++ b/mathesar_ui/src/stores/table-data/tabularData.ts
@@ -1,7 +1,7 @@
 import { getContext, setContext } from 'svelte';
 import { type Readable, type Writable, derived, writable } from 'svelte/store';
 
-import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import { States } from '@mathesar/api/rest/utils/requestUtils';
 import type { DBObjectEntry } from '@mathesar/AppTypes';
@@ -25,7 +25,7 @@ import { RecordsData } from './records';
 export interface TabularDataProps {
   id: DBObjectEntry['id'];
   abstractTypesMap: AbstractTypesMap;
-  table: TableEntry;
+  table: Table;
   meta?: Meta;
   shareConsumer?: ShareConsumer;
   /**
@@ -60,7 +60,7 @@ export class TabularData {
 
   selection: SheetSelectionStore;
 
-  table: TableEntry;
+  table: Table;
 
   shareConsumer?: ShareConsumer;
 
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index 219cc4407c..36af8432e7 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -16,10 +16,7 @@
 import type { Readable, Unsubscriber, Writable } from 'svelte/store';
 import { derived, get, writable } from 'svelte/store';
 
-import type {
-  MinimalColumnDetails,
-  TableEntry,
-} from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rest/types/tables';
 import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
 import type {
   SplitTableRequest,
@@ -51,7 +48,7 @@ import { addCountToSchemaNumTables, currentSchemaId } from './schemas';
 const commonData = preloadCommonData();
 
 export interface DBTablesStoreData {
-  data: Map<TableEntry['id'], TableEntry>;
+  data: Map<Table['oid'], Table>;
   requestStatus: RequestStatus;
 }
 
@@ -61,21 +58,21 @@ const schemaTablesStoreMap: Map<
 > = new Map();
 const schemaTablesRequestMap: Map<
   Schema['oid'],
-  CancellablePromise<PaginatedResponse<TableEntry>>
+  CancellablePromise<PaginatedResponse<Table>>
 > = new Map();
 
-function sortedTableEntries(tableEntries: TableEntry[]): TableEntry[] {
+function sortedTableEntries(tableEntries: Table[]): Table[] {
   return [...tableEntries].sort((a, b) => a.name.localeCompare(b.name));
 }
 
 function setSchemaTablesStore(
   schemaId: Schema['oid'],
-  tableEntries?: TableEntry[],
+  tableEntries?: Table[],
 ): Writable<DBTablesStoreData> {
   const tables: DBTablesStoreData['data'] = new Map();
   if (tableEntries) {
     sortedTableEntries(tableEntries).forEach((entry) => {
-      tables.set(entry.id, entry);
+      tables.set(entry.oid, entry);
     });
   }
 
@@ -115,7 +112,7 @@ export async function refetchTablesForSchema(
 
     schemaTablesRequestMap.get(schemaId)?.cancel();
 
-    const tablesRequest = getAPI<PaginatedResponse<TableEntry>>(
+    const tablesRequest = getAPI<PaginatedResponse<Table>>(
       `/api/db/v0/tables/?schema=${schemaId}&limit=500`,
     );
     schemaTablesRequestMap.set(schemaId, tablesRequest);
@@ -167,23 +164,23 @@ export function getTablesStoreForSchema(
  * TODO: Use a dedicated higher level Tables store and
  * remove this function.
  */
-function findSchemaStoreForTable(id: TableEntry['id']) {
+function findSchemaStoreForTable(id: Table['oid']) {
   return [...schemaTablesStoreMap.values()].find((entry) =>
     get(entry).data.has(id),
   );
 }
 
-function findAndUpdateTableStore(id: TableEntry['id'], tableEntry: TableEntry) {
+function findAndUpdateTableStore(id: Table['oid'], table: Table) {
   findSchemaStoreForTable(id)?.update((tableStoreData) => {
     const existingTableEntry = tableStoreData.data.get(id);
     const updatedTableEntry = {
       ...(existingTableEntry ?? {}),
-      ...tableEntry,
+      ...table,
     };
     tableStoreData.data.set(id, updatedTableEntry);
     const tableEntryMap: DBTablesStoreData['data'] = new Map();
     sortedTableEntries([...tableStoreData.data.values()]).forEach((entry) => {
-      tableEntryMap.set(entry.id, entry);
+      tableEntryMap.set(entry.oid, entry);
     });
     return {
       ...tableStoreData,
@@ -195,9 +192,9 @@ function findAndUpdateTableStore(id: TableEntry['id'], tableEntry: TableEntry) {
 export function deleteTable(
   database: Database,
   schema: Schema,
-  tableId: TableEntry['id'],
-): CancellablePromise<TableEntry> {
-  const promise = deleteAPI<TableEntry>(`/api/db/v0/tables/${tableId}/`);
+  tableId: Table['oid'],
+): CancellablePromise<Table> {
+  const promise = deleteAPI<Table>(`/api/db/v0/tables/${tableId}/`);
   return new CancellablePromise(
     (resolve, reject) => {
       void promise.then((value) => {
@@ -221,11 +218,8 @@ export function deleteTable(
 export function updateTableMetaData(
   id: number,
   updatedMetaData: AtLeastOne<{ name: string; description: string }>,
-): CancellablePromise<TableEntry> {
-  const promise = patchAPI<TableEntry>(
-    `/api/db/v0/tables/${id}/`,
-    updatedMetaData,
-  );
+): CancellablePromise<Table> {
+  const promise = patchAPI<Table>(`/api/db/v0/tables/${id}/`, updatedMetaData);
   return new CancellablePromise(
     (resolve, reject) => {
       void promise.then((value) => {
@@ -246,8 +240,8 @@ export function createTable(
     name?: string;
     dataFiles?: [number, ...number[]];
   },
-): CancellablePromise<TableEntry> {
-  const promise = postAPI<TableEntry>('/api/db/v0/tables/', {
+): CancellablePromise<Table> {
+  const promise = postAPI<Table>('/api/db/v0/tables/', {
     schema: schema.oid,
     name: tableArgs.name,
     data_files: tableArgs.dataFiles,
@@ -260,7 +254,7 @@ export function createTable(
           const tableEntryMap: DBTablesStoreData['data'] = new Map();
           sortedTableEntries([...existing.data.values(), value]).forEach(
             (entry) => {
-              tableEntryMap.set(entry.id, entry);
+              tableEntryMap.set(entry.oid, entry);
             },
           );
           return {
@@ -278,14 +272,14 @@ export function createTable(
 }
 
 export function patchTable(
-  id: TableEntry['id'],
+  id: Table['oid'],
   patch: {
-    name?: TableEntry['name'];
-    import_verified?: TableEntry['import_verified'];
-    columns?: MinimalColumnDetails[];
+    name?: Table['name'];
+    import_verified?: Table['import_verified'];
+    columns?: Table['columns'];
   },
-): CancellablePromise<TableEntry> {
-  const promise = patchAPI<TableEntry>(`/api/db/v0/tables/${id}/`, patch);
+): CancellablePromise<Table> {
+  const promise = patchAPI<Table>(`/api/db/v0/tables/${id}/`, patch);
   return new CancellablePromise(
     (resolve, reject) => {
       void promise.then((value) => {
@@ -312,7 +306,7 @@ export function patchTable(
  * 3. Move all api-call-only functions to /api. Only keep functions that
  *    update the stores within /stores
  */
-export function getTable(id: TableEntry['id']): CancellablePromise<TableEntry> {
+export function getTable(id: Table['oid']): CancellablePromise<Table> {
   return getAPI(`/api/db/v0/tables/${id}/`);
 }
 
@@ -350,8 +344,8 @@ export function moveColumns(
  * Replace getTable with this function once the above mentioned changes are done.
  */
 export function getTableFromStoreOrApi(
-  id: TableEntry['id'],
-): CancellablePromise<TableEntry> {
+  id: Table['oid'],
+): CancellablePromise<Table> {
   const schemaStore = findSchemaStoreForTable(id);
   if (schemaStore) {
     const tableEntry = get(schemaStore).data.get(id);
@@ -368,10 +362,10 @@ export function getTableFromStoreOrApi(
         const store = schemaTablesStoreMap.get(table.schema);
         if (store) {
           store.update((existing) => {
-            const tableMap = new Map<number, TableEntry>();
+            const tableMap = new Map<number, Table>();
             const tables = [...existing.data.values(), table];
             sortedTableEntries(tables).forEach((t) => {
-              tableMap.set(t.id, t);
+              tableMap.set(t.oid, t);
             });
             return {
               ...existing,
@@ -395,7 +389,7 @@ export function getTableFromStoreOrApi(
  * follows, that this function cannot be used where columns might have defaults.
  */
 export function getTypeSuggestionsForTable(
-  id: TableEntry['id'],
+  id: Table['oid'],
 ): CancellablePromise<Record<string, string>> {
   const optimizingQueryParam = 'columns_might_have_defaults=false';
   return getAPI(
@@ -404,13 +398,13 @@ export function getTypeSuggestionsForTable(
 }
 
 export function generateTablePreview(props: {
-  table: Pick<TableEntry, 'id'>;
-  columns: MinimalColumnDetails[];
+  table: Pick<Table, 'oid'>;
+  columns: Table['columns'];
 }): CancellablePromise<{
   records: Record<string, unknown>[];
 }> {
   const { columns, table } = props;
-  return postAPI(`/api/db/v0/tables/${table.id}/previews/`, { columns });
+  return postAPI(`/api/db/v0/tables/${table.oid}/previews/`, { columns });
 }
 
 export const tables: Readable<DBTablesStoreData> = derived(
@@ -443,7 +437,7 @@ export const importVerifiedTables: Readable<DBTablesStoreData['data']> =
       new Map(
         [...$tables.data.values()]
           .filter((table) => !isTableImportConfirmationRequired(table))
-          .map((table) => [table.id, table]),
+          .map((table) => [table.oid, table]),
       ),
   );
 
@@ -475,19 +469,19 @@ export function getJoinableTablesResult(tableId: number, maxDepth = 1) {
   );
 }
 
-type TableSettings = TableEntry['settings'];
+type TableSettings = Table['settings'];
 
 export async function saveTableSettings(
-  table: Pick<TableEntry, 'id' | 'settings' | 'schema'>,
+  table: Pick<Table, 'oid' | 'settings' | 'schema'>,
   settings: RecursivePartial<TableSettings>,
 ): Promise<void> {
-  const url = `/api/db/v0/tables/${table.id}/settings/${table.settings.id}/`;
+  const url = `/api/db/v0/tables/${table.oid}/settings/${table.settings.id}/`;
   await patchAPI<TableSettings>(url, settings);
   await refetchTablesForSchema(table.schema);
 }
 
 export function saveRecordSummaryTemplate(
-  table: Pick<TableEntry, 'id' | 'settings' | 'schema'>,
+  table: Pick<Table, 'oid' | 'settings' | 'schema'>,
   previewSettings: TableSettings['preview_settings'],
 ): Promise<void> {
   const { customized } = previewSettings;
@@ -497,7 +491,7 @@ export function saveRecordSummaryTemplate(
 }
 
 export function saveColumnOrder(
-  table: Pick<TableEntry, 'id' | 'settings' | 'schema'>,
+  table: Pick<Table, 'oid' | 'settings' | 'schema'>,
   columnOrder: TableSettings['column_order'],
 ): Promise<void> {
   return saveTableSettings(table, {
diff --git a/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte b/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
index fdda3a127f..7de3e97ec7 100644
--- a/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
+++ b/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
@@ -2,7 +2,7 @@
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
 
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import EntityPageHeader from '@mathesar/components/EntityPageHeader.svelte';
   import ModificationStatus from '@mathesar/components/ModificationStatus.svelte';
   import NameAndDescInputModalForm from '@mathesar/components/NameAndDescInputModalForm.svelte';
@@ -49,9 +49,9 @@
   $: hasNoColumns = $query.initial_columns.length === 0;
   $: querySaveRequestStatus = $state.saveState?.state;
 
-  function updateBaseTable(tableEntry: TableEntry | undefined) {
+  function updateBaseTable(table: Table | undefined) {
     void queryManager.update((q) =>
-      q.withBaseTable(tableEntry ? tableEntry.id : undefined),
+      q.withBaseTable(table ? table.oid : undefined),
     );
     linkCollapsibleOpenState = {};
   }
diff --git a/mathesar_ui/src/systems/data-explorer/QueryManager.ts b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
index cb97856185..7bba0d4c00 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryManager.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
@@ -6,7 +6,7 @@ import type {
   QueryInstance,
   QueryRunResponse,
 } from '@mathesar/api/rest/types/queries';
-import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rest/types/tables';
 import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { getAPI } from '@mathesar/api/rest/utils/requestUtils';
@@ -63,7 +63,7 @@ export default class QueryManager extends QueryRunner {
 
   // Promises
 
-  private baseTableFetchPromise: CancellablePromise<TableEntry> | undefined;
+  private baseTableFetchPromise: CancellablePromise<Table> | undefined;
 
   private joinableColumnsfetchPromise:
     | CancellablePromise<JoinableTablesResult>
diff --git a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
index 79d9a4f8c5..b58cd4b36c 100644
--- a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
+++ b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
@@ -1,5 +1,5 @@
 import type { QueryInstanceSummarizationTransformation } from '@mathesar/api/rest/types/queries';
-import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
 import type { UnsavedQueryInstance } from '@mathesar/stores/queries';
@@ -7,7 +7,7 @@ import type { TerseGrouping } from '@mathesar/stores/table-data';
 import Url64 from '@mathesar/utils/Url64';
 
 type TerseSummarizedColumn = Pick<Column, 'id' | 'name'>;
-type BaseTable = Pick<TableEntry, 'id' | 'name'>;
+type BaseTable = Pick<Table, 'oid' | 'name'>;
 
 interface TerseSummarization {
   baseTable: BaseTable;
@@ -23,7 +23,7 @@ interface TerseSummarization {
 class Streamline {
   static baseTable(t: BaseTable): BaseTable {
     return {
-      id: t.id,
+      oid: t.oid,
       name: t.name,
     };
   }
@@ -103,7 +103,7 @@ export function constructQueryModelFromHash(
     !terseSummarization.terseGrouping?.length ||
     !terseSummarization.columns
   ) {
-    return { base_table: baseTable.id };
+    return { base_table: baseTable.oid };
   }
 
   const columnMap = new Map(
@@ -117,7 +117,7 @@ export function constructQueryModelFromHash(
     .filter((entry): entry is TerseSummarizedColumn => entry !== undefined);
 
   if (groupingColumns.length === 0) {
-    return { base_table: baseTable.id };
+    return { base_table: baseTable.oid };
   }
 
   const baseGroupingColumn = groupingColumns[0];
@@ -173,7 +173,7 @@ export function constructQueryModelFromHash(
   );
 
   return {
-    base_table: baseTable.id,
+    base_table: baseTable.oid,
     initial_columns: initialColumns,
     transformations,
     display_names: displayNames,
diff --git a/mathesar_ui/src/systems/data-explorer/utils.ts b/mathesar_ui/src/systems/data-explorer/utils.ts
index c91f41adae..aa11c208b1 100644
--- a/mathesar_ui/src/systems/data-explorer/utils.ts
+++ b/mathesar_ui/src/systems/data-explorer/utils.ts
@@ -5,7 +5,7 @@ import type {
   QueryResultColumn,
   QueryRunResponse,
 } from '@mathesar/api/rest/types/queries';
-import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type {
   JoinableTablesResult,
@@ -70,10 +70,10 @@ export type ProcessedQueryOutputColumnMap = ImmutableMap<
 export interface InputColumn {
   id: Column['id'];
   name: Column['name'];
-  tableName: TableEntry['name'];
+  tableName: Table['name'];
   jpPath?: JpPath;
   type: Column['type'];
-  tableId: TableEntry['id'];
+  tableId: Table['oid'];
 }
 
 export interface ColumnWithLink extends Omit<InputColumn, 'tableId'> {
@@ -83,8 +83,8 @@ export interface ColumnWithLink extends Omit<InputColumn, 'tableId'> {
 }
 
 export interface LinkedTable {
-  id: TableEntry['id'];
-  name: TableEntry['name'];
+  id: Table['oid'];
+  name: Table['name'];
   linkedToColumn: {
     id: Column['id'];
     name: Column['name'];
@@ -181,7 +181,7 @@ export function getLinkFromColumn(
 
 export function getColumnInformationMap(
   result: JoinableTablesResult,
-  baseTable: Pick<TableEntry, 'id' | 'name' | 'columns'>,
+  baseTable: Pick<Table, 'oid' | 'name' | 'columns'>,
 ): InputColumnsStoreSubstance['inputColumnInformationMap'] {
   const map: InputColumnsStoreSubstance['inputColumnInformationMap'] =
     new Map();
@@ -190,7 +190,7 @@ export function getColumnInformationMap(
       id: column.id,
       name: column.name,
       type: column.type,
-      tableId: baseTable.id,
+      tableId: baseTable.oid,
       tableName: baseTable.name,
     });
   });
@@ -213,7 +213,7 @@ export function getColumnInformationMap(
 
 export function getBaseTableColumnsWithLinks(
   result: JoinableTablesResult,
-  baseTable: Pick<TableEntry, 'id' | 'name' | 'columns'>,
+  baseTable: Pick<Table, 'oid' | 'name' | 'columns'>,
 ): Map<ColumnWithLink['id'], ColumnWithLink> {
   const columnMapEntries: [ColumnWithLink['id'], ColumnWithLink][] =
     baseTable.columns.map((column) => [
@@ -232,7 +232,7 @@ export function getBaseTableColumnsWithLinks(
 
 export function getTablesThatReferenceBaseTable(
   result: JoinableTablesResult,
-  baseTable: Pick<TableEntry, 'id' | 'name' | 'columns'>,
+  baseTable: Pick<Table, 'oid' | 'name' | 'columns'>,
 ): ReferencedByTable[] {
   const referenceLinks = result.joinable_tables.filter(
     (entry) => entry.depth === 1 && entry.fk_path[0][1] === true,
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
index 4f34d7bd3c..9c96febd74 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
@@ -88,8 +88,8 @@
       const record = response.results[0];
       const recordId = getPkValueInRecord(record, $columns);
       const previewData = response.preview_data ?? [];
-      const tableEntry = $tables.data.get(tableId);
-      const template = tableEntry?.settings?.preview_settings?.template;
+      const table = $tables.data.get(tableId);
+      const template = table?.settings?.preview_settings?.template;
       if (!template) {
         throw new Error('No record summary template found in API response.');
       }
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorNavigationButton.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorNavigationButton.svelte
index c930a71b12..a41d543ead 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorNavigationButton.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorNavigationButton.svelte
@@ -2,7 +2,7 @@
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
 
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import { Icon } from '@mathesar/component-library';
   import { iconSelectRecord } from '@mathesar/icons';
 
@@ -11,15 +11,15 @@
   const recordSelector = getRecordSelectorFromContext();
   const dispatch = createEventDispatcher();
 
-  export let table: { id: TableEntry['id']; name?: TableEntry['name'] };
+  export let table: { oid: Table['oid']; name?: Table['name'] };
 
-  $: ({ id, name } = table);
+  $: ({ oid, name } = table);
   $: label = name
     ? $_('navigate_to_table_record', { values: { tableName: name } })
     : $_('navigate_to_record');
 
   function handleClick() {
-    recordSelector.navigateToRecordPage({ tableId: id });
+    recordSelector.navigateToRecordPage({ tableId: oid });
     dispatch('click');
   }
 </script>
diff --git a/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts b/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts
index 3c897c4c7c..f316771211 100644
--- a/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts
+++ b/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts
@@ -1,4 +1,4 @@
-import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 
 /**
@@ -18,7 +18,7 @@ export function getColumnIdToFocusInitially({
   table,
   columns,
 }: {
-  table: TableEntry | undefined;
+  table: Table | undefined;
   columns: Column[];
 }): number | undefined {
   function getFromRecordSummaryTemplate() {
diff --git a/mathesar_ui/src/systems/table-view/TableView.svelte b/mathesar_ui/src/systems/table-view/TableView.svelte
index 833a2d7368..642282eea5 100644
--- a/mathesar_ui/src/systems/table-view/TableView.svelte
+++ b/mathesar_ui/src/systems/table-view/TableView.svelte
@@ -3,7 +3,7 @@
   import type { ComponentProps } from 'svelte';
   import { get } from 'svelte/store';
 
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import { ImmutableMap, Spinner } from '@mathesar/component-library';
   import { Sheet } from '@mathesar/components/sheet';
   import { SheetClipboardHandler } from '@mathesar/components/sheet/SheetClipboardHandler';
@@ -37,7 +37,7 @@
   );
 
   export let context: Context = 'page';
-  export let table: Pick<TableEntry, 'id' | 'settings' | 'schema'>;
+  export let table: Pick<Table, 'oid' | 'settings' | 'schema'>;
   export let sheetElement: HTMLElement | undefined = undefined;
 
   let tableInspectorTab: ComponentProps<WithTableInspector>['activeTabId'] =
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte b/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
index a7277b088b..23a91eb430 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import EntityPageHeader from '@mathesar/components/EntityPageHeader.svelte';
   import ModificationStatus from '@mathesar/components/ModificationStatus.svelte';
   import { iconInspector, iconTable } from '@mathesar/icons';
@@ -22,7 +22,7 @@
   const userProfile = getUserProfileStoreFromContext();
 
   export let context: TableActionsContext = 'page';
-  export let table: Pick<TableEntry, 'name' | 'description'>;
+  export let table: Pick<Table, 'name' | 'description'>;
 
   $: ({ id, meta, isLoading, display } = $tabularData);
   $: ({ filtering, sorting, grouping, sheetState } = meta);
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/ShareTableDropdown.svelte b/mathesar_ui/src/systems/table-view/actions-pane/ShareTableDropdown.svelte
index a2e5586006..7cfa23bf29 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/ShareTableDropdown.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/ShareTableDropdown.svelte
@@ -2,13 +2,13 @@
   import { _ } from 'svelte-i18n';
 
   import tableShareApi from '@mathesar/api/rest/tableShares';
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import { iconShare } from '@mathesar/icons';
   import { getSharedTablePageUrl } from '@mathesar/routes/urls';
   import ShareEntity from '@mathesar/systems/shares/ShareEntity.svelte';
   import { Dropdown, Icon } from '@mathesar-component-library';
 
-  export let id: TableEntry['id'];
+  export let id: Table['oid'];
 </script>
 
 <Dropdown
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
index 9ea24e4bd5..5343383053 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import {
     type FilledFormValues,
     FormSubmit,
@@ -57,7 +57,7 @@
   );
 
   $: baseColumn = requiredField<ProcessedColumn | undefined>(undefined);
-  $: targetTable = requiredField<TableEntry | undefined>(undefined);
+  $: targetTable = requiredField<Table | undefined>(undefined);
   $: targetColumn = requiredField<ProcessedColumn | undefined>(undefined);
   $: namingStrategy = requiredField<NamingStrategy>('auto');
   $: constraintName = requiredField<string | undefined>(undefined, [
@@ -78,7 +78,7 @@
 
   $: targetTableStructure = $targetTable
     ? new TableStructure({
-        id: $targetTable.id,
+        id: $targetTable.oid,
         abstractTypesMap: $currentDbAbstractTypes.data,
       })
     : undefined;
@@ -106,7 +106,7 @@
       columns: [values.baseColumn.id],
       type: 'foreignkey',
       name: values.constraintName,
-      referent_table: values.targetTable.id,
+      referent_table: values.targetTable.oid,
       referent_columns: [values.targetColumn.id],
     });
     // Why reset before close when the form is automatically reset during
diff --git a/mathesar_ui/src/systems/table-view/header/Header.svelte b/mathesar_ui/src/systems/table-view/header/Header.svelte
index 88e779d715..f4e30394e7 100644
--- a/mathesar_ui/src/systems/table-view/header/Header.svelte
+++ b/mathesar_ui/src/systems/table-view/header/Header.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { first } from 'iter-tools';
 
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import { ContextMenu } from '@mathesar/component-library';
   import {
     SheetCellResizer,
@@ -27,7 +27,7 @@
 
   export let hasNewColumnButton = false;
   export let columnOrder: number[];
-  export let table: Pick<TableEntry, 'id' | 'settings' | 'schema'>;
+  export let table: Pick<Table, 'oid' | 'settings' | 'schema'>;
 
   $: columnOrder = columnOrder ?? [];
   $: columnOrderString = columnOrder.map(String);
diff --git a/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte b/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte
index 2d426179ba..24ebf06e2d 100644
--- a/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte
+++ b/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte
@@ -62,7 +62,7 @@
   $: ({ linkFk } = processedColumn);
   $: linkedTable = linkFk ? $tables.data.get(linkFk.referent_table) : undefined;
   $: linkedTableHref = linkedTable
-    ? $storeToGetTablePageUrl({ tableId: linkedTable.id })
+    ? $storeToGetTablePageUrl({ tableId: linkedTable.oid })
     : undefined;
 
   function addFilter() {
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index 2358429709..153cb12302 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -2,7 +2,7 @@
   import { _ } from 'svelte-i18n';
 
   import type { LinksPostRequest } from '@mathesar/api/rest/types/links';
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import { postAPI } from '@mathesar/api/rest/utils/requestUtils';
   import {
     Field,
@@ -53,7 +53,7 @@
 
   const tabularData = getTabularDataStoreFromContext();
 
-  export let base: TableEntry;
+  export let base: Table;
   export let close: () => void;
 
   // ===========================================================================
@@ -68,9 +68,9 @@
   // ===========================================================================
   // Fields
   // ===========================================================================
-  $: targetTable = requiredField<TableEntry | undefined>(undefined);
+  $: targetTable = requiredField<Table | undefined>(undefined);
   $: target = $targetTable;
-  $: isSelfReferential = base.id === target?.id;
+  $: isSelfReferential = base.oid === target?.oid;
   $: linkTypes = ((): LinkType[] =>
     isSelfReferential
       ? ['manyToOne', 'manyToMany']
@@ -78,7 +78,7 @@
   $: linkType = requiredField<LinkType>('manyToOne');
   $: $targetTable, linkType.reset();
   $: targetColumnsStore = target
-    ? new ColumnsDataStore({ tableId: target.id })
+    ? new ColumnsDataStore({ tableId: target.oid })
     : undefined;
   $: targetColumns = ensureReadable(targetColumnsStore?.columns ?? []);
   $: targetColumnsFetchStatus = ensureReadable(targetColumnsStore?.fetchStatus);
@@ -166,17 +166,17 @@
     if ($linkType === 'oneToMany') {
       return {
         link_type: 'one-to-many',
-        reference_table: values.targetTable.id,
+        reference_table: values.targetTable.oid,
         reference_column_name: $columnNameInTarget,
-        referent_table: base.id,
+        referent_table: base.oid,
       };
     }
     if ($linkType === 'manyToOne') {
       return {
         link_type: 'one-to-many',
-        reference_table: base.id,
+        reference_table: base.oid,
         reference_column_name: $columnNameInBase,
-        referent_table: values.targetTable.id,
+        referent_table: values.targetTable.oid,
       };
     }
     if ($linkType === 'manyToMany') {
@@ -185,11 +185,11 @@
         mapping_table_name: $mappingTableName,
         referents: [
           {
-            referent_table: base.id,
+            referent_table: base.oid,
             column_name: $columnNameMappingToBase,
           },
           {
-            referent_table: values.targetTable.id,
+            referent_table: values.targetTable.oid,
             column_name: $columnNameMappingToTarget,
           },
         ],
@@ -207,7 +207,7 @@
     if (!tableWithNewColumn) {
       return;
     }
-    if (tableWithNewColumn.id === $tabularData.id) {
+    if (tableWithNewColumn.oid === $tabularData.id) {
       await $tabularData.refresh();
     }
   }
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTablePill.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTablePill.svelte
index c53ca57f80..a516f8589c 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTablePill.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTablePill.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import TableName from '@mathesar/components/TableName.svelte';
 
-  export let table: Pick<TableEntry, 'name'>;
+  export let table: Pick<Table, 'name'>;
   export let which: 'base' | 'target' | 'mapping';
 </script>
 
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte
index f1a956740f..c6997204f5 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import type { FieldStore } from '@mathesar/components/form';
   import { RichText } from '@mathesar/components/rich-text';
   import { Label, Radio, assertExhaustive } from '@mathesar-component-library';
@@ -13,8 +13,8 @@
   export let linkType: LinkType;
   export let isSelfReferential: boolean;
   export let field: FieldStore<LinkType>;
-  export let base: Pick<TableEntry, 'name'>;
-  export let target: Pick<TableEntry, 'name'>;
+  export let base: Pick<Table, 'name'>;
+  export let target: Pick<Table, 'name'>;
 
   $: checked = linkType === $field;
   $: label = (() => {
diff --git a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
index 1593b6a405..cefe3ecf36 100644
--- a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
@@ -2,7 +2,7 @@
   import type { ComponentProps } from 'svelte';
   import { _ } from 'svelte-i18n';
 
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import { Field, type FieldStore } from '@mathesar/components/form';
   import { RichText } from '@mathesar/components/rich-text';
   import { Spinner } from '@mathesar-component-library';
@@ -13,9 +13,9 @@
 
   type Which = ComponentProps<Pill>['which'];
 
-  export let base: Pick<TableEntry, 'name'>;
+  export let base: Pick<Table, 'name'>;
   export let baseWhich: Which = 'base';
-  export let target: Pick<TableEntry, 'name'>;
+  export let target: Pick<Table, 'name'>;
   export let targetWhich: Which = 'target';
   export let field: FieldStore;
   export let targetColumnsAreLoading = false;
diff --git a/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte b/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
index 1b6e3bc0e9..f051f6ca01 100644
--- a/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import type { FieldStore } from '@mathesar/components/form';
   import FieldErrors from '@mathesar/components/form/FieldErrors.svelte';
   import FieldLayout from '@mathesar/components/form/FieldLayout.svelte';
@@ -13,8 +13,8 @@
   export let linkTypes: LinkType[];
   export let isSelfReferential: boolean;
   export let field: FieldStore<LinkType>;
-  export let base: Pick<TableEntry, 'name'>;
-  export let target: Pick<TableEntry, 'name'>;
+  export let base: Pick<Table, 'name'>;
+  export let target: Pick<Table, 'name'>;
 </script>
 
 <FieldLayout>
diff --git a/mathesar_ui/src/systems/table-view/link-table/linkTableUtils.ts b/mathesar_ui/src/systems/table-view/link-table/linkTableUtils.ts
index 285b598728..c03ad449ee 100644
--- a/mathesar_ui/src/systems/table-view/link-table/linkTableUtils.ts
+++ b/mathesar_ui/src/systems/table-view/link-table/linkTableUtils.ts
@@ -1,7 +1,7 @@
 import { get } from 'svelte/store';
 import { _ } from 'svelte-i18n';
 
-import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rest/types/tables';
 import { invalidIf } from '@mathesar/components/form';
 import { getAvailableName } from '@mathesar/utils/db';
 
@@ -15,9 +15,9 @@ export function columnNameIsNotId() {
 }
 
 export function suggestMappingTableName(
-  baseTable: Pick<TableEntry, 'name'>,
-  targetTable: Pick<TableEntry, 'name'> | undefined,
-  allTables: Pick<TableEntry, 'name'>[],
+  baseTable: Pick<Table, 'name'>,
+  targetTable: Pick<Table, 'name'> | undefined,
+  allTables: Pick<Table, 'name'>[],
 ): string {
   return targetTable
     ? getAvailableName(
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
index 9b8682c546..35b594c931 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
@@ -141,7 +141,7 @@
     const extractedColumnIds = extractedColumns.map((c) => c.id);
     try {
       if ($targetType === 'existingTable') {
-        const targetTableId = $linkedTable?.table.id;
+        const targetTableId = $linkedTable?.table.oid;
         if (!targetTableId) {
           throw new Error($_('no_target_table_selected'));
         }
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionTypes.ts b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionTypes.ts
index 0611fc54b4..58efb5dda3 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionTypes.ts
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionTypes.ts
@@ -1,4 +1,4 @@
-import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rest/types/tables';
 import type { FkConstraint } from '@mathesar/api/rest/types/tables/constraints';
 import type { ProcessedColumn } from '@mathesar/stores/table-data';
 
@@ -14,5 +14,5 @@ export interface LinkedTable {
   /** The columns specified in the FK constraint. */
   columns: ProcessedColumn[];
   /** The table to which the FK constraint points. */
-  table: TableEntry;
+  table: Table;
 }
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts
index 40b4fb240e..3e9d492328 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts
@@ -1,7 +1,7 @@
 import { get } from 'svelte/store';
 import { _ } from 'svelte-i18n';
 
-import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rest/types/tables';
 import type { FkConstraint } from '@mathesar/api/rest/types/tables/constraints';
 import { isDefinedNonNullable } from '@mathesar/component-library';
 import {
@@ -24,7 +24,7 @@ function getLinkedTable({
 }: {
   fkConstraint: FkConstraint;
   columns: Map<number, ProcessedColumn>;
-  tables: Map<number, TableEntry>;
+  tables: Map<number, Table>;
 }): LinkedTable | undefined {
   const table = tables.get(fkConstraint.referent_table);
   if (!table) {
@@ -46,7 +46,7 @@ export function getLinkedTables({
 }: {
   constraints: Constraint[];
   columns: Map<number, ProcessedColumn>;
-  tables: Map<number, TableEntry>;
+  tables: Map<number, Table>;
 }): LinkedTable[] {
   return constraints
     .map((c) =>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
index 86afae45c2..68edf145e4 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
@@ -1,15 +1,15 @@
 <script lang="ts">
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
   import { Meta, TabularData } from '@mathesar/stores/table-data';
   import RecordSummaryConfig from '@mathesar/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte';
   import Pagination from '@mathesar/utils/Pagination';
 
-  export let table: TableEntry;
+  export let table: Table;
 
   $: abstractTypesMap = $currentDbAbstractTypes.data;
   $: tabularData = new TabularData({
-    id: table.id,
+    id: table.oid,
     abstractTypesMap,
     meta: new Meta({ pagination: new Pagination({ size: 1 }) }),
     table,
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
index a9d6fe83d8..9554f8baf3 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rest/types/tables';
   import {
     FormSubmit,
     makeForm,
@@ -30,7 +30,7 @@
   } from './recordSummaryTemplateUtils';
   import TemplateInput from './TemplateInput.svelte';
 
-  export let table: TableEntry;
+  export let table: Table;
   export let tabularData: TabularData;
 
   const userProfile = getUserProfileStoreFromContext();
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
index 4c36f76d7a..332abba58f 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
@@ -36,7 +36,7 @@
           $currentDatabase?.id,
           $currentSchema.oid,
           {
-            id: $tabularData.id,
+            oid: $tabularData.id,
             name: $tables.data.get($tabularData.id)?.name ?? '',
           },
         )
@@ -49,7 +49,7 @@
       $currentDatabase.id,
       $currentSchema.oid,
       {
-        baseTable: { id, name: $currentTable.name },
+        baseTable: { oid: id, name: $currentTable.name },
         columns: $columns,
         terseGrouping: $grouping.terse(),
       },
diff --git a/mathesar_ui/src/utils/columnUtils.ts b/mathesar_ui/src/utils/columnUtils.ts
index 15a83b5e3d..c5407da366 100644
--- a/mathesar_ui/src/utils/columnUtils.ts
+++ b/mathesar_ui/src/utils/columnUtils.ts
@@ -1,6 +1,6 @@
 import { get } from 'svelte/store';
 
-import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rest/types/tables';
 import type { DisplayColumn } from '@mathesar/components/column/types';
 import { type ValidationFn, uniqueWith } from '@mathesar/components/form';
 import { iconConstraint, iconTableLink } from '@mathesar/icons';
@@ -35,7 +35,7 @@ export function getColumnIconProps(
 }
 
 export function getSuggestedFkColumnName(
-  targetTable: Pick<TableEntry, 'name'> | undefined,
+  targetTable: Pick<Table, 'name'> | undefined,
   existingColumns: { name: string }[] = [{ name: 'id' }],
 ): string {
   const columnNames = new Set(existingColumns.map((c) => c.name));
diff --git a/mathesar_ui/src/utils/preloadData.ts b/mathesar_ui/src/utils/preloadData.ts
index c857d24128..15845a5b7b 100644
--- a/mathesar_ui/src/utils/preloadData.ts
+++ b/mathesar_ui/src/utils/preloadData.ts
@@ -1,6 +1,6 @@
 import type { Connection } from '@mathesar/api/rest/connections';
 import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rest/types/tables';
 import type { User } from '@mathesar/api/rest/users';
 import type { Schema } from '@mathesar/api/rpc/schemas';
 import type { AbstractTypeResponse } from '@mathesar/AppTypes';
@@ -8,7 +8,7 @@ import type { AbstractTypeResponse } from '@mathesar/AppTypes';
 export interface CommonData {
   connections: Connection[];
   schemas: Schema[];
-  tables: TableEntry[];
+  tables: Table[];
   queries: QueryInstance[];
   current_connection: Connection['id'] | null;
   internal_db_connection: {
diff --git a/mathesar_ui/src/utils/tables.ts b/mathesar_ui/src/utils/tables.ts
index 3a8bcab41e..24b3537784 100644
--- a/mathesar_ui/src/utils/tables.ts
+++ b/mathesar_ui/src/utils/tables.ts
@@ -1,4 +1,4 @@
-import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rest/types/tables';
 import {
   getImportPreviewPageUrl,
   getTablePageUrl,
@@ -6,7 +6,7 @@ import {
 import type { ProcessedColumn } from '@mathesar/stores/table-data';
 
 export function isTableImportConfirmationRequired(
-  table: Partial<Pick<TableEntry, 'import_verified' | 'data_files'>>,
+  table: Partial<Pick<Table, 'import_verified' | 'data_files'>>,
 ): boolean {
   /**
    * table.import_verified can be null when tables have been
@@ -22,7 +22,7 @@ export function isTableImportConfirmationRequired(
 
 export function getColumnOrder(
   processedColumns: ProcessedColumn[],
-  table: Partial<Pick<TableEntry, 'settings'>>,
+  table: Partial<Pick<Table, 'settings'>>,
 ) {
   const allColumns = [...processedColumns.values()];
   let completeColumnOrder: number[] = [];
@@ -43,7 +43,7 @@ export function getColumnOrder(
 
 export function orderProcessedColumns(
   processedColumns: Map<number, ProcessedColumn>,
-  table: Partial<Pick<TableEntry, 'settings'>>,
+  table: Partial<Pick<Table, 'settings'>>,
 ): Map<number, ProcessedColumn> {
   const columns = [...processedColumns.values()];
   const orderedColumns = new Map<number, ProcessedColumn>();
@@ -63,12 +63,12 @@ export function orderProcessedColumns(
 export function getLinkForTableItem(
   connectionId: number,
   schemaId: number,
-  table: Pick<TableEntry, 'import_verified' | 'data_files' | 'id'>,
+  table: Pick<Table, 'oid' | 'import_verified' | 'data_files'>,
 ) {
   if (isTableImportConfirmationRequired(table)) {
-    return getImportPreviewPageUrl(connectionId, schemaId, table.id, {
+    return getImportPreviewPageUrl(connectionId, schemaId, table.oid, {
       useColumnTypeInference: true,
     });
   }
-  return getTablePageUrl(connectionId, schemaId, table.id);
+  return getTablePageUrl(connectionId, schemaId, table.oid);
 }

From 4f33808979fc73e65660abae126cffdd9df3eaf7 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 19 Jul 2024 14:16:00 -0400
Subject: [PATCH 0454/1141] Move Table type to RPC file

---
 mathesar_ui/src/api/rest/columns.ts             |  3 +--
 .../api/rest/types/tables/joinable_tables.ts    |  2 +-
 .../src/api/{rest/types => rpc}/tables.ts       | 17 +++++++++++------
 mathesar_ui/src/components/SelectTable.svelte   |  2 +-
 .../SelectTableWithinCurrentSchema.svelte       |  2 +-
 mathesar_ui/src/components/TableName.svelte     |  2 +-
 .../breadcrumb/BreadcrumbRecordSelector.svelte  |  2 +-
 .../components/breadcrumb/EntitySelector.svelte |  2 +-
 .../components/breadcrumb/breadcrumbTypes.ts    |  2 +-
 mathesar_ui/src/components/cell-fabric/utils.ts |  2 +-
 .../import/preview/ImportPreviewContent.svelte  |  2 +-
 .../import/preview/importPreviewPageUtils.ts    |  2 +-
 mathesar_ui/src/pages/record/RecordPage.svelte  |  2 +-
 .../src/pages/record/RecordPageContent.svelte   |  2 +-
 mathesar_ui/src/pages/record/RecordStore.ts     |  2 +-
 mathesar_ui/src/pages/record/TableWidget.svelte |  2 +-
 mathesar_ui/src/pages/schema/EditTable.svelte   |  2 +-
 .../src/pages/schema/SchemaOverview.svelte      |  2 +-
 .../src/pages/schema/SchemaTables.svelte        |  2 +-
 mathesar_ui/src/pages/schema/TableCard.svelte   |  2 +-
 mathesar_ui/src/pages/schema/TablesList.svelte  |  2 +-
 mathesar_ui/src/pages/table/TablePage.svelte    |  2 +-
 mathesar_ui/src/routes/RecordPageRoute.svelte   |  2 +-
 mathesar_ui/src/stores/table-data/columns.ts    |  2 +-
 .../src/stores/table-data/constraints.ts        |  2 +-
 .../src/stores/table-data/processedColumns.ts   |  2 +-
 mathesar_ui/src/stores/table-data/records.ts    |  2 +-
 .../src/stores/table-data/tabularData.ts        |  2 +-
 mathesar_ui/src/stores/tables.ts                |  2 +-
 .../systems/data-explorer/ActionsPane.svelte    |  2 +-
 .../src/systems/data-explorer/QueryManager.ts   |  2 +-
 .../data-explorer/urlSerializationUtils.ts      |  2 +-
 mathesar_ui/src/systems/data-explorer/utils.ts  |  2 +-
 .../RecordSelectorNavigationButton.svelte       |  2 +-
 .../record-selector/recordSelectorUtils.ts      |  2 +-
 .../src/systems/table-view/TableView.svelte     |  2 +-
 .../table-view/actions-pane/ActionsPane.svelte  |  2 +-
 .../actions-pane/ShareTableDropdown.svelte      |  2 +-
 .../constraints/NewFkConstraint.svelte          |  2 +-
 .../src/systems/table-view/header/Header.svelte |  2 +-
 .../table-view/link-table/LinkTableForm.svelte  |  2 +-
 .../table-view/link-table/LinkTablePill.svelte  |  2 +-
 .../table-view/link-table/LinkTypeOption.svelte |  2 +-
 .../table-view/link-table/NewColumn.svelte      |  2 +-
 .../table-view/link-table/SelectLinkType.svelte |  2 +-
 .../table-view/link-table/linkTableUtils.ts     |  2 +-
 .../column-extraction/columnExtractionTypes.ts  |  2 +-
 .../column-extraction/columnExtractionUtils.ts  |  2 +-
 .../record-summary/FkRecordSummaryConfig.svelte |  2 +-
 .../record-summary/RecordSummaryConfig.svelte   |  2 +-
 mathesar_ui/src/utils/columnUtils.ts            |  2 +-
 mathesar_ui/src/utils/preloadData.ts            |  2 +-
 mathesar_ui/src/utils/tables.ts                 |  2 +-
 53 files changed, 63 insertions(+), 59 deletions(-)
 rename mathesar_ui/src/api/{rest/types => rpc}/tables.ts (61%)

diff --git a/mathesar_ui/src/api/rest/columns.ts b/mathesar_ui/src/api/rest/columns.ts
index 2c8e113a8f..64e1baf5a9 100644
--- a/mathesar_ui/src/api/rest/columns.ts
+++ b/mathesar_ui/src/api/rest/columns.ts
@@ -1,8 +1,7 @@
-import type { Table } from './types/tables';
 import type { Column } from './types/tables/columns';
 import { type PaginatedResponse, getAPI } from './utils/requestUtils';
 
-function list(tableId: Table['oid']) {
+function list(tableId: number) {
   const url = `/api/db/v0/tables/${tableId}/columns/?limit=500`;
   return getAPI<PaginatedResponse<Column>>(url);
 }
diff --git a/mathesar_ui/src/api/rest/types/tables/joinable_tables.ts b/mathesar_ui/src/api/rest/types/tables/joinable_tables.ts
index 645bcc5413..8b84483b2e 100644
--- a/mathesar_ui/src/api/rest/types/tables/joinable_tables.ts
+++ b/mathesar_ui/src/api/rest/types/tables/joinable_tables.ts
@@ -4,7 +4,7 @@
  * endpoint: /api/db/v0/tables/<table_id>/joinable_tables/
  */
 
-import type { Table } from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rpc/tables';
 
 import type { Column } from './columns';
 
diff --git a/mathesar_ui/src/api/rest/types/tables.ts b/mathesar_ui/src/api/rpc/tables.ts
similarity index 61%
rename from mathesar_ui/src/api/rest/types/tables.ts
rename to mathesar_ui/src/api/rpc/tables.ts
index 3173585142..0f7ab6260e 100644
--- a/mathesar_ui/src/api/rest/types/tables.ts
+++ b/mathesar_ui/src/api/rpc/tables.ts
@@ -1,6 +1,6 @@
-import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
+import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
 
-import type { Column } from './tables/columns';
+import type { Column } from '../rest/types/tables/columns';
 
 export interface Table {
   oid: number;
@@ -24,7 +24,12 @@ export interface Table {
   description: string | null;
 }
 
-/**
- * This is the GET response for: `/api/db/v0/tables/`
- */
-export type TablesList = PaginatedResponse<Table>;
+export const tables = {
+  list: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      schema_oid: number;
+    },
+    Table[]
+  >(),
+};
diff --git a/mathesar_ui/src/components/SelectTable.svelte b/mathesar_ui/src/components/SelectTable.svelte
index b2671f67f2..12ded514be 100644
--- a/mathesar_ui/src/components/SelectTable.svelte
+++ b/mathesar_ui/src/components/SelectTable.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import { Select } from '@mathesar-component-library';
   import type { SelectProps } from '@mathesar-component-library/types';
 
diff --git a/mathesar_ui/src/components/SelectTableWithinCurrentSchema.svelte b/mathesar_ui/src/components/SelectTableWithinCurrentSchema.svelte
index 258c1bec27..77d3b3ddd6 100644
--- a/mathesar_ui/src/components/SelectTableWithinCurrentSchema.svelte
+++ b/mathesar_ui/src/components/SelectTableWithinCurrentSchema.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Table } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import { importVerifiedTables } from '@mathesar/stores/tables';
   import type { SelectProps } from '@mathesar-component-library/types';
 
diff --git a/mathesar_ui/src/components/TableName.svelte b/mathesar_ui/src/components/TableName.svelte
index 70705713f8..cbf6258239 100644
--- a/mathesar_ui/src/components/TableName.svelte
+++ b/mathesar_ui/src/components/TableName.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import type { ComponentProps } from 'svelte';
 
-  import type { Table } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import { iconTable } from '@mathesar/icons';
   import { isTableImportConfirmationRequired } from '@mathesar/utils/tables';
 
diff --git a/mathesar_ui/src/components/breadcrumb/BreadcrumbRecordSelector.svelte b/mathesar_ui/src/components/breadcrumb/BreadcrumbRecordSelector.svelte
index aebb0e61ab..ffcddbc722 100644
--- a/mathesar_ui/src/components/breadcrumb/BreadcrumbRecordSelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/BreadcrumbRecordSelector.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Table } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import { iconExpandRight } from '@mathesar/icons';
   import { getRecordSelectorFromContext } from '@mathesar/systems/record-selector/RecordSelectorController';
   import { Button, Icon, iconSearch } from '@mathesar-component-library';
diff --git a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
index 5232e8d356..6b46f2701c 100644
--- a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
@@ -3,8 +3,8 @@
   import { meta } from 'tinro';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { Table } from '@mathesar/api/rest/types/tables';
   import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import type { Database } from '@mathesar/AppTypes';
   import { iconTable } from '@mathesar/icons';
   import { getExplorationPageUrl } from '@mathesar/routes/urls';
diff --git a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
index b9a437894f..a9f2e97e06 100644
--- a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
+++ b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
@@ -1,6 +1,6 @@
 import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Schema } from '@mathesar/api/rpc/schemas';
+import type { Table } from '@mathesar/api/rpc/tables';
 import type { Database } from '@mathesar/AppTypes';
 import type {
   ComponentAndProps,
diff --git a/mathesar_ui/src/components/cell-fabric/utils.ts b/mathesar_ui/src/components/cell-fabric/utils.ts
index 3e9a501731..a97e119ab0 100644
--- a/mathesar_ui/src/components/cell-fabric/utils.ts
+++ b/mathesar_ui/src/components/cell-fabric/utils.ts
@@ -1,5 +1,5 @@
-import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type { Table } from '@mathesar/api/rpc/tables';
 import type { CellInfo } from '@mathesar/stores/abstract-types/types';
 import type { RecordSummariesForSheet } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
 import type { ComponentAndProps } from '@mathesar-component-library/types';
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index 9e123b5897..ba12bb9953 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -4,9 +4,9 @@
 
   import { columnsApi } from '@mathesar/api/rest/columns';
   import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
-  import type { Table } from '@mathesar/api/rest/types/tables';
   import type { Column } from '@mathesar/api/rest/types/tables/columns';
   import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import type { Database } from '@mathesar/AppTypes';
   import {
     Field,
diff --git a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
index e544c240e6..c9aa18e830 100644
--- a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
+++ b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
@@ -1,8 +1,8 @@
 import { dataFilesApi } from '@mathesar/api/rest/dataFiles';
 import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
-import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { Schema } from '@mathesar/api/rpc/schemas';
+import type { Table } from '@mathesar/api/rpc/tables';
 import type { Database } from '@mathesar/AppTypes';
 import { getCellCap } from '@mathesar/components/cell-fabric/utils';
 import { getAbstractTypeForDbType } from '@mathesar/stores/abstract-types';
diff --git a/mathesar_ui/src/pages/record/RecordPage.svelte b/mathesar_ui/src/pages/record/RecordPage.svelte
index ae9b4fe4af..4e2e50a945 100644
--- a/mathesar_ui/src/pages/record/RecordPage.svelte
+++ b/mathesar_ui/src/pages/record/RecordPage.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Table } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
diff --git a/mathesar_ui/src/pages/record/RecordPageContent.svelte b/mathesar_ui/src/pages/record/RecordPageContent.svelte
index 7a651f7513..fd603bf9dd 100644
--- a/mathesar_ui/src/pages/record/RecordPageContent.svelte
+++ b/mathesar_ui/src/pages/record/RecordPageContent.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rest/types/tables';
   import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
   import { getDetailedRecordsErrors } from '@mathesar/api/rest/utils/recordUtils';
   import { getAPI } from '@mathesar/api/rest/utils/requestUtils';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import {
     FormSubmit,
     makeForm,
diff --git a/mathesar_ui/src/pages/record/RecordStore.ts b/mathesar_ui/src/pages/record/RecordStore.ts
index f1a7350c5b..b49f2d3bb6 100644
--- a/mathesar_ui/src/pages/record/RecordStore.ts
+++ b/mathesar_ui/src/pages/record/RecordStore.ts
@@ -1,12 +1,12 @@
 import { type Readable, derived, writable } from 'svelte/store';
 
-import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Response as ApiResponse } from '@mathesar/api/rest/types/tables/records';
 import {
   type RequestStatus,
   getAPI,
   patchAPI,
 } from '@mathesar/api/rest/utils/requestUtils';
+import type { Table } from '@mathesar/api/rpc/tables';
 import { WritableMap } from '@mathesar/component-library';
 import RecordSummaryStore from '@mathesar/stores/table-data/record-summaries/RecordSummaryStore';
 import {
diff --git a/mathesar_ui/src/pages/record/TableWidget.svelte b/mathesar_ui/src/pages/record/TableWidget.svelte
index 524ebe0583..b75a3da41d 100644
--- a/mathesar_ui/src/pages/record/TableWidget.svelte
+++ b/mathesar_ui/src/pages/record/TableWidget.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import type { Table } from '@mathesar/api/rest/types/tables';
   import type { Column } from '@mathesar/api/rest/types/tables/columns';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import TableName from '@mathesar/components/TableName.svelte';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
   import {
diff --git a/mathesar_ui/src/pages/schema/EditTable.svelte b/mathesar_ui/src/pages/schema/EditTable.svelte
index 0007deb56d..39ba72b6bb 100644
--- a/mathesar_ui/src/pages/schema/EditTable.svelte
+++ b/mathesar_ui/src/pages/schema/EditTable.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import EditTableHoc from '@mathesar/components/EditTableHOC.svelte';
   import Identifier from '@mathesar/components/Identifier.svelte';
   import NameAndDescInputModalForm from '@mathesar/components/NameAndDescInputModalForm.svelte';
diff --git a/mathesar_ui/src/pages/schema/SchemaOverview.svelte b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
index 20d5094024..9f41c1ceeb 100644
--- a/mathesar_ui/src/pages/schema/SchemaOverview.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
@@ -2,9 +2,9 @@
   import { _ } from 'svelte-i18n';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { Table } from '@mathesar/api/rest/types/tables';
   import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
   import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import type { Database } from '@mathesar/AppTypes';
   import SpinnerButton from '@mathesar/component-library/spinner-button/SpinnerButton.svelte';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
diff --git a/mathesar_ui/src/pages/schema/SchemaTables.svelte b/mathesar_ui/src/pages/schema/SchemaTables.svelte
index 4937dad7d2..a7d753bcf3 100644
--- a/mathesar_ui/src/pages/schema/SchemaTables.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaTables.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rest/types/tables';
   import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import type { Database } from '@mathesar/AppTypes';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
diff --git a/mathesar_ui/src/pages/schema/TableCard.svelte b/mathesar_ui/src/pages/schema/TableCard.svelte
index 6712bed832..17cdd81952 100644
--- a/mathesar_ui/src/pages/schema/TableCard.svelte
+++ b/mathesar_ui/src/pages/schema/TableCard.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rest/types/tables';
   import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import type { Database } from '@mathesar/AppTypes';
   import LinkMenuItem from '@mathesar/component-library/menu/LinkMenuItem.svelte';
   import TableName from '@mathesar/components/TableName.svelte';
diff --git a/mathesar_ui/src/pages/schema/TablesList.svelte b/mathesar_ui/src/pages/schema/TablesList.svelte
index bbc766f9c1..8017449486 100644
--- a/mathesar_ui/src/pages/schema/TablesList.svelte
+++ b/mathesar_ui/src/pages/schema/TablesList.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rest/types/tables';
   import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import type { Database } from '@mathesar/AppTypes';
   import { iconTable } from '@mathesar/icons';
 
diff --git a/mathesar_ui/src/pages/table/TablePage.svelte b/mathesar_ui/src/pages/table/TablePage.svelte
index ec4c1471ca..da4603c51e 100644
--- a/mathesar_ui/src/pages/table/TablePage.svelte
+++ b/mathesar_ui/src/pages/table/TablePage.svelte
@@ -2,7 +2,7 @@
   import { tick } from 'svelte';
   import { router } from 'tinro';
 
-  import type { Table } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import { focusActiveCell } from '@mathesar/components/sheet/utils';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
diff --git a/mathesar_ui/src/routes/RecordPageRoute.svelte b/mathesar_ui/src/routes/RecordPageRoute.svelte
index d5456249f2..526b8e9b50 100644
--- a/mathesar_ui/src/routes/RecordPageRoute.svelte
+++ b/mathesar_ui/src/routes/RecordPageRoute.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import type { Table } from '@mathesar/api/rest/types/tables';
   import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import type { Database } from '@mathesar/AppTypes';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import RecordPage from '@mathesar/pages/record/RecordPage.svelte';
diff --git a/mathesar_ui/src/stores/table-data/columns.ts b/mathesar_ui/src/stores/table-data/columns.ts
index c860a71a68..b76dded669 100644
--- a/mathesar_ui/src/stores/table-data/columns.ts
+++ b/mathesar_ui/src/stores/table-data/columns.ts
@@ -1,6 +1,5 @@
 import { type Readable, derived, writable } from 'svelte/store';
 
-import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type {
   PaginatedResponse,
@@ -13,6 +12,7 @@ import {
   patchAPI,
   postAPI,
 } from '@mathesar/api/rest/utils/requestUtils';
+import type { Table } from '@mathesar/api/rpc/tables';
 import { getErrorMessage } from '@mathesar/utils/errors';
 import type { ShareConsumer } from '@mathesar/utils/shares';
 import {
diff --git a/mathesar_ui/src/stores/table-data/constraints.ts b/mathesar_ui/src/stores/table-data/constraints.ts
index 48ed985e94..ffb5de065f 100644
--- a/mathesar_ui/src/stores/table-data/constraints.ts
+++ b/mathesar_ui/src/stores/table-data/constraints.ts
@@ -7,7 +7,6 @@ import type {
 } from 'svelte/store';
 import { derived, get as getStoreValue, writable } from 'svelte/store';
 
-import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { Constraint as ApiConstraint } from '@mathesar/api/rest/types/tables/constraints';
 import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
@@ -18,6 +17,7 @@ import {
   getAPI,
   postAPI,
 } from '@mathesar/api/rest/utils/requestUtils';
+import type { Table } from '@mathesar/api/rpc/tables';
 import type { ShareConsumer } from '@mathesar/utils/shares';
 import type { CancellablePromise } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/stores/table-data/processedColumns.ts b/mathesar_ui/src/stores/table-data/processedColumns.ts
index aaae15f7e2..ab1ccad0c5 100644
--- a/mathesar_ui/src/stores/table-data/processedColumns.ts
+++ b/mathesar_ui/src/stores/table-data/processedColumns.ts
@@ -1,8 +1,8 @@
 import type { Readable } from 'svelte/store';
 
-import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { Constraint } from '@mathesar/api/rest/types/tables/constraints';
+import type { Table } from '@mathesar/api/rpc/tables';
 import type { CellColumnFabric } from '@mathesar/components/cell-fabric/types';
 import {
   getCellCap,
diff --git a/mathesar_ui/src/stores/table-data/records.ts b/mathesar_ui/src/stores/table-data/records.ts
index 38767fa584..fbc4443993 100644
--- a/mathesar_ui/src/stores/table-data/records.ts
+++ b/mathesar_ui/src/stores/table-data/records.ts
@@ -7,7 +7,6 @@ import {
   writable,
 } from 'svelte/store';
 
-import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type {
   GetRequestParams as ApiGetRequestParams,
@@ -25,6 +24,7 @@ import {
   patchAPI,
   postAPI,
 } from '@mathesar/api/rest/utils/requestUtils';
+import type { Table } from '@mathesar/api/rpc/tables';
 import { getErrorMessage } from '@mathesar/utils/errors';
 import { pluralize } from '@mathesar/utils/languageUtils';
 import type Pagination from '@mathesar/utils/Pagination';
diff --git a/mathesar_ui/src/stores/table-data/tabularData.ts b/mathesar_ui/src/stores/table-data/tabularData.ts
index 81cd538e03..cead9d366b 100644
--- a/mathesar_ui/src/stores/table-data/tabularData.ts
+++ b/mathesar_ui/src/stores/table-data/tabularData.ts
@@ -1,9 +1,9 @@
 import { getContext, setContext } from 'svelte';
 import { type Readable, type Writable, derived, writable } from 'svelte/store';
 
-import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import { States } from '@mathesar/api/rest/utils/requestUtils';
+import type { Table } from '@mathesar/api/rpc/tables';
 import type { DBObjectEntry } from '@mathesar/AppTypes';
 import Plane from '@mathesar/components/sheet/selection/Plane';
 import Series from '@mathesar/components/sheet/selection/Series';
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index 36af8432e7..72407e39f3 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -16,7 +16,6 @@
 import type { Readable, Unsubscriber, Writable } from 'svelte/store';
 import { derived, get, writable } from 'svelte/store';
 
-import type { Table } from '@mathesar/api/rest/types/tables';
 import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
 import type {
   SplitTableRequest,
@@ -33,6 +32,7 @@ import {
   postAPI,
 } from '@mathesar/api/rest/utils/requestUtils';
 import type { Schema } from '@mathesar/api/rpc/schemas';
+import type { Table } from '@mathesar/api/rpc/tables';
 import type { DBObjectEntry, Database } from '@mathesar/AppTypes';
 import { invalidIf } from '@mathesar/components/form';
 import type { AtLeastOne } from '@mathesar/typeUtils';
diff --git a/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte b/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
index 7de3e97ec7..449ac7ace3 100644
--- a/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
+++ b/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
@@ -2,7 +2,7 @@
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import EntityPageHeader from '@mathesar/components/EntityPageHeader.svelte';
   import ModificationStatus from '@mathesar/components/ModificationStatus.svelte';
   import NameAndDescInputModalForm from '@mathesar/components/NameAndDescInputModalForm.svelte';
diff --git a/mathesar_ui/src/systems/data-explorer/QueryManager.ts b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
index 7bba0d4c00..6a5aaece66 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryManager.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
@@ -6,10 +6,10 @@ import type {
   QueryInstance,
   QueryRunResponse,
 } from '@mathesar/api/rest/types/queries';
-import type { Table } from '@mathesar/api/rest/types/tables';
 import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { getAPI } from '@mathesar/api/rest/utils/requestUtils';
+import type { Table } from '@mathesar/api/rpc/tables';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
 import { createQuery, putQuery } from '@mathesar/stores/queries';
 import { getTable } from '@mathesar/stores/tables';
diff --git a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
index b58cd4b36c..709be355e7 100644
--- a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
+++ b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
@@ -1,6 +1,6 @@
 import type { QueryInstanceSummarizationTransformation } from '@mathesar/api/rest/types/queries';
-import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type { Table } from '@mathesar/api/rpc/tables';
 import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
 import type { UnsavedQueryInstance } from '@mathesar/stores/queries';
 import type { TerseGrouping } from '@mathesar/stores/table-data';
diff --git a/mathesar_ui/src/systems/data-explorer/utils.ts b/mathesar_ui/src/systems/data-explorer/utils.ts
index aa11c208b1..5899b87f68 100644
--- a/mathesar_ui/src/systems/data-explorer/utils.ts
+++ b/mathesar_ui/src/systems/data-explorer/utils.ts
@@ -5,12 +5,12 @@ import type {
   QueryResultColumn,
   QueryRunResponse,
 } from '@mathesar/api/rest/types/queries';
-import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type {
   JoinableTablesResult,
   JpPath,
 } from '@mathesar/api/rest/types/tables/joinable_tables';
+import type { Table } from '@mathesar/api/rpc/tables';
 import type { CellColumnFabric } from '@mathesar/components/cell-fabric/types';
 import {
   getCellCap,
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorNavigationButton.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorNavigationButton.svelte
index a41d543ead..9d3ed1b2e3 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorNavigationButton.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorNavigationButton.svelte
@@ -2,7 +2,7 @@
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import { Icon } from '@mathesar/component-library';
   import { iconSelectRecord } from '@mathesar/icons';
 
diff --git a/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts b/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts
index f316771211..f39c9972b7 100644
--- a/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts
+++ b/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts
@@ -1,5 +1,5 @@
-import type { Table } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type { Table } from '@mathesar/api/rpc/tables';
 
 /**
  * - 'dataEntry' - each row is a button that submits the recordId via a Promise.
diff --git a/mathesar_ui/src/systems/table-view/TableView.svelte b/mathesar_ui/src/systems/table-view/TableView.svelte
index 642282eea5..5885287a5f 100644
--- a/mathesar_ui/src/systems/table-view/TableView.svelte
+++ b/mathesar_ui/src/systems/table-view/TableView.svelte
@@ -3,7 +3,7 @@
   import type { ComponentProps } from 'svelte';
   import { get } from 'svelte/store';
 
-  import type { Table } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import { ImmutableMap, Spinner } from '@mathesar/component-library';
   import { Sheet } from '@mathesar/components/sheet';
   import { SheetClipboardHandler } from '@mathesar/components/sheet/SheetClipboardHandler';
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte b/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
index 23a91eb430..f8af08115b 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import EntityPageHeader from '@mathesar/components/EntityPageHeader.svelte';
   import ModificationStatus from '@mathesar/components/ModificationStatus.svelte';
   import { iconInspector, iconTable } from '@mathesar/icons';
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/ShareTableDropdown.svelte b/mathesar_ui/src/systems/table-view/actions-pane/ShareTableDropdown.svelte
index 7cfa23bf29..884322182c 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/ShareTableDropdown.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/ShareTableDropdown.svelte
@@ -2,7 +2,7 @@
   import { _ } from 'svelte-i18n';
 
   import tableShareApi from '@mathesar/api/rest/tableShares';
-  import type { Table } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import { iconShare } from '@mathesar/icons';
   import { getSharedTablePageUrl } from '@mathesar/routes/urls';
   import ShareEntity from '@mathesar/systems/shares/ShareEntity.svelte';
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
index 5343383053..3acf717de2 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import {
     type FilledFormValues,
     FormSubmit,
diff --git a/mathesar_ui/src/systems/table-view/header/Header.svelte b/mathesar_ui/src/systems/table-view/header/Header.svelte
index f4e30394e7..706280a516 100644
--- a/mathesar_ui/src/systems/table-view/header/Header.svelte
+++ b/mathesar_ui/src/systems/table-view/header/Header.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { first } from 'iter-tools';
 
-  import type { Table } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import { ContextMenu } from '@mathesar/component-library';
   import {
     SheetCellResizer,
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index 153cb12302..33b6977c52 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -2,8 +2,8 @@
   import { _ } from 'svelte-i18n';
 
   import type { LinksPostRequest } from '@mathesar/api/rest/types/links';
-  import type { Table } from '@mathesar/api/rest/types/tables';
   import { postAPI } from '@mathesar/api/rest/utils/requestUtils';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import {
     Field,
     FieldLayout,
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTablePill.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTablePill.svelte
index a516f8589c..f6fb64885c 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTablePill.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTablePill.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Table } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import TableName from '@mathesar/components/TableName.svelte';
 
   export let table: Pick<Table, 'name'>;
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte
index c6997204f5..4d7447e99e 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import type { FieldStore } from '@mathesar/components/form';
   import { RichText } from '@mathesar/components/rich-text';
   import { Label, Radio, assertExhaustive } from '@mathesar-component-library';
diff --git a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
index cefe3ecf36..b503c8b8c5 100644
--- a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
@@ -2,7 +2,7 @@
   import type { ComponentProps } from 'svelte';
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import { Field, type FieldStore } from '@mathesar/components/form';
   import { RichText } from '@mathesar/components/rich-text';
   import { Spinner } from '@mathesar-component-library';
diff --git a/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte b/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
index f051f6ca01..16289909fc 100644
--- a/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import type { FieldStore } from '@mathesar/components/form';
   import FieldErrors from '@mathesar/components/form/FieldErrors.svelte';
   import FieldLayout from '@mathesar/components/form/FieldLayout.svelte';
diff --git a/mathesar_ui/src/systems/table-view/link-table/linkTableUtils.ts b/mathesar_ui/src/systems/table-view/link-table/linkTableUtils.ts
index c03ad449ee..e4d5183600 100644
--- a/mathesar_ui/src/systems/table-view/link-table/linkTableUtils.ts
+++ b/mathesar_ui/src/systems/table-view/link-table/linkTableUtils.ts
@@ -1,7 +1,7 @@
 import { get } from 'svelte/store';
 import { _ } from 'svelte-i18n';
 
-import type { Table } from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rpc/tables';
 import { invalidIf } from '@mathesar/components/form';
 import { getAvailableName } from '@mathesar/utils/db';
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionTypes.ts b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionTypes.ts
index 58efb5dda3..ec41de3e28 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionTypes.ts
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionTypes.ts
@@ -1,5 +1,5 @@
-import type { Table } from '@mathesar/api/rest/types/tables';
 import type { FkConstraint } from '@mathesar/api/rest/types/tables/constraints';
+import type { Table } from '@mathesar/api/rpc/tables';
 import type { ProcessedColumn } from '@mathesar/stores/table-data';
 
 export type ColumnExtractionTargetType = 'newTable' | 'existingTable';
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts
index 3e9d492328..b632eaeb34 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts
@@ -1,8 +1,8 @@
 import { get } from 'svelte/store';
 import { _ } from 'svelte-i18n';
 
-import type { Table } from '@mathesar/api/rest/types/tables';
 import type { FkConstraint } from '@mathesar/api/rest/types/tables/constraints';
+import type { Table } from '@mathesar/api/rpc/tables';
 import { isDefinedNonNullable } from '@mathesar/component-library';
 import {
   type ValidationOutcome,
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
index 68edf145e4..15432634ad 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Table } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
   import { Meta, TabularData } from '@mathesar/stores/table-data';
   import RecordSummaryConfig from '@mathesar/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte';
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
index 9554f8baf3..ac6ce4b4b2 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rest/types/tables';
+  import type { Table } from '@mathesar/api/rpc/tables';
   import {
     FormSubmit,
     makeForm,
diff --git a/mathesar_ui/src/utils/columnUtils.ts b/mathesar_ui/src/utils/columnUtils.ts
index c5407da366..00fd0eb8df 100644
--- a/mathesar_ui/src/utils/columnUtils.ts
+++ b/mathesar_ui/src/utils/columnUtils.ts
@@ -1,6 +1,6 @@
 import { get } from 'svelte/store';
 
-import type { Table } from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rpc/tables';
 import type { DisplayColumn } from '@mathesar/components/column/types';
 import { type ValidationFn, uniqueWith } from '@mathesar/components/form';
 import { iconConstraint, iconTableLink } from '@mathesar/icons';
diff --git a/mathesar_ui/src/utils/preloadData.ts b/mathesar_ui/src/utils/preloadData.ts
index 15845a5b7b..b2fd4677c6 100644
--- a/mathesar_ui/src/utils/preloadData.ts
+++ b/mathesar_ui/src/utils/preloadData.ts
@@ -1,8 +1,8 @@
 import type { Connection } from '@mathesar/api/rest/connections';
 import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-import type { Table } from '@mathesar/api/rest/types/tables';
 import type { User } from '@mathesar/api/rest/users';
 import type { Schema } from '@mathesar/api/rpc/schemas';
+import type { Table } from '@mathesar/api/rpc/tables';
 import type { AbstractTypeResponse } from '@mathesar/AppTypes';
 
 export interface CommonData {
diff --git a/mathesar_ui/src/utils/tables.ts b/mathesar_ui/src/utils/tables.ts
index 24b3537784..717ba284e3 100644
--- a/mathesar_ui/src/utils/tables.ts
+++ b/mathesar_ui/src/utils/tables.ts
@@ -1,4 +1,4 @@
-import type { Table } from '@mathesar/api/rest/types/tables';
+import type { Table } from '@mathesar/api/rpc/tables';
 import {
   getImportPreviewPageUrl,
   getTablePageUrl,

From e4fac4f70b9e5356445ee05f89860c8e9d001e9b Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 19 Jul 2024 14:16:00 -0400
Subject: [PATCH 0455/1141] Flesh out tables RPC method types

---
 mathesar_ui/src/api/rpc/tables.ts | 44 +++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/mathesar_ui/src/api/rpc/tables.ts b/mathesar_ui/src/api/rpc/tables.ts
index 0f7ab6260e..2587eab91b 100644
--- a/mathesar_ui/src/api/rpc/tables.ts
+++ b/mathesar_ui/src/api/rpc/tables.ts
@@ -32,4 +32,48 @@ export const tables = {
     },
     Table[]
   >(),
+
+  get: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      table_oid: number;
+    },
+    Table
+  >(),
+
+  /** Returns the oid of the table created */
+  add: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      schema_oid: number;
+      table_name: string;
+      comment: string;
+      /** TODO */
+      column_data_list: unknown;
+      /** TODO */
+      constraint_data_list: unknown;
+    },
+    number
+  >(),
+
+  patch: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      table_oid: number;
+      table_data_dict: {
+        name: string;
+        description: string;
+      };
+    },
+    void
+  >(),
+
+  delete: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      table_oid: number;
+      cascade: boolean;
+    },
+    void
+  >(),
 };

From 2b4fe810720ec9bbfdd0502ae55af8d022c4ddab Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 19 Jul 2024 14:16:00 -0400
Subject: [PATCH 0456/1141] Remove old properties from Table type

---
 mathesar_ui/src/api/rpc/tables.ts | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/tables.ts b/mathesar_ui/src/api/rpc/tables.ts
index 2587eab91b..4e1f147fb9 100644
--- a/mathesar_ui/src/api/rpc/tables.ts
+++ b/mathesar_ui/src/api/rpc/tables.ts
@@ -1,26 +1,9 @@
 import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
 
-import type { Column } from '../rest/types/tables/columns';
-
 export interface Table {
   oid: number;
   name: string;
   schema: number;
-  import_verified: boolean | null;
-  data_files?: number[];
-  columns: Pick<
-    Column,
-    'id' | 'name' | 'type' | 'type_options' | 'display_options'
-  >[];
-  settings: {
-    /** This is the settings id, not the table id */
-    id: number;
-    preview_settings: {
-      customized: boolean;
-      template: string;
-    };
-    column_order: number[];
-  };
   description: string | null;
 }
 

From 96630236482464017cacdf216eb89af51f7b28e6 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 19 Jul 2024 14:16:00 -0400
Subject: [PATCH 0457/1141] Add TupleMap utility

---
 mathesar_ui/src/packages/tuple-map/LICENSE    | 21 ++++++++
 .../src/packages/tuple-map/TupleMap.ts        | 53 +++++++++++++++++++
 mathesar_ui/src/packages/tuple-map/index.ts   |  1 +
 3 files changed, 75 insertions(+)
 create mode 100644 mathesar_ui/src/packages/tuple-map/LICENSE
 create mode 100644 mathesar_ui/src/packages/tuple-map/TupleMap.ts
 create mode 100644 mathesar_ui/src/packages/tuple-map/index.ts

diff --git a/mathesar_ui/src/packages/tuple-map/LICENSE b/mathesar_ui/src/packages/tuple-map/LICENSE
new file mode 100644
index 0000000000..ddf685f590
--- /dev/null
+++ b/mathesar_ui/src/packages/tuple-map/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Mathesar Foundation Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/mathesar_ui/src/packages/tuple-map/TupleMap.ts b/mathesar_ui/src/packages/tuple-map/TupleMap.ts
new file mode 100644
index 0000000000..a760ac67e9
--- /dev/null
+++ b/mathesar_ui/src/packages/tuple-map/TupleMap.ts
@@ -0,0 +1,53 @@
+import { map } from 'iter-tools';
+
+function parse(key: string) {
+  return JSON.parse(key);
+}
+
+function serialize(keys: unknown[]) {
+  return JSON.stringify(keys);
+}
+
+export class TupleMap<K extends unknown[], V> {
+  private map = new Map<string, V>();
+
+  set(key: K, value: V) {
+    this.map.set(serialize(key), value);
+  }
+
+  get(key: K): V | undefined {
+    return this.map.get(serialize(key));
+  }
+
+  has(key: K): boolean {
+    return this.map.has(serialize(key));
+  }
+
+  delete(key: K): boolean {
+    return this.map.delete(serialize(key));
+  }
+
+  clear() {
+    this.map.clear();
+  }
+
+  forEach(fn: (value: V, key: K, map: TupleMap<K, V>) => void) {
+    this.map.forEach((value, key) => fn(value, parse(key), this));
+  }
+
+  get size() {
+    return this.map.size;
+  }
+
+  get keys(): IterableIterator<K> {
+    return map(parse, this.map.keys());
+  }
+
+  get values(): IterableIterator<V> {
+    return this.map.values();
+  }
+
+  get entries() {
+    return map(([key, value]) => [parse(key), value], this.map.entries());
+  }
+}
diff --git a/mathesar_ui/src/packages/tuple-map/index.ts b/mathesar_ui/src/packages/tuple-map/index.ts
new file mode 100644
index 0000000000..73b0c725e4
--- /dev/null
+++ b/mathesar_ui/src/packages/tuple-map/index.ts
@@ -0,0 +1 @@
+export { TupleMap } from './TupleMap';

From 923565557e6bbdab88526703fd58244eba6768db Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 19 Jul 2024 14:16:00 -0400
Subject: [PATCH 0458/1141] Light code cleanup in stores/tables.ts

---
 mathesar_ui/src/api/rpc/tables.ts             |   1 +
 .../src/components/EditTableHOC.svelte        |   2 +-
 .../breadcrumb/EntitySelector.svelte          |   2 +-
 .../src/pages/database/DatabaseDetails.svelte |   4 +-
 .../preview/ImportPreviewContent.svelte       |   2 +-
 mathesar_ui/src/pages/record/Widgets.svelte   |   2 +-
 .../src/pages/schema/ExplorationItem.svelte   |   2 +-
 .../src/pages/schema/SchemaPage.svelte        |   4 +-
 .../src/routes/SharedTableRoute.svelte        |   2 +-
 mathesar_ui/src/routes/TableRoute.svelte      |   2 +-
 mathesar_ui/src/stores/tables.ts              | 231 +++++++++---------
 .../systems/data-explorer/ActionsPane.svelte  |   2 +-
 .../RecordSelectorContent.svelte              |   2 +-
 .../RecordSelectorTable.svelte                |   4 +-
 .../RecordSelectorWindow.svelte               |   2 +-
 .../ForeignKeyConstraintDetails.svelte        |   2 +-
 .../constraints/NewUniqueConstraint.svelte    |   2 +-
 .../ColumnHeaderContextMenu.svelte            |   4 +-
 .../link-table/LinkTableForm.svelte           |   2 +-
 .../table-inspector/column/ColumnMode.svelte  |   2 +-
 .../column/ColumnTypeSpecifierTag.svelte      |   4 +-
 .../ExtractColumnsModal.svelte                |   2 +-
 .../table-inspector/table/TableActions.svelte |   2 +-
 .../table/TableDescription.svelte             |   2 +-
 .../table-inspector/table/TableName.svelte    |   2 +-
 25 files changed, 141 insertions(+), 147 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/tables.ts b/mathesar_ui/src/api/rpc/tables.ts
index 4e1f147fb9..2d45f10cc3 100644
--- a/mathesar_ui/src/api/rpc/tables.ts
+++ b/mathesar_ui/src/api/rpc/tables.ts
@@ -3,6 +3,7 @@ import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-build
 export interface Table {
   oid: number;
   name: string;
+  /** The OID of the schema containing the table */
   schema: number;
   description: string | null;
 }
diff --git a/mathesar_ui/src/components/EditTableHOC.svelte b/mathesar_ui/src/components/EditTableHOC.svelte
index f08be77f39..6bfc59393a 100644
--- a/mathesar_ui/src/components/EditTableHOC.svelte
+++ b/mathesar_ui/src/components/EditTableHOC.svelte
@@ -12,7 +12,7 @@
   export let tableId: number;
 
   function schemaContainsTableName(name: string): boolean {
-    const allTables = [...$tables.data.values()];
+    const allTables = [...$tables.tablesMap.values()];
     const tablesUsingName = allTables.filter(
       (current) => current.name === name,
     );
diff --git a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
index 6b46f2701c..57e8e394f7 100644
--- a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
@@ -63,7 +63,7 @@
     };
   }
 
-  $: tables = [...$tablesStore.data.values()];
+  $: tables = [...$tablesStore.tablesMap.values()];
   $: queries = [...$queriesStore.data.values()];
 
   $: selectorData = new Map<string, BreadcrumbSelectorEntry[]>([
diff --git a/mathesar_ui/src/pages/database/DatabaseDetails.svelte b/mathesar_ui/src/pages/database/DatabaseDetails.svelte
index 24a0805c52..4e2a8e6d02 100644
--- a/mathesar_ui/src/pages/database/DatabaseDetails.svelte
+++ b/mathesar_ui/src/pages/database/DatabaseDetails.svelte
@@ -26,7 +26,7 @@
     deleteSchema as deleteSchemaAPI,
     schemas as schemasStore,
   } from '@mathesar/stores/schemas';
-  import { removeTablesInSchemaTablesStore } from '@mathesar/stores/tables';
+  import { removeTablesStore } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import {
@@ -102,7 +102,7 @@
       onProceed: async () => {
         await deleteSchemaAPI(database.id, schema.oid);
         // TODO: Create common util to handle data clearing & sync between stores
-        removeTablesInSchemaTablesStore(schema.oid);
+        removeTablesStore(schema.oid);
       },
     });
   }
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index ba12bb9953..51dc936274 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -69,7 +69,7 @@
   let columns: Column[] = [];
   let columnPropertiesMap = buildColumnPropertiesMap([]);
 
-  $: otherTableNames = [...$tables.data.values()]
+  $: otherTableNames = [...$tables.tablesMap.values()]
     .filter((t) => t.oid !== table.oid)
     .map((t) => t.name);
   $: customizedTableName = requiredField(table.name, [
diff --git a/mathesar_ui/src/pages/record/Widgets.svelte b/mathesar_ui/src/pages/record/Widgets.svelte
index 6a808cc796..8d75a77a0e 100644
--- a/mathesar_ui/src/pages/record/Widgets.svelte
+++ b/mathesar_ui/src/pages/record/Widgets.svelte
@@ -25,7 +25,7 @@
   );
 
   function buildWidgetInput(joinableTable: JoinableTable) {
-    const table = $tables.data.get(joinableTable.target);
+    const table = $tables.tablesMap.get(joinableTable.target);
     if (!table) return undefined;
     const id = joinableTable.jp_path[0].slice(-1)[0];
     const name = columnNameMap.get(id) ?? `(${$_('unknown_column')})`;
diff --git a/mathesar_ui/src/pages/schema/ExplorationItem.svelte b/mathesar_ui/src/pages/schema/ExplorationItem.svelte
index dc2a346478..9076144df9 100644
--- a/mathesar_ui/src/pages/schema/ExplorationItem.svelte
+++ b/mathesar_ui/src/pages/schema/ExplorationItem.svelte
@@ -14,7 +14,7 @@
   export let database: Database;
   export let schema: Schema;
 
-  $: baseTable = $tablesStore.data.get(exploration.base_table);
+  $: baseTable = $tablesStore.tablesMap.get(exploration.base_table);
 </script>
 
 <a
diff --git a/mathesar_ui/src/pages/schema/SchemaPage.svelte b/mathesar_ui/src/pages/schema/SchemaPage.svelte
index e7bc1d4149..8b73e92710 100644
--- a/mathesar_ui/src/pages/schema/SchemaPage.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPage.svelte
@@ -60,7 +60,9 @@
     href: string;
   };
 
-  $: tablesMap = canExecuteDDL ? $tablesStore.data : $importVerifiedTablesStore;
+  $: tablesMap = canExecuteDDL
+    ? $tablesStore.tablesMap
+    : $importVerifiedTablesStore;
   $: explorationsMap = $queries.data;
   $: tablesRequestStatus = $tablesStore.requestStatus;
   $: explorationsRequestStatus = $queries.requestStatus;
diff --git a/mathesar_ui/src/routes/SharedTableRoute.svelte b/mathesar_ui/src/routes/SharedTableRoute.svelte
index e8c7c33f82..0d768185a5 100644
--- a/mathesar_ui/src/routes/SharedTableRoute.svelte
+++ b/mathesar_ui/src/routes/SharedTableRoute.svelte
@@ -17,7 +17,7 @@
 
   $: tableId = routeSpecificData?.table_id ?? undefined;
   $: $currentTableId = tableId ?? undefined;
-  $: table = tableId ? $tables.data.get(tableId) : undefined;
+  $: table = tableId ? $tables.tablesMap.get(tableId) : undefined;
   $: shareConsumer = new ShareConsumer({
     slug,
   });
diff --git a/mathesar_ui/src/routes/TableRoute.svelte b/mathesar_ui/src/routes/TableRoute.svelte
index f75cc14cb3..f243530cd6 100644
--- a/mathesar_ui/src/routes/TableRoute.svelte
+++ b/mathesar_ui/src/routes/TableRoute.svelte
@@ -17,7 +17,7 @@
   export let tableId: number;
 
   $: $currentTableId = tableId;
-  $: table = $tables.data.get(tableId);
+  $: table = $tables.tablesMap.get(tableId);
 
   function handleUnmount() {
     $currentTableId = undefined;
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index 72407e39f3..7dd4f6f62c 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -47,60 +47,60 @@ import { addCountToSchemaNumTables, currentSchemaId } from './schemas';
 
 const commonData = preloadCommonData();
 
-export interface DBTablesStoreData {
-  data: Map<Table['oid'], Table>;
+type TablesMap = Map<Table['oid'], Table>;
+
+interface TablesData {
+  tablesMap: TablesMap;
   requestStatus: RequestStatus;
 }
 
-const schemaTablesStoreMap: Map<
-  Schema['oid'],
-  Writable<DBTablesStoreData>
-> = new Map();
-const schemaTablesRequestMap: Map<
+type TablesStore = Writable<TablesData>;
+
+const tablesStores: Map<Schema['oid'], TablesStore> = new Map();
+
+const tablesRequests: Map<
   Schema['oid'],
-  CancellablePromise<PaginatedResponse<Table>>
+  CancellablePromise<Table[]>
 > = new Map();
 
-function sortedTableEntries(tableEntries: Table[]): Table[] {
-  return [...tableEntries].sort((a, b) => a.name.localeCompare(b.name));
+function sortTables(tables: Iterable<Table>): Table[] {
+  return [...tables].sort((a, b) => a.name.localeCompare(b.name));
 }
 
-function setSchemaTablesStore(
-  schemaId: Schema['oid'],
-  tableEntries?: Table[],
-): Writable<DBTablesStoreData> {
-  const tables: DBTablesStoreData['data'] = new Map();
-  if (tableEntries) {
-    sortedTableEntries(tableEntries).forEach((entry) => {
-      tables.set(entry.oid, entry);
-    });
+function setTablesStore(
+  schemaOid: Schema['oid'],
+  tables?: Table[],
+): TablesStore {
+  const tablesMap: TablesMap = new Map();
+  if (tables) {
+    sortTables(tables).forEach((t) => tablesMap.set(t.oid, t));
   }
 
-  const storeValue: DBTablesStoreData = {
-    data: tables,
+  const storeValue: TablesData = {
+    tablesMap,
     requestStatus: { state: 'success' },
   };
 
-  let store = schemaTablesStoreMap.get(schemaId);
+  let store = tablesStores.get(schemaOid);
   if (!store) {
     store = writable(storeValue);
-    schemaTablesStoreMap.set(schemaId, store);
+    tablesStores.set(schemaOid, store);
   } else {
     store.set(storeValue);
   }
   return store;
 }
 
-export function removeTablesInSchemaTablesStore(schemaId: Schema['oid']): void {
-  schemaTablesStoreMap.delete(schemaId);
+export function removeTablesStore(schemaOid: Schema['oid']): void {
+  tablesStores.delete(schemaOid);
 }
 
 export async function refetchTablesForSchema(
-  schemaId: Schema['oid'],
-): Promise<DBTablesStoreData | undefined> {
-  const store = schemaTablesStoreMap.get(schemaId);
+  schemaOid: Schema['oid'],
+): Promise<TablesData | undefined> {
+  const store = tablesStores.get(schemaOid);
   if (!store) {
-    console.error(`Tables store for schema: ${schemaId} not found.`);
+    console.error(`Tables store for schema: ${schemaOid} not found.`);
     return undefined;
   }
 
@@ -110,16 +110,16 @@ export async function refetchTablesForSchema(
       requestStatus: { state: 'processing' },
     }));
 
-    schemaTablesRequestMap.get(schemaId)?.cancel();
+    tablesRequests.get(schemaOid)?.cancel();
 
     const tablesRequest = getAPI<PaginatedResponse<Table>>(
-      `/api/db/v0/tables/?schema=${schemaId}&limit=500`,
+      `/api/db/v0/tables/?schema=${schemaOid}&limit=500`,
     );
-    schemaTablesRequestMap.set(schemaId, tablesRequest);
+    tablesRequests.set(schemaOid, tablesRequest);
     const response = await tablesRequest;
     const tableEntries = response.results || [];
 
-    const schemaTablesStore = setSchemaTablesStore(schemaId, tableEntries);
+    const schemaTablesStore = setTablesStore(schemaOid, tableEntries);
 
     return get(schemaTablesStore);
   } catch (err) {
@@ -138,75 +138,63 @@ export async function refetchTablesForSchema(
 
 let preload = true;
 
-export function getTablesStoreForSchema(
-  schemaId: Schema['oid'],
-): Writable<DBTablesStoreData> {
-  let store = schemaTablesStoreMap.get(schemaId);
+function getTablesStore(schemaOid: Schema['oid']): TablesStore {
+  let store = tablesStores.get(schemaOid);
   if (!store) {
     store = writable({
       requestStatus: { state: 'processing' },
-      data: new Map(),
+      tablesMap: new Map(),
     });
-    schemaTablesStoreMap.set(schemaId, store);
-    if (preload && commonData.current_schema === schemaId) {
-      store = setSchemaTablesStore(schemaId, commonData.tables ?? []);
+    tablesStores.set(schemaOid, store);
+    if (preload && commonData.current_schema === schemaOid) {
+      store = setTablesStore(schemaOid, commonData.tables ?? []);
     } else {
-      void refetchTablesForSchema(schemaId);
+      void refetchTablesForSchema(schemaOid);
     }
     preload = false;
   } else if (get(store).requestStatus.state === 'failure') {
-    void refetchTablesForSchema(schemaId);
+    void refetchTablesForSchema(schemaOid);
   }
   return store;
 }
 
-/**
- * TODO: Use a dedicated higher level Tables store and
- * remove this function.
- */
-function findSchemaStoreForTable(id: Table['oid']) {
-  return [...schemaTablesStoreMap.values()].find((entry) =>
-    get(entry).data.has(id),
-  );
+function findSchemaStoreForTable(
+  tableOid: Table['oid'],
+): TablesStore | undefined {
+  // TODO rewrite this function
+  throw new Error('Not implemented');
 }
 
-function findAndUpdateTableStore(id: Table['oid'], table: Table) {
-  findSchemaStoreForTable(id)?.update((tableStoreData) => {
-    const existingTableEntry = tableStoreData.data.get(id);
-    const updatedTableEntry = {
-      ...(existingTableEntry ?? {}),
-      ...table,
-    };
-    tableStoreData.data.set(id, updatedTableEntry);
-    const tableEntryMap: DBTablesStoreData['data'] = new Map();
-    sortedTableEntries([...tableStoreData.data.values()]).forEach((entry) => {
-      tableEntryMap.set(entry.oid, entry);
+function findAndUpdateTableStore(tableOid: Table['oid'], newTable: Table) {
+  findSchemaStoreForTable(tableOid)?.update((tablesData) => {
+    const oldTable = tablesData.tablesMap.get(tableOid);
+    tablesData.tablesMap.set(tableOid, { ...(oldTable ?? {}), ...newTable });
+    const tablesMap: TablesMap = new Map();
+    sortTables([...tablesData.tablesMap.values()]).forEach((t) => {
+      tablesMap.set(t.oid, t);
     });
-    return {
-      ...tableStoreData,
-      data: tableEntryMap,
-    };
+    return { ...tablesData, tablesMap };
   });
 }
 
 export function deleteTable(
   database: Database,
   schema: Schema,
-  tableId: Table['oid'],
+  tableOid: Table['oid'],
 ): CancellablePromise<Table> {
-  const promise = deleteAPI<Table>(`/api/db/v0/tables/${tableId}/`);
+  const promise = deleteAPI<Table>(`/api/db/v0/tables/${tableOid}/`);
   return new CancellablePromise(
     (resolve, reject) => {
-      void promise.then((value) => {
+      void promise.then((table) => {
         addCountToSchemaNumTables(database, schema, -1);
-        schemaTablesStoreMap.get(schema.oid)?.update((tableStoreData) => {
-          tableStoreData.data.delete(tableId);
+        tablesStores.get(schema.oid)?.update((tableStoreData) => {
+          tableStoreData.tablesMap.delete(tableOid);
           return {
             ...tableStoreData,
-            data: new Map(tableStoreData.data),
+            tablesMap: new Map(tableStoreData.tablesMap),
           };
         });
-        return resolve(value);
+        return resolve(table);
       }, reject);
     },
     () => {
@@ -216,15 +204,18 @@ export function deleteTable(
 }
 
 export function updateTableMetaData(
-  id: number,
+  tableOid: number,
   updatedMetaData: AtLeastOne<{ name: string; description: string }>,
 ): CancellablePromise<Table> {
-  const promise = patchAPI<Table>(`/api/db/v0/tables/${id}/`, updatedMetaData);
+  const promise = patchAPI<Table>(
+    `/api/db/v0/tables/${tableOid}/`,
+    updatedMetaData,
+  );
   return new CancellablePromise(
     (resolve, reject) => {
-      void promise.then((value) => {
-        findAndUpdateTableStore(id, value);
-        return resolve(value);
+      void promise.then((table) => {
+        findAndUpdateTableStore(tableOid, table);
+        return resolve(table);
       }, reject);
     },
     () => {
@@ -248,21 +239,18 @@ export function createTable(
   });
   return new CancellablePromise(
     (resolve, reject) => {
-      void promise.then((value) => {
+      void promise.then((table) => {
         addCountToSchemaNumTables(database, schema, 1);
-        schemaTablesStoreMap.get(schema.oid)?.update((existing) => {
-          const tableEntryMap: DBTablesStoreData['data'] = new Map();
-          sortedTableEntries([...existing.data.values(), value]).forEach(
+        tablesStores.get(schema.oid)?.update((existing) => {
+          const tablesMap: TablesMap = new Map();
+          sortTables([...existing.tablesMap.values(), table]).forEach(
             (entry) => {
-              tableEntryMap.set(entry.oid, entry);
+              tablesMap.set(entry.oid, entry);
             },
           );
-          return {
-            ...existing,
-            data: tableEntryMap,
-          };
+          return { ...existing, tablesMap };
         });
-        return resolve(value);
+        return resolve(table);
       }, reject);
     },
     () => {
@@ -272,18 +260,18 @@ export function createTable(
 }
 
 export function patchTable(
-  id: Table['oid'],
+  tableOid: Table['oid'],
   patch: {
     name?: Table['name'];
     import_verified?: Table['import_verified'];
     columns?: Table['columns'];
   },
 ): CancellablePromise<Table> {
-  const promise = patchAPI<Table>(`/api/db/v0/tables/${id}/`, patch);
+  const promise = patchAPI<Table>(`/api/db/v0/tables/${tableOid}/`, patch);
   return new CancellablePromise(
     (resolve, reject) => {
       void promise.then((value) => {
-        findAndUpdateTableStore(id, value);
+        findAndUpdateTableStore(tableOid, value);
         return resolve(value);
       }, reject);
     },
@@ -306,8 +294,8 @@ export function patchTable(
  * 3. Move all api-call-only functions to /api. Only keep functions that
  *    update the stores within /stores
  */
-export function getTable(id: Table['oid']): CancellablePromise<Table> {
-  return getAPI(`/api/db/v0/tables/${id}/`);
+export function getTable(tableOid: Table['oid']): CancellablePromise<Table> {
+  return getAPI(`/api/db/v0/tables/${tableOid}/`);
 }
 
 export function splitTable({
@@ -330,11 +318,11 @@ export function splitTable({
 }
 
 export function moveColumns(
-  tableId: number,
+  tableOid: number,
   idsOfColumnsToMove: number[],
   targetTableId: number,
 ): CancellablePromise<null> {
-  return postAPI(`/api/db/v0/tables/${tableId}/move_columns/`, {
+  return postAPI(`/api/db/v0/tables/${tableOid}/move_columns/`, {
     move_columns: idsOfColumnsToMove,
     target_table: targetTableId,
   });
@@ -344,32 +332,32 @@ export function moveColumns(
  * Replace getTable with this function once the above mentioned changes are done.
  */
 export function getTableFromStoreOrApi(
-  id: Table['oid'],
+  tableOid: Table['oid'],
 ): CancellablePromise<Table> {
-  const schemaStore = findSchemaStoreForTable(id);
-  if (schemaStore) {
-    const tableEntry = get(schemaStore).data.get(id);
-    if (tableEntry) {
+  const tablesStore = findSchemaStoreForTable(tableOid);
+  if (tablesStore) {
+    const table = get(tablesStore).tablesMap.get(tableOid);
+    if (table) {
       return new CancellablePromise((resolve) => {
-        resolve(tableEntry);
+        resolve(table);
       });
     }
   }
-  const promise = getTable(id);
+  const promise = getTable(tableOid);
   return new CancellablePromise(
     (resolve, reject) => {
       void promise.then((table) => {
-        const store = schemaTablesStoreMap.get(table.schema);
+        const store = tablesStores.get(table.schema);
         if (store) {
           store.update((existing) => {
             const tableMap = new Map<number, Table>();
-            const tables = [...existing.data.values(), table];
-            sortedTableEntries(tables).forEach((t) => {
+            const tables = [...existing.tablesMap.values(), table];
+            sortTables(tables).forEach((t) => {
               tableMap.set(t.oid, t);
             });
             return {
               ...existing,
-              data: tableMap,
+              tablesMap: tableMap,
             };
           });
         }
@@ -407,18 +395,18 @@ export function generateTablePreview(props: {
   return postAPI(`/api/db/v0/tables/${table.oid}/previews/`, { columns });
 }
 
-export const tables: Readable<DBTablesStoreData> = derived(
+export const tables: Readable<TablesData> = derived(
   currentSchemaId,
   ($currentSchemaId, set) => {
     let unsubscribe: Unsubscriber;
 
     if (!$currentSchemaId) {
       set({
-        data: new Map(),
+        tablesMap: new Map(),
         requestStatus: { state: 'success' },
       });
     } else {
-      const store = getTablesStoreForSchema($currentSchemaId);
+      const store = getTablesStore($currentSchemaId);
       unsubscribe = store.subscribe((dbSchemasData) => {
         set(dbSchemasData);
       });
@@ -430,19 +418,18 @@ export const tables: Readable<DBTablesStoreData> = derived(
   },
 );
 
-export const importVerifiedTables: Readable<DBTablesStoreData['data']> =
-  derived(
-    tables,
-    ($tables) =>
-      new Map(
-        [...$tables.data.values()]
-          .filter((table) => !isTableImportConfirmationRequired(table))
-          .map((table) => [table.oid, table]),
-      ),
-  );
+export const importVerifiedTables: Readable<TablesMap> = derived(
+  tables,
+  ($tables) =>
+    new Map(
+      [...$tables.tablesMap.values()]
+        .filter((table) => !isTableImportConfirmationRequired(table))
+        .map((table) => [table.oid, table]),
+    ),
+);
 
 export const validateNewTableName = derived(tables, ($tables) => {
-  const names = new Set([...$tables.data.values()].map((t) => t.name));
+  const names = new Set([...$tables.tablesMap.values()].map((t) => t.name));
   return invalidIf(
     (name: string) => names.has(name),
     'A table with that name already exists.',
@@ -450,7 +437,7 @@ export const validateNewTableName = derived(tables, ($tables) => {
 });
 
 export function getTableName(id: DBObjectEntry['id']): string | undefined {
-  return get(tables).data.get(id)?.name;
+  return get(tables).tablesMap.get(id)?.name;
 }
 
 export const currentTableId = writable<number | undefined>(undefined);
@@ -460,7 +447,7 @@ export const currentTable = derived(
   ([$currentTableId, $tables]) =>
     $currentTableId === undefined
       ? undefined
-      : $tables.data.get($currentTableId),
+      : $tables.tablesMap.get($currentTableId),
 );
 
 export function getJoinableTablesResult(tableId: number, maxDepth = 1) {
diff --git a/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte b/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
index 449ac7ace3..585e5bcc20 100644
--- a/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
+++ b/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
@@ -43,7 +43,7 @@
 
   $: ({ query, state, queryHasUnsavedChanges } = queryManager);
   $: currentTable = $query.base_table
-    ? $tablesDataStore.data.get($query.base_table)
+    ? $tablesDataStore.tablesMap.get($query.base_table)
     : undefined;
   $: isSaved = $query.isSaved();
   $: hasNoColumns = $query.initial_columns.length === 0;
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
index 9c96febd74..05276014b0 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
@@ -88,7 +88,7 @@
       const record = response.results[0];
       const recordId = getPkValueInRecord(record, $columns);
       const previewData = response.preview_data ?? [];
-      const table = $tables.data.get(tableId);
+      const table = $tables.tablesMap.get(tableId);
       const template = table?.settings?.preview_settings?.template;
       if (!template) {
         throw new Error('No record summary template found in API response.');
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
index f56e9c2442..9a9bf877f1 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
@@ -56,7 +56,7 @@
     recordsData,
     processedColumns,
   } = tabularData);
-  $: table = $tables.data.get(tableId);
+  $: table = $tables.tablesMap.get(tableId);
   $: ({ recordSummaries, state: recordsDataState } = recordsData);
   $: recordsDataIsLoading = $recordsDataState === States.Loading;
   $: ({ constraints } = $constraintsDataStore);
@@ -137,7 +137,7 @@
     if (!record || recordId === undefined) {
       return;
     }
-    const tableEntry = $tables.data.get(tableId);
+    const tableEntry = $tables.tablesMap.get(tableId);
     const template = tableEntry?.settings?.preview_settings?.template ?? '';
     const recordSummary = renderTransitiveRecordSummary({
       template,
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
index 167133e63f..05c9c5c425 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
@@ -31,7 +31,7 @@
     nestingLevel: controller.nestingLevel + 1,
   });
   $: ({ tableId, purpose } = controller);
-  $: table = $tableId && $tables.data.get($tableId);
+  $: table = $tableId && $tables.tablesMap.get($tableId);
   $: tabularData =
     $tableId && table
       ? new TabularData({
diff --git a/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte b/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
index a4d6c92120..03fee0ab5a 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
@@ -14,7 +14,7 @@
 
   $: referentTable =
     constraint.type === 'foreignkey'
-      ? $tables.data.get(constraint.referent_table)
+      ? $tables.tablesMap.get(constraint.referent_table)
       : undefined;
 
   async function getReferentColumns(_constraint: Constraint) {
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
index 3c6b7379bd..9c6f952ac8 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
@@ -75,7 +75,7 @@
   $: existingConstraintNames = new Set(
     $constraintsDataStore.constraints.map((c) => c.name),
   );
-  $: tableName = $tables.data.get($tabularData.id)?.name ?? '';
+  $: tableName = $tables.tablesMap.get($tabularData.id)?.name ?? '';
   $: ({ processedColumns } = $tabularData);
   $: columnsInTable = Array.from($processedColumns.values());
   $: nameValidationErrors = getNameValidationErrors(
diff --git a/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte b/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte
index 24ebf06e2d..0110e13aba 100644
--- a/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte
+++ b/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte
@@ -60,7 +60,9 @@
   $: hasGrouping = $grouping.hasColumn(columnId);
 
   $: ({ linkFk } = processedColumn);
-  $: linkedTable = linkFk ? $tables.data.get(linkFk.referent_table) : undefined;
+  $: linkedTable = linkFk
+    ? $tables.tablesMap.get(linkFk.referent_table)
+    : undefined;
   $: linkedTableHref = linkedTable
     ? $storeToGetTablePageUrl({ tableId: linkedTable.oid })
     : undefined;
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index 33b6977c52..dcd0fef696 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -61,7 +61,7 @@
   // ===========================================================================
   $: singularBaseTableName = makeSingular(base.name);
   $: importVerifiedTables = [...$importVerifiedTablesStore.values()];
-  $: allTables = [...$tablesDataStore.data.values()];
+  $: allTables = [...$tablesDataStore.tablesMap.values()];
   $: ({ columnsDataStore } = $tabularData);
   $: baseColumns = columnsDataStore.columns;
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
index fd9af53489..7815072839 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
@@ -145,7 +145,7 @@
       {@const referentTable =
         referentTableId === undefined
           ? undefined
-          : $tables.data.get(referentTableId)}
+          : $tables.tablesMap.get(referentTableId)}
       {#if referentTable !== undefined}
         <Collapsible triggerAppearance="plain">
           <CollapsibleHeader
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnTypeSpecifierTag.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnTypeSpecifierTag.svelte
index 6802e8bff3..117eeb2bf9 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnTypeSpecifierTag.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnTypeSpecifierTag.svelte
@@ -12,7 +12,9 @@
   export let column: ProcessedColumn;
 
   $: linkedTableId = column.linkFk?.referent_table;
-  $: linkedTable = linkedTableId ? $tables.data.get(linkedTableId) : undefined;
+  $: linkedTable = linkedTableId
+    ? $tables.tablesMap.get(linkedTableId)
+    : undefined;
 </script>
 
 <div class="specifier-tag-container">
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
index 35b594c931..f1395b917c 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
@@ -84,7 +84,7 @@
   $: linkedTables = getLinkedTables({
     constraints,
     columns: $processedColumns,
-    tables: $tablesDataStore.data,
+    tables: $tablesDataStore.tablesMap,
   });
   $: selectedColumnsHelpText = (() => {
     if ($targetType === 'existingTable') {
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
index 332abba58f..2092698daf 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
@@ -37,7 +37,7 @@
           $currentSchema.oid,
           {
             oid: $tabularData.id,
-            name: $tables.data.get($tabularData.id)?.name ?? '',
+            name: $tables.tablesMap.get($tabularData.id)?.name ?? '',
           },
         )
       : '';
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
index afe973e18f..752b257977 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
@@ -15,7 +15,7 @@
   <div class="update-table-description-property-container">
     <span class="label">{$_('description')}</span>
     <EditableTextWithActions
-      initialValue={$tables.data.get($tabularData.id)?.description ?? ''}
+      initialValue={$tables.tablesMap.get($tabularData.id)?.description ?? ''}
       onSubmit={(description) => onUpdate({ description })}
       isLongText
       {disabled}
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
index f78e0debe5..9311372cd7 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
@@ -19,7 +19,7 @@
   <div class="rename-table-property-container">
     <span class="label">{$_('name')}</span>
     <EditableTextWithActions
-      initialValue={$tables.data.get($tabularData.id)?.name ?? ''}
+      initialValue={$tables.tablesMap.get($tabularData.id)?.name ?? ''}
       onSubmit={(name) => onUpdate({ name })}
       getValidationErrors={getNameValidationErrors}
       {disabled}

From 76057f5f7fb9b437f33fc5c8de27cca2878633ad Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 19 Jul 2024 14:16:00 -0400
Subject: [PATCH 0459/1141] Rename some stores exported from tables.ts

---
 .../src/components/EditTableHOC.svelte        |  9 ++-------
 .../breadcrumb/EntitySelector.svelte          |  8 ++------
 .../preview/ImportPreviewContent.svelte       |  4 ++--
 mathesar_ui/src/pages/record/Widgets.svelte   |  4 ++--
 .../src/pages/schema/ExplorationItem.svelte   |  2 +-
 .../src/pages/schema/SchemaOverview.svelte    |  2 +-
 .../src/pages/schema/SchemaPage.svelte        |  2 +-
 .../src/routes/SharedTableRoute.svelte        |  4 ++--
 mathesar_ui/src/routes/TableRoute.svelte      |  4 ++--
 mathesar_ui/src/stores/tables.ts              | 20 +++++++++++--------
 .../systems/data-explorer/ActionsPane.svelte  |  2 +-
 .../RecordSelectorContent.svelte              |  4 ++--
 .../RecordSelectorTable.svelte                |  6 +++---
 .../RecordSelectorWindow.svelte               |  4 ++--
 .../ForeignKeyConstraintDetails.svelte        |  4 ++--
 .../constraints/NewUniqueConstraint.svelte    |  4 ++--
 .../ColumnHeaderContextMenu.svelte            |  4 ++--
 .../link-table/LinkTableForm.svelte           |  5 ++---
 .../table-inspector/column/ColumnMode.svelte  |  4 ++--
 .../column/ColumnTypeSpecifierTag.svelte      |  4 ++--
 .../ExtractColumnsModal.svelte                |  2 +-
 .../table-inspector/table/TableActions.svelte |  8 ++++++--
 .../table/TableDescription.svelte             |  5 +++--
 .../table-inspector/table/TableName.svelte    |  5 +++--
 24 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/mathesar_ui/src/components/EditTableHOC.svelte b/mathesar_ui/src/components/EditTableHOC.svelte
index 6bfc59393a..2e399ab2e0 100644
--- a/mathesar_ui/src/components/EditTableHOC.svelte
+++ b/mathesar_ui/src/components/EditTableHOC.svelte
@@ -4,7 +4,7 @@
   import { currentSchemaId } from '@mathesar/stores/schemas';
   import {
     refetchTablesForSchema,
-    tables,
+    currentTables,
     updateTableMetaData,
   } from '@mathesar/stores/tables';
   import type { AtLeastOne } from '@mathesar/typeUtils';
@@ -12,12 +12,7 @@
   export let tableId: number;
 
   function schemaContainsTableName(name: string): boolean {
-    const allTables = [...$tables.tablesMap.values()];
-    const tablesUsingName = allTables.filter(
-      (current) => current.name === name,
-    );
-
-    return tablesUsingName.length > 0 && tablesUsingName[0].oid !== tableId;
+    return $currentTables.some((t) => t.name === name && t.oid !== tableId);
   }
 
   function getNameValidationErrors(name: string): string[] {
diff --git a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
index 57e8e394f7..10b3855a7a 100644
--- a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
@@ -9,10 +9,7 @@
   import { iconTable } from '@mathesar/icons';
   import { getExplorationPageUrl } from '@mathesar/routes/urls';
   import { queries as queriesStore } from '@mathesar/stores/queries';
-  import {
-    currentTableId,
-    tables as tablesStore,
-  } from '@mathesar/stores/tables';
+  import { currentTableId, currentTables } from '@mathesar/stores/tables';
   import { getLinkForTableItem } from '@mathesar/utils/tables';
 
   import BreadcrumbSelector from './BreadcrumbSelector.svelte';
@@ -63,11 +60,10 @@
     };
   }
 
-  $: tables = [...$tablesStore.tablesMap.values()];
   $: queries = [...$queriesStore.data.values()];
 
   $: selectorData = new Map<string, BreadcrumbSelectorEntry[]>([
-    [$_('tables'), tables.map(makeTableBreadcrumbSelectorItem)],
+    [$_('tables'), $currentTables.map(makeTableBreadcrumbSelectorItem)],
     [$_('explorations'), queries.map(makeQueryBreadcrumbSelectorItem)],
   ]);
 </script>
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index 51dc936274..ea2138deeb 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -28,7 +28,7 @@
     generateTablePreview,
     getTypeSuggestionsForTable,
     patchTable,
-    tables,
+    currentTables,
   } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
   import {
@@ -69,7 +69,7 @@
   let columns: Column[] = [];
   let columnPropertiesMap = buildColumnPropertiesMap([]);
 
-  $: otherTableNames = [...$tables.tablesMap.values()]
+  $: otherTableNames = $currentTables
     .filter((t) => t.oid !== table.oid)
     .map((t) => t.name);
   $: customizedTableName = requiredField(table.name, [
diff --git a/mathesar_ui/src/pages/record/Widgets.svelte b/mathesar_ui/src/pages/record/Widgets.svelte
index 8d75a77a0e..21f23fd65f 100644
--- a/mathesar_ui/src/pages/record/Widgets.svelte
+++ b/mathesar_ui/src/pages/record/Widgets.svelte
@@ -8,7 +8,7 @@
   import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import { iconRecord } from '@mathesar/icons';
-  import { tables } from '@mathesar/stores/tables';
+  import { currentTablesData } from '@mathesar/stores/tables';
   import { Help, isDefinedNonNullable } from '@mathesar-component-library';
 
   import TableWidget from './TableWidget.svelte';
@@ -25,7 +25,7 @@
   );
 
   function buildWidgetInput(joinableTable: JoinableTable) {
-    const table = $tables.tablesMap.get(joinableTable.target);
+    const table = $currentTablesData.tablesMap.get(joinableTable.target);
     if (!table) return undefined;
     const id = joinableTable.jp_path[0].slice(-1)[0];
     const name = columnNameMap.get(id) ?? `(${$_('unknown_column')})`;
diff --git a/mathesar_ui/src/pages/schema/ExplorationItem.svelte b/mathesar_ui/src/pages/schema/ExplorationItem.svelte
index 9076144df9..aa62e26d65 100644
--- a/mathesar_ui/src/pages/schema/ExplorationItem.svelte
+++ b/mathesar_ui/src/pages/schema/ExplorationItem.svelte
@@ -7,7 +7,7 @@
   import TableName from '@mathesar/components/TableName.svelte';
   import { iconExploration } from '@mathesar/icons';
   import { getExplorationPageUrl } from '@mathesar/routes/urls';
-  import { tables as tablesStore } from '@mathesar/stores/tables';
+  import { currentTablesData as tablesStore } from '@mathesar/stores/tables';
   import { Icon } from '@mathesar-component-library';
 
   export let exploration: QueryInstance;
diff --git a/mathesar_ui/src/pages/schema/SchemaOverview.svelte b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
index 9f41c1ceeb..8b5707c7dd 100644
--- a/mathesar_ui/src/pages/schema/SchemaOverview.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
@@ -23,7 +23,7 @@
   import TableSkeleton from './TableSkeleton.svelte';
   import TablesList from './TablesList.svelte';
 
-  export let tablesMap: Map<number, Table>;
+  export let tablesMap: Map<Table['oid'], Table>;
   export let explorationsMap: Map<number, QueryInstance>;
   export let tablesRequestStatus: RequestStatus;
   export let explorationsRequestStatus: RequestStatus;
diff --git a/mathesar_ui/src/pages/schema/SchemaPage.svelte b/mathesar_ui/src/pages/schema/SchemaPage.svelte
index 8b73e92710..f327b12610 100644
--- a/mathesar_ui/src/pages/schema/SchemaPage.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPage.svelte
@@ -16,7 +16,7 @@
   import { queries } from '@mathesar/stores/queries';
   import {
     importVerifiedTables as importVerifiedTablesStore,
-    tables as tablesStore,
+    currentTablesData as tablesStore,
   } from '@mathesar/stores/tables';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { logEvent } from '@mathesar/utils/telemetry';
diff --git a/mathesar_ui/src/routes/SharedTableRoute.svelte b/mathesar_ui/src/routes/SharedTableRoute.svelte
index 0d768185a5..4a62e73e67 100644
--- a/mathesar_ui/src/routes/SharedTableRoute.svelte
+++ b/mathesar_ui/src/routes/SharedTableRoute.svelte
@@ -5,7 +5,7 @@
 
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import TablePage from '@mathesar/pages/table/TablePage.svelte';
-  import { currentTableId, tables } from '@mathesar/stores/tables';
+  import { currentTableId, currentTablesData } from '@mathesar/stores/tables';
   import { preloadRouteData } from '@mathesar/utils/preloadData';
   import { ShareConsumer } from '@mathesar/utils/shares';
 
@@ -17,7 +17,7 @@
 
   $: tableId = routeSpecificData?.table_id ?? undefined;
   $: $currentTableId = tableId ?? undefined;
-  $: table = tableId ? $tables.tablesMap.get(tableId) : undefined;
+  $: table = tableId ? $currentTablesData.tablesMap.get(tableId) : undefined;
   $: shareConsumer = new ShareConsumer({
     slug,
   });
diff --git a/mathesar_ui/src/routes/TableRoute.svelte b/mathesar_ui/src/routes/TableRoute.svelte
index f243530cd6..0dcf247238 100644
--- a/mathesar_ui/src/routes/TableRoute.svelte
+++ b/mathesar_ui/src/routes/TableRoute.svelte
@@ -8,7 +8,7 @@
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import TablePage from '@mathesar/pages/table/TablePage.svelte';
-  import { currentTableId, tables } from '@mathesar/stores/tables';
+  import { currentTableId, currentTablesData } from '@mathesar/stores/tables';
 
   import RecordPageRoute from './RecordPageRoute.svelte';
 
@@ -17,7 +17,7 @@
   export let tableId: number;
 
   $: $currentTableId = tableId;
-  $: table = $tables.tablesMap.get(tableId);
+  $: table = $currentTablesData.tablesMap.get(tableId);
 
   function handleUnmount() {
     $currentTableId = undefined;
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index 7dd4f6f62c..8ee392ad53 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -395,7 +395,7 @@ export function generateTablePreview(props: {
   return postAPI(`/api/db/v0/tables/${table.oid}/previews/`, { columns });
 }
 
-export const tables: Readable<TablesData> = derived(
+export const currentTablesData: Readable<TablesData> = derived(
   currentSchemaId,
   ($currentSchemaId, set) => {
     let unsubscribe: Unsubscriber;
@@ -418,18 +418,22 @@ export const tables: Readable<TablesData> = derived(
   },
 );
 
+export const currentTables = derived(currentTablesData, (tablesData) =>
+  sortTables(tablesData.tablesMap.values()),
+);
+
 export const importVerifiedTables: Readable<TablesMap> = derived(
-  tables,
-  ($tables) =>
+  currentTablesData,
+  (tablesData) =>
     new Map(
-      [...$tables.tablesMap.values()]
+      [...tablesData.tablesMap.values()]
         .filter((table) => !isTableImportConfirmationRequired(table))
         .map((table) => [table.oid, table]),
     ),
 );
 
-export const validateNewTableName = derived(tables, ($tables) => {
-  const names = new Set([...$tables.tablesMap.values()].map((t) => t.name));
+export const validateNewTableName = derived(currentTablesData, (tablesData) => {
+  const names = new Set([...tablesData.tablesMap.values()].map((t) => t.name));
   return invalidIf(
     (name: string) => names.has(name),
     'A table with that name already exists.',
@@ -437,13 +441,13 @@ export const validateNewTableName = derived(tables, ($tables) => {
 });
 
 export function getTableName(id: DBObjectEntry['id']): string | undefined {
-  return get(tables).tablesMap.get(id)?.name;
+  return get(currentTablesData).tablesMap.get(id)?.name;
 }
 
 export const currentTableId = writable<number | undefined>(undefined);
 
 export const currentTable = derived(
-  [currentTableId, tables],
+  [currentTableId, currentTablesData],
   ([$currentTableId, $tables]) =>
     $currentTableId === undefined
       ? undefined
diff --git a/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte b/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
index 585e5bcc20..955f9586c4 100644
--- a/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
+++ b/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
@@ -16,7 +16,7 @@
   } from '@mathesar/icons';
   import { modal } from '@mathesar/stores/modal';
   import { queries } from '@mathesar/stores/queries';
-  import { tables as tablesDataStore } from '@mathesar/stores/tables';
+  import { currentTablesData as tablesDataStore } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
   import {
     Button,
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
index 05276014b0..4607a5c238 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
@@ -15,7 +15,7 @@
     renderTransitiveRecordSummary,
   } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
   import { getPkValueInRecord } from '@mathesar/stores/table-data/records';
-  import { tables } from '@mathesar/stores/tables';
+  import { currentTablesData } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { getErrorMessage } from '@mathesar/utils/errors';
@@ -88,7 +88,7 @@
       const record = response.results[0];
       const recordId = getPkValueInRecord(record, $columns);
       const previewData = response.preview_data ?? [];
-      const table = $tables.tablesMap.get(tableId);
+      const table = $currentTablesData.tablesMap.get(tableId);
       const template = table?.settings?.preview_settings?.template;
       if (!template) {
         throw new Error('No record summary template found in API response.');
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
index 9a9bf877f1..e9f8986b65 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
@@ -15,7 +15,7 @@
     renderTransitiveRecordSummary,
   } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
   import { getPkValueInRecord } from '@mathesar/stores/table-data/records';
-  import { tables } from '@mathesar/stores/tables';
+  import { currentTablesData } from '@mathesar/stores/tables';
   import overflowObserver, {
     makeOverflowDetails,
   } from '@mathesar/utils/overflowObserver';
@@ -56,7 +56,7 @@
     recordsData,
     processedColumns,
   } = tabularData);
-  $: table = $tables.tablesMap.get(tableId);
+  $: table = $currentTablesData.tablesMap.get(tableId);
   $: ({ recordSummaries, state: recordsDataState } = recordsData);
   $: recordsDataIsLoading = $recordsDataState === States.Loading;
   $: ({ constraints } = $constraintsDataStore);
@@ -137,7 +137,7 @@
     if (!record || recordId === undefined) {
       return;
     }
-    const tableEntry = $tables.tablesMap.get(tableId);
+    const tableEntry = $currentTablesData.tablesMap.get(tableId);
     const template = tableEntry?.settings?.preview_settings?.template ?? '';
     const recordSummary = renderTransitiveRecordSummary({
       template,
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
index 05c9c5c425..0b115103c0 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
@@ -6,7 +6,7 @@
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
   import { Meta, TabularData } from '@mathesar/stores/table-data';
   import { getTableName } from '@mathesar/stores/tables';
-  import { tables } from '@mathesar/stores/tables';
+  import { currentTablesData } from '@mathesar/stores/tables';
   import Pagination from '@mathesar/utils/Pagination';
   import { Window, portal } from '@mathesar-component-library';
 
@@ -31,7 +31,7 @@
     nestingLevel: controller.nestingLevel + 1,
   });
   $: ({ tableId, purpose } = controller);
-  $: table = $tableId && $tables.tablesMap.get($tableId);
+  $: table = $tableId && $currentTablesData.tablesMap.get($tableId);
   $: tabularData =
     $tableId && table
       ? new TabularData({
diff --git a/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte b/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
index 03fee0ab5a..bf0566c542 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
@@ -8,13 +8,13 @@
   import ColumnName from '@mathesar/components/column/ColumnName.svelte';
   import TableName from '@mathesar/components/TableName.svelte';
   import type { Constraint } from '@mathesar/stores/table-data';
-  import { tables } from '@mathesar/stores/tables';
+  import { currentTablesData } from '@mathesar/stores/tables';
 
   export let constraint: Constraint;
 
   $: referentTable =
     constraint.type === 'foreignkey'
-      ? $tables.tablesMap.get(constraint.referent_table)
+      ? $currentTablesData.tablesMap.get(constraint.referent_table)
       : undefined;
 
   async function getReferentColumns(_constraint: Constraint) {
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
index 9c6f952ac8..07a369b0e0 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
@@ -8,7 +8,7 @@
     type ProcessedColumn,
     getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
-  import { tables } from '@mathesar/stores/tables';
+  import { currentTablesData } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
   import { getColumnConstraintTypeByColumnId } from '@mathesar/utils/columnUtils';
   import { getAvailableName } from '@mathesar/utils/db';
@@ -75,7 +75,7 @@
   $: existingConstraintNames = new Set(
     $constraintsDataStore.constraints.map((c) => c.name),
   );
-  $: tableName = $tables.tablesMap.get($tabularData.id)?.name ?? '';
+  $: tableName = $currentTablesData.tablesMap.get($tabularData.id)?.name ?? '';
   $: ({ processedColumns } = $tabularData);
   $: columnsInTable = Array.from($processedColumns.values());
   $: nameValidationErrors = getNameValidationErrors(
diff --git a/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte b/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte
index 0110e13aba..afb73a4c21 100644
--- a/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte
+++ b/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte
@@ -23,7 +23,7 @@
     type ProcessedColumn,
     getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
-  import { tables } from '@mathesar/stores/tables';
+  import { currentTablesData } from '@mathesar/stores/tables';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { ButtonMenuItem, LinkMenuItem } from '@mathesar-component-library';
 
@@ -61,7 +61,7 @@
 
   $: ({ linkFk } = processedColumn);
   $: linkedTable = linkFk
-    ? $tables.tablesMap.get(linkFk.referent_table)
+    ? $currentTablesData.tablesMap.get(linkFk.referent_table)
     : undefined;
   $: linkedTableHref = linkedTable
     ? $storeToGetTablePageUrl({ tableId: linkedTable.oid })
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index dcd0fef696..7c3e457b68 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -26,7 +26,7 @@
   import {
     importVerifiedTables as importVerifiedTablesStore,
     refetchTablesForSchema,
-    tables as tablesDataStore,
+    currentTables,
     validateNewTableName,
   } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
@@ -61,7 +61,6 @@
   // ===========================================================================
   $: singularBaseTableName = makeSingular(base.name);
   $: importVerifiedTables = [...$importVerifiedTablesStore.values()];
-  $: allTables = [...$tablesDataStore.tablesMap.values()];
   $: ({ columnsDataStore } = $tabularData);
   $: baseColumns = columnsDataStore.columns;
 
@@ -93,7 +92,7 @@
     [columnNameIsAvailable($targetColumns)],
   );
   $: mappingTableName = requiredField(
-    suggestMappingTableName(base, target, allTables),
+    suggestMappingTableName(base, target, $currentTables),
     [$validateNewTableName],
   );
   $: columnNameMappingToBase = (() => {
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
index 7815072839..b254a43c5d 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
@@ -4,7 +4,7 @@
   import { currentDatabase } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
-  import { tables } from '@mathesar/stores/tables';
+  import { currentTablesData } from '@mathesar/stores/tables';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import FkRecordSummaryConfig from '@mathesar/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte';
   import { Collapsible } from '@mathesar-component-library';
@@ -145,7 +145,7 @@
       {@const referentTable =
         referentTableId === undefined
           ? undefined
-          : $tables.tablesMap.get(referentTableId)}
+          : $currentTablesData.tablesMap.get(referentTableId)}
       {#if referentTable !== undefined}
         <Collapsible triggerAppearance="plain">
           <CollapsibleHeader
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnTypeSpecifierTag.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnTypeSpecifierTag.svelte
index 117eeb2bf9..aa4cb9a510 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnTypeSpecifierTag.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnTypeSpecifierTag.svelte
@@ -5,7 +5,7 @@
   import { iconConstraint } from '@mathesar/icons';
   import { storeToGetTablePageUrl } from '@mathesar/stores/storeBasedUrls';
   import type { ProcessedColumn } from '@mathesar/stores/table-data';
-  import { tables } from '@mathesar/stores/tables';
+  import { currentTablesData } from '@mathesar/stores/tables';
   import { Icon, iconExternalLink } from '@mathesar-component-library';
 
   export let type: 'primaryKey' | 'foreignKey';
@@ -13,7 +13,7 @@
 
   $: linkedTableId = column.linkFk?.referent_table;
   $: linkedTable = linkedTableId
-    ? $tables.tablesMap.get(linkedTableId)
+    ? $currentTablesData.tablesMap.get(linkedTableId)
     : undefined;
 </script>
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
index f1395b917c..49f8299144 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
@@ -24,7 +24,7 @@
     getTableFromStoreOrApi,
     moveColumns,
     splitTable,
-    tables as tablesDataStore,
+    currentTablesData as tablesDataStore,
     validateNewTableName,
   } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
index 2092698daf..75b222ad5a 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
@@ -8,7 +8,11 @@
   import { currentDatabase } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
-  import { currentTable, deleteTable, tables } from '@mathesar/stores/tables';
+  import {
+    currentTable,
+    deleteTable,
+    currentTablesData,
+  } from '@mathesar/stores/tables';
   import {
     constructDataExplorerUrlToSummarizeFromGroup,
     createDataExplorerUrlToExploreATable,
@@ -37,7 +41,7 @@
           $currentSchema.oid,
           {
             oid: $tabularData.id,
-            name: $tables.tablesMap.get($tabularData.id)?.name ?? '',
+            name: $currentTablesData.tablesMap.get($tabularData.id)?.name ?? '',
           },
         )
       : '';
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
index 752b257977..80d6f20d14 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
@@ -4,7 +4,7 @@
   import EditableTextWithActions from '@mathesar/components/EditableTextWithActions.svelte';
   import EditTableHOC from '@mathesar/components/EditTableHOC.svelte';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
-  import { tables } from '@mathesar/stores/tables';
+  import { currentTablesData } from '@mathesar/stores/tables';
 
   const tabularData = getTabularDataStoreFromContext();
 
@@ -15,7 +15,8 @@
   <div class="update-table-description-property-container">
     <span class="label">{$_('description')}</span>
     <EditableTextWithActions
-      initialValue={$tables.tablesMap.get($tabularData.id)?.description ?? ''}
+      initialValue={$currentTablesData.tablesMap.get($tabularData.id)
+        ?.description ?? ''}
       onSubmit={(description) => onUpdate({ description })}
       isLongText
       {disabled}
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
index 9311372cd7..2a0d4d5b27 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
@@ -4,7 +4,7 @@
   import EditableTextWithActions from '@mathesar/components/EditableTextWithActions.svelte';
   import EditTableHOC from '@mathesar/components/EditTableHOC.svelte';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
-  import { tables } from '@mathesar/stores/tables';
+  import { currentTablesData } from '@mathesar/stores/tables';
 
   const tabularData = getTabularDataStoreFromContext();
 
@@ -19,7 +19,8 @@
   <div class="rename-table-property-container">
     <span class="label">{$_('name')}</span>
     <EditableTextWithActions
-      initialValue={$tables.tablesMap.get($tabularData.id)?.name ?? ''}
+      initialValue={$currentTablesData.tablesMap.get($tabularData.id)?.name ??
+        ''}
       onSubmit={(name) => onUpdate({ name })}
       getValidationErrors={getNameValidationErrors}
       {disabled}

From b5170e30c18997785e2f0c69f57dfd2cbefa99ac Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 19 Jul 2024 14:16:00 -0400
Subject: [PATCH 0460/1141] Add connection params to tables functions

---
 mathesar_ui/src/api/rpc/index.ts              |   2 +
 .../src/components/EditTableHOC.svelte        |  14 +-
 .../src/pages/database/DatabaseDetails.svelte |   2 +-
 .../preview/ImportPreviewContent.svelte       |  44 ++-
 .../src/pages/schema/SchemaOverview.svelte    |   2 +-
 mathesar_ui/src/stores/tables.ts              | 254 +++++++++---------
 .../src/systems/data-explorer/QueryManager.ts |  16 +-
 .../RecordSelectorWindow.svelte               |  12 +-
 .../systems/table-view/header/Header.svelte   |  11 +-
 .../link-table/LinkTableForm.svelte           |   7 +-
 .../record-summary/RecordSummaryConfig.svelte |   5 +-
 11 files changed, 200 insertions(+), 169 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/index.ts b/mathesar_ui/src/api/rpc/index.ts
index e9a3b3c531..ed58604e71 100644
--- a/mathesar_ui/src/api/rpc/index.ts
+++ b/mathesar_ui/src/api/rpc/index.ts
@@ -4,6 +4,7 @@ import { buildRpcApi } from '@mathesar/packages/json-rpc-client-builder';
 
 import { connections } from './connections';
 import { schemas } from './schemas';
+import { tables } from './tables';
 
 /** Mathesar's JSON-RPC API */
 export const api = buildRpcApi({
@@ -12,5 +13,6 @@ export const api = buildRpcApi({
   methodTree: {
     connections,
     schemas,
+    tables,
   },
 });
diff --git a/mathesar_ui/src/components/EditTableHOC.svelte b/mathesar_ui/src/components/EditTableHOC.svelte
index 2e399ab2e0..1c08470b15 100644
--- a/mathesar_ui/src/components/EditTableHOC.svelte
+++ b/mathesar_ui/src/components/EditTableHOC.svelte
@@ -1,11 +1,9 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import { currentSchemaId } from '@mathesar/stores/schemas';
   import {
-    refetchTablesForSchema,
+    refetchTablesForCurrentSchema,
     currentTables,
-    updateTableMetaData,
   } from '@mathesar/stores/tables';
   import type { AtLeastOne } from '@mathesar/typeUtils';
 
@@ -28,10 +26,12 @@
   async function handleTableMetaUpdate(
     data: AtLeastOne<{ name: string; description: string }>,
   ): Promise<void> {
-    await updateTableMetaData(tableId, data);
-    if ($currentSchemaId) {
-      await refetchTablesForSchema($currentSchemaId);
-    }
+    // await updateTableMetaData(tableId, data);
+
+    // TODO_3651:
+    // - Modify name and description.
+    // - Rename this function so that it doesn't mention metadata.
+    await refetchTablesForCurrentSchema();
   }
 </script>
 
diff --git a/mathesar_ui/src/pages/database/DatabaseDetails.svelte b/mathesar_ui/src/pages/database/DatabaseDetails.svelte
index 4e2a8e6d02..0bfab64b20 100644
--- a/mathesar_ui/src/pages/database/DatabaseDetails.svelte
+++ b/mathesar_ui/src/pages/database/DatabaseDetails.svelte
@@ -102,7 +102,7 @@
       onProceed: async () => {
         await deleteSchemaAPI(database.id, schema.oid);
         // TODO: Create common util to handle data clearing & sync between stores
-        removeTablesStore(schema.oid);
+        removeTablesStore(database, schema);
       },
     });
   }
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index ea2138deeb..44b9a56d7c 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -2,6 +2,11 @@
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
 
+  import {
+    CancellablePromise,
+    CancelOrProceedButtonPair,
+    Spinner,
+  } from '@mathesar-component-library';
   import { columnsApi } from '@mathesar/api/rest/columns';
   import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
   import type { Column } from '@mathesar/api/rest/types/tables/columns';
@@ -24,21 +29,13 @@
   } from '@mathesar/routes/urls';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
   import AsyncStore from '@mathesar/stores/AsyncStore';
-  import {
-    generateTablePreview,
-    getTypeSuggestionsForTable,
-    patchTable,
-    currentTables,
-  } from '@mathesar/stores/tables';
+  import { currentTables, patchTable } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
-  import {
-    CancelOrProceedButtonPair,
-    Spinner,
-  } from '@mathesar-component-library';
 
   import ColumnNamingStrategyInput from '../column-names/ColumnNamingStrategyInput.svelte';
   import ColumnTypeInferenceInput from '../inference/ColumnTypeInferenceInput.svelte';
 
+  import { getAPI, postAPI } from '@mathesar/api/rest/utils/requestUtils';
   import ErrorInfo from './ErrorInfo.svelte';
   import ImportPreviewLayout from './ImportPreviewLayout.svelte';
   import {
@@ -54,6 +51,31 @@
   /** Set via back-end */
   const TRUNCATION_LIMIT = 20;
 
+  /**
+   * Note the optimizing query parameter. It asserts that the table will not have
+   * columns with default values (probably because it is currently being imported
+   * and a table produced by importing will not have column defaults). It
+   * follows, that this function cannot be used where columns might have defaults.
+   */
+  function getTypeSuggestionsForTable(
+    id: Table['oid'],
+  ): CancellablePromise<Record<string, string>> {
+    const optimizingQueryParam = 'columns_might_have_defaults=false';
+    return getAPI(
+      `/api/db/v0/tables/${id}/type_suggestions/?${optimizingQueryParam}`,
+    );
+  }
+
+  function generateTablePreview(props: {
+    table: Pick<Table, 'oid'>;
+    columns: Table['columns'];
+  }): CancellablePromise<{
+    records: Record<string, unknown>[];
+  }> {
+    const { columns, table } = props;
+    return postAPI(`/api/db/v0/tables/${table.oid}/previews/`, { columns });
+  }
+
   const columnsFetch = new AsyncStore(columnsApi.list);
   const previewRequest = new AsyncStore(generateTablePreview);
   const typeSuggestionsRequest = new AsyncStore(getTypeSuggestionsForTable);
@@ -152,7 +174,7 @@
 
   async function finishImport() {
     try {
-      await patchTable(table.oid, {
+      await patchTable(database, table.oid, {
         name: $customizedTableName,
         import_verified: true,
         columns: finalizeColumns(columns, columnPropertiesMap),
diff --git a/mathesar_ui/src/pages/schema/SchemaOverview.svelte b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
index 8b5707c7dd..e6ada4b4b3 100644
--- a/mathesar_ui/src/pages/schema/SchemaOverview.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
@@ -61,7 +61,7 @@
         <div>
           <SpinnerButton
             onClick={async () => {
-              await refetchTablesForSchema(schema.oid);
+              await refetchTablesForSchema(database, schema);
             }}
             label={$_('retry')}
             icon={iconRefresh}
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index 8ee392ad53..fe09a100cd 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -1,30 +1,29 @@
 /**
  * @file
  *
- * TODO This file **badly** needs to be refactored, cleaned up, and made to
- * function more consistently with the rest of the codebase.
+ * TODO This file should ideally be refactored, cleaned up, and made to function
+ * more consistently with the rest of the codebase.
  *
- * - For values of type `Writable<DBTablesStoreData>`, we seem to be using using
- *   names like `schemaStore`, `tableStore`, `tablesStore`, `schemaTablesStore`
- *   almost interchangeably which is a readability nightmare.
- *
- * - Tables need to be sorted before being stored, but that sorting happens in
- *   many different places. I suggest having a derived store that does the
- *   sorting.
+ * Also, tables need to be sorted before being stored, but that sorting happens
+ * in many different places. I suggest having a derived store that does the
+ * sorting.
  */
 
-import type { Readable, Unsubscriber, Writable } from 'svelte/store';
-import { derived, get, writable } from 'svelte/store';
+import type { Readable, Writable } from 'svelte/store';
+import { derived, get, readable, writable } from 'svelte/store';
 
+import {
+  CancellablePromise,
+  collapse,
+  type RecursivePartial,
+} from '@mathesar-component-library';
+import type { DBObjectEntry } from '@mathesar/AppTypes';
 import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
 import type {
   SplitTableRequest,
   SplitTableResponse,
 } from '@mathesar/api/rest/types/tables/split_table';
-import type {
-  PaginatedResponse,
-  RequestStatus,
-} from '@mathesar/api/rest/utils/requestUtils';
+import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import {
   deleteAPI,
   getAPI,
@@ -33,17 +32,16 @@ import {
 } from '@mathesar/api/rest/utils/requestUtils';
 import type { Schema } from '@mathesar/api/rpc/schemas';
 import type { Table } from '@mathesar/api/rpc/tables';
-import type { DBObjectEntry, Database } from '@mathesar/AppTypes';
 import { invalidIf } from '@mathesar/components/form';
 import type { AtLeastOne } from '@mathesar/typeUtils';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import { isTableImportConfirmationRequired } from '@mathesar/utils/tables';
-import {
-  CancellablePromise,
-  type RecursivePartial,
-} from '@mathesar-component-library';
 
+import type { Connection } from '@mathesar/api/rpc/connections';
+import { TupleMap } from '@mathesar/packages/tuple-map';
+import { connectionsStore } from './databases';
 import { addCountToSchemaNumTables, currentSchemaId } from './schemas';
+import { api } from '@mathesar/api/rpc';
 
 const commonData = preloadCommonData();
 
@@ -54,21 +52,33 @@ interface TablesData {
   requestStatus: RequestStatus;
 }
 
+function makeEmptyTablesData(): TablesData {
+  return {
+    tablesMap: new Map(),
+    requestStatus: { state: 'success' },
+  };
+}
+
 type TablesStore = Writable<TablesData>;
 
-const tablesStores: Map<Schema['oid'], TablesStore> = new Map();
+/** Maps [connectionId, schemaOid] to TablesStore */
+const tablesStores = new TupleMap<
+  [Connection['id'], Schema['oid']],
+  TablesStore
+>();
 
-const tablesRequests: Map<
-  Schema['oid'],
+const tablesRequests = new TupleMap<
+  [Connection['id'], Schema['oid']],
   CancellablePromise<Table[]>
-> = new Map();
+>();
 
 function sortTables(tables: Iterable<Table>): Table[] {
   return [...tables].sort((a, b) => a.name.localeCompare(b.name));
 }
 
 function setTablesStore(
-  schemaOid: Schema['oid'],
+  connection: Pick<Connection, 'id'>,
+  schema: Pick<Schema, 'oid'>,
   tables?: Table[],
 ): TablesStore {
   const tablesMap: TablesMap = new Map();
@@ -81,26 +91,33 @@ function setTablesStore(
     requestStatus: { state: 'success' },
   };
 
-  let store = tablesStores.get(schemaOid);
+  let store = tablesStores.get([connection.id, schema.oid]);
   if (!store) {
     store = writable(storeValue);
-    tablesStores.set(schemaOid, store);
+    tablesStores.set([connection.id, schema.oid], store);
   } else {
     store.set(storeValue);
   }
   return store;
 }
 
-export function removeTablesStore(schemaOid: Schema['oid']): void {
-  tablesStores.delete(schemaOid);
+export function removeTablesStore(
+  connection: Pick<Connection, 'id'>,
+  schema: Pick<Schema, 'oid'>,
+): void {
+  tablesStores.delete([connection.id, schema.oid]);
 }
 
 export async function refetchTablesForSchema(
-  schemaOid: Schema['oid'],
+  connection: Pick<Connection, 'id'>,
+  schema: Pick<Schema, 'oid'>,
 ): Promise<TablesData | undefined> {
-  const store = tablesStores.get(schemaOid);
+  const store = tablesStores.get([connection.id, schema.oid]);
   if (!store) {
-    console.error(`Tables store for schema: ${schemaOid} not found.`);
+    // TODO: why are we logging an error here? I would expect that we'd either
+    // throw or ignore. If there's a reason for this logging, please add a code
+    // comment explaining why.
+    console.error(`Tables store not found.`);
     return undefined;
   }
 
@@ -110,16 +127,15 @@ export async function refetchTablesForSchema(
       requestStatus: { state: 'processing' },
     }));
 
-    tablesRequests.get(schemaOid)?.cancel();
+    tablesRequests.get([connection.id, schema.oid])?.cancel();
 
-    const tablesRequest = getAPI<PaginatedResponse<Table>>(
-      `/api/db/v0/tables/?schema=${schemaOid}&limit=500`,
+    const tablesRequest = getAPI<Table[]>(
+      `/api/db/v0/tables/?schema=${schema.oid}&limit=500`,
     );
-    tablesRequests.set(schemaOid, tablesRequest);
-    const response = await tablesRequest;
-    const tableEntries = response.results || [];
+    tablesRequests.set([connection.id, schema.oid], tablesRequest);
+    const tableEntries = await tablesRequest;
 
-    const schemaTablesStore = setTablesStore(schemaOid, tableEntries);
+    const schemaTablesStore = setTablesStore(connection, schema, tableEntries);
 
     return get(schemaTablesStore);
   } catch (err) {
@@ -138,22 +154,26 @@ export async function refetchTablesForSchema(
 
 let preload = true;
 
-function getTablesStore(schemaOid: Schema['oid']): TablesStore {
-  let store = tablesStores.get(schemaOid);
+function getTablesStore(
+  connection: Pick<Connection, 'id'>,
+  schema: Pick<Schema, 'oid'>,
+): TablesStore {
+  let store = tablesStores.get([connection.id, schema.oid]);
   if (!store) {
     store = writable({
       requestStatus: { state: 'processing' },
       tablesMap: new Map(),
     });
-    tablesStores.set(schemaOid, store);
-    if (preload && commonData.current_schema === schemaOid) {
-      store = setTablesStore(schemaOid, commonData.tables ?? []);
+    tablesStores.set([connection.id, schema.oid], store);
+    // TODO_3651: add condition for current connection as well as current schema
+    if (preload && commonData.current_schema === schema.oid) {
+      store = setTablesStore(connection, schema, commonData.tables ?? []);
     } else {
-      void refetchTablesForSchema(schemaOid);
+      void refetchTablesForSchema(connection, schema);
     }
     preload = false;
   } else if (get(store).requestStatus.state === 'failure') {
-    void refetchTablesForSchema(schemaOid);
+    void refetchTablesForSchema(connection, schema);
   }
   return store;
 }
@@ -161,7 +181,7 @@ function getTablesStore(schemaOid: Schema['oid']): TablesStore {
 function findSchemaStoreForTable(
   tableOid: Table['oid'],
 ): TablesStore | undefined {
-  // TODO rewrite this function
+  // TODO_3651 rewrite this function
   throw new Error('Not implemented');
 }
 
@@ -178,7 +198,7 @@ function findAndUpdateTableStore(tableOid: Table['oid'], newTable: Table) {
 }
 
 export function deleteTable(
-  database: Database,
+  connection: Connection,
   schema: Schema,
   tableOid: Table['oid'],
 ): CancellablePromise<Table> {
@@ -186,14 +206,16 @@ export function deleteTable(
   return new CancellablePromise(
     (resolve, reject) => {
       void promise.then((table) => {
-        addCountToSchemaNumTables(database, schema, -1);
-        tablesStores.get(schema.oid)?.update((tableStoreData) => {
-          tableStoreData.tablesMap.delete(tableOid);
-          return {
-            ...tableStoreData,
-            tablesMap: new Map(tableStoreData.tablesMap),
-          };
-        });
+        addCountToSchemaNumTables(connection, schema, -1);
+        tablesStores
+          .get([connection.id, schema.oid])
+          ?.update((tableStoreData) => {
+            tableStoreData.tablesMap.delete(tableOid);
+            return {
+              ...tableStoreData,
+              tablesMap: new Map(tableStoreData.tablesMap),
+            };
+          });
         return resolve(table);
       }, reject);
     },
@@ -203,7 +225,10 @@ export function deleteTable(
   );
 }
 
+// TODO_3651: This is not actually updating metadata. Merge this function with
+// patchTable below. Separate actual metadata into a different function
 export function updateTableMetaData(
+  connection: Pick<Connection, 'id'>,
   tableOid: number,
   updatedMetaData: AtLeastOne<{ name: string; description: string }>,
 ): CancellablePromise<Table> {
@@ -225,7 +250,7 @@ export function updateTableMetaData(
 }
 
 export function createTable(
-  database: Database,
+  connection: Connection,
   schema: Schema,
   tableArgs: {
     name?: string;
@@ -240,8 +265,8 @@ export function createTable(
   return new CancellablePromise(
     (resolve, reject) => {
       void promise.then((table) => {
-        addCountToSchemaNumTables(database, schema, 1);
-        tablesStores.get(schema.oid)?.update((existing) => {
+        addCountToSchemaNumTables(connection, schema, 1);
+        tablesStores.get([connection.id, schema.oid])?.update((existing) => {
           const tablesMap: TablesMap = new Map();
           sortTables([...existing.tablesMap.values(), table]).forEach(
             (entry) => {
@@ -260,6 +285,7 @@ export function createTable(
 }
 
 export function patchTable(
+  connection: Pick<Connection, 'id'>,
   tableOid: Table['oid'],
   patch: {
     name?: Table['name'];
@@ -281,23 +307,6 @@ export function patchTable(
   );
 }
 
-/**
- * NOTE: The getTable function currently does not get data from the store.
- * We need to keep it that way for the time-being, because the components
- * that call this function expect latest data from the db, while the store
- * contains stale information.
- *
- * TODO:
- * 1. Keep stores upto-date when user performs any action to related db objects.
- * 2. Find a sync mechanism to keep the frontend stores upto-date when
- *    data in db changes.
- * 3. Move all api-call-only functions to /api. Only keep functions that
- *    update the stores within /stores
- */
-export function getTable(tableOid: Table['oid']): CancellablePromise<Table> {
-  return getAPI(`/api/db/v0/tables/${tableOid}/`);
-}
-
 export function splitTable({
   id,
   idsOfColumnsToExtract,
@@ -328,10 +337,8 @@ export function moveColumns(
   });
 }
 
-/**
- * Replace getTable with this function once the above mentioned changes are done.
- */
 export function getTableFromStoreOrApi(
+  connection: Pick<Connection, 'id'>,
   tableOid: Table['oid'],
 ): CancellablePromise<Table> {
   const tablesStore = findSchemaStoreForTable(tableOid);
@@ -343,11 +350,16 @@ export function getTableFromStoreOrApi(
       });
     }
   }
-  const promise = getTable(tableOid);
+  const promise = api.tables
+    .get({
+      database_id: connection.id,
+      table_oid: tableOid,
+    })
+    .run();
   return new CancellablePromise(
     (resolve, reject) => {
       void promise.then((table) => {
-        const store = tablesStores.get(table.schema);
+        const store = tablesStores.get([connection.id, table.schema]);
         if (store) {
           store.update((existing) => {
             const tableMap = new Map<number, Table>();
@@ -370,52 +382,19 @@ export function getTableFromStoreOrApi(
   );
 }
 
-/**
- * Note the optimizing query parameter. It asserts that the table will not have
- * columns with default values (probably because it is currently being imported
- * and a table produced by importing will not have column defaults). It
- * follows, that this function cannot be used where columns might have defaults.
- */
-export function getTypeSuggestionsForTable(
-  id: Table['oid'],
-): CancellablePromise<Record<string, string>> {
-  const optimizingQueryParam = 'columns_might_have_defaults=false';
-  return getAPI(
-    `/api/db/v0/tables/${id}/type_suggestions/?${optimizingQueryParam}`,
-  );
-}
-
-export function generateTablePreview(props: {
-  table: Pick<Table, 'oid'>;
-  columns: Table['columns'];
-}): CancellablePromise<{
-  records: Record<string, unknown>[];
-}> {
-  const { columns, table } = props;
-  return postAPI(`/api/db/v0/tables/${table.oid}/previews/`, { columns });
-}
-
-export const currentTablesData: Readable<TablesData> = derived(
-  currentSchemaId,
-  ($currentSchemaId, set) => {
-    let unsubscribe: Unsubscriber;
-
-    if (!$currentSchemaId) {
-      set({
-        tablesMap: new Map(),
-        requestStatus: { state: 'success' },
-      });
-    } else {
-      const store = getTablesStore($currentSchemaId);
-      unsubscribe = store.subscribe((dbSchemasData) => {
-        set(dbSchemasData);
-      });
-    }
+export const currentTablesData = collapse(
+  derived(
+    [connectionsStore.currentConnection, currentSchemaId],
+    ([connection, schemaOid]) =>
+      !connection || !schemaOid
+        ? readable(makeEmptyTablesData())
+        : getTablesStore(connection, { oid: schemaOid }),
+  ),
+);
 
-    return () => {
-      unsubscribe?.();
-    };
-  },
+export const currentTablesMap = derived(
+  currentTablesData,
+  (tablesData) => tablesData.tablesMap,
 );
 
 export const currentTables = derived(currentTablesData, (tablesData) =>
@@ -440,10 +419,6 @@ export const validateNewTableName = derived(currentTablesData, (tablesData) => {
   );
 });
 
-export function getTableName(id: DBObjectEntry['id']): string | undefined {
-  return get(currentTablesData).tablesMap.get(id)?.name;
-}
-
 export const currentTableId = writable<number | undefined>(undefined);
 
 export const currentTable = derived(
@@ -462,31 +437,42 @@ export function getJoinableTablesResult(tableId: number, maxDepth = 1) {
 
 type TableSettings = Table['settings'];
 
-export async function saveTableSettings(
+async function saveTableSettings(
+  connection: Pick<Connection, 'id'>,
   table: Pick<Table, 'oid' | 'settings' | 'schema'>,
   settings: RecursivePartial<TableSettings>,
 ): Promise<void> {
   const url = `/api/db/v0/tables/${table.oid}/settings/${table.settings.id}/`;
   await patchAPI<TableSettings>(url, settings);
-  await refetchTablesForSchema(table.schema);
+  await refetchTablesForSchema(connection, { oid: table.schema });
 }
 
 export function saveRecordSummaryTemplate(
+  connection: Pick<Connection, 'id'>,
   table: Pick<Table, 'oid' | 'settings' | 'schema'>,
   previewSettings: TableSettings['preview_settings'],
 ): Promise<void> {
   const { customized } = previewSettings;
-  return saveTableSettings(table, {
+  return saveTableSettings(connection, table, {
     preview_settings: customized ? previewSettings : { customized },
   });
 }
 
 export function saveColumnOrder(
+  connection: Pick<Connection, 'id'>,
   table: Pick<Table, 'oid' | 'settings' | 'schema'>,
   columnOrder: TableSettings['column_order'],
 ): Promise<void> {
-  return saveTableSettings(table, {
+  return saveTableSettings(connection, table, {
     // Using the Set constructor to remove potential duplicates
     column_order: [...new Set(columnOrder)],
   });
 }
+
+export async function refetchTablesForCurrentSchema() {
+  const connection = get(connectionsStore.currentConnection);
+  const schemaOid = get(currentSchemaId);
+  if (connection && schemaOid) {
+    await refetchTablesForSchema(connection, { oid: schemaOid });
+  }
+}
diff --git a/mathesar_ui/src/systems/data-explorer/QueryManager.ts b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
index 6a5aaece66..af169c114e 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryManager.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
@@ -12,7 +12,6 @@ import { getAPI } from '@mathesar/api/rest/utils/requestUtils';
 import type { Table } from '@mathesar/api/rpc/tables';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
 import { createQuery, putQuery } from '@mathesar/stores/queries';
-import { getTable } from '@mathesar/stores/tables';
 import CacheManager from '@mathesar/utils/CacheManager';
 import type { CancellablePromise } from '@mathesar-component-library';
 
@@ -27,6 +26,8 @@ import {
   getColumnInformationMap,
   getTablesThatReferenceBaseTable,
 } from './utils';
+import { api } from '@mathesar/api/rpc';
+import { connectionsStore } from '@mathesar/stores/databases';
 
 export default class QueryManager extends QueryRunner {
   private undoRedoManager: QueryUndoRedoManager;
@@ -135,7 +136,18 @@ export default class QueryManager extends QueryRunner {
         inputColumnsFetchState: { state: 'processing' },
       }));
 
-      this.baseTableFetchPromise = getTable(baseTableId);
+      const currentConnection = get(connectionsStore.currentConnection);
+      if (!currentConnection) {
+        throw new Error('No current connection selected.');
+      }
+
+      this.baseTableFetchPromise = api.tables
+        .get({
+          database_id: currentConnection.id,
+          table_oid: baseTableId,
+        })
+        .run();
+
       this.joinableColumnsfetchPromise = getAPI<JoinableTablesResult>(
         `/api/db/v0/tables/${baseTableId}/joinable_tables/`,
       );
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
index 0b115103c0..2471426b66 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
@@ -5,10 +5,9 @@
   import TableName from '@mathesar/components/TableName.svelte';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
   import { Meta, TabularData } from '@mathesar/stores/table-data';
-  import { getTableName } from '@mathesar/stores/tables';
-  import { currentTablesData } from '@mathesar/stores/tables';
+  import { currentTablesMap } from '@mathesar/stores/tables';
   import Pagination from '@mathesar/utils/Pagination';
-  import { Window, portal } from '@mathesar-component-library';
+  import { Window, defined, portal } from '@mathesar-component-library';
 
   import RecordSelectorContent from './RecordSelectorContent.svelte';
   import { RecordSelectorController } from './RecordSelectorController';
@@ -31,7 +30,7 @@
     nestingLevel: controller.nestingLevel + 1,
   });
   $: ({ tableId, purpose } = controller);
-  $: table = $tableId && $currentTablesData.tablesMap.get($tableId);
+  $: table = defined($tableId, (id) => $currentTablesMap.get(id));
   $: tabularData =
     $tableId && table
       ? new TabularData({
@@ -42,7 +41,6 @@
           table,
         })
       : undefined;
-  $: tableName = $tableId ? getTableName($tableId) : undefined;
   $: nestedSelectorIsOpen = nestedController.isOpen;
   $: marginBottom = $nestedSelectorIsOpen
     ? `calc(${nestedSelectorVerticalOffset} - ${contentHeight}px)`
@@ -96,8 +94,8 @@
             : $_('open_table_record')}
           let:slotName
         >
-          {#if slotName === 'tableName' && tableName}
-            <TableName table={{ name: tableName }} truncate={false} />
+          {#if slotName === 'tableName' && table}
+            <TableName table={{ name: table.name }} truncate={false} />
           {/if}
         </RichText>
       </span>
diff --git a/mathesar_ui/src/systems/table-view/header/Header.svelte b/mathesar_ui/src/systems/table-view/header/Header.svelte
index 706280a516..9ad8424603 100644
--- a/mathesar_ui/src/systems/table-view/header/Header.svelte
+++ b/mathesar_ui/src/systems/table-view/header/Header.svelte
@@ -22,6 +22,7 @@
   import ColumnHeaderContextMenu from './header-cell/ColumnHeaderContextMenu.svelte';
   import HeaderCell from './header-cell/HeaderCell.svelte';
   import NewColumnCell from './new-column-cell/NewColumnCell.svelte';
+  import { connectionsStore } from '@mathesar/stores/databases';
 
   const tabularData = getTabularDataStoreFromContext();
 
@@ -32,6 +33,7 @@
   $: columnOrder = columnOrder ?? [];
   $: columnOrderString = columnOrder.map(String);
   $: ({ selection, processedColumns } = $tabularData);
+  $: ({ currentConnectionId } = connectionsStore);
 
   let locationOfFirstDraggedColumn: number | undefined = undefined;
   let selectedColumnIdsOrdered: string[] = [];
@@ -61,6 +63,9 @@
   }
 
   function dropColumn(columnDroppedOn?: ProcessedColumn) {
+    const connectionId = $currentConnectionId;
+    if (!connectionId) throw new Error('No current connection ID');
+
     // Early exit if a column is dropped in the same place.
     // Should only be done for single column if non-continuous selection is allowed.
     if (
@@ -87,7 +92,11 @@
       newColumnOrder.splice(0, 0, ...selectedColumnIdsOrdered);
     }
 
-    void saveColumnOrder(table, newColumnOrder.map(Number));
+    void saveColumnOrder(
+      { id: connectionId },
+      table,
+      newColumnOrder.map(Number),
+    );
 
     // Reset drag information
     locationOfFirstDraggedColumn = undefined;
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index 7c3e457b68..bf2326e8d1 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -18,14 +18,13 @@
   import { RichText } from '@mathesar/components/rich-text';
   import SelectTable from '@mathesar/components/SelectTable.svelte';
   import { iconTableLink } from '@mathesar/icons';
-  import { currentSchemaId } from '@mathesar/stores/schemas';
   import {
     ColumnsDataStore,
     getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
   import {
     importVerifiedTables as importVerifiedTablesStore,
-    refetchTablesForSchema,
+    refetchTablesForCurrentSchema,
     currentTables,
     validateNewTableName,
   } from '@mathesar/stores/tables';
@@ -198,8 +197,8 @@
   }
 
   async function reFetchOtherThingsThatChanged() {
-    if ($linkType === 'manyToMany' && $currentSchemaId !== undefined) {
-      await refetchTablesForSchema($currentSchemaId);
+    if ($linkType === 'manyToMany') {
+      await refetchTablesForCurrentSchema();
       return;
     }
     const tableWithNewColumn = $linkType === 'oneToMany' ? target : base;
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
index ac6ce4b4b2..13608f4e95 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
@@ -73,7 +73,10 @@
 
   async function save() {
     try {
-      await saveRecordSummaryTemplate(table, $form.values);
+      if (!database) {
+        throw new Error('Current database not found');
+      }
+      await saveRecordSummaryTemplate(database, table, $form.values);
     } catch (e) {
       toast.error(`${$_('unable_to_save_changes')} ${getErrorMessage(e)}`);
     }

From 8d2a524917958b05703c4d386711f3ff0450b744 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 19 Jul 2024 14:16:01 -0400
Subject: [PATCH 0461/1141] Minor cleanup

---
 mathesar_ui/src/stores/tables.ts | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index fe09a100cd..ba0a9f5d7a 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -17,7 +17,6 @@ import {
   collapse,
   type RecursivePartial,
 } from '@mathesar-component-library';
-import type { DBObjectEntry } from '@mathesar/AppTypes';
 import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
 import type {
   SplitTableRequest,
@@ -435,22 +434,20 @@ export function getJoinableTablesResult(tableId: number, maxDepth = 1) {
   );
 }
 
-type TableSettings = Table['settings'];
-
 async function saveTableSettings(
   connection: Pick<Connection, 'id'>,
   table: Pick<Table, 'oid' | 'settings' | 'schema'>,
-  settings: RecursivePartial<TableSettings>,
+  settings: RecursivePartial<Table['settings']>,
 ): Promise<void> {
   const url = `/api/db/v0/tables/${table.oid}/settings/${table.settings.id}/`;
-  await patchAPI<TableSettings>(url, settings);
+  await patchAPI<Table['settings']>(url, settings);
   await refetchTablesForSchema(connection, { oid: table.schema });
 }
 
 export function saveRecordSummaryTemplate(
   connection: Pick<Connection, 'id'>,
   table: Pick<Table, 'oid' | 'settings' | 'schema'>,
-  previewSettings: TableSettings['preview_settings'],
+  previewSettings: Table['settings']['preview_settings'],
 ): Promise<void> {
   const { customized } = previewSettings;
   return saveTableSettings(connection, table, {
@@ -461,7 +458,7 @@ export function saveRecordSummaryTemplate(
 export function saveColumnOrder(
   connection: Pick<Connection, 'id'>,
   table: Pick<Table, 'oid' | 'settings' | 'schema'>,
-  columnOrder: TableSettings['column_order'],
+  columnOrder: Table['settings']['column_order'],
 ): Promise<void> {
   return saveTableSettings(connection, table, {
     // Using the Set constructor to remove potential duplicates

From 8be0d60aaee08bdc0f8ea267417bca64b8bc5c85 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 19 Jul 2024 14:16:01 -0400
Subject: [PATCH 0462/1141] Update tables API types with new metadata fields

---
 mathesar_ui/src/api/rpc/tables.ts | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/tables.ts b/mathesar_ui/src/api/rpc/tables.ts
index 2d45f10cc3..1684d3a2ab 100644
--- a/mathesar_ui/src/api/rpc/tables.ts
+++ b/mathesar_ui/src/api/rpc/tables.ts
@@ -1,6 +1,6 @@
 import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
 
-export interface Table {
+export interface RawTable {
   oid: number;
   name: string;
   /** The OID of the schema containing the table */
@@ -8,8 +8,27 @@ export interface Table {
   description: string | null;
 }
 
+interface TableMetadata {
+  import_verified: boolean | null;
+  column_order: number[] | null;
+  record_summary_customized: boolean | null;
+  record_summary_template: string | null;
+}
+
+export interface Table extends RawTable {
+  metadata: TableMetadata;
+}
+
 export const tables = {
   list: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      schema_oid: number;
+    },
+    RawTable[]
+  >(),
+
+  list_with_metadata: rpcMethodTypeContainer<
     {
       database_id: number;
       schema_oid: number;
@@ -22,7 +41,7 @@ export const tables = {
       database_id: number;
       table_oid: number;
     },
-    Table
+    RawTable
   >(),
 
   /** Returns the oid of the table created */

From 6ff2b633f53b5f3b30fabd60259f7affe2dfbb1f Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 19 Jul 2024 14:16:01 -0400
Subject: [PATCH 0463/1141] Adjust code to match Table type with metadata

---
 mathesar_ui/src/api/rpc/tables.ts             |   8 ++
 .../src/components/EditTableHOC.svelte        |  38 -----
 mathesar_ui/src/components/TableName.svelte   |   7 +-
 .../preview/ImportPreviewContent.svelte       |  27 ++--
 .../import/preview/ImportPreviewPage.svelte   |  26 ++--
 .../import/preview/importPreviewPageUtils.ts  |   2 +-
 mathesar_ui/src/pages/record/RecordStore.ts   |  12 +-
 mathesar_ui/src/pages/schema/EditTable.svelte |  53 ++++---
 mathesar_ui/src/stores/databases.ts           |  14 ++
 mathesar_ui/src/stores/tables.ts              | 131 +++++++-----------
 .../src/systems/data-explorer/QueryManager.ts |   2 +-
 .../src/systems/data-explorer/utils.ts        |  70 ++++++----
 .../RecordSelectorContent.svelte              |   9 +-
 .../RecordSelectorTable.svelte                |  10 +-
 .../record-selector/recordSelectorUtils.ts    |  10 +-
 .../src/systems/table-view/TableView.svelte   |   5 +-
 .../systems/table-view/header/Header.svelte   |  43 +++---
 .../ExtractColumnsModal.svelte                |   8 +-
 .../record-summary/RecordSummaryConfig.svelte |  14 +-
 .../table/TableDescription.svelte             |  33 +++--
 .../table-inspector/table/TableName.svelte    |  42 +++---
 mathesar_ui/src/utils/tables.ts               |  66 ++++-----
 22 files changed, 336 insertions(+), 294 deletions(-)
 delete mode 100644 mathesar_ui/src/components/EditTableHOC.svelte

diff --git a/mathesar_ui/src/api/rpc/tables.ts b/mathesar_ui/src/api/rpc/tables.ts
index 1684d3a2ab..2b9b66d2cd 100644
--- a/mathesar_ui/src/api/rpc/tables.ts
+++ b/mathesar_ui/src/api/rpc/tables.ts
@@ -44,6 +44,14 @@ export const tables = {
     RawTable
   >(),
 
+  get_with_metadata: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      table_oid: number;
+    },
+    Table
+  >(),
+
   /** Returns the oid of the table created */
   add: rpcMethodTypeContainer<
     {
diff --git a/mathesar_ui/src/components/EditTableHOC.svelte b/mathesar_ui/src/components/EditTableHOC.svelte
deleted file mode 100644
index 1c08470b15..0000000000
--- a/mathesar_ui/src/components/EditTableHOC.svelte
+++ /dev/null
@@ -1,38 +0,0 @@
-<script lang="ts">
-  import { _ } from 'svelte-i18n';
-
-  import {
-    refetchTablesForCurrentSchema,
-    currentTables,
-  } from '@mathesar/stores/tables';
-  import type { AtLeastOne } from '@mathesar/typeUtils';
-
-  export let tableId: number;
-
-  function schemaContainsTableName(name: string): boolean {
-    return $currentTables.some((t) => t.name === name && t.oid !== tableId);
-  }
-
-  function getNameValidationErrors(name: string): string[] {
-    if (!name.trim()) {
-      return [$_('table_name_cannot_be_empty')];
-    }
-    if (schemaContainsTableName(name)) {
-      return [$_('table_with_name_already_exists')];
-    }
-    return [];
-  }
-
-  async function handleTableMetaUpdate(
-    data: AtLeastOne<{ name: string; description: string }>,
-  ): Promise<void> {
-    // await updateTableMetaData(tableId, data);
-
-    // TODO_3651:
-    // - Modify name and description.
-    // - Rename this function so that it doesn't mention metadata.
-    await refetchTablesForCurrentSchema();
-  }
-</script>
-
-<slot {getNameValidationErrors} onUpdate={handleTableMetaUpdate} />
diff --git a/mathesar_ui/src/components/TableName.svelte b/mathesar_ui/src/components/TableName.svelte
index cbf6258239..72f64baee3 100644
--- a/mathesar_ui/src/components/TableName.svelte
+++ b/mathesar_ui/src/components/TableName.svelte
@@ -8,11 +8,8 @@
   import NameWithIcon from './NameWithIcon.svelte';
 
   interface $$Props extends Omit<ComponentProps<NameWithIcon>, 'icon'> {
-    table: {
-      name: Table['name'];
-      data_files?: Table['data_files'];
-      import_verified?: Table['import_verified'];
-    };
+    table: Pick<Table, 'name'> &
+      Parameters<typeof isTableImportConfirmationRequired>[0];
     isLoading?: boolean;
   }
 
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index 44b9a56d7c..f0c32b7fe8 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -29,7 +29,7 @@
   } from '@mathesar/routes/urls';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
   import AsyncStore from '@mathesar/stores/AsyncStore';
-  import { currentTables, patchTable } from '@mathesar/stores/tables';
+  import { currentTables } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
 
   import ColumnNamingStrategyInput from '../column-names/ColumnNamingStrategyInput.svelte';
@@ -68,7 +68,7 @@
 
   function generateTablePreview(props: {
     table: Pick<Table, 'oid'>;
-    columns: Table['columns'];
+    columns: Column[];
   }): CancellablePromise<{
     records: Record<string, unknown>[];
   }> {
@@ -173,16 +173,19 @@
   }
 
   async function finishImport() {
-    try {
-      await patchTable(database, table.oid, {
-        name: $customizedTableName,
-        import_verified: true,
-        columns: finalizeColumns(columns, columnPropertiesMap),
-      });
-      router.goto(getTablePageUrl(database.id, schema.oid, table.oid), true);
-    } catch (err) {
-      toast.fromError(err);
-    }
+    // TODO reimplement patching tables columns with RPC API.
+    throw new Error('Not implemented');
+
+    // try {
+    //   await patchTable(database, table.oid, {
+    //     name: $customizedTableName,
+    //     import_verified: true,
+    //     columns: finalizeColumns(columns, columnPropertiesMap),
+    //   });
+    //   router.goto(getTablePageUrl(database.id, schema.oid, table.oid), true);
+    // } catch (err) {
+    //   toast.fromError(err);
+    // }
   }
 </script>
 
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
index 775b6d0712..3b8641bd19 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
@@ -15,6 +15,7 @@
 
   import ImportPreviewContent from './ImportPreviewContent.svelte';
   import ImportPreviewLayout from './ImportPreviewLayout.svelte';
+  import { currentConnection } from '@mathesar/stores/databases';
 
   const tableFetch = new AsyncStore(getTableFromStoreOrApi);
   const dataFileFetch = new AsyncStore(dataFilesApi.get);
@@ -29,20 +30,29 @@
   }
 
   $: void (async () => {
-    const table = (await tableFetch.run(tableId)).resolvedValue;
+    const table = (
+      await tableFetch.run({
+        connection: $currentConnection,
+        tableOid: tableId,
+      })
+    ).resolvedValue;
     if (!table) {
       return;
     }
-    if (table.import_verified) {
+    if (table.metadata.import_verified) {
       redirectToTablePage();
       return;
     }
-    const firstDataFileId = table.data_files?.[0];
-    if (firstDataFileId === undefined) {
-      redirectToTablePage();
-      return;
-    }
-    await dataFileFetch.run(firstDataFileId);
+
+    // TODO_BETA: re-implement fetching and storing of `table.data_files`
+    // metadata from RPC API or similar.
+    throw new Error('Not implemented');
+    // const firstDataFileId = table.data_files?.[0];
+    // if (firstDataFileId === undefined) {
+    //   redirectToTablePage();
+    //   return;
+    // }
+    // await dataFileFetch.run(firstDataFileId);
   })();
   $: error = $tableFetch.error ?? $dataFileFetch.error;
 </script>
diff --git a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
index c9aa18e830..e76f4bbd62 100644
--- a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
+++ b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
@@ -101,7 +101,7 @@ export function buildColumnPropertiesMap(
 export function finalizeColumns(
   columns: Column[],
   columnPropertiesMap: ColumnPropertiesMap,
-): Table['columns'] {
+) {
   return columns
     .filter((column) => columnPropertiesMap[column.id]?.selected)
     .map((column) => ({
diff --git a/mathesar_ui/src/pages/record/RecordStore.ts b/mathesar_ui/src/pages/record/RecordStore.ts
index b49f2d3bb6..188a0a522d 100644
--- a/mathesar_ui/src/pages/record/RecordStore.ts
+++ b/mathesar_ui/src/pages/record/RecordStore.ts
@@ -36,7 +36,17 @@ export default class RecordStore {
     this.table = table;
     this.recordPk = recordPk;
     this.url = `/api/db/v0/tables/${this.table.oid}/records/${this.recordPk}/`;
-    const { template } = this.table.settings.preview_settings;
+    // TODO_RS_TEMPLATE
+    //
+    // We need to handle the case where no record summary template is set.
+    // Previously it was the responsibility of the service layer to _always_
+    // return a record summary template, even by deriving one on the fly to send
+    // if necessary. With the changes for beta, it will be the responsibility of
+    // the client to handle the case where no template is set. We need to wait
+    // until after the service layer changes are made before we can implement
+    // this here.
+    const template =
+      this.table.metadata.record_summary_template ?? 'TODO_RS_TEMPLATE';
     this.summary = derived(
       [this.fieldValues, this.recordSummaries],
       ([fields, fkSummaryData]) =>
diff --git a/mathesar_ui/src/pages/schema/EditTable.svelte b/mathesar_ui/src/pages/schema/EditTable.svelte
index 39ba72b6bb..fc3d80d5ca 100644
--- a/mathesar_ui/src/pages/schema/EditTable.svelte
+++ b/mathesar_ui/src/pages/schema/EditTable.svelte
@@ -1,31 +1,46 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
+  import type { ModalController } from '@mathesar-component-library';
   import type { Table } from '@mathesar/api/rpc/tables';
-  import EditTableHoc from '@mathesar/components/EditTableHOC.svelte';
   import Identifier from '@mathesar/components/Identifier.svelte';
   import NameAndDescInputModalForm from '@mathesar/components/NameAndDescInputModalForm.svelte';
   import { RichText } from '@mathesar/components/rich-text';
-  import type { ModalController } from '@mathesar-component-library';
+  import { currentConnection } from '@mathesar/stores/databases';
+  import {
+    factoryToGetTableNameValidationErrors,
+    updateTable,
+  } from '@mathesar/stores/tables';
 
   export let table: Table;
   export let modalController: ModalController;
+
+  $: getNameValidationErrors = factoryToGetTableNameValidationErrors(
+    $currentConnection,
+    table,
+  );
+
+  async function handleSave(name: string, description: string) {
+    updateTable($currentConnection, {
+      oid: table.oid,
+      name,
+      description,
+    });
+  }
 </script>
 
-<EditTableHoc let:getNameValidationErrors let:onUpdate tableId={table.oid}>
-  <NameAndDescInputModalForm
-    controller={modalController}
-    save={(name, description) => onUpdate({ name, description })}
-    {getNameValidationErrors}
-    getInitialName={() => table.name ?? ''}
-    getInitialDescription={() => table.description ?? ''}
-  >
-    <span slot="title" let:initialName>
-      <RichText text={$_('edit_table_with_name')} let:slotName>
-        {#if slotName === 'tableName'}
-          <Identifier>{initialName}</Identifier>
-        {/if}
-      </RichText>
-    </span>
-  </NameAndDescInputModalForm>
-</EditTableHoc>
+<NameAndDescInputModalForm
+  controller={modalController}
+  save={handleSave}
+  getNameValidationErrors={$getNameValidationErrors}
+  getInitialName={() => table.name ?? ''}
+  getInitialDescription={() => table.description ?? ''}
+>
+  <span slot="title" let:initialName>
+    <RichText text={$_('edit_table_with_name')} let:slotName>
+      {#if slotName === 'tableName'}
+        <Identifier>{initialName}</Identifier>
+      {/if}
+    </RichText>
+  </span>
+</NameAndDescInputModalForm>
diff --git a/mathesar_ui/src/stores/databases.ts b/mathesar_ui/src/stores/databases.ts
index 24c98cf5d2..3a59fa0936 100644
--- a/mathesar_ui/src/stores/databases.ts
+++ b/mathesar_ui/src/stores/databases.ts
@@ -129,5 +129,19 @@ class ConnectionsStore {
 export const connectionsStore: MakeWritablePropertiesReadable<ConnectionsStore> =
   new ConnectionsStore();
 
+/**
+ * @throws an error when used in a context where no current connection exists.
+ * This behavior sacrifices some stability for the sake of developer ergonomics.
+ * This sacrifice seems acceptable given that such a large part of the
+ * application depends on the existence of one and only one connection.
+ */
+export const currentConnection = derived(
+  connectionsStore.currentConnection,
+  (c) => {
+    if (!c) throw new Error('No current connection');
+    return c;
+  },
+);
+
 /** @deprecated Use connectionsStore.currentConnection instead */
 export const currentDatabase = connectionsStore.currentConnection;
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index ba0a9f5d7a..8878269ac9 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -32,7 +32,6 @@ import {
 import type { Schema } from '@mathesar/api/rpc/schemas';
 import type { Table } from '@mathesar/api/rpc/tables';
 import { invalidIf } from '@mathesar/components/form';
-import type { AtLeastOne } from '@mathesar/typeUtils';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import { isTableImportConfirmationRequired } from '@mathesar/utils/tables';
 
@@ -41,6 +40,8 @@ import { TupleMap } from '@mathesar/packages/tuple-map';
 import { connectionsStore } from './databases';
 import { addCountToSchemaNumTables, currentSchemaId } from './schemas';
 import { api } from '@mathesar/api/rpc';
+import { execPipe, filter, map } from 'iter-tools';
+import { _ } from 'svelte-i18n';
 
 const commonData = preloadCommonData();
 
@@ -224,28 +225,12 @@ export function deleteTable(
   );
 }
 
-// TODO_3651: This is not actually updating metadata. Merge this function with
-// patchTable below. Separate actual metadata into a different function
-export function updateTableMetaData(
+export async function updateTable(
   connection: Pick<Connection, 'id'>,
-  tableOid: number,
-  updatedMetaData: AtLeastOne<{ name: string; description: string }>,
-): CancellablePromise<Table> {
-  const promise = patchAPI<Table>(
-    `/api/db/v0/tables/${tableOid}/`,
-    updatedMetaData,
-  );
-  return new CancellablePromise(
-    (resolve, reject) => {
-      void promise.then((table) => {
-        findAndUpdateTableStore(tableOid, table);
-        return resolve(table);
-      }, reject);
-    },
-    () => {
-      promise.cancel();
-    },
-  );
+  table: RecursivePartial<Table> & { oid: Table['oid'] },
+) {
+  // TODO_3651
+  throw new Error('Not implemented');
 }
 
 export function createTable(
@@ -283,29 +268,6 @@ export function createTable(
   );
 }
 
-export function patchTable(
-  connection: Pick<Connection, 'id'>,
-  tableOid: Table['oid'],
-  patch: {
-    name?: Table['name'];
-    import_verified?: Table['import_verified'];
-    columns?: Table['columns'];
-  },
-): CancellablePromise<Table> {
-  const promise = patchAPI<Table>(`/api/db/v0/tables/${tableOid}/`, patch);
-  return new CancellablePromise(
-    (resolve, reject) => {
-      void promise.then((value) => {
-        findAndUpdateTableStore(tableOid, value);
-        return resolve(value);
-      }, reject);
-    },
-    () => {
-      promise.cancel();
-    },
-  );
-}
-
 export function splitTable({
   id,
   idsOfColumnsToExtract,
@@ -336,10 +298,13 @@ export function moveColumns(
   });
 }
 
-export function getTableFromStoreOrApi(
-  connection: Pick<Connection, 'id'>,
-  tableOid: Table['oid'],
-): CancellablePromise<Table> {
+export function getTableFromStoreOrApi({
+  connection,
+  tableOid,
+}: {
+  connection: Pick<Connection, 'id'>;
+  tableOid: Table['oid'];
+}): CancellablePromise<Table> {
   const tablesStore = findSchemaStoreForTable(tableOid);
   if (tablesStore) {
     const table = get(tablesStore).tablesMap.get(tableOid);
@@ -350,7 +315,7 @@ export function getTableFromStoreOrApi(
     }
   }
   const promise = api.tables
-    .get({
+    .get_with_metadata({
       database_id: connection.id,
       table_oid: tableOid,
     })
@@ -434,38 +399,6 @@ export function getJoinableTablesResult(tableId: number, maxDepth = 1) {
   );
 }
 
-async function saveTableSettings(
-  connection: Pick<Connection, 'id'>,
-  table: Pick<Table, 'oid' | 'settings' | 'schema'>,
-  settings: RecursivePartial<Table['settings']>,
-): Promise<void> {
-  const url = `/api/db/v0/tables/${table.oid}/settings/${table.settings.id}/`;
-  await patchAPI<Table['settings']>(url, settings);
-  await refetchTablesForSchema(connection, { oid: table.schema });
-}
-
-export function saveRecordSummaryTemplate(
-  connection: Pick<Connection, 'id'>,
-  table: Pick<Table, 'oid' | 'settings' | 'schema'>,
-  previewSettings: Table['settings']['preview_settings'],
-): Promise<void> {
-  const { customized } = previewSettings;
-  return saveTableSettings(connection, table, {
-    preview_settings: customized ? previewSettings : { customized },
-  });
-}
-
-export function saveColumnOrder(
-  connection: Pick<Connection, 'id'>,
-  table: Pick<Table, 'oid' | 'settings' | 'schema'>,
-  columnOrder: Table['settings']['column_order'],
-): Promise<void> {
-  return saveTableSettings(connection, table, {
-    // Using the Set constructor to remove potential duplicates
-    column_order: [...new Set(columnOrder)],
-  });
-}
-
 export async function refetchTablesForCurrentSchema() {
   const connection = get(connectionsStore.currentConnection);
   const schemaOid = get(currentSchemaId);
@@ -473,3 +406,37 @@ export async function refetchTablesForCurrentSchema() {
     await refetchTablesForSchema(connection, { oid: schemaOid });
   }
 }
+
+export function factoryToGetTableNameValidationErrors(
+  connection: Pick<Connection, 'id'>,
+  table: Table,
+): Readable<(n: string) => string[]> {
+  const tablesStore = tablesStores.get([connection.id, table.schema]);
+  if (!tablesStore) throw new Error('Tables store not found');
+
+  const otherTableNames = derived(
+    tablesStore,
+    (d) =>
+      new Set(
+        execPipe(
+          d.tablesMap.values(),
+          filter((t) => t.oid !== table.oid),
+          map((t) => t.name),
+        ),
+      ),
+  );
+
+  return derived([otherTableNames, _], ([$otherTableNames, $_]) => {
+    function getNameValidationErrors(name: string): string[] {
+      if (!name.trim()) {
+        return [$_('table_name_cannot_be_empty')];
+      }
+      if ($otherTableNames.has(name)) {
+        return [$_('table_with_name_already_exists')];
+      }
+      return [];
+    }
+
+    return getNameValidationErrors;
+  });
+}
diff --git a/mathesar_ui/src/systems/data-explorer/QueryManager.ts b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
index af169c114e..37209feaa2 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryManager.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
@@ -142,7 +142,7 @@ export default class QueryManager extends QueryRunner {
       }
 
       this.baseTableFetchPromise = api.tables
-        .get({
+        .get_with_metadata({
           database_id: currentConnection.id,
           table_oid: baseTableId,
         })
diff --git a/mathesar_ui/src/systems/data-explorer/utils.ts b/mathesar_ui/src/systems/data-explorer/utils.ts
index 5899b87f68..7a3c77f1fd 100644
--- a/mathesar_ui/src/systems/data-explorer/utils.ts
+++ b/mathesar_ui/src/systems/data-explorer/utils.ts
@@ -181,19 +181,23 @@ export function getLinkFromColumn(
 
 export function getColumnInformationMap(
   result: JoinableTablesResult,
-  baseTable: Pick<Table, 'oid' | 'name' | 'columns'>,
+  baseTable: Pick<Table, 'oid' | 'name'>,
 ): InputColumnsStoreSubstance['inputColumnInformationMap'] {
   const map: InputColumnsStoreSubstance['inputColumnInformationMap'] =
     new Map();
-  baseTable.columns.forEach((column) => {
-    map.set(column.id, {
-      id: column.id,
-      name: column.name,
-      type: column.type,
-      tableId: baseTable.oid,
-      tableName: baseTable.name,
-    });
-  });
+
+  // TODO_BETA: figure out how to deal with the fact that our `Table` type no
+  // longer has a `columns` field.
+
+  // baseTable.columns.forEach((column) => {
+  //   map.set(column.id, {
+  //     id: column.id,
+  //     name: column.name,
+  //     type: column.type,
+  //     tableId: baseTable.oid,
+  //     tableName: baseTable.name,
+  //   });
+  // });
   Object.keys(result.tables).forEach((tableIdKey) => {
     const tableId = parseInt(tableIdKey, 10);
     const table = result.tables[tableId];
@@ -213,26 +217,32 @@ export function getColumnInformationMap(
 
 export function getBaseTableColumnsWithLinks(
   result: JoinableTablesResult,
-  baseTable: Pick<Table, 'oid' | 'name' | 'columns'>,
+  baseTable: Pick<Table, 'oid' | 'name'>,
 ): Map<ColumnWithLink['id'], ColumnWithLink> {
-  const columnMapEntries: [ColumnWithLink['id'], ColumnWithLink][] =
-    baseTable.columns.map((column) => [
-      column.id,
-      {
-        id: column.id,
-        name: column.name,
-        type: column.type,
-        tableName: baseTable.name,
-        linksTo: getLinkFromColumn(result, column.id, 1),
-        producesMultipleResults: false,
-      },
-    ]);
+  // TODO_BETA: figure out how to deal with the fact that our `Table` type no
+  // longer has a `columns` field.
+
+  // const columnMapEntries: [ColumnWithLink['id'], ColumnWithLink][] =
+  //   baseTable.columns.map((column) => [
+  //     column.id,
+  //     {
+  //       id: column.id,
+  //       name: column.name,
+  //       type: column.type,
+  //       tableName: baseTable.name,
+  //       linksTo: getLinkFromColumn(result, column.id, 1),
+  //       producesMultipleResults: false,
+  //     },
+  //   ]);
+
+  const columnMapEntries: [ColumnWithLink['id'], ColumnWithLink][] = [];
+
   return new Map(columnMapEntries.sort(compareColumnByLinks));
 }
 
 export function getTablesThatReferenceBaseTable(
   result: JoinableTablesResult,
-  baseTable: Pick<Table, 'oid' | 'name' | 'columns'>,
+  baseTable: Pick<Table, 'oid' | 'name'>,
 ): ReferencedByTable[] {
   const referenceLinks = result.joinable_tables.filter(
     (entry) => entry.depth === 1 && entry.fk_path[0][1] === true,
@@ -243,10 +253,16 @@ export function getTablesThatReferenceBaseTable(
     const tableId = reference.target;
     const table = result.tables[tableId];
     const baseTableColumnId = reference.jp_path[0][0];
-    const baseTableColumn = baseTable.columns.find(
-      (column) => column.id === baseTableColumnId,
-    );
     const referenceTableColumnId = reference.jp_path[0][1];
+
+    // TODO_BETA: figure out how to deal with the fact that our `Table` type no
+    // longer has a `columns` field.
+
+    // const baseTableColumn = baseTable.columns.find(
+    //   (column) => column.id === baseTableColumnId,
+    // );
+    const baseTableColumn = undefined;
+
     if (!baseTableColumn) {
       return;
     }
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
index 4607a5c238..5bf3143624 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
@@ -89,9 +89,14 @@
       const recordId = getPkValueInRecord(record, $columns);
       const previewData = response.preview_data ?? [];
       const table = $currentTablesData.tablesMap.get(tableId);
-      const template = table?.settings?.preview_settings?.template;
+      const template = table?.metadata?.record_summary_template;
+      // TODO_RS_TEMPLATE
+      //
+      // We need to change the logic here to account for the fact that sometimes
+      // the record summary template actually _will_ be missing. We need to
+      // handle this on the client.
       if (!template) {
-        throw new Error('No record summary template found in API response.');
+        throw new Error('TODO_RS_TEMPLATE');
       }
       const recordSummary = renderTransitiveRecordSummary({
         inputData: buildInputData(record),
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
index e9f8986b65..cf9a36368d 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
@@ -138,7 +138,15 @@
       return;
     }
     const tableEntry = $currentTablesData.tablesMap.get(tableId);
-    const template = tableEntry?.settings?.preview_settings?.template ?? '';
+    const template = table?.metadata?.record_summary_template;
+    if (!template) {
+      throw new Error('TODO_RS_TEMPLATE');
+      // TODO_RS_TEMPLATE
+      //
+      // We need to change the logic here to account for the fact that sometimes
+      // the record summary template actually _will_ be missing. We need to
+      // handle this on the client.
+    }
     const recordSummary = renderTransitiveRecordSummary({
       template,
       inputData: buildInputData(record),
diff --git a/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts b/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts
index f39c9972b7..8b2d4cc4e4 100644
--- a/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts
+++ b/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts
@@ -25,7 +25,15 @@ export function getColumnIdToFocusInitially({
     if (!table) {
       return undefined;
     }
-    const { template } = table.settings.preview_settings;
+    const template = table?.metadata?.record_summary_template;
+    if (!template) {
+      throw new Error('TODO_RS_TEMPLATE');
+      // TODO_RS_TEMPLATE
+      //
+      // We need to change the logic here to account for the fact that sometimes
+      // the record summary template actually _will_ be missing. We need to
+      // handle this on the client.
+    }
     const match = template.match(/\{\d+\}/)?.[0] ?? undefined;
     if (!match) {
       return undefined;
diff --git a/mathesar_ui/src/systems/table-view/TableView.svelte b/mathesar_ui/src/systems/table-view/TableView.svelte
index 5885287a5f..81030731f5 100644
--- a/mathesar_ui/src/systems/table-view/TableView.svelte
+++ b/mathesar_ui/src/systems/table-view/TableView.svelte
@@ -37,7 +37,7 @@
   );
 
   export let context: Context = 'page';
-  export let table: Pick<Table, 'oid' | 'settings' | 'schema'>;
+  export let table: Table;
   export let sheetElement: HTMLElement | undefined = undefined;
 
   let tableInspectorTab: ComponentProps<WithTableInspector>['activeTabId'] =
@@ -62,8 +62,7 @@
   });
   $: ({ horizontalScrollOffset, scrollOffset, isTableInspectorVisible } =
     display);
-  $: ({ settings } = table);
-  $: ({ column_order: columnOrder } = settings);
+  $: columnOrder = table.metadata.column_order ?? [];
   $: hasNewColumnButton = allowsDdlOperations;
   /**
    * These are separate variables for readability and also to keep the door open
diff --git a/mathesar_ui/src/systems/table-view/header/Header.svelte b/mathesar_ui/src/systems/table-view/header/Header.svelte
index 9ad8424603..9a2042a9bd 100644
--- a/mathesar_ui/src/systems/table-view/header/Header.svelte
+++ b/mathesar_ui/src/systems/table-view/header/Header.svelte
@@ -16,45 +16,42 @@
     ID_ROW_CONTROL_COLUMN,
     getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
-  import { saveColumnOrder } from '@mathesar/stores/tables';
+  import { updateTable } from '@mathesar/stores/tables';
 
   import { Draggable, Droppable } from './drag-and-drop';
   import ColumnHeaderContextMenu from './header-cell/ColumnHeaderContextMenu.svelte';
   import HeaderCell from './header-cell/HeaderCell.svelte';
   import NewColumnCell from './new-column-cell/NewColumnCell.svelte';
-  import { connectionsStore } from '@mathesar/stores/databases';
+  import { currentConnection } from '@mathesar/stores/databases';
 
   const tabularData = getTabularDataStoreFromContext();
 
   export let hasNewColumnButton = false;
   export let columnOrder: number[];
-  export let table: Pick<Table, 'oid' | 'settings' | 'schema'>;
+  export let table: Pick<Table, 'oid'>;
 
   $: columnOrder = columnOrder ?? [];
-  $: columnOrderString = columnOrder.map(String);
   $: ({ selection, processedColumns } = $tabularData);
-  $: ({ currentConnectionId } = connectionsStore);
 
   let locationOfFirstDraggedColumn: number | undefined = undefined;
-  let selectedColumnIdsOrdered: string[] = [];
-  let newColumnOrder: string[] = [];
+  let selectedColumnIdsOrdered: number[] = [];
+  let newColumnOrder: number[] = [];
 
   function dragColumn() {
     // Keep only IDs for which the column exists
     for (const columnId of $processedColumns.keys()) {
-      const columnIdString = columnId.toString();
-      columnOrderString = [...new Set(columnOrderString)];
-      if (!columnOrderString.includes(columnIdString)) {
-        columnOrderString = [...columnOrderString, columnIdString];
+      columnOrder = [...new Set(columnOrder)];
+      if (!columnOrder.includes(columnId)) {
+        columnOrder = [...columnOrder, columnId];
       }
     }
-    columnOrderString = columnOrderString;
+    columnOrder = columnOrder;
     // Remove selected column IDs and keep their order
-    for (const id of columnOrderString) {
-      if ($selection.columnIds.has(id)) {
+    for (const id of columnOrder) {
+      if ($selection.columnIds.has(String(id))) {
         selectedColumnIdsOrdered.push(id);
         if (!locationOfFirstDraggedColumn) {
-          locationOfFirstDraggedColumn = columnOrderString.indexOf(id);
+          locationOfFirstDraggedColumn = columnOrder.indexOf(id);
         }
       } else {
         newColumnOrder.push(id);
@@ -63,9 +60,6 @@
   }
 
   function dropColumn(columnDroppedOn?: ProcessedColumn) {
-    const connectionId = $currentConnectionId;
-    if (!connectionId) throw new Error('No current connection ID');
-
     // Early exit if a column is dropped in the same place.
     // Should only be done for single column if non-continuous selection is allowed.
     if (
@@ -83,7 +77,7 @@
     // if that column is to the right, else insert it before
     if (columnDroppedOn) {
       newColumnOrder.splice(
-        columnOrderString.indexOf(columnDroppedOn.id.toString()),
+        columnOrder.indexOf(columnDroppedOn.id),
         0,
         ...selectedColumnIdsOrdered,
       );
@@ -92,11 +86,10 @@
       newColumnOrder.splice(0, 0, ...selectedColumnIdsOrdered);
     }
 
-    void saveColumnOrder(
-      { id: connectionId },
-      table,
-      newColumnOrder.map(Number),
-    );
+    void updateTable($currentConnection, {
+      oid: table.oid,
+      metadata: { column_order: newColumnOrder },
+    });
 
     // Reset drag information
     locationOfFirstDraggedColumn = undefined;
@@ -127,7 +120,7 @@
           on:drop={() => dropColumn(processedColumn)}
           on:dragover={(e) => e.preventDefault()}
           {locationOfFirstDraggedColumn}
-          columnLocation={columnOrderString.indexOf(columnId.toString())}
+          columnLocation={columnOrder.indexOf(columnId)}
           {isSelected}
         >
           <HeaderCell {processedColumn} {isSelected} />
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
index 49f8299144..bff522a810 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
@@ -43,6 +43,7 @@
   import type { ExtractColumnsModalController } from './ExtractColumnsModalController';
   import SelectLinkedTable from './SelectLinkedTable.svelte';
   import SuccessToastContent from './SuccessToastContent.svelte';
+  import { currentConnection } from '@mathesar/stores/databases';
 
   const tabularData = getTabularDataStoreFromContext();
 
@@ -164,7 +165,12 @@
           extractedTableName: newTableName,
           newFkColumnName: $newFkColumnName,
         });
-        followUps.push(getTableFromStoreOrApi(response.extracted_table));
+        followUps.push(
+          getTableFromStoreOrApi({
+            connection: $currentConnection,
+            tableOid: response.extracted_table,
+          }),
+        );
         followUps.push(
           $tabularData.refreshAfterColumnExtraction(
             extractedColumnIds,
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
index 13608f4e95..77d3ef30a4 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
@@ -17,7 +17,7 @@
   import { currentSchema } from '@mathesar/stores/schemas';
   import type { RecordRow, TabularData } from '@mathesar/stores/table-data';
   import { renderRecordSummaryForRow } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
-  import { saveRecordSummaryTemplate } from '@mathesar/stores/tables';
+  import { updateTable } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { getErrorMessage } from '@mathesar/utils/errors';
@@ -41,8 +41,8 @@
   $: ({ columns } = columnsDataStore);
   $: ({ savedRecords, recordSummaries } = recordsData);
   $: firstRow = $savedRecords[0] as RecordRow | undefined;
-  $: initialCustomized = table.settings.preview_settings.customized ?? false;
-  $: initialTemplate = table.settings.preview_settings.template ?? '';
+  $: initialCustomized = table.metadata.record_summary_customized ?? false;
+  $: initialTemplate = table.metadata.record_summary_template ?? '';
   $: customized = requiredField(initialCustomized);
   $: customizedDisabled = customized.disabled;
   $: template = optionalField(initialTemplate, [hasColumnReferences($columns)]);
@@ -76,7 +76,13 @@
       if (!database) {
         throw new Error('Current database not found');
       }
-      await saveRecordSummaryTemplate(database, table, $form.values);
+      await updateTable(database, {
+        oid: table.oid,
+        metadata: {
+          record_summary_customized: $customized,
+          record_summary_template: $template,
+        },
+      });
     } catch (e) {
       toast.error(`${$_('unable_to_save_changes')} ${getErrorMessage(e)}`);
     }
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
index 80d6f20d14..55873eb052 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
@@ -2,27 +2,32 @@
   import { _ } from 'svelte-i18n';
 
   import EditableTextWithActions from '@mathesar/components/EditableTextWithActions.svelte';
-  import EditTableHOC from '@mathesar/components/EditTableHOC.svelte';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
-  import { currentTablesData } from '@mathesar/stores/tables';
+  import { currentTablesData, updateTable } from '@mathesar/stores/tables';
+  import { currentConnection } from '@mathesar/stores/databases';
 
   const tabularData = getTabularDataStoreFromContext();
 
   export let disabled = false;
+
+  async function handleSave(description: string) {
+    updateTable($currentConnection, {
+      oid: $tabularData.table.oid,
+      description,
+    });
+  }
 </script>
 
-<EditTableHOC let:onUpdate tableId={$tabularData.id}>
-  <div class="update-table-description-property-container">
-    <span class="label">{$_('description')}</span>
-    <EditableTextWithActions
-      initialValue={$currentTablesData.tablesMap.get($tabularData.id)
-        ?.description ?? ''}
-      onSubmit={(description) => onUpdate({ description })}
-      isLongText
-      {disabled}
-    />
-  </div>
-</EditTableHOC>
+<div class="update-table-description-property-container">
+  <span class="label">{$_('description')}</span>
+  <EditableTextWithActions
+    initialValue={$currentTablesData.tablesMap.get($tabularData.id)
+      ?.description ?? ''}
+    onSubmit={handleSave}
+    isLongText
+    {disabled}
+  />
+</div>
 
 <style lang="scss">
   .update-table-description-property-container {
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
index 2a0d4d5b27..ccde5ba3d7 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
@@ -2,31 +2,37 @@
   import { _ } from 'svelte-i18n';
 
   import EditableTextWithActions from '@mathesar/components/EditableTextWithActions.svelte';
-  import EditTableHOC from '@mathesar/components/EditTableHOC.svelte';
+  import { currentConnection } from '@mathesar/stores/databases';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
-  import { currentTablesData } from '@mathesar/stores/tables';
+  import {
+    currentTablesData,
+    factoryToGetTableNameValidationErrors,
+    updateTable,
+  } from '@mathesar/stores/tables';
 
   const tabularData = getTabularDataStoreFromContext();
 
   export let disabled = false;
+
+  $: getNameValidationErrors = factoryToGetTableNameValidationErrors(
+    $currentConnection,
+    $tabularData.table,
+  );
+
+  async function handleSubmit(name: string) {
+    updateTable($currentConnection, { oid: $tabularData.table.oid, name });
+  }
 </script>
 
-<EditTableHOC
-  let:getNameValidationErrors
-  let:onUpdate
-  tableId={$tabularData.id}
->
-  <div class="rename-table-property-container">
-    <span class="label">{$_('name')}</span>
-    <EditableTextWithActions
-      initialValue={$currentTablesData.tablesMap.get($tabularData.id)?.name ??
-        ''}
-      onSubmit={(name) => onUpdate({ name })}
-      getValidationErrors={getNameValidationErrors}
-      {disabled}
-    />
-  </div>
-</EditTableHOC>
+<div class="rename-table-property-container">
+  <span class="label">{$_('name')}</span>
+  <EditableTextWithActions
+    initialValue={$currentTablesData.tablesMap.get($tabularData.id)?.name ?? ''}
+    onSubmit={handleSubmit}
+    getValidationErrors={$getNameValidationErrors}
+    {disabled}
+  />
+</div>
 
 <style lang="scss">
   .rename-table-property-container {
diff --git a/mathesar_ui/src/utils/tables.ts b/mathesar_ui/src/utils/tables.ts
index 717ba284e3..8b49f2fd24 100644
--- a/mathesar_ui/src/utils/tables.ts
+++ b/mathesar_ui/src/utils/tables.ts
@@ -4,46 +4,50 @@ import {
   getTablePageUrl,
 } from '@mathesar/routes/urls';
 import type { ProcessedColumn } from '@mathesar/stores/table-data';
+import { filter } from 'iter-tools';
+
+interface TableWithColumnOrder {
+  metadata?: {
+    column_order: number[] | null;
+  } | null;
+}
+
+interface TableWithImportVerification {
+  metadata?: {
+    import_verified: boolean | null;
+  } | null;
+}
 
 export function isTableImportConfirmationRequired(
-  table: Partial<Pick<Table, 'import_verified' | 'data_files'>>,
+  table: TableWithImportVerification,
 ): boolean {
-  /**
-   * table.import_verified can be null when tables have been
-   * manually added to the db/already present in db in which
-   * case we should not ask for re-confirmation.
-   */
-  return (
-    table.import_verified === false &&
-    table.data_files !== undefined &&
-    table.data_files.length > 0
-  );
+  if (table.metadata?.import_verified === false) {
+    return true;
+  }
+  return false;
 }
 
-export function getColumnOrder(
+function getColumnOrder(
   processedColumns: ProcessedColumn[],
-  table: Partial<Pick<Table, 'settings'>>,
-) {
-  const allColumns = [...processedColumns.values()];
-  let completeColumnOrder: number[] = [];
-  const { settings } = table;
-  if (settings) {
-    const { column_order: columnOrder } = settings;
-    if (columnOrder) {
-      completeColumnOrder = columnOrder;
-    }
-  }
-  allColumns.forEach((column) => {
-    if (!completeColumnOrder.includes(column.id)) {
-      completeColumnOrder.push(column.id);
-    }
-  });
-  return completeColumnOrder;
+  table: TableWithColumnOrder,
+): number[] {
+  /**
+   * The column ids set in metadata. Because this array comes from
+   * loosely-coupled metadata, it might contain ids of columns which no longer
+   * exist, and it might lack ids of columns that do exist.
+   */
+  const orderedIds = new Set(table.metadata?.column_order ?? []);
+  const existingIds = new Set(processedColumns.map((c) => c.id));
+
+  const orderedIdsThatExist = filter((i) => existingIds.has(i), orderedIds);
+  const existingIdsNotOrdered = filter((i) => !orderedIds.has(i), existingIds);
+
+  return [...orderedIdsThatExist, ...existingIdsNotOrdered];
 }
 
 export function orderProcessedColumns(
   processedColumns: Map<number, ProcessedColumn>,
-  table: Partial<Pick<Table, 'settings'>>,
+  table: TableWithColumnOrder,
 ): Map<number, ProcessedColumn> {
   const columns = [...processedColumns.values()];
   const orderedColumns = new Map<number, ProcessedColumn>();
@@ -63,7 +67,7 @@ export function orderProcessedColumns(
 export function getLinkForTableItem(
   connectionId: number,
   schemaId: number,
-  table: Pick<Table, 'oid' | 'import_verified' | 'data_files'>,
+  table: TableWithImportVerification & { oid: Table['oid'] },
 ) {
   if (isTableImportConfirmationRequired(table)) {
     return getImportPreviewPageUrl(connectionId, schemaId, table.oid, {

From f095cbe4b77aac612e25b3650879f888355adc65 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 19 Jul 2024 14:16:01 -0400
Subject: [PATCH 0464/1141] Begin replacing tables REST calls with RPC

---
 mathesar_ui/src/api/rpc/tables.ts             |  12 +-
 mathesar_ui/src/components/AppHeader.svelte   |   4 +-
 .../preview/ImportPreviewContent.svelte       |   9 +-
 .../import/preview/ImportPreviewPage.svelte   |   4 +-
 .../import/upload/ImportUploadPage.svelte     |   4 +-
 mathesar_ui/src/pages/record/RecordStore.ts   |   2 +-
 .../schema/CreateEmptyTableButton.svelte      |   4 +-
 .../pages/schema/CreateNewTableButton.svelte  |   4 +-
 mathesar_ui/src/stores/tables.ts              | 129 +++++++++++-------
 .../src/systems/table-view/TableView.svelte   |   2 +-
 .../record-summary/RecordSummaryConfig.svelte |   4 +-
 11 files changed, 103 insertions(+), 75 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/tables.ts b/mathesar_ui/src/api/rpc/tables.ts
index 2b9b66d2cd..03a3b642f1 100644
--- a/mathesar_ui/src/api/rpc/tables.ts
+++ b/mathesar_ui/src/api/rpc/tables.ts
@@ -16,7 +16,7 @@ interface TableMetadata {
 }
 
 export interface Table extends RawTable {
-  metadata: TableMetadata;
+  metadata: TableMetadata | null;
 }
 
 export const tables = {
@@ -57,12 +57,12 @@ export const tables = {
     {
       database_id: number;
       schema_oid: number;
-      table_name: string;
-      comment: string;
+      table_name?: string;
+      comment?: string;
       /** TODO */
-      column_data_list: unknown;
+      column_data_list?: unknown;
       /** TODO */
-      constraint_data_list: unknown;
+      constraint_data_list?: unknown;
     },
     number
   >(),
@@ -83,7 +83,7 @@ export const tables = {
     {
       database_id: number;
       table_oid: number;
-      cascade: boolean;
+      cascade?: boolean;
     },
     void
   >(),
diff --git a/mathesar_ui/src/components/AppHeader.svelte b/mathesar_ui/src/components/AppHeader.svelte
index bb961de878..17751fee36 100644
--- a/mathesar_ui/src/components/AppHeader.svelte
+++ b/mathesar_ui/src/components/AppHeader.svelte
@@ -60,9 +60,9 @@
       return;
     }
     isCreatingNewEmptyTable = true;
-    const tableInfo = await createTable(database, schema, {});
+    const tableOid = await createTable(database, schema, {});
     isCreatingNewEmptyTable = false;
-    router.goto(getTablePageUrl(database.id, schema.oid, tableInfo.oid), false);
+    router.goto(getTablePageUrl(database.id, schema.oid, tableOid), false);
   }
 </script>
 
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index f0c32b7fe8..7c2cd505f0 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -125,7 +125,10 @@
   }
   $: table, useColumnTypeInference, void init();
 
-  function reload(props: { table?: Table; useColumnTypeInference?: boolean }) {
+  function reload(props: {
+    table?: Pick<Table, 'oid'>;
+    useColumnTypeInference?: boolean;
+  }) {
     const tableId = props.table?.oid ?? table.oid;
     router.goto(
       getImportPreviewPageUrl(database.id, schema.oid, tableId, {
@@ -147,7 +150,7 @@
       customizedTableName: $customizedTableName,
     });
     if (response.resolvedValue) {
-      reload({ table: response.resolvedValue });
+      reload({ table: { oid: response.resolvedValue } });
     }
   }
 
@@ -173,7 +176,7 @@
   }
 
   async function finishImport() {
-    // TODO reimplement patching tables columns with RPC API.
+    // TODO_BETA reimplement patching tables columns with RPC API.
     throw new Error('Not implemented');
 
     // try {
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
index 3b8641bd19..25f296c248 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
@@ -16,6 +16,7 @@
   import ImportPreviewContent from './ImportPreviewContent.svelte';
   import ImportPreviewLayout from './ImportPreviewLayout.svelte';
   import { currentConnection } from '@mathesar/stores/databases';
+  import { isTableImportConfirmationRequired } from '@mathesar/utils/tables';
 
   const tableFetch = new AsyncStore(getTableFromStoreOrApi);
   const dataFileFetch = new AsyncStore(dataFilesApi.get);
@@ -39,7 +40,8 @@
     if (!table) {
       return;
     }
-    if (table.metadata.import_verified) {
+
+    if (!isTableImportConfirmationRequired(table)) {
       redirectToTablePage();
       return;
     }
diff --git a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
index 75896e172a..7d9371bdfb 100644
--- a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
+++ b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
@@ -113,13 +113,13 @@
       if (dataFileId === undefined) {
         return;
       }
-      const table = await createTable(database, schema, {
+      const tableOid = await createTable(database, schema, {
         dataFiles: [dataFileId],
       });
       const previewPage = getImportPreviewPageUrl(
         database.id,
         schema.oid,
-        table.oid,
+        tableOid,
         { useColumnTypeInference: $useColumnTypeInference },
       );
       router.goto(previewPage, true);
diff --git a/mathesar_ui/src/pages/record/RecordStore.ts b/mathesar_ui/src/pages/record/RecordStore.ts
index 188a0a522d..f750d69a32 100644
--- a/mathesar_ui/src/pages/record/RecordStore.ts
+++ b/mathesar_ui/src/pages/record/RecordStore.ts
@@ -46,7 +46,7 @@ export default class RecordStore {
     // until after the service layer changes are made before we can implement
     // this here.
     const template =
-      this.table.metadata.record_summary_template ?? 'TODO_RS_TEMPLATE';
+      this.table.metadata?.record_summary_template ?? 'TODO_RS_TEMPLATE';
     this.summary = derived(
       [this.fieldValues, this.recordSummaries],
       ([fields, fkSummaryData]) =>
diff --git a/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte b/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
index 5ecc9637a2..fc500cb142 100644
--- a/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
+++ b/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
@@ -17,9 +17,9 @@
 
   async function handleCreateEmptyTable() {
     isCreatingNewTable = true;
-    const tableInfo = await createTable(database, schema, {});
+    const tableOid = await createTable(database, schema, {});
     isCreatingNewTable = false;
-    router.goto(getTablePageUrl(database.id, schema.oid, tableInfo.oid), false);
+    router.goto(getTablePageUrl(database.id, schema.oid, tableOid), false);
   }
 </script>
 
diff --git a/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte b/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
index 343b3812a2..52b97f1c12 100644
--- a/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
+++ b/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
@@ -22,9 +22,9 @@
 
   async function handleCreateEmptyTable() {
     isCreatingNewTable = true;
-    const tableInfo = await createTable(database, schema, {});
+    const tableOid = await createTable(database, schema, {});
     isCreatingNewTable = false;
-    router.goto(getTablePageUrl(database.id, schema.oid, tableInfo.oid), false);
+    router.goto(getTablePageUrl(database.id, schema.oid, tableOid), false);
   }
 </script>
 
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index 8878269ac9..65fb4b2094 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -9,6 +9,8 @@
  * sorting.
  */
 
+import { execPipe, filter, map } from 'iter-tools';
+import { _ } from 'svelte-i18n';
 import type { Readable, Writable } from 'svelte/store';
 import { derived, get, readable, writable } from 'svelte/store';
 
@@ -18,30 +20,18 @@ import {
   type RecursivePartial,
 } from '@mathesar-component-library';
 import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
-import type {
-  SplitTableRequest,
-  SplitTableResponse,
-} from '@mathesar/api/rest/types/tables/split_table';
+import type { SplitTableResponse } from '@mathesar/api/rest/types/tables/split_table';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
-import {
-  deleteAPI,
-  getAPI,
-  patchAPI,
-  postAPI,
-} from '@mathesar/api/rest/utils/requestUtils';
+import { api } from '@mathesar/api/rpc';
+import type { Connection } from '@mathesar/api/rpc/connections';
 import type { Schema } from '@mathesar/api/rpc/schemas';
 import type { Table } from '@mathesar/api/rpc/tables';
 import { invalidIf } from '@mathesar/components/form';
+import { TupleMap } from '@mathesar/packages/tuple-map';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import { isTableImportConfirmationRequired } from '@mathesar/utils/tables';
-
-import type { Connection } from '@mathesar/api/rpc/connections';
-import { TupleMap } from '@mathesar/packages/tuple-map';
 import { connectionsStore } from './databases';
 import { addCountToSchemaNumTables, currentSchemaId } from './schemas';
-import { api } from '@mathesar/api/rpc';
-import { execPipe, filter, map } from 'iter-tools';
-import { _ } from 'svelte-i18n';
 
 const commonData = preloadCommonData();
 
@@ -129,9 +119,12 @@ export async function refetchTablesForSchema(
 
     tablesRequests.get([connection.id, schema.oid])?.cancel();
 
-    const tablesRequest = getAPI<Table[]>(
-      `/api/db/v0/tables/?schema=${schema.oid}&limit=500`,
-    );
+    const tablesRequest = api.tables
+      .list_with_metadata({
+        database_id: connection.id,
+        schema_oid: schema.oid,
+      })
+      .run();
     tablesRequests.set([connection.id, schema.oid], tablesRequest);
     const tableEntries = await tablesRequest;
 
@@ -201,11 +194,16 @@ export function deleteTable(
   connection: Connection,
   schema: Schema,
   tableOid: Table['oid'],
-): CancellablePromise<Table> {
-  const promise = deleteAPI<Table>(`/api/db/v0/tables/${tableOid}/`);
+): CancellablePromise<void> {
+  const promise = api.tables
+    .delete({
+      database_id: connection.id,
+      table_oid: tableOid,
+    })
+    .run();
   return new CancellablePromise(
     (resolve, reject) => {
-      void promise.then((table) => {
+      void promise.then(() => {
         addCountToSchemaNumTables(connection, schema, -1);
         tablesStores
           .get([connection.id, schema.oid])
@@ -216,7 +214,7 @@ export function deleteTable(
               tablesMap: new Map(tableStoreData.tablesMap),
             };
           });
-        return resolve(table);
+        return resolve();
       }, reject);
     },
     () => {
@@ -240,26 +238,42 @@ export function createTable(
     name?: string;
     dataFiles?: [number, ...number[]];
   },
-): CancellablePromise<Table> {
-  const promise = postAPI<Table>('/api/db/v0/tables/', {
-    schema: schema.oid,
-    name: tableArgs.name,
-    data_files: tableArgs.dataFiles,
-  });
+): CancellablePromise<Table['oid']> {
+  const promise = api.tables
+    .add({
+      database_id: connection.id,
+      schema_oid: schema.oid,
+      table_name: tableArgs.name ?? '',
+      // TODO_BETA
+      //
+      // Figure out how to create a table with `data_files`. We might need a
+      // separate RPC method for that.
+
+      // data_files: tableArgs.dataFiles,
+    })
+    .run();
   return new CancellablePromise(
     (resolve, reject) => {
-      void promise.then((table) => {
+      void promise.then((tableOid) => {
         addCountToSchemaNumTables(connection, schema, 1);
-        tablesStores.get([connection.id, schema.oid])?.update((existing) => {
-          const tablesMap: TablesMap = new Map();
-          sortTables([...existing.tablesMap.values(), table]).forEach(
-            (entry) => {
-              tablesMap.set(entry.oid, entry);
-            },
-          );
-          return { ...existing, tablesMap };
+        const tablesStore = tablesStores.get([connection.id, schema.oid]);
+        tablesStore?.update((tablesData) => {
+          const table: Table = {
+            oid: tableOid,
+            // TODO_3651: What happens when we create a table without passing a
+            // name. Does the RPC API support this? Should it?
+            name: tableArgs.name ?? '',
+            schema: schema.oid,
+            description: null,
+            metadata: null,
+          };
+          const tables = sortTables([...tablesData.tablesMap.values(), table]);
+          return {
+            ...tablesData,
+            tablesMap: new Map(tables.map((t) => [t.oid, t])),
+          };
         });
-        return resolve(table);
+        return resolve(tableOid);
       }, reject);
     },
     () => {
@@ -279,12 +293,14 @@ export function splitTable({
   extractedTableName: string;
   newFkColumnName?: string;
 }): CancellablePromise<SplitTableResponse> {
-  const body: SplitTableRequest = {
-    extract_columns: idsOfColumnsToExtract,
-    extracted_table_name: extractedTableName,
-    relationship_fk_column_name: newFkColumnName,
-  };
-  return postAPI(`/api/db/v0/tables/${id}/split_table/`, body);
+  throw new Error('Not implemented'); // TODO_BETA
+
+  // const body: SplitTableRequest = {
+  //   extract_columns: idsOfColumnsToExtract,
+  //   extracted_table_name: extractedTableName,
+  //   relationship_fk_column_name: newFkColumnName,
+  // };
+  // return postAPI(`/api/db/v0/tables/${id}/split_table/`, body);
 }
 
 export function moveColumns(
@@ -292,10 +308,12 @@ export function moveColumns(
   idsOfColumnsToMove: number[],
   targetTableId: number,
 ): CancellablePromise<null> {
-  return postAPI(`/api/db/v0/tables/${tableOid}/move_columns/`, {
-    move_columns: idsOfColumnsToMove,
-    target_table: targetTableId,
-  });
+  throw new Error('Not implemented'); // TODO_BETA
+
+  // return postAPI(`/api/db/v0/tables/${tableOid}/move_columns/`, {
+  //   move_columns: idsOfColumnsToMove,
+  //   target_table: targetTableId,
+  // });
 }
 
 export function getTableFromStoreOrApi({
@@ -393,10 +411,15 @@ export const currentTable = derived(
       : $tables.tablesMap.get($currentTableId),
 );
 
-export function getJoinableTablesResult(tableId: number, maxDepth = 1) {
-  return getAPI<JoinableTablesResult>(
-    `/api/db/v0/tables/${tableId}/joinable_tables/?max_depth=${maxDepth}`,
-  );
+export function getJoinableTablesResult(
+  tableId: number,
+  maxDepth = 1,
+): Promise<JoinableTablesResult> {
+  throw new Error('Not implemented'); // TODO_BETA
+
+  // return getAPI<JoinableTablesResult>(
+  //   `/api/db/v0/tables/${tableId}/joinable_tables/?max_depth=${maxDepth}`,
+  // );
 }
 
 export async function refetchTablesForCurrentSchema() {
diff --git a/mathesar_ui/src/systems/table-view/TableView.svelte b/mathesar_ui/src/systems/table-view/TableView.svelte
index 81030731f5..b8a99f1a84 100644
--- a/mathesar_ui/src/systems/table-view/TableView.svelte
+++ b/mathesar_ui/src/systems/table-view/TableView.svelte
@@ -62,7 +62,7 @@
   });
   $: ({ horizontalScrollOffset, scrollOffset, isTableInspectorVisible } =
     display);
-  $: columnOrder = table.metadata.column_order ?? [];
+  $: columnOrder = table.metadata?.column_order ?? [];
   $: hasNewColumnButton = allowsDdlOperations;
   /**
    * These are separate variables for readability and also to keep the door open
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
index 77d3ef30a4..334a3ee080 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
@@ -41,8 +41,8 @@
   $: ({ columns } = columnsDataStore);
   $: ({ savedRecords, recordSummaries } = recordsData);
   $: firstRow = $savedRecords[0] as RecordRow | undefined;
-  $: initialCustomized = table.metadata.record_summary_customized ?? false;
-  $: initialTemplate = table.metadata.record_summary_template ?? '';
+  $: initialCustomized = table.metadata?.record_summary_customized ?? false;
+  $: initialTemplate = table.metadata?.record_summary_template ?? '';
   $: customized = requiredField(initialCustomized);
   $: customizedDisabled = customized.disabled;
   $: template = optionalField(initialTemplate, [hasColumnReferences($columns)]);

From 4f1272a750f3262c682ac632df502ebcfdeb28ab Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 19 Jul 2024 14:16:01 -0400
Subject: [PATCH 0465/1141] Adjust function name

---
 mathesar_ui/src/components/TableName.svelte        |  6 +++---
 .../pages/import/preview/ImportPreviewPage.svelte  |  4 ++--
 mathesar_ui/src/pages/schema/TableCard.svelte      | 14 +++++++-------
 mathesar_ui/src/stores/tables.ts                   |  4 ++--
 mathesar_ui/src/utils/tables.ts                    |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/mathesar_ui/src/components/TableName.svelte b/mathesar_ui/src/components/TableName.svelte
index 72f64baee3..f913b5cde5 100644
--- a/mathesar_ui/src/components/TableName.svelte
+++ b/mathesar_ui/src/components/TableName.svelte
@@ -3,20 +3,20 @@
 
   import type { Table } from '@mathesar/api/rpc/tables';
   import { iconTable } from '@mathesar/icons';
-  import { isTableImportConfirmationRequired } from '@mathesar/utils/tables';
+  import { tableRequiresImportConfirmation } from '@mathesar/utils/tables';
 
   import NameWithIcon from './NameWithIcon.svelte';
 
   interface $$Props extends Omit<ComponentProps<NameWithIcon>, 'icon'> {
     table: Pick<Table, 'name'> &
-      Parameters<typeof isTableImportConfirmationRequired>[0];
+      Parameters<typeof tableRequiresImportConfirmation>[0];
     isLoading?: boolean;
   }
 
   export let table: $$Props['table'];
   export let isLoading = false;
 
-  $: isNotConfirmed = isTableImportConfirmationRequired(table);
+  $: isNotConfirmed = tableRequiresImportConfirmation(table);
 </script>
 
 <NameWithIcon icon={iconTable} {isLoading} {...$$restProps}>
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
index 25f296c248..6e17590869 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
@@ -16,7 +16,7 @@
   import ImportPreviewContent from './ImportPreviewContent.svelte';
   import ImportPreviewLayout from './ImportPreviewLayout.svelte';
   import { currentConnection } from '@mathesar/stores/databases';
-  import { isTableImportConfirmationRequired } from '@mathesar/utils/tables';
+  import { tableRequiresImportConfirmation } from '@mathesar/utils/tables';
 
   const tableFetch = new AsyncStore(getTableFromStoreOrApi);
   const dataFileFetch = new AsyncStore(dataFilesApi.get);
@@ -41,7 +41,7 @@
       return;
     }
 
-    if (!isTableImportConfirmationRequired(table)) {
+    if (!tableRequiresImportConfirmation(table)) {
       redirectToTablePage();
       return;
     }
diff --git a/mathesar_ui/src/pages/schema/TableCard.svelte b/mathesar_ui/src/pages/schema/TableCard.svelte
index 17cdd81952..eb58b09d98 100644
--- a/mathesar_ui/src/pages/schema/TableCard.svelte
+++ b/mathesar_ui/src/pages/schema/TableCard.svelte
@@ -23,7 +23,7 @@
   import { createDataExplorerUrlToExploreATable } from '@mathesar/systems/data-explorer';
   import { getRecordSelectorFromContext } from '@mathesar/systems/record-selector/RecordSelectorController';
   import TableDeleteConfirmationBody from '@mathesar/systems/table-view/table-inspector/table/TableDeleteConfirmationBody.svelte';
-  import { isTableImportConfirmationRequired } from '@mathesar/utils/tables';
+  import { tableRequiresImportConfirmation } from '@mathesar/utils/tables';
   import {
     ButtonMenuItem,
     DropdownMenu,
@@ -45,8 +45,8 @@
   let isHoveringBottomButton = false;
   let isTableCardFocused = false;
 
-  $: isTableImportConfirmationNeeded = isTableImportConfirmationRequired(table);
-  $: tablePageUrl = isTableImportConfirmationNeeded
+  $: requiresImportConfirmation = tableRequiresImportConfirmation(table);
+  $: tablePageUrl = requiresImportConfirmation
     ? getImportPreviewPageUrl(database.id, schema.oid, table.oid, {
         useColumnTypeInference: true,
       })
@@ -87,7 +87,7 @@
   class:focus={isTableCardFocused}
   class:hovering-menu-trigger={isHoveringMenuTrigger}
   class:hovering-bottom-button={isHoveringBottomButton}
-  class:unconfirmed-import={isTableImportConfirmationNeeded}
+  class:unconfirmed-import={requiresImportConfirmation}
 >
   <a
     class="link passthrough"
@@ -114,7 +114,7 @@
       {/if}
     </div>
     <div class="bottom">
-      {#if isTableImportConfirmationNeeded}
+      {#if requiresImportConfirmation}
         {$_('needs_import_confirmation')}
       {/if}
     </div>
@@ -138,7 +138,7 @@
       icon={iconMoreActions}
       size="small"
     >
-      {#if !isTableImportConfirmationNeeded}
+      {#if !requiresImportConfirmation}
         <LinkMenuItem href={explorationPageUrl} icon={iconExploration}>
           {$_('explore_table')}
         </LinkMenuItem>
@@ -159,7 +159,7 @@
       {/if}
     </DropdownMenu>
   </div>
-  {#if !isTableImportConfirmationNeeded}
+  {#if !requiresImportConfirmation}
     <button
       class="bottom-button passthrough"
       on:mouseenter={() => {
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index 65fb4b2094..ec7981cd38 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -29,7 +29,7 @@ import type { Table } from '@mathesar/api/rpc/tables';
 import { invalidIf } from '@mathesar/components/form';
 import { TupleMap } from '@mathesar/packages/tuple-map';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
-import { isTableImportConfirmationRequired } from '@mathesar/utils/tables';
+import { tableRequiresImportConfirmation } from '@mathesar/utils/tables';
 import { connectionsStore } from './databases';
 import { addCountToSchemaNumTables, currentSchemaId } from './schemas';
 
@@ -388,7 +388,7 @@ export const importVerifiedTables: Readable<TablesMap> = derived(
   (tablesData) =>
     new Map(
       [...tablesData.tablesMap.values()]
-        .filter((table) => !isTableImportConfirmationRequired(table))
+        .filter((table) => !tableRequiresImportConfirmation(table))
         .map((table) => [table.oid, table]),
     ),
 );
diff --git a/mathesar_ui/src/utils/tables.ts b/mathesar_ui/src/utils/tables.ts
index 8b49f2fd24..925052655e 100644
--- a/mathesar_ui/src/utils/tables.ts
+++ b/mathesar_ui/src/utils/tables.ts
@@ -18,7 +18,7 @@ interface TableWithImportVerification {
   } | null;
 }
 
-export function isTableImportConfirmationRequired(
+export function tableRequiresImportConfirmation(
   table: TableWithImportVerification,
 ): boolean {
   if (table.metadata?.import_verified === false) {
@@ -69,7 +69,7 @@ export function getLinkForTableItem(
   schemaId: number,
   table: TableWithImportVerification & { oid: Table['oid'] },
 ) {
-  if (isTableImportConfirmationRequired(table)) {
+  if (tableRequiresImportConfirmation(table)) {
     return getImportPreviewPageUrl(connectionId, schemaId, table.oid, {
       useColumnTypeInference: true,
     });

From a30dbd6726f22a192e6ca1a573d54be843432619 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 19 Jul 2024 14:16:01 -0400
Subject: [PATCH 0466/1141] Begin fleshing out updateTable function

---
 mathesar_ui/src/api/rpc/tables.ts             |  4 +-
 .../src/packages/tuple-map/TupleMap.ts        | 10 ++-
 mathesar_ui/src/pages/schema/EditTable.svelte |  2 +-
 mathesar_ui/src/stores/tables.ts              | 72 +++++++++++++------
 mathesar_ui/src/utils/tables.ts               | 40 +++++++++--
 5 files changed, 95 insertions(+), 33 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/tables.ts b/mathesar_ui/src/api/rpc/tables.ts
index 03a3b642f1..11c269cd40 100644
--- a/mathesar_ui/src/api/rpc/tables.ts
+++ b/mathesar_ui/src/api/rpc/tables.ts
@@ -72,8 +72,8 @@ export const tables = {
       database_id: number;
       table_oid: number;
       table_data_dict: {
-        name: string;
-        description: string;
+        name?: string;
+        description?: string | null;
       };
     },
     void
diff --git a/mathesar_ui/src/packages/tuple-map/TupleMap.ts b/mathesar_ui/src/packages/tuple-map/TupleMap.ts
index a760ac67e9..10a1f5994e 100644
--- a/mathesar_ui/src/packages/tuple-map/TupleMap.ts
+++ b/mathesar_ui/src/packages/tuple-map/TupleMap.ts
@@ -39,15 +39,19 @@ export class TupleMap<K extends unknown[], V> {
     return this.map.size;
   }
 
-  get keys(): IterableIterator<K> {
+  keys(): IterableIterator<K> {
     return map(parse, this.map.keys());
   }
 
-  get values(): IterableIterator<V> {
+  values(): IterableIterator<V> {
     return this.map.values();
   }
 
-  get entries() {
+  entries(): IterableIterator<[K, V]> {
     return map(([key, value]) => [parse(key), value], this.map.entries());
   }
+
+  [Symbol.iterator]() {
+    return this.entries();
+  }
 }
diff --git a/mathesar_ui/src/pages/schema/EditTable.svelte b/mathesar_ui/src/pages/schema/EditTable.svelte
index fc3d80d5ca..6d8d52f638 100644
--- a/mathesar_ui/src/pages/schema/EditTable.svelte
+++ b/mathesar_ui/src/pages/schema/EditTable.svelte
@@ -33,7 +33,7 @@
   controller={modalController}
   save={handleSave}
   getNameValidationErrors={$getNameValidationErrors}
-  getInitialName={() => table.name ?? ''}
+  getInitialName={() => table.name}
   getInitialDescription={() => table.description ?? ''}
 >
   <span slot="title" let:initialName>
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index ec7981cd38..06c8cd945e 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -9,7 +9,7 @@
  * sorting.
  */
 
-import { execPipe, filter, map } from 'iter-tools';
+import { execPipe, filter, find, map } from 'iter-tools';
 import { _ } from 'svelte-i18n';
 import type { Readable, Writable } from 'svelte/store';
 import { derived, get, readable, writable } from 'svelte/store';
@@ -17,6 +17,7 @@ import { derived, get, readable, writable } from 'svelte/store';
 import {
   CancellablePromise,
   collapse,
+  defined,
   type RecursivePartial,
 } from '@mathesar-component-library';
 import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
@@ -29,7 +30,10 @@ import type { Table } from '@mathesar/api/rpc/tables';
 import { invalidIf } from '@mathesar/components/form';
 import { TupleMap } from '@mathesar/packages/tuple-map';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
-import { tableRequiresImportConfirmation } from '@mathesar/utils/tables';
+import {
+  mergeTables,
+  tableRequiresImportConfirmation,
+} from '@mathesar/utils/tables';
 import { connectionsStore } from './databases';
 import { addCountToSchemaNumTables, currentSchemaId } from './schemas';
 
@@ -171,23 +175,19 @@ function getTablesStore(
   return store;
 }
 
-function findSchemaStoreForTable(
+function findStoreContainingTable(
+  connection: Pick<Connection, 'id'>,
   tableOid: Table['oid'],
 ): TablesStore | undefined {
-  // TODO_3651 rewrite this function
-  throw new Error('Not implemented');
-}
-
-function findAndUpdateTableStore(tableOid: Table['oid'], newTable: Table) {
-  findSchemaStoreForTable(tableOid)?.update((tablesData) => {
-    const oldTable = tablesData.tablesMap.get(tableOid);
-    tablesData.tablesMap.set(tableOid, { ...(oldTable ?? {}), ...newTable });
-    const tablesMap: TablesMap = new Map();
-    sortTables([...tablesData.tablesMap.values()]).forEach((t) => {
-      tablesMap.set(t.oid, t);
-    });
-    return { ...tablesData, tablesMap };
-  });
+  return defined(
+    find(
+      ([[connectionId], tablesStore]) =>
+        connectionId === connection.id &&
+        get(tablesStore).tablesMap.has(tableOid),
+      tablesStores,
+    ),
+    ([, tablesStore]) => tablesStore,
+  );
 }
 
 export function deleteTable(
@@ -223,12 +223,42 @@ export function deleteTable(
   );
 }
 
+/**
+ *
+ * @throws Error if the table store is not found or if the table is not found in
+ * the store.
+ */
 export async function updateTable(
   connection: Pick<Connection, 'id'>,
   table: RecursivePartial<Table> & { oid: Table['oid'] },
-) {
-  // TODO_3651
-  throw new Error('Not implemented');
+): Promise<void> {
+  await api.tables
+    .patch({
+      database_id: connection.id,
+      table_oid: table.oid,
+      table_data_dict: {
+        name: table.name,
+        description: table.description,
+      },
+    })
+    .run();
+
+  // TODO_BETA: also run tables.metadata.patch to handle updates to
+  // `table.metadata`. Run both API calls as one RPC batch request.
+
+  const tableStore = findStoreContainingTable(connection, table.oid);
+  if (!tableStore) throw new Error('Table store not found');
+  tableStore.update((tablesData) => {
+    const oldTable = tablesData.tablesMap.get(table.oid);
+    if (!oldTable) throw new Error('Table not found within store.');
+    const newTable = mergeTables(oldTable, table);
+    tablesData.tablesMap.set(table.oid, newTable);
+    const tablesMap: TablesMap = new Map();
+    sortTables([...tablesData.tablesMap.values()]).forEach((t) => {
+      tablesMap.set(t.oid, t);
+    });
+    return { ...tablesData, tablesMap };
+  });
 }
 
 export function createTable(
@@ -323,7 +353,7 @@ export function getTableFromStoreOrApi({
   connection: Pick<Connection, 'id'>;
   tableOid: Table['oid'];
 }): CancellablePromise<Table> {
-  const tablesStore = findSchemaStoreForTable(tableOid);
+  const tablesStore = findStoreContainingTable(connection, tableOid);
   if (tablesStore) {
     const table = get(tablesStore).tablesMap.get(tableOid);
     if (table) {
diff --git a/mathesar_ui/src/utils/tables.ts b/mathesar_ui/src/utils/tables.ts
index 925052655e..9385168ecb 100644
--- a/mathesar_ui/src/utils/tables.ts
+++ b/mathesar_ui/src/utils/tables.ts
@@ -1,15 +1,37 @@
+import { filter } from 'iter-tools';
+
 import type { Table } from '@mathesar/api/rpc/tables';
+import { type RecursivePartial } from '@mathesar/component-library';
 import {
   getImportPreviewPageUrl,
   getTablePageUrl,
 } from '@mathesar/routes/urls';
-import type { ProcessedColumn } from '@mathesar/stores/table-data';
-import { filter } from 'iter-tools';
+import { type ProcessedColumn } from '@mathesar/stores/table-data';
 
-interface TableWithColumnOrder {
-  metadata?: {
-    column_order: number[] | null;
-  } | null;
+export function mergeTableMetadata(
+  a: Table['metadata'],
+  b?: RecursivePartial<Table['metadata']>,
+): Table['metadata'] {
+  if (!a && !b) return null;
+  if (!b) return a;
+  return {
+    column_order: b.column_order
+      ? b.column_order.map(Number)
+      : a?.column_order ?? null,
+    import_verified: a?.import_verified ?? b.import_verified ?? null,
+    record_summary_customized:
+      a?.record_summary_customized ?? b.record_summary_customized ?? null,
+    record_summary_template:
+      a?.record_summary_template ?? b.record_summary_template ?? null,
+  };
+}
+
+export function mergeTables(a: Table, b: RecursivePartial<Table>): Table {
+  return {
+    ...a,
+    ...b,
+    metadata: mergeTableMetadata(a.metadata, b.metadata),
+  };
 }
 
 interface TableWithImportVerification {
@@ -27,6 +49,12 @@ export function tableRequiresImportConfirmation(
   return false;
 }
 
+interface TableWithColumnOrder {
+  metadata?: {
+    column_order: number[] | null;
+  } | null;
+}
+
 function getColumnOrder(
   processedColumns: ProcessedColumn[],
   table: TableWithColumnOrder,

From c273a497f4f6d87199576b4aa5e8603acd7e4253 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 19 Jul 2024 14:16:01 -0400
Subject: [PATCH 0467/1141] Add code comment

---
 mathesar_ui/src/utils/tables.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mathesar_ui/src/utils/tables.ts b/mathesar_ui/src/utils/tables.ts
index 9385168ecb..da6d74c936 100644
--- a/mathesar_ui/src/utils/tables.ts
+++ b/mathesar_ui/src/utils/tables.ts
@@ -8,7 +8,7 @@ import {
 } from '@mathesar/routes/urls';
 import { type ProcessedColumn } from '@mathesar/stores/table-data';
 
-export function mergeTableMetadata(
+function mergeTableMetadata(
   a: Table['metadata'],
   b?: RecursivePartial<Table['metadata']>,
 ): Table['metadata'] {
@@ -27,6 +27,11 @@ export function mergeTableMetadata(
 }
 
 export function mergeTables(a: Table, b: RecursivePartial<Table>): Table {
+  // I don't love this function, but for now it works. It seems like we ought to
+  // have a more generic way to do this sort of thing, perhaps with a library,
+  // perhaps with JSON serialization. It's kind of hard do find a type-safe
+  // approach that's compatible with our RecursivePartial type. I'm open to more
+  // generalized ways of doing this!
   return {
     ...a,
     ...b,

From ca7340b8e13b28e827e971e3d411a6eac530f611 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 19 Jul 2024 14:32:23 -0400
Subject: [PATCH 0468/1141] Handle API errors in front end when patching table

---
 mathesar_ui/src/pages/schema/EditTable.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar_ui/src/pages/schema/EditTable.svelte b/mathesar_ui/src/pages/schema/EditTable.svelte
index 6d8d52f638..4378036e06 100644
--- a/mathesar_ui/src/pages/schema/EditTable.svelte
+++ b/mathesar_ui/src/pages/schema/EditTable.svelte
@@ -21,7 +21,7 @@
   );
 
   async function handleSave(name: string, description: string) {
-    updateTable($currentConnection, {
+    await updateTable($currentConnection, {
       oid: table.oid,
       name,
       description,

From bbab92d5751782fdf3991abfc34d9346700237e5 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 19 Jul 2024 14:45:08 -0400
Subject: [PATCH 0469/1141] Fix linting errors

---
 mathesar_ui/src/packages/tuple-map/TupleMap.ts  |  8 ++++----
 .../import/preview/ImportPreviewContent.svelte  | 13 +++++++------
 .../import/preview/ImportPreviewPage.svelte     |  4 ++--
 mathesar_ui/src/pages/schema/EditTable.svelte   |  2 +-
 mathesar_ui/src/stores/tables.ts                | 17 +++++++++--------
 .../src/systems/data-explorer/QueryManager.ts   |  4 ++--
 .../src/systems/table-view/header/Header.svelte |  2 +-
 .../table-view/link-table/LinkTableForm.svelte  |  2 +-
 .../ExtractColumnsModal.svelte                  |  2 +-
 .../table-inspector/table/TableActions.svelte   |  2 +-
 .../table/TableDescription.svelte               |  4 ++--
 .../table-inspector/table/TableName.svelte      |  5 ++++-
 mathesar_ui/src/utils/tables.ts                 |  4 ++--
 13 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/mathesar_ui/src/packages/tuple-map/TupleMap.ts b/mathesar_ui/src/packages/tuple-map/TupleMap.ts
index 10a1f5994e..40a2b8faf4 100644
--- a/mathesar_ui/src/packages/tuple-map/TupleMap.ts
+++ b/mathesar_ui/src/packages/tuple-map/TupleMap.ts
@@ -1,10 +1,10 @@
 import { map } from 'iter-tools';
 
-function parse(key: string) {
-  return JSON.parse(key);
+function parse<T>(key: string): T {
+  return JSON.parse(key) as T;
 }
 
-function serialize(keys: unknown[]) {
+function serialize(keys: unknown[]): string {
   return JSON.stringify(keys);
 }
 
@@ -40,7 +40,7 @@ export class TupleMap<K extends unknown[], V> {
   }
 
   keys(): IterableIterator<K> {
-    return map(parse, this.map.keys());
+    return map((k) => parse(k), this.map.keys());
   }
 
   values(): IterableIterator<V> {
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index 7c2cd505f0..68a3465a1a 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -2,14 +2,10 @@
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
 
-  import {
-    CancellablePromise,
-    CancelOrProceedButtonPair,
-    Spinner,
-  } from '@mathesar-component-library';
   import { columnsApi } from '@mathesar/api/rest/columns';
   import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
   import type { Column } from '@mathesar/api/rest/types/tables/columns';
+  import { getAPI, postAPI } from '@mathesar/api/rest/utils/requestUtils';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Table } from '@mathesar/api/rpc/tables';
   import type { Database } from '@mathesar/AppTypes';
@@ -31,11 +27,16 @@
   import AsyncStore from '@mathesar/stores/AsyncStore';
   import { currentTables } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
+  import {
+    CancelOrProceedButtonPair,
+    CancellablePromise,
+    Spinner,
+  } from '@mathesar-component-library';
 
   import ColumnNamingStrategyInput from '../column-names/ColumnNamingStrategyInput.svelte';
   import ColumnTypeInferenceInput from '../inference/ColumnTypeInferenceInput.svelte';
 
-  import { getAPI, postAPI } from '@mathesar/api/rest/utils/requestUtils';
+
   import ErrorInfo from './ErrorInfo.svelte';
   import ImportPreviewLayout from './ImportPreviewLayout.svelte';
   import {
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
index 6e17590869..848d444632 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
@@ -9,14 +9,14 @@
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { getTablePageUrl } from '@mathesar/routes/urls';
   import AsyncStore from '@mathesar/stores/AsyncStore';
+  import { currentConnection } from '@mathesar/stores/databases';
   import { getTableFromStoreOrApi } from '@mathesar/stores/tables';
   import { getErrorMessage } from '@mathesar/utils/errors';
+  import { tableRequiresImportConfirmation } from '@mathesar/utils/tables';
   import { Spinner } from '@mathesar-component-library';
 
   import ImportPreviewContent from './ImportPreviewContent.svelte';
   import ImportPreviewLayout from './ImportPreviewLayout.svelte';
-  import { currentConnection } from '@mathesar/stores/databases';
-  import { tableRequiresImportConfirmation } from '@mathesar/utils/tables';
 
   const tableFetch = new AsyncStore(getTableFromStoreOrApi);
   const dataFileFetch = new AsyncStore(dataFilesApi.get);
diff --git a/mathesar_ui/src/pages/schema/EditTable.svelte b/mathesar_ui/src/pages/schema/EditTable.svelte
index 4378036e06..8621503f63 100644
--- a/mathesar_ui/src/pages/schema/EditTable.svelte
+++ b/mathesar_ui/src/pages/schema/EditTable.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { ModalController } from '@mathesar-component-library';
   import type { Table } from '@mathesar/api/rpc/tables';
   import Identifier from '@mathesar/components/Identifier.svelte';
   import NameAndDescInputModalForm from '@mathesar/components/NameAndDescInputModalForm.svelte';
@@ -11,6 +10,7 @@
     factoryToGetTableNameValidationErrors,
     updateTable,
   } from '@mathesar/stores/tables';
+  import type { ModalController } from '@mathesar-component-library';
 
   export let table: Table;
   export let modalController: ModalController;
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index 06c8cd945e..e69e6ae2e9 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -10,16 +10,10 @@
  */
 
 import { execPipe, filter, find, map } from 'iter-tools';
-import { _ } from 'svelte-i18n';
 import type { Readable, Writable } from 'svelte/store';
 import { derived, get, readable, writable } from 'svelte/store';
+import { _ } from 'svelte-i18n';
 
-import {
-  CancellablePromise,
-  collapse,
-  defined,
-  type RecursivePartial,
-} from '@mathesar-component-library';
 import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
 import type { SplitTableResponse } from '@mathesar/api/rest/types/tables/split_table';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
@@ -34,6 +28,13 @@ import {
   mergeTables,
   tableRequiresImportConfirmation,
 } from '@mathesar/utils/tables';
+import {
+  CancellablePromise,
+  type RecursivePartial,
+  collapse,
+  defined,
+} from '@mathesar-component-library';
+
 import { connectionsStore } from './databases';
 import { addCountToSchemaNumTables, currentSchemaId } from './schemas';
 
@@ -111,7 +112,7 @@ export async function refetchTablesForSchema(
     // TODO: why are we logging an error here? I would expect that we'd either
     // throw or ignore. If there's a reason for this logging, please add a code
     // comment explaining why.
-    console.error(`Tables store not found.`);
+    console.error('Tables store not found.');
     return undefined;
   }
 
diff --git a/mathesar_ui/src/systems/data-explorer/QueryManager.ts b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
index 37209feaa2..52ee117114 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryManager.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
@@ -9,8 +9,10 @@ import type {
 import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { getAPI } from '@mathesar/api/rest/utils/requestUtils';
+import { api } from '@mathesar/api/rpc';
 import type { Table } from '@mathesar/api/rpc/tables';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
+import { connectionsStore } from '@mathesar/stores/databases';
 import { createQuery, putQuery } from '@mathesar/stores/queries';
 import CacheManager from '@mathesar/utils/CacheManager';
 import type { CancellablePromise } from '@mathesar-component-library';
@@ -26,8 +28,6 @@ import {
   getColumnInformationMap,
   getTablesThatReferenceBaseTable,
 } from './utils';
-import { api } from '@mathesar/api/rpc';
-import { connectionsStore } from '@mathesar/stores/databases';
 
 export default class QueryManager extends QueryRunner {
   private undoRedoManager: QueryUndoRedoManager;
diff --git a/mathesar_ui/src/systems/table-view/header/Header.svelte b/mathesar_ui/src/systems/table-view/header/Header.svelte
index 9a2042a9bd..6e0b318e94 100644
--- a/mathesar_ui/src/systems/table-view/header/Header.svelte
+++ b/mathesar_ui/src/systems/table-view/header/Header.svelte
@@ -10,6 +10,7 @@
     SheetHeader,
   } from '@mathesar/components/sheet';
   import SheetOriginCell from '@mathesar/components/sheet/cells/SheetOriginCell.svelte';
+  import { currentConnection } from '@mathesar/stores/databases';
   import type { ProcessedColumn } from '@mathesar/stores/table-data';
   import {
     ID_ADD_NEW_COLUMN,
@@ -22,7 +23,6 @@
   import ColumnHeaderContextMenu from './header-cell/ColumnHeaderContextMenu.svelte';
   import HeaderCell from './header-cell/HeaderCell.svelte';
   import NewColumnCell from './new-column-cell/NewColumnCell.svelte';
-  import { currentConnection } from '@mathesar/stores/databases';
 
   const tabularData = getTabularDataStoreFromContext();
 
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index bf2326e8d1..a03a1b3baa 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -23,9 +23,9 @@
     getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
   import {
+    currentTables,
     importVerifiedTables as importVerifiedTablesStore,
     refetchTablesForCurrentSchema,
-    currentTables,
     validateNewTableName,
   } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
index bff522a810..07780ad57e 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
@@ -16,6 +16,7 @@
   import SelectProcessedColumns from '@mathesar/components/SelectProcessedColumns.svelte';
   import { scrollBasedOnSelection } from '@mathesar/components/sheet';
   import TableName from '@mathesar/components/TableName.svelte';
+  import { currentConnection } from '@mathesar/stores/databases';
   import {
     type ProcessedColumn,
     getTabularDataStoreFromContext,
@@ -43,7 +44,6 @@
   import type { ExtractColumnsModalController } from './ExtractColumnsModalController';
   import SelectLinkedTable from './SelectLinkedTable.svelte';
   import SuccessToastContent from './SuccessToastContent.svelte';
-  import { currentConnection } from '@mathesar/stores/databases';
 
   const tabularData = getTabularDataStoreFromContext();
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
index 75b222ad5a..676b7fbcf0 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
@@ -10,8 +10,8 @@
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import {
     currentTable,
-    deleteTable,
     currentTablesData,
+    deleteTable,
   } from '@mathesar/stores/tables';
   import {
     constructDataExplorerUrlToSummarizeFromGroup,
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
index 55873eb052..82fe5b69ce 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
@@ -2,16 +2,16 @@
   import { _ } from 'svelte-i18n';
 
   import EditableTextWithActions from '@mathesar/components/EditableTextWithActions.svelte';
+  import { currentConnection } from '@mathesar/stores/databases';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import { currentTablesData, updateTable } from '@mathesar/stores/tables';
-  import { currentConnection } from '@mathesar/stores/databases';
 
   const tabularData = getTabularDataStoreFromContext();
 
   export let disabled = false;
 
   async function handleSave(description: string) {
-    updateTable($currentConnection, {
+    await updateTable($currentConnection, {
       oid: $tabularData.table.oid,
       description,
     });
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
index ccde5ba3d7..464a10d95e 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
@@ -20,7 +20,10 @@
   );
 
   async function handleSubmit(name: string) {
-    updateTable($currentConnection, { oid: $tabularData.table.oid, name });
+    await updateTable($currentConnection, {
+      oid: $tabularData.table.oid,
+      name,
+    });
   }
 </script>
 
diff --git a/mathesar_ui/src/utils/tables.ts b/mathesar_ui/src/utils/tables.ts
index da6d74c936..488950e928 100644
--- a/mathesar_ui/src/utils/tables.ts
+++ b/mathesar_ui/src/utils/tables.ts
@@ -1,12 +1,12 @@
 import { filter } from 'iter-tools';
 
 import type { Table } from '@mathesar/api/rpc/tables';
-import { type RecursivePartial } from '@mathesar/component-library';
+import type { RecursivePartial } from '@mathesar/component-library';
 import {
   getImportPreviewPageUrl,
   getTablePageUrl,
 } from '@mathesar/routes/urls';
-import { type ProcessedColumn } from '@mathesar/stores/table-data';
+import type { ProcessedColumn } from '@mathesar/stores/table-data';
 
 function mergeTableMetadata(
   a: Table['metadata'],

From 6bc9d2642e9396d64464001225cfbe465b70f29a Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Sun, 21 Jul 2024 16:52:57 -0400
Subject: [PATCH 0470/1141] Fix return type error when defining SQL function

- get_constraints_for_table had previously been defined with a different return type.
---
 db/sql/00_msar.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 1c73adc5db..a7c3a1ae53 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -517,6 +517,7 @@ END;
 $$ LANGUAGE SQL;
 
 
+DROP FUNCTION IF EXISTS msar.get_constraints_for_table(oid);
 CREATE OR REPLACE FUNCTION msar.get_constraints_for_table(tab_id oid) RETURNS TABLE
 (
   oid oid,

From ecc9cdedcc3c6115a3d7552cc1f02d5131617502 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Sun, 21 Jul 2024 14:04:35 -0400
Subject: [PATCH 0471/1141] Convert table patch data to JSON before send to
 psycopg

---
 db/tables/operations/alter.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/db/tables/operations/alter.py b/db/tables/operations/alter.py
index d1d554bc29..72c72ca514 100644
--- a/db/tables/operations/alter.py
+++ b/db/tables/operations/alter.py
@@ -1,4 +1,6 @@
 """The functions in this module wrap SQL functions that use `ALTER TABLE`."""
+import json
+
 from db import constants
 from db import connection as db_conn
 from db.columns.operations.alter import batch_update_columns
@@ -66,7 +68,7 @@ def alter_table_on_database(table_oid, table_data_dict, conn):
     }
     """
     return db_conn.exec_msar_func(
-        conn, 'alter_table', table_oid, table_data_dict
+        conn, 'alter_table', table_oid, json.dumps(table_data_dict)
     ).fetchone()[0]
 
 

From f66bc48cf934c8a09abf3a82360fcd7cdae05e45 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Sun, 21 Jul 2024 16:32:58 -0400
Subject: [PATCH 0472/1141] Refactor __msar out of rename_table DB functions

---
 db/sql/00_msar.sql | 38 ++++++++++++--------------------------
 1 file changed, 12 insertions(+), 26 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 1c73adc5db..da6bd5da3c 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1170,24 +1170,25 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 -- Rename table ------------------------------------------------------------------------------------
 
+DROP FUNCTION IF EXISTS msar.rename_table(text, text, text);
 CREATE OR REPLACE FUNCTION
-__msar.rename_table(old_tab_name text, new_tab_name text) RETURNS text AS $$/*
+msar.rename_table(sch_name text, old_tab_name text, new_tab_name text) RETURNS void AS $$/*
 Change a table's name, returning the command executed.
 
 Args:
-  old_tab_name: properly quoted, qualified table name
-  new_tab_name: properly quoted, unqualified table name
+  sch_name: unquoted schema name where the table lives
+  old_tab_name: unquoted, unqualified original table name
+  new_tab_name: unquoted, unqualified new table name
 */
 BEGIN
-  RETURN __msar.exec_ddl(
-    'ALTER TABLE %s RENAME TO %s', old_tab_name, new_tab_name
-  );
+  EXECUTE format('ALTER TABLE %I.%I RENAME TO %I', sch_name, old_tab_name, new_tab_name);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
+DROP FUNCTION IF EXISTS msar.rename_table(oid, text);
 CREATE OR REPLACE FUNCTION
-msar.rename_table(tab_id oid, new_tab_name text) RETURNS text AS $$/*
+msar.rename_table(tab_id oid, new_tab_name text) RETURNS void AS $$/*
 Change a table's name, returning the command executed.
 
 Args:
@@ -1195,30 +1196,15 @@ Args:
   new_tab_name: unquoted, unqualified table name
 */
 BEGIN
-  RETURN __msar.rename_table(
-    __msar.get_qualified_relation_name_or_null(tab_id),
-    quote_ident(new_tab_name)
+  PERFORM msar.rename_table(
+    msar.get_relation_schema_name(tab_id),
+    msar.get_relation_name(tab_id),
+    new_tab_name
   );
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
-CREATE OR REPLACE FUNCTION
-msar.rename_table(sch_name text, old_tab_name text, new_tab_name text) RETURNS text AS $$/*
-Change a table's name, returning the command executed.
-
-Args:
-  sch_name: unquoted schema name where the table lives
-  old_tab_name: unquoted, unqualified original table name
-  new_tab_name: unquoted, unqualified new table name
-*/
-DECLARE fullname text;
-BEGIN
-  fullname := __msar.build_qualified_name_sql(sch_name, old_tab_name);
-  RETURN __msar.rename_table(fullname, quote_ident(new_tab_name));
-END;
-$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
-
 
 -- Comment on table --------------------------------------------------------------------------------
 

From da89d221c04404b5c96f2d0d7460a838a8a40198 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Sun, 21 Jul 2024 16:49:42 -0400
Subject: [PATCH 0473/1141] Fix error on rename table to same name

---
 db/sql/00_msar.sql      |  4 ++++
 db/sql/test_00_msar.sql | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index da6bd5da3c..3522f5cd8d 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1181,6 +1181,10 @@ Args:
   new_tab_name: unquoted, unqualified new table name
 */
 BEGIN
+  IF old_tab_name = new_tab_name THEN
+    -- Return early if the names are the same. This avoids an error from Postgres.
+    RETURN;
+  END IF;
   EXECUTE format('ALTER TABLE %I.%I RENAME TO %I', sch_name, old_tab_name, new_tab_name);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 91efd314ab..9bfaff637d 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -1370,6 +1370,19 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+CREATE OR REPLACE FUNCTION test_rename_table_with_same_name() RETURNS SETOF TEXT AS $$
+BEGIN
+  PERFORM __setup_alter_table();
+  PERFORM msar.rename_table(
+    sch_name =>'public',
+    old_tab_name => 'alter_this_table',
+    new_tab_name => 'alter_this_table'
+  );
+  RETURN NEXT has_table('alter_this_table');
+END;
+$$ LANGUAGE plpgsql;
+
+
 CREATE OR REPLACE FUNCTION test_rename_table_using_oid() RETURNS SETOF TEXT AS $$
 BEGIN
   PERFORM __setup_alter_table();

From 17b40e45b0bfb2a4f453cba1551989cbf1400087 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Sun, 21 Jul 2024 17:11:16 -0400
Subject: [PATCH 0474/1141] Run prettier

---
 mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index 68a3465a1a..91582ac601 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -36,7 +36,6 @@
   import ColumnNamingStrategyInput from '../column-names/ColumnNamingStrategyInput.svelte';
   import ColumnTypeInferenceInput from '../inference/ColumnTypeInferenceInput.svelte';
 
-
   import ErrorInfo from './ErrorInfo.svelte';
   import ImportPreviewLayout from './ImportPreviewLayout.svelte';
   import {

From 05d9e5d23dba0fd0f5486869e25c416d3e0182cc Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Sun, 21 Jul 2024 20:43:42 -0400
Subject: [PATCH 0475/1141] Fix small TODOs

---
 mathesar_ui/src/stores/tables.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index e69e6ae2e9..64ce6cdf46 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -163,8 +163,11 @@ function getTablesStore(
       tablesMap: new Map(),
     });
     tablesStores.set([connection.id, schema.oid], store);
-    // TODO_3651: add condition for current connection as well as current schema
-    if (preload && commonData.current_schema === schema.oid) {
+    if (
+      preload &&
+      commonData.current_schema === schema.oid &&
+      commonData.current_connection === connection.id
+    ) {
       store = setTablesStore(connection, schema, commonData.tables ?? []);
     } else {
       void refetchTablesForSchema(connection, schema);
@@ -291,7 +294,7 @@ export function createTable(
         tablesStore?.update((tablesData) => {
           const table: Table = {
             oid: tableOid,
-            // TODO_3651: What happens when we create a table without passing a
+            // TODO_BETA: What happens when we create a table without passing a
             // name. Does the RPC API support this? Should it?
             name: tableArgs.name ?? '',
             schema: schema.oid,

From b16958b8dcf0e015f2b61a232205ce8a214d5b03 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 22 Jul 2024 14:08:22 +0800
Subject: [PATCH 0476/1141] add composition test for filtering, fix composition

---
 db/sql/00_msar.sql      |  4 +--
 db/sql/test_00_msar.sql | 63 +++++++++++++++++++++++++++++++++++++----
 2 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 4961aee44a..d92ee1e467 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3313,8 +3313,8 @@ DROP TABLE IF EXISTS msar.filter_templates;
 CREATE TABLE msar.filter_templates (filter_key text PRIMARY KEY, filter_template text);
 INSERT INTO msar.filter_templates VALUES
   -- basic composition operators
-  ('and', '%s AND %s'),
-  ('or', '%s OR %s'),
+  ('and', '(%s) AND (%s)'),
+  ('or', '(%s) OR (%s)'),
   -- general comparison operators
   ('equal', '%s = %s'),
   ('lesser', '%s < %s'),
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 15e346886d..83ab687427 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2885,7 +2885,14 @@ BEGIN
         {"1": 2, "2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]},
         {"1": 3, "2": 2, "3": "abcde", "4": {"k": 3242348}, "5": true}
       ]
-    }$j$
+    }$j$ || jsonb_build_object(
+      'query', concat(
+        'SELECT msar.format_data(id) AS "1", msar.format_data(col1) AS "2",'
+        ' msar.format_data(col2) AS "3", msar.format_data(col3) AS "4",'
+        ' msar.format_data(col4) AS "5" FROM public.atable'
+        '  ORDER BY "1" ASC LIMIT NULL OFFSET NULL'
+      )
+    )
   );
   RETURN NEXT is(
     msar.list_records_from_table(
@@ -2897,7 +2904,14 @@ BEGIN
         {"1": 2, "2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]},
         {"1": 1, "2": 5, "3": "sdflkj", "4": "s", "5": {"a": "val"}}
       ]
-    }$j$
+    }$j$ || jsonb_build_object(
+      'query', concat(
+        'SELECT msar.format_data(id) AS "1", msar.format_data(col1) AS "2",'
+        ' msar.format_data(col2) AS "3", msar.format_data(col3) AS "4",'
+        ' msar.format_data(col4) AS "5" FROM public.atable'
+        '  ORDER BY "2" DESC, "1" ASC LIMIT ''2'' OFFSET NULL'
+      )
+    )
   );
   RETURN NEXT is(
     msar.list_records_from_table(
@@ -2909,7 +2923,14 @@ BEGIN
         {"1": 2, "2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]},
         {"1": 1, "2": 5, "3": "sdflkj", "4": "s", "5": {"a": "val"}}
       ]
-    }$j$
+    }$j$ || jsonb_build_object(
+      'query', concat(
+        'SELECT msar.format_data(id) AS "1", msar.format_data(col1) AS "2",',
+        ' msar.format_data(col2) AS "3", msar.format_data(col3) AS "4",',
+        ' msar.format_data(col4) AS "5" FROM public.atable',
+        '  ORDER BY "1" DESC, "1" ASC LIMIT NULL OFFSET ''1'''
+      )
+    )
   );
   CREATE ROLE intern_no_pkey;
   GRANT USAGE ON SCHEMA msar, __msar TO intern_no_pkey;
@@ -2925,7 +2946,13 @@ BEGIN
         {"2": 5, "3": "sdflkj", "4": "s", "5": {"a": "val"}},
         {"2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]}
       ]
-    }$j$
+    }$j$ || jsonb_build_object(
+      'query', concat(
+        'SELECT msar.format_data(col1) AS "2", msar.format_data(col2) AS "3",',
+        ' msar.format_data(col3) AS "4", msar.format_data(col4) AS "5" FROM public.atable',
+        '  ORDER BY "2" ASC, "3" ASC, "5" ASC LIMIT NULL OFFSET NULL'
+      )
+    )
   );
   RETURN NEXT is(
     msar.list_records_from_table(
@@ -2938,7 +2965,13 @@ BEGIN
         {"2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]},
         {"2": 2, "3": "abcde", "4": {"k": 3242348}, "5": true}
       ]
-    }$j$
+    }$j$ || jsonb_build_object(
+      'query', concat(
+        'SELECT msar.format_data(col1) AS "2", msar.format_data(col2) AS "3",',
+        ' msar.format_data(col3) AS "4", msar.format_data(col4) AS "5" FROM public.atable',
+        '  ORDER BY "3" DESC, "2" ASC, "3" ASC, "5" ASC LIMIT NULL OFFSET NULL'
+      )
+    )
   );
 END;
 $$ LANGUAGE plpgsql;
@@ -3165,5 +3198,25 @@ BEGIN
           jsonb_build_object('type', 'literal', 'value', 'mail')))),
     'mathesar_types.email_domain_name(col1) LIKE ''%'' || ''mail'' || ''%'''
   );
+  RETURN NEXT is(
+    msar.build_filter_expr(
+      rel_id,
+      jsonb_build_object(
+        'type', 'or', 'args', jsonb_build_array(
+          jsonb_build_object(
+            'type', 'email_domain_contains', 'args', jsonb_build_array(
+              jsonb_build_object('type', 'column_id', 'value', 2),
+              jsonb_build_object('type', 'literal', 'value', 'mail'))
+          ),
+          jsonb_build_object(
+            'type', 'equal', 'args', jsonb_build_array(
+              jsonb_build_object('type', 'column_id', 'value', 3),
+              jsonb_build_object('type', 'literal', 'value', 500))
+          )
+        )
+      )
+    ),
+    '(mathesar_types.email_domain_name(col1) LIKE ''%'' || ''mail'' || ''%'') OR (col2 = ''500'')'
+  );
 END;
 $$ LANGUAGE plpgsql;

From 2a152b09a35a8af6876bc0ed3e5b3974bb8f133c Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 22 Jul 2024 14:40:07 +0800
Subject: [PATCH 0477/1141] add more complex composition example

---
 db/sql/test_00_msar.sql | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 83ab687427..91927a0211 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -3218,5 +3218,34 @@ BEGIN
     ),
     '(mathesar_types.email_domain_name(col1) LIKE ''%'' || ''mail'' || ''%'') OR (col2 = ''500'')'
   );
+  RETURN NEXT is(
+    msar.build_filter_expr(
+      rel_id,
+      jsonb_build_object(
+        'type', 'or', 'args', jsonb_build_array(
+          jsonb_build_object(
+            'type', 'and', 'args', jsonb_build_array(
+              jsonb_build_object(
+                'type', 'equal', 'args', jsonb_build_array(
+                  jsonb_build_object('type', 'column_id', 'value', 3),
+                  jsonb_build_object('type', 'literal', 'value', 500))
+              ),
+              jsonb_build_object(
+                'type', 'lesser', 'args', jsonb_build_array(
+                  jsonb_build_object('type', 'column_id', 'value', 4),
+                  jsonb_build_object('type', 'literal', 'value', 'abcde'))
+              )
+            )
+          ),
+          jsonb_build_object(
+            'type', 'greater', 'args', jsonb_build_array(
+              jsonb_build_object('type', 'column_id', 'value', 1),
+              jsonb_build_object('type', 'literal', 'value', 20))
+          )
+        )
+      )
+    ),
+    '((col2 = ''500'') AND (col3 < ''abcde'')) OR (id > ''20'')'
+  );
 END;
 $$ LANGUAGE plpgsql;

From 0380f324042c7dace4bbe500638fe8f53639322b Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 22 Jul 2024 14:51:12 +0800
Subject: [PATCH 0478/1141] fix records list test with new type

---
 mathesar/tests/rpc/test_records.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mathesar/tests/rpc/test_records.py b/mathesar/tests/rpc/test_records.py
index df0afc407d..78289e2d6d 100644
--- a/mathesar/tests/rpc/test_records.py
+++ b/mathesar/tests/rpc/test_records.py
@@ -44,6 +44,7 @@ def mock_list_records(
         return {
             "count": 50123,
             "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}]
+            "query": "SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2"
         }
 
     monkeypatch.setattr(records, 'connect', mock_connect)
@@ -52,7 +53,8 @@ def mock_list_records(
         "count": 50123,
         "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],
         "group": None,
-        "preview_data": []
+        "preview_data": [],
+        "query": "SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2"
     }
     actual_records_list = records.list_(
         table_oid=table_oid, database_id=database_id, request=request

From 15c61d16f4debebac31072fc7f811aafc11cb356 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 22 Jul 2024 14:55:57 +0800
Subject: [PATCH 0479/1141] fix stupid syntax mistake :hankey: :hankey:
 :hankey:

---
 mathesar/tests/rpc/test_records.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mathesar/tests/rpc/test_records.py b/mathesar/tests/rpc/test_records.py
index 78289e2d6d..5ba961b813 100644
--- a/mathesar/tests/rpc/test_records.py
+++ b/mathesar/tests/rpc/test_records.py
@@ -43,8 +43,8 @@ def mock_list_records(
             raise AssertionError('incorrect parameters passed')
         return {
             "count": 50123,
-            "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}]
-            "query": "SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2"
+            "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],
+            "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
         }
 
     monkeypatch.setattr(records, 'connect', mock_connect)
@@ -54,7 +54,7 @@ def mock_list_records(
         "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],
         "group": None,
         "preview_data": [],
-        "query": "SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2"
+        "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
     }
     actual_records_list = records.list_(
         table_oid=table_oid, database_id=database_id, request=request

From 1155d7fcf46d425f9a816ad24f7e7fe49c903cae Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 22 Jul 2024 15:27:07 +0800
Subject: [PATCH 0480/1141] change column_id -> attnum for conformity with
 other RPC functions

Also, add some type information for documentation
---
 db/sql/00_msar.sql      |  2 +-
 db/sql/test_00_msar.sql | 50 ++++++++++++++++++++---------------------
 mathesar/rpc/records.py | 43 +++++++++++++++++++++++++++++++++--
 3 files changed, 67 insertions(+), 28 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 3aa30f0176..740c6b4042 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3346,7 +3346,7 @@ INSERT INTO msar.filter_templates VALUES
 CREATE OR REPLACE FUNCTION msar.build_filter_expr(rel_id oid, tree jsonb) RETURNS text AS $$
 SELECT CASE tree ->> 'type'
   WHEN 'literal' THEN format('%L', tree ->> 'value')
-  WHEN 'column_id' THEN format('%I', msar.get_column_name(rel_id, (tree ->> 'value')::smallint))
+  WHEN 'attnum' THEN format('%I', msar.get_column_name(rel_id, (tree ->> 'value')::smallint))
   ELSE
     format(max(filter_template), VARIADIC array_agg(msar.build_filter_expr(rel_id, inner_tree)))
 END
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 91927a0211..3428031244 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -3025,7 +3025,7 @@ BEGIN
       rel_id,
       jsonb_build_object(
         'type', 'equal', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 500)))),
     'col1 = ''500'''
   );
@@ -3034,7 +3034,7 @@ BEGIN
       rel_id,
       jsonb_build_object(
         'type', 'lesser', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 500)))),
     'col1 < ''500'''
   );
@@ -3043,7 +3043,7 @@ BEGIN
       rel_id,
       jsonb_build_object(
         'type', 'greater', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 500)))),
     'col1 > ''500'''
   );
@@ -3052,7 +3052,7 @@ BEGIN
       rel_id,
       jsonb_build_object(
         'type', 'lesser_or_equal', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 500)))),
     'col1 <= ''500'''
   );
@@ -3061,7 +3061,7 @@ BEGIN
       rel_id,
       jsonb_build_object(
         'type', 'greater_or_equal', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 500)))),
     'col1 >= ''500'''
   );
@@ -3070,7 +3070,7 @@ BEGIN
       rel_id,
       jsonb_build_object(
         'type', 'null', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'column_id', 'value', 2)))),
+          jsonb_build_object('type', 'attnum', 'value', 2)))),
     'col1 IS NULL'
   );
   RETURN NEXT is(
@@ -3078,7 +3078,7 @@ BEGIN
       rel_id,
       jsonb_build_object(
         'type', 'not_null', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'column_id', 'value', 2)))),
+          jsonb_build_object('type', 'attnum', 'value', 2)))),
     'col1 IS NOT NULL'
   );
   RETURN NEXT is(
@@ -3086,7 +3086,7 @@ BEGIN
       rel_id,
       jsonb_build_object(
         'type', 'contains_case_insensitive', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 'ABc')))),
     'col1 ILIKE ''%'' || ''ABc'' || ''%'''
   );
@@ -3095,7 +3095,7 @@ BEGIN
       rel_id,
       jsonb_build_object(
         'type', 'starts_with_case_insensitive', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 'a''bc')))),
     'col1 ILIKE ''a''''bc'' || ''%'''
   );
@@ -3104,7 +3104,7 @@ BEGIN
       rel_id,
       jsonb_build_object(
         'type', 'json_array_length_equals', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 500)))),
     'jsonb_array_length(col1::jsonb) = ''500'''
   );
@@ -3113,7 +3113,7 @@ BEGIN
       rel_id,
       jsonb_build_object(
         'type', 'json_array_length_greater_than', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 500)))),
     'jsonb_array_length(col1::jsonb) > ''500'''
   );
@@ -3122,7 +3122,7 @@ BEGIN
       rel_id,
       jsonb_build_object(
         'type', 'json_array_length_greater_or_equal', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 500)))),
     'jsonb_array_length(col1::jsonb) >= ''500'''
   );
@@ -3131,7 +3131,7 @@ BEGIN
       rel_id,
       jsonb_build_object(
         'type', 'json_array_length_less_than', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 500)))),
     'jsonb_array_length(col1::jsonb) < ''500'''
   );
@@ -3140,7 +3140,7 @@ BEGIN
       rel_id,
       jsonb_build_object(
         'type', 'json_array_length_less_or_equal', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 500)))),
     'jsonb_array_length(col1::jsonb) <= ''500'''
   );
@@ -3149,7 +3149,7 @@ BEGIN
       rel_id,
       jsonb_build_object(
         'type', 'json_array_not_empty', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 500)))),
     'jsonb_array_length(col1::jsonb) > 0'
   );
@@ -3158,7 +3158,7 @@ BEGIN
       rel_id,
       jsonb_build_object(
         'type', 'json_array_contains', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', '"500"')))),
     'col1 @> ''"500"'''
   );
@@ -3167,7 +3167,7 @@ BEGIN
       rel_id,
       jsonb_build_object(
         'type', 'uri_scheme_equals', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 'https')))),
     'mathesar_types.uri_scheme(col1) = ''https'''
   );
@@ -3176,7 +3176,7 @@ BEGIN
       rel_id,
       jsonb_build_object(
         'type', 'uri_authority_contains', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 'google')))),
     'mathesar_types.uri_authority(col1) LIKE ''%'' || ''google'' || ''%'''
   );
@@ -3185,7 +3185,7 @@ BEGIN
       rel_id,
       jsonb_build_object(
         'type', 'email_domain_equals', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 'gmail.com')))),
     'mathesar_types.email_domain_name(col1) = ''gmail.com'''
   );
@@ -3194,7 +3194,7 @@ BEGIN
       rel_id,
       jsonb_build_object(
         'type', 'email_domain_contains', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'column_id', 'value', 2),
+          jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 'mail')))),
     'mathesar_types.email_domain_name(col1) LIKE ''%'' || ''mail'' || ''%'''
   );
@@ -3205,12 +3205,12 @@ BEGIN
         'type', 'or', 'args', jsonb_build_array(
           jsonb_build_object(
             'type', 'email_domain_contains', 'args', jsonb_build_array(
-              jsonb_build_object('type', 'column_id', 'value', 2),
+              jsonb_build_object('type', 'attnum', 'value', 2),
               jsonb_build_object('type', 'literal', 'value', 'mail'))
           ),
           jsonb_build_object(
             'type', 'equal', 'args', jsonb_build_array(
-              jsonb_build_object('type', 'column_id', 'value', 3),
+              jsonb_build_object('type', 'attnum', 'value', 3),
               jsonb_build_object('type', 'literal', 'value', 500))
           )
         )
@@ -3227,19 +3227,19 @@ BEGIN
             'type', 'and', 'args', jsonb_build_array(
               jsonb_build_object(
                 'type', 'equal', 'args', jsonb_build_array(
-                  jsonb_build_object('type', 'column_id', 'value', 3),
+                  jsonb_build_object('type', 'attnum', 'value', 3),
                   jsonb_build_object('type', 'literal', 'value', 500))
               ),
               jsonb_build_object(
                 'type', 'lesser', 'args', jsonb_build_array(
-                  jsonb_build_object('type', 'column_id', 'value', 4),
+                  jsonb_build_object('type', 'attnum', 'value', 4),
                   jsonb_build_object('type', 'literal', 'value', 'abcde'))
               )
             )
           ),
           jsonb_build_object(
             'type', 'greater', 'args', jsonb_build_array(
-              jsonb_build_object('type', 'column_id', 'value', 1),
+              jsonb_build_object('type', 'attnum', 'value', 1),
               jsonb_build_object('type', 'literal', 'value', 20))
           )
         )
diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index 35099d5b22..bffd4cf8be 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -1,7 +1,7 @@
 """
 Classes and functions exposed to the RPC endpoint for managing table records.
 """
-from typing import TypedDict, Literal
+from typing import Any, Literal, TypedDict, Union
 
 from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
@@ -23,6 +23,45 @@ class OrderBy(TypedDict):
     direction: Literal["asc", "desc"]
 
 
+class FilterAttnum(TypedDict):
+    """
+    An object choosing a column for a filter.
+
+    Attributes:
+        type: Must be `"attnum"`
+        value: The attnum of the column to filter by
+    """
+    type: Literal["attnum"]
+    value: int
+
+
+class FilterLiteral(TypedDict):
+    """
+    An object defining a literal for an argument to a filter.
+
+    Attributes:
+      type: must be `"literal"`.
+      value: The value of the literal.
+    """
+    type: Literal["literal"]
+    value: Any
+
+
+class Filter(TypedDict):
+    """
+    An object defining a filter to be used in a `WHERE` clause.
+
+    For valid `type` values, see the `msar.filter_templates` table
+    defined in `mathesar/db/sql/00_msar.sql`.
+
+    Attributes:
+      type: a function or operator to be used in filtering.
+      args: The ordered arguments for the function or operator.
+    """
+    type: str
+    args: list[Union['Filter', FilterAttnum, FilterLiteral]]
+
+
 class RecordList(TypedDict):
     """
     Records from a table, along with some meta data
@@ -64,7 +103,7 @@ def list_(
         limit: int = None,
         offset: int = None,
         order: list[OrderBy] = None,
-        filter: list[dict] = None,
+        filter: Filter = None,
         group: list[dict] = None,
         search: list[dict] = None,
         **kwargs

From 45490f9bb6265818b134e49a6eea1a56ce25686c Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 22 Jul 2024 16:13:20 +0800
Subject: [PATCH 0481/1141] add new classes to docs

---
 docs/docs/api/rpc.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 0718f47bfa..9ff7103bf4 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -180,8 +180,11 @@ To use an RPC function:
     options:
       members:
       - list_
-      - OrderBy
       - RecordList
+      - OrderBy
+      - Filter
+      - FilterAttnum
+      - FilterLiteral
 
 ## Explorations
 

From 798e08ccfe256ecf6963e2878f137763388573d0 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 22 Jul 2024 10:43:56 -0400
Subject: [PATCH 0482/1141] Fix failing test

---
 db/tests/tables/operations/test_alter.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/db/tests/tables/operations/test_alter.py b/db/tests/tables/operations/test_alter.py
index 754a588956..af1f0b9b0c 100644
--- a/db/tests/tables/operations/test_alter.py
+++ b/db/tests/tables/operations/test_alter.py
@@ -1,3 +1,5 @@
+import json
+
 from unittest.mock import patch
 import db.tables.operations.alter as tab_alter
 
@@ -42,4 +44,8 @@ def test_alter_table():
     assert call_args[0] == "conn"
     assert call_args[1] == "alter_table"
     assert call_args[2] == 12345
-    assert call_args[3] == {"name": "newname", "description": "this is a comment", "columns": {}}
+    assert call_args[3] == json.dumps({
+        "name": "newname",
+        "description": "this is a comment",
+        "columns": {},
+    })

From e3e6c58daa8bd675db3af3d88539a91e99336e7b Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 23 Jul 2024 04:52:16 +0530
Subject: [PATCH 0483/1141] add sql for getting records for an exploration

---
 db/sql/00_msar.sql | 78 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index a7c3a1ae53..e3d07a60be 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3453,3 +3453,81 @@ BEGIN
   RETURN records;
 END;
 $$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION
+msar.list_records_from_exploration(
+  exploration jsonb
+) RETURNS jsonb AS $$
+DECLARE
+  records jsonb;
+  base_table_oid bigint;
+  columns jsonb;
+  sel text;
+BEGIN
+  base_table_oid := exploration->'base_table_oid';
+  columns := exploration->'initial_columns';
+  sel := build_selectable_for_explorations(base_table_oid, columns);
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION
+msar.build_selectable_for_explorations(
+  base_table_oid bigint,
+  columns jsonb
+) RETURNS text AS $$
+DECLARE
+  sel text;
+BEGIN
+  WITH col_cte AS (
+    SELECT (x->>'id')::smallint AS id, x->>'alias' AS alias, x->'join_path' AS jp FROM jsonb_array_elements('[{"id": 2, "alias": "abcd"},{"id": 5, "alias":"efgh", "join_path":[[[2254329, 2], [2254334, 1]],[[2254334, 5], [2254321, 1]]]}]'::jsonb) WITH ORDINALITY AS j(x, idx)
+  ), jp_cte AS (
+    SELECT
+    (col#>>'{0,0}')::oid AS lt_oid,
+    (col#>>'{0,1}')::smallint AS lt_attnum,
+    (col#>>'{1,0}')::oid AS rt_oid,
+    (col#>>'{1,1}')::smallint AS rt_attnum
+    FROM (SELECT jsonb_array_elements(jp) FROM col_cte) AS y(col)
+  ), sel_base_cte AS (
+    SELECT 
+    CASE 
+      WHEN col_cte.jp IS NULL
+      AND has_column_privilege(2254329, col_cte.id, 'SELECT')
+    THEN
+      format('msar.format_data(%I) AS %I', msar.get_column_name(2254329, col_cte.id), col_cte.alias)
+    END as base_sel
+    FROM col_cte
+  ), join_text_cte AS (
+    SELECT 
+    CASE 
+      WHEN col_cte.jp IS NOT NULL
+      AND has_column_privilege((col_cte.jp#>>'{-1,-1,0}')::oid, col_cte.id, 'SELECT')
+      AND has_column_privilege(lt_oid, lt_attnum, 'SELECT')
+      AND has_column_privilege(rt_oid, rt_attnum, 'SELECT') 
+    THEN
+      jsonb_build_object(
+        'join_sel',
+        format(
+          'msar.format_data(%I.%I) AS %I',
+          col_cte.jp#>>'{-1,-1,0}',
+          col_cte.id,
+          col_cte.alias
+        ),
+        'join_text',
+        format(
+          'LEFT OUTER JOIN %I.%I AS %I ON %I.%I=%I.%I',
+          msar.get_relation_schema_name(rt_oid),
+          msar.get_relation_name(rt_oid),
+          rt_oid,
+          lt_oid,
+          msar.get_column_name(lt_oid, lt_attnum),
+          rt_oid,
+          msar.get_column_name(rt_oid, rt_attnum)
+        )
+      )
+    END AS joins
+    FROM jp_cte, col_cte
+  ) SELECT distinct *, joins->>'join_sel', joins->>'join_text' FROM join_text_cte, sel_base_cte;
+END;
+$$ LANGUAGE plpgsql;

From 709a60c9c2538a3f0d8ab238f96120f2a5188d85 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 23 Jul 2024 12:00:11 -0400
Subject: [PATCH 0484/1141] Return empty array when a schema has no tables

---
 db/sql/00_msar.sql      | 17 ++++++++++-------
 db/sql/test_00_msar.sql |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 5c163fbe77..aac6ddddc7 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -838,13 +838,16 @@ Each returned JSON object in the array will have the form:
 Args:
   sch_id: The OID or name of the schema.
 */
-SELECT jsonb_agg(
-  jsonb_build_object(
-    'oid', pgc.oid::bigint,
-    'name', pgc.relname,
-    'schema', pgc.relnamespace::bigint,
-    'description', msar.obj_description(pgc.oid, 'pg_class')
-  )
+SELECT coalesce(
+  jsonb_agg(
+    jsonb_build_object(
+      'oid', pgc.oid::bigint,
+      'name', pgc.relname,
+      'schema', pgc.relnamespace::bigint,
+      'description', msar.obj_description(pgc.oid, 'pg_class')
+    )
+  ),
+  '[]'::jsonb
 )
 FROM pg_catalog.pg_class AS pgc 
   LEFT JOIN pg_catalog.pg_namespace AS pgn ON pgc.relnamespace = pgn.oid
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 9bfaff637d..5c10ad130a 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2696,7 +2696,7 @@ BEGIN
 
   -- Test table info for schema 'alice' that contains no tables
   RETURN NEXT is(
-    alice_table_info, null
+    alice_table_info, '[]'::jsonb
   );
 END;
 $$ LANGUAGE plpgsql;

From e185d6d4f7faecd63a67791f7dbe51ae3e329773 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 23 Jul 2024 12:29:45 -0400
Subject: [PATCH 0485/1141] Fix TS error after git merge

---
 .../record-summary/RecordSummaryConfig.svelte               | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
index 84f93d6fa9..d8f028935a 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
@@ -13,6 +13,7 @@
   import LinkedRecord from '@mathesar/components/LinkedRecord.svelte';
   import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
   import { RichText } from '@mathesar/components/rich-text';
+  import { currentConnection } from '@mathesar/stores/databases';
   import type { RecordRow, TabularData } from '@mathesar/stores/table-data';
   import { renderRecordSummaryForRow } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
   import { updateTable } from '@mathesar/stores/tables';
@@ -58,10 +59,7 @@
 
   async function save() {
     try {
-      if (!database) {
-        throw new Error('Current database not found');
-      }
-      await updateTable(database, {
+      await updateTable($currentConnection, {
         oid: table.oid,
         metadata: {
           record_summary_customized: $customized,

From 4e549ae9f5a3b28d6837f4e3ae8f3575ced8355a Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 23 Jul 2024 23:11:30 +0530
Subject: [PATCH 0486/1141] add rpc endpoint for listing column info with
 metadata

---
 docs/docs/api/rpc.md                          |  7 ++-
 mathesar/rpc/columns/base.py                  | 24 ++++++++
 mathesar/rpc/columns/metadata.py              | 57 +++++++++++-------
 mathesar/tests/rpc/columns/test_c_metadata.py | 58 +------------------
 mathesar/tests/rpc/test_endpoints.py          |  9 ++-
 mathesar/utils/columns.py                     |  2 +-
 6 files changed, 73 insertions(+), 84 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 0718f47bfa..9d56505837 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -134,6 +134,7 @@ To use an RPC function:
       - add
       - patch
       - delete
+      - list_with_metadata
       - ColumnInfo
       - ColumnListReturn
       - CreatableColumnInfo
@@ -148,9 +149,9 @@ To use an RPC function:
     options:
       members:
       - list_
-      - patch
-      - ColumnMetaData
-      - SettableColumnMetaData
+      - set_
+      - ColumnMetaDataRecord
+      - ColumnMetaDataBlob
 
 ## Types
 
diff --git a/mathesar/rpc/columns/base.py b/mathesar/rpc/columns/base.py
index abbaa96a51..257cfccf64 100644
--- a/mathesar/rpc/columns/base.py
+++ b/mathesar/rpc/columns/base.py
@@ -10,8 +10,10 @@
 from db.columns.operations.create import add_columns_to_table
 from db.columns.operations.drop import drop_columns_from_table
 from db.columns.operations.select import get_column_info_for_table
+from mathesar.rpc.columns.metadata import ColumnMetaDataBlob
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
+from mathesar.utils.columns import get_columns_meta_data
 
 
 class TypeOptions(TypedDict, total=False):
@@ -282,3 +284,25 @@ def delete(
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
         return drop_columns_from_table(table_oid, column_attnums, conn)
+
+
+@rpc_method(name="columns.list_with_metadata")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def list_with_metadata(*, table_oid: int, database_id: int, **kwargs) -> list:
+    """
+    List information about columns for a table, along with the metadata associated with each column.
+    Args:
+        table_oid: Identity of the table in the user's database.
+        database_id: The Django id of the database containing the table.
+    Returns:
+        A list of column details.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        column_info = get_column_info_for_table(table_oid, conn)
+    column_metadata = get_columns_meta_data(table_oid, database_id)
+    metadata_map = {
+        c.attnum: ColumnMetaDataBlob.from_model(c) for c in column_metadata
+    }
+    return [col | {"metadata": metadata_map.get(col["id"])} for col in column_info]
diff --git a/mathesar/rpc/columns/metadata.py b/mathesar/rpc/columns/metadata.py
index 3dd8df5931..bfd9a64168 100644
--- a/mathesar/rpc/columns/metadata.py
+++ b/mathesar/rpc/columns/metadata.py
@@ -7,10 +7,10 @@
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
-from mathesar.utils.columns import get_columns_meta_data, patch_columns_meta_data
+from mathesar.utils.columns import get_columns_meta_data, set_columns_meta_data
 
 
-class ColumnMetaData(TypedDict):
+class ColumnMetaDataRecord(TypedDict):
     """
     Metadata for a column in a table.
 
@@ -73,9 +73,9 @@ def from_model(cls, model):
         )
 
 
-class SettableColumnMetaData(TypedDict):
+class ColumnMetaDataBlob(TypedDict):
     """
-    Settable metadata fields for a column in a table.
+    The metadata fields which can be set for a column in a table.
 
     Attributes:
         attnum: The attnum of the column in the table.
@@ -108,11 +108,30 @@ class SettableColumnMetaData(TypedDict):
     duration_max: Optional[str]
     duration_show_units: Optional[bool]
 
+    @classmethod
+    def from_model(cls, model):
+        return cls(
+            attnum=model.attnum,
+            bool_input=model.bool_input,
+            bool_true=model.bool_true,
+            bool_false=model.bool_false,
+            num_min_frac_digits=model.num_min_frac_digits,
+            num_max_frac_digits=model.num_max_frac_digits,
+            num_show_as_perc=model.num_show_as_perc,
+            mon_currency_symbol=model.mon_currency_symbol,
+            mon_currency_location=model.mon_currency_location,
+            time_format=model.time_format,
+            date_format=model.date_format,
+            duration_min=model.duration_min,
+            duration_max=model.duration_max,
+            duration_show_units=model.duration_show_units
+        )
+
 
 @rpc_method(name="columns.metadata.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def list_(*, table_oid: int, database_id: int, **kwargs) -> list[ColumnMetaData]:
+def list_(*, table_oid: int, database_id: int, **kwargs) -> list[ColumnMetaDataRecord]:
     """
     List metadata associated with columns for a table. Exposed as `list`.
 
@@ -125,34 +144,28 @@ def list_(*, table_oid: int, database_id: int, **kwargs) -> list[ColumnMetaData]
     """
     columns_meta_data = get_columns_meta_data(table_oid, database_id)
     return [
-        ColumnMetaData.from_model(model) for model in columns_meta_data
+        ColumnMetaDataRecord.from_model(model) for model in columns_meta_data
     ]
 
 
-@rpc_method(name="columns.metadata.patch")
+@rpc_method(name="columns.metadata.set")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def patch(
-        *,
-        column_meta_data_list: list[SettableColumnMetaData],
-        table_oid: int,
-        database_id: int,
-        **kwargs
-) -> list[ColumnMetaData]:
+def set_(
+    *,
+    column_meta_data_list: list[ColumnMetaDataBlob],
+    table_oid: int,
+    database_id: int,
+    **kwargs
+) -> None:
     """
-    Alter metadata settings associated with columns of a table for a database.
+    Set metadata associated with columns of a table for a database. Exposed as `set`.
 
     Args:
         column_meta_data_list: A list describing desired metadata alterations.
         table_oid: Identity of the table whose metadata we'll modify.
         database_id: The Django id of the database containing the table.
-
-    Returns:
-        List of altered metadata objects.
     """
-    columns_meta_data = patch_columns_meta_data(
+    set_columns_meta_data(
         column_meta_data_list, table_oid, database_id
     )
-    return [
-        ColumnMetaData.from_model(model) for model in columns_meta_data
-    ]
diff --git a/mathesar/tests/rpc/columns/test_c_metadata.py b/mathesar/tests/rpc/columns/test_c_metadata.py
index 6e3ea21244..b76a3b31a6 100644
--- a/mathesar/tests/rpc/columns/test_c_metadata.py
+++ b/mathesar/tests/rpc/columns/test_c_metadata.py
@@ -38,7 +38,7 @@ def mock_get_columns_meta_data(_table_oid, _database_id):
     monkeypatch.setattr(metadata, "get_columns_meta_data", mock_get_columns_meta_data)
 
     expect_metadata_list = [
-        metadata.ColumnMetaData(
+        metadata.ColumnMetaDataRecord(
             database_id=database_id, table_oid=table_oid, attnum=2,
             bool_input="dropdown", bool_true="TRUE", bool_false="FALSE",
             num_min_frac_digits=5, num_max_frac_digits=10, num_show_as_perc=False,
@@ -46,7 +46,7 @@ def mock_get_columns_meta_data(_table_oid, _database_id):
             time_format=None, date_format=None,
             duration_min=None, duration_max=None, duration_show_units=True,
         ),
-        metadata.ColumnMetaData(
+        metadata.ColumnMetaDataRecord(
             database_id=database_id, table_oid=table_oid, attnum=8,
             bool_input="checkbox", bool_true="true", bool_false="false",
             num_min_frac_digits=2, num_max_frac_digits=8, num_show_as_perc=True,
@@ -57,57 +57,3 @@ def mock_get_columns_meta_data(_table_oid, _database_id):
     ]
     actual_metadata_list = metadata.list_(table_oid=table_oid, database_id=database_id)
     assert actual_metadata_list == expect_metadata_list
-
-
-# TODO consider mocking out ColumnMetaData queryset for this test
-def test_columns_meta_data_patch(monkeypatch):
-    database_id = 2
-    table_oid = 123456
-    expect_metadata_list = [
-        metadata.ColumnMetaData(
-            database_id=database_id, table_oid=table_oid, attnum=2,
-            bool_input="dropdown", bool_true="TRUE", bool_false="FALSE",
-            num_min_frac_digits=5, num_max_frac_digits=10, num_show_as_perc=False,
-            mon_currency_symbol="EUR", mon_currency_location="end-with-space",
-            time_format=None, date_format=None,
-            duration_min=None, duration_max=None, duration_show_units=True,
-        ),
-        metadata.ColumnMetaData(
-            database_id=database_id, table_oid=table_oid, attnum=8,
-            bool_input="checkbox", bool_true="true", bool_false="false",
-            num_min_frac_digits=2, num_max_frac_digits=8, num_show_as_perc=True,
-            mon_currency_symbol="$", mon_currency_location="after-minus",
-            time_format=None, date_format=None,
-            duration_min=None, duration_max=None, duration_show_units=True,
-        ),
-    ]
-
-    def mock_patch_columns_meta_data(column_meta_data_list, _table_oid, _database_id):
-        server_model = Server(id=2, host='example.com', port=5432)
-        db_model = Database(id=_database_id, name='mymathesardb', server=server_model)
-        return [
-            ColumnMetaData(
-                database=db_model, table_oid=_table_oid, attnum=2,
-                bool_input="dropdown", bool_true="TRUE", bool_false="FALSE",
-                num_min_frac_digits=5, num_max_frac_digits=10, num_show_as_perc=False,
-                mon_currency_symbol="EUR", mon_currency_location="end-with-space",
-                time_format=None, date_format=None,
-                duration_min=None, duration_max=None, duration_show_units=True,
-            ),
-            ColumnMetaData(
-                database=db_model, table_oid=_table_oid, attnum=8,
-                bool_input="checkbox", bool_true="true", bool_false="false",
-                num_min_frac_digits=2, num_max_frac_digits=8, num_show_as_perc=True,
-                mon_currency_symbol="$", mon_currency_location="after-minus",
-                time_format=None, date_format=None,
-                duration_min=None, duration_max=None, duration_show_units=True,
-            )
-        ]
-
-    monkeypatch.setattr(metadata, "patch_columns_meta_data", mock_patch_columns_meta_data)
-    actual_metadata_list = metadata.patch(
-        column_meta_data_list=expect_metadata_list,
-        table_oid=table_oid,
-        database_id=database_id
-    )
-    assert actual_metadata_list == expect_metadata_list
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 7b64967ff5..91db2de782 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -64,14 +64,19 @@
         "columns.add",
         [user_is_authenticated]
     ),
+    (
+        columns.list_with_metadata,
+        "columns.list_with_metadata",
+        [user_is_authenticated]
+    ),
     (
         columns.metadata.list_,
         "columns.metadata.list",
         [user_is_authenticated]
     ),
     (
-        columns.metadata.patch,
-        "columns.metadata.patch",
+        columns.metadata.set_,
+        "columns.metadata.set",
         [user_is_authenticated]
     ),
     (
diff --git a/mathesar/utils/columns.py b/mathesar/utils/columns.py
index 67b3deec75..504ab45014 100644
--- a/mathesar/utils/columns.py
+++ b/mathesar/utils/columns.py
@@ -7,7 +7,7 @@ def get_columns_meta_data(table_oid, database_id):
     )
 
 
-def patch_columns_meta_data(column_meta_data_list, table_oid, database_id):
+def set_columns_meta_data(column_meta_data_list, table_oid, database_id):
     db_model = Database.objects.get(id=database_id)
     for meta_data_dict in column_meta_data_list:
         # TODO decide if this is worth the trouble of doing in bulk.

From 53e9f404f448cd3196b3c10ae17478d3c1805d42 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 24 Jul 2024 13:16:47 +0800
Subject: [PATCH 0487/1141] add initial records search function

---
 db/sql/00_msar.sql | 75 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 740c6b4042..e46350015d 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3505,3 +3505,78 @@ BEGIN
   RETURN records;
 END;
 $$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION
+msar.get_score_expr(tab_id oid, parameters_ jsonb) RETURNS text AS $$
+SELECT string_agg(
+  CASE WHEN pgt.typcategory = 'S' THEN
+    format(
+      $s$(CASE
+        WHEN %1$I ILIKE %2$L THEN 4
+        WHEN %1$I ILIKE %2$L || '%%' THEN 3
+        WHEN %1$I ILIKE '%%' || %2$L || '%%' THEN 2
+        ELSE 0
+      END)$s$,
+      pga.attname,
+      x.literal
+    )
+  ELSE
+    format('(CASE WHEN %1$I = %2$L THEN 4 ELSE 0 END)', pga.attname, x.literal)
+  END,
+  ' + '
+)
+FROM jsonb_to_recordset(parameters_) AS x(attnum smallint, literal text)
+  INNER JOIN pg_catalog.pg_attribute AS pga ON x.attnum = pga.attnum
+  INNER JOIN pg_catalog.pg_type AS pgt ON pga.atttypid = pgt.oid
+WHERE
+  pga.attrelid = tab_id
+  AND NOT pga.attisdropped
+  AND has_column_privilege(tab_id, x.attnum, 'SELECT')
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.search_records_from_table(
+  tab_id oid,
+  search_ jsonb,
+  limit_ integer
+) RETURNS jsonb AS $$/*
+Get records from a table, filtering and sorting according to a search specification.
+
+Only columns to which the user has access are returned.
+
+Args:
+  tab_id: The OID of the table whose records we'll get
+  search_: An array of search definition objects.
+  limit_: The maximum number of rows we'll return.
+
+The search definition objects should have the form
+  {"attnum": <int>, "literal": <any>}
+*/
+DECLARE
+  records jsonb;
+BEGIN
+  EXECUTE format(
+    $q$
+    WITH count_cte AS (
+      SELECT count(1) AS count FROM %2$I.%3$I WHERE %4$s > 0
+    ), results_cte AS (
+      SELECT %1$s FROM %2$I.%3$I WHERE %4$s >0 ORDER BY %4$s DESC LIMIT %5$L
+    )
+    SELECT jsonb_build_object(
+      'results', jsonb_agg(row_to_json(results_cte.*)),
+      'count', max(count_cte.count),
+      'query', $iq$SELECT %1$s FROM %2$I.%3$I WHERE %4$s >0 ORDER BY %4$s DESC LIMIT %5$L$iq$
+    )
+    FROM results_cte, count_cte
+    $q$,
+    msar.build_selectable_column_expr(tab_id),
+    msar.get_relation_schema_name(tab_id),
+    msar.get_relation_name(tab_id),
+    msar.get_score_expr(tab_id, search_),
+    limit_
+  ) INTO records;
+  RETURN records;
+END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;

From 66c787d4bbb5c2d00866ea11a1297d2eb46a9456 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 24 Jul 2024 14:44:41 +0800
Subject: [PATCH 0488/1141] make ordering deterministic in search results

---
 db/sql/00_msar.sql | 41 +++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index e46350015d..943406dbfe 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3408,18 +3408,13 @@ $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-msar.build_order_by_expr(tab_id oid, order_ jsonb) RETURNS text AS $$/*
-Build an ORDER BY expression for the given table and order JSON.
-
-The ORDER BY expression will refer to columns by their attnum. This is designed to work together
-with `msar.build_selectable_column_expr`. It will only use the columns to which the user has access.
-Finally, this function will append either a primary key, or all columns to the produced ORDER BY so
-the resulting ordering is totally defined (i.e., deterministic).
-
+msar.build_total_order_expr(tab_id oid, order_ jsonb) RETURNS text AS $$/*
+Build a deterministic order expression for the given table and order JSON.
 Args:
   tab_id: The OID of the table whose columns we'll order by.
+  order_: A JSONB array defining any desired ordering of columns.
 */
-SELECT 'ORDER BY ' || string_agg(format('%I %s', attnum, msar.sanitize_direction(direction)), ', ')
+SELECT string_agg(format('%I %s', attnum, msar.sanitize_direction(direction)), ', ')
 FROM jsonb_to_recordset(
     COALESCE(
       COALESCE(order_, '[]'::jsonb) || msar.get_pkey_order(tab_id),
@@ -3431,6 +3426,23 @@ WHERE has_column_privilege(tab_id, attnum, 'SELECT');
 $$ LANGUAGE SQL;
 
 
+CREATE OR REPLACE FUNCTION
+msar.build_order_by_expr(tab_id oid, order_ jsonb) RETURNS text AS $$/*
+Build an ORDER BY expression for the given table and order JSON.
+
+The ORDER BY expression will refer to columns by their attnum. This is designed to work together
+with `msar.build_selectable_column_expr`. It will only use the columns to which the user has access.
+Finally, this function will append either a primary key, or all columns to the produced ORDER BY so
+the resulting ordering is totally defined (i.e., deterministic).
+
+Args:
+  tab_id: The OID of the table whose columns we'll order by.
+  order_: A JSONB array defining any desired ordering of columns.
+*/
+SELECT 'ORDER BY ' || msar.build_total_order_expr(tab_id, order_)
+$$ LANGUAGE SQL;
+
+
 CREATE OR REPLACE FUNCTION
 msar.build_selectable_column_expr(tab_id oid) RETURNS text AS $$/*
 Build an SQL select-target expression of only columns to which the user has access.
@@ -3562,12 +3574,12 @@ BEGIN
     WITH count_cte AS (
       SELECT count(1) AS count FROM %2$I.%3$I WHERE %4$s > 0
     ), results_cte AS (
-      SELECT %1$s FROM %2$I.%3$I WHERE %4$s >0 ORDER BY %4$s DESC LIMIT %5$L
+      SELECT %1$s FROM %2$I.%3$I WHERE %4$s >0 ORDER BY %6$s LIMIT %5$L
     )
     SELECT jsonb_build_object(
       'results', jsonb_agg(row_to_json(results_cte.*)),
       'count', max(count_cte.count),
-      'query', $iq$SELECT %1$s FROM %2$I.%3$I WHERE %4$s >0 ORDER BY %4$s DESC LIMIT %5$L$iq$
+      'query', $iq$SELECT %1$s FROM %2$I.%3$I WHERE %4$s >0 ORDER BY %6$s LIMIT %5$L$iq$
     )
     FROM results_cte, count_cte
     $q$,
@@ -3575,7 +3587,12 @@ BEGIN
     msar.get_relation_schema_name(tab_id),
     msar.get_relation_name(tab_id),
     msar.get_score_expr(tab_id, search_),
-    limit_
+    limit_,
+    concat(
+      msar.get_score_expr(tab_id, search_),
+      ' DESC, ',
+      msar.build_total_order_expr(tab_id, null)
+    )
   ) INTO records;
   RETURN records;
 END;

From dfc2c2e5094a08c6b7d967a81da54e92c358ad1e Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 24 Jul 2024 12:20:14 +0530
Subject: [PATCH 0489/1141] Specify rpc apis for servers, database_setup,
 databases, and configured_roles

---
 mathesar_ui/src/api/rpc/configured_roles.ts | 42 +++++++++++++++++++++
 mathesar_ui/src/api/rpc/database_setup.ts   | 40 ++++++++++++++++++++
 mathesar_ui/src/api/rpc/databases.ts        | 18 +++++++++
 mathesar_ui/src/api/rpc/servers.ts          | 11 ++++++
 4 files changed, 111 insertions(+)
 create mode 100644 mathesar_ui/src/api/rpc/configured_roles.ts
 create mode 100644 mathesar_ui/src/api/rpc/database_setup.ts
 create mode 100644 mathesar_ui/src/api/rpc/databases.ts
 create mode 100644 mathesar_ui/src/api/rpc/servers.ts

diff --git a/mathesar_ui/src/api/rpc/configured_roles.ts b/mathesar_ui/src/api/rpc/configured_roles.ts
new file mode 100644
index 0000000000..d5a3f0b45a
--- /dev/null
+++ b/mathesar_ui/src/api/rpc/configured_roles.ts
@@ -0,0 +1,42 @@
+import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
+
+import type { Server } from './servers';
+
+export interface ConfiguredRole {
+  id: number;
+  server_id: Server['id'];
+  name: string;
+}
+
+export const configuredRoles = {
+  list: rpcMethodTypeContainer<
+    {
+      server_id: ConfiguredRole['server_id'];
+    },
+    Array<ConfiguredRole>
+  >(),
+
+  add: rpcMethodTypeContainer<
+    {
+      server_id: ConfiguredRole['server_id'];
+      name: ConfiguredRole['name'];
+      password: string;
+    },
+    ConfiguredRole
+  >(),
+
+  delete: rpcMethodTypeContainer<
+    {
+      configured_role_id: ConfiguredRole['id'];
+    },
+    void
+  >(),
+
+  set_password: rpcMethodTypeContainer<
+    {
+      configured_role_id: ConfiguredRole['id'];
+      password: string;
+    },
+    void
+  >(),
+};
diff --git a/mathesar_ui/src/api/rpc/database_setup.ts b/mathesar_ui/src/api/rpc/database_setup.ts
new file mode 100644
index 0000000000..9db7223862
--- /dev/null
+++ b/mathesar_ui/src/api/rpc/database_setup.ts
@@ -0,0 +1,40 @@
+import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
+
+import type { ConfiguredRole } from './configured_roles';
+import type { Database } from './databases';
+import type { Server } from './servers';
+
+export const sampleDataOptions = [
+  'library_management',
+  'movie_collection',
+] as const;
+
+export type SampleDataSchemaIdentifier = (typeof sampleDataOptions)[number];
+
+export interface DatabaseConnectionResult {
+  server_id: Server['id'];
+  database_id: Database['id'];
+  configured_role_id: ConfiguredRole['id'];
+}
+
+export const databaseSetup = {
+  create_new: rpcMethodTypeContainer<
+    {
+      database: Database['name'];
+      sample_data?: SampleDataSchemaIdentifier[];
+    },
+    DatabaseConnectionResult
+  >(),
+
+  connect_existing: rpcMethodTypeContainer<
+    {
+      host: Server['host'];
+      port: Server['port'];
+      database: Database['name'];
+      role: ConfiguredRole['name'];
+      password: string;
+      sample_data?: SampleDataSchemaIdentifier[];
+    },
+    DatabaseConnectionResult
+  >(),
+};
diff --git a/mathesar_ui/src/api/rpc/databases.ts b/mathesar_ui/src/api/rpc/databases.ts
new file mode 100644
index 0000000000..ae3fecc3b7
--- /dev/null
+++ b/mathesar_ui/src/api/rpc/databases.ts
@@ -0,0 +1,18 @@
+import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
+
+import type { Server } from './servers';
+
+export interface Database {
+  id: number;
+  name: string;
+  server_id: Server['id'];
+}
+
+export const databases = {
+  list: rpcMethodTypeContainer<
+    {
+      server_id?: Database['server_id'];
+    },
+    Array<Database>
+  >(),
+};
diff --git a/mathesar_ui/src/api/rpc/servers.ts b/mathesar_ui/src/api/rpc/servers.ts
new file mode 100644
index 0000000000..eaa9faec31
--- /dev/null
+++ b/mathesar_ui/src/api/rpc/servers.ts
@@ -0,0 +1,11 @@
+import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
+
+export interface Server {
+  id: number;
+  host: string;
+  port: number;
+}
+
+export const servers = {
+  list: rpcMethodTypeContainer<void, Array<Server>>(),
+};

From e534ffbfe44e84b54b5cb6c62d14d5c966da3c98 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 24 Jul 2024 14:59:48 +0800
Subject: [PATCH 0490/1141] remove 'search' from the  functions

---
 db/records/operations/select.py |  3 ---
 db/sql/00_msar.sql              |  4 +---
 db/sql/test_00_msar.sql         | 10 +++++-----
 mathesar/rpc/records.py         |  3 ---
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/db/records/operations/select.py b/db/records/operations/select.py
index fb5b7fad62..da6a45c00a 100644
--- a/db/records/operations/select.py
+++ b/db/records/operations/select.py
@@ -19,7 +19,6 @@ def list_records_from_table(
         order=None,
         filter=None,
         group=None,
-        search=None,
 ):
     """
     Get records from a table.
@@ -37,7 +36,6 @@ def list_records_from_table(
         order: An array of ordering definition objects.
         filter: An array of filter definition objects.
         group: An array of group definition objects.
-        search: An array of search definition objects.
     """
     result = db_conn.exec_msar_func(
         conn,
@@ -48,7 +46,6 @@ def list_records_from_table(
         json.dumps(order) if order is not None else None,
         json.dumps(filter) if filter is not None else None,
         json.dumps(group) if group is not None else None,
-        json.dumps(search) if search is not None else None,
     ).fetchone()[0]
     return result
 
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 943406dbfe..f59fda9778 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3472,8 +3472,7 @@ msar.list_records_from_table(
   offset_ integer,
   order_ jsonb,
   filter_ jsonb,
-  group_ jsonb,
-  search_ jsonb
+  group_ jsonb
 ) RETURNS jsonb AS $$/*
 Get records from a table. Only columns to which the user has access are returned.
 
@@ -3484,7 +3483,6 @@ Args:
   order_: An array of ordering definition objects.
   filter_: An array of filter definition objects.
   group_: An array of group definition objects.
-  search_: An array of search definition objects.
 
 The order definition objects should have the form
   {"attnum": <int>, "direction": <text>}
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 3428031244..b6cdedc554 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2877,7 +2877,7 @@ BEGIN
   PERFORM __setup_list_records_table();
   rel_id := 'atable'::regclass::oid;
   RETURN NEXT is(
-    msar.list_records_from_table(rel_id, null, null, null, null, null, null),
+    msar.list_records_from_table(rel_id, null, null, null, null, null),
     $j${
       "count": 3,
       "results": [
@@ -2896,7 +2896,7 @@ BEGIN
   );
   RETURN NEXT is(
     msar.list_records_from_table(
-      rel_id, 2, null, '[{"attnum": 2, "direction": "desc"}]', null, null, null
+      rel_id, 2, null, '[{"attnum": 2, "direction": "desc"}]', null, null
     ),
     $j${
       "count": 3,
@@ -2915,7 +2915,7 @@ BEGIN
   );
   RETURN NEXT is(
     msar.list_records_from_table(
-      rel_id, null, 1, '[{"attnum": 1, "direction": "desc"}]', null, null, null
+      rel_id, null, 1, '[{"attnum": 1, "direction": "desc"}]', null, null
     ),
     $j${
       "count": 3,
@@ -2938,7 +2938,7 @@ BEGIN
   GRANT SELECT (col1, col2, col3, col4) ON TABLE atable TO intern_no_pkey;
   SET ROLE intern_no_pkey;
   RETURN NEXT is(
-    msar.list_records_from_table(rel_id, null, null, null, null, null, null),
+    msar.list_records_from_table(rel_id, null, null, null, null, null),
     $j${
       "count": 3,
       "results": [
@@ -2956,7 +2956,7 @@ BEGIN
   );
   RETURN NEXT is(
     msar.list_records_from_table(
-      rel_id, null, null, '[{"attnum": 3, "direction": "desc"}]', null, null, null
+      rel_id, null, null, '[{"attnum": 3, "direction": "desc"}]', null, null
     ),
     $j${
       "count": 3,
diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index bffd4cf8be..ca10f0cd40 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -105,7 +105,6 @@ def list_(
         order: list[OrderBy] = None,
         filter: Filter = None,
         group: list[dict] = None,
-        search: list[dict] = None,
         **kwargs
 ) -> RecordList:
     """
@@ -120,7 +119,6 @@ def list_(
         order: An array of ordering definition objects.
         filter: An array of filter definition objects.
         group: An array of group definition objects.
-        search: An array of search definition objects.
 
     Returns:
         The requested records, along with some metadata.
@@ -135,6 +133,5 @@ def list_(
             order=order,
             filter=filter,
             group=group,
-            search=search,
         )
     return RecordList.from_dict(record_info)

From 9cd50c35a8788d994e6372b789211837e98be326 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 24 Jul 2024 12:49:59 +0530
Subject: [PATCH 0491/1141] Remove deprecated Database type in favour of
 Database type in rpc file

---
 mathesar_ui/src/AppTypes.ts                    | 10 ----------
 mathesar_ui/src/components/DatabaseName.svelte |  4 ++--
 .../breadcrumb/EntitySelector.svelte           |  2 +-
 .../breadcrumb/SchemaSelector.svelte           |  2 +-
 .../components/breadcrumb/breadcrumbTypes.ts   |  2 +-
 .../data-explorer/DataExplorerPage.svelte      |  2 +-
 .../pages/database/AddEditSchemaModal.svelte   |  2 +-
 .../src/pages/database/DatabaseDetails.svelte  | 18 ++----------------
 .../src/pages/database/DatabasePage.svelte     |  4 ++--
 .../src/pages/database/SchemaRow.svelte        |  2 +-
 .../pages/exploration/ExplorationPage.svelte   |  2 +-
 .../src/pages/exploration/Header.svelte        |  2 +-
 .../import/preview/ImportPreviewContent.svelte |  2 +-
 .../import/preview/ImportPreviewPage.svelte    |  2 +-
 .../import/preview/importPreviewPageUtils.ts   |  2 +-
 .../import/upload/ImportUploadPage.svelte      |  2 +-
 .../pages/schema/CreateEmptyTableButton.svelte |  2 +-
 .../schema/CreateNewExplorationTutorial.svelte |  2 +-
 .../pages/schema/CreateNewTableButton.svelte   |  2 +-
 .../pages/schema/CreateNewTableTutorial.svelte |  2 +-
 .../src/pages/schema/ExplorationItem.svelte    |  2 +-
 .../src/pages/schema/ExplorationsList.svelte   |  2 +-
 .../src/pages/schema/SchemaExplorations.svelte |  2 +-
 .../src/pages/schema/SchemaOverview.svelte     |  2 +-
 mathesar_ui/src/pages/schema/SchemaPage.svelte |  4 ++--
 .../src/pages/schema/SchemaTables.svelte       |  2 +-
 mathesar_ui/src/pages/schema/TableCard.svelte  |  2 +-
 mathesar_ui/src/pages/schema/TablesList.svelte |  2 +-
 .../src/routes/DataExplorerRoute.svelte        |  2 +-
 mathesar_ui/src/routes/ExplorationRoute.svelte |  2 +-
 mathesar_ui/src/routes/ImportRoute.svelte      |  2 +-
 mathesar_ui/src/routes/RecordPageRoute.svelte  |  2 +-
 mathesar_ui/src/routes/SchemaRoute.svelte      |  2 +-
 mathesar_ui/src/routes/TableRoute.svelte       |  2 +-
 mathesar_ui/src/stores/schemas.ts              |  2 +-
 mathesar_ui/src/stores/tables.ts               |  3 ++-
 36 files changed, 40 insertions(+), 63 deletions(-)

diff --git a/mathesar_ui/src/AppTypes.ts b/mathesar_ui/src/AppTypes.ts
index a779ca063e..5a12d255e0 100644
--- a/mathesar_ui/src/AppTypes.ts
+++ b/mathesar_ui/src/AppTypes.ts
@@ -1,13 +1,3 @@
-/** @deprecated in favor of Connection */
-export interface Database {
-  id: number;
-  nickname: string;
-  database: string;
-  username: string;
-  host: string;
-  port: number;
-}
-
 export interface DBObjectEntry {
   id: number;
   name: string;
diff --git a/mathesar_ui/src/components/DatabaseName.svelte b/mathesar_ui/src/components/DatabaseName.svelte
index 7be52793e0..f7855f97eb 100644
--- a/mathesar_ui/src/components/DatabaseName.svelte
+++ b/mathesar_ui/src/components/DatabaseName.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Database } from '@mathesar/AppTypes';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import { iconDatabase } from '@mathesar/icons';
 
   import NameWithIcon from './NameWithIcon.svelte';
@@ -9,5 +9,5 @@
 </script>
 
 <NameWithIcon icon={iconDatabase} {iconHasBox}>
-  {database.nickname}
+  {database.name}
 </NameWithIcon>
diff --git a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
index c3c182f93a..daf3e5cada 100644
--- a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
@@ -4,8 +4,8 @@
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import { iconTable } from '@mathesar/icons';
   import { getExplorationPageUrl } from '@mathesar/routes/urls';
   import { queries as queriesStore } from '@mathesar/stores/queries';
diff --git a/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte b/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte
index d9c11af8d7..bd4ee89c19 100644
--- a/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import { iconSchema } from '@mathesar/icons';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
   import {
diff --git a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
index 3e761149fa..5d62db082d 100644
--- a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
+++ b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
@@ -1,7 +1,7 @@
 import type { QueryInstance } from '@mathesar/api/rest/types/queries';
 import type { TableEntry } from '@mathesar/api/rest/types/tables';
+import type { Database } from '@mathesar/api/rpc/databases';
 import type { Schema } from '@mathesar/api/rpc/schemas';
-import type { Database } from '@mathesar/AppTypes';
 import type {
   ComponentAndProps,
   IconProps,
diff --git a/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte b/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte
index 7057d1367f..3a3e0d5303 100644
--- a/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte
+++ b/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte
@@ -2,8 +2,8 @@
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
 
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import {
diff --git a/mathesar_ui/src/pages/database/AddEditSchemaModal.svelte b/mathesar_ui/src/pages/database/AddEditSchemaModal.svelte
index 477ec9ee99..2dc3925178 100644
--- a/mathesar_ui/src/pages/database/AddEditSchemaModal.svelte
+++ b/mathesar_ui/src/pages/database/AddEditSchemaModal.svelte
@@ -2,8 +2,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import Identifier from '@mathesar/components/Identifier.svelte';
   import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
   import NameAndDescInputModalForm from '@mathesar/components/NameAndDescInputModalForm.svelte';
diff --git a/mathesar_ui/src/pages/database/DatabaseDetails.svelte b/mathesar_ui/src/pages/database/DatabaseDetails.svelte
index 23a23c3111..c1a31ea295 100644
--- a/mathesar_ui/src/pages/database/DatabaseDetails.svelte
+++ b/mathesar_ui/src/pages/database/DatabaseDetails.svelte
@@ -1,10 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
-  import { router } from 'tinro';
-
   import { reflectApi } from '@mathesar/api/rest/reflect';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import AppSecondaryHeader from '@mathesar/components/AppSecondaryHeader.svelte';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
@@ -17,7 +15,6 @@
     iconMoreActions,
     iconRefresh,
   } from '@mathesar/icons';
-  import { CONNECTIONS_URL } from '@mathesar/routes/urls';
   import { confirmDelete } from '@mathesar/stores/confirmation';
   import { modal } from '@mathesar/stores/modal';
   import type { DBSchemaStoreData } from '@mathesar/stores/schemas';
@@ -28,10 +25,6 @@
   import { removeTablesInSchemaTablesStore } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
-  import {
-    DeleteConnectionModal,
-    EditConnectionModal,
-  } from '@mathesar/systems/connections';
   import {
     Button,
     ButtonMenuItem,
@@ -117,7 +110,7 @@
 
 <AppSecondaryHeader
   pageTitleAndMetaProps={{
-    name: database.nickname,
+    name: database.name,
     type: 'database',
     icon: iconDatabase,
   }}
@@ -228,13 +221,6 @@
   schema={targetSchema}
 />
 
-<EditConnectionModal controller={editConnectionModal} connection={database} />
-<DeleteConnectionModal
-  controller={deleteConnectionModal}
-  connection={database}
-  on:delete={() => router.goto(CONNECTIONS_URL)}
-/>
-
 <style lang="scss">
   .schema-list-wrapper {
     display: flex;
diff --git a/mathesar_ui/src/pages/database/DatabasePage.svelte b/mathesar_ui/src/pages/database/DatabasePage.svelte
index 766772ee84..b4f2d16aff 100644
--- a/mathesar_ui/src/pages/database/DatabasePage.svelte
+++ b/mathesar_ui/src/pages/database/DatabasePage.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Database } from '@mathesar/AppTypes';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
 
@@ -9,7 +9,7 @@
 </script>
 
 <svelte:head>
-  <title>{makeSimplePageTitle(database.nickname)}</title>
+  <title>{makeSimplePageTitle(database.name)}</title>
 </svelte:head>
 
 <LayoutWithHeader
diff --git a/mathesar_ui/src/pages/database/SchemaRow.svelte b/mathesar_ui/src/pages/database/SchemaRow.svelte
index 07e88ed0c8..32149dc4d3 100644
--- a/mathesar_ui/src/pages/database/SchemaRow.svelte
+++ b/mathesar_ui/src/pages/database/SchemaRow.svelte
@@ -2,8 +2,8 @@
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
 
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import DropdownMenu from '@mathesar/component-library/dropdown-menu/DropdownMenu.svelte';
   import MenuDivider from '@mathesar/component-library/menu/MenuDivider.svelte';
   import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
diff --git a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
index b9551db21f..9af3683cf6 100644
--- a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
+++ b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
@@ -3,8 +3,8 @@
   import { router } from 'tinro';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
diff --git a/mathesar_ui/src/pages/exploration/Header.svelte b/mathesar_ui/src/pages/exploration/Header.svelte
index c3a002a5e8..c50e7156a8 100644
--- a/mathesar_ui/src/pages/exploration/Header.svelte
+++ b/mathesar_ui/src/pages/exploration/Header.svelte
@@ -2,8 +2,8 @@
   import { _ } from 'svelte-i18n';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import EntityPageHeader from '@mathesar/components/EntityPageHeader.svelte';
   import { iconExploration, iconInspector } from '@mathesar/icons';
   import { getExplorationEditorPageUrl } from '@mathesar/routes/urls';
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index 838161b297..801b72c812 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -6,8 +6,8 @@
   import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import type { Column } from '@mathesar/api/rest/types/tables/columns';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import {
     Field,
     FieldLayout,
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
index 775b6d0712..80b959cf1d 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
@@ -3,8 +3,8 @@
   import { router } from 'tinro';
 
   import { dataFilesApi } from '@mathesar/api/rest/dataFiles';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { getTablePageUrl } from '@mathesar/routes/urls';
diff --git a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
index 6d7474ca8c..b825b48d0e 100644
--- a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
+++ b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
@@ -5,8 +5,8 @@ import type {
   TableEntry,
 } from '@mathesar/api/rest/types/tables';
 import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type { Database } from '@mathesar/api/rpc/databases';
 import type { Schema } from '@mathesar/api/rpc/schemas';
-import type { Database } from '@mathesar/AppTypes';
 import { getCellCap } from '@mathesar/components/cell-fabric/utils';
 import { getAbstractTypeForDbType } from '@mathesar/stores/abstract-types';
 import type {
diff --git a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
index 64c670d4d1..d41ca3b121 100644
--- a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
+++ b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
@@ -4,8 +4,8 @@
 
   import { dataFilesApi } from '@mathesar/api/rest/dataFiles';
   import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import Spinner from '@mathesar/component-library/spinner/Spinner.svelte';
   import DocsLink from '@mathesar/components/DocsLink.svelte';
   import {
diff --git a/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte b/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
index 6e288c5312..424f91fd24 100644
--- a/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
+++ b/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { router } from 'tinro';
 
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import { getTablePageUrl } from '@mathesar/routes/urls';
   import { createTable } from '@mathesar/stores/tables';
   import { Button, Spinner } from '@mathesar-component-library';
diff --git a/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte b/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte
index ea2eebf2f6..3b476254c6 100644
--- a/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte
+++ b/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
   import { AnchorButton, Tutorial } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte b/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
index 9a22b3733e..4cfeeaf0e9 100644
--- a/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
+++ b/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
@@ -2,8 +2,8 @@
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
 
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import Icon from '@mathesar/component-library/icon/Icon.svelte';
   import LinkMenuItem from '@mathesar/component-library/menu/LinkMenuItem.svelte';
   import { iconAddNew } from '@mathesar/icons';
diff --git a/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte b/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte
index 241bb17bb9..62e81a4dcb 100644
--- a/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte
+++ b/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import { getImportPageUrl } from '@mathesar/routes/urls';
   import { AnchorButton, Tutorial } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/pages/schema/ExplorationItem.svelte b/mathesar_ui/src/pages/schema/ExplorationItem.svelte
index dc2a346478..915b221e4c 100644
--- a/mathesar_ui/src/pages/schema/ExplorationItem.svelte
+++ b/mathesar_ui/src/pages/schema/ExplorationItem.svelte
@@ -2,8 +2,8 @@
   import { _ } from 'svelte-i18n';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import TableName from '@mathesar/components/TableName.svelte';
   import { iconExploration } from '@mathesar/icons';
   import { getExplorationPageUrl } from '@mathesar/routes/urls';
diff --git a/mathesar_ui/src/pages/schema/ExplorationsList.svelte b/mathesar_ui/src/pages/schema/ExplorationsList.svelte
index 8fa27682a5..8f2ae29584 100644
--- a/mathesar_ui/src/pages/schema/ExplorationsList.svelte
+++ b/mathesar_ui/src/pages/schema/ExplorationsList.svelte
@@ -2,8 +2,8 @@
   import { _ } from 'svelte-i18n';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import { iconExploration } from '@mathesar/icons';
 
   import EmptyEntity from './EmptyEntity.svelte';
diff --git a/mathesar_ui/src/pages/schema/SchemaExplorations.svelte b/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
index 963b7d907a..6afd536fb0 100644
--- a/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
@@ -2,8 +2,8 @@
   import { _ } from 'svelte-i18n';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
diff --git a/mathesar_ui/src/pages/schema/SchemaOverview.svelte b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
index 9f5a876627..f87d78d27b 100644
--- a/mathesar_ui/src/pages/schema/SchemaOverview.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
@@ -4,8 +4,8 @@
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
   import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import SpinnerButton from '@mathesar/component-library/spinner-button/SpinnerButton.svelte';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { iconRefresh } from '@mathesar/icons';
diff --git a/mathesar_ui/src/pages/schema/SchemaPage.svelte b/mathesar_ui/src/pages/schema/SchemaPage.svelte
index 4a7a422761..46edde48be 100644
--- a/mathesar_ui/src/pages/schema/SchemaPage.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPage.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import AppSecondaryHeader from '@mathesar/components/AppSecondaryHeader.svelte';
   import { iconEdit, iconSchema } from '@mathesar/icons';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
@@ -75,7 +75,7 @@
   $: isDefault = schema.name === 'public';
 
   logEvent('opened_schema', {
-    database_name: database.nickname,
+    database_name: database.name,
     schema_name: schema.name,
     source: 'schema_page',
   });
diff --git a/mathesar_ui/src/pages/schema/SchemaTables.svelte b/mathesar_ui/src/pages/schema/SchemaTables.svelte
index c9359c6c78..c42b93f791 100644
--- a/mathesar_ui/src/pages/schema/SchemaTables.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaTables.svelte
@@ -2,8 +2,8 @@
   import { _ } from 'svelte-i18n';
 
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
 
diff --git a/mathesar_ui/src/pages/schema/TableCard.svelte b/mathesar_ui/src/pages/schema/TableCard.svelte
index 3ec354c5ab..27806d376c 100644
--- a/mathesar_ui/src/pages/schema/TableCard.svelte
+++ b/mathesar_ui/src/pages/schema/TableCard.svelte
@@ -2,8 +2,8 @@
   import { _ } from 'svelte-i18n';
 
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import LinkMenuItem from '@mathesar/component-library/menu/LinkMenuItem.svelte';
   import TableName from '@mathesar/components/TableName.svelte';
   import {
diff --git a/mathesar_ui/src/pages/schema/TablesList.svelte b/mathesar_ui/src/pages/schema/TablesList.svelte
index 403b8c6aad..a3392f9bbe 100644
--- a/mathesar_ui/src/pages/schema/TablesList.svelte
+++ b/mathesar_ui/src/pages/schema/TablesList.svelte
@@ -2,8 +2,8 @@
   import { _ } from 'svelte-i18n';
 
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import { iconTable } from '@mathesar/icons';
 
   import EmptyEntity from './EmptyEntity.svelte';
diff --git a/mathesar_ui/src/routes/DataExplorerRoute.svelte b/mathesar_ui/src/routes/DataExplorerRoute.svelte
index 6e792991fd..9b5388fbba 100644
--- a/mathesar_ui/src/routes/DataExplorerRoute.svelte
+++ b/mathesar_ui/src/routes/DataExplorerRoute.svelte
@@ -4,8 +4,8 @@
   import { router } from 'tinro';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import type { CancellablePromise } from '@mathesar/component-library';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import { iconEdit, iconExploration } from '@mathesar/icons';
diff --git a/mathesar_ui/src/routes/ExplorationRoute.svelte b/mathesar_ui/src/routes/ExplorationRoute.svelte
index c8354d2a1c..55d02030f0 100644
--- a/mathesar_ui/src/routes/ExplorationRoute.svelte
+++ b/mathesar_ui/src/routes/ExplorationRoute.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import ExplorationPage from '@mathesar/pages/exploration/ExplorationPage.svelte';
diff --git a/mathesar_ui/src/routes/ImportRoute.svelte b/mathesar_ui/src/routes/ImportRoute.svelte
index 7d92797891..0bcf4d339a 100644
--- a/mathesar_ui/src/routes/ImportRoute.svelte
+++ b/mathesar_ui/src/routes/ImportRoute.svelte
@@ -2,8 +2,8 @@
   import { _ } from 'svelte-i18n';
   import { Route } from 'tinro';
 
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import { iconImportData } from '@mathesar/icons';
   import ImportPreviewPage from '@mathesar/pages/import/preview/ImportPreviewPage.svelte';
diff --git a/mathesar_ui/src/routes/RecordPageRoute.svelte b/mathesar_ui/src/routes/RecordPageRoute.svelte
index 82f16ba0f7..727ee2d7d9 100644
--- a/mathesar_ui/src/routes/RecordPageRoute.svelte
+++ b/mathesar_ui/src/routes/RecordPageRoute.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import type { TableEntry } from '@mathesar/api/rest/types/tables';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import RecordPage from '@mathesar/pages/record/RecordPage.svelte';
   import RecordStore from '@mathesar/pages/record/RecordStore';
diff --git a/mathesar_ui/src/routes/SchemaRoute.svelte b/mathesar_ui/src/routes/SchemaRoute.svelte
index bcd533d64c..02f55d66fe 100644
--- a/mathesar_ui/src/routes/SchemaRoute.svelte
+++ b/mathesar_ui/src/routes/SchemaRoute.svelte
@@ -3,7 +3,7 @@
   import { _ } from 'svelte-i18n';
   import { Route } from 'tinro';
 
-  import type { Database } from '@mathesar/AppTypes';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import MultiPathRoute from '@mathesar/components/routing/MultiPathRoute.svelte';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
diff --git a/mathesar_ui/src/routes/TableRoute.svelte b/mathesar_ui/src/routes/TableRoute.svelte
index f75cc14cb3..da697eb55f 100644
--- a/mathesar_ui/src/routes/TableRoute.svelte
+++ b/mathesar_ui/src/routes/TableRoute.svelte
@@ -3,8 +3,8 @@
   import { _ } from 'svelte-i18n';
   import { Route } from 'tinro';
 
+  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/AppTypes';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import TablePage from '@mathesar/pages/table/TablePage.svelte';
diff --git a/mathesar_ui/src/stores/schemas.ts b/mathesar_ui/src/stores/schemas.ts
index 2a5d31374a..f53d6c518b 100644
--- a/mathesar_ui/src/stores/schemas.ts
+++ b/mathesar_ui/src/stores/schemas.ts
@@ -86,7 +86,7 @@ function removeSchemaInDBSchemaStore(
 }
 
 export function addCountToSchemaNumTables(
-  connection: Connection,
+  connection: Pick<Connection, 'id'>,
   schema: Schema,
   count: number,
 ) {
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index 219cc4407c..f80e6785a4 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -35,8 +35,9 @@ import {
   patchAPI,
   postAPI,
 } from '@mathesar/api/rest/utils/requestUtils';
+import type { Database } from '@mathesar/api/rpc/databases';
 import type { Schema } from '@mathesar/api/rpc/schemas';
-import type { DBObjectEntry, Database } from '@mathesar/AppTypes';
+import type { DBObjectEntry } from '@mathesar/AppTypes';
 import { invalidIf } from '@mathesar/components/form';
 import type { AtLeastOne } from '@mathesar/typeUtils';
 import { preloadCommonData } from '@mathesar/utils/preloadData';

From 9c0d7690ffae6ed99907f82f36cd4222108108c8 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 24 Jul 2024 15:38:54 +0800
Subject: [PATCH 0492/1141] wire new records search up to RPC endpoint

---
 db/records/operations/select.py      | 26 +++++++++++++
 mathesar/rpc/records.py              | 58 +++++++++++++++++++++++++++-
 mathesar/tests/rpc/test_endpoints.py |  5 +++
 mathesar/tests/rpc/test_records.py   |  3 +-
 4 files changed, 88 insertions(+), 4 deletions(-)

diff --git a/db/records/operations/select.py b/db/records/operations/select.py
index da6a45c00a..a32ee0a382 100644
--- a/db/records/operations/select.py
+++ b/db/records/operations/select.py
@@ -50,6 +50,32 @@ def list_records_from_table(
     return result
 
 
+def search_records_from_table(
+        conn,
+        table_oid,
+        search=[],
+        limit=10,
+):
+    """
+    Get records from a table, according to a search specification
+
+    Only data from which the user is granted `SELECT` is returned.
+
+    Args:
+        tab_id: The OID of the table whose records we'll get.
+        search: A list of dictionaries defining a search.
+        limit: The maximum number of rows we'll return.
+
+    The search definition objects should have the form
+    {"attnum": <int>, "direction": <text>}
+    """
+    search = search or []
+    result = db_conn.exec_msar_func(
+        conn, 'search_records_from_table', table_oid, json.dumps(search), limit
+    ).fetchone()[0]
+    return result
+
+
 def get_record(table, engine, id_value):
     primary_key_column = get_primary_key_column(table)
     pg_query = select(table).where(primary_key_column == id_value)
diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index ca10f0cd40..028f5fe859 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -6,7 +6,7 @@
 from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
 
-from db.records.operations.select import list_records_from_table
+from db.records.operations import select as record_select
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
 
@@ -62,6 +62,18 @@ class Filter(TypedDict):
     args: list[Union['Filter', FilterAttnum, FilterLiteral]]
 
 
+class SearchParam(TypedDict):
+    """
+    Search definition for a single column.
+
+    Attributes:
+        attnum: The attnum of the column in the table.
+        literal: The literal to search for in the column.
+    """
+    attnum: int
+    literal: Any
+
+
 class RecordList(TypedDict):
     """
     Records from a table, along with some meta data
@@ -125,7 +137,7 @@ def list_(
     """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
-        record_info = list_records_from_table(
+        record_info = record_select.list_records_from_table(
             conn,
             table_oid,
             limit=limit,
@@ -135,3 +147,45 @@ def list_(
             group=group,
         )
     return RecordList.from_dict(record_info)
+
+
+@rpc_method(name="records.search")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def search(
+        *,
+        table_oid: int,
+        database_id: int,
+        search_params: list[SearchParam] = [],
+        limit: int = 10,
+        **kwargs
+) -> RecordList:
+    """
+    List records from a table according to `search_params`.
+
+
+    Literals will be searched for in a basic way in string-like columns,
+    but will have to match exactly in non-string-like columns.
+
+    Records are assigned a score based on how many matches, and of what
+    quality, they have with the passed search parameters.
+
+    Args:
+        table_oid: Identity of the table in the user's database.
+        database_id: The Django id of the database containing the table.
+        search_params: Results are ranked and filtered according to the
+                       objects passed here.
+        limit: The maximum number of rows we'll return.
+
+    Returns:
+        The requested records, along with some metadata.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        record_info = record_select.search_records_from_table(
+            conn,
+            table_oid,
+            search=search_params,
+            limit=limit,
+        )
+    return RecordList.from_dict(record_info)
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 7b64967ff5..ce1c090d4b 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -144,6 +144,11 @@
         "records.list",
         [user_is_authenticated]
     ),
+    (
+        records.search,
+        "records.search",
+        [user_is_authenticated]
+    ),
     (
         explorations.list_,
         "explorations.list",
diff --git a/mathesar/tests/rpc/test_records.py b/mathesar/tests/rpc/test_records.py
index 5ba961b813..a43660f8dd 100644
--- a/mathesar/tests/rpc/test_records.py
+++ b/mathesar/tests/rpc/test_records.py
@@ -37,7 +37,6 @@ def mock_list_records(
             order=None,
             filter=None,
             group=None,
-            search=None,
     ):
         if _table_oid != table_oid:
             raise AssertionError('incorrect parameters passed')
@@ -48,7 +47,7 @@ def mock_list_records(
         }
 
     monkeypatch.setattr(records, 'connect', mock_connect)
-    monkeypatch.setattr(records, 'list_records_from_table', mock_list_records)
+    monkeypatch.setattr(records.record_select, 'list_records_from_table', mock_list_records)
     expect_records_list = {
         "count": 50123,
         "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],

From 75d842aa4f1f763476978eb43b5d01f8af405bc5 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 24 Jul 2024 18:29:59 +0800
Subject: [PATCH 0493/1141] add basic SQL tests for search function

---
 db/sql/00_msar.sql      |   4 +-
 db/sql/test_00_msar.sql | 109 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 111 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index f59fda9778..bd326745ee 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3575,8 +3575,8 @@ BEGIN
       SELECT %1$s FROM %2$I.%3$I WHERE %4$s >0 ORDER BY %6$s LIMIT %5$L
     )
     SELECT jsonb_build_object(
-      'results', jsonb_agg(row_to_json(results_cte.*)),
-      'count', max(count_cte.count),
+      'results', coalesce(jsonb_agg(row_to_json(results_cte.*)), jsonb_build_array()),
+      'count', coalesce(max(count_cte.count), 0),
       'query', $iq$SELECT %1$s FROM %2$I.%3$I WHERE %4$s >0 ORDER BY %6$s LIMIT %5$L$iq$
     )
     FROM results_cte, count_cte
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index b6cdedc554..bbb2755fb2 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -3249,3 +3249,112 @@ BEGIN
   );
 END;
 $$ LANGUAGE plpgsql;
+
+
+-- msar.search_records_from_table ------------------------------------------------------------------
+
+CREATE OR REPLACE FUNCTION __setup_search_records_table() RETURNS SETOF TEXT AS $$
+BEGIN
+  CREATE TABLE atable (
+    id integer PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
+    col1 integer,
+    col2 varchar,
+    coltodrop integer
+  );
+  ALTER TABLE atable DROP COLUMN coltodrop;
+  INSERT INTO atable (col1, col2) VALUES
+    (1, 'bcdea'),
+    (12, 'vwxyz'),
+    (1, 'edcba'),
+    (2, 'abcde');
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_search_records_from_table() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+  search_result jsonb;
+BEGIN
+  PERFORM __setup_search_records_table();
+  rel_id := 'atable'::regclass::oid;
+  search_result := msar.search_records_from_table(
+    rel_id,
+    jsonb_build_array(
+      jsonb_build_object('attnum', 2, 'literal', 3)
+    ),
+    10
+  );
+  RETURN NEXT is(search_result -> 'results', jsonb_build_array());
+  RETURN NEXT is((search_result -> 'count')::integer, 0);
+
+  search_result := msar.search_records_from_table(
+    rel_id,
+    jsonb_build_array(
+      jsonb_build_object('attnum', 3, 'literal', 'bc')
+    ),
+    10
+  );
+  RETURN NEXT is(
+    search_result -> 'results',
+    jsonb_build_array(
+      jsonb_build_object('1', 1, '2', 1, '3', 'bcdea'),
+      jsonb_build_object('1', 4, '2', 2, '3', 'abcde')
+    )
+  );
+  RETURN NEXT is((search_result -> 'count')::integer, 2);
+
+  search_result := msar.search_records_from_table(
+    rel_id,
+    jsonb_build_array(
+      jsonb_build_object('attnum', 3, 'literal', 'b'),
+      jsonb_build_object('attnum', 2, 'literal', 1)
+    ),
+    10
+  );
+  RETURN NEXT is(
+    search_result -> 'results',
+    jsonb_build_array(
+      jsonb_build_object('1', 1, '2', 1, '3', 'bcdea'),
+      jsonb_build_object('1', 3, '2', 1, '3', 'edcba'),
+      jsonb_build_object('1', 4, '2', 2, '3', 'abcde')
+    )
+  );
+  RETURN NEXT is((search_result -> 'count')::integer, 3);
+
+  search_result := msar.search_records_from_table(
+    rel_id,
+    jsonb_build_array(
+      jsonb_build_object('attnum', 3, 'literal', 'a'),
+      jsonb_build_object('attnum', 2, 'literal', 1)
+    ),
+    10
+  );
+  RETURN NEXT is(
+    search_result -> 'results',
+    jsonb_build_array(
+      jsonb_build_object('1', 1, '2', 1, '3', 'bcdea'),
+      jsonb_build_object('1', 3, '2', 1, '3', 'edcba'),
+      jsonb_build_object('1', 4, '2', 2, '3', 'abcde')
+    )
+  );
+  RETURN NEXT is((search_result -> 'count')::integer, 3);
+
+  search_result := msar.search_records_from_table(
+    rel_id,
+    jsonb_build_array(
+      jsonb_build_object('attnum', 3, 'literal', 'a')
+    ),
+    10
+  );
+  RETURN NEXT is(
+    search_result -> 'results',
+    jsonb_build_array(
+      jsonb_build_object('1', 4, '2', 2, '3', 'abcde'),
+      jsonb_build_object('1', 1, '2', 1, '3', 'bcdea'),
+      jsonb_build_object('1', 3, '2', 1, '3', 'edcba')
+    )
+  );
+  RETURN NEXT is((search_result -> 'count')::integer, 3);
+END;
+$$ LANGUAGE plpgsql;

From fc086e9d3c11ea5dbc0c51d6e17ab3d7ffb692ab Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 24 Jul 2024 18:31:41 +0800
Subject: [PATCH 0494/1141] fix no records found bug

---
 db/sql/00_msar.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index bd326745ee..4ff6570d8a 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3498,8 +3498,8 @@ BEGIN
       SELECT %1$s FROM %2$I.%3$I %7$s %6$s LIMIT %4$L OFFSET %5$L
     )
     SELECT jsonb_build_object(
-      'results', jsonb_agg(row_to_json(results_cte.*)),
-      'count', max(count_cte.count),
+      'results', coalesce(jsonb_agg(row_to_json(results_cte.*)), jsonb_build_array()),
+      'count', coalesce(max(count_cte.count), 0),
       'query', $iq$SELECT %1$s FROM %2$I.%3$I %7$s %6$s LIMIT %4$L OFFSET %5$L$iq$
     )
     FROM results_cte, count_cte

From c0944cdc1cf34ea0c5defedf25f841e39d43f91d Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 24 Jul 2024 16:11:43 +0530
Subject: [PATCH 0495/1141] Rename connections route to databases, add
 databases to common_data

---
 mathesar/urls.py                              |   8 +-
 mathesar/views.py                             | 206 +++++-------------
 .../src/routes/AuthenticatedRoutes.svelte     |   2 +-
 mathesar_ui/src/utils/preloadData.ts          |   2 +
 4 files changed, 67 insertions(+), 151 deletions(-)

diff --git a/mathesar/urls.py b/mathesar/urls.py
index 8f80565ad0..1daba441f7 100644
--- a/mathesar/urls.py
+++ b/mathesar/urls.py
@@ -56,12 +56,12 @@
     path('administration/update/', views.admin_home, name='admin_update'),
     path('shares/tables/<slug>/', views.shared_table, name='shared_table'),
     path('shares/explorations/<slug>/', views.shared_query, name='shared_query'),
-    path('connections/', views.connections, name='connections'),
-    path('db/<connection_id>/', views.schemas, name='schemas'),
+    path('databases/', views.databases, name='databases'),
+    path('db/<database_id>/', views.schemas, name='schemas'),
     path('i18n/', include('django.conf.urls.i18n')),
     re_path(
-        r'^db/(?P<connection_id>\w+)/(?P<schema_id>\w+)/',
-        views.schemas,
+        r'^db/(?P<database_id>\w+)/(?P<schema_id>\w+)/',
+        views.schemas_home,
         name='schema_home'
     ),
 ]
diff --git a/mathesar/views.py b/mathesar/views.py
index 4199ee79ee..131b321ac5 100644
--- a/mathesar/views.py
+++ b/mathesar/views.py
@@ -1,111 +1,49 @@
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.shortcuts import render, redirect, get_object_or_404
+from django.shortcuts import render, redirect
 from modernrpc.views import RPCEntryPoint
 from rest_framework import status
 from rest_framework.decorators import api_view
 from rest_framework.response import Response
 
+from mathesar.rpc.databases import list_ as databases_list
 from mathesar.rpc.schemas import list_ as schemas_list
-from mathesar.api.db.permissions.database import DatabaseAccessPolicy
-from mathesar.api.db.permissions.query import QueryAccessPolicy
-from mathesar.api.db.permissions.schema import SchemaAccessPolicy
-from mathesar.api.db.permissions.table import TableAccessPolicy
-from mathesar.api.serializers.databases import ConnectionSerializer, TypeSerializer
-from mathesar.api.serializers.schemas import SchemaSerializer
+from mathesar.api.serializers.databases import TypeSerializer
 from mathesar.api.serializers.tables import TableSerializer
 from mathesar.api.serializers.queries import QuerySerializer
 from mathesar.api.ui.serializers.users import UserSerializer
 from mathesar.api.utils import is_valid_uuid_v4
 from mathesar.database.types import UIType
-from mathesar.models.deprecated import Connection, Schema, Table
-from mathesar.models.query import Exploration
+from mathesar.models.deprecated import Connection
 from mathesar.models.shares import SharedTable, SharedQuery
 from mathesar.state import reset_reflection
 from mathesar import __version__
 
 
-def get_schema_list(request, database):
-    if database is not None:
-        return schemas_list(request=request, database_id=database.id)
+def get_schema_list(request, database_id):
+    if database_id is not None:
+        return schemas_list(request=request, database_id=database_id)
     else:
         return []
 
 
-def _get_permissible_db_queryset(request):
-    """
-    Returns the queryset for connections a user is permitted to access.
-
-    Note, connections that a user is permitted to access is the union of those
-    permitted by DatabaseAccessPolicy and those containing Schemas permitted by
-    SchemaAccessPolicy.
-    """
-    for deleted in (True, False):
-        dbs_qs = Connection.objects.filter(deleted=deleted)
-        permitted_dbs_qs = DatabaseAccessPolicy.scope_queryset(request, dbs_qs)
-        schemas_qs = Schema.objects.all()
-        permitted_schemas_qs = SchemaAccessPolicy.scope_queryset(request, schemas_qs)
-        dbs_containing_permitted_schemas_qs = Connection.objects.filter(schemas__in=permitted_schemas_qs, deleted=deleted)
-        permitted_dbs_qs = permitted_dbs_qs | dbs_containing_permitted_schemas_qs
-        permitted_dbs_qs = permitted_dbs_qs.distinct()
-        if deleted:
-            failed_permitted_dbs_qs = permitted_dbs_qs
-        else:
-            successful_permitted_dbs_qs = permitted_dbs_qs
-    return successful_permitted_dbs_qs, failed_permitted_dbs_qs
-
-
 def get_database_list(request):
-    permission_restricted_db_qs, permission_restricted_failed_db_qs = _get_permissible_db_queryset(request)
-    database_serializer = ConnectionSerializer(
-        permission_restricted_db_qs,
-        many=True,
-        context={'request': request}
-    )
-    failed_db_data = []
-    for db in permission_restricted_failed_db_qs:
-        failed_db_data.append({
-            'id': db.id,
-            'username': db.username,
-            'port': db.port,
-            'host': db.host,
-            'nickname': db.name,
-            'database': db.db_name,
-            'error': 'Error connecting to the database'
-        })
-    return database_serializer.data + failed_db_data
+    return databases_list(request=request)
 
 
-def get_table_list(request, schema):
-    if schema is None:
-        return []
-    qs = Table.objects.filter(schema=schema)
-    permission_restricted_qs = TableAccessPolicy.scope_queryset(request, qs)
-    table_serializer = TableSerializer(
-        permission_restricted_qs,
-        many=True,
-        context={'request': request}
-    )
-    return table_serializer.data
-
+def get_table_list(request, schema_id):
+    # TODO: Fill this method
+    return []
 
-def get_queries_list(request, schema):
-    if schema is None:
-        return []
-    qs = Exploration.objects.filter(base_table__schema=schema)
-    permission_restricted_qs = QueryAccessPolicy.scope_queryset(request, qs)
 
-    query_serializer = QuerySerializer(
-        permission_restricted_qs,
-        many=True,
-        context={'request': request}
-    )
-    return query_serializer.data
+def get_queries_list(request, schema_id):
+    # TODO: Fill this method
+    return []
 
 
-def get_ui_type_list(request, database):
-    if database is None:
+def get_ui_type_list(request, database_id):
+    if database_id is None:
         return []
     type_serializer = TypeSerializer(
         UIType,
@@ -124,22 +62,6 @@ def get_user_data(request):
     return user_serializer.data
 
 
-def get_base_data_all_routes(request, database=None, schema=None):
-    return {
-        'current_connection': database.id if database else None,
-        'current_schema': schema.id if schema else None,
-        'schemas': [],
-        'connections': [],
-        'tables': [],
-        'queries': [],
-        'abstract_types': get_ui_type_list(request, database),
-        'user': get_user_data(request),
-        'is_authenticated': not request.user.is_anonymous,
-        'current_release_tag_name': __version__,
-        'internal_db_connection': _get_internal_db_meta(),
-    }
-
-
 def _get_internal_db_meta():
     internal_db = Connection.create_from_settings_key('default')
     if internal_db is not None:
@@ -154,56 +76,42 @@ def _get_internal_db_meta():
         return {'type': 'sqlite'}
 
 
-def get_common_data(request, database=None, schema=None):
+def _get_base_data_all_routes(request, database_id=None, schema_id=None):
     return {
-        **get_base_data_all_routes(request, database, schema),
-        'schemas': get_schema_list(request, database),
-        'connections': get_database_list(request),
-        'tables': get_table_list(request, schema),
-        'queries': get_queries_list(request, schema),
+        'abstract_types': get_ui_type_list(request, database_id),
+        'current_database': database_id,
+        'current_schema': schema_id,
+        'current_release_tag_name': __version__,
+        'databases': get_database_list(request),
+        'internal_db_connection': _get_internal_db_meta(),
+        'is_authenticated': not request.user.is_anonymous,
+        'queries': [],
+        'schemas': get_schema_list(request, database_id),
         'supported_languages': dict(getattr(settings, 'LANGUAGES', [])),
-        'routing_context': 'normal',
+        'tables': [],
+        'user': get_user_data(request)
     }
 
 
-def get_current_database(request, connection_id):
-    """Get database from passed name, with fall back behavior."""
-    successful_dbs, failed_dbs = _get_permissible_db_queryset(request)
-    permitted_databases = successful_dbs | failed_dbs
-    if connection_id is not None:
-        current_database = get_object_or_404(permitted_databases, id=connection_id)
-    else:
-        current_database = None
-    return current_database
-
-
-def render_schema(request, database, schema):
-    # if there's no schema available, redirect to the schemas page.
-    if not schema:
-        return redirect('schemas', db_name=database.name)
-    else:
-        # We are redirecting so that the correct URL is passed to the frontend.
-        return redirect('schema_home', db_name=database.name, schema_id=schema.id)
+def get_common_data(request, database_id=None, schema_id=None):
+    return {
+        **_get_base_data_all_routes(request, database_id, schema_id),
+        'tables': get_table_list(request, schema_id),
+        'queries': get_queries_list(request, schema_id),
+        'routing_context': 'normal',
+    }
 
 
 def get_common_data_for_shared_entity(request, schema=None):
-    database = schema.database if schema else None
-    schemas = [schema] if schema else []
-    databases = [database] if database else []
-    serialized_schemas = SchemaSerializer(
-        schemas,
-        many=True,
-        context={'request': request}
-    ).data
-    serialized_databases = ConnectionSerializer(
-        databases,
-        many=True,
-        context={'request': request}
-    ).data
+    # TODO: Provide only authorized schemas & databases
+    # database = schema.database if schema else None
+    # schemas = [schema] if schema else []
+    # databases = [database] if database else []
     return {
-        **get_base_data_all_routes(request, database, schema),
-        'schemas': serialized_schemas,
-        'connections': serialized_databases,
+        # **_get_base_data_all_routes(request, database, schema),
+        # 'schemas': serialized_schemas,
+        # 'databases': serialized_databases,
+        **_get_base_data_all_routes(request),
         'routing_context': 'anonymous',
     }
 
@@ -249,13 +157,13 @@ def reflect_all(_):
 
 @login_required
 def home(request):
-    connection_list = get_database_list(request)
-    number_of_connections = len(connection_list)
-    if number_of_connections > 1:
-        return redirect('connections')
-    elif number_of_connections == 1:
-        db = connection_list[0]
-        return redirect('schemas', connection_id=db['id'])
+    database_list = get_database_list(request)
+    number_of_databases = len(database_list)
+    if number_of_databases > 1:
+        return redirect('databases')
+    elif number_of_databases == 1:
+        db = database_list[0]
+        return redirect('schemas', database_id=db['id'])
     else:
         return render(request, 'mathesar/index.html', {
             'common_data': get_common_data(request)
@@ -263,7 +171,7 @@ def home(request):
 
 
 @login_required
-def connections(request):
+def databases(request):
     return render(request, 'mathesar/index.html', {
         'common_data': get_common_data(request)
     })
@@ -284,10 +192,16 @@ def admin_home(request, **kwargs):
 
 
 @login_required
-def schemas(request, connection_id, **kwargs):
-    database = get_current_database(request, connection_id)
+def schemas(request, database_id, **kwargs):
+    return render(request, 'mathesar/index.html', {
+        'common_data': get_common_data(request, database_id, None)
+    })
+
+
+@login_required
+def schemas_home(request, database_id, schema_id, **kwargs):
     return render(request, 'mathesar/index.html', {
-        'common_data': get_common_data(request, database, None)
+        'common_data': get_common_data(request, database_id, schema_id)
     })
 
 
diff --git a/mathesar_ui/src/routes/AuthenticatedRoutes.svelte b/mathesar_ui/src/routes/AuthenticatedRoutes.svelte
index 30cd000f15..b5ecbfd42c 100644
--- a/mathesar_ui/src/routes/AuthenticatedRoutes.svelte
+++ b/mathesar_ui/src/routes/AuthenticatedRoutes.svelte
@@ -44,7 +44,7 @@
   <DatabaseRoute connectionId={parseInt(meta.params.connectionId, 10)} />
 </Route>
 
-<Route path="/connections">
+<Route path="/databases">
   <AppendBreadcrumb item={{ type: 'connectionList' }} />
   <ConnectionsPage />
 </Route>
diff --git a/mathesar_ui/src/utils/preloadData.ts b/mathesar_ui/src/utils/preloadData.ts
index c857d24128..381e3fc814 100644
--- a/mathesar_ui/src/utils/preloadData.ts
+++ b/mathesar_ui/src/utils/preloadData.ts
@@ -2,11 +2,13 @@ import type { Connection } from '@mathesar/api/rest/connections';
 import type { QueryInstance } from '@mathesar/api/rest/types/queries';
 import type { TableEntry } from '@mathesar/api/rest/types/tables';
 import type { User } from '@mathesar/api/rest/users';
+import type { Database } from '@mathesar/api/rpc/databases';
 import type { Schema } from '@mathesar/api/rpc/schemas';
 import type { AbstractTypeResponse } from '@mathesar/AppTypes';
 
 export interface CommonData {
   connections: Connection[];
+  databases: Database[];
   schemas: Schema[];
   tables: TableEntry[];
   queries: QueryInstance[];

From 773ccbe5346be86a4a1ccc4fbc204df518cb617a Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 24 Jul 2024 16:42:19 +0530
Subject: [PATCH 0496/1141] remove defaults from column metadata

---
 ...lter_columnmetadata_bool_false_and_more.py | 78 +++++++++++++++++++
 mathesar/models/base.py                       | 26 +++----
 2 files changed, 91 insertions(+), 13 deletions(-)
 create mode 100644 mathesar/migrations/0013_alter_columnmetadata_bool_false_and_more.py

diff --git a/mathesar/migrations/0013_alter_columnmetadata_bool_false_and_more.py b/mathesar/migrations/0013_alter_columnmetadata_bool_false_and_more.py
new file mode 100644
index 0000000000..3fb9759fbf
--- /dev/null
+++ b/mathesar/migrations/0013_alter_columnmetadata_bool_false_and_more.py
@@ -0,0 +1,78 @@
+# Generated by Django 4.2.11 on 2024-07-24 10:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mathesar', '0012_merge_20240718_0628'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='columnmetadata',
+            name='bool_false',
+            field=models.CharField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='columnmetadata',
+            name='bool_input',
+            field=models.CharField(choices=[('dropdown', 'dropdown'), ('checkbox', 'checkbox')], null=True),
+        ),
+        migrations.AlterField(
+            model_name='columnmetadata',
+            name='bool_true',
+            field=models.CharField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='columnmetadata',
+            name='date_format',
+            field=models.CharField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='columnmetadata',
+            name='duration_max',
+            field=models.CharField(max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='columnmetadata',
+            name='duration_min',
+            field=models.CharField(max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='columnmetadata',
+            name='duration_show_units',
+            field=models.BooleanField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='columnmetadata',
+            name='mon_currency_location',
+            field=models.CharField(choices=[('after-minus', 'after-minus'), ('end-with-space', 'end-with-space')], null=True),
+        ),
+        migrations.AlterField(
+            model_name='columnmetadata',
+            name='mon_currency_symbol',
+            field=models.CharField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='columnmetadata',
+            name='num_max_frac_digits',
+            field=models.PositiveIntegerField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='columnmetadata',
+            name='num_min_frac_digits',
+            field=models.PositiveIntegerField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='columnmetadata',
+            name='num_show_as_perc',
+            field=models.BooleanField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='columnmetadata',
+            name='time_format',
+            field=models.CharField(null=True),
+        ),
+    ]
diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index 08bb6d34cd..cb0606bba8 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -88,23 +88,23 @@ class ColumnMetaData(BaseModel):
     attnum = models.SmallIntegerField()
     bool_input = models.CharField(
         choices=[("dropdown", "dropdown"), ("checkbox", "checkbox")],
-        blank=True
+        null=True
     )
-    bool_true = models.CharField(default='True')
-    bool_false = models.CharField(default='False')
-    num_min_frac_digits = models.PositiveIntegerField(default=0)
-    num_max_frac_digits = models.PositiveIntegerField(default=20)
-    num_show_as_perc = models.BooleanField(default=False)
-    mon_currency_symbol = models.CharField(default="$")
+    bool_true = models.CharField(null=True)
+    bool_false = models.CharField(null=True)
+    num_min_frac_digits = models.PositiveIntegerField(null=True)
+    num_max_frac_digits = models.PositiveIntegerField(null=True)
+    num_show_as_perc = models.BooleanField(null=True)
+    mon_currency_symbol = models.CharField(null=True)
     mon_currency_location = models.CharField(
         choices=[("after-minus", "after-minus"), ("end-with-space", "end-with-space")],
-        default="after-minus"
+        null=True
     )
-    time_format = models.CharField(blank=True)
-    date_format = models.CharField(blank=True)
-    duration_min = models.CharField(max_length=255, blank=True)
-    duration_max = models.CharField(max_length=255, blank=True)
-    duration_show_units = models.BooleanField(default=True)
+    time_format = models.CharField(null=True)
+    date_format = models.CharField(null=True)
+    duration_min = models.CharField(max_length=255, null=True)
+    duration_max = models.CharField(max_length=255, null=True)
+    duration_show_units = models.BooleanField(null=True)
 
     class Meta:
         constraints = [

From 88a005250966a683cb07fa443137ef665d3fb8f2 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 24 Jul 2024 16:53:17 +0530
Subject: [PATCH 0497/1141] Send server, database, and configured_role info in
 database_setup response instead of just the ids

---
 mathesar/rpc/database_setup.py | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/mathesar/rpc/database_setup.py b/mathesar/rpc/database_setup.py
index ce2ac09fb0..d81b936d41 100644
--- a/mathesar/rpc/database_setup.py
+++ b/mathesar/rpc/database_setup.py
@@ -8,6 +8,9 @@
 
 from mathesar.utils import permissions
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+from mathesar.rpc.servers import ServerInfo
+from mathesar.rpc.databases import DatabaseInfo
+from mathesar.rpc.configured_roles import ConfiguredRoleInfo
 
 
 class DatabaseConnectionResult(TypedDict):
@@ -18,20 +21,20 @@ class DatabaseConnectionResult(TypedDict):
     Database, and ConfiguredRole models, as well as a UserDatabaseRoleMap entry.
 
     Attributes:
-        server_id: The Django ID of the Server model instance.
-        database_id: The Django ID of the Database model instance.
-        configured_role_id: The Django ID of the ConfiguredRole model instance.
+        server: Information on the Server model instance.
+        database: Information on the Database model instance.
+        configured_role: Information on the ConfiguredRole model instance.
     """
-    server_id: int
-    database_id: int
-    configured_role_id: int
+    server: ServerInfo
+    database: DatabaseInfo
+    configured_role: ConfiguredRoleInfo
 
     @classmethod
     def from_model(cls, model):
         return cls(
-            server_id=model.server.id,
-            database_id=model.database.id,
-            configured_role_id=model.configured_role.id,
+            server=ServerInfo.from_model(model.server),
+            database=DatabaseInfo.from_model(model.database),
+            configured_role=ConfiguredRoleInfo.from_model(model.configured_role),
         )
 
 

From 31ffec5dcbf6d28cb6b8dceb393cadea681e2e0a Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 24 Jul 2024 17:17:04 +0530
Subject: [PATCH 0498/1141] Specify rpc endpoints in the index file and update
 return types in DatabaseConnectionResult

---
 mathesar_ui/.eslintrc.cjs                   | 1 +
 mathesar_ui/src/api/rpc/configured_roles.ts | 3 ++-
 mathesar_ui/src/api/rpc/database_setup.ts   | 9 +++++----
 mathesar_ui/src/api/rpc/index.ts            | 8 ++++++++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/mathesar_ui/.eslintrc.cjs b/mathesar_ui/.eslintrc.cjs
index 6b30ababfa..f2212d4005 100644
--- a/mathesar_ui/.eslintrc.cjs
+++ b/mathesar_ui/.eslintrc.cjs
@@ -189,6 +189,7 @@ module.exports = {
             ts: 'never',
           },
         ],
+        'import/no-unresolved': 'off',
         'import/prefer-default-export': 'off',
         'no-void': 'off',
         'no-underscore-dangle': 'off',
diff --git a/mathesar_ui/src/api/rpc/configured_roles.ts b/mathesar_ui/src/api/rpc/configured_roles.ts
index d5a3f0b45a..351452b2f6 100644
--- a/mathesar_ui/src/api/rpc/configured_roles.ts
+++ b/mathesar_ui/src/api/rpc/configured_roles.ts
@@ -8,7 +8,8 @@ export interface ConfiguredRole {
   name: string;
 }
 
-export const configuredRoles = {
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const configured_roles = {
   list: rpcMethodTypeContainer<
     {
       server_id: ConfiguredRole['server_id'];
diff --git a/mathesar_ui/src/api/rpc/database_setup.ts b/mathesar_ui/src/api/rpc/database_setup.ts
index 9db7223862..bcf52a17c4 100644
--- a/mathesar_ui/src/api/rpc/database_setup.ts
+++ b/mathesar_ui/src/api/rpc/database_setup.ts
@@ -12,12 +12,13 @@ export const sampleDataOptions = [
 export type SampleDataSchemaIdentifier = (typeof sampleDataOptions)[number];
 
 export interface DatabaseConnectionResult {
-  server_id: Server['id'];
-  database_id: Database['id'];
-  configured_role_id: ConfiguredRole['id'];
+  server: Server;
+  database: Database;
+  configured_role: ConfiguredRole;
 }
 
-export const databaseSetup = {
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const database_setup = {
   create_new: rpcMethodTypeContainer<
     {
       database: Database['name'];
diff --git a/mathesar_ui/src/api/rpc/index.ts b/mathesar_ui/src/api/rpc/index.ts
index e9a3b3c531..5da14f3020 100644
--- a/mathesar_ui/src/api/rpc/index.ts
+++ b/mathesar_ui/src/api/rpc/index.ts
@@ -2,15 +2,23 @@ import Cookies from 'js-cookie';
 
 import { buildRpcApi } from '@mathesar/packages/json-rpc-client-builder';
 
+import { configured_roles } from './configured_roles';
 import { connections } from './connections';
+import { database_setup } from './database_setup';
+import { databases } from './databases';
 import { schemas } from './schemas';
+import { servers } from './servers';
 
 /** Mathesar's JSON-RPC API */
 export const api = buildRpcApi({
   endpoint: '/api/rpc/v0/',
   getHeaders: () => ({ 'X-CSRFToken': Cookies.get('csrftoken') }),
   methodTree: {
+    configured_roles,
     connections,
+    database_setup,
+    databases,
     schemas,
+    servers,
   },
 });

From 069076a0a1846b8a49871f033f41ee49d7e4fb85 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 24 Jul 2024 17:19:32 +0530
Subject: [PATCH 0499/1141] Rename ConnectionsStore to DatabasesStore and
 update methods, usage

---
 mathesar_ui/src/components/AppHeader.svelte   |   5 +-
 .../breadcrumb/DatabaseSelector.svelte        |  16 +--
 .../pages/connections/ConnectionsPage.svelte  |  34 ++---
 .../src/routes/AuthenticatedRoutes.svelte     |  11 +-
 mathesar_ui/src/routes/DatabaseRoute.svelte   |  23 ++-
 .../src/routes/SharedExplorationRoute.svelte  |   3 +-
 mathesar_ui/src/routes/urls.ts                |  52 +++----
 .../src/stores/abstract-types/store.ts        |  27 ++--
 mathesar_ui/src/stores/databases.ts           | 135 +++++-------------
 mathesar_ui/src/stores/schemas.ts             |  86 ++++++-----
 mathesar_ui/src/stores/storeBasedUrls.ts      |  22 +--
 mathesar_ui/src/stores/tables.ts              |   4 +-
 .../connections/DeleteConnectionModal.svelte  |  33 ++---
 .../result-pane/QueryRunErrors.svelte         |   4 +-
 .../table-inspector/table/TableActions.svelte |   3 +-
 mathesar_ui/src/utils/preloadData.ts          |   3 +-
 16 files changed, 189 insertions(+), 272 deletions(-)

diff --git a/mathesar_ui/src/components/AppHeader.svelte b/mathesar_ui/src/components/AppHeader.svelte
index 6640491234..6922ae8c34 100644
--- a/mathesar_ui/src/components/AppHeader.svelte
+++ b/mathesar_ui/src/components/AppHeader.svelte
@@ -22,7 +22,7 @@
     getImportPageUrl,
     getTablePageUrl,
   } from '@mathesar/routes/urls';
-  import { currentDatabase } from '@mathesar/stores/databases';
+  import { databasesStore } from '@mathesar/stores/databases';
   import { getReleaseDataStoreFromContext } from '@mathesar/stores/releases';
   import { currentSchema } from '@mathesar/stores/schemas';
   import { createTable } from '@mathesar/stores/tables';
@@ -43,6 +43,7 @@
   const commonData = preloadCommonData();
   const userProfile = getUserProfileStoreFromContext();
   const releaseDataStore = getReleaseDataStoreFromContext();
+  const { currentDatabase } = databasesStore;
 
   $: database = $currentDatabase;
   $: schema = $currentSchema;
@@ -113,7 +114,7 @@
               icon={iconDatabase}
               href={getDatabasePageUrl(database.id)}
             >
-              {database.nickname}
+              {database.name}
             </LinkMenuItem>
             <MenuDivider />
           {/if}
diff --git a/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte b/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
index f061c5e257..003877e433 100644
--- a/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
@@ -1,29 +1,29 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Connection } from '@mathesar/api/rest/connections';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import { iconConnection, iconDatabase } from '@mathesar/icons';
   import { CONNECTIONS_URL, getDatabasePageUrl } from '@mathesar/routes/urls';
-  import { connectionsStore } from '@mathesar/stores/databases';
+  import { databasesStore } from '@mathesar/stores/databases';
 
   import BreadcrumbSelector from './BreadcrumbSelector.svelte';
   import type { BreadcrumbSelectorEntry } from './breadcrumbTypes';
 
-  const { connections, currentConnectionId } = connectionsStore;
+  const { databases, currentDatabaseId } = databasesStore;
 
   function makeBreadcrumbSelectorEntry(
-    connection: Connection,
+    database: Database,
   ): BreadcrumbSelectorEntry {
     return {
       type: 'simple',
-      label: connection.nickname,
-      href: getDatabasePageUrl(connection.id),
+      label: database.name,
+      href: getDatabasePageUrl(database.id),
       icon: iconDatabase,
-      isActive: () => connection.id === $currentConnectionId,
+      isActive: () => database.id === $currentDatabaseId,
     };
   }
 
-  $: breadcrumbEntries = [...$connections.values()].map(
+  $: breadcrumbEntries = [...$databases.values()].map(
     makeBreadcrumbSelectorEntry,
   );
 </script>
diff --git a/mathesar_ui/src/pages/connections/ConnectionsPage.svelte b/mathesar_ui/src/pages/connections/ConnectionsPage.svelte
index 0dfa4fe923..59e812ff3b 100644
--- a/mathesar_ui/src/pages/connections/ConnectionsPage.svelte
+++ b/mathesar_ui/src/pages/connections/ConnectionsPage.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Connection } from '@mathesar/api/rest/connections';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import { iconAddNew } from '@mathesar/icons';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
-  import { connectionsStore } from '@mathesar/stores/databases';
+  import { databasesStore } from '@mathesar/stores/databases';
   import { modal } from '@mathesar/stores/modal';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import {
@@ -16,8 +16,6 @@
   } from '@mathesar/systems/connections';
   import { Button, Icon } from '@mathesar-component-library';
 
-  import ConnectionRow from './ConnectionRow.svelte';
-
   const addConnectionModalController = modal.spawnModalController();
 
   const userProfileStore = getUserProfileStoreFromContext();
@@ -26,23 +24,20 @@
 
   let filterQuery = '';
 
-  $: ({ connections } = connectionsStore);
+  $: ({ databases } = databasesStore);
 
-  function filterConnections(allConnections: Connection[], query: string) {
-    if (!query) return allConnections;
+  function filterDatabases(allDatabases: Database[], query: string) {
+    if (!query) return allDatabases;
     const sanitizedQuery = query.trim().toLowerCase();
     const match = (t: string) => t.toLowerCase().includes(sanitizedQuery);
-    return allConnections.filter((c) => match(c.nickname) || match(c.database));
+    return allDatabases.filter((d) => match(d.name));
   }
 
   function handleClearFilterQuery() {
     filterQuery = '';
   }
 
-  $: filteredConnections = filterConnections(
-    [...$connections.values()],
-    filterQuery,
-  );
+  $: filteredDatabases = filterDatabases([...$databases.values()], filterQuery);
 </script>
 
 <svelte:head>
@@ -59,12 +54,12 @@
   <div data-identifier="connections-header">
     <span>
       {$_('database_connections')}
-      {#if $connections.size}({$connections.size}){/if}
+      {#if $databases.size}({$databases.size}){/if}
     </span>
   </div>
 
   <section data-identifier="connections-container">
-    {#if $connections.size === 0}
+    {#if $databases.size === 0}
       <ConnectionsEmptyState />
     {:else}
       <EntityContainerWithFilterBar
@@ -100,24 +95,21 @@
         </p>
 
         <svelte:fragment slot="content">
-          {#if filteredConnections.length}
+          {#if filteredDatabases.length}
             <div data-identifier="connections-list-grid">
               <table>
                 <thead>
                   <tr>
-                    <th>{$_('connection_name')}</th>
                     <th>{$_('database_name')}</th>
-                    <th>{$_('username')}</th>
-                    <th>{$_('host')}</th>
-                    <th>{$_('port')}</th>
                     {#if isSuperUser}
                       <th>{$_('actions')}</th>
                     {/if}
                   </tr>
                 </thead>
                 <tbody>
-                  {#each filteredConnections as connection (connection.id)}
-                    <ConnectionRow {connection} />
+                  {#each filteredDatabases as database (database.id)}
+                    <!-- <ConnectionRow {connection} /> -->
+                    {database.name}
                   {/each}
                 </tbody>
               </table>
diff --git a/mathesar_ui/src/routes/AuthenticatedRoutes.svelte b/mathesar_ui/src/routes/AuthenticatedRoutes.svelte
index b5ecbfd42c..ad37f48a10 100644
--- a/mathesar_ui/src/routes/AuthenticatedRoutes.svelte
+++ b/mathesar_ui/src/routes/AuthenticatedRoutes.svelte
@@ -5,7 +5,7 @@
   import ConnectionsPage from '@mathesar/pages/connections/ConnectionsPage.svelte';
   import WelcomePage from '@mathesar/pages/WelcomePage.svelte';
   import { CONNECTIONS_URL, getDatabasePageUrl } from '@mathesar/routes/urls';
-  import { connectionsStore } from '@mathesar/stores/databases';
+  import { databasesStore } from '@mathesar/stores/databases';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { mapExactlyOne } from '@mathesar/utils/iterUtils';
 
@@ -13,12 +13,11 @@
   import DatabaseRoute from './DatabaseRoute.svelte';
   import UserProfileRoute from './UserProfileRoute.svelte';
 
+  const { databases } = databasesStore;
   const userProfileStore = getUserProfileStoreFromContext();
   $: userProfile = $userProfileStore;
 
-  $: ({ connections } = connectionsStore);
-
-  $: rootPathRedirectUrl = mapExactlyOne($connections, {
+  $: rootPathRedirectUrl = mapExactlyOne($databases, {
     whenZero: undefined,
     whenOne: ([id]) => getDatabasePageUrl(id),
     whenMany: CONNECTIONS_URL,
@@ -40,8 +39,8 @@
   </Route>
 {/if}
 
-<Route path="/db/:connectionId/*" let:meta firstmatch>
-  <DatabaseRoute connectionId={parseInt(meta.params.connectionId, 10)} />
+<Route path="/db/:databaseId/*" let:meta firstmatch>
+  <DatabaseRoute databaseId={parseInt(meta.params.databaseId, 10)} />
 </Route>
 
 <Route path="/databases">
diff --git a/mathesar_ui/src/routes/DatabaseRoute.svelte b/mathesar_ui/src/routes/DatabaseRoute.svelte
index c6e7aab2a7..119d5f40c8 100644
--- a/mathesar_ui/src/routes/DatabaseRoute.svelte
+++ b/mathesar_ui/src/routes/DatabaseRoute.svelte
@@ -3,39 +3,38 @@
   import { _ } from 'svelte-i18n';
   import { Route } from 'tinro';
 
-  import type { Connection } from '@mathesar/api/rest/connections';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import Identifier from '@mathesar/components/Identifier.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import DatabasePage from '@mathesar/pages/database/DatabasePage.svelte';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
-  import { connectionsStore } from '@mathesar/stores/databases';
+  import { databasesStore } from '@mathesar/stores/databases';
 
   import SchemaRoute from './SchemaRoute.svelte';
 
-  export let connectionId: Connection['id'];
+  export let databaseId: Database['id'];
 
-  $: connectionsStore.setCurrentConnectionId(connectionId);
-  $: ({ connections } = connectionsStore);
-  $: connection = $connections.get(connectionId);
+  $: databasesStore.setCurrentDatabaseId(databaseId);
+  const { currentDatabase } = databasesStore;
 
   function handleUnmount() {
-    connectionsStore.clearCurrentConnectionId();
+    databasesStore.clearCurrentDatabaseId();
   }
 
   onMount(() => handleUnmount);
 </script>
 
-{#if connection}
-  <AppendBreadcrumb item={{ type: 'database', database: connection }} />
+{#if $currentDatabase}
+  <AppendBreadcrumb item={{ type: 'database', database: $currentDatabase }} />
 
   <Route path="/">
-    <DatabasePage database={connection} />
+    <DatabasePage database={$currentDatabase} />
   </Route>
 
   <Route path="/:schemaId/*" let:meta firstmatch>
     <SchemaRoute
-      database={connection}
+      database={$currentDatabase}
       schemaId={parseInt(meta.params.schemaId, 10)}
     />
   </Route>
@@ -43,7 +42,7 @@
   <ErrorPage>
     <RichText text={$_('database_not_found')} let:slotName>
       {#if slotName === 'connectionId'}
-        <Identifier>{connectionId}</Identifier>
+        <Identifier>{databaseId}</Identifier>
       {/if}
     </RichText>
   </ErrorPage>
diff --git a/mathesar_ui/src/routes/SharedExplorationRoute.svelte b/mathesar_ui/src/routes/SharedExplorationRoute.svelte
index 8584a56025..1547f00dd3 100644
--- a/mathesar_ui/src/routes/SharedExplorationRoute.svelte
+++ b/mathesar_ui/src/routes/SharedExplorationRoute.svelte
@@ -4,7 +4,7 @@
 
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import ExplorationPage from '@mathesar/pages/exploration/ExplorationPage.svelte';
-  import { currentDatabase } from '@mathesar/stores/databases';
+  import { databasesStore } from '@mathesar/stores/databases';
   import { queries } from '@mathesar/stores/queries';
   import { currentSchema } from '@mathesar/stores/schemas';
   import { preloadRouteData } from '@mathesar/utils/preloadData';
@@ -13,6 +13,7 @@
   const routeSpecificData = preloadRouteData<{ query_id: number | null }>(
     'shared_query',
   );
+  const { currentDatabase } = databasesStore;
 
   export let slug: string;
 
diff --git a/mathesar_ui/src/routes/urls.ts b/mathesar_ui/src/routes/urls.ts
index 9273c8c763..2de38e09cc 100644
--- a/mathesar_ui/src/routes/urls.ts
+++ b/mathesar_ui/src/routes/urls.ts
@@ -1,33 +1,27 @@
-export function getDatabasePageUrl(connectionId: number): string {
-  return `/db/${connectionId}/`;
+export function getDatabasePageUrl(databaseId: number): string {
+  return `/db/${databaseId}/`;
 }
 
-export function getSchemaPageUrl(
-  connectionId: number,
-  schemaId: number,
-): string {
-  return `${getDatabasePageUrl(connectionId)}${schemaId}/`;
+export function getSchemaPageUrl(databaseId: number, schemaId: number): string {
+  return `${getDatabasePageUrl(databaseId)}${schemaId}/`;
 }
 
 export function getSchemaPageTablesSectionUrl(
-  connectionId: number,
+  databaseId: number,
   schemaId: number,
 ): string {
-  return `${getSchemaPageUrl(connectionId, schemaId)}tables/`;
+  return `${getSchemaPageUrl(databaseId, schemaId)}tables/`;
 }
 
 export function getSchemaPageExplorationsSectionUrl(
-  connectionId: number,
+  databaseId: number,
   schemaId: number,
 ): string {
-  return `${getSchemaPageUrl(connectionId, schemaId)}explorations/`;
+  return `${getSchemaPageUrl(databaseId, schemaId)}explorations/`;
 }
 
-export function getImportPageUrl(
-  connectionId: number,
-  schemaId: number,
-): string {
-  return `${getSchemaPageUrl(connectionId, schemaId)}import/`;
+export function getImportPageUrl(databaseId: number, schemaId: number): string {
+  return `${getSchemaPageUrl(databaseId, schemaId)}import/`;
 }
 
 interface ImportPreviewPageQueryParams {
@@ -53,59 +47,57 @@ export function getImportPreviewPageQueryParams(
 }
 
 export function getImportPreviewPageUrl(
-  connectionId: number,
+  databaseId: number,
   schemaId: number,
   previewTableId: number,
   options: ImportPreviewPageQueryParams,
 ): string {
-  const importPageUrl = getImportPageUrl(connectionId, schemaId);
+  const importPageUrl = getImportPageUrl(databaseId, schemaId);
   const q = serializeImportPreviewPageQueryParams(options);
   return `${importPageUrl}${previewTableId}/?${q}`;
 }
 
 export function getDataExplorerPageUrl(
-  connectionId: number,
+  databaseId: number,
   schemaId: number,
 ): string {
-  return `${getSchemaPageUrl(connectionId, schemaId)}data-explorer/`;
+  return `${getSchemaPageUrl(databaseId, schemaId)}data-explorer/`;
 }
 
 export function getExplorationPageUrl(
-  connectionId: number,
+  databaseId: number,
   schemaId: number,
   queryId: number,
 ): string {
   return `${getSchemaPageExplorationsSectionUrl(
-    connectionId,
+    databaseId,
     schemaId,
   )}${queryId}/`;
 }
 
 export function getExplorationEditorPageUrl(
-  connectionId: number,
+  databaseId: number,
   schemaId: number,
   queryId: number,
 ): string {
-  return `${getExplorationPageUrl(connectionId, schemaId, queryId)}edit/`;
+  return `${getExplorationPageUrl(databaseId, schemaId, queryId)}edit/`;
 }
 
 export function getTablePageUrl(
-  connectionId: number,
+  databaseId: number,
   schemaId: number,
   tableId: number,
 ): string {
-  return `${getSchemaPageTablesSectionUrl(connectionId, schemaId)}${tableId}/`;
+  return `${getSchemaPageTablesSectionUrl(databaseId, schemaId)}${tableId}/`;
 }
 
 export function getRecordPageUrl(
-  connectionId: number,
+  databaseId: number,
   schemaId: number,
   tableId: number,
   recordId: unknown,
 ): string {
-  return `${getTablePageUrl(connectionId, schemaId, tableId)}${String(
-    recordId,
-  )}`;
+  return `${getTablePageUrl(databaseId, schemaId, tableId)}${String(recordId)}`;
 }
 
 export const USER_PROFILE_URL = '/profile/';
diff --git a/mathesar_ui/src/stores/abstract-types/store.ts b/mathesar_ui/src/stores/abstract-types/store.ts
index 71a0897b1c..cbe83182c9 100644
--- a/mathesar_ui/src/stores/abstract-types/store.ts
+++ b/mathesar_ui/src/stores/abstract-types/store.ts
@@ -1,9 +1,9 @@
 import type { Readable, Unsubscriber, Writable } from 'svelte/store';
 import { derived, get, writable } from 'svelte/store';
 
-import type { Connection } from '@mathesar/api/rest/connections';
 import { States, getAPI } from '@mathesar/api/rest/utils/requestUtils';
-import { currentDatabase } from '@mathesar/stores/databases';
+import type { Database } from '@mathesar/api/rpc/databases';
+import { databasesStore } from '@mathesar/stores/databases';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import type { CancellablePromise } from '@mathesar-component-library';
 
@@ -15,18 +15,19 @@ import type {
 } from './types';
 
 const commonData = preloadCommonData();
+const { currentDatabase } = databasesStore;
 
 const databasesToAbstractTypesStoreMap: Map<
-  Connection['id'],
+  Database['id'],
   Writable<AbstractTypesSubstance>
 > = new Map();
 const abstractTypesRequestMap: Map<
-  Connection['id'],
+  Database['id'],
   CancellablePromise<AbstractTypeResponse[]>
 > = new Map();
 
 export async function refetchTypesForDb(
-  databaseId: Connection['id'],
+  databaseId: Database['id'],
 ): Promise<AbstractTypesMap | undefined> {
   const store = databasesToAbstractTypesStoreMap.get(databaseId);
   if (!store) {
@@ -74,18 +75,18 @@ export async function refetchTypesForDb(
  */
 let preload = true;
 
-function getTypesForConnection(
-  connection: Connection,
+function getTypesForDatabase(
+  database: Database,
 ): Writable<AbstractTypesSubstance> {
-  let store = databasesToAbstractTypesStoreMap.get(connection.id);
+  let store = databasesToAbstractTypesStoreMap.get(database.id);
   if (!store) {
     store = writable({
       state: States.Loading,
       data: new Map(),
     });
-    databasesToAbstractTypesStoreMap.set(connection.id, store);
+    databasesToAbstractTypesStoreMap.set(database.id, store);
 
-    if (preload && commonData.current_connection === connection.id) {
+    if (preload && commonData.current_database === database.id) {
       store.update((currentData) => ({
         ...currentData,
         state: States.Done,
@@ -93,11 +94,11 @@ function getTypesForConnection(
         data: constructAbstractTypeMapFromResponse(commonData.abstract_types),
       }));
     } else {
-      void refetchTypesForDb(connection.id);
+      void refetchTypesForDb(database.id);
     }
     preload = false;
   } else if (get(store).error) {
-    void refetchTypesForDb(connection.id);
+    void refetchTypesForDb(database.id);
   }
   return store;
 }
@@ -113,7 +114,7 @@ export const currentDbAbstractTypes: Readable<AbstractTypesSubstance> = derived(
         data: new Map(),
       });
     } else {
-      const store = getTypesForConnection($currentDatabase);
+      const store = getTypesForDatabase($currentDatabase);
       unsubscribe = store.subscribe((typesData) => {
         set(typesData);
       });
diff --git a/mathesar_ui/src/stores/databases.ts b/mathesar_ui/src/stores/databases.ts
index 24c98cf5d2..0320c0d398 100644
--- a/mathesar_ui/src/stores/databases.ts
+++ b/mathesar_ui/src/stores/databases.ts
@@ -1,12 +1,5 @@
-import { some } from 'iter-tools';
-import { type Readable, derived, get, writable } from 'svelte/store';
-
-import connectionsApi, {
-  type Connection,
-  type CreateWithNewUserProps,
-  type UpdatableConnectionProperties,
-} from '@mathesar/api/rest/connections';
 import { api } from '@mathesar/api/rpc';
+import type { Database } from '@mathesar/api/rpc/databases';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import type { MakeWritablePropertiesReadable } from '@mathesar/utils/typeUtils';
 import {
@@ -14,120 +7,70 @@ import {
   WritableMap,
   defined,
 } from '@mathesar-component-library';
+import { type Readable, derived, writable } from 'svelte/store';
 
 const commonData = preloadCommonData();
 
-function sortConnections(c: Iterable<Connection>): Connection[] {
-  return [...c].sort((a, b) => a.nickname.localeCompare(b.nickname));
-}
-
-/**
- * @returns true if the given connection is the only one that points to the same
- * database among all the supplied connections. Connections with the same ids
- * will not be compared.
- */
-export function connectionHasUniqueDatabaseReference(
-  connection: Connection,
-  allConnections: Iterable<Connection>,
-): boolean {
-  return !some(
-    (c) =>
-      c.id !== connection.id &&
-      c.host === connection.host &&
-      c.port === connection.port &&
-      c.database === connection.database,
-    allConnections,
-  );
+function sortDatabases(c: Iterable<Database>): Database[] {
+  return [...c].sort((a, b) => a.name.localeCompare(b.name));
 }
 
-class ConnectionsStore {
-  private readonly unsortedConnections = new WritableMap<
-    Connection['id'],
-    Connection
+class DatabasesStore {
+  private readonly unsortedDatabases = new WritableMap<
+    Database['id'],
+    Database
   >();
 
-  readonly connections: Readable<ImmutableMap<Connection['id'], Connection>>;
+  readonly databases: Readable<ImmutableMap<Database['id'], Database>>;
 
-  readonly currentConnectionId = writable<Connection['id'] | undefined>();
+  readonly currentDatabaseId = writable<Database['id'] | undefined>();
 
-  readonly currentConnection: Readable<Connection | undefined>;
+  readonly currentDatabase: Readable<Database | undefined>;
 
   constructor() {
-    this.unsortedConnections.reconstruct(
-      commonData.connections.map((c) => [c.id, c]),
+    this.unsortedDatabases.reconstruct(
+      commonData.databases.map((d) => [d.id, d]),
     );
-    this.connections = derived(
-      this.unsortedConnections,
-      (uc) =>
-        new ImmutableMap(sortConnections(uc.values()).map((c) => [c.id, c])),
+    this.databases = derived(
+      this.unsortedDatabases,
+      (ud) =>
+        new ImmutableMap(sortDatabases(ud.values()).map((d) => [d.id, d])),
     );
-    this.currentConnectionId.set(commonData.current_connection ?? undefined);
-    this.currentConnection = derived(
-      [this.connections, this.currentConnectionId],
-      ([connections, id]) => defined(id, (v) => connections.get(v)),
+    this.currentDatabaseId.set(commonData.current_database ?? undefined);
+    this.currentDatabase = derived(
+      [this.databases, this.currentDatabaseId],
+      ([databases, id]) => defined(id, (v) => databases.get(v)),
     );
   }
 
-  private addConnection(connection: Connection) {
-    this.unsortedConnections.set(connection.id, connection);
+  private addDatabase(database: Database) {
+    this.unsortedDatabases.set(database.id, database);
   }
 
-  async createFromKnownConnection(
-    props: Parameters<typeof api.connections.add_from_known_connection>[0],
+  async connectExistingDatabase(
+    props: Parameters<typeof api.database_setup.connect_existing>[0],
   ) {
-    const connection = await api.connections
-      .add_from_known_connection(props)
-      .run();
-    this.addConnection(connection);
-    return connection;
+    const { database } = await api.database_setup.connect_existing(props).run();
+    this.addDatabase(database);
+    return database;
   }
 
-  async createFromScratch(
-    props: Parameters<typeof api.connections.add_from_scratch>[0],
+  async createNewDatabase(
+    props: Parameters<typeof api.database_setup.create_new>[0],
   ) {
-    const connection = await api.connections.add_from_scratch(props).run();
-    this.addConnection(connection);
-    return connection;
+    const { database } = await api.database_setup.create_new(props).run();
+    this.addDatabase(database);
+    return database;
   }
 
-  async createWithNewUser(props: CreateWithNewUserProps) {
-    const connection = await connectionsApi.createWithNewUser(props);
-    this.addConnection(connection);
-    return connection;
+  setCurrentDatabaseId(databaseId: Database['id']) {
+    this.currentDatabaseId.set(databaseId);
   }
 
-  setCurrentConnectionId(connectionId: Connection['id']) {
-    this.currentConnectionId.set(connectionId);
-  }
-
-  clearCurrentConnectionId() {
-    this.currentConnectionId.set(undefined);
-  }
-
-  async updateConnection(
-    id: Connection['id'],
-    properties: Partial<UpdatableConnectionProperties>,
-  ): Promise<Connection> {
-    const connection = await connectionsApi.update(id, properties);
-    this.unsortedConnections.set(id, connection);
-    return connection;
-  }
-
-  async deleteConnection(id: Connection['id'], deleteMathesarSchemas = false) {
-    const connections = get(this.connections);
-    const connection = connections.get(id);
-    if (!connection) return;
-    const databaseIsUnique = connectionHasUniqueDatabaseReference(
-      connection,
-      connections.values(),
-    );
-    await connectionsApi.delete(id, deleteMathesarSchemas && databaseIsUnique);
-    this.unsortedConnections.delete(id);
+  clearCurrentDatabaseId() {
+    this.currentDatabaseId.set(undefined);
   }
 }
 
-export const connectionsStore: MakeWritablePropertiesReadable<ConnectionsStore> =
-  new ConnectionsStore();
-
-/** @deprecated Use connectionsStore.currentConnection instead */
-export const currentDatabase = connectionsStore.currentConnection;
+export const databasesStore: MakeWritablePropertiesReadable<DatabasesStore> =
+  new DatabasesStore();
diff --git a/mathesar_ui/src/stores/schemas.ts b/mathesar_ui/src/stores/schemas.ts
index f53d6c518b..b54de6d584 100644
--- a/mathesar_ui/src/stores/schemas.ts
+++ b/mathesar_ui/src/stores/schemas.ts
@@ -1,14 +1,14 @@
 import type { Readable, Unsubscriber, Writable } from 'svelte/store';
 import { derived, get, writable } from 'svelte/store';
 
-import type { Connection } from '@mathesar/api/rest/connections';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { api } from '@mathesar/api/rpc';
+import type { Database } from '@mathesar/api/rpc/databases';
 import type { Schema } from '@mathesar/api/rpc/schemas';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import type { CancellablePromise } from '@mathesar-component-library';
 
-import { connectionsStore } from './databases';
+import { databasesStore } from './databases';
 
 const commonData = preloadCommonData();
 
@@ -22,16 +22,16 @@ export interface DBSchemaStoreData {
 }
 
 const dbSchemaStoreMap: Map<
-  Connection['id'],
+  Database['id'],
   Writable<DBSchemaStoreData>
 > = new Map();
 const dbSchemasRequestMap: Map<
-  Connection['id'],
+  Database['id'],
   CancellablePromise<Schema[]>
 > = new Map();
 
 function setDBSchemaStore(
-  connectionId: Connection['id'],
+  databaseId: Database['id'],
   schemas: Schema[],
 ): Writable<DBSchemaStoreData> {
   const schemaMap: DBSchemaStoreData['data'] = new Map();
@@ -43,10 +43,10 @@ function setDBSchemaStore(
     data: schemaMap,
   };
 
-  let store = dbSchemaStoreMap.get(connectionId);
+  let store = dbSchemaStoreMap.get(databaseId);
   if (!store) {
     store = writable(storeValue);
-    dbSchemaStoreMap.set(connectionId, store);
+    dbSchemaStoreMap.set(databaseId, store);
   } else {
     store.set(storeValue);
   }
@@ -54,10 +54,10 @@ function setDBSchemaStore(
 }
 
 function updateSchemaInDBSchemaStore(
-  connectionId: Connection['id'],
+  databaseId: Database['id'],
   schema: Schema,
 ) {
-  const store = dbSchemaStoreMap.get(connectionId);
+  const store = dbSchemaStoreMap.get(databaseId);
   if (store) {
     store.update((value) => {
       value.data?.set(schema.oid, schema);
@@ -70,10 +70,10 @@ function updateSchemaInDBSchemaStore(
 }
 
 function removeSchemaInDBSchemaStore(
-  connectionId: Connection['id'],
+  databaseId: Database['id'],
   schemaId: Schema['oid'],
 ) {
-  const store = dbSchemaStoreMap.get(connectionId);
+  const store = dbSchemaStoreMap.get(databaseId);
   if (store) {
     store.update((value) => {
       value.data?.delete(schemaId);
@@ -86,11 +86,11 @@ function removeSchemaInDBSchemaStore(
 }
 
 export function addCountToSchemaNumTables(
-  connection: Pick<Connection, 'id'>,
+  database: Pick<Database, 'id'>,
   schema: Schema,
   count: number,
 ) {
-  const store = dbSchemaStoreMap.get(connection.id);
+  const store = dbSchemaStoreMap.get(database.id);
   if (store) {
     store.update((value) => {
       const schemaToModify = value.data.get(schema.oid);
@@ -107,13 +107,11 @@ export function addCountToSchemaNumTables(
 }
 
 async function refetchSchemasForDB(
-  connectionId: Connection['id'],
+  databaseId: Database['id'],
 ): Promise<DBSchemaStoreData | undefined> {
-  const store = dbSchemaStoreMap.get(connectionId);
+  const store = dbSchemaStoreMap.get(databaseId);
   if (!store) {
-    console.error(
-      `DB Schemas store for connection: ${connectionId} not found.`,
-    );
+    console.error(`DB Schemas store for database: ${databaseId} not found.`);
     return undefined;
   }
 
@@ -123,13 +121,13 @@ async function refetchSchemasForDB(
       requestStatus: { state: 'processing' },
     }));
 
-    dbSchemasRequestMap.get(connectionId)?.cancel();
+    dbSchemasRequestMap.get(databaseId)?.cancel();
 
-    const schemaRequest = api.schemas.list({ database_id: connectionId }).run();
-    dbSchemasRequestMap.set(connectionId, schemaRequest);
+    const schemaRequest = api.schemas.list({ database_id: databaseId }).run();
+    dbSchemasRequestMap.set(databaseId, schemaRequest);
     const schemas = await schemaRequest;
 
-    const dbSchemasStore = setDBSchemaStore(connectionId, schemas);
+    const dbSchemasStore = setDBSchemaStore(databaseId, schemas);
 
     return get(dbSchemasStore);
   } catch (err) {
@@ -149,32 +147,32 @@ async function refetchSchemasForDB(
 let preload = true;
 
 function getSchemasStoreForDB(
-  connectionId: Connection['id'],
+  databaseId: Database['id'],
 ): Writable<DBSchemaStoreData> {
-  let store = dbSchemaStoreMap.get(connectionId);
+  let store = dbSchemaStoreMap.get(databaseId);
   if (!store) {
     store = writable({
       requestStatus: { state: 'processing' },
       data: new Map(),
     });
-    dbSchemaStoreMap.set(connectionId, store);
-    if (preload && commonData.current_connection === connectionId) {
-      store = setDBSchemaStore(connectionId, commonData.schemas ?? []);
+    dbSchemaStoreMap.set(databaseId, store);
+    if (preload && commonData.current_database === databaseId) {
+      store = setDBSchemaStore(databaseId, commonData.schemas ?? []);
     } else {
-      void refetchSchemasForDB(connectionId);
+      void refetchSchemasForDB(databaseId);
     }
     preload = false;
   } else if (get(store).requestStatus.state === 'failure') {
-    void refetchSchemasForDB(connectionId);
+    void refetchSchemasForDB(databaseId);
   }
   return store;
 }
 
 export function getSchemaInfo(
-  connectionId: Connection['id'],
+  databaseId: Database['id'],
   schemaId: Schema['oid'],
 ): Schema | undefined {
-  const store = dbSchemaStoreMap.get(connectionId);
+  const store = dbSchemaStoreMap.get(databaseId);
   if (!store) {
     return undefined;
   }
@@ -182,18 +180,18 @@ export function getSchemaInfo(
 }
 
 export async function createSchema(
-  connectionId: Connection['id'],
+  databaseId: Database['id'],
   name: Schema['name'],
   description: Schema['description'],
 ): Promise<void> {
   const schemaOid = await api.schemas
     .add({
-      database_id: connectionId,
+      database_id: databaseId,
       name,
       description,
     })
     .run();
-  updateSchemaInDBSchemaStore(connectionId, {
+  updateSchemaInDBSchemaStore(databaseId, {
     oid: schemaOid,
     name,
     description,
@@ -202,12 +200,12 @@ export async function createSchema(
 }
 
 export async function updateSchema(
-  connectionId: Connection['id'],
+  databaseId: Database['id'],
   schema: Schema,
 ): Promise<void> {
   await api.schemas
     .patch({
-      database_id: connectionId,
+      database_id: databaseId,
       schema_oid: schema.oid,
       patch: {
         name: schema.name,
@@ -215,34 +213,34 @@ export async function updateSchema(
       },
     })
     .run();
-  updateSchemaInDBSchemaStore(connectionId, schema);
+  updateSchemaInDBSchemaStore(databaseId, schema);
 }
 
 export async function deleteSchema(
-  connectionId: Connection['id'],
+  databaseId: Database['id'],
   schemaId: Schema['oid'],
 ): Promise<void> {
   await api.schemas
     .delete({
-      database_id: connectionId,
+      database_id: databaseId,
       schema_oid: schemaId,
     })
     .run();
-  removeSchemaInDBSchemaStore(connectionId, schemaId);
+  removeSchemaInDBSchemaStore(databaseId, schemaId);
 }
 
 export const schemas: Readable<DBSchemaStoreData> = derived(
-  connectionsStore.currentConnectionId,
-  ($currentConnectionName, set) => {
+  databasesStore.currentDatabaseId,
+  ($currentDatabaseId, set) => {
     let unsubscribe: Unsubscriber;
 
-    if (!$currentConnectionName) {
+    if (!$currentDatabaseId) {
       set({
         requestStatus: { state: 'success' },
         data: new Map(),
       });
     } else {
-      const store = getSchemasStoreForDB($currentConnectionName);
+      const store = getSchemasStoreForDB($currentDatabaseId);
       unsubscribe = store.subscribe((dbSchemasData) => {
         set(dbSchemasData);
       });
diff --git a/mathesar_ui/src/stores/storeBasedUrls.ts b/mathesar_ui/src/stores/storeBasedUrls.ts
index 7c858b6bd2..441e1dc4c3 100644
--- a/mathesar_ui/src/stores/storeBasedUrls.ts
+++ b/mathesar_ui/src/stores/storeBasedUrls.ts
@@ -12,25 +12,25 @@ import { derived } from 'svelte/store';
 
 import * as urls from '@mathesar/routes/urls';
 
-import { connectionsStore } from './databases';
+import { databasesStore } from './databases';
 import { currentSchema } from './schemas';
 import { currentTable } from './tables';
 
 export const storeToGetRecordPageUrl = derived(
-  [connectionsStore.currentConnection, currentSchema, currentTable],
-  ([connection, schema, table]) => {
+  [databasesStore.currentDatabase, currentSchema, currentTable],
+  ([database, schema, table]) => {
     function getRecordPageUrl({
-      connectionId,
+      databaseId,
       schemaId,
       tableId,
       recordId,
     }: {
-      connectionId?: number;
+      databaseId?: number;
       schemaId?: number;
       tableId?: number;
       recordId: unknown;
     }): string | undefined {
-      const d = connectionId ?? connection?.id;
+      const d = databaseId ?? database?.id;
       const s = schemaId ?? schema?.oid;
       const t = tableId ?? table?.id;
       const r = recordId ?? undefined;
@@ -49,18 +49,18 @@ export const storeToGetRecordPageUrl = derived(
 );
 
 export const storeToGetTablePageUrl = derived(
-  [connectionsStore.currentConnection, currentSchema, currentTable],
-  ([connection, schema, table]) => {
+  [databasesStore.currentDatabase, currentSchema, currentTable],
+  ([database, schema, table]) => {
     function getTablePageUrl({
-      connectionId,
+      databaseId,
       schemaId,
       tableId,
     }: {
-      connectionId?: number;
+      databaseId?: number;
       schemaId?: number;
       tableId?: number;
     }): string | undefined {
-      const d = connectionId ?? connection?.id;
+      const d = databaseId ?? database?.id;
       const s = schemaId ?? schema?.oid;
       const t = tableId ?? table?.id;
       if (d === undefined || s === undefined || t === undefined) {
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index f80e6785a4..79e7c31c93 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -194,7 +194,7 @@ function findAndUpdateTableStore(id: TableEntry['id'], tableEntry: TableEntry) {
 }
 
 export function deleteTable(
-  database: Database,
+  database: Pick<Database, 'id'>,
   schema: Schema,
   tableId: TableEntry['id'],
 ): CancellablePromise<TableEntry> {
@@ -241,7 +241,7 @@ export function updateTableMetaData(
 }
 
 export function createTable(
-  database: Database,
+  database: Pick<Database, 'id'>,
   schema: Schema,
   tableArgs: {
     name?: string;
diff --git a/mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte b/mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte
index 26a79b1b18..d158ddf381 100644
--- a/mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte
+++ b/mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte
@@ -5,10 +5,7 @@
   import type { Connection } from '@mathesar/api/rest/connections';
   import Identifier from '@mathesar/components/Identifier.svelte';
   import RichText from '@mathesar/components/rich-text/RichText.svelte';
-  import {
-    connectionHasUniqueDatabaseReference,
-    connectionsStore,
-  } from '@mathesar/stores/databases';
+  import { connectionsStore } from '@mathesar/stores/databases';
   import { toast } from '@mathesar/stores/toast';
   import { getErrorMessage } from '@mathesar/utils/errors';
   import {
@@ -19,17 +16,11 @@
     ModalController,
   } from '@mathesar-component-library';
 
-  const { connections } = connectionsStore;
   const dispatch = createEventDispatcher<{ delete: undefined }>();
 
   export let controller: ModalController;
   export let connection: Connection;
 
-  $: hasUniqueDatabaseReference = connectionHasUniqueDatabaseReference(
-    connection,
-    $connections.values(),
-  );
-
   let deleteMathesarSchemas = false;
 
   async function disconnect() {
@@ -69,21 +60,20 @@
     {$_('delete_connection_db_delete_info')}
   </p>
 
-  {#if hasUniqueDatabaseReference}
-    <p>
-      <LabeledInput
-        layout="inline-input-first"
-        label={$_('delete_associated_mathesar_schemas_help')}
-      >
-        <Checkbox bind:checked={deleteMathesarSchemas} />
-      </LabeledInput>
-    </p>
+  <p>
+    <LabeledInput
+      layout="inline-input-first"
+      label={$_('delete_associated_mathesar_schemas_help')}
+    >
+      <Checkbox bind:checked={deleteMathesarSchemas} />
+    </LabeledInput>
+  </p>
 
-    <!--
+  <!--
       TODO: Uncomment this when we have a docs page to link to.
       See: https://github.com/mathesar-foundation/mathesar/issues/3450
      -->
-    <!-- <p>
+  <!-- <p>
       <WarningBox>
         {$_('using_custom_types')}
         <DocsLink path="/">
@@ -91,7 +81,6 @@
         </DocsLink>
       </WarningBox>
     </p> -->
-  {/if}
 
   <CancelOrProceedButtonPair
     proceedButton={{
diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/QueryRunErrors.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/QueryRunErrors.svelte
index 6efc59e488..ba320d046b 100644
--- a/mathesar_ui/src/systems/data-explorer/result-pane/QueryRunErrors.svelte
+++ b/mathesar_ui/src/systems/data-explorer/result-pane/QueryRunErrors.svelte
@@ -5,13 +5,15 @@
   import { ApiMultiError } from '@mathesar/api/rest/utils/errors';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { getExplorationEditorPageUrl } from '@mathesar/routes/urls';
-  import { currentDatabase } from '@mathesar/stores/databases';
+  import { databasesStore } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
   import { Button, hasProperty } from '@mathesar-component-library';
 
   import QueryManager from '../QueryManager';
   import type QueryRunner from '../QueryRunner';
 
+  const { currentDatabase } = databasesStore;
+
   export let queryHandler: QueryRunner | QueryManager;
   export let errors: ApiMultiError | string[];
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
index 6f4b3b0691..d52737e2ff 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
@@ -5,7 +5,7 @@
   import { iconDeleteMajor, iconExploration } from '@mathesar/icons';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
   import { confirmDelete } from '@mathesar/stores/confirmation';
-  import { currentDatabase } from '@mathesar/stores/databases';
+  import { databasesStore } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import { currentTable, deleteTable, tables } from '@mathesar/stores/tables';
@@ -24,6 +24,7 @@
   import TableDeleteConfirmationBody from './TableDeleteConfirmationBody.svelte';
 
   const tabularData = getTabularDataStoreFromContext();
+  const { currentDatabase } = databasesStore;
 
   $: ({ id, columnsDataStore, meta } = $tabularData);
   $: ({ grouping } = meta);
diff --git a/mathesar_ui/src/utils/preloadData.ts b/mathesar_ui/src/utils/preloadData.ts
index 381e3fc814..2c73a639de 100644
--- a/mathesar_ui/src/utils/preloadData.ts
+++ b/mathesar_ui/src/utils/preloadData.ts
@@ -7,12 +7,11 @@ import type { Schema } from '@mathesar/api/rpc/schemas';
 import type { AbstractTypeResponse } from '@mathesar/AppTypes';
 
 export interface CommonData {
-  connections: Connection[];
   databases: Database[];
   schemas: Schema[];
   tables: TableEntry[];
   queries: QueryInstance[];
-  current_connection: Connection['id'] | null;
+  current_database: Database['id'] | null;
   internal_db_connection: {
     database: Connection['database'];
     host: Connection['host'];

From 9806865666b52223deee4e040bdd1c3d619bb279 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 24 Jul 2024 17:22:24 +0530
Subject: [PATCH 0500/1141] Remove connections rpc api file

---
 mathesar_ui/src/api/rpc/connections.ts | 50 --------------------------
 mathesar_ui/src/api/rpc/index.ts       |  2 --
 2 files changed, 52 deletions(-)
 delete mode 100644 mathesar_ui/src/api/rpc/connections.ts

diff --git a/mathesar_ui/src/api/rpc/connections.ts b/mathesar_ui/src/api/rpc/connections.ts
deleted file mode 100644
index b3102afda5..0000000000
--- a/mathesar_ui/src/api/rpc/connections.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
-
-export const sampleDataOptions = [
-  'library_management',
-  'movie_collection',
-] as const;
-
-export type SampleDataSchemaIdentifier = (typeof sampleDataOptions)[number];
-
-export interface Connection {
-  id: number;
-  nickname: string;
-  database: string;
-  username: string;
-  host: string;
-  port: number;
-}
-
-export const connections = {
-  add_from_known_connection: rpcMethodTypeContainer<
-    {
-      nickname: Connection['nickname'];
-      database: Connection['database'];
-      /** When true, create a new database if needed. Defaults to False. */
-      create_db?: boolean;
-      /**
-       * When present, reuse the credentials from a known connection. When
-       * omitted, use the credentials from the internal DB server.
-       */
-      connection_id?: Connection['id'];
-      /** Sample data to load. Defaults to none. */
-      sample_data?: SampleDataSchemaIdentifier[];
-    },
-    Connection
-  >(),
-
-  add_from_scratch: rpcMethodTypeContainer<
-    {
-      nickname: Connection['nickname'];
-      database: Connection['database'];
-      user: Connection['username'];
-      password: string;
-      host: Connection['host'];
-      port: Connection['port'];
-      /** Sample data to load. Defaults to none. */
-      sample_data?: SampleDataSchemaIdentifier[];
-    },
-    Connection
-  >(),
-};
diff --git a/mathesar_ui/src/api/rpc/index.ts b/mathesar_ui/src/api/rpc/index.ts
index 5da14f3020..836d60625d 100644
--- a/mathesar_ui/src/api/rpc/index.ts
+++ b/mathesar_ui/src/api/rpc/index.ts
@@ -3,7 +3,6 @@ import Cookies from 'js-cookie';
 import { buildRpcApi } from '@mathesar/packages/json-rpc-client-builder';
 
 import { configured_roles } from './configured_roles';
-import { connections } from './connections';
 import { database_setup } from './database_setup';
 import { databases } from './databases';
 import { schemas } from './schemas';
@@ -15,7 +14,6 @@ export const api = buildRpcApi({
   getHeaders: () => ({ 'X-CSRFToken': Cookies.get('csrftoken') }),
   methodTree: {
     configured_roles,
-    connections,
     database_setup,
     databases,
     schemas,

From e386cd9eaa0c7009044f6ed014f042347e3ceaee Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 24 Jul 2024 17:38:04 +0530
Subject: [PATCH 0501/1141] Update breadcrumbs and url for databases

---
 mathesar_ui/src/components/AppHeader.svelte                 | 4 ++--
 mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte | 6 +++---
 .../src/components/breadcrumb/DatabaseSelector.svelte       | 4 ++--
 mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts    | 6 +++---
 mathesar_ui/src/routes/urls.ts                              | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/mathesar_ui/src/components/AppHeader.svelte b/mathesar_ui/src/components/AppHeader.svelte
index 6922ae8c34..67c8a91f2e 100644
--- a/mathesar_ui/src/components/AppHeader.svelte
+++ b/mathesar_ui/src/components/AppHeader.svelte
@@ -14,7 +14,7 @@
   } from '@mathesar/icons';
   import {
     ADMIN_URL,
-    CONNECTIONS_URL,
+    HOME_URL,
     LOGOUT_URL,
     USER_PROFILE_URL,
     getDataExplorerPageUrl,
@@ -123,7 +123,7 @@
             {$userProfile.getDisplayName()}
           </LinkMenuItem>
           <MenuDivider />
-          <LinkMenuItem icon={iconConnection} href={CONNECTIONS_URL}>
+          <LinkMenuItem icon={iconConnection} href={HOME_URL}>
             {$_('database_connections')}
           </LinkMenuItem>
           {#if $userProfile.isSuperUser}
diff --git a/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte b/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
index df897dfb2c..eadd91040a 100644
--- a/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
+++ b/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
@@ -8,7 +8,7 @@
   import TableName from '@mathesar/components/TableName.svelte';
   import { iconConnection, iconExploration, iconRecord } from '@mathesar/icons';
   import {
-    CONNECTIONS_URL,
+    HOME_URL,
     getDatabasePageUrl,
     getExplorationPageUrl,
     getRecordPageUrl,
@@ -29,10 +29,10 @@
   export let item: BreadcrumbItem;
 </script>
 
-{#if item.type === 'connectionList'}
+{#if item.type === 'home'}
   <DatabaseSelector />
   <div class="breadcrumb-item truncate">
-    <BreadcrumbLink href={CONNECTIONS_URL}>
+    <BreadcrumbLink href={HOME_URL}>
       <NameWithIcon icon={iconConnection}>
         {$_('connections')}
       </NameWithIcon>
diff --git a/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte b/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
index 003877e433..ea61f78e71 100644
--- a/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
@@ -3,7 +3,7 @@
 
   import type { Database } from '@mathesar/api/rpc/databases';
   import { iconConnection, iconDatabase } from '@mathesar/icons';
-  import { CONNECTIONS_URL, getDatabasePageUrl } from '@mathesar/routes/urls';
+  import { HOME_URL, getDatabasePageUrl } from '@mathesar/routes/urls';
   import { databasesStore } from '@mathesar/stores/databases';
 
   import BreadcrumbSelector from './BreadcrumbSelector.svelte';
@@ -35,7 +35,7 @@
     {
       type: 'simple',
       label: $_('manage_connections'),
-      href: CONNECTIONS_URL,
+      href: HOME_URL,
       icon: iconConnection,
       // TODO: Handle active states for persistent links
       isActive: () => false,
diff --git a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
index 5d62db082d..77efabf9b2 100644
--- a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
+++ b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
@@ -7,8 +7,8 @@ import type {
   IconProps,
 } from '@mathesar/component-library/types';
 
-export interface BreadcrumbItemConnectionList {
-  type: 'connectionList';
+export interface BreadcrumbItemHome {
+  type: 'home';
 }
 
 export interface BreadcrumbItemDatabase {
@@ -55,7 +55,7 @@ export interface BreadcrumbItemExploration {
 }
 
 export type BreadcrumbItem =
-  | BreadcrumbItemConnectionList
+  | BreadcrumbItemHome
   | BreadcrumbItemDatabase
   | BreadcrumbItemSchema
   | BreadcrumbItemTable
diff --git a/mathesar_ui/src/routes/urls.ts b/mathesar_ui/src/routes/urls.ts
index 2de38e09cc..64335e3283 100644
--- a/mathesar_ui/src/routes/urls.ts
+++ b/mathesar_ui/src/routes/urls.ts
@@ -106,7 +106,7 @@ export const ADMIN_UPDATE_PAGE_URL = `${ADMIN_URL}update/`;
 export const ADMIN_USERS_PAGE_URL = `${ADMIN_URL}users/`;
 export const ADMIN_USERS_PAGE_ADD_NEW_URL = `${ADMIN_URL}users/new/`;
 export const LOGOUT_URL = '/auth/logout/';
-export const CONNECTIONS_URL = '/connections/';
+export const HOME_URL = '/databases/';
 export const WELCOME_URL = '/welcome';
 
 export function getEditUsersPageUrl(userId: number) {

From 4baa18ba08a97ff3d2e621bd3ed005a90b840b9d Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 24 Jul 2024 17:42:04 +0530
Subject: [PATCH 0502/1141] Implement basic home page with list of databases

---
 mathesar_ui/src/pages/WelcomePage.svelte      |  4 ++--
 .../DatabaseRow.svelte}                       | 23 ++++++-------------
 .../HomePage.svelte}                          | 19 +++++++--------
 .../src/routes/AuthenticatedRoutes.svelte     | 10 ++++----
 ...tate.svelte => DatabasesEmptyState.svelte} |  8 +++----
 mathesar_ui/src/systems/connections/index.ts  |  8 +++----
 .../data-explorer/__tests__/utils.test.ts     |  2 +-
 mathesar_ui/src/utils/preloadData.ts          |  7 +++---
 8 files changed, 34 insertions(+), 47 deletions(-)
 rename mathesar_ui/src/pages/{connections/ConnectionRow.svelte => home/DatabaseRow.svelte} (77%)
 rename mathesar_ui/src/pages/{connections/ConnectionsPage.svelte => home/HomePage.svelte} (93%)
 rename mathesar_ui/src/systems/connections/{ConnectionsEmptyState.svelte => DatabasesEmptyState.svelte} (83%)

diff --git a/mathesar_ui/src/pages/WelcomePage.svelte b/mathesar_ui/src/pages/WelcomePage.svelte
index 2a65a4e18d..1334c4ff23 100644
--- a/mathesar_ui/src/pages/WelcomePage.svelte
+++ b/mathesar_ui/src/pages/WelcomePage.svelte
@@ -5,7 +5,7 @@
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { getDocsLink, getWikiLink } from '@mathesar/routes/urls';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
-  import { ConnectionsEmptyState } from '@mathesar/systems/connections';
+  import { DatabasesEmptyState } from '@mathesar/systems/connections';
   import { AnchorButton, Icon } from '@mathesar-component-library';
 
   const userProfileStore = getUserProfileStoreFromContext();
@@ -30,7 +30,7 @@
       <div class="header">
         {$_('database_connections')}
       </div>
-      <ConnectionsEmptyState />
+      <DatabasesEmptyState />
     </section>
     <hr />
     <section>
diff --git a/mathesar_ui/src/pages/connections/ConnectionRow.svelte b/mathesar_ui/src/pages/home/DatabaseRow.svelte
similarity index 77%
rename from mathesar_ui/src/pages/connections/ConnectionRow.svelte
rename to mathesar_ui/src/pages/home/DatabaseRow.svelte
index 62b394116a..a74bfeb6a6 100644
--- a/mathesar_ui/src/pages/connections/ConnectionRow.svelte
+++ b/mathesar_ui/src/pages/home/DatabaseRow.svelte
@@ -1,17 +1,12 @@
 <script lang="ts">
-  import { _ } from 'svelte-i18n';
-
-  import type { Connection } from '@mathesar/api/rest/connections';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import { iconDeleteMajor, iconEdit } from '@mathesar/icons';
   import { iconConnection } from '@mathesar/icons';
   import { getDatabasePageUrl } from '@mathesar/routes/urls';
   import { modal } from '@mathesar/stores/modal';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
-  import {
-    DeleteConnectionModal,
-    EditConnectionModal,
-  } from '@mathesar/systems/connections';
   import { Button, Icon } from '@mathesar-component-library';
+  import { _ } from 'svelte-i18n';
 
   const userProfileStore = getUserProfileStoreFromContext();
   $: userProfile = $userProfileStore;
@@ -20,20 +15,16 @@
   const editConnectionModalController = modal.spawnModalController();
   const deleteConnectionModalController = modal.spawnModalController();
 
-  export let connection: Connection;
+  export let database: Database;
 </script>
 
 <tr data-identifier="connection-row" class="grid-row">
   <td>
-    <a href={getDatabasePageUrl(connection.id)}>
+    <a href={getDatabasePageUrl(database.id)}>
       <Icon {...iconConnection} />
-      {connection.nickname}
+      {database.name}
     </a>
   </td>
-  <td>{connection.database}</td>
-  <td>{connection.username}</td>
-  <td>{connection.host}</td>
-  <td>{connection.port}</td>
   {#if isSuperUser}
     <td>
       <div class="actions">
@@ -56,11 +47,11 @@
   {/if}
 </tr>
 
-<EditConnectionModal controller={editConnectionModalController} {connection} />
+<!-- <EditConnectionModal controller={editConnectionModalController} {connection} />
 <DeleteConnectionModal
   controller={deleteConnectionModalController}
   {connection}
-/>
+/> -->
 
 <style lang="scss">
   [data-identifier='connection-row'] {
diff --git a/mathesar_ui/src/pages/connections/ConnectionsPage.svelte b/mathesar_ui/src/pages/home/HomePage.svelte
similarity index 93%
rename from mathesar_ui/src/pages/connections/ConnectionsPage.svelte
rename to mathesar_ui/src/pages/home/HomePage.svelte
index 59e812ff3b..54625c6a9a 100644
--- a/mathesar_ui/src/pages/connections/ConnectionsPage.svelte
+++ b/mathesar_ui/src/pages/home/HomePage.svelte
@@ -1,6 +1,4 @@
 <script lang="ts">
-  import { _ } from 'svelte-i18n';
-
   import type { Database } from '@mathesar/api/rpc/databases';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
@@ -10,11 +8,11 @@
   import { databasesStore } from '@mathesar/stores/databases';
   import { modal } from '@mathesar/stores/modal';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
-  import {
-    AddConnectionModal,
-    ConnectionsEmptyState,
-  } from '@mathesar/systems/connections';
+  import { DatabasesEmptyState } from '@mathesar/systems/connections';
   import { Button, Icon } from '@mathesar-component-library';
+  import { _ } from 'svelte-i18n';
+
+  import DatabaseRow from './DatabaseRow.svelte';
 
   const addConnectionModalController = modal.spawnModalController();
 
@@ -60,7 +58,7 @@
 
   <section data-identifier="connections-container">
     {#if $databases.size === 0}
-      <ConnectionsEmptyState />
+      <DatabasesEmptyState />
     {:else}
       <EntityContainerWithFilterBar
         searchPlaceholder={$_('search_database_connections')}
@@ -83,7 +81,7 @@
           <RichText
             text={$_('connections_matching_search', {
               values: {
-                count: filteredConnections.length,
+                count: filteredDatabases.length,
               },
             })}
             let:slotName
@@ -108,8 +106,7 @@
                 </thead>
                 <tbody>
                   {#each filteredDatabases as database (database.id)}
-                    <!-- <ConnectionRow {connection} /> -->
-                    {database.name}
+                    <DatabaseRow {database} />
                   {/each}
                 </tbody>
               </table>
@@ -121,7 +118,7 @@
   </section>
 </LayoutWithHeader>
 
-<AddConnectionModal controller={addConnectionModalController} />
+<!-- <AddConnectionModal controller={addConnectionModalController} /> -->
 
 <style lang="scss">
   [data-identifier='connections-header'] {
diff --git a/mathesar_ui/src/routes/AuthenticatedRoutes.svelte b/mathesar_ui/src/routes/AuthenticatedRoutes.svelte
index ad37f48a10..1d4a90520f 100644
--- a/mathesar_ui/src/routes/AuthenticatedRoutes.svelte
+++ b/mathesar_ui/src/routes/AuthenticatedRoutes.svelte
@@ -2,9 +2,9 @@
   import { Route } from 'tinro';
 
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
-  import ConnectionsPage from '@mathesar/pages/connections/ConnectionsPage.svelte';
+  import HomePage from '@mathesar/pages/home/HomePage.svelte';
   import WelcomePage from '@mathesar/pages/WelcomePage.svelte';
-  import { CONNECTIONS_URL, getDatabasePageUrl } from '@mathesar/routes/urls';
+  import { HOME_URL, getDatabasePageUrl } from '@mathesar/routes/urls';
   import { databasesStore } from '@mathesar/stores/databases';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { mapExactlyOne } from '@mathesar/utils/iterUtils';
@@ -20,7 +20,7 @@
   $: rootPathRedirectUrl = mapExactlyOne($databases, {
     whenZero: undefined,
     whenOne: ([id]) => getDatabasePageUrl(id),
-    whenMany: CONNECTIONS_URL,
+    whenMany: HOME_URL,
   });
 </script>
 
@@ -44,6 +44,6 @@
 </Route>
 
 <Route path="/databases">
-  <AppendBreadcrumb item={{ type: 'connectionList' }} />
-  <ConnectionsPage />
+  <AppendBreadcrumb item={{ type: 'home' }} />
+  <HomePage />
 </Route>
diff --git a/mathesar_ui/src/systems/connections/ConnectionsEmptyState.svelte b/mathesar_ui/src/systems/connections/DatabasesEmptyState.svelte
similarity index 83%
rename from mathesar_ui/src/systems/connections/ConnectionsEmptyState.svelte
rename to mathesar_ui/src/systems/connections/DatabasesEmptyState.svelte
index 4d3e46497f..4e3bb0bfd2 100644
--- a/mathesar_ui/src/systems/connections/ConnectionsEmptyState.svelte
+++ b/mathesar_ui/src/systems/connections/DatabasesEmptyState.svelte
@@ -5,9 +5,9 @@
   import { modal } from '@mathesar/stores/modal';
   import { Button, Icon, Tutorial } from '@mathesar-component-library';
 
-  import AddConnectionModal from './AddConnectionModal.svelte';
+  // import AddConnectionModal from './AddConnectionModal.svelte';
 
-  const addConnectionModalController = modal.spawnModalController();
+  const addDatabaseModalController = modal.spawnModalController();
 </script>
 
 <div class="content" data-identifier="connection-empty-text">
@@ -26,7 +26,7 @@
     <Button
       slot="footer"
       appearance="primary"
-      on:click={() => addConnectionModalController.open()}
+      on:click={() => addDatabaseModalController.open()}
     >
       <Icon {...iconAddNew} />
       <span>{$_('add_database_connection')}</span>
@@ -34,7 +34,7 @@
   </Tutorial>
 </div>
 
-<AddConnectionModal controller={addConnectionModalController} />
+<!-- <AddConnectionModal controller={addDatabaseModalController} /> -->
 
 <style lang="scss">
   [data-identifier='connection-empty-text'] {
diff --git a/mathesar_ui/src/systems/connections/index.ts b/mathesar_ui/src/systems/connections/index.ts
index de2b34ee93..b2b1f7a755 100644
--- a/mathesar_ui/src/systems/connections/index.ts
+++ b/mathesar_ui/src/systems/connections/index.ts
@@ -1,4 +1,4 @@
-export { default as ConnectionsEmptyState } from './ConnectionsEmptyState.svelte';
-export { default as AddConnectionModal } from './AddConnectionModal.svelte';
-export { default as EditConnectionModal } from './EditConnectionModal.svelte';
-export { default as DeleteConnectionModal } from './DeleteConnectionModal.svelte';
+export { default as DatabasesEmptyState } from './DatabasesEmptyState.svelte';
+// export { default as AddConnectionModal } from './AddConnectionModal.svelte';
+// export { default as EditConnectionModal } from './EditConnectionModal.svelte';
+// export { default as DeleteConnectionModal } from './DeleteConnectionModal.svelte';
diff --git a/mathesar_ui/src/systems/data-explorer/__tests__/utils.test.ts b/mathesar_ui/src/systems/data-explorer/__tests__/utils.test.ts
index 66a77a0535..439dba8a90 100644
--- a/mathesar_ui/src/systems/data-explorer/__tests__/utils.test.ts
+++ b/mathesar_ui/src/systems/data-explorer/__tests__/utils.test.ts
@@ -16,7 +16,7 @@ import {
 
 vi.mock('@mathesar/utils/preloadData', () => ({
   preloadCommonData: () => ({
-    connections: [],
+    databases: [],
   }),
 }));
 
diff --git a/mathesar_ui/src/utils/preloadData.ts b/mathesar_ui/src/utils/preloadData.ts
index 2c73a639de..4ee2c8fb06 100644
--- a/mathesar_ui/src/utils/preloadData.ts
+++ b/mathesar_ui/src/utils/preloadData.ts
@@ -1,4 +1,3 @@
-import type { Connection } from '@mathesar/api/rest/connections';
 import type { QueryInstance } from '@mathesar/api/rest/types/queries';
 import type { TableEntry } from '@mathesar/api/rest/types/tables';
 import type { User } from '@mathesar/api/rest/users';
@@ -13,9 +12,9 @@ export interface CommonData {
   queries: QueryInstance[];
   current_database: Database['id'] | null;
   internal_db_connection: {
-    database: Connection['database'];
-    host: Connection['host'];
-    port: Connection['port'];
+    database: string;
+    host: string;
+    port: number;
     type: string;
     user: string;
   };

From 5aae3f74501bf7c2d5beb44d8470c34248f8547a Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 25 Jul 2024 14:28:12 +0800
Subject: [PATCH 0503/1141] add RPC test for record search

---
 mathesar/tests/rpc/test_records.py | 47 ++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/mathesar/tests/rpc/test_records.py b/mathesar/tests/rpc/test_records.py
index a43660f8dd..8fc0229684 100644
--- a/mathesar/tests/rpc/test_records.py
+++ b/mathesar/tests/rpc/test_records.py
@@ -59,3 +59,50 @@ def mock_list_records(
         table_oid=table_oid, database_id=database_id, request=request
     )
     assert actual_records_list == expect_records_list
+
+
+def test_records_search(rf, monkeypatch):
+    username = 'alice'
+    password = 'pass1234'
+    table_oid = 23457
+    database_id = 2
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=username, password=password)
+
+    @contextmanager
+    def mock_connect(_database_id, user):
+        if _database_id == database_id and user.username == username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_search_records(
+            conn,
+            _table_oid,
+            search=[],
+            limit=10,
+    ):
+        if _table_oid != table_oid:
+            raise AssertionError('incorrect parameters passed')
+        return {
+            "count": 50123,
+            "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],
+            "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
+        }
+
+    monkeypatch.setattr(records, 'connect', mock_connect)
+    monkeypatch.setattr(records.record_select, 'search_records_from_table', mock_search_records)
+    expect_records_list = {
+        "count": 50123,
+        "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],
+        "group": None,
+        "preview_data": [],
+        "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
+    }
+    actual_records_list = records.search(
+        table_oid=table_oid, database_id=database_id, request=request
+    )
+    assert actual_records_list == expect_records_list

From bb78a2ef71ad3fedb066f7d4c69a72936fc7ba23 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 25 Jul 2024 16:09:34 +0800
Subject: [PATCH 0504/1141] update filtering logic as per convo with Sean

use composition rather than prewrapped functions
add more parentheses to avoid ambiguity
avoid ILIKE, stopping bugs due to inadvertent wildcards
---
 db/sql/00_msar.sql      |  36 +++++-----
 db/sql/test_00_msar.sql | 144 +++++++++++++++++++++++++++-------------
 2 files changed, 115 insertions(+), 65 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 740c6b4042..8a1312de3c 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3317,30 +3317,26 @@ INSERT INTO msar.filter_templates VALUES
   ('and', '(%s) AND (%s)'),
   ('or', '(%s) OR (%s)'),
   -- general comparison operators
-  ('equal', '%s = %s'),
-  ('lesser', '%s < %s'),
-  ('greater', '%s > %s'),
-  ('lesser_or_equal', '%s <= %s'),
-  ('greater_or_equal', '%s >= %s'),
-  ('null', '%s IS NULL'),
-  ('not_null', '%s IS NOT NULL'),
+  ('equal', '(%s) = (%s)'),
+  ('lesser', '(%s) < (%s)'),
+  ('greater', '(%s) > (%s)'),
+  ('lesser_or_equal', '(%s) <= (%s)'),
+  ('greater_or_equal', '(%s) >= (%s)'),
+  ('null', '(%s) IS NULL'),
+  ('not_null', '(%s) IS NOT NULL'),
   -- string specific filters
-  ('contains_case_insensitive', '%s ILIKE ''%%'' || %s || ''%%'''),
-  ('starts_with_case_insensitive', '%s ILIKE %s || ''%%'''),
+  ('contains_case_insensitive', 'strpos(lower(%s), lower(%s))::boolean'),
+  ('starts_with_case_insensitive', 'starts_with(lower(%s), lower(%s))'),
+  ('contains', 'strpos((%s), (%s))::boolean'),
+  ('starts_with', 'starts_with((%s), (%s))'),
   -- json(b) filters
-  ('json_array_length_equals', 'jsonb_array_length(%s::jsonb) = %s'),
-  ('json_array_length_greater_than', 'jsonb_array_length(%s::jsonb) > %s'),
-  ('json_array_length_greater_or_equal', 'jsonb_array_length(%s::jsonb) >= %s'),
-  ('json_array_length_less_than', 'jsonb_array_length(%s::jsonb) < %s'),
-  ('json_array_length_less_or_equal', 'jsonb_array_length(%s::jsonb) <= %s'),
-  ('json_array_not_empty', 'jsonb_array_length(%s::jsonb) > 0'),
-  ('json_array_contains', '%s @> %s'),
+  ('json_array_length', 'jsonb_array_length((%s)::jsonb)'),
+  ('json_array_contains', '(%s) @> (%s)'),
   -- URI filters
-  ('uri_scheme_equals', 'mathesar_types.uri_scheme(%s) = %s'),
-  ('uri_authority_contains', 'mathesar_types.uri_authority(%s) LIKE ''%%'' || %s || ''%%'''),
+  ('uri_scheme', 'mathesar_types.uri_scheme(%s)'),
+  ('uri_authority', 'mathesar_types.uri_authority(%s)'),
   -- Email filters
-  ('email_domain_equals', 'mathesar_types.email_domain_name(%s) = %s'),
-  ('email_domain_contains', 'mathesar_types.email_domain_name(%s) LIKE ''%%'' || %s || ''%%''')
+  ('email_domain', 'mathesar_types.email_domain_name(%s)')
 ;
 
 CREATE OR REPLACE FUNCTION msar.build_filter_expr(rel_id oid, tree jsonb) RETURNS text AS $$
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 3428031244..3cf950a04c 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -3027,7 +3027,7 @@ BEGIN
         'type', 'equal', 'args', jsonb_build_array(
           jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 500)))),
-    'col1 = ''500'''
+    '(col1) = (''500'')'
   );
   RETURN NEXT is(
     msar.build_filter_expr(
@@ -3036,7 +3036,7 @@ BEGIN
         'type', 'lesser', 'args', jsonb_build_array(
           jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 500)))),
-    'col1 < ''500'''
+    '(col1) < (''500'')'
   );
   RETURN NEXT is(
     msar.build_filter_expr(
@@ -3045,7 +3045,7 @@ BEGIN
         'type', 'greater', 'args', jsonb_build_array(
           jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 500)))),
-    'col1 > ''500'''
+    '(col1) > (''500'')'
   );
   RETURN NEXT is(
     msar.build_filter_expr(
@@ -3054,7 +3054,7 @@ BEGIN
         'type', 'lesser_or_equal', 'args', jsonb_build_array(
           jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 500)))),
-    'col1 <= ''500'''
+    '(col1) <= (''500'')'
   );
   RETURN NEXT is(
     msar.build_filter_expr(
@@ -3063,7 +3063,7 @@ BEGIN
         'type', 'greater_or_equal', 'args', jsonb_build_array(
           jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 500)))),
-    'col1 >= ''500'''
+    '(col1) >= (''500'')'
   );
   RETURN NEXT is(
     msar.build_filter_expr(
@@ -3071,7 +3071,7 @@ BEGIN
       jsonb_build_object(
         'type', 'null', 'args', jsonb_build_array(
           jsonb_build_object('type', 'attnum', 'value', 2)))),
-    'col1 IS NULL'
+    '(col1) IS NULL'
   );
   RETURN NEXT is(
     msar.build_filter_expr(
@@ -3079,7 +3079,7 @@ BEGIN
       jsonb_build_object(
         'type', 'not_null', 'args', jsonb_build_array(
           jsonb_build_object('type', 'attnum', 'value', 2)))),
-    'col1 IS NOT NULL'
+    '(col1) IS NOT NULL'
   );
   RETURN NEXT is(
     msar.build_filter_expr(
@@ -3088,7 +3088,7 @@ BEGIN
         'type', 'contains_case_insensitive', 'args', jsonb_build_array(
           jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 'ABc')))),
-    'col1 ILIKE ''%'' || ''ABc'' || ''%'''
+    'strpos(lower(col1), lower(''ABc''))::boolean'
   );
   RETURN NEXT is(
     msar.build_filter_expr(
@@ -3097,61 +3097,91 @@ BEGIN
         'type', 'starts_with_case_insensitive', 'args', jsonb_build_array(
           jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', 'a''bc')))),
-    'col1 ILIKE ''a''''bc'' || ''%'''
+    'starts_with(lower(col1), lower(''a''''bc''))'
   );
   RETURN NEXT is(
+    -- composition for json_array_length_equals
     msar.build_filter_expr(
       rel_id,
       jsonb_build_object(
-        'type', 'json_array_length_equals', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'attnum', 'value', 2),
+        'type', 'equal', 'args', jsonb_build_array(
+          jsonb_build_object(
+            'type', 'json_array_length', 'args', jsonb_build_array(
+              jsonb_build_object('type', 'attnum', 'value', 2)
+            )
+          ),
           jsonb_build_object('type', 'literal', 'value', 500)))),
-    'jsonb_array_length(col1::jsonb) = ''500'''
+    '(jsonb_array_length((col1)::jsonb)) = (''500'')'
   );
   RETURN NEXT is(
+    -- composition for json_array_length_greater_than
     msar.build_filter_expr(
       rel_id,
       jsonb_build_object(
-        'type', 'json_array_length_greater_than', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'attnum', 'value', 2),
+        'type', 'greater', 'args', jsonb_build_array(
+          jsonb_build_object(
+            'type', 'json_array_length', 'args', jsonb_build_array(
+              jsonb_build_object('type', 'attnum', 'value', 2)
+            )
+          ),
           jsonb_build_object('type', 'literal', 'value', 500)))),
-    'jsonb_array_length(col1::jsonb) > ''500'''
+    '(jsonb_array_length((col1)::jsonb)) > (''500'')'
   );
   RETURN NEXT is(
     msar.build_filter_expr(
+    -- composition for json_array_length_greater_or_equal
       rel_id,
       jsonb_build_object(
-        'type', 'json_array_length_greater_or_equal', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'attnum', 'value', 2),
+        'type', 'greater_or_equal', 'args', jsonb_build_array(
+          jsonb_build_object(
+            'type', 'json_array_length', 'args', jsonb_build_array(
+              jsonb_build_object('type', 'attnum', 'value', 2)
+            )
+          ),
           jsonb_build_object('type', 'literal', 'value', 500)))),
-    'jsonb_array_length(col1::jsonb) >= ''500'''
+    '(jsonb_array_length((col1)::jsonb)) >= (''500'')'
   );
   RETURN NEXT is(
     msar.build_filter_expr(
+    -- composition for json_array_length_less_than
       rel_id,
       jsonb_build_object(
-        'type', 'json_array_length_less_than', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'attnum', 'value', 2),
+        'type', 'lesser', 'args', jsonb_build_array(
+          jsonb_build_object(
+            'type', 'json_array_length', 'args', jsonb_build_array(
+              jsonb_build_object('type', 'attnum', 'value', 2)
+            )
+          ),
           jsonb_build_object('type', 'literal', 'value', 500)))),
-    'jsonb_array_length(col1::jsonb) < ''500'''
+    '(jsonb_array_length((col1)::jsonb)) < (''500'')'
   );
   RETURN NEXT is(
     msar.build_filter_expr(
+    -- composition for json_array_length_less_or_equal
       rel_id,
       jsonb_build_object(
-        'type', 'json_array_length_less_or_equal', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'attnum', 'value', 2),
+        'type', 'lesser_or_equal', 'args', jsonb_build_array(
+          jsonb_build_object(
+            'type', 'json_array_length', 'args', jsonb_build_array(
+              jsonb_build_object('type', 'attnum', 'value', 2)
+            )
+          ),
           jsonb_build_object('type', 'literal', 'value', 500)))),
-    'jsonb_array_length(col1::jsonb) <= ''500'''
+    '(jsonb_array_length((col1)::jsonb)) <= (''500'')'
   );
   RETURN NEXT is(
     msar.build_filter_expr(
+    -- composition for json_array_not_empty
       rel_id,
       jsonb_build_object(
-        'type', 'json_array_not_empty', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'attnum', 'value', 2),
-          jsonb_build_object('type', 'literal', 'value', 500)))),
-    'jsonb_array_length(col1::jsonb) > 0'
+        'type', 'greater', 'args', jsonb_build_array(
+          jsonb_build_object(
+            'type', 'json_array_length', 'args', jsonb_build_array(
+              jsonb_build_object('type', 'attnum', 'value', 2)
+            )
+          ),
+          jsonb_build_object('type', 'literal', 'value', 0)))),
+    '(jsonb_array_length((col1)::jsonb)) > (''0'')'
   );
   RETURN NEXT is(
     msar.build_filter_expr(
@@ -3160,43 +3190,63 @@ BEGIN
         'type', 'json_array_contains', 'args', jsonb_build_array(
           jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', '"500"')))),
-    'col1 @> ''"500"'''
+    '(col1) @> (''"500"'')'
   );
   RETURN NEXT is(
     msar.build_filter_expr(
+    -- composition for uri_scheme_equals
       rel_id,
       jsonb_build_object(
-        'type', 'uri_scheme_equals', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'attnum', 'value', 2),
+        'type', 'equal', 'args', jsonb_build_array(
+          jsonb_build_object(
+            'type', 'uri_scheme', 'args', jsonb_build_array(
+              jsonb_build_object('type', 'attnum', 'value', 2)
+            )
+          ),
           jsonb_build_object('type', 'literal', 'value', 'https')))),
-    'mathesar_types.uri_scheme(col1) = ''https'''
+    '(mathesar_types.uri_scheme(col1)) = (''https'')'
   );
   RETURN NEXT is(
+    -- composition for uri_authority_contains
     msar.build_filter_expr(
       rel_id,
       jsonb_build_object(
-        'type', 'uri_authority_contains', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'attnum', 'value', 2),
+        'type', 'contains', 'args', jsonb_build_array(
+          jsonb_build_object(
+            'type', 'uri_authority', 'args', jsonb_build_array(
+              jsonb_build_object('type', 'attnum', 'value', 2)
+            )
+          ),
           jsonb_build_object('type', 'literal', 'value', 'google')))),
-    'mathesar_types.uri_authority(col1) LIKE ''%'' || ''google'' || ''%'''
+    'strpos((mathesar_types.uri_authority(col1)), (''google''))::boolean'
   );
   RETURN NEXT is(
+    -- composition for email_domain_equals
     msar.build_filter_expr(
       rel_id,
       jsonb_build_object(
-        'type', 'email_domain_equals', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'attnum', 'value', 2),
+        'type', 'equal', 'args', jsonb_build_array(
+          jsonb_build_object(
+            'type', 'email_domain', 'args', jsonb_build_array(
+              jsonb_build_object('type', 'attnum', 'value', 2)
+            )
+          ),
           jsonb_build_object('type', 'literal', 'value', 'gmail.com')))),
-    'mathesar_types.email_domain_name(col1) = ''gmail.com'''
+    '(mathesar_types.email_domain_name(col1)) = (''gmail.com'')'
   );
   RETURN NEXT is(
+    -- composition for email_domain_contains
     msar.build_filter_expr(
       rel_id,
       jsonb_build_object(
-        'type', 'email_domain_contains', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'attnum', 'value', 2),
+        'type', 'contains', 'args', jsonb_build_array(
+          jsonb_build_object(
+            'type', 'email_domain', 'args', jsonb_build_array(
+              jsonb_build_object('type', 'attnum', 'value', 2)
+            )
+          ),
           jsonb_build_object('type', 'literal', 'value', 'mail')))),
-    'mathesar_types.email_domain_name(col1) LIKE ''%'' || ''mail'' || ''%'''
+    'strpos((mathesar_types.email_domain_name(col1)), (''mail''))::boolean'
   );
   RETURN NEXT is(
     msar.build_filter_expr(
@@ -3204,8 +3254,12 @@ BEGIN
       jsonb_build_object(
         'type', 'or', 'args', jsonb_build_array(
           jsonb_build_object(
-            'type', 'email_domain_contains', 'args', jsonb_build_array(
-              jsonb_build_object('type', 'attnum', 'value', 2),
+            'type', 'contains', 'args', jsonb_build_array(
+              jsonb_build_object(
+                'type', 'email_domain', 'args', jsonb_build_array(
+                  jsonb_build_object('type', 'attnum', 'value', 2)
+                )
+              ),
               jsonb_build_object('type', 'literal', 'value', 'mail'))
           ),
           jsonb_build_object(
@@ -3216,7 +3270,7 @@ BEGIN
         )
       )
     ),
-    '(mathesar_types.email_domain_name(col1) LIKE ''%'' || ''mail'' || ''%'') OR (col2 = ''500'')'
+    '(strpos((mathesar_types.email_domain_name(col1)), (''mail''))::boolean) OR ((col2) = (''500''))'
   );
   RETURN NEXT is(
     msar.build_filter_expr(
@@ -3245,7 +3299,7 @@ BEGIN
         )
       )
     ),
-    '((col2 = ''500'') AND (col3 < ''abcde'')) OR (id > ''20'')'
+    '(((col2) = (''500'')) AND ((col3) < (''abcde''))) OR ((id) > (''20''))'
   );
 END;
 $$ LANGUAGE plpgsql;

From 79631b03e56b79433785ddaee432903991a0e0a7 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 25 Jul 2024 16:26:53 +0800
Subject: [PATCH 0505/1141] generalize terminology to avoid 'filter' where
 appropriate

---
 db/sql/00_msar.sql      | 22 +++++++++----------
 db/sql/test_00_msar.sql | 48 ++++++++++++++++++++---------------------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 8a1312de3c..905163ab3e 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3310,9 +3310,9 @@ SELECT val;
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
-DROP TABLE IF EXISTS msar.filter_templates;
-CREATE TABLE msar.filter_templates (filter_key text PRIMARY KEY, filter_template text);
-INSERT INTO msar.filter_templates VALUES
+DROP TABLE IF EXISTS msar.expr_templates;
+CREATE TABLE msar.expr_templates (expr_key text PRIMARY KEY, expr_template text);
+INSERT INTO msar.expr_templates VALUES
   -- basic composition operators
   ('and', '(%s) AND (%s)'),
   ('or', '(%s) OR (%s)'),
@@ -3329,30 +3329,30 @@ INSERT INTO msar.filter_templates VALUES
   ('starts_with_case_insensitive', 'starts_with(lower(%s), lower(%s))'),
   ('contains', 'strpos((%s), (%s))::boolean'),
   ('starts_with', 'starts_with((%s), (%s))'),
-  -- json(b) filters
+  -- json(b) filters and expressions
   ('json_array_length', 'jsonb_array_length((%s)::jsonb)'),
   ('json_array_contains', '(%s) @> (%s)'),
-  -- URI filters
+  -- URI part getters
   ('uri_scheme', 'mathesar_types.uri_scheme(%s)'),
   ('uri_authority', 'mathesar_types.uri_authority(%s)'),
-  -- Email filters
+  -- Email part getters
   ('email_domain', 'mathesar_types.email_domain_name(%s)')
 ;
 
-CREATE OR REPLACE FUNCTION msar.build_filter_expr(rel_id oid, tree jsonb) RETURNS text AS $$
+CREATE OR REPLACE FUNCTION msar.build_expr(rel_id oid, tree jsonb) RETURNS text AS $$
 SELECT CASE tree ->> 'type'
   WHEN 'literal' THEN format('%L', tree ->> 'value')
   WHEN 'attnum' THEN format('%I', msar.get_column_name(rel_id, (tree ->> 'value')::smallint))
   ELSE
-    format(max(filter_template), VARIADIC array_agg(msar.build_filter_expr(rel_id, inner_tree)))
+    format(max(expr_template), VARIADIC array_agg(msar.build_expr(rel_id, inner_tree)))
 END
-FROM jsonb_array_elements(tree -> 'args') inner_tree, msar.filter_templates
-WHERE tree ->> 'type' = filter_key
+FROM jsonb_array_elements(tree -> 'args') inner_tree, msar.expr_templates
+WHERE tree ->> 'type' = expr_key
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION msar.build_where_clause(rel_id oid, tree jsonb) RETURNS text AS $$
-SELECT 'WHERE ' || msar.build_filter_expr(rel_id, tree);
+SELECT 'WHERE ' || msar.build_expr(rel_id, tree);
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 3cf950a04c..2ca03b3406 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -3012,16 +3012,16 @@ END;
 $$ LANGUAGE plpgsql;
 
 
--- msar.build_filter_expr --------------------------------------------------------------------------
+-- msar.build_expr --------------------------------------------------------------------------
 
-CREATE OR REPLACE FUNCTION test_build_filter_expr() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION test_build_expr() RETURNS SETOF TEXT AS $$
 DECLARE
   rel_id oid;
 BEGIN
   PERFORM __setup_list_records_table();
   rel_id := 'atable'::regclass::oid;
   RETURN NEXT is(
-    msar.build_filter_expr(
+    msar.build_expr(
       rel_id,
       jsonb_build_object(
         'type', 'equal', 'args', jsonb_build_array(
@@ -3030,7 +3030,7 @@ BEGIN
     '(col1) = (''500'')'
   );
   RETURN NEXT is(
-    msar.build_filter_expr(
+    msar.build_expr(
       rel_id,
       jsonb_build_object(
         'type', 'lesser', 'args', jsonb_build_array(
@@ -3039,7 +3039,7 @@ BEGIN
     '(col1) < (''500'')'
   );
   RETURN NEXT is(
-    msar.build_filter_expr(
+    msar.build_expr(
       rel_id,
       jsonb_build_object(
         'type', 'greater', 'args', jsonb_build_array(
@@ -3048,7 +3048,7 @@ BEGIN
     '(col1) > (''500'')'
   );
   RETURN NEXT is(
-    msar.build_filter_expr(
+    msar.build_expr(
       rel_id,
       jsonb_build_object(
         'type', 'lesser_or_equal', 'args', jsonb_build_array(
@@ -3057,7 +3057,7 @@ BEGIN
     '(col1) <= (''500'')'
   );
   RETURN NEXT is(
-    msar.build_filter_expr(
+    msar.build_expr(
       rel_id,
       jsonb_build_object(
         'type', 'greater_or_equal', 'args', jsonb_build_array(
@@ -3066,7 +3066,7 @@ BEGIN
     '(col1) >= (''500'')'
   );
   RETURN NEXT is(
-    msar.build_filter_expr(
+    msar.build_expr(
       rel_id,
       jsonb_build_object(
         'type', 'null', 'args', jsonb_build_array(
@@ -3074,7 +3074,7 @@ BEGIN
     '(col1) IS NULL'
   );
   RETURN NEXT is(
-    msar.build_filter_expr(
+    msar.build_expr(
       rel_id,
       jsonb_build_object(
         'type', 'not_null', 'args', jsonb_build_array(
@@ -3082,7 +3082,7 @@ BEGIN
     '(col1) IS NOT NULL'
   );
   RETURN NEXT is(
-    msar.build_filter_expr(
+    msar.build_expr(
       rel_id,
       jsonb_build_object(
         'type', 'contains_case_insensitive', 'args', jsonb_build_array(
@@ -3091,7 +3091,7 @@ BEGIN
     'strpos(lower(col1), lower(''ABc''))::boolean'
   );
   RETURN NEXT is(
-    msar.build_filter_expr(
+    msar.build_expr(
       rel_id,
       jsonb_build_object(
         'type', 'starts_with_case_insensitive', 'args', jsonb_build_array(
@@ -3101,7 +3101,7 @@ BEGIN
   );
   RETURN NEXT is(
     -- composition for json_array_length_equals
-    msar.build_filter_expr(
+    msar.build_expr(
       rel_id,
       jsonb_build_object(
         'type', 'equal', 'args', jsonb_build_array(
@@ -3115,7 +3115,7 @@ BEGIN
   );
   RETURN NEXT is(
     -- composition for json_array_length_greater_than
-    msar.build_filter_expr(
+    msar.build_expr(
       rel_id,
       jsonb_build_object(
         'type', 'greater', 'args', jsonb_build_array(
@@ -3128,7 +3128,7 @@ BEGIN
     '(jsonb_array_length((col1)::jsonb)) > (''500'')'
   );
   RETURN NEXT is(
-    msar.build_filter_expr(
+    msar.build_expr(
     -- composition for json_array_length_greater_or_equal
       rel_id,
       jsonb_build_object(
@@ -3142,7 +3142,7 @@ BEGIN
     '(jsonb_array_length((col1)::jsonb)) >= (''500'')'
   );
   RETURN NEXT is(
-    msar.build_filter_expr(
+    msar.build_expr(
     -- composition for json_array_length_less_than
       rel_id,
       jsonb_build_object(
@@ -3156,7 +3156,7 @@ BEGIN
     '(jsonb_array_length((col1)::jsonb)) < (''500'')'
   );
   RETURN NEXT is(
-    msar.build_filter_expr(
+    msar.build_expr(
     -- composition for json_array_length_less_or_equal
       rel_id,
       jsonb_build_object(
@@ -3170,7 +3170,7 @@ BEGIN
     '(jsonb_array_length((col1)::jsonb)) <= (''500'')'
   );
   RETURN NEXT is(
-    msar.build_filter_expr(
+    msar.build_expr(
     -- composition for json_array_not_empty
       rel_id,
       jsonb_build_object(
@@ -3184,7 +3184,7 @@ BEGIN
     '(jsonb_array_length((col1)::jsonb)) > (''0'')'
   );
   RETURN NEXT is(
-    msar.build_filter_expr(
+    msar.build_expr(
       rel_id,
       jsonb_build_object(
         'type', 'json_array_contains', 'args', jsonb_build_array(
@@ -3193,7 +3193,7 @@ BEGIN
     '(col1) @> (''"500"'')'
   );
   RETURN NEXT is(
-    msar.build_filter_expr(
+    msar.build_expr(
     -- composition for uri_scheme_equals
       rel_id,
       jsonb_build_object(
@@ -3208,7 +3208,7 @@ BEGIN
   );
   RETURN NEXT is(
     -- composition for uri_authority_contains
-    msar.build_filter_expr(
+    msar.build_expr(
       rel_id,
       jsonb_build_object(
         'type', 'contains', 'args', jsonb_build_array(
@@ -3222,7 +3222,7 @@ BEGIN
   );
   RETURN NEXT is(
     -- composition for email_domain_equals
-    msar.build_filter_expr(
+    msar.build_expr(
       rel_id,
       jsonb_build_object(
         'type', 'equal', 'args', jsonb_build_array(
@@ -3236,7 +3236,7 @@ BEGIN
   );
   RETURN NEXT is(
     -- composition for email_domain_contains
-    msar.build_filter_expr(
+    msar.build_expr(
       rel_id,
       jsonb_build_object(
         'type', 'contains', 'args', jsonb_build_array(
@@ -3249,7 +3249,7 @@ BEGIN
     'strpos((mathesar_types.email_domain_name(col1)), (''mail''))::boolean'
   );
   RETURN NEXT is(
-    msar.build_filter_expr(
+    msar.build_expr(
       rel_id,
       jsonb_build_object(
         'type', 'or', 'args', jsonb_build_array(
@@ -3273,7 +3273,7 @@ BEGIN
     '(strpos((mathesar_types.email_domain_name(col1)), (''mail''))::boolean) OR ((col2) = (''500''))'
   );
   RETURN NEXT is(
-    msar.build_filter_expr(
+    msar.build_expr(
       rel_id,
       jsonb_build_object(
         'type', 'or', 'args', jsonb_build_array(

From 45c1b7b290a77dccc4fb6815c6de90ce83d32b74 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 25 Jul 2024 17:32:48 +0800
Subject: [PATCH 0506/1141] wire up documentation for RPC function

---
 docs/docs/api/rpc.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 0f969220fb..34dfd1cc37 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -181,11 +181,13 @@ To use an RPC function:
     options:
       members:
       - list_
+      - search
       - RecordList
       - OrderBy
       - Filter
       - FilterAttnum
       - FilterLiteral
+      - SearchParam
 
 ## Explorations
 

From e68c87603a41c281e67230baa951918f7453228b Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 25 Jul 2024 18:18:28 +0800
Subject: [PATCH 0507/1141] wire up valid_target_type function to column lister

---
 db/sql/00_msar.sql                        |  6 +++--
 db/sql/test_00_msar.sql                   | 21 ++++++++++------
 mathesar/rpc/columns/base.py              |  4 ++-
 mathesar/tests/rpc/columns/test_c_base.py | 30 +++++++++++++++--------
 4 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index aac6ddddc7..87298e948d 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -753,7 +753,8 @@ Each returned JSON object in the array will have the form:
     "primary_key": <bool>,
     "default": {"value": <str>, "is_dynamic": <bool>},
     "has_dependents": <bool>,
-    "description": <str>
+    "description": <str>,
+    "valid_target_types": [<str>, <str>, ...]
   }
 
 The `type_options` object is described in the docstring of `msar.get_type_options`. The `default`
@@ -784,7 +785,8 @@ SELECT jsonb_agg(
       jsonb_build_object()
     ),
     'has_dependents', msar.has_dependents(tab_id, attnum),
-    'description', msar.col_description(tab_id, attnum)
+    'description', msar.col_description(tab_id, attnum),
+    'valid_target_types', msar.get_valid_target_type_strings(atttypid)
   )
 )
 FROM pg_attribute pga
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 5c10ad130a..9148fa52d3 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2554,7 +2554,8 @@ BEGIN
         "description": null,
         "primary_key": true,
         "type_options": null,
-        "has_dependents": true
+        "has_dependents": true,
+        "valid_target_types": null
       },
       {
         "id": 2,
@@ -2568,7 +2569,8 @@ BEGIN
           "scale": null,
           "precision": null
         },
-        "has_dependents": false
+        "has_dependents": false,
+        "valid_target_types": null
       },
       {
         "id": 3,
@@ -2581,7 +2583,8 @@ BEGIN
         "type_options": {
           "length": 128
         },
-        "has_dependents": false
+        "has_dependents": false,
+        "valid_target_types": null
       },
       {
         "id": 4,
@@ -2595,7 +2598,8 @@ BEGIN
         "description": "A super comment ;",
         "primary_key": false,
         "type_options": null,
-        "has_dependents": false
+        "has_dependents": false,
+        "valid_target_types": ["numeric", "text"]
       },
       {
         "id": 5,
@@ -2611,7 +2615,8 @@ BEGIN
         "type_options": {
           "precision": null
         },
-        "has_dependents": false
+        "has_dependents": false,
+        "valid_target_types": null
       },
       {
         "id": 6,
@@ -2624,7 +2629,8 @@ BEGIN
         "type_options": {
           "item_type": "integer"
         },
-        "has_dependents": false
+        "has_dependents": false,
+        "valid_target_types": null
       },
       {
         "id": 7,
@@ -2639,7 +2645,8 @@ BEGIN
           "item_type": "numeric",
           "precision": 15
         },
-        "has_dependents": false
+        "has_dependents": false,
+        "valid_target_types": null
       }
     ]$j$::jsonb
   );
diff --git a/mathesar/rpc/columns/base.py b/mathesar/rpc/columns/base.py
index 257cfccf64..6c447541a8 100644
--- a/mathesar/rpc/columns/base.py
+++ b/mathesar/rpc/columns/base.py
@@ -170,6 +170,7 @@ class ColumnInfo(TypedDict):
     default: ColumnDefault
     has_dependents: bool
     description: str
+    valid_target_types: list[str]
 
     @classmethod
     def from_dict(cls, col_info):
@@ -182,7 +183,8 @@ def from_dict(cls, col_info):
             primary_key=col_info["primary_key"],
             default=ColumnDefault.from_dict(col_info.get("default")),
             has_dependents=col_info["has_dependents"],
-            description=col_info.get("description")
+            description=col_info.get("description"),
+            valid_target_types=col_info.get("valid_target_types")
         )
 
 
diff --git a/mathesar/tests/rpc/columns/test_c_base.py b/mathesar/tests/rpc/columns/test_c_base.py
index 657145f514..88f7db64f5 100644
--- a/mathesar/tests/rpc/columns/test_c_base.py
+++ b/mathesar/tests/rpc/columns/test_c_base.py
@@ -36,7 +36,8 @@ def mock_column_info(_table_oid, conn):
                 'default': {'value': 'identity', 'is_dynamic': True},
                 'nullable': False, 'description': None, 'primary_key': True,
                 'type_options': None,
-                'has_dependents': True
+                'has_dependents': True,
+                'valid_target_types': ['text']
             }, {
                 'id': 2, 'name': 'numcol', 'type': 'numeric',
                 'default': {'value': "'8'::numeric", 'is_dynamic': False},
@@ -44,25 +45,29 @@ def mock_column_info(_table_oid, conn):
                 'description': 'My super numeric column',
                 'primary_key': False,
                 'type_options': {'scale': None, 'precision': None},
-                'has_dependents': False
+                'has_dependents': False,
+                'valid_target_types': ['text']
             }, {
                 'id': 4, 'name': 'numcolmod', 'type': 'numeric',
                 'default': None,
                 'nullable': True, 'description': None, 'primary_key': False,
                 'type_options': {'scale': 3, 'precision': 5},
-                'has_dependents': False
+                'has_dependents': False,
+                'valid_target_types': ['text']
             }, {
                 'id': 8, 'name': 'ivlcolmod', 'type': 'interval',
                 'default': None,
                 'nullable': True, 'description': None, 'primary_key': False,
                 'type_options': {'fields': 'day to second'},
-                'has_dependents': False
+                'has_dependents': False,
+                'valid_target_types': ['text']
             }, {
                 'id': 10, 'name': 'arrcol', 'type': '_array',
                 'default': None,
                 'nullable': True, 'description': None, 'primary_key': False,
                 'type_options': {'item_type': 'character varying', 'length': 3},
-                'has_dependents': False
+                'has_dependents': False,
+                'valid_target_types': None
             },
         ]
 
@@ -74,7 +79,8 @@ def mock_column_info(_table_oid, conn):
             'default': {'value': 'identity', 'is_dynamic': True},
             'nullable': False, 'description': None, 'primary_key': True,
             'type_options': None,
-            'has_dependents': True
+            'has_dependents': True,
+            'valid_target_types': ['text']
         }, {
             'id': 2, 'name': 'numcol', 'type': 'numeric',
             'default': {'value': "'8'::numeric", 'is_dynamic': False},
@@ -82,25 +88,29 @@ def mock_column_info(_table_oid, conn):
             'description': 'My super numeric column',
             'primary_key': False,
             'type_options': None,
-            'has_dependents': False
+            'has_dependents': False,
+            'valid_target_types': ['text']
         }, {
             'id': 4, 'name': 'numcolmod', 'type': 'numeric',
             'default': None,
             'nullable': True, 'description': None, 'primary_key': False,
             'type_options': {'scale': 3, 'precision': 5},
-            'has_dependents': False
+            'has_dependents': False,
+            'valid_target_types': ['text']
         }, {
             'id': 8, 'name': 'ivlcolmod', 'type': 'interval',
             'default': None,
             'nullable': True, 'description': None, 'primary_key': False,
             'type_options': {'fields': 'day to second'},
-            'has_dependents': False
+            'has_dependents': False,
+            'valid_target_types': ['text']
         }, {
             'id': 10, 'name': 'arrcol', 'type': '_array',
             'default': None,
             'nullable': True, 'description': None, 'primary_key': False,
             'type_options': {'item_type': 'character varying', 'length': 3},
-            'has_dependents': False
+            'has_dependents': False,
+            'valid_target_types': None
         }
     ]
     actual_col_list = columns.list_(table_oid=23457, database_id=database_id, request=request)

From 15aa6b65bd530b2b594ede77d08ba6fb0f2c77ea Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 25 Jul 2024 16:10:25 +0530
Subject: [PATCH 0508/1141] Remove the rest api file for Connections

---
 mathesar_ui/src/api/rest/connections.ts | 89 -------------------------
 1 file changed, 89 deletions(-)
 delete mode 100644 mathesar_ui/src/api/rest/connections.ts

diff --git a/mathesar_ui/src/api/rest/connections.ts b/mathesar_ui/src/api/rest/connections.ts
deleted file mode 100644
index 0a23ad7eb1..0000000000
--- a/mathesar_ui/src/api/rest/connections.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import {
-  type PaginatedResponse,
-  addQueryParamsToUrl,
-  deleteAPI,
-  getAPI,
-  patchAPI,
-  postAPI,
-} from './utils/requestUtils';
-
-export interface Connection {
-  id: number;
-  nickname: string;
-  database: string;
-  username: string;
-  host: string;
-  port: number;
-}
-
-interface ConnectionWithPassword extends Connection {
-  password: string;
-}
-
-export type UpdatableConnectionProperties = Omit<ConnectionWithPassword, 'id'>;
-
-function list() {
-  return getAPI<PaginatedResponse<Connection>>(
-    '/api/db/v0/connections/?limit=500',
-  );
-}
-
-export const sampleDataOptions = [
-  'library_management',
-  'movie_collection',
-] as const;
-
-export type SampleDataSchemaIdentifier = (typeof sampleDataOptions)[number];
-
-export type ConnectionReference =
-  | { connection_type: 'internal_database' }
-  | { connection_type: 'user_database'; id: Connection['id'] };
-
-export interface CommonCreationProps {
-  database_name: string;
-  sample_data: SampleDataSchemaIdentifier[];
-  nickname: string;
-}
-
-export interface CreateWithNewUserProps extends CommonCreationProps {
-  credentials: {
-    create_user_via: ConnectionReference;
-    user: string;
-    password: string;
-  };
-  create_database: boolean;
-}
-
-function createWithNewUser(props: CreateWithNewUserProps) {
-  const url = '/api/ui/v0/connections/create_with_new_user/';
-  return postAPI<Connection>(url, props);
-}
-
-function update(
-  connectionId: Connection['id'],
-  properties: Partial<UpdatableConnectionProperties>,
-) {
-  return patchAPI<Connection>(
-    `/api/db/v0/connections/${connectionId}/`,
-    properties,
-  );
-}
-
-function deleteConnection(
-  connectionId: Connection['id'],
-  deleteMathesarSchemas = false,
-) {
-  const params = { del_msar_schemas: deleteMathesarSchemas };
-  const url = addQueryParamsToUrl(
-    `/api/db/v0/connections/${connectionId}/`,
-    params,
-  );
-  return deleteAPI(url);
-}
-
-export default {
-  list,
-  createWithNewUser,
-  update,
-  delete: deleteConnection,
-};

From 6cb4767b080ec405f2751508aaf3f4ed5fb34989 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 25 Jul 2024 21:57:37 +0800
Subject: [PATCH 0509/1141] add doc for valid_target_types attribute

---
 mathesar/rpc/columns/base.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mathesar/rpc/columns/base.py b/mathesar/rpc/columns/base.py
index 6c447541a8..1b0f5e954d 100644
--- a/mathesar/rpc/columns/base.py
+++ b/mathesar/rpc/columns/base.py
@@ -160,6 +160,8 @@ class ColumnInfo(TypedDict):
         default: The default value and whether it's dynamic.
         has_dependents: Whether the column has dependent objects.
         description: The description of the column.
+        valid_target_types: A list of all types to which the column can
+            be cast.
     """
     id: int
     name: str

From 503c9078d33a61e2f3a8b94e7527f6e019a88500 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 25 Jul 2024 20:21:12 +0530
Subject: [PATCH 0510/1141] Remove unused components

---
 .../systems/connections/AddConnection.svelte  | 295 ------------------
 .../connections/AddConnectionModal.svelte     |  33 --
 .../connections/DeleteConnectionModal.svelte  |  94 ------
 .../connections/EditConnectionModal.svelte    | 198 ------------
 .../connections/GeneralConnection.svelte      |  43 ---
 .../systems/connections/generalConnections.ts |  76 -----
 6 files changed, 739 deletions(-)
 delete mode 100644 mathesar_ui/src/systems/connections/AddConnection.svelte
 delete mode 100644 mathesar_ui/src/systems/connections/AddConnectionModal.svelte
 delete mode 100644 mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte
 delete mode 100644 mathesar_ui/src/systems/connections/EditConnectionModal.svelte
 delete mode 100644 mathesar_ui/src/systems/connections/GeneralConnection.svelte
 delete mode 100644 mathesar_ui/src/systems/connections/generalConnections.ts

diff --git a/mathesar_ui/src/systems/connections/AddConnection.svelte b/mathesar_ui/src/systems/connections/AddConnection.svelte
deleted file mode 100644
index 520731a0f2..0000000000
--- a/mathesar_ui/src/systems/connections/AddConnection.svelte
+++ /dev/null
@@ -1,295 +0,0 @@
-<script lang="ts">
-  import { map } from 'iter-tools';
-  import { _ } from 'svelte-i18n';
-
-  import {
-    type CommonCreationProps,
-    type Connection,
-    type SampleDataSchemaIdentifier,
-    sampleDataOptions,
-  } from '@mathesar/api/rest/connections';
-  import Checkbox from '@mathesar/component-library/checkbox/Checkbox.svelte';
-  import LabeledInput from '@mathesar/component-library/labeled-input/LabeledInput.svelte';
-  import Select from '@mathesar/component-library/select/Select.svelte';
-  import {
-    FormSubmit,
-    makeForm,
-    requiredField,
-    uniqueWith,
-  } from '@mathesar/components/form';
-  import Field from '@mathesar/components/form/Field.svelte';
-  import FieldHelp from '@mathesar/components/form/FieldHelp.svelte';
-  import {
-    GridForm,
-    GridFormDivider,
-    GridFormLabelRow,
-  } from '@mathesar/components/grid-form';
-  import { connectionsStore } from '@mathesar/stores/databases';
-  import { toast } from '@mathesar/stores/toast';
-  import { getAvailableName } from '@mathesar/utils/db';
-  import {
-    CheckboxGroup,
-    NumberInput,
-    PasswordInput,
-    RadioGroup,
-    defined,
-    portalToWindowFooter,
-  } from '@mathesar-component-library';
-
-  import GeneralConnection from './GeneralConnection.svelte';
-  import {
-    generalConnections,
-    getConnectionReference,
-    getUsername,
-    pickDefaultGeneralConnection,
-  } from './generalConnections';
-
-  interface CredentialsStrategy {
-    /** We want to reuse the credentials from a known connection */
-    reuse: boolean;
-    /** The user can modify the strategy */
-    modifiable: boolean;
-  }
-  function getCredentialsStrategyLabel(s: CredentialsStrategy) {
-    return s.reuse
-      ? $_('reuse_credentials_from_known_connection')
-      : $_('enter_new_credentials');
-  }
-
-  type InstallationSchema = SampleDataSchemaIdentifier | 'internal';
-  const installationSchemaOptions: InstallationSchema[] = [
-    'internal',
-    ...sampleDataOptions,
-  ];
-  const installationSchemaLabels: Record<InstallationSchema, string> = {
-    // These strings are not translated because these are the names that will
-    // appear in the Mathesar UI after installation.
-    internal: 'mathesar_types, __msar, msar',
-    library_management: 'Library Management',
-    movie_collection: 'Movie Collection',
-  };
-  const installationSchemaHelp: Record<InstallationSchema, string> = {
-    internal: $_('internal_schema_help'),
-    library_management: $_('sample_data_library_help'),
-    movie_collection: $_('sample_data_movies_help'),
-  };
-
-  export let onCancel: () => void;
-  export let onSuccess: (c: Connection) => void;
-
-  $: availableConnectionsToReuse = $generalConnections;
-  $: defaultConnectionToReuse =
-    pickDefaultGeneralConnection($generalConnections);
-  $: namedConnections = connectionsStore.connections;
-  $: connectionNames = new Set(map(([, c]) => c.nickname, $namedConnections));
-  $: someUserDbConnectionsExist = $generalConnections.some(
-    (c) => c.type === 'user_database',
-  );
-  $: defaultDatabaseName = someUserDbConnectionsExist ? '' : 'mathesar';
-  $: credentialsStrategy = requiredField<CredentialsStrategy>(
-    defaultConnectionToReuse
-      ? { reuse: true, modifiable: true }
-      : { reuse: false, modifiable: false },
-  );
-  $: databaseName = requiredField(defaultDatabaseName);
-  $: createDatabase = requiredField(true);
-  $: installationSchemas = requiredField<InstallationSchema[]>(['internal']);
-  $: connectionNickname = requiredField('', [uniqueWith(connectionNames)]);
-  $: connectionToReuse = requiredField(defaultConnectionToReuse);
-  $: host = requiredField('localhost');
-  $: port = requiredField(5432);
-  $: user = requiredField('');
-  $: password = requiredField('');
-  $: commonFields = { databaseName, installationSchemas, connectionNickname };
-  $: allFields = $credentialsStrategy.reuse
-    ? { ...commonFields, connectionToReuse, createDatabase }
-    : { ...commonFields, host, port, user, password };
-  $: form = makeForm(allFields);
-  $: canCreateDb = $credentialsStrategy.reuse;
-  $: databaseNameHelp = canCreateDb
-    ? undefined
-    : $_('this_database_must_exist_already');
-  $: databaseCreationUser = $credentialsStrategy.reuse
-    ? defined($connectionToReuse, getUsername)
-    : undefined;
-
-  function handleNewDatabaseName(newDatabaseName: string) {
-    $connectionNickname = getAvailableName(newDatabaseName, connectionNames);
-  }
-  $: handleNewDatabaseName($databaseName);
-
-  function create(): Promise<Connection> {
-    const commonProps: CommonCreationProps = {
-      database_name: $databaseName,
-      sample_data: sampleDataOptions.filter((o) =>
-        $installationSchemas.includes(o),
-      ),
-      nickname: $connectionNickname,
-    };
-    if ($credentialsStrategy.reuse) {
-      const connection = $connectionToReuse;
-      if (!connection) {
-        throw new Error('Bug: $connectionToReuse is undefined');
-      }
-      const connectionReference = getConnectionReference(connection);
-      const connectionId =
-        connectionReference.connection_type === 'user_database'
-          ? connectionReference.id
-          : undefined;
-      return connectionsStore.createFromKnownConnection({
-        database: commonProps.database_name,
-        nickname: commonProps.nickname,
-        sample_data: commonProps.sample_data,
-        connection_id: connectionId,
-        create_db: $createDatabase,
-      });
-    }
-    return connectionsStore.createFromScratch({
-      database: commonProps.database_name,
-      nickname: commonProps.nickname,
-      sample_data: commonProps.sample_data,
-      host: $host,
-      port: $port,
-      user: $user,
-      password: $password,
-    });
-  }
-
-  async function saveConnectionDetails() {
-    try {
-      const connection = await create();
-      onSuccess(connection);
-      toast.success($_('connection_added_successfully'));
-    } catch (e) {
-      toast.fromError(e);
-    }
-  }
-</script>
-
-<div class="db-connection-form">
-  <GridForm>
-    {#if $credentialsStrategy.modifiable}
-      <div>{$_('database_server_credentials')}</div>
-      <div>
-        <RadioGroup
-          bind:value={$credentialsStrategy}
-          ariaLabel={$_('database_server_credentials')}
-          options={[
-            { reuse: true, modifiable: true },
-            { reuse: false, modifiable: true },
-          ]}
-          valuesAreEqual={(a, b) => a?.reuse === b?.reuse}
-          getRadioLabel={getCredentialsStrategyLabel}
-        />
-      </div>
-    {/if}
-
-    {#if $credentialsStrategy.reuse}
-      <GridFormLabelRow label={$_('known_connection')}>
-        <Select
-          bind:value={$connectionToReuse}
-          options={availableConnectionsToReuse}
-          getLabel={(generalConnection) => ({
-            component: GeneralConnection,
-            props: { generalConnection },
-          })}
-        />
-        <FieldHelp>
-          {$_('the_credentials_will_be_copied_from_this_connection')}
-        </FieldHelp>
-      </GridFormLabelRow>
-    {:else}
-      <GridFormLabelRow label={$_('host_name')}>
-        <div class="host-and-port">
-          <Field field={host} />
-          <Field
-            field={port}
-            input={{ component: NumberInput, props: { style: 'width: 8ch;' } }}
-            label={$_('port')}
-          />
-        </div>
-      </GridFormLabelRow>
-
-      <GridFormLabelRow label={$_('user_name')}>
-        <Field field={user} help={$_('existing_pg_user_privileges_help')} />
-      </GridFormLabelRow>
-
-      <GridFormLabelRow label={$_('password')}>
-        <Field
-          field={password}
-          input={{ component: PasswordInput }}
-          help={$_('password_encryption_help')}
-        />
-      </GridFormLabelRow>
-    {/if}
-
-    <GridFormDivider />
-
-    <GridFormLabelRow label={$_('database_name')}>
-      <div>
-        <Field field={databaseName} help={databaseNameHelp} />
-      </div>
-      {#if canCreateDb}
-        <div class="create-db-checkbox-field">
-          <LabeledInput
-            label={$_('create_db_if_not_exists')}
-            layout="inline-input-first"
-            help={$_('operation_requires_pg_user_have_createdb', {
-              values: { username: databaseCreationUser },
-            })}
-          >
-            <Checkbox bind:checked={$createDatabase} />
-          </LabeledInput>
-        </div>
-      {/if}
-    </GridFormLabelRow>
-
-    <GridFormDivider />
-
-    <div>{$_('schemas_to_install')}</div>
-    <div>
-      <CheckboxGroup
-        bind:values={$installationSchemas}
-        ariaLabel={$_('schemas_to_install')}
-        options={installationSchemaOptions}
-        getCheckboxLabel={(o) => installationSchemaLabels[o]}
-        getCheckboxHelp={(o) => installationSchemaHelp[o]}
-        getCheckboxDisabled={(o) => o === 'internal'}
-      />
-    </div>
-
-    <GridFormDivider />
-
-    <GridFormLabelRow label={$_('connection_nickname')}>
-      <Field field={connectionNickname} help={$_('connection_nickname_help')} />
-    </GridFormLabelRow>
-  </GridForm>
-
-  <div use:portalToWindowFooter class="footer">
-    <FormSubmit
-      {form}
-      catchErrors
-      {onCancel}
-      onProceed={saveConnectionDetails}
-      proceedButton={{ label: $_('add_connection') }}
-      cancelButton={{ label: $_('cancel') }}
-    />
-  </div>
-</div>
-
-<style>
-  .db-connection-form {
-    --form-submit-margin: 1rem 0 0 0;
-  }
-  .host-and-port {
-    display: grid;
-    grid-template: 1fr / 1fr auto;
-    gap: 1rem;
-  }
-  .host-and-port > :global(*) {
-    margin: 0;
-  }
-  .create-db-checkbox-field {
-    margin-top: 1rem;
-  }
-</style>
diff --git a/mathesar_ui/src/systems/connections/AddConnectionModal.svelte b/mathesar_ui/src/systems/connections/AddConnectionModal.svelte
deleted file mode 100644
index dc52dfada4..0000000000
--- a/mathesar_ui/src/systems/connections/AddConnectionModal.svelte
+++ /dev/null
@@ -1,33 +0,0 @@
-<script lang="ts">
-  import { _ } from 'svelte-i18n';
-  import { router } from 'tinro';
-
-  import type { Connection } from '@mathesar/api/rest/connections';
-  import { getDatabasePageUrl } from '@mathesar/routes/urls';
-  import {
-    ControlledModal,
-    type ModalController,
-  } from '@mathesar-component-library';
-
-  import AddConnection from './AddConnection.svelte';
-
-  export let controller: ModalController;
-
-  function handleCancel() {
-    controller.close();
-  }
-
-  function handleSuccess(connection: Connection) {
-    controller.close();
-    const url = getDatabasePageUrl(connection.id);
-    router.goto(url);
-  }
-</script>
-
-<ControlledModal
-  {controller}
-  size="large"
-  title={$_('new_postgresql_database_connection')}
->
-  <AddConnection onCancel={handleCancel} onSuccess={handleSuccess} />
-</ControlledModal>
diff --git a/mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte b/mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte
deleted file mode 100644
index d158ddf381..0000000000
--- a/mathesar_ui/src/systems/connections/DeleteConnectionModal.svelte
+++ /dev/null
@@ -1,94 +0,0 @@
-<script lang="ts">
-  import { createEventDispatcher } from 'svelte';
-  import { _ } from 'svelte-i18n';
-
-  import type { Connection } from '@mathesar/api/rest/connections';
-  import Identifier from '@mathesar/components/Identifier.svelte';
-  import RichText from '@mathesar/components/rich-text/RichText.svelte';
-  import { connectionsStore } from '@mathesar/stores/databases';
-  import { toast } from '@mathesar/stores/toast';
-  import { getErrorMessage } from '@mathesar/utils/errors';
-  import {
-    CancelOrProceedButtonPair,
-    Checkbox,
-    ControlledModal,
-    LabeledInput,
-    ModalController,
-  } from '@mathesar-component-library';
-
-  const dispatch = createEventDispatcher<{ delete: undefined }>();
-
-  export let controller: ModalController;
-  export let connection: Connection;
-
-  let deleteMathesarSchemas = false;
-
-  async function disconnect() {
-    try {
-      await connectionsStore.deleteConnection(
-        connection.id,
-        deleteMathesarSchemas,
-      );
-      toast.success($_('connection_deleted_successfully'));
-      controller.close();
-      dispatch('delete');
-    } catch (e) {
-      toast.error(getErrorMessage(e));
-    }
-  }
-
-  function cancel() {
-    controller.close();
-    deleteMathesarSchemas = false;
-  }
-</script>
-
-<ControlledModal {controller}>
-  <svelte:fragment slot="title">
-    <RichText text={$_('delete_connection_with_name')} let:slotName>
-      {#if slotName === 'connectionName'}
-        <Identifier>{connection.nickname}</Identifier>
-      {/if}
-    </RichText>
-  </svelte:fragment>
-
-  <p>{$_('action_cannot_be_undone')}</p>
-  <p>
-    {$_('delete_connection_info')}
-  </p>
-  <p>
-    {$_('delete_connection_db_delete_info')}
-  </p>
-
-  <p>
-    <LabeledInput
-      layout="inline-input-first"
-      label={$_('delete_associated_mathesar_schemas_help')}
-    >
-      <Checkbox bind:checked={deleteMathesarSchemas} />
-    </LabeledInput>
-  </p>
-
-  <!--
-      TODO: Uncomment this when we have a docs page to link to.
-      See: https://github.com/mathesar-foundation/mathesar/issues/3450
-     -->
-  <!-- <p>
-      <WarningBox>
-        {$_('using_custom_types')}
-        <DocsLink path="/">
-          {$_('learn_implications_deleting_mathesar_schemas')}
-        </DocsLink>
-      </WarningBox>
-    </p> -->
-
-  <CancelOrProceedButtonPair
-    proceedButton={{
-      icon: undefined,
-      label: $_('delete_connection'),
-    }}
-    onCancel={cancel}
-    onProceed={disconnect}
-    slot="footer"
-  />
-</ControlledModal>
diff --git a/mathesar_ui/src/systems/connections/EditConnectionModal.svelte b/mathesar_ui/src/systems/connections/EditConnectionModal.svelte
deleted file mode 100644
index 375ac95020..0000000000
--- a/mathesar_ui/src/systems/connections/EditConnectionModal.svelte
+++ /dev/null
@@ -1,198 +0,0 @@
-<script lang="ts">
-  import { map } from 'iter-tools';
-  import { _ } from 'svelte-i18n';
-
-  import type { Connection } from '@mathesar/api/rest/connections';
-  import Checkbox from '@mathesar/component-library/checkbox/Checkbox.svelte';
-  import TextInput from '@mathesar/component-library/text-input/TextInput.svelte';
-  import {
-    Field,
-    FieldLayout,
-    FormSubmit,
-    isInPortRange,
-    makeForm,
-    requiredField,
-    uniqueWith,
-  } from '@mathesar/components/form';
-  import Identifier from '@mathesar/components/Identifier.svelte';
-  import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
-  import { RichText } from '@mathesar/components/rich-text';
-  import { connectionsStore } from '@mathesar/stores/databases';
-  import { toast } from '@mathesar/stores/toast';
-  import { getErrorMessage } from '@mathesar/utils/errors';
-  import {
-    ControlledModal,
-    LabeledInput,
-    type ModalController,
-    PasswordInput,
-  } from '@mathesar-component-library';
-
-  export let controller: ModalController;
-  export let connection: Connection;
-
-  $: ({ connections } = connectionsStore);
-  $: otherNicknames = new Set(
-    map(([, c]) => c.nickname, $connections.without(connection.id)),
-  );
-  $: connectionName = requiredField(connection.nickname, [
-    uniqueWith(otherNicknames),
-  ]);
-  $: databaseName = requiredField(connection.database);
-  $: host = requiredField(connection.host);
-  $: port = requiredField(connection.port ?? 5432, [isInPortRange()]);
-  $: username = requiredField(connection.username);
-  $: changePassword = requiredField(false);
-  $: password = requiredField('');
-  $: form = makeForm({
-    ...{ connectionName, username, changePassword },
-    ...($changePassword ? { password } : {}),
-  });
-
-  async function save() {
-    try {
-      await connectionsStore.updateConnection(connection.id, {
-        nickname: $connectionName,
-        username: $username,
-        ...($changePassword ? { password: $password } : {}),
-      });
-      toast.success($_('connection_updated_successfully'));
-      controller.close();
-    } catch (error) {
-      toast.error(getErrorMessage(error));
-    }
-  }
-</script>
-
-<ControlledModal {controller} on:open={() => form.reset()}>
-  <svelte:fragment slot="title">
-    <RichText text={$_('edit_connection_with_name')} let:slotName>
-      {#if slotName === 'connectionName'}
-        <Identifier>{connection.nickname}</Identifier>
-      {/if}
-    </RichText>
-  </svelte:fragment>
-
-  <div>
-    <Field
-      label={$_('connection_name')}
-      field={connectionName}
-      layout="stacked"
-    />
-    <hr />
-    <Field
-      label={$_('database_name')}
-      field={databaseName}
-      layout="stacked"
-      input={{ component: TextInput, props: { disabled: true } }}
-    />
-    <FieldLayout>
-      <div data-identifier="host-port-config">
-        <div data-identifier="host-config">
-          <Field
-            label={$_('host')}
-            field={host}
-            layout="stacked"
-            input={{ component: TextInput, props: { disabled: true } }}
-          />
-        </div>
-        <div data-identifier="port-config">
-          <Field
-            label={$_('port')}
-            field={port}
-            layout="stacked"
-            input={{ component: TextInput, props: { disabled: true } }}
-          />
-        </div>
-      </div>
-    </FieldLayout>
-
-    <FieldLayout>
-      <div class="disabled-help">
-        <InfoBox>
-          <RichText
-            text={$_('disabled_connection_edit_fields_help')}
-            let:slotName
-            let:translatedArg
-          >
-            {#if slotName === 'issueLink'}
-              <a
-                href="https://github.com/mathesar-foundation/mathesar/issues/3386"
-                target="_blank">{translatedArg}</a
-              >
-            {/if}
-          </RichText>
-        </InfoBox>
-      </div>
-    </FieldLayout>
-
-    <hr />
-
-    <Field
-      label={$_('username')}
-      field={username}
-      layout="stacked"
-      help={$_('user_needs_create_connect_privileges')}
-    />
-    <!-- TODO: Add docs link with $_('why_is_this_needed') text. This link needs
-    to be part of the translated string and it needs to point to a specific page
-    or section. -->
-
-    <!--
-      TODO: Use Field instead of FieldLayout/LabeledInput/Checkbox. We can't do
-      this yet because of a compatibility issue between Field and Checkbox.
-    -->
-    <FieldLayout>
-      <LabeledInput label={$_('change_password')} layout="inline-input-first">
-        <Checkbox bind:checked={$changePassword} />
-      </LabeledInput>
-    </FieldLayout>
-
-    {#if $changePassword}
-      <Field
-        label={$_('new_password')}
-        field={password}
-        input={{
-          component: PasswordInput,
-          props: { autocomplete: 'new-password' },
-        }}
-        layout="stacked"
-        help={$_('password_encryption_help')}
-      />
-    {/if}
-  </div>
-
-  <div slot="footer">
-    <FormSubmit
-      {form}
-      canCancel={$form.hasChanges}
-      canProceed={$form.hasChanges}
-      cancelButton={{ label: $_('reset') }}
-      proceedButton={{ label: $_('update_connection') }}
-      onCancel={() => form.reset()}
-      onProceed={save}
-    />
-  </div>
-</ControlledModal>
-
-<style lang="scss">
-  hr {
-    margin: var(--size-large) 0;
-  }
-
-  .disabled-help {
-    font-size: var(--size-small);
-  }
-
-  [data-identifier='host-port-config'] {
-    display: flex;
-    gap: var(--size-base);
-
-    > [data-identifier='host-config'] {
-      flex: 1 1 auto;
-    }
-
-    > [data-identifier='port-config'] {
-      flex: 1 1 5rem;
-    }
-  }
-</style>
diff --git a/mathesar_ui/src/systems/connections/GeneralConnection.svelte b/mathesar_ui/src/systems/connections/GeneralConnection.svelte
deleted file mode 100644
index 1b6ae557b2..0000000000
--- a/mathesar_ui/src/systems/connections/GeneralConnection.svelte
+++ /dev/null
@@ -1,43 +0,0 @@
-<script lang="ts">
-  import { _ } from 'svelte-i18n';
-
-  import { type GeneralConnection, getUsername } from './generalConnections';
-
-  export let generalConnection: GeneralConnection;
-
-  $: ({ connection } = generalConnection);
-  $: user = getUsername(generalConnection);
-  $: ({ host, port, database } = connection);
-</script>
-
-<span
-  class="general-connection"
-  class:internal={generalConnection.type === 'internal_database'}
->
-  <span class="name">
-    {#if generalConnection.type === 'user_database'}
-      {generalConnection.connection.nickname}
-    {:else}
-      ({$_('internal_database')})
-    {/if}
-  </span>
-  <span class="uri">
-    {user}@<wbr />{host}:{port}/<wbr />{database}
-  </span>
-</span>
-
-<style>
-  .general-connection,
-  .name,
-  .uri {
-    display: block;
-  }
-  .general-connection.internal .name {
-    font-style: italic;
-  }
-  .uri {
-    font-size: var(--text-size-small);
-    color: var(--color-text-muted);
-    margin-top: 0.5rem;
-  }
-</style>
diff --git a/mathesar_ui/src/systems/connections/generalConnections.ts b/mathesar_ui/src/systems/connections/generalConnections.ts
deleted file mode 100644
index b33e2d7767..0000000000
--- a/mathesar_ui/src/systems/connections/generalConnections.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { map } from 'iter-tools';
-import { type Readable, derived } from 'svelte/store';
-
-import type {
-  Connection,
-  ConnectionReference,
-} from '@mathesar/api/rest/connections';
-import { connectionsStore } from '@mathesar/stores/databases';
-import {
-  type CommonData,
-  preloadCommonData,
-} from '@mathesar/utils/preloadData';
-
-interface UserDatabaseConnection {
-  type: 'user_database';
-  connection: Connection;
-}
-interface InternalDatabaseConnection {
-  type: 'internal_database';
-  connection: CommonData['internal_db_connection'];
-}
-
-export type GeneralConnection =
-  | UserDatabaseConnection
-  | InternalDatabaseConnection;
-
-function isUserDatabaseConnection(
-  connection: GeneralConnection,
-): connection is UserDatabaseConnection {
-  return connection.type === 'user_database';
-}
-
-function getCommonDataGeneralConnections(): GeneralConnection[] {
-  const commonData = preloadCommonData();
-  if (!commonData) return [];
-  return [
-    {
-      type: 'internal_database',
-      connection: commonData.internal_db_connection,
-    },
-  ];
-}
-
-export const generalConnections: Readable<GeneralConnection[]> = derived(
-  connectionsStore.connections,
-  (connections) => [
-    ...getCommonDataGeneralConnections(),
-    ...map(
-      ([, connection]) => ({ type: 'user_database' as const, connection }),
-      connections,
-    ),
-  ],
-);
-
-export function pickDefaultGeneralConnection(connections: GeneralConnection[]) {
-  if (connections.length === 0) return undefined;
-  const internalConnection = connections.find(
-    (connection) => connection.type === 'internal_database',
-  );
-  if (internalConnection) return internalConnection;
-  return connections
-    .filter(isUserDatabaseConnection)
-    .reduce((a, b) => (a.connection.id > b.connection.id ? a : b));
-}
-
-export function getUsername({ connection }: GeneralConnection): string {
-  return 'user' in connection ? connection.user : connection.username;
-}
-
-export function getConnectionReference(
-  connection: GeneralConnection,
-): ConnectionReference {
-  return connection.type === 'internal_database'
-    ? { connection_type: 'internal_database' }
-    : { connection_type: 'user_database', id: connection.connection.id };
-}

From b32870003c5bd646c551e92f5819ee1c6ea354ee Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 25 Jul 2024 20:26:11 +0530
Subject: [PATCH 0511/1141] Fix linting errors

---
 mathesar_ui/.eslintrc.cjs                             | 1 -
 mathesar_ui/src/pages/database/DatabaseDetails.svelte | 1 +
 mathesar_ui/src/pages/home/DatabaseRow.svelte         | 3 ++-
 mathesar_ui/src/pages/home/HomePage.svelte            | 3 ++-
 mathesar_ui/src/stores/databases.ts                   | 3 ++-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mathesar_ui/.eslintrc.cjs b/mathesar_ui/.eslintrc.cjs
index f2212d4005..6b30ababfa 100644
--- a/mathesar_ui/.eslintrc.cjs
+++ b/mathesar_ui/.eslintrc.cjs
@@ -189,7 +189,6 @@ module.exports = {
             ts: 'never',
           },
         ],
-        'import/no-unresolved': 'off',
         'import/prefer-default-export': 'off',
         'no-void': 'off',
         'no-underscore-dangle': 'off',
diff --git a/mathesar_ui/src/pages/database/DatabaseDetails.svelte b/mathesar_ui/src/pages/database/DatabaseDetails.svelte
index c1a31ea295..05dbf0b25e 100644
--- a/mathesar_ui/src/pages/database/DatabaseDetails.svelte
+++ b/mathesar_ui/src/pages/database/DatabaseDetails.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
   import { reflectApi } from '@mathesar/api/rest/reflect';
   import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
diff --git a/mathesar_ui/src/pages/home/DatabaseRow.svelte b/mathesar_ui/src/pages/home/DatabaseRow.svelte
index a74bfeb6a6..eaba9e3419 100644
--- a/mathesar_ui/src/pages/home/DatabaseRow.svelte
+++ b/mathesar_ui/src/pages/home/DatabaseRow.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+  import { _ } from 'svelte-i18n';
+
   import type { Database } from '@mathesar/api/rpc/databases';
   import { iconDeleteMajor, iconEdit } from '@mathesar/icons';
   import { iconConnection } from '@mathesar/icons';
@@ -6,7 +8,6 @@
   import { modal } from '@mathesar/stores/modal';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { Button, Icon } from '@mathesar-component-library';
-  import { _ } from 'svelte-i18n';
 
   const userProfileStore = getUserProfileStoreFromContext();
   $: userProfile = $userProfileStore;
diff --git a/mathesar_ui/src/pages/home/HomePage.svelte b/mathesar_ui/src/pages/home/HomePage.svelte
index 54625c6a9a..bd49315a32 100644
--- a/mathesar_ui/src/pages/home/HomePage.svelte
+++ b/mathesar_ui/src/pages/home/HomePage.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+  import { _ } from 'svelte-i18n';
+
   import type { Database } from '@mathesar/api/rpc/databases';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
@@ -10,7 +12,6 @@
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { DatabasesEmptyState } from '@mathesar/systems/connections';
   import { Button, Icon } from '@mathesar-component-library';
-  import { _ } from 'svelte-i18n';
 
   import DatabaseRow from './DatabaseRow.svelte';
 
diff --git a/mathesar_ui/src/stores/databases.ts b/mathesar_ui/src/stores/databases.ts
index 0320c0d398..1f65bf4483 100644
--- a/mathesar_ui/src/stores/databases.ts
+++ b/mathesar_ui/src/stores/databases.ts
@@ -1,3 +1,5 @@
+import { type Readable, derived, writable } from 'svelte/store';
+
 import { api } from '@mathesar/api/rpc';
 import type { Database } from '@mathesar/api/rpc/databases';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
@@ -7,7 +9,6 @@ import {
   WritableMap,
   defined,
 } from '@mathesar-component-library';
-import { type Readable, derived, writable } from 'svelte/store';
 
 const commonData = preloadCommonData();
 

From 5c2e9c8a15adad15a66b6dfbaa385ab4c0e3ed29 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 25 Jul 2024 20:38:03 +0530
Subject: [PATCH 0512/1141] Fix failing tests

---
 mathesar/tests/rpc/test_database_setup.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/mathesar/tests/rpc/test_database_setup.py b/mathesar/tests/rpc/test_database_setup.py
index d9de031afc..be7c6ac15d 100644
--- a/mathesar/tests/rpc/test_database_setup.py
+++ b/mathesar/tests/rpc/test_database_setup.py
@@ -7,7 +7,7 @@
 """
 from mathesar.models.users import User
 from mathesar.models.base import Database, ConfiguredRole, Server, UserDatabaseRoleMap
-from mathesar.rpc import database_setup
+from mathesar.rpc import database_setup, servers, configured_roles, databases
 
 
 def test_create_new(monkeypatch, rf):
@@ -15,6 +15,9 @@ def test_create_new(monkeypatch, rf):
     test_database = "mathesar42"
     request = rf.post("/api/rpc/v0/", data={})
     request.user = User(username="alice", password="pass1234")
+    server_model = Server(id=2, host="example.com", port=5432)
+    db_model = Database(id=3, name=test_database, server=server_model)
+    role_model = ConfiguredRole(id=4, name="matheuser", server=server_model)
 
     def mock_set_up_new_for_user(database, user, sample_data=[]):
         if not (
@@ -23,9 +26,6 @@ def mock_set_up_new_for_user(database, user, sample_data=[]):
                 and sample_data == test_sample_data
         ):
             raise AssertionError("incorrect parameters passed")
-        server_model = Server(id=2, host="example.com", port=5432)
-        db_model = Database(id=3, name=test_database, server=server_model)
-        role_model = ConfiguredRole(id=4, name="matheuser", server=server_model)
         return UserDatabaseRoleMap(
             user=user, database=db_model, configured_role=role_model, server=server_model
         )
@@ -36,7 +36,9 @@ def mock_set_up_new_for_user(database, user, sample_data=[]):
         mock_set_up_new_for_user,
     )
     expect_response = database_setup.DatabaseConnectionResult(
-        server_id=2, database_id=3, configured_role_id=4
+        server=servers.ServerInfo.from_model(server_model),
+        database=databases.DatabaseInfo.from_model(db_model),
+        configured_role=configured_roles.ConfiguredRoleInfo.from_model(role_model)
     )
 
     actual_response = database_setup.create_new(
@@ -54,6 +56,9 @@ def test_connect_existing(monkeypatch, rf):
     test_password = "ernie1234"
     request = rf.post("/api/rpc/v0/", data={})
     request.user = User(username="alice", password="pass1234")
+    server_model = Server(id=2, host="example.com", port=5432)
+    db_model = Database(id=3, name=test_database, server=server_model)
+    role_model = ConfiguredRole(id=4, name="matheuser", server=server_model)
 
     def mock_set_up_preexisting_database_for_user(
             host, port, database_name, role_name, password, user, sample_data=[]
@@ -68,9 +73,6 @@ def mock_set_up_preexisting_database_for_user(
                 and sample_data == test_sample_data
         ):
             raise AssertionError("incorrect parameters passed")
-        server_model = Server(id=2, host="example.com", port=5432)
-        db_model = Database(id=3, name=test_database, server=server_model)
-        role_model = ConfiguredRole(id=4, name="matheuser", server=server_model)
         return UserDatabaseRoleMap(
             user=user, database=db_model, configured_role=role_model, server=server_model
         )
@@ -81,7 +83,9 @@ def mock_set_up_preexisting_database_for_user(
         mock_set_up_preexisting_database_for_user,
     )
     expect_response = database_setup.DatabaseConnectionResult(
-        server_id=2, database_id=3, configured_role_id=4
+        server=servers.ServerInfo.from_model(server_model),
+        database=databases.DatabaseInfo.from_model(db_model),
+        configured_role=configured_roles.ConfiguredRoleInfo.from_model(role_model)
     )
 
     actual_response = database_setup.connect_existing(

From a1b293e5c61227f4c71b0e0d1f4e667d7a945d44 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 25 Jul 2024 18:20:45 -0400
Subject: [PATCH 0513/1141] Fix TS errors post-merge

---
 mathesar_ui/src/stores/tables.ts              | 44 +++++++++----------
 .../src/systems/data-explorer/QueryManager.ts |  9 ++--
 2 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index 717f10c9fa..01cf2ec9c5 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -18,7 +18,7 @@ import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joina
 import type { SplitTableResponse } from '@mathesar/api/rest/types/tables/split_table';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { api } from '@mathesar/api/rpc';
-import type { Connection } from '@mathesar/api/rpc/connections';
+import type { Database } from '@mathesar/api/rpc/databases';
 import type { Schema } from '@mathesar/api/rpc/schemas';
 import type { Table } from '@mathesar/api/rpc/tables';
 import { invalidIf } from '@mathesar/components/form';
@@ -35,7 +35,7 @@ import {
   defined,
 } from '@mathesar-component-library';
 
-import { connectionsStore } from './databases';
+import { currentConnection } from './databases';
 import { addCountToSchemaNumTables, currentSchemaId } from './schemas';
 
 const commonData = preloadCommonData();
@@ -58,12 +58,12 @@ type TablesStore = Writable<TablesData>;
 
 /** Maps [connectionId, schemaOid] to TablesStore */
 const tablesStores = new TupleMap<
-  [Connection['id'], Schema['oid']],
+  [Database['id'], Schema['oid']],
   TablesStore
 >();
 
 const tablesRequests = new TupleMap<
-  [Connection['id'], Schema['oid']],
+  [Database['id'], Schema['oid']],
   CancellablePromise<Table[]>
 >();
 
@@ -72,7 +72,7 @@ function sortTables(tables: Iterable<Table>): Table[] {
 }
 
 function setTablesStore(
-  connection: Pick<Connection, 'id'>,
+  connection: Pick<Database, 'id'>,
   schema: Pick<Schema, 'oid'>,
   tables?: Table[],
 ): TablesStore {
@@ -97,14 +97,14 @@ function setTablesStore(
 }
 
 export function removeTablesStore(
-  connection: Pick<Connection, 'id'>,
+  connection: Pick<Database, 'id'>,
   schema: Pick<Schema, 'oid'>,
 ): void {
   tablesStores.delete([connection.id, schema.oid]);
 }
 
 export async function refetchTablesForSchema(
-  connection: Pick<Connection, 'id'>,
+  connection: Pick<Database, 'id'>,
   schema: Pick<Schema, 'oid'>,
 ): Promise<TablesData | undefined> {
   const store = tablesStores.get([connection.id, schema.oid]);
@@ -153,7 +153,7 @@ export async function refetchTablesForSchema(
 let preload = true;
 
 function getTablesStore(
-  connection: Pick<Connection, 'id'>,
+  connection: Pick<Database, 'id'>,
   schema: Pick<Schema, 'oid'>,
 ): TablesStore {
   let store = tablesStores.get([connection.id, schema.oid]);
@@ -166,7 +166,7 @@ function getTablesStore(
     if (
       preload &&
       commonData.current_schema === schema.oid &&
-      commonData.current_connection === connection.id
+      commonData.current_database === connection.id
     ) {
       store = setTablesStore(connection, schema, commonData.tables ?? []);
     } else {
@@ -180,7 +180,7 @@ function getTablesStore(
 }
 
 function findStoreContainingTable(
-  connection: Pick<Connection, 'id'>,
+  connection: Pick<Database, 'id'>,
   tableOid: Table['oid'],
 ): TablesStore | undefined {
   return defined(
@@ -195,7 +195,7 @@ function findStoreContainingTable(
 }
 
 export function deleteTable(
-  connection: Pick<Connection, 'id'>,
+  connection: Pick<Database, 'id'>,
   schema: Schema,
   tableOid: Table['oid'],
 ): CancellablePromise<void> {
@@ -233,7 +233,7 @@ export function deleteTable(
  * the store.
  */
 export async function updateTable(
-  connection: Pick<Connection, 'id'>,
+  connection: Pick<Database, 'id'>,
   table: RecursivePartial<Table> & { oid: Table['oid'] },
 ): Promise<void> {
   await api.tables
@@ -266,7 +266,7 @@ export async function updateTable(
 }
 
 export function createTable(
-  connection: Pick<Connection, 'id'>,
+  connection: Pick<Database, 'id'>,
   schema: Schema,
   tableArgs: {
     name?: string;
@@ -354,7 +354,7 @@ export function getTableFromStoreOrApi({
   connection,
   tableOid,
 }: {
-  connection: Pick<Connection, 'id'>;
+  connection: Pick<Database, 'id'>;
   tableOid: Table['oid'];
 }): CancellablePromise<Table> {
   const tablesStore = findStoreContainingTable(connection, tableOid);
@@ -399,12 +399,10 @@ export function getTableFromStoreOrApi({
 }
 
 export const currentTablesData = collapse(
-  derived(
-    [connectionsStore.currentConnection, currentSchemaId],
-    ([connection, schemaOid]) =>
-      !connection || !schemaOid
-        ? readable(makeEmptyTablesData())
-        : getTablesStore(connection, { oid: schemaOid }),
+  derived([currentConnection, currentSchemaId], ([connection, schemaOid]) =>
+    !connection || !schemaOid
+      ? readable(makeEmptyTablesData())
+      : getTablesStore(connection, { oid: schemaOid }),
   ),
 );
 
@@ -457,15 +455,15 @@ export function getJoinableTablesResult(
 }
 
 export async function refetchTablesForCurrentSchema() {
-  const connection = get(connectionsStore.currentConnection);
+  const connection = get(currentConnection);
   const schemaOid = get(currentSchemaId);
-  if (connection && schemaOid) {
+  if (schemaOid) {
     await refetchTablesForSchema(connection, { oid: schemaOid });
   }
 }
 
 export function factoryToGetTableNameValidationErrors(
-  connection: Pick<Connection, 'id'>,
+  connection: Pick<Database, 'id'>,
   table: Table,
 ): Readable<(n: string) => string[]> {
   const tablesStore = tablesStores.get([connection.id, table.schema]);
diff --git a/mathesar_ui/src/systems/data-explorer/QueryManager.ts b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
index 52ee117114..1022391ded 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryManager.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
@@ -12,7 +12,7 @@ import { getAPI } from '@mathesar/api/rest/utils/requestUtils';
 import { api } from '@mathesar/api/rpc';
 import type { Table } from '@mathesar/api/rpc/tables';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
-import { connectionsStore } from '@mathesar/stores/databases';
+import { currentConnection } from '@mathesar/stores/databases';
 import { createQuery, putQuery } from '@mathesar/stores/queries';
 import CacheManager from '@mathesar/utils/CacheManager';
 import type { CancellablePromise } from '@mathesar-component-library';
@@ -136,14 +136,11 @@ export default class QueryManager extends QueryRunner {
         inputColumnsFetchState: { state: 'processing' },
       }));
 
-      const currentConnection = get(connectionsStore.currentConnection);
-      if (!currentConnection) {
-        throw new Error('No current connection selected.');
-      }
+      const connection = get(currentConnection);
 
       this.baseTableFetchPromise = api.tables
         .get_with_metadata({
-          database_id: currentConnection.id,
+          database_id: connection.id,
           table_oid: baseTableId,
         })
         .run();

From 1886e00115ccaa284dda4abf2b470e880a343da4 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 25 Jul 2024 18:42:00 -0400
Subject: [PATCH 0514/1141] Rename connection to database

---
 .../import/preview/ImportPreviewPage.svelte   |  4 +-
 mathesar_ui/src/pages/schema/EditTable.svelte |  6 +-
 mathesar_ui/src/stores/databases.ts           | 15 ++-
 mathesar_ui/src/stores/tables.ts              | 93 +++++++++----------
 .../src/systems/data-explorer/QueryManager.ts |  6 +-
 .../data-explorer/urlSerializationUtils.ts    |  8 +-
 .../systems/table-view/header/Header.svelte   |  4 +-
 .../ExtractColumnsModal.svelte                |  4 +-
 .../record-summary/RecordSummaryConfig.svelte |  4 +-
 .../table/TableDescription.svelte             |  4 +-
 .../table-inspector/table/TableName.svelte    |  6 +-
 mathesar_ui/src/utils/tables.ts               |  6 +-
 12 files changed, 77 insertions(+), 83 deletions(-)

diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
index c42f8c9ef9..eef280f22a 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
@@ -9,7 +9,7 @@
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { getTablePageUrl } from '@mathesar/routes/urls';
   import AsyncStore from '@mathesar/stores/AsyncStore';
-  import { currentConnection } from '@mathesar/stores/databases';
+  import { currentDatabase } from '@mathesar/stores/databases';
   import { getTableFromStoreOrApi } from '@mathesar/stores/tables';
   import { getErrorMessage } from '@mathesar/utils/errors';
   import { tableRequiresImportConfirmation } from '@mathesar/utils/tables';
@@ -33,7 +33,7 @@
   $: void (async () => {
     const table = (
       await tableFetch.run({
-        connection: $currentConnection,
+        database: $currentDatabase,
         tableOid: tableId,
       })
     ).resolvedValue;
diff --git a/mathesar_ui/src/pages/schema/EditTable.svelte b/mathesar_ui/src/pages/schema/EditTable.svelte
index 8621503f63..cbe193d4a1 100644
--- a/mathesar_ui/src/pages/schema/EditTable.svelte
+++ b/mathesar_ui/src/pages/schema/EditTable.svelte
@@ -5,7 +5,7 @@
   import Identifier from '@mathesar/components/Identifier.svelte';
   import NameAndDescInputModalForm from '@mathesar/components/NameAndDescInputModalForm.svelte';
   import { RichText } from '@mathesar/components/rich-text';
-  import { currentConnection } from '@mathesar/stores/databases';
+  import { currentDatabase } from '@mathesar/stores/databases';
   import {
     factoryToGetTableNameValidationErrors,
     updateTable,
@@ -16,12 +16,12 @@
   export let modalController: ModalController;
 
   $: getNameValidationErrors = factoryToGetTableNameValidationErrors(
-    $currentConnection,
+    $currentDatabase,
     table,
   );
 
   async function handleSave(name: string, description: string) {
-    await updateTable($currentConnection, {
+    await updateTable($currentDatabase, {
       oid: table.oid,
       name,
       description,
diff --git a/mathesar_ui/src/stores/databases.ts b/mathesar_ui/src/stores/databases.ts
index 8d555cc58d..c5eae8f070 100644
--- a/mathesar_ui/src/stores/databases.ts
+++ b/mathesar_ui/src/stores/databases.ts
@@ -77,15 +77,12 @@ export const databasesStore: MakeWritablePropertiesReadable<DatabasesStore> =
   new DatabasesStore();
 
 /**
- * @throws an error when used in a context where no current connection exists.
+ * @throws an error when used in a context where no current database exists.
  * This behavior sacrifices some stability for the sake of developer ergonomics.
  * This sacrifice seems acceptable given that such a large part of the
- * application depends on the existence of one and only one connection.
+ * application depends on the existence of one and only one database.
  */
-export const currentConnection = derived(
-  databasesStore.currentDatabase,
-  (c) => {
-    if (!c) throw new Error('No current connection');
-    return c;
-  },
-);
+export const currentDatabase = derived(databasesStore.currentDatabase, (c) => {
+  if (!c) throw new Error('No current database');
+  return c;
+});
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index 01cf2ec9c5..e09222aae2 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -35,7 +35,7 @@ import {
   defined,
 } from '@mathesar-component-library';
 
-import { currentConnection } from './databases';
+import { currentDatabase } from './databases';
 import { addCountToSchemaNumTables, currentSchemaId } from './schemas';
 
 const commonData = preloadCommonData();
@@ -56,7 +56,7 @@ function makeEmptyTablesData(): TablesData {
 
 type TablesStore = Writable<TablesData>;
 
-/** Maps [connectionId, schemaOid] to TablesStore */
+/** Maps [databaseId, schemaOid] to TablesStore */
 const tablesStores = new TupleMap<
   [Database['id'], Schema['oid']],
   TablesStore
@@ -72,7 +72,7 @@ function sortTables(tables: Iterable<Table>): Table[] {
 }
 
 function setTablesStore(
-  connection: Pick<Database, 'id'>,
+  database: Pick<Database, 'id'>,
   schema: Pick<Schema, 'oid'>,
   tables?: Table[],
 ): TablesStore {
@@ -86,10 +86,10 @@ function setTablesStore(
     requestStatus: { state: 'success' },
   };
 
-  let store = tablesStores.get([connection.id, schema.oid]);
+  let store = tablesStores.get([database.id, schema.oid]);
   if (!store) {
     store = writable(storeValue);
-    tablesStores.set([connection.id, schema.oid], store);
+    tablesStores.set([database.id, schema.oid], store);
   } else {
     store.set(storeValue);
   }
@@ -97,17 +97,17 @@ function setTablesStore(
 }
 
 export function removeTablesStore(
-  connection: Pick<Database, 'id'>,
+  database: Pick<Database, 'id'>,
   schema: Pick<Schema, 'oid'>,
 ): void {
-  tablesStores.delete([connection.id, schema.oid]);
+  tablesStores.delete([database.id, schema.oid]);
 }
 
 export async function refetchTablesForSchema(
-  connection: Pick<Database, 'id'>,
+  database: Pick<Database, 'id'>,
   schema: Pick<Schema, 'oid'>,
 ): Promise<TablesData | undefined> {
-  const store = tablesStores.get([connection.id, schema.oid]);
+  const store = tablesStores.get([database.id, schema.oid]);
   if (!store) {
     // TODO: why are we logging an error here? I would expect that we'd either
     // throw or ignore. If there's a reason for this logging, please add a code
@@ -122,18 +122,18 @@ export async function refetchTablesForSchema(
       requestStatus: { state: 'processing' },
     }));
 
-    tablesRequests.get([connection.id, schema.oid])?.cancel();
+    tablesRequests.get([database.id, schema.oid])?.cancel();
 
     const tablesRequest = api.tables
       .list_with_metadata({
-        database_id: connection.id,
+        database_id: database.id,
         schema_oid: schema.oid,
       })
       .run();
-    tablesRequests.set([connection.id, schema.oid], tablesRequest);
+    tablesRequests.set([database.id, schema.oid], tablesRequest);
     const tableEntries = await tablesRequest;
 
-    const schemaTablesStore = setTablesStore(connection, schema, tableEntries);
+    const schemaTablesStore = setTablesStore(database, schema, tableEntries);
 
     return get(schemaTablesStore);
   } catch (err) {
@@ -153,41 +153,40 @@ export async function refetchTablesForSchema(
 let preload = true;
 
 function getTablesStore(
-  connection: Pick<Database, 'id'>,
+  database: Pick<Database, 'id'>,
   schema: Pick<Schema, 'oid'>,
 ): TablesStore {
-  let store = tablesStores.get([connection.id, schema.oid]);
+  let store = tablesStores.get([database.id, schema.oid]);
   if (!store) {
     store = writable({
       requestStatus: { state: 'processing' },
       tablesMap: new Map(),
     });
-    tablesStores.set([connection.id, schema.oid], store);
+    tablesStores.set([database.id, schema.oid], store);
     if (
       preload &&
       commonData.current_schema === schema.oid &&
-      commonData.current_database === connection.id
+      commonData.current_database === database.id
     ) {
-      store = setTablesStore(connection, schema, commonData.tables ?? []);
+      store = setTablesStore(database, schema, commonData.tables ?? []);
     } else {
-      void refetchTablesForSchema(connection, schema);
+      void refetchTablesForSchema(database, schema);
     }
     preload = false;
   } else if (get(store).requestStatus.state === 'failure') {
-    void refetchTablesForSchema(connection, schema);
+    void refetchTablesForSchema(database, schema);
   }
   return store;
 }
 
 function findStoreContainingTable(
-  connection: Pick<Database, 'id'>,
+  database: Pick<Database, 'id'>,
   tableOid: Table['oid'],
 ): TablesStore | undefined {
   return defined(
     find(
-      ([[connectionId], tablesStore]) =>
-        connectionId === connection.id &&
-        get(tablesStore).tablesMap.has(tableOid),
+      ([[databaseId], tablesStore]) =>
+        databaseId === database.id && get(tablesStore).tablesMap.has(tableOid),
       tablesStores,
     ),
     ([, tablesStore]) => tablesStore,
@@ -195,22 +194,22 @@ function findStoreContainingTable(
 }
 
 export function deleteTable(
-  connection: Pick<Database, 'id'>,
+  database: Pick<Database, 'id'>,
   schema: Schema,
   tableOid: Table['oid'],
 ): CancellablePromise<void> {
   const promise = api.tables
     .delete({
-      database_id: connection.id,
+      database_id: database.id,
       table_oid: tableOid,
     })
     .run();
   return new CancellablePromise(
     (resolve, reject) => {
       void promise.then(() => {
-        addCountToSchemaNumTables(connection, schema, -1);
+        addCountToSchemaNumTables(database, schema, -1);
         tablesStores
-          .get([connection.id, schema.oid])
+          .get([database.id, schema.oid])
           ?.update((tableStoreData) => {
             tableStoreData.tablesMap.delete(tableOid);
             return {
@@ -233,12 +232,12 @@ export function deleteTable(
  * the store.
  */
 export async function updateTable(
-  connection: Pick<Database, 'id'>,
+  database: Pick<Database, 'id'>,
   table: RecursivePartial<Table> & { oid: Table['oid'] },
 ): Promise<void> {
   await api.tables
     .patch({
-      database_id: connection.id,
+      database_id: database.id,
       table_oid: table.oid,
       table_data_dict: {
         name: table.name,
@@ -250,7 +249,7 @@ export async function updateTable(
   // TODO_BETA: also run tables.metadata.patch to handle updates to
   // `table.metadata`. Run both API calls as one RPC batch request.
 
-  const tableStore = findStoreContainingTable(connection, table.oid);
+  const tableStore = findStoreContainingTable(database, table.oid);
   if (!tableStore) throw new Error('Table store not found');
   tableStore.update((tablesData) => {
     const oldTable = tablesData.tablesMap.get(table.oid);
@@ -266,7 +265,7 @@ export async function updateTable(
 }
 
 export function createTable(
-  connection: Pick<Database, 'id'>,
+  database: Pick<Database, 'id'>,
   schema: Schema,
   tableArgs: {
     name?: string;
@@ -275,7 +274,7 @@ export function createTable(
 ): CancellablePromise<Table['oid']> {
   const promise = api.tables
     .add({
-      database_id: connection.id,
+      database_id: database.id,
       schema_oid: schema.oid,
       table_name: tableArgs.name ?? '',
       // TODO_BETA
@@ -289,8 +288,8 @@ export function createTable(
   return new CancellablePromise(
     (resolve, reject) => {
       void promise.then((tableOid) => {
-        addCountToSchemaNumTables(connection, schema, 1);
-        const tablesStore = tablesStores.get([connection.id, schema.oid]);
+        addCountToSchemaNumTables(database, schema, 1);
+        const tablesStore = tablesStores.get([database.id, schema.oid]);
         tablesStore?.update((tablesData) => {
           const table: Table = {
             oid: tableOid,
@@ -351,13 +350,13 @@ export function moveColumns(
 }
 
 export function getTableFromStoreOrApi({
-  connection,
+  database,
   tableOid,
 }: {
-  connection: Pick<Database, 'id'>;
+  database: Pick<Database, 'id'>;
   tableOid: Table['oid'];
 }): CancellablePromise<Table> {
-  const tablesStore = findStoreContainingTable(connection, tableOid);
+  const tablesStore = findStoreContainingTable(database, tableOid);
   if (tablesStore) {
     const table = get(tablesStore).tablesMap.get(tableOid);
     if (table) {
@@ -368,14 +367,14 @@ export function getTableFromStoreOrApi({
   }
   const promise = api.tables
     .get_with_metadata({
-      database_id: connection.id,
+      database_id: database.id,
       table_oid: tableOid,
     })
     .run();
   return new CancellablePromise(
     (resolve, reject) => {
       void promise.then((table) => {
-        const store = tablesStores.get([connection.id, table.schema]);
+        const store = tablesStores.get([database.id, table.schema]);
         if (store) {
           store.update((existing) => {
             const tableMap = new Map<number, Table>();
@@ -399,10 +398,10 @@ export function getTableFromStoreOrApi({
 }
 
 export const currentTablesData = collapse(
-  derived([currentConnection, currentSchemaId], ([connection, schemaOid]) =>
-    !connection || !schemaOid
+  derived([currentDatabase, currentSchemaId], ([database, schemaOid]) =>
+    !database || !schemaOid
       ? readable(makeEmptyTablesData())
-      : getTablesStore(connection, { oid: schemaOid }),
+      : getTablesStore(database, { oid: schemaOid }),
   ),
 );
 
@@ -455,18 +454,18 @@ export function getJoinableTablesResult(
 }
 
 export async function refetchTablesForCurrentSchema() {
-  const connection = get(currentConnection);
+  const database = get(currentDatabase);
   const schemaOid = get(currentSchemaId);
   if (schemaOid) {
-    await refetchTablesForSchema(connection, { oid: schemaOid });
+    await refetchTablesForSchema(database, { oid: schemaOid });
   }
 }
 
 export function factoryToGetTableNameValidationErrors(
-  connection: Pick<Database, 'id'>,
+  database: Pick<Database, 'id'>,
   table: Table,
 ): Readable<(n: string) => string[]> {
-  const tablesStore = tablesStores.get([connection.id, table.schema]);
+  const tablesStore = tablesStores.get([database.id, table.schema]);
   if (!tablesStore) throw new Error('Tables store not found');
 
   const otherTableNames = derived(
diff --git a/mathesar_ui/src/systems/data-explorer/QueryManager.ts b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
index 1022391ded..dbd73e9d64 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryManager.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
@@ -12,7 +12,7 @@ import { getAPI } from '@mathesar/api/rest/utils/requestUtils';
 import { api } from '@mathesar/api/rpc';
 import type { Table } from '@mathesar/api/rpc/tables';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
-import { currentConnection } from '@mathesar/stores/databases';
+import { currentDatabase } from '@mathesar/stores/databases';
 import { createQuery, putQuery } from '@mathesar/stores/queries';
 import CacheManager from '@mathesar/utils/CacheManager';
 import type { CancellablePromise } from '@mathesar-component-library';
@@ -136,11 +136,9 @@ export default class QueryManager extends QueryRunner {
         inputColumnsFetchState: { state: 'processing' },
       }));
 
-      const connection = get(currentConnection);
-
       this.baseTableFetchPromise = api.tables
         .get_with_metadata({
-          database_id: connection.id,
+          database_id: get(currentDatabase).id,
           table_oid: baseTableId,
         })
         .run();
diff --git a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
index 709be355e7..3551b2675e 100644
--- a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
+++ b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
@@ -51,11 +51,11 @@ function buildTableInformationHash(t: TerseSummarization): string {
 }
 
 export function createDataExplorerUrlToExploreATable(
-  connectionId: number,
+  databaseId: number,
   schemaId: number,
   baseTable: BaseTable,
 ) {
-  const dataExplorerRouteUrl = getDataExplorerPageUrl(connectionId, schemaId);
+  const dataExplorerRouteUrl = getDataExplorerPageUrl(databaseId, schemaId);
   const tableInformationHash = buildTableInformationHash({
     baseTable,
     columns: [],
@@ -65,11 +65,11 @@ export function createDataExplorerUrlToExploreATable(
 }
 
 export function constructDataExplorerUrlToSummarizeFromGroup(
-  connectionId: number,
+  databaseId: number,
   schemaId: number,
   terseSummarization: TerseSummarization,
 ): string | undefined {
-  const dataExplorerRouteUrl = getDataExplorerPageUrl(connectionId, schemaId);
+  const dataExplorerRouteUrl = getDataExplorerPageUrl(databaseId, schemaId);
   const { columns, terseGrouping } = terseSummarization;
 
   if (terseGrouping.length > 0 && columns.length > 0) {
diff --git a/mathesar_ui/src/systems/table-view/header/Header.svelte b/mathesar_ui/src/systems/table-view/header/Header.svelte
index 6e0b318e94..bb35472102 100644
--- a/mathesar_ui/src/systems/table-view/header/Header.svelte
+++ b/mathesar_ui/src/systems/table-view/header/Header.svelte
@@ -10,7 +10,7 @@
     SheetHeader,
   } from '@mathesar/components/sheet';
   import SheetOriginCell from '@mathesar/components/sheet/cells/SheetOriginCell.svelte';
-  import { currentConnection } from '@mathesar/stores/databases';
+  import { currentDatabase } from '@mathesar/stores/databases';
   import type { ProcessedColumn } from '@mathesar/stores/table-data';
   import {
     ID_ADD_NEW_COLUMN,
@@ -86,7 +86,7 @@
       newColumnOrder.splice(0, 0, ...selectedColumnIdsOrdered);
     }
 
-    void updateTable($currentConnection, {
+    void updateTable($currentDatabase, {
       oid: table.oid,
       metadata: { column_order: newColumnOrder },
     });
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
index 07780ad57e..2464245eec 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
@@ -16,7 +16,7 @@
   import SelectProcessedColumns from '@mathesar/components/SelectProcessedColumns.svelte';
   import { scrollBasedOnSelection } from '@mathesar/components/sheet';
   import TableName from '@mathesar/components/TableName.svelte';
-  import { currentConnection } from '@mathesar/stores/databases';
+  import { currentDatabase } from '@mathesar/stores/databases';
   import {
     type ProcessedColumn,
     getTabularDataStoreFromContext,
@@ -167,7 +167,7 @@
         });
         followUps.push(
           getTableFromStoreOrApi({
-            connection: $currentConnection,
+            database: $currentDatabase,
             tableOid: response.extracted_table,
           }),
         );
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
index d8f028935a..c6efe29989 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
@@ -13,7 +13,7 @@
   import LinkedRecord from '@mathesar/components/LinkedRecord.svelte';
   import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
   import { RichText } from '@mathesar/components/rich-text';
-  import { currentConnection } from '@mathesar/stores/databases';
+  import { currentDatabase } from '@mathesar/stores/databases';
   import type { RecordRow, TabularData } from '@mathesar/stores/table-data';
   import { renderRecordSummaryForRow } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
   import { updateTable } from '@mathesar/stores/tables';
@@ -59,7 +59,7 @@
 
   async function save() {
     try {
-      await updateTable($currentConnection, {
+      await updateTable($currentDatabase, {
         oid: table.oid,
         metadata: {
           record_summary_customized: $customized,
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
index 82fe5b69ce..93e204d237 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
@@ -2,7 +2,7 @@
   import { _ } from 'svelte-i18n';
 
   import EditableTextWithActions from '@mathesar/components/EditableTextWithActions.svelte';
-  import { currentConnection } from '@mathesar/stores/databases';
+  import { currentDatabase } from '@mathesar/stores/databases';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import { currentTablesData, updateTable } from '@mathesar/stores/tables';
 
@@ -11,7 +11,7 @@
   export let disabled = false;
 
   async function handleSave(description: string) {
-    await updateTable($currentConnection, {
+    await updateTable($currentDatabase, {
       oid: $tabularData.table.oid,
       description,
     });
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
index 464a10d95e..2f1c1b817d 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
@@ -2,7 +2,7 @@
   import { _ } from 'svelte-i18n';
 
   import EditableTextWithActions from '@mathesar/components/EditableTextWithActions.svelte';
-  import { currentConnection } from '@mathesar/stores/databases';
+  import { currentDatabase } from '@mathesar/stores/databases';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import {
     currentTablesData,
@@ -15,12 +15,12 @@
   export let disabled = false;
 
   $: getNameValidationErrors = factoryToGetTableNameValidationErrors(
-    $currentConnection,
+    $currentDatabase,
     $tabularData.table,
   );
 
   async function handleSubmit(name: string) {
-    await updateTable($currentConnection, {
+    await updateTable($currentDatabase, {
       oid: $tabularData.table.oid,
       name,
     });
diff --git a/mathesar_ui/src/utils/tables.ts b/mathesar_ui/src/utils/tables.ts
index 488950e928..22675ff1d0 100644
--- a/mathesar_ui/src/utils/tables.ts
+++ b/mathesar_ui/src/utils/tables.ts
@@ -98,14 +98,14 @@ export function orderProcessedColumns(
 }
 
 export function getLinkForTableItem(
-  connectionId: number,
+  databaseId: number,
   schemaId: number,
   table: TableWithImportVerification & { oid: Table['oid'] },
 ) {
   if (tableRequiresImportConfirmation(table)) {
-    return getImportPreviewPageUrl(connectionId, schemaId, table.oid, {
+    return getImportPreviewPageUrl(databaseId, schemaId, table.oid, {
       useColumnTypeInference: true,
     });
   }
-  return getTablePageUrl(connectionId, schemaId, table.oid);
+  return getTablePageUrl(databaseId, schemaId, table.oid);
 }

From 570c87ba82af740987fb4f54a79654b25a900590 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 26 Jul 2024 14:16:16 +0800
Subject: [PATCH 0515/1141] use explicit type casting for json containment

---
 db/sql/00_msar.sql      | 2 +-
 db/sql/test_00_msar.sql | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index fca27e7ebd..7d7f78e1cf 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3324,7 +3324,7 @@ INSERT INTO msar.expr_templates VALUES
   ('starts_with', 'starts_with((%s), (%s))'),
   -- json(b) filters and expressions
   ('json_array_length', 'jsonb_array_length((%s)::jsonb)'),
-  ('json_array_contains', '(%s) @> (%s)'),
+  ('json_array_contains', '(%s)::jsonb @> (%s)::jsonb'),
   -- URI part getters
   ('uri_scheme', 'mathesar_types.uri_scheme(%s)'),
   ('uri_authority', 'mathesar_types.uri_authority(%s)'),
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 28d257a135..f41255311e 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -3203,7 +3203,7 @@ BEGIN
         'type', 'json_array_contains', 'args', jsonb_build_array(
           jsonb_build_object('type', 'attnum', 'value', 2),
           jsonb_build_object('type', 'literal', 'value', '"500"')))),
-    '(col1) @> (''"500"'')'
+    '(col1)::jsonb @> (''"500"'')::jsonb'
   );
   RETURN NEXT is(
     msar.build_expr(

From 72e0258d22b8558fb116588ee5069d1e1a4ef555 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 29 Jul 2024 19:26:48 +0530
Subject: [PATCH 0516/1141] Implment component to create new database

---
 .../create-database/CreateNewDatabase.svelte  | 59 +++++++++++++++++++
 .../InstallationSchemaSelector.svelte         | 52 ++++++++++++++++
 .../create-database/createDatabaseUtils.ts    | 12 ++++
 3 files changed, 123 insertions(+)
 create mode 100644 mathesar_ui/src/systems/databases/create-database/CreateNewDatabase.svelte
 create mode 100644 mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte
 create mode 100644 mathesar_ui/src/systems/databases/create-database/createDatabaseUtils.ts

diff --git a/mathesar_ui/src/systems/databases/create-database/CreateNewDatabase.svelte b/mathesar_ui/src/systems/databases/create-database/CreateNewDatabase.svelte
new file mode 100644
index 0000000000..ba58f3a2a9
--- /dev/null
+++ b/mathesar_ui/src/systems/databases/create-database/CreateNewDatabase.svelte
@@ -0,0 +1,59 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import { portalToWindowFooter } from '@mathesar-component-library';
+  import {
+    requiredField,
+    FormSubmit,
+    makeForm,
+  } from '@mathesar/components/form';
+  import Form from '@mathesar/components/Form.svelte';
+  import FormField from '@mathesar/components/FormField.svelte';
+  import Field from '@mathesar/components/form/Field.svelte';
+  import type { Database } from '@mathesar/api/rpc/databases';
+  import { databasesStore } from '@mathesar/stores/databases';
+  import InstallationSchemaSelector from './InstallationSchemaSelector.svelte';
+  import {
+    type InstallationSchema,
+    getSampleSchemasFromInstallationSchemas,
+  } from './createDatabaseUtils';
+
+  export let onCancel: () => void;
+  export let onSuccess: (db: Database) => void;
+
+  const databaseName = requiredField('');
+  const installationSchemas = requiredField<InstallationSchema[]>(['internal']);
+  const form = makeForm({ databaseName, installationSchemas });
+
+  async function createDatabase() {
+    const newDatabase = await databasesStore.createNewDatabase({
+      database: $databaseName,
+      sample_data:
+        getSampleSchemasFromInstallationSchemas($installationSchemas),
+    });
+    onSuccess(newDatabase);
+  }
+</script>
+
+<div class="create-db-form">
+  <Form>
+    <FormField>
+      <Field label={$_('name')} layout="stacked" field={databaseName} />
+    </FormField>
+
+    <FormField>
+      <InstallationSchemaSelector {installationSchemas} />
+    </FormField>
+  </Form>
+
+  <div use:portalToWindowFooter class="footer">
+    <FormSubmit
+      {form}
+      catchErrors
+      {onCancel}
+      onProceed={createDatabase}
+      proceedButton={{ label: $_('add_connection') }}
+      cancelButton={{ label: $_('cancel') }}
+    />
+  </div>
+</div>
diff --git a/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte b/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte
new file mode 100644
index 0000000000..833e63678c
--- /dev/null
+++ b/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte
@@ -0,0 +1,52 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import { CheckboxGroup } from '@mathesar-component-library';
+  import {
+    sampleDataOptions,
+    type SampleDataSchemaIdentifier,
+  } from '@mathesar/api/rpc/database_setup';
+  import type { RequiredField } from '@mathesar/components/form/field';
+
+  type InstallationSchema = SampleDataSchemaIdentifier | 'internal';
+  const installationSchemaOptions: InstallationSchema[] = [
+    'internal',
+    ...sampleDataOptions,
+  ];
+  const installationSchemaLabels: Record<InstallationSchema, string> = {
+    // These strings are not translated because these are the names that will
+    // appear in the Mathesar UI after installation.
+    internal: 'mathesar_types, __msar, msar',
+    library_management: 'Library Management',
+    movie_collection: 'Movie Collection',
+  };
+  const installationSchemaHelp: Record<InstallationSchema, string> = {
+    internal: $_('internal_schema_help'),
+    library_management: $_('sample_data_library_help'),
+    movie_collection: $_('sample_data_movies_help'),
+  };
+
+  export let installationSchemas: RequiredField<InstallationSchema[]>;
+</script>
+
+<div class="schemas-cbgroup">
+  <CheckboxGroup
+    label={$_('schemas_to_install')}
+    ariaLabel={$_('schemas_to_install')}
+    bind:values={$installationSchemas}
+    options={installationSchemaOptions}
+    getCheckboxLabel={(o) => installationSchemaLabels[o]}
+    getCheckboxHelp={(o) => installationSchemaHelp[o]}
+    getCheckboxDisabled={(o) => o === 'internal'}
+  />
+</div>
+
+<style>
+  .schemas-cbgroup :global(ul.options) {
+    background: var(--white);
+    padding: 1rem;
+    border: 1px solid var(--slate-200);
+    border-radius: var(--border-radius-m);
+    margin-top: var(--size-ultra-small);
+  }
+</style>
diff --git a/mathesar_ui/src/systems/databases/create-database/createDatabaseUtils.ts b/mathesar_ui/src/systems/databases/create-database/createDatabaseUtils.ts
new file mode 100644
index 0000000000..e9bbef1ec8
--- /dev/null
+++ b/mathesar_ui/src/systems/databases/create-database/createDatabaseUtils.ts
@@ -0,0 +1,12 @@
+import {
+  sampleDataOptions,
+  type SampleDataSchemaIdentifier,
+} from '@mathesar/api/rpc/database_setup';
+
+export type InstallationSchema = SampleDataSchemaIdentifier | 'internal';
+
+export function getSampleSchemasFromInstallationSchemas(
+  installationSchemas: InstallationSchema[],
+): SampleDataSchemaIdentifier[] {
+  return sampleDataOptions.filter((o) => installationSchemas.includes(o));
+}

From 0a16b44ed4d79d5c20d616db5e2b344ab30e21e0 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 29 Jul 2024 19:27:09 +0530
Subject: [PATCH 0517/1141] Implement component to connect existing database

---
 .../ConnectExistingDatabase.svelte            | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte

diff --git a/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte b/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte
new file mode 100644
index 0000000000..51687b0591
--- /dev/null
+++ b/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte
@@ -0,0 +1,91 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import {
+    portalToWindowFooter,
+    PasswordInput,
+  } from '@mathesar-component-library';
+  import {
+    requiredField,
+    FormSubmit,
+    makeForm,
+  } from '@mathesar/components/form';
+  import Form from '@mathesar/components/Form.svelte';
+  import FormField from '@mathesar/components/FormField.svelte';
+  import Field from '@mathesar/components/form/Field.svelte';
+  import type { Database } from '@mathesar/api/rpc/databases';
+  import { databasesStore } from '@mathesar/stores/databases';
+  import InstallationSchemaSelector from './InstallationSchemaSelector.svelte';
+  import {
+    type InstallationSchema,
+    getSampleSchemasFromInstallationSchemas,
+  } from './createDatabaseUtils';
+
+  export let onCancel: () => void;
+  export let onSuccess: (db: Database) => void;
+
+  const databaseName = requiredField('');
+  const host = requiredField('localhost');
+  const port = requiredField(5432);
+  const role = requiredField('');
+  const password = requiredField('');
+  const installationSchemas = requiredField<InstallationSchema[]>(['internal']);
+  const form = makeForm({ databaseName, installationSchemas });
+
+  async function createDatabase() {
+    const newDatabase = await databasesStore.connectExistingDatabase({
+      host: $host,
+      port: $port,
+      role: $role,
+      password: $password,
+      database: $databaseName,
+      sample_data:
+        getSampleSchemasFromInstallationSchemas($installationSchemas),
+    });
+    onSuccess(newDatabase);
+  }
+</script>
+
+<div class="create-db-form">
+  <Form>
+    <FormField>
+      <Field label={$_('host')} layout="stacked" field={host} />
+    </FormField>
+
+    <FormField>
+      <Field label={$_('port')} layout="stacked" field={port} />
+    </FormField>
+
+    <FormField>
+      <Field label={$_('name')} layout="stacked" field={databaseName} />
+    </FormField>
+
+    <FormField>
+      <Field label={$_('username')} layout="stacked" field={role} />
+    </FormField>
+
+    <FormField>
+      <Field
+        label={$_('password')}
+        layout="stacked"
+        field={password}
+        input={{ component: PasswordInput }}
+      />
+    </FormField>
+
+    <FormField>
+      <InstallationSchemaSelector {installationSchemas} />
+    </FormField>
+  </Form>
+
+  <div use:portalToWindowFooter class="footer">
+    <FormSubmit
+      {form}
+      catchErrors
+      {onCancel}
+      onProceed={createDatabase}
+      proceedButton={{ label: $_('add_connection') }}
+      cancelButton={{ label: $_('cancel') }}
+    />
+  </div>
+</div>

From 716e9812e3985f06007102fc4fa39968fc83f01c Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 29 Jul 2024 19:27:25 +0530
Subject: [PATCH 0518/1141] Implement connect database modal

---
 mathesar_ui/src/i18n/languages/en/dict.json   |  7 +-
 mathesar_ui/src/pages/WelcomePage.svelte      |  2 +-
 mathesar_ui/src/pages/home/DatabaseRow.svelte | 44 +--------
 mathesar_ui/src/pages/home/HomePage.svelte    | 14 +--
 .../DatabasesEmptyState.svelte                |  0
 .../ConnectDatabaseModal.svelte               | 91 +++++++++++++++++++
 .../create-database/ConnectOption.svelte      | 52 +++++++++++
 .../{connections => databases}/index.ts       |  2 +-
 8 files changed, 158 insertions(+), 54 deletions(-)
 rename mathesar_ui/src/systems/{connections => databases}/DatabasesEmptyState.svelte (100%)
 create mode 100644 mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte
 create mode 100644 mathesar_ui/src/systems/databases/create-database/ConnectOption.svelte
 rename mathesar_ui/src/systems/{connections => databases}/index.ts (71%)

diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index cb35003739..14af6872a9 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -79,12 +79,12 @@
   "confirm_and_create_table": "Confirm & create table",
   "confirm_delete_table": "To confirm the deletion of the [tableName] table, please enter the table name into the input field below.",
   "confirm_password": "Confirm Password",
+  "connect_existing_database": "Connect to an Existing Database",
   "connect_with_community_help": "Connect with Mathesar users and contributors in our community chat. Share ideas, get help, and contribute to discussions.",
   "connection_added_successfully": "The connection has been successfully added.",
   "connection_deleted_successfully": "The connection has been successfully deleted",
   "connection_name": "Connection Name",
   "connection_nickname": "Connection nickname",
-  "connection_nickname_help": "This nickname will appear in Mathesar's navigation and must be unique across all connections. You can change it later.",
   "connection_updated_successfully": "The connection has been successfully updated",
   "connections": "Connections",
   "connections_matching_search": "{count, plural, one {{count} connection matches [searchValue]} other {{count} connections match [searchValue]}}",
@@ -107,9 +107,11 @@
   "count_records_deleted_successfully": "{count, plural, one {{count} record deleted successfully!} other {{count} records deleted successfully!}}",
   "count_tables": "{count, plural, one {{count} table} other {{count} tables}}",
   "create_a_table_by_importing": "Create a table by importing your data",
+  "create_database_mathesar_internal_server": "Create a new PostgreSQL database on Mathesar's internal server",
   "create_db_if_not_exists": "Create this database if it does not already exist",
   "create_exploration_empty_state_help": "Use Data Explorer to analyze and share your data. Explorations are based on tables in your schema, to get started choose a table and start adding columns and transformations.",
   "create_link": "Create Link",
+  "create_new_database": "Create a New Database",
   "create_new_pg_user": "Create a new PostgreSQL user",
   "create_new_schema": "Create New Schema",
   "create_record_from_search": "Create Record From Search Criteria",
@@ -241,6 +243,7 @@
   "host_name": "Host name",
   "hours": "Hours",
   "how_do_you_want_to_create_table": "How do you want to create your table?",
+  "how_would_you_like_to_connect_db": "How would you like to connect your database?",
   "id_is_reserved_column": "The name \"id\" is reserved for the primary key column that will be created when creating the table.",
   "if_upgrade_fails_help": "If the upgrade fails, the update status screen will still show that an upgrade is available, and you will need to refer to our [documentationLink](documentation) for further troubleshooting.",
   "if_upgrade_succeeds_help": "If the upgrade succeeds, you will see that you're running the latest version.",
@@ -313,7 +316,6 @@
   "new_link_wont_work_once_regenerated": "Once you regenerate a new link, the old link will no longer work.",
   "new_password": "New Password",
   "new_pg_user_privileges_help": "The user will be granted CONNECT and CREATE privileges on the database.",
-  "new_postgresql_database_connection": "New PostgreSQL Database Connection",
   "new_record": "New Record",
   "new_records_reposition_refresh": "New records will be repositioned on refresh",
   "new_table": "New Table",
@@ -391,6 +393,7 @@
   "processing_data": "Processing Data",
   "prompt_new_password_next_login": "Resetting the password will prompt the user to change their password on their next login.",
   "properties": "Properties",
+  "provide_details_connect_existing_database": "Provide the details to connect an existing PostgreSQL database to Mathesar",
   "provide_url_to_file": "Provide a URL to the file",
   "public_schema_info": "Every PostgreSQL database includes the \"public\" schema. This protected schema can be read by anybody who accesses the database.",
   "read_release_notes": "Read the [releaseNotesLink](release notes) to see if this release requires any special upgrade instructions.",
diff --git a/mathesar_ui/src/pages/WelcomePage.svelte b/mathesar_ui/src/pages/WelcomePage.svelte
index 1334c4ff23..3c52398d90 100644
--- a/mathesar_ui/src/pages/WelcomePage.svelte
+++ b/mathesar_ui/src/pages/WelcomePage.svelte
@@ -5,7 +5,7 @@
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { getDocsLink, getWikiLink } from '@mathesar/routes/urls';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
-  import { DatabasesEmptyState } from '@mathesar/systems/connections';
+  import { DatabasesEmptyState } from '@mathesar/systems/databases';
   import { AnchorButton, Icon } from '@mathesar-component-library';
 
   const userProfileStore = getUserProfileStoreFromContext();
diff --git a/mathesar_ui/src/pages/home/DatabaseRow.svelte b/mathesar_ui/src/pages/home/DatabaseRow.svelte
index eaba9e3419..133faa3d34 100644
--- a/mathesar_ui/src/pages/home/DatabaseRow.svelte
+++ b/mathesar_ui/src/pages/home/DatabaseRow.svelte
@@ -2,19 +2,9 @@
   import { _ } from 'svelte-i18n';
 
   import type { Database } from '@mathesar/api/rpc/databases';
-  import { iconDeleteMajor, iconEdit } from '@mathesar/icons';
   import { iconConnection } from '@mathesar/icons';
   import { getDatabasePageUrl } from '@mathesar/routes/urls';
-  import { modal } from '@mathesar/stores/modal';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
-  import { Button, Icon } from '@mathesar-component-library';
-
-  const userProfileStore = getUserProfileStoreFromContext();
-  $: userProfile = $userProfileStore;
-  $: isSuperUser = userProfile?.isSuperUser;
-
-  const editConnectionModalController = modal.spawnModalController();
-  const deleteConnectionModalController = modal.spawnModalController();
+  import { Icon } from '@mathesar-component-library';
 
   export let database: Database;
 </script>
@@ -26,44 +16,12 @@
       {database.name}
     </a>
   </td>
-  {#if isSuperUser}
-    <td>
-      <div class="actions">
-        <Button
-          appearance="secondary"
-          on:click={() => editConnectionModalController.open()}
-        >
-          <Icon {...iconEdit} />
-          <span>{$_('edit')}</span>
-        </Button>
-        <Button
-          appearance="outline-primary"
-          on:click={() => deleteConnectionModalController.open()}
-        >
-          <Icon {...iconDeleteMajor} />
-          <span>{$_('delete')}</span>
-        </Button>
-      </div>
-    </td>
-  {/if}
 </tr>
 
-<!-- <EditConnectionModal controller={editConnectionModalController} {connection} />
-<DeleteConnectionModal
-  controller={deleteConnectionModalController}
-  {connection}
-/> -->
-
 <style lang="scss">
   [data-identifier='connection-row'] {
     td {
       padding: var(--size-base);
     }
-
-    .actions {
-      display: flex;
-      align-items: center;
-      gap: var(--size-xx-small);
-    }
   }
 </style>
diff --git a/mathesar_ui/src/pages/home/HomePage.svelte b/mathesar_ui/src/pages/home/HomePage.svelte
index bd49315a32..43f29d31dc 100644
--- a/mathesar_ui/src/pages/home/HomePage.svelte
+++ b/mathesar_ui/src/pages/home/HomePage.svelte
@@ -10,12 +10,15 @@
   import { databasesStore } from '@mathesar/stores/databases';
   import { modal } from '@mathesar/stores/modal';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
-  import { DatabasesEmptyState } from '@mathesar/systems/connections';
+  import {
+    ConnectDatabaseModal,
+    DatabasesEmptyState,
+  } from '@mathesar/systems/databases';
   import { Button, Icon } from '@mathesar-component-library';
 
   import DatabaseRow from './DatabaseRow.svelte';
 
-  const addConnectionModalController = modal.spawnModalController();
+  const connectDbModalController = modal.spawnModalController();
 
   const userProfileStore = getUserProfileStoreFromContext();
   $: userProfile = $userProfileStore;
@@ -70,7 +73,7 @@
           {#if isSuperUser}
             <Button
               appearance="primary"
-              on:click={() => addConnectionModalController.open()}
+              on:click={() => connectDbModalController.open()}
             >
               <Icon {...iconAddNew} />
               <span>{$_('add_database_connection')}</span>
@@ -100,9 +103,6 @@
                 <thead>
                   <tr>
                     <th>{$_('database_name')}</th>
-                    {#if isSuperUser}
-                      <th>{$_('actions')}</th>
-                    {/if}
                   </tr>
                 </thead>
                 <tbody>
@@ -119,7 +119,7 @@
   </section>
 </LayoutWithHeader>
 
-<!-- <AddConnectionModal controller={addConnectionModalController} /> -->
+<ConnectDatabaseModal controller={connectDbModalController} />
 
 <style lang="scss">
   [data-identifier='connections-header'] {
diff --git a/mathesar_ui/src/systems/connections/DatabasesEmptyState.svelte b/mathesar_ui/src/systems/databases/DatabasesEmptyState.svelte
similarity index 100%
rename from mathesar_ui/src/systems/connections/DatabasesEmptyState.svelte
rename to mathesar_ui/src/systems/databases/DatabasesEmptyState.svelte
diff --git a/mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte b/mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte
new file mode 100644
index 0000000000..dc540ea4df
--- /dev/null
+++ b/mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte
@@ -0,0 +1,91 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+  import { router } from 'tinro';
+  import type { Database } from '@mathesar/api/rpc/databases';
+  import { iconDatabase } from '@mathesar/icons';
+  import { getDatabasePageUrl } from '@mathesar/routes/urls';
+  import {
+    ControlledModal,
+    type ModalController,
+  } from '@mathesar-component-library';
+  import ConnectExistingDatabase from './ConnectExistingDatabase.svelte';
+  import CreateNewDatabase from './CreateNewDatabase.svelte';
+  import ConnectOption from './ConnectOption.svelte';
+
+  export let controller: ModalController;
+
+  type View = 'base' | 'create' | 'connect';
+  let view: View = 'base';
+
+  $: title = (() => {
+    switch (view) {
+      case 'create':
+        return $_('create_new_database');
+      case 'connect':
+        return $_('connect_existing_database');
+      case 'base':
+      default:
+        return $_('how_would_you_like_to_connect_db');
+    }
+  })();
+
+  function setView(_view: View) {
+    view = _view;
+  }
+
+  function handleCancel() {
+    controller.close();
+  }
+
+  function handleSuccess(database: Database) {
+    controller.close();
+    const url = getDatabasePageUrl(database.id);
+    router.goto(url);
+  }
+</script>
+
+<ControlledModal
+  {controller}
+  size="medium"
+  {title}
+  on:close={() => setView('base')}
+>
+  {#if view === 'base'}
+    <div class="connect-db-options">
+      <ConnectOption
+        icon={iconDatabase}
+        header={$_('create_new_database')}
+        description={$_('create_database_mathesar_internal_server')}
+        changeView={() => setView('create')}
+      />
+      <ConnectOption
+        icon={iconDatabase}
+        header={$_('connect_existing_database')}
+        description={$_('provide_details_connect_existing_database')}
+        changeView={() => setView('connect')}
+      />
+    </div>
+  {:else if view === 'create'}
+    <CreateNewDatabase onCancel={handleCancel} onSuccess={handleSuccess} />
+  {:else}
+    <ConnectExistingDatabase
+      onCancel={handleCancel}
+      onSuccess={handleSuccess}
+    />
+  {/if}
+</ControlledModal>
+
+<style lang="scss">
+  div.connect-db-options {
+    display: grid;
+    grid-gap: var(--size-xx-small);
+
+    > :global(.btn.option) {
+      display: grid;
+      width: 100%;
+      text-align: left;
+      grid-template-columns: 100px 1fr;
+      padding: var(--size-ultra-large) var(--size-large);
+    }
+  }
+</style>
diff --git a/mathesar_ui/src/systems/databases/create-database/ConnectOption.svelte b/mathesar_ui/src/systems/databases/create-database/ConnectOption.svelte
new file mode 100644
index 0000000000..729f9238b1
--- /dev/null
+++ b/mathesar_ui/src/systems/databases/create-database/ConnectOption.svelte
@@ -0,0 +1,52 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+  import { Button, Icon } from '@mathesar-component-library';
+  import type { IconProps } from '@mathesar-component-library/types';
+
+  export let changeView: () => void;
+
+  export let icon: IconProps;
+  export let header: string;
+  export let description: string;
+</script>
+
+<Button class="option" on:click={changeView}>
+  <div class="icon-holder">
+    <div class="icon-circle">
+      <Icon {...icon} size="1.6rem" />
+    </div>
+  </div>
+  <div class="content-holder">
+    <div class="header">
+      {header}
+    </div>
+    <div class="description">
+      {description}
+    </div>
+  </div>
+</Button>
+
+<style>
+  .icon-holder {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .icon-circle {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: #e1cfb5;
+    height: 3.6rem;
+    width: 3.6rem;
+    border-radius: 3.6rem;
+  }
+  .header {
+    font-size: var(--text-size-large);
+    font-weight: 500;
+  }
+  .description {
+    color: var(--slate-500);
+    margin-top: var(--size-ultra-small);
+  }
+</style>
diff --git a/mathesar_ui/src/systems/connections/index.ts b/mathesar_ui/src/systems/databases/index.ts
similarity index 71%
rename from mathesar_ui/src/systems/connections/index.ts
rename to mathesar_ui/src/systems/databases/index.ts
index b2b1f7a755..137d13a306 100644
--- a/mathesar_ui/src/systems/connections/index.ts
+++ b/mathesar_ui/src/systems/databases/index.ts
@@ -1,4 +1,4 @@
 export { default as DatabasesEmptyState } from './DatabasesEmptyState.svelte';
-// export { default as AddConnectionModal } from './AddConnectionModal.svelte';
+export { default as ConnectDatabaseModal } from './create-database/ConnectDatabaseModal.svelte';
 // export { default as EditConnectionModal } from './EditConnectionModal.svelte';
 // export { default as DeleteConnectionModal } from './DeleteConnectionModal.svelte';

From d3ad0ccd6f81da7d30443c7d3392be8e2c17ec7b Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 29 Jul 2024 22:17:52 -0400
Subject: [PATCH 0519/1141] Transition frontend to use RPC API for columns.list

---
 mathesar_ui/src/api/rest/columns.ts           |  11 -
 mathesar_ui/src/api/rest/types/queries.ts     |   2 +-
 .../src/api/rest/types/tables/columns.ts      | 162 ------------
 .../api/rest/types/tables/joinable_tables.ts  |  12 +-
 mathesar_ui/src/api/rpc/columns.ts            | 241 ++++++++++++++++++
 mathesar_ui/src/api/rpc/index.ts              |   2 +
 .../number-input/number-formatter/options.ts  |   6 +-
 .../AbstractTypeControl.svelte                |  10 +-
 .../AbstractTypeSelector.svelte               |  10 +-
 .../DurationConfiguration.svelte              |   2 +-
 .../components/abstract-type-control/utils.ts |  16 +-
 .../cell-fabric/data-types/boolean.ts         |  41 +--
 .../data-types/components/typeDefinitions.ts  |   2 +-
 .../components/cell-fabric/data-types/date.ts |  21 +-
 .../cell-fabric/data-types/datetime.ts        |  24 +-
 .../cell-fabric/data-types/duration.ts        |  20 +-
 .../cell-fabric/data-types/money.ts           |  51 ++--
 .../cell-fabric/data-types/number.ts          |  50 ++--
 .../cell-fabric/data-types/string.ts          |  12 +-
 .../components/cell-fabric/data-types/time.ts |  22 +-
 .../src/components/cell-fabric/utils.ts       |   2 +-
 .../packages/json-rpc-client-builder/index.ts |   1 +
 .../json-rpc-client-builder/requests.ts       |  15 ++
 .../preview/ImportPreviewContent.svelte       |  15 +-
 .../import/preview/ImportPreviewSheet.svelte  |   2 +-
 .../pages/import/preview/PreviewColumn.svelte |   2 +-
 .../import/preview/importPreviewPageUtils.ts  |   2 +-
 .../src/pages/record/RecordPage.svelte        |   4 +-
 .../src/pages/record/TableWidget.svelte       |   7 +-
 mathesar_ui/src/pages/table/TablePage.svelte  |   7 +-
 .../abstract-types/type-configs/boolean.ts    |  45 ++--
 .../type-configs/comboTypes/arrayFactory.ts   |  20 +-
 .../abstract-types/type-configs/date.ts       |  27 +-
 .../abstract-types/type-configs/datetime.ts   |  26 +-
 .../abstract-types/type-configs/duration.ts   |  23 +-
 .../abstract-types/type-configs/money.ts      |  54 ++--
 .../abstract-types/type-configs/number.ts     |  41 ++-
 .../abstract-types/type-configs/text.ts       |   4 +-
 .../abstract-types/type-configs/time.ts       |  26 +-
 .../abstract-types/type-configs/utils.ts      |   5 +-
 .../src/stores/abstract-types/types.ts        |   2 +-
 .../src/stores/table-data/TableStructure.ts   |  20 +-
 mathesar_ui/src/stores/table-data/columns.ts  | 140 +++++-----
 .../src/stores/table-data/constraints.ts      |   2 +-
 .../src/stores/table-data/constraintsUtils.ts |   2 +-
 .../src/stores/table-data/processedColumns.ts |   2 +-
 mathesar_ui/src/stores/table-data/records.ts  |   2 +-
 .../src/stores/table-data/tabularData.ts      |  23 +-
 mathesar_ui/src/stores/table-data/utils.ts    |   2 +-
 mathesar_ui/src/stores/tables.ts              |   7 +-
 .../data-explorer/urlSerializationUtils.ts    |   2 +-
 .../src/systems/data-explorer/utils.ts        |  20 +-
 .../RecordSelectorContent.svelte              |  13 +-
 .../RecordSelectorController.ts               |   2 +-
 .../RecordSelectorTable.svelte                |  10 +-
 .../RecordSelectorWindow.svelte               |   3 +-
 .../record-selector/recordSelectorUtils.ts    |   2 +-
 .../src/systems/table-view/Body.svelte        |   5 +-
 .../actions-pane/ActionsPane.svelte           |   6 +-
 .../ForeignKeyConstraintDetails.svelte        |   2 +-
 .../constraints/NewFkConstraint.svelte        |   6 +-
 .../constraints/NewUniqueConstraint.svelte    |   3 +-
 .../new-column-cell/NewColumnCell.svelte      |   7 +-
 .../link-table/LinkTableForm.svelte           |   5 +-
 .../column/ColumnFormatting.svelte            |   8 +-
 .../table-inspector/column/ColumnType.svelte  |   4 +-
 .../column/SetDefaultValue.svelte             |  12 +-
 .../ExtractColumnsModal.svelte                |   8 +-
 .../record-summary/AppendColumn.svelte        |   2 +-
 .../FkRecordSummaryConfig.svelte              |   5 +-
 .../record-summary/TemplateInput.svelte       |   2 +-
 .../recordSummaryTemplateUtils.ts             |   2 +-
 .../table-inspector/table/TableActions.svelte |  21 +-
 .../table/TableDescription.svelte             |  12 +-
 .../table-inspector/table/TableName.svelte    |   8 +-
 .../table/links/TableLinks.svelte             |   3 +-
 .../utils/date-time/DateTimeSpecification.ts  |   5 +-
 .../src/utils/duration/DurationFormatter.ts   |   2 +-
 .../utils/duration/DurationSpecification.ts   |  25 +-
 mathesar_ui/src/utils/objectUtils.ts          |  14 +
 80 files changed, 763 insertions(+), 703 deletions(-)
 delete mode 100644 mathesar_ui/src/api/rest/columns.ts
 delete mode 100644 mathesar_ui/src/api/rest/types/tables/columns.ts
 create mode 100644 mathesar_ui/src/api/rpc/columns.ts
 create mode 100644 mathesar_ui/src/utils/objectUtils.ts

diff --git a/mathesar_ui/src/api/rest/columns.ts b/mathesar_ui/src/api/rest/columns.ts
deleted file mode 100644
index 64e1baf5a9..0000000000
--- a/mathesar_ui/src/api/rest/columns.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { Column } from './types/tables/columns';
-import { type PaginatedResponse, getAPI } from './utils/requestUtils';
-
-function list(tableId: number) {
-  const url = `/api/db/v0/tables/${tableId}/columns/?limit=500`;
-  return getAPI<PaginatedResponse<Column>>(url);
-}
-
-export const columnsApi = {
-  list,
-};
diff --git a/mathesar_ui/src/api/rest/types/queries.ts b/mathesar_ui/src/api/rest/types/queries.ts
index 6517eef56a..6b5e72cea6 100644
--- a/mathesar_ui/src/api/rest/types/queries.ts
+++ b/mathesar_ui/src/api/rest/types/queries.ts
@@ -1,6 +1,6 @@
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { JpPath } from '@mathesar/api/rest/types/tables/joinable_tables';
 import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
+import type { Column } from '@mathesar/api/rpc/columns';
 import type { Schema } from '@mathesar/api/rpc/schemas';
 
 export type QueryColumnAlias = string;
diff --git a/mathesar_ui/src/api/rest/types/tables/columns.ts b/mathesar_ui/src/api/rest/types/tables/columns.ts
deleted file mode 100644
index 763ba287fe..0000000000
--- a/mathesar_ui/src/api/rest/types/tables/columns.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-import type { DbType } from '@mathesar/AppTypes';
-
-/**
- * | value     | example locale | example format |
- * | --------- | -------------- | -------------- |
- * | 'english' | 'en'           |   '-123,456.7' |
- * | 'german'  | 'de'           |   '-123.456,7' |
- * | 'french'  | 'fr'           |   '-123 456,7' |
- * | 'hindi'   | 'hi'           |  '-1,23,456.7' |
- * | 'swiss'   | 'de-CH'        |   '-123'456.7' |
- */
-export type NumberFormat = 'english' | 'german' | 'french' | 'hindi' | 'swiss';
-
-/**
- * This common for both Number and Money types
- */
-interface FormattedNumberDisplayOptions {
-  /** When `null`, the browser's locale will be used. */
-  number_format: NumberFormat | null;
-
-  /**
-   * - "true": display grouping separators even if the locale prefers otherwise.
-   * - "false": do not display grouping separators.
-   */
-  use_grouping: 'true' | 'false';
-
-  minimum_fraction_digits: number | null;
-  maximum_fraction_digits: number | null;
-}
-
-export interface NumberDisplayOptions
-  extends Record<string, unknown>,
-    FormattedNumberDisplayOptions {}
-
-/**
- * See the [Postgres docs][1] for an explanation of `scale` and `precision`.
- *
- * [1]: https://www.postgresql.org/docs/current/datatype-numeric.html
- */
-export interface NumberTypeOptions {
-  scale: number;
-  precision: number;
-}
-
-export interface MoneyDisplayOptions extends FormattedNumberDisplayOptions {
-  /**
-   * e.g. "$", "€", "NZD", etc.
-   */
-  currency_symbol: string;
-
-  /**
-   * | value            | formatting pattern                           |
-   * | ---------------- | -------------------------------------------- |
-   * | 'after-minus'    | {minus_sign}{currency_symbol}{number}        |
-   * | 'end-with-space' | {minus_sign}{number}{space}{currency_symbol} |
-   */
-  currency_symbol_location: 'after-minus' | 'end-with-space';
-
-  /**
-   * PLANNED FOR FUTURE IMPLEMENTATION POST-ALPHA.
-   */
-  // use_accounting_notation: boolean;
-}
-
-export interface TextTypeOptions extends Record<string, unknown> {
-  length: number | null;
-}
-
-export interface BooleanDisplayOptions extends Record<string, unknown> {
-  input: 'checkbox' | 'dropdown' | null;
-  custom_labels: {
-    TRUE: string;
-    FALSE: string;
-  } | null;
-}
-
-export type DurationUnit = 'd' | 'h' | 'm' | 's' | 'ms';
-
-export interface DurationDisplayOptions extends Record<string, unknown> {
-  min: DurationUnit | null;
-  max: DurationUnit | null;
-  show_units: boolean | null;
-}
-
-export type DateFormat = 'none' | 'us' | 'eu' | 'friendly' | 'iso';
-
-export interface DateDisplayOptions extends Record<string, unknown> {
-  format: DateFormat | null;
-}
-
-export type TimeFormat = '24hr' | '12hr' | '24hrLong' | '12hrLong';
-
-export interface TimeDisplayOptions extends Record<string, unknown> {
-  format: TimeFormat | null;
-}
-
-export interface TimeStampDisplayOptions extends Record<string, unknown> {
-  date_format: DateDisplayOptions['format'];
-  time_format: TimeDisplayOptions['format'];
-}
-
-export interface BaseColumn {
-  id: number;
-  name: string;
-  description: string | null;
-  type: DbType;
-  index: number;
-  nullable: boolean;
-  primary_key: boolean;
-  valid_target_types: DbType[];
-  default: {
-    is_dynamic: boolean;
-    value: unknown;
-  } | null;
-}
-
-/**
- * TODO:
- *
- * Once we have all column types defined like `NumberColumn` is defined, then
- * convert the `Column` type to a discriminated union of all possible specific
- * column types.
- */
-export interface Column extends BaseColumn {
-  type_options: Record<string, unknown> | null;
-  display_options: Record<string, unknown> | null;
-}
-
-export interface MathesarMoneyColumn extends Column {
-  type: 'MATHESAR_TYPES.MATHESAR_MONEY';
-  type_options: Partial<NumberTypeOptions> | null;
-  display_options: Partial<MoneyDisplayOptions> | null;
-}
-
-export interface PostgresMoneyColumn extends Column {
-  type: 'MONEY';
-  type_options: null;
-  display_options: Partial<MoneyDisplayOptions> | null;
-}
-
-export type MoneyColumn = MathesarMoneyColumn | PostgresMoneyColumn;
-
-// TODO: Remove specification of DB types here
-export interface NumberColumn extends Column {
-  type:
-    | 'BIGINT'
-    | 'BIGSERIAL'
-    | 'DECIMAL'
-    | 'DOUBLE PRECISION'
-    | 'INTEGER'
-    | 'NUMERIC'
-    | 'REAL'
-    | 'SERIAL'
-    | 'SMALLINT'
-    | 'SMALLSERIAL';
-  type_options: Partial<NumberTypeOptions> | null;
-  display_options: Partial<NumberDisplayOptions> | null;
-}
-
-export interface ArrayTypeOptions extends Record<string, unknown> {
-  item_type: string;
-}
diff --git a/mathesar_ui/src/api/rest/types/tables/joinable_tables.ts b/mathesar_ui/src/api/rest/types/tables/joinable_tables.ts
index 8b84483b2e..c53a5742f7 100644
--- a/mathesar_ui/src/api/rest/types/tables/joinable_tables.ts
+++ b/mathesar_ui/src/api/rest/types/tables/joinable_tables.ts
@@ -6,11 +6,11 @@
 
 import type { Table } from '@mathesar/api/rpc/tables';
 
-import type { Column } from './columns';
-
 type ForeignKeyId = number;
 type IsLinkReversed = boolean;
-export type JpPath = [Column['id'], Column['id']][];
+
+/** [attnum, attnum][] */
+export type JpPath = [number, number][];
 
 export interface JoinableTable {
   target: Table['oid']; // baseTableId
@@ -26,14 +26,14 @@ export interface JoinableTablesResult {
     string, // tableId
     {
       name: Table['name'];
-      columns: Column['id'][];
+      columns: number[];
     }
   >;
   columns: Record<
     string, // columnId
     {
-      name: Column['name'];
-      type: Column['type'];
+      name: string;
+      type: string;
     }
   >;
 }
diff --git a/mathesar_ui/src/api/rpc/columns.ts b/mathesar_ui/src/api/rpc/columns.ts
new file mode 100644
index 0000000000..e4a3838ce6
--- /dev/null
+++ b/mathesar_ui/src/api/rpc/columns.ts
@@ -0,0 +1,241 @@
+import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
+
+export type BooleanInputType = 'checkbox' | 'dropdown';
+
+/**
+ * | value     | example locale | example format |
+ * | --------- | -------------- | -------------- |
+ * | 'english' | 'en'           |   '-123,456.7' |
+ * | 'german'  | 'de'           |   '-123.456,7' |
+ * | 'french'  | 'fr'           |   '-123 456,7' |
+ * | 'hindi'   | 'hi'           |  '-1,23,456.7' |
+ * | 'swiss'   | 'de-CH'        |   '-123'456.7' |
+ */
+export type NumberFormat = 'english' | 'german' | 'french' | 'hindi' | 'swiss';
+
+/**
+ * Corresponds to the Intl.NumberFormat options `useGrouping`.
+ *
+ * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat#usegrouping
+ *
+ * - `"always"` - Display grouping separators even if the locale prefers
+ *   otherwise.
+ * - `"auto"` - Display grouping separators based on the locale preference,
+ *   which may also be dependent on the currency.
+ * - `"never"` - Do not display grouping separators.
+ */
+export type NumberGrouping = 'always' | 'auto' | 'never';
+
+/**
+ * | value            | formatting pattern                           |
+ * | ---------------- | -------------------------------------------- |
+ * | 'after-minus'    | {minus_sign}{currency_symbol}{number}        |
+ * | 'end-with-space' | {minus_sign}{number}{space}{currency_symbol} |
+ */
+export type CurrencyLocation = 'after-minus' | 'end-with-space';
+
+export const allDurationUnits = ['d', 'h', 'm', 's', 'ms'] as const;
+
+export type DurationUnit = (typeof allDurationUnits)[number];
+
+export type DateFormat = 'none' | 'us' | 'eu' | 'friendly' | 'iso';
+
+export type TimeFormat = '24hr' | '12hr' | '24hrLong' | '12hrLong';
+
+/**
+ * See the [Postgres docs][1] for an explanation of `scale` and `precision`.
+ *
+ * [1]: https://www.postgresql.org/docs/current/datatype-numeric.html
+ */
+interface ColumnTypeOptions {
+  /**
+   * For numeric types, the number of significant digits. For date/time types,
+   * the number of fractional digits.
+   */
+  precision?: number | null;
+
+  /** For numeric types, the number of fractional digits. */
+  scale?: number | null;
+
+  /** Which time fields are stored. See Postgres docs. */
+  fields?: string | null;
+
+  /** The maximum length of a character-type field. */
+  length?: number | null;
+
+  /** The member type for arrays.  */
+  item_type?: string | null;
+}
+
+/**
+ * The column display options values, typed as we need in order to render them
+ * in the UI.
+ */
+export interface RequiredColumnDisplayOptions {
+  /** The type of input used for boolean values */
+  bool_input: BooleanInputType;
+
+  /** The text to display for a boolean `true` value */
+  bool_true: string;
+
+  /** The text to display for a boolean `false` value */
+  bool_false: string;
+
+  /** The minimum number of fraction digits to display for a number */
+  num_min_frac_digits: number;
+
+  /** The maximum number of fraction digits to display for a number */
+  num_max_frac_digits: number;
+
+  /** When `null`, the browser's locale will be used. */
+  num_format: NumberFormat | null;
+
+  /**
+   * - `null`: display grouping separators if the locale prefers it.
+   * - `true`: display grouping separators.
+   * - `false`: do not display grouping separators.
+   */
+  num_grouping: NumberGrouping;
+
+  /** The currency symbol to show for a money type e.g. "$", "€", "NZD", etc. */
+  mon_currency_symbol: string;
+
+  mon_currency_location: CurrencyLocation;
+
+  time_format: TimeFormat;
+
+  date_format: DateFormat;
+
+  duration_min: DurationUnit;
+
+  duration_max: DurationUnit;
+
+  duration_show_units: boolean;
+}
+
+/** The column display options values, types as we get them from the API. */
+type ColumnDisplayOptions = {
+  [K in keyof RequiredColumnDisplayOptions]?:
+    | RequiredColumnDisplayOptions[K]
+    | null;
+};
+
+export const defaultColumnDisplayOptions: RequiredColumnDisplayOptions = {
+  bool_input: 'checkbox',
+  bool_true: 'true',
+  bool_false: 'false',
+  num_min_frac_digits: 0,
+  num_max_frac_digits: 20,
+  num_format: null,
+  num_grouping: 'auto',
+  mon_currency_symbol: '$',
+  mon_currency_location: 'after-minus',
+  time_format: '24hr',
+  date_format: 'none',
+  duration_min: 's',
+  duration_max: 'm',
+  duration_show_units: true,
+};
+
+/**
+ * Gets a display option value from a column, if present. Otherwise returns the
+ * default value for that display option.
+ */
+export function getColumnDisplayOption<
+  Option extends keyof RequiredColumnDisplayOptions,
+>(column: Pick<Column, 'display_options'>, opt: Option) {
+  return column.display_options?.[opt] ?? defaultColumnDisplayOptions[opt];
+}
+
+interface ColumnDefault {
+  value: string;
+  is_dynamic: boolean;
+}
+
+/** The raw column data, from the user database only */
+interface RawColumn {
+  /** The PostgreSQL attnum of the column */
+  id: number;
+  name: string;
+  description: string | null;
+  /** The PostgreSQL data type */
+  type: string;
+  type_options: ColumnTypeOptions | null;
+  nullable: boolean;
+  primary_key: boolean;
+  default: ColumnDefault | null;
+  has_dependents: boolean;
+  valid_target_types: string[];
+}
+
+/**
+ * The raw column data from the user database combined with Mathesar's metadata
+ */
+export interface Column extends RawColumn {
+  display_options: ColumnDisplayOptions | null;
+}
+
+export interface ColumnCreationSpec {
+  name?: string;
+  type?: string;
+  description?: string;
+  type_options?: ColumnTypeOptions;
+  nullable?: boolean;
+  default?: ColumnDefault;
+}
+
+export interface ColumnPatchSpec {
+  id: number;
+  name?: string;
+  type?: string | null;
+  description?: string | null;
+  type_options?: ColumnTypeOptions | null;
+  nullable?: boolean;
+  default?: ColumnDefault | null;
+}
+
+export const columns = {
+  list: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      table_oid: number;
+    },
+    RawColumn[]
+  >(),
+
+  list_with_metadata: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      table_oid: number;
+    },
+    Column[]
+  >(),
+
+  /** Returns an array of the attnums of the newly-added columns */
+  add: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      table_oid: number;
+      column_data_list: ColumnCreationSpec[];
+    },
+    number[]
+  >(),
+
+  patch: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      table_oid: number;
+      column_data_list: ColumnPatchSpec[];
+    },
+    void
+  >(),
+
+  delete: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      table_oid: number;
+      column_attnums: number[];
+    },
+    void
+  >(),
+};
diff --git a/mathesar_ui/src/api/rpc/index.ts b/mathesar_ui/src/api/rpc/index.ts
index a3cefb1626..4a0a5a9697 100644
--- a/mathesar_ui/src/api/rpc/index.ts
+++ b/mathesar_ui/src/api/rpc/index.ts
@@ -2,6 +2,7 @@ import Cookies from 'js-cookie';
 
 import { buildRpcApi } from '@mathesar/packages/json-rpc-client-builder';
 
+import { columns } from './columns';
 import { configured_roles } from './configured_roles';
 import { database_setup } from './database_setup';
 import { databases } from './databases';
@@ -20,5 +21,6 @@ export const api = buildRpcApi({
     schemas,
     servers,
     tables,
+    columns,
   },
 });
diff --git a/mathesar_ui/src/component-library/number-input/number-formatter/options.ts b/mathesar_ui/src/component-library/number-input/number-formatter/options.ts
index 2be88e9fea..04ba0d54cb 100644
--- a/mathesar_ui/src/component-library/number-input/number-formatter/options.ts
+++ b/mathesar_ui/src/component-library/number-input/number-formatter/options.ts
@@ -7,14 +7,10 @@ export interface Options {
   /**
    * Corresponds to the options of the [Intl.NumberFormat][1] API.
    *
-   * The MDN docs say that "true" and "false" are accepted as strings, but in my
-   * testing with Firefox and Chromium, I noticed that those values need to be
-   * passed as booleans to work correctly.
-   *
    * [1]:
    * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat
    */
-  useGrouping: boolean;
+  useGrouping: 'always' | 'auto' | 'min2' | true | false;
   minimumFractionDigits: number;
   maximumFractionDigits: number;
   forceTrailingDecimal: boolean;
diff --git a/mathesar_ui/src/components/abstract-type-control/AbstractTypeControl.svelte b/mathesar_ui/src/components/abstract-type-control/AbstractTypeControl.svelte
index 5049f2185f..93301afd3e 100644
--- a/mathesar_ui/src/components/abstract-type-control/AbstractTypeControl.svelte
+++ b/mathesar_ui/src/components/abstract-type-control/AbstractTypeControl.svelte
@@ -4,6 +4,7 @@
 
   import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
   import { toast } from '@mathesar/stores/toast';
+  import { objectsAreDeeplyEqual } from '@mathesar/utils/objectUtils';
   import {
     CancelOrProceedButtonPair,
     createValidationContext,
@@ -13,10 +14,9 @@
 
   import AbstractTypeDBOptions from './AbstractTypeDBOptions.svelte';
   import AbstractTypeSelector from './AbstractTypeSelector.svelte';
-  import {
-    type ColumnTypeOptionsSaveArgs,
-    type ColumnWithAbstractType,
-    hasTypeOptionsChanged,
+  import type {
+    ColumnTypeOptionsSaveArgs,
+    ColumnWithAbstractType,
   } from './utils';
 
   const dispatch = createEventDispatcher();
@@ -36,7 +36,7 @@
   $: actionButtonsVisible =
     selectedAbstractType !== column.abstractType ||
     selectedDbType !== column.type ||
-    hasTypeOptionsChanged(column.type_options ?? {}, typeOptions ?? {});
+    !objectsAreDeeplyEqual(column.type_options, typeOptions);
 
   let typeChangeState: RequestStatus;
 
diff --git a/mathesar_ui/src/components/abstract-type-control/AbstractTypeSelector.svelte b/mathesar_ui/src/components/abstract-type-control/AbstractTypeSelector.svelte
index 9984c0632a..1bd153be53 100644
--- a/mathesar_ui/src/components/abstract-type-control/AbstractTypeSelector.svelte
+++ b/mathesar_ui/src/components/abstract-type-control/AbstractTypeSelector.svelte
@@ -26,7 +26,15 @@
 
   $: allowedTypeConversions = getAllowedAbstractTypesForDbTypeAndItsTargetTypes(
     column.type,
-    column.valid_target_types ?? [],
+
+    // TODO_BETA
+    //
+    // We need to find another way to get the valid target types for a column
+    // since the RPC API no longer returns this.
+
+    // column.valid_target_types ?? [],
+    [],
+
     $currentDbAbstractTypes.data,
   ).filter((item) => !['jsonlist', 'map'].includes(item.identifier));
 
diff --git a/mathesar_ui/src/components/abstract-type-control/config-components/DurationConfiguration.svelte b/mathesar_ui/src/components/abstract-type-control/config-components/DurationConfiguration.svelte
index 2771c8178b..0ffe9f0e46 100644
--- a/mathesar_ui/src/components/abstract-type-control/config-components/DurationConfiguration.svelte
+++ b/mathesar_ui/src/components/abstract-type-control/config-components/DurationConfiguration.svelte
@@ -2,7 +2,7 @@
   import type { Writable } from 'svelte/store';
   import { _ } from 'svelte-i18n';
 
-  import type { DurationUnit } from '@mathesar/api/rest/types/tables/columns';
+  import type { DurationUnit } from '@mathesar/api/rpc/columns';
   import { RichText } from '@mathesar/components/rich-text';
   import { DurationSpecification } from '@mathesar/utils/duration';
   import type { DurationConfig } from '@mathesar/utils/duration/types';
diff --git a/mathesar_ui/src/components/abstract-type-control/utils.ts b/mathesar_ui/src/components/abstract-type-control/utils.ts
index 822b90faa5..84d003c891 100644
--- a/mathesar_ui/src/components/abstract-type-control/utils.ts
+++ b/mathesar_ui/src/components/abstract-type-control/utils.ts
@@ -1,6 +1,6 @@
 import { readable } from 'svelte/store';
 
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type { Column } from '@mathesar/api/rpc/columns';
 import type { DbType } from '@mathesar/AppTypes';
 import type {
   AbstractType,
@@ -93,17 +93,3 @@ export function constructDisplayForm(
     displayFormValues,
   };
 }
-
-export function hasTypeOptionsChanged(
-  previousTypeOptions: NonNullable<ColumnWithAbstractType['type_options']>,
-  currentTypeOptions: NonNullable<ColumnWithAbstractType['type_options']>,
-): boolean {
-  for (const key in currentTypeOptions) {
-    if (Object.hasOwn(currentTypeOptions, key)) {
-      if (currentTypeOptions[key] !== previousTypeOptions[key]) {
-        return true;
-      }
-    }
-  }
-  return false;
-}
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/boolean.ts b/mathesar_ui/src/components/cell-fabric/data-types/boolean.ts
index 00a3435bce..112f966071 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/boolean.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/boolean.ts
@@ -1,4 +1,4 @@
-import type { BooleanDisplayOptions } from '@mathesar/api/rest/types/tables/columns';
+import { type Column, getColumnDisplayOption } from '@mathesar/api/rpc/columns';
 import { Select, isDefinedNonNullable } from '@mathesar-component-library';
 import type {
   ComponentAndProps,
@@ -11,37 +11,38 @@ import type {
   CheckBoxCellExternalProps,
   SingleSelectCellExternalProps,
 } from './components/typeDefinitions';
-import type { CellColumnLike, CellComponentFactory } from './typeDefinitions';
-
-export interface BooleanLikeColumn extends CellColumnLike {
-  display_options: Partial<BooleanDisplayOptions> | null;
-}
+import type { CellComponentFactory } from './typeDefinitions';
 
 type Props =
   | CheckBoxCellExternalProps
   | SingleSelectCellExternalProps<boolean | null>;
 
-function getLabels(
-  displayOptions?: BooleanLikeColumn['display_options'],
-): [string, string] {
-  const customLabels = displayOptions?.custom_labels ?? undefined;
-  return [customLabels?.TRUE ?? 'true', customLabels?.FALSE ?? 'false'];
+interface BooleanLabels {
+  true: string;
+  false: string;
+}
+
+function getLabels(column: Column): BooleanLabels {
+  return {
+    true: getColumnDisplayOption(column, 'bool_true'),
+    false: getColumnDisplayOption(column, 'bool_false'),
+  };
 }
 
 function getFormattedValue(
-  labels: [string, string],
+  labels: BooleanLabels,
   value?: boolean | null,
 ): string {
   if (isDefinedNonNullable(value)) {
-    return value ? labels[0] : labels[1];
+    return value ? labels.true : labels.false;
   }
   return '';
 }
 
 function getProps(
-  column: BooleanLikeColumn,
+  column: Column,
 ): SingleSelectCellExternalProps<boolean | null> {
-  const labels = getLabels(column.display_options);
+  const labels = getLabels(column);
   return {
     options: [null, true, false],
     getLabel: (value?: boolean | null) => getFormattedValue(labels, value),
@@ -50,9 +51,9 @@ function getProps(
 
 const booleanType: CellComponentFactory = {
   initialInputValue: null,
-  get: (column: BooleanLikeColumn): ComponentAndProps<Props> => {
+  get: (column: Column): ComponentAndProps<Props> => {
     const displayOptions = column.display_options ?? undefined;
-    if (displayOptions && displayOptions.input === 'dropdown') {
+    if (displayOptions && displayOptions.bool_input === 'dropdown') {
       return {
         component: SingleSelectCell,
         props: getProps(column),
@@ -61,13 +62,13 @@ const booleanType: CellComponentFactory = {
     return { component: CheckboxCell, props: {} };
   },
   getInput: (
-    column: BooleanLikeColumn,
+    column: Column,
   ): ComponentAndProps<SelectProps<boolean | null>> => ({
     component: Select,
     props: getProps(column),
   }),
-  getDisplayFormatter(column: BooleanLikeColumn) {
-    const labels = getLabels(column.display_options);
+  getDisplayFormatter(column: Column) {
+    const labels = getLabels(column);
     return (value: unknown) => {
       if (value === null || value === undefined || typeof value === 'boolean') {
         return getFormattedValue(labels, value);
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts b/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts
index 9897637c48..2c07cdac98 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts
@@ -1,5 +1,5 @@
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { FkConstraint } from '@mathesar/api/rest/types/tables/constraints';
+import type { Column } from '@mathesar/api/rpc/columns';
 import type { DBObjectEntry } from '@mathesar/AppTypes';
 import type { DateTimeFormatter } from '@mathesar/utils/date-time/types';
 import type {
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/date.ts b/mathesar_ui/src/components/cell-fabric/data-types/date.ts
index a754b40b06..66c130800b 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/date.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/date.ts
@@ -1,4 +1,4 @@
-import type { DateDisplayOptions } from '@mathesar/api/rest/types/tables/columns';
+import { type Column, getColumnDisplayOption } from '@mathesar/api/rpc/columns';
 import {
   DateTimeFormatter,
   DateTimeSpecification,
@@ -9,15 +9,10 @@ import type { ComponentAndProps } from '@mathesar-component-library/types';
 import DateTimeCell from './components/date-time/DateTimeCell.svelte';
 import DateTimeInput from './components/date-time/DateTimeInput.svelte';
 import type { DateTimeCellExternalProps } from './components/typeDefinitions';
-import type { CellColumnLike, CellComponentFactory } from './typeDefinitions';
+import type { CellComponentFactory } from './typeDefinitions';
 
-export interface DateLikeColumn extends CellColumnLike {
-  display_options: Partial<DateDisplayOptions> | null;
-}
-
-function getProps(column: DateLikeColumn): DateTimeCellExternalProps {
-  const displayOptions = column.display_options ?? {};
-  const format = displayOptions.format ?? 'none';
+function getProps(column: Column): DateTimeCellExternalProps {
+  const format = getColumnDisplayOption(column, 'date_format');
   const specification = new DateTimeSpecification({
     type: 'date',
     dateFormat: format,
@@ -39,14 +34,12 @@ function getProps(column: DateLikeColumn): DateTimeCellExternalProps {
 }
 
 const stringType: CellComponentFactory = {
-  get: (
-    column: DateLikeColumn,
-  ): ComponentAndProps<DateTimeCellExternalProps> => ({
+  get: (column: Column): ComponentAndProps<DateTimeCellExternalProps> => ({
     component: DateTimeCell,
     props: getProps(column),
   }),
   getInput: (
-    column: DateLikeColumn,
+    column: Column,
   ): ComponentAndProps<
     Omit<DateTimeCellExternalProps, 'formatForDisplay'>
   > => ({
@@ -56,7 +49,7 @@ const stringType: CellComponentFactory = {
       allowRelativePresets: true,
     },
   }),
-  getDisplayFormatter(column: DateLikeColumn) {
+  getDisplayFormatter(column: Column) {
     return (v) => getProps(column).formatForDisplay(String(v));
   },
 };
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/datetime.ts b/mathesar_ui/src/components/cell-fabric/data-types/datetime.ts
index d214e45060..a5ef36949c 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/datetime.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/datetime.ts
@@ -1,4 +1,4 @@
-import type { TimeStampDisplayOptions } from '@mathesar/api/rest/types/tables/columns';
+import { type Column, getColumnDisplayOption } from '@mathesar/api/rpc/columns';
 import {
   DateTimeFormatter,
   DateTimeSpecification,
@@ -9,19 +9,14 @@ import type { ComponentAndProps } from '@mathesar-component-library/types';
 import DateTimeCell from './components/date-time/DateTimeCell.svelte';
 import DateTimeInput from './components/date-time/DateTimeInput.svelte';
 import type { DateTimeCellExternalProps } from './components/typeDefinitions';
-import type { CellColumnLike, CellComponentFactory } from './typeDefinitions';
-
-export interface DateLikeColumn extends CellColumnLike {
-  display_options: Partial<TimeStampDisplayOptions> | null;
-}
+import type { CellComponentFactory } from './typeDefinitions';
 
 function getProps(
-  column: DateLikeColumn,
+  column: Column,
   supportTimeZone: boolean,
 ): DateTimeCellExternalProps {
-  const displayOptions = column.display_options ?? {};
-  const dateFormat = displayOptions.date_format ?? 'none';
-  const timeFormat = displayOptions.time_format ?? '24hr';
+  const dateFormat = getColumnDisplayOption(column, 'date_format');
+  const timeFormat = getColumnDisplayOption(column, 'time_format');
   const specification = new DateTimeSpecification({
     type: supportTimeZone ? 'timestampWithTZ' : 'timestamp',
     dateFormat,
@@ -47,14 +42,14 @@ function getProps(
 
 const datetimeType: CellComponentFactory = {
   get: (
-    column: DateLikeColumn,
+    column: Column,
     config?: { supportTimeZone?: boolean },
   ): ComponentAndProps<DateTimeCellExternalProps> => ({
     component: DateTimeCell,
     props: getProps(column, config?.supportTimeZone ?? false),
   }),
   getInput: (
-    column: DateLikeColumn,
+    column: Column,
     config?: { supportTimeZone?: boolean },
   ): ComponentAndProps<
     Omit<DateTimeCellExternalProps, 'formatForDisplay'>
@@ -65,10 +60,7 @@ const datetimeType: CellComponentFactory = {
       allowRelativePresets: true,
     },
   }),
-  getDisplayFormatter(
-    column: DateLikeColumn,
-    config?: { supportTimeZone?: boolean },
-  ) {
+  getDisplayFormatter(column: Column, config?: { supportTimeZone?: boolean }) {
     return (v) =>
       getProps(column, config?.supportTimeZone ?? false).formatForDisplay(
         String(v),
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/duration.ts b/mathesar_ui/src/components/cell-fabric/data-types/duration.ts
index 5f7af38409..2864958f0c 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/duration.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/duration.ts
@@ -1,4 +1,4 @@
-import type { DurationDisplayOptions } from '@mathesar/api/rest/types/tables/columns';
+import type { Column } from '@mathesar/api/rpc/columns';
 import {
   DurationFormatter,
   DurationSpecification,
@@ -14,16 +14,12 @@ import type {
 
 import FormattedInputCell from './components/formatted-input/FormattedInputCell.svelte';
 import type { FormattedInputCellExternalProps } from './components/typeDefinitions';
-import type { CellColumnLike, CellComponentFactory } from './typeDefinitions';
+import type { CellComponentFactory } from './typeDefinitions';
 
-export interface DurationLikeColumn extends CellColumnLike {
-  display_options: Partial<DurationDisplayOptions> | null;
-}
-
-function getProps(column: DurationLikeColumn): FormattedInputCellExternalProps {
+function getProps(column: Column): FormattedInputCellExternalProps {
   const defaults = DurationSpecification.getDefaults();
-  const max = column.display_options?.max ?? defaults.max;
-  const min = column.display_options?.min ?? defaults.min;
+  const max = column.display_options?.duration_max ?? defaults.max;
+  const min = column.display_options?.duration_min ?? defaults.min;
   const durationSpecification = new DurationSpecification({ max, min });
   const formatter = new DurationFormatter(durationSpecification);
   return {
@@ -42,18 +38,18 @@ function getProps(column: DurationLikeColumn): FormattedInputCellExternalProps {
 
 const durationType: CellComponentFactory = {
   get: (
-    column: DurationLikeColumn,
+    column: Column,
   ): ComponentAndProps<FormattedInputCellExternalProps> => ({
     component: FormattedInputCell,
     props: getProps(column),
   }),
   getInput: (
-    column: DurationLikeColumn,
+    column: Column,
   ): ComponentAndProps<FormattedInputProps<string>> => ({
     component: FormattedInput,
     props: getProps(column),
   }),
-  getDisplayFormatter(column: DurationLikeColumn) {
+  getDisplayFormatter(column: Column) {
     return (v) => getProps(column).formatForDisplay(String(v));
   },
 };
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/money.ts b/mathesar_ui/src/components/cell-fabric/data-types/money.ts
index 028f50ac60..8666d4fc49 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/money.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/money.ts
@@ -1,7 +1,8 @@
-import type {
-  MoneyColumn,
-  NumberFormat,
-} from '@mathesar/api/rest/types/tables/columns';
+import {
+  type Column,
+  type NumberFormat,
+  getColumnDisplayOption,
+} from '@mathesar/api/rpc/columns';
 import {
   StringifiedNumberFormatter,
   isDefinedNonNullable,
@@ -14,10 +15,6 @@ import type { MoneyCellExternalProps } from './components/typeDefinitions';
 import { getUseGrouping } from './number';
 import type { CellComponentFactory } from './typeDefinitions';
 
-// Values to use if for some reason we don't get them from the API.
-const FALLBACK_CURRENCY_SYMBOL = '$';
-const FALLBACK_CURRENCY_SYMBOL_LOCATION = 'after-minus';
-
 // prettier-ignore
 const localeMap = new Map<NumberFormat, string>([
   ['english' , 'en'    ],
@@ -27,30 +24,36 @@ const localeMap = new Map<NumberFormat, string>([
   ['swiss'   , 'de-CH' ],
 ]);
 
-function moneyColumnIsInteger(column: MoneyColumn): boolean {
+function ColumnIsInteger(column: Column): boolean {
   return (column.type_options?.scale ?? Infinity) === 0;
 }
 
 function getFormatterOptions(
-  column: MoneyColumn,
+  column: Column,
 ): MoneyCellExternalProps['formatterOptions'] {
-  const displayOptions = column.display_options;
-  const format = displayOptions?.number_format ?? null;
+  const format = getColumnDisplayOption(column, 'num_format');
   return {
     locale: (format && localeMap.get(format)) ?? undefined,
-    useGrouping: getUseGrouping(displayOptions?.use_grouping ?? 'true'),
-    allowFloat: !moneyColumnIsInteger(column),
+    useGrouping: getUseGrouping(column),
+    allowFloat: !ColumnIsInteger(column),
     allowNegative: true,
-    minimumFractionDigits: displayOptions?.minimum_fraction_digits ?? undefined,
-    maximumFractionDigits: displayOptions?.maximum_fraction_digits ?? undefined,
-    currencySymbol: displayOptions?.currency_symbol ?? FALLBACK_CURRENCY_SYMBOL,
-    currencySymbolLocation:
-      displayOptions?.currency_symbol_location ??
-      FALLBACK_CURRENCY_SYMBOL_LOCATION,
+    minimumFractionDigits: getColumnDisplayOption(
+      column,
+      'num_min_frac_digits',
+    ),
+    maximumFractionDigits: getColumnDisplayOption(
+      column,
+      'num_max_frac_digits',
+    ),
+    currencySymbol: getColumnDisplayOption(column, 'mon_currency_symbol'),
+    currencySymbolLocation: getColumnDisplayOption(
+      column,
+      'mon_currency_location',
+    ),
   };
 }
 
-function getProps(column: MoneyColumn): MoneyCellExternalProps {
+function getProps(column: Column): MoneyCellExternalProps {
   const formatterOptions = getFormatterOptions(column);
   const displayFormatter = new StringifiedNumberFormatter(formatterOptions);
   const insertCurrencySymbol = (() => {
@@ -78,7 +81,7 @@ function getProps(column: MoneyColumn): MoneyCellExternalProps {
 }
 
 const moneyType: CellComponentFactory = {
-  get(column: MoneyColumn): ComponentAndProps<MoneyCellExternalProps> {
+  get(column: Column): ComponentAndProps<MoneyCellExternalProps> {
     return {
       component: MoneyCell,
       props: getProps(column),
@@ -86,7 +89,7 @@ const moneyType: CellComponentFactory = {
   },
 
   getInput(
-    column: MoneyColumn,
+    column: Column,
   ): ComponentAndProps<MoneyCellExternalProps['formatterOptions']> {
     return {
       component: MoneyCellInput,
@@ -97,7 +100,7 @@ const moneyType: CellComponentFactory = {
     };
   },
 
-  getDisplayFormatter(column: MoneyColumn) {
+  getDisplayFormatter(column: Column) {
     return (v) => getProps(column).formatForDisplay(String(v));
   },
 };
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/number.ts b/mathesar_ui/src/components/cell-fabric/data-types/number.ts
index eff54ce072..d1d93eadd0 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/number.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/number.ts
@@ -1,10 +1,11 @@
-import type {
-  NumberColumn,
-  NumberDisplayOptions,
-  NumberFormat,
-} from '@mathesar/api/rest/types/tables/columns';
+import {
+  type Column,
+  type NumberFormat,
+  getColumnDisplayOption,
+} from '@mathesar/api/rpc/columns';
 import {
   StringifiedNumberFormatter,
+  assertExhaustive,
   isDefinedNonNullable,
 } from '@mathesar-component-library';
 import type { ComponentAndProps } from '@mathesar-component-library/types';
@@ -34,7 +35,7 @@ interface Config extends Record<string, unknown> {
 }
 
 function getAllowFloat(
-  column: NumberColumn,
+  column: Column,
   floatAllowanceStrategy?: FloatAllowanceStrategy,
 ): boolean {
   if (floatAllowanceStrategy === 'scale-based') {
@@ -47,29 +48,33 @@ function getAllowFloat(
 }
 
 export function getUseGrouping(
-  apiUseGrouping: NumberDisplayOptions['use_grouping'],
+  column: Column,
 ): NumberCellExternalProps['formatterOptions']['useGrouping'] {
-  switch (apiUseGrouping) {
-    case 'true':
-      return true;
-    case 'false':
-    default:
+  const grouping = getColumnDisplayOption(column, 'num_grouping');
+  switch (grouping) {
+    case 'always':
+      return 'always';
+    case 'auto':
+      return 'auto';
+    case 'never':
       return false;
+    default:
+      return assertExhaustive(grouping);
   }
 }
 
 function getFormatterOptions(
-  column: NumberColumn,
+  column: Column,
   config?: Config,
 ): NumberCellExternalProps['formatterOptions'] {
   const displayOptions = column.display_options;
-  const format = displayOptions?.number_format ?? null;
+  const format = displayOptions?.num_format ?? null;
   const locale = (format && localeMap.get(format)) ?? undefined;
-  const useGrouping = getUseGrouping(displayOptions?.use_grouping ?? 'false');
+  const useGrouping = getUseGrouping(column);
   const allowFloat = getAllowFloat(column, config?.floatAllowanceStrategy);
   const allowNegative = true;
   const minimumFractionDigits =
-    displayOptions?.minimum_fraction_digits ?? undefined;
+    displayOptions?.num_min_frac_digits ?? undefined;
   return {
     locale,
     allowFloat,
@@ -79,14 +84,11 @@ function getFormatterOptions(
   };
 }
 
-function getProps(
-  column: NumberColumn,
-  config?: Config,
-): NumberCellExternalProps {
+function getProps(column: Column, config?: Config): NumberCellExternalProps {
   const basicFormatterOptions = getFormatterOptions(column, config);
   const displayOptions = column.display_options;
   const maximumFractionDigits =
-    displayOptions?.maximum_fraction_digits ?? undefined;
+    displayOptions?.num_max_frac_digits ?? undefined;
   const formatterOptions = {
     ...basicFormatterOptions,
     // We only want to apply `maximumFractionDigits` during display. We don't
@@ -109,7 +111,7 @@ function getProps(
 
 const numberType: CellComponentFactory = {
   get(
-    column: NumberColumn,
+    column: Column,
     config?: Config,
   ): ComponentAndProps<NumberCellExternalProps> {
     return {
@@ -119,7 +121,7 @@ const numberType: CellComponentFactory = {
   },
 
   getInput(
-    column: NumberColumn,
+    column: Column,
     config?: Config,
   ): ComponentAndProps<NumberCellExternalProps['formatterOptions']> {
     return {
@@ -128,7 +130,7 @@ const numberType: CellComponentFactory = {
     };
   },
 
-  getDisplayFormatter(column: NumberColumn, config?: Config) {
+  getDisplayFormatter(column: Column, config?: Config) {
     return (v) => getProps(column, config).formatForDisplay(String(v));
   },
 };
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/string.ts b/mathesar_ui/src/components/cell-fabric/data-types/string.ts
index 79ab7c20cd..3711fa67c8 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/string.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/string.ts
@@ -1,4 +1,4 @@
-import type { TextTypeOptions } from '@mathesar/api/rest/types/tables/columns';
+import type { Column } from '@mathesar/api/rpc/columns';
 import GrowableTextArea from '@mathesar/components/GrowableTextArea.svelte';
 import { TextInput, optionalNonNullable } from '@mathesar-component-library';
 import type {
@@ -12,16 +12,12 @@ import type {
   TextAreaCellExternalProps,
   TextBoxCellExternalProps,
 } from './components/typeDefinitions';
-import type { CellColumnLike, CellComponentFactory } from './typeDefinitions';
-
-export interface StringLikeColumn extends CellColumnLike {
-  type_options: Partial<TextTypeOptions> | null;
-}
+import type { CellComponentFactory } from './typeDefinitions';
 
 const stringType: CellComponentFactory = {
   initialInputValue: '',
   get: (
-    column: StringLikeColumn,
+    column: Column,
     config?: { multiLine?: boolean },
   ): ComponentAndProps<
     TextBoxCellExternalProps | TextAreaCellExternalProps
@@ -31,7 +27,7 @@ const stringType: CellComponentFactory = {
     return { component, props: typeOptions };
   },
   getInput: (
-    column: StringLikeColumn,
+    column: Column,
     config?: { multiLine?: boolean },
   ): ComponentAndProps<TextInputProps> => {
     const component = config?.multiLine ? GrowableTextArea : TextInput;
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/time.ts b/mathesar_ui/src/components/cell-fabric/data-types/time.ts
index a6c1ed331f..f4301ceae0 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/time.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/time.ts
@@ -1,4 +1,4 @@
-import type { TimeDisplayOptions } from '@mathesar/api/rest/types/tables/columns';
+import { type Column, getColumnDisplayOption } from '@mathesar/api/rpc/columns';
 import {
   DateTimeFormatter,
   DateTimeSpecification,
@@ -9,18 +9,13 @@ import type { ComponentAndProps } from '@mathesar-component-library/types';
 import DateTimeCell from './components/date-time/DateTimeCell.svelte';
 import DateTimeInput from './components/date-time/DateTimeInput.svelte';
 import type { DateTimeCellExternalProps } from './components/typeDefinitions';
-import type { CellColumnLike, CellComponentFactory } from './typeDefinitions';
-
-export interface TimeLikeColumn extends CellColumnLike {
-  display_options: Partial<TimeDisplayOptions> | null;
-}
+import type { CellComponentFactory } from './typeDefinitions';
 
 function getProps(
-  column: TimeLikeColumn,
+  column: Column,
   supportTimeZone: boolean,
 ): DateTimeCellExternalProps {
-  const displayOptions = column.display_options ?? {};
-  const format = displayOptions.format ?? '24hr';
+  const format = getColumnDisplayOption(column, 'time_format');
   const specification = new DateTimeSpecification({
     type: supportTimeZone ? 'timeWithTZ' : 'time',
     timeFormat: format,
@@ -45,14 +40,14 @@ function getProps(
 
 const timeType: CellComponentFactory = {
   get: (
-    column: TimeLikeColumn,
+    column: Column,
     config?: { supportTimeZone?: boolean },
   ): ComponentAndProps<DateTimeCellExternalProps> => ({
     component: DateTimeCell,
     props: getProps(column, config?.supportTimeZone ?? false),
   }),
   getInput: (
-    column: TimeLikeColumn,
+    column: Column,
     config?: { supportTimeZone?: boolean },
   ): ComponentAndProps<
     Omit<DateTimeCellExternalProps, 'formatForDisplay'>
@@ -63,10 +58,7 @@ const timeType: CellComponentFactory = {
       allowRelativePresets: true,
     },
   }),
-  getDisplayFormatter(
-    column: TimeLikeColumn,
-    config?: { supportTimeZone?: boolean },
-  ) {
+  getDisplayFormatter(column: Column, config?: { supportTimeZone?: boolean }) {
     const supportTimeZone = config?.supportTimeZone ?? false;
     return (v) => getProps(column, supportTimeZone).formatForDisplay(String(v));
   },
diff --git a/mathesar_ui/src/components/cell-fabric/utils.ts b/mathesar_ui/src/components/cell-fabric/utils.ts
index a97e119ab0..ddcff2edf7 100644
--- a/mathesar_ui/src/components/cell-fabric/utils.ts
+++ b/mathesar_ui/src/components/cell-fabric/utils.ts
@@ -1,4 +1,4 @@
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type { Column } from '@mathesar/api/rpc/columns';
 import type { Table } from '@mathesar/api/rpc/tables';
 import type { CellInfo } from '@mathesar/stores/abstract-types/types';
 import type { RecordSummariesForSheet } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
diff --git a/mathesar_ui/src/packages/json-rpc-client-builder/index.ts b/mathesar_ui/src/packages/json-rpc-client-builder/index.ts
index 066c9206d9..d8eb45d709 100644
--- a/mathesar_ui/src/packages/json-rpc-client-builder/index.ts
+++ b/mathesar_ui/src/packages/json-rpc-client-builder/index.ts
@@ -2,6 +2,7 @@ export { type RpcError } from './RpcError';
 export { buildRpcApi, rpcMethodTypeContainer } from './builder';
 export {
   batchSend,
+  runner,
   type RpcBatchResponse,
   type RpcRequest,
   type RpcResponse,
diff --git a/mathesar_ui/src/packages/json-rpc-client-builder/requests.ts b/mathesar_ui/src/packages/json-rpc-client-builder/requests.ts
index 4609dffa6f..0ad5cfd337 100644
--- a/mathesar_ui/src/packages/json-rpc-client-builder/requests.ts
+++ b/mathesar_ui/src/packages/json-rpc-client-builder/requests.ts
@@ -137,3 +137,18 @@ export function batchSend<T extends RpcRequest<unknown>[]>(
   // TODO implement batch sending
   throw new Error('Not implemented');
 }
+
+/**
+ * A factory function to builds a function that directly runs a specific RPC
+ * request. The built function will then accept all the props of the RPC method
+ * and run the request without needing to call `.run()` on it.
+ *
+ * This utility is useful when you want to define a function that runs a
+ * specific RPC method without having to spell out the type of the method
+ * parameters.
+ */
+export function runner<P, R>(
+  method: (props: P) => RpcRequest<R>,
+): (props: P) => CancellablePromise<R> {
+  return (props) => method(props).run();
+}
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index cefec83868..3ce4b725a3 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -2,10 +2,10 @@
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
 
-  import { columnsApi } from '@mathesar/api/rest/columns';
   import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
-  import type { Column } from '@mathesar/api/rest/types/tables/columns';
   import { getAPI, postAPI } from '@mathesar/api/rest/utils/requestUtils';
+  import { api } from '@mathesar/api/rpc';
+  import type { Column } from '@mathesar/api/rpc/columns';
   import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Table } from '@mathesar/api/rpc/tables';
@@ -18,6 +18,7 @@
   } from '@mathesar/components/form';
   import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
   import { iconDeleteMajor } from '@mathesar/icons';
+  import { runner } from '@mathesar/packages/json-rpc-client-builder';
   import {
     getImportPreviewPageUrl,
     getSchemaPageUrl,
@@ -25,6 +26,7 @@
   } from '@mathesar/routes/urls';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
   import AsyncStore from '@mathesar/stores/AsyncStore';
+  import { currentDatabase } from '@mathesar/stores/databases';
   import { currentTables } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
   import {
@@ -76,7 +78,7 @@
     return postAPI(`/api/db/v0/tables/${table.oid}/previews/`, { columns });
   }
 
-  const columnsFetch = new AsyncStore(columnsApi.list);
+  const columnsFetch = new AsyncStore(runner(api.columns.list_with_metadata));
   const previewRequest = new AsyncStore(generateTablePreview);
   const typeSuggestionsRequest = new AsyncStore(getTypeSuggestionsForTable);
   const headerUpdate = makeHeaderUpdateRequest();
@@ -104,8 +106,11 @@
   $: processedColumns = processColumns(columns, $currentDbAbstractTypes.data);
 
   async function init() {
-    const columnsResponse = await columnsFetch.run(table.oid);
-    const fetchedColumns = columnsResponse?.resolvedValue?.results;
+    const columnsResponse = await columnsFetch.run({
+      database_id: $currentDatabase.id,
+      table_oid: table.oid,
+    });
+    const fetchedColumns = columnsResponse?.resolvedValue;
     if (!fetchedColumns) {
       return;
     }
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewSheet.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewSheet.svelte
index e2689764f4..724b44f34b 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewSheet.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewSheet.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Column } from '@mathesar/api/rest/types/tables/columns';
+  import type { Column } from '@mathesar/api/rpc/columns';
   import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
   import {
     Sheet,
diff --git a/mathesar_ui/src/pages/import/preview/PreviewColumn.svelte b/mathesar_ui/src/pages/import/preview/PreviewColumn.svelte
index b1692543f2..f39fddf12f 100644
--- a/mathesar_ui/src/pages/import/preview/PreviewColumn.svelte
+++ b/mathesar_ui/src/pages/import/preview/PreviewColumn.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Column } from '@mathesar/api/rest/types/tables/columns';
+  import type { Column } from '@mathesar/api/rpc/columns';
   import { AbstractTypeControl } from '@mathesar/components/abstract-type-control';
   import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
   import type { AbstractType } from '@mathesar/stores/abstract-types/types';
diff --git a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
index ccc3ac1bae..e60bc8a4dd 100644
--- a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
+++ b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
@@ -1,6 +1,6 @@
 import { dataFilesApi } from '@mathesar/api/rest/dataFiles';
 import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type { Column } from '@mathesar/api/rpc/columns';
 import type { Database } from '@mathesar/api/rpc/databases';
 import type { Schema } from '@mathesar/api/rpc/schemas';
 import type { Table } from '@mathesar/api/rpc/tables';
diff --git a/mathesar_ui/src/pages/record/RecordPage.svelte b/mathesar_ui/src/pages/record/RecordPage.svelte
index 4e2e50a945..073447100a 100644
--- a/mathesar_ui/src/pages/record/RecordPage.svelte
+++ b/mathesar_ui/src/pages/record/RecordPage.svelte
@@ -3,6 +3,7 @@
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
+  import { currentDatabase } from '@mathesar/stores/databases';
   import { TableStructure } from '@mathesar/stores/table-data';
   import { displayRecordSummaryAsPlainText } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
   import { currentTable } from '@mathesar/stores/tables';
@@ -15,7 +16,8 @@
 
   $: table = $currentTable as Table;
   $: tableStructure = new TableStructure({
-    id: table.oid,
+    database: $currentDatabase,
+    table,
     abstractTypesMap: $currentDbAbstractTypes.data,
   });
   $: tableStructureIsLoading = tableStructure.isLoading;
diff --git a/mathesar_ui/src/pages/record/TableWidget.svelte b/mathesar_ui/src/pages/record/TableWidget.svelte
index b75a3da41d..9388c362ab 100644
--- a/mathesar_ui/src/pages/record/TableWidget.svelte
+++ b/mathesar_ui/src/pages/record/TableWidget.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
-  import type { Column } from '@mathesar/api/rest/types/tables/columns';
+  import type { Column } from '@mathesar/api/rpc/columns';
   import type { Table } from '@mathesar/api/rpc/tables';
   import TableName from '@mathesar/components/TableName.svelte';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
+  import { currentDatabase } from '@mathesar/stores/databases';
   import {
     Meta,
     TabularData,
@@ -27,11 +28,11 @@
 
   $: abstractTypesMap = $currentDbAbstractTypes.data;
   $: tabularData = new TabularData({
-    id: table.oid,
+    database: $currentDatabase,
+    table,
     abstractTypesMap,
     meta,
     contextualFilters: new Map([[fkColumn.id, recordPk]]),
-    table,
   });
   $: tabularDataStore.set(tabularData);
 </script>
diff --git a/mathesar_ui/src/pages/table/TablePage.svelte b/mathesar_ui/src/pages/table/TablePage.svelte
index da4603c51e..865735b000 100644
--- a/mathesar_ui/src/pages/table/TablePage.svelte
+++ b/mathesar_ui/src/pages/table/TablePage.svelte
@@ -7,6 +7,7 @@
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
+  import { currentDatabase } from '@mathesar/stores/databases';
   import {
     Meta,
     TabularData,
@@ -36,10 +37,10 @@
   $: ({ query } = $router);
   $: meta = Meta.fromSerialization(query[metaSerializationQueryKey] ?? '');
   $: tabularData = new TabularData({
-    id: table.oid,
+    database: $currentDatabase,
+    table,
     abstractTypesMap,
     meta,
-    table,
     shareConsumer,
   });
   $: ({ isLoading, selection } = tabularData);
@@ -73,7 +74,7 @@
 
 <LayoutWithHeader fitViewport restrictWidth={false}>
   <div class="table-page">
-    <ActionsPane {table} {context} />
+    <ActionsPane {context} />
     <TableView {table} {context} bind:sheetElement />
   </div>
 </LayoutWithHeader>
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/boolean.ts b/mathesar_ui/src/stores/abstract-types/type-configs/boolean.ts
index 730490ecc8..b42c7c2ceb 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/boolean.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/boolean.ts
@@ -1,7 +1,8 @@
-import type {
-  BooleanDisplayOptions,
-  Column,
-} from '@mathesar/api/rest/types/tables/columns';
+import {
+  type BooleanInputType,
+  type Column,
+  getColumnDisplayOption,
+} from '@mathesar/api/rpc/columns';
 import { iconUiTypeBoolean } from '@mathesar/icons';
 import type { FormValues } from '@mathesar-component-library/types';
 
@@ -84,39 +85,31 @@ const displayForm: AbstractTypeConfigForm = {
 };
 
 function determineDisplayOptions(
-  dispFormValues: FormValues,
+  formValues: FormValues,
 ): Column['display_options'] {
   const displayOptions: Column['display_options'] = {
-    input: dispFormValues.displayAs,
+    bool_input: formValues.displayAs as BooleanInputType,
   };
-  if (
-    dispFormValues.displayAs === 'dropdown' &&
-    dispFormValues.useCustomLabels
-  ) {
-    displayOptions.custom_labels = {
-      TRUE: dispFormValues.trueLabel,
-      FALSE: dispFormValues.falseLabel,
-    };
+  if (formValues.displayAs === 'dropdown' && formValues.useCustomLabels) {
+    displayOptions.bool_true = formValues.trueLabel as string;
+    displayOptions.bool_false = formValues.falseLabel as string;
   }
   return displayOptions;
 }
 
 function constructDisplayFormValuesFromDisplayOptions(
-  columnDisplayOpts: Column['display_options'],
+  displayOptions: Column['display_options'],
 ): FormValues {
-  const displayOptions = columnDisplayOpts as BooleanDisplayOptions | null;
-  const dispFormValues: FormValues = {
-    displayAs: displayOptions?.input ?? 'checkbox',
+  const column = { display_options: displayOptions };
+  const formValues: FormValues = {
+    displayAs: getColumnDisplayOption(column, 'bool_input'),
   };
-  if (
-    typeof displayOptions?.custom_labels === 'object' &&
-    displayOptions.custom_labels !== null
-  ) {
-    dispFormValues.useCustomLabels = true;
-    dispFormValues.trueLabel = displayOptions.custom_labels.TRUE;
-    dispFormValues.falseLabel = displayOptions.custom_labels.FALSE;
+  if (displayOptions?.bool_true || displayOptions?.bool_false) {
+    formValues.useCustomLabels = true;
+    formValues.trueLabel = getColumnDisplayOption(column, 'bool_true');
+    formValues.falseLabel = getColumnDisplayOption(column, 'bool_false');
   }
-  return dispFormValues;
+  return formValues;
 }
 
 const booleanType: AbstractTypeConfiguration = {
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/comboTypes/arrayFactory.ts b/mathesar_ui/src/stores/abstract-types/type-configs/comboTypes/arrayFactory.ts
index 3238fdfdc3..6f1ef295de 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/comboTypes/arrayFactory.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/comboTypes/arrayFactory.ts
@@ -1,4 +1,3 @@
-import type { ArrayTypeOptions } from '@mathesar/api/rest/types/tables/columns';
 import { iconUiTypeArray } from '@mathesar/icons';
 
 import type { AbstractTypeConfigurationFactory } from '../../types';
@@ -7,19 +6,12 @@ import { getAbstractTypeForDbType } from '../../utils';
 const arrayFactory: AbstractTypeConfigurationFactory = (map) => ({
   getIcon: (args) => {
     const arrayIcon = { ...iconUiTypeArray, label: 'Array' };
-    if (args && args.typeOptions) {
-      const typeOpts = args.typeOptions as ArrayTypeOptions;
-      const innerAbstractType = getAbstractTypeForDbType(
-        typeOpts.item_type,
-        map,
-      );
-      if (innerAbstractType) {
-        const innerIcon = innerAbstractType.getIcon();
-        const innerIcons = Array.isArray(innerIcon) ? innerIcon : [innerIcon];
-        return [{ ...iconUiTypeArray, label: 'Array' }, ...innerIcons];
-      }
-    }
-    return arrayIcon;
+    const itemType = args?.typeOptions?.item_type ?? undefined;
+    if (!itemType) return arrayIcon;
+    const innerAbstractType = getAbstractTypeForDbType(itemType, map);
+    const innerIcon = innerAbstractType.getIcon();
+    const innerIcons = Array.isArray(innerIcon) ? innerIcon : [innerIcon];
+    return [arrayIcon, ...innerIcons];
   },
   cellInfo: {
     type: 'array',
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/date.ts b/mathesar_ui/src/stores/abstract-types/type-configs/date.ts
index b31d33175e..9e1fa9ee47 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/date.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/date.ts
@@ -1,8 +1,8 @@
-import type {
-  Column,
-  DateDisplayOptions,
-  DateFormat,
-} from '@mathesar/api/rest/types/tables/columns';
+import {
+  type Column,
+  type DateFormat,
+  getColumnDisplayOption,
+} from '@mathesar/api/rpc/columns';
 import { iconUiTypeDate } from '@mathesar/icons';
 import type { FormValues } from '@mathesar-component-library/types';
 
@@ -35,22 +35,21 @@ const displayForm: AbstractTypeConfigForm = {
 };
 
 function determineDisplayOptions(
-  dispFormValues: FormValues,
+  formValues: FormValues,
 ): Column['display_options'] {
-  const displayOptions: DateDisplayOptions = {
-    format: dispFormValues.format as DateFormat,
+  return {
+    date_format: formValues.format as DateFormat,
   };
-  return displayOptions;
 }
 
 function constructDisplayFormValuesFromDisplayOptions(
-  columnDisplayOpts: Column['display_options'],
+  displayOptions: Column['display_options'],
 ): FormValues {
-  const displayOptions = columnDisplayOpts as DateDisplayOptions | null;
-  const dispFormValues: FormValues = {
-    format: displayOptions?.format ?? 'none',
+  const column = { display_options: displayOptions };
+  const formValues: FormValues = {
+    format: getColumnDisplayOption(column, 'date_format'),
   };
-  return dispFormValues;
+  return formValues;
 }
 
 const dateType: AbstractTypeConfiguration = {
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/datetime.ts b/mathesar_ui/src/stores/abstract-types/type-configs/datetime.ts
index 43e1771aa6..1f366a2740 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/datetime.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/datetime.ts
@@ -1,9 +1,9 @@
-import type {
-  Column,
-  DateFormat,
-  TimeFormat,
-  TimeStampDisplayOptions,
-} from '@mathesar/api/rest/types/tables/columns';
+import {
+  type Column,
+  type DateFormat,
+  type TimeFormat,
+  getColumnDisplayOption,
+} from '@mathesar/api/rpc/columns';
 import { iconUiTypeDateTime } from '@mathesar/icons';
 import type { FormValues } from '@mathesar-component-library/types';
 
@@ -94,7 +94,7 @@ const displayForm: AbstractTypeConfigForm = {
 function determineDisplayOptions(
   dispFormValues: FormValues,
 ): Column['display_options'] {
-  const displayOptions: TimeStampDisplayOptions = {
+  const displayOptions: Column['display_options'] = {
     date_format: dispFormValues.dateFormat as DateFormat,
     time_format: dispFormValues.timeFormat as TimeFormat,
   };
@@ -102,14 +102,14 @@ function determineDisplayOptions(
 }
 
 function constructDisplayFormValuesFromDisplayOptions(
-  columnDisplayOpts: Column['display_options'],
+  displayOptions: Column['display_options'],
 ): FormValues {
-  const displayOptions = columnDisplayOpts as TimeStampDisplayOptions | null;
-  const dispFormValues: FormValues = {
-    dateFormat: displayOptions?.date_format ?? 'none',
-    timeFormat: displayOptions?.time_format ?? '24hr',
+  const column = { display_options: displayOptions };
+  const formValues: FormValues = {
+    dateFormat: getColumnDisplayOption(column, 'date_format'),
+    timeFormat: getColumnDisplayOption(column, 'time_format'),
   };
-  return dispFormValues;
+  return formValues;
 }
 
 const dateTimeType: AbstractTypeConfiguration = {
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/duration.ts b/mathesar_ui/src/stores/abstract-types/type-configs/duration.ts
index fc546fa12e..da7d4fb81f 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/duration.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/duration.ts
@@ -1,7 +1,4 @@
-import type {
-  Column,
-  DurationDisplayOptions,
-} from '@mathesar/api/rest/types/tables/columns';
+import { type Column, getColumnDisplayOption } from '@mathesar/api/rpc/columns';
 import { iconUiTypeDuration } from '@mathesar/icons';
 import { DurationSpecification } from '@mathesar/utils/duration';
 import type { FormValues } from '@mathesar-component-library/types';
@@ -43,26 +40,26 @@ const displayForm: AbstractTypeConfigForm = {
 };
 
 function determineDisplayOptions(
-  dispFormValues: FormValues,
+  formValues: FormValues,
 ): Column['display_options'] {
   const displayOptions: Column['display_options'] = {
-    ...(dispFormValues.durationConfig as Record<string, unknown>),
-    show_units: false,
+    ...(formValues.durationConfig as Record<string, unknown>),
+    duration_show_units: false,
   };
   return displayOptions;
 }
 
 function constructDisplayFormValuesFromDisplayOptions(
-  columnDisplayOpts: Column['display_options'],
+  displayOptions: Column['display_options'],
 ): FormValues {
-  const displayOptions = columnDisplayOpts as DurationDisplayOptions | null;
-  const dispFormValues: FormValues = {
+  const column = { display_options: displayOptions };
+  const formValues: FormValues = {
     durationConfig: {
-      max: displayOptions?.max ?? durationDefaults.max,
-      min: displayOptions?.min ?? durationDefaults.min,
+      max: getColumnDisplayOption(column, 'duration_max'),
+      min: getColumnDisplayOption(column, 'duration_min'),
     },
   };
-  return dispFormValues;
+  return formValues;
 }
 
 const durationType: AbstractTypeConfiguration = {
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/money.ts b/mathesar_ui/src/stores/abstract-types/type-configs/money.ts
index 83da2fb45b..789dbea426 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/money.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/money.ts
@@ -1,8 +1,10 @@
-import type {
-  Column,
-  MoneyDisplayOptions,
-  NumberFormat,
-} from '@mathesar/api/rest/types/tables/columns';
+import {
+  type Column,
+  type CurrencyLocation,
+  type NumberFormat,
+  type NumberGrouping,
+  getColumnDisplayOption,
+} from '@mathesar/api/rpc/columns';
 import { iconUiTypeMoney } from '@mathesar/icons';
 import type { FormValues } from '@mathesar-component-library/types';
 
@@ -93,41 +95,43 @@ const displayForm: AbstractTypeConfigForm = {
 };
 
 interface MoneyFormValues extends Record<string, unknown> {
-  currencySymbol: MoneyDisplayOptions['currency_symbol'];
-  decimalPlaces: MoneyDisplayOptions['minimum_fraction_digits'];
-  currencySymbolLocation: MoneyDisplayOptions['currency_symbol_location'];
+  currencySymbol: string;
+  decimalPlaces: number | null;
+  currencySymbolLocation: CurrencyLocation;
   numberFormat: NumberFormat | 'none';
-  useGrouping: MoneyDisplayOptions['use_grouping'];
+  useGrouping: NumberGrouping;
 }
 
 function determineDisplayOptions(form: FormValues): Column['display_options'] {
   const f = form as MoneyFormValues;
-  const opts: Partial<MoneyDisplayOptions> = {
-    currency_symbol: f.currencySymbol,
-    currency_symbol_location: f.currencySymbolLocation,
-    number_format: f.numberFormat === 'none' ? null : f.numberFormat,
-    use_grouping: f.useGrouping,
-    minimum_fraction_digits: f.decimalPlaces ?? undefined,
-    maximum_fraction_digits: f.decimalPlaces ?? undefined,
+  const opts: Partial<Column['display_options']> = {
+    mon_currency_symbol: f.currencySymbol,
+    mon_currency_location: f.currencySymbolLocation,
+    num_format: f.numberFormat === 'none' ? null : f.numberFormat,
+    num_grouping: f.useGrouping,
+    num_min_frac_digits: f.decimalPlaces ?? undefined,
+    num_max_frac_digits: f.decimalPlaces ?? undefined,
   };
   return opts;
 }
 
 function constructDisplayFormValuesFromDisplayOptions(
-  columnDisplayOpts: Column['display_options'],
+  displayOptions: Column['display_options'],
 ): MoneyFormValues {
-  const displayOptions = columnDisplayOpts as MoneyDisplayOptions | null;
+  const column = { display_options: displayOptions };
   const decimalPlaces = getDecimalPlaces(
-    displayOptions?.minimum_fraction_digits ?? null,
-    displayOptions?.maximum_fraction_digits ?? null,
+    displayOptions?.num_min_frac_digits ?? null,
+    displayOptions?.num_max_frac_digits ?? null,
   );
   const displayFormValues: MoneyFormValues = {
-    numberFormat: displayOptions?.number_format ?? 'none',
-    currencySymbol: displayOptions?.currency_symbol ?? '',
+    numberFormat: getColumnDisplayOption(column, 'num_format') ?? 'none',
+    currencySymbol: getColumnDisplayOption(column, 'mon_currency_symbol') ?? '',
     decimalPlaces,
-    currencySymbolLocation:
-      displayOptions?.currency_symbol_location ?? 'after-minus',
-    useGrouping: displayOptions?.use_grouping ?? 'true',
+    currencySymbolLocation: getColumnDisplayOption(
+      column,
+      'mon_currency_location',
+    ),
+    useGrouping: getColumnDisplayOption(column, 'num_grouping'),
   };
   return displayFormValues;
 }
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/number.ts b/mathesar_ui/src/stores/abstract-types/type-configs/number.ts
index 423b344e25..0986c592ce 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/number.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/number.ts
@@ -1,8 +1,9 @@
-import type {
-  Column,
-  NumberDisplayOptions,
-  NumberFormat,
-} from '@mathesar/api/rest/types/tables/columns';
+import {
+  type Column,
+  type NumberFormat,
+  type NumberGrouping,
+  getColumnDisplayOption,
+} from '@mathesar/api/rpc/columns';
 import type { DbType } from '@mathesar/AppTypes';
 import { iconUiTypeNumber } from '@mathesar/icons';
 import type { FormValues } from '@mathesar-component-library/types';
@@ -148,10 +149,10 @@ function determineDbTypeAndOptions(
 
   if (dbType === DB_TYPES.DECIMAL || dbType === DB_TYPES.NUMERIC) {
     if (dbFormValues.maxDigits !== null) {
-      typeOptions.precision = dbFormValues.maxDigits;
+      typeOptions.precision = Number(dbFormValues.maxDigits);
     }
     if (dbFormValues.decimalPlaces !== null) {
-      typeOptions.scale = dbFormValues.decimalPlaces;
+      typeOptions.scale = Number(dbFormValues.decimalPlaces);
     }
   }
 
@@ -257,17 +258,15 @@ function determineDisplayOptions(
   formValues: FormValues,
 ): Column['display_options'] {
   const decimalPlaces = formValues.decimalPlaces as number | null;
-  const opts: Partial<NumberDisplayOptions> = {
-    number_format:
+  const opts: Partial<Column['display_options']> = {
+    num_format:
       formValues.numberFormat === 'none'
         ? undefined
         : (formValues.numberFormat as NumberFormat),
-    use_grouping:
-      (formValues.useGrouping as
-        | NumberDisplayOptions['use_grouping']
-        | undefined) ?? 'false',
-    minimum_fraction_digits: decimalPlaces ?? undefined,
-    maximum_fraction_digits: decimalPlaces ?? undefined,
+    num_grouping:
+      (formValues.useGrouping as NumberGrouping | undefined) ?? 'auto',
+    num_min_frac_digits: decimalPlaces ?? undefined,
+    num_max_frac_digits: decimalPlaces ?? undefined,
   };
   return opts;
 }
@@ -289,16 +288,16 @@ export function getDecimalPlaces(
 }
 
 function constructDisplayFormValuesFromDisplayOptions(
-  columnDisplayOpts: Column['display_options'],
+  displayOptions: Column['display_options'],
 ): FormValues {
-  const displayOptions = columnDisplayOpts as NumberDisplayOptions | null;
+  const column = { display_options: displayOptions };
   const decimalPlaces = getDecimalPlaces(
-    displayOptions?.minimum_fraction_digits ?? null,
-    displayOptions?.maximum_fraction_digits ?? null,
+    displayOptions?.num_min_frac_digits ?? null,
+    displayOptions?.num_max_frac_digits ?? null,
   );
   const formValues: FormValues = {
-    numberFormat: displayOptions?.number_format ?? 'none',
-    useGrouping: displayOptions?.use_grouping ?? 'false',
+    numberFormat: getColumnDisplayOption(column, 'num_format'),
+    useGrouping: getColumnDisplayOption(column, 'num_grouping'),
     decimalPlaces,
   };
   return formValues;
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/text.ts b/mathesar_ui/src/stores/abstract-types/type-configs/text.ts
index fecf3c0b87..5dbd4fdb56 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/text.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/text.ts
@@ -1,4 +1,4 @@
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type { Column } from '@mathesar/api/rpc/columns';
 import type { DbType } from '@mathesar/AppTypes';
 import { iconUiTypeText } from '@mathesar/icons';
 import type { FormValues } from '@mathesar-component-library/types';
@@ -76,7 +76,7 @@ function determineDbTypeAndOptions(
   const dbType = determineDbType(dbFormValues, columnType);
   const typeOptions: Column['type_options'] = {};
   if (dbType === DB_TYPES.CHAR || dbType === DB_TYPES.VARCHAR) {
-    typeOptions.length = dbFormValues.length;
+    typeOptions.length = Number(dbFormValues.length);
   }
   return {
     dbType,
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/time.ts b/mathesar_ui/src/stores/abstract-types/type-configs/time.ts
index 8c0905dc44..42e739c7c3 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/time.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/time.ts
@@ -1,8 +1,8 @@
-import type {
-  Column,
-  TimeDisplayOptions,
-  TimeFormat,
-} from '@mathesar/api/rest/types/tables/columns';
+import {
+  type Column,
+  type TimeFormat,
+  getColumnDisplayOption,
+} from '@mathesar/api/rpc/columns';
 import { iconUiTypeTime } from '@mathesar/icons';
 import type { FormValues } from '@mathesar-component-library/types';
 
@@ -80,22 +80,20 @@ const displayForm: AbstractTypeConfigForm = {
 };
 
 function determineDisplayOptions(
-  dispFormValues: FormValues,
+  formValues: FormValues,
 ): Column['display_options'] {
-  const displayOptions: TimeDisplayOptions = {
-    format: dispFormValues.format as TimeFormat,
+  return {
+    time_format: formValues.format as TimeFormat,
   };
-  return displayOptions;
 }
 
 function constructDisplayFormValuesFromDisplayOptions(
-  columnDisplayOpts: Column['display_options'],
+  displayOptions: Column['display_options'],
 ): FormValues {
-  const displayOptions = columnDisplayOpts as TimeDisplayOptions | null;
-  const dispFormValues: FormValues = {
-    format: displayOptions?.format ?? '24hr',
+  const column = { display_options: displayOptions };
+  return {
+    format: getColumnDisplayOption(column, 'time_format'),
   };
-  return dispFormValues;
 }
 
 const timeType: AbstractTypeConfiguration = {
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/utils.ts b/mathesar_ui/src/stores/abstract-types/type-configs/utils.ts
index bb3774db89..ab126c1d0e 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/utils.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/utils.ts
@@ -1,7 +1,4 @@
-import type {
-  DateFormat,
-  TimeFormat,
-} from '@mathesar/api/rest/types/tables/columns';
+import type { DateFormat, TimeFormat } from '@mathesar/api/rpc/columns';
 import { DateTimeSpecification } from '@mathesar/utils/date-time';
 import { dayjs } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/stores/abstract-types/types.ts b/mathesar_ui/src/stores/abstract-types/types.ts
index c05a43ed8b..6f04eaf055 100644
--- a/mathesar_ui/src/stores/abstract-types/types.ts
+++ b/mathesar_ui/src/stores/abstract-types/types.ts
@@ -1,6 +1,6 @@
 import type { QuerySummarizationFunctionId } from '@mathesar/api/rest/types/queries';
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { States } from '@mathesar/api/rest/utils/requestUtils';
+import type { Column } from '@mathesar/api/rpc/columns';
 import type { DbType } from '@mathesar/AppTypes';
 import type { CellDataType } from '@mathesar/components/cell-fabric/data-types/typeDefinitions';
 import type {
diff --git a/mathesar_ui/src/stores/table-data/TableStructure.ts b/mathesar_ui/src/stores/table-data/TableStructure.ts
index 0289a340c2..12444c7fa6 100644
--- a/mathesar_ui/src/stores/table-data/TableStructure.ts
+++ b/mathesar_ui/src/stores/table-data/TableStructure.ts
@@ -1,8 +1,10 @@
 import type { Readable } from 'svelte/store';
 import { derived } from 'svelte/store';
 
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import { States } from '@mathesar/api/rest/utils/requestUtils';
+import type { Column } from '@mathesar/api/rpc/columns';
+import type { Database } from '@mathesar/api/rpc/databases';
+import type { Table } from '@mathesar/api/rpc/tables';
 import type { DBObjectEntry } from '@mathesar/AppTypes';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
 
@@ -13,12 +15,13 @@ import type { ProcessedColumnsStore } from './processedColumns';
 import { processColumn } from './processedColumns';
 
 export interface TableStructureProps {
-  id: DBObjectEntry['id'];
+  database: Pick<Database, 'id'>;
+  table: Pick<Table, 'oid'>;
   abstractTypesMap: AbstractTypesMap;
 }
 
 export class TableStructure {
-  id: DBObjectEntry['id'];
+  oid: DBObjectEntry['id'];
 
   columnsDataStore: ColumnsDataStore;
 
@@ -29,9 +32,12 @@ export class TableStructure {
   isLoading: Readable<boolean>;
 
   constructor(props: TableStructureProps) {
-    this.id = props.id;
-    this.columnsDataStore = new ColumnsDataStore({ tableId: this.id });
-    this.constraintsDataStore = new ConstraintsDataStore({ tableId: this.id });
+    this.oid = props.table.oid;
+    this.columnsDataStore = new ColumnsDataStore({
+      database: props.database,
+      tableOid: this.oid,
+    });
+    this.constraintsDataStore = new ConstraintsDataStore({ tableId: this.oid });
     this.processedColumns = derived(
       [this.columnsDataStore.columns, this.constraintsDataStore],
       ([columns, constraintsData]) =>
@@ -39,7 +45,7 @@ export class TableStructure {
           columns.map((column, columnIndex) => [
             column.id,
             processColumn({
-              tableId: this.id,
+              tableId: this.oid,
               column,
               columnIndex,
               constraints: constraintsData.constraints,
diff --git a/mathesar_ui/src/stores/table-data/columns.ts b/mathesar_ui/src/stores/table-data/columns.ts
index b76dded669..58b9bdfdc8 100644
--- a/mathesar_ui/src/stores/table-data/columns.ts
+++ b/mathesar_ui/src/stores/table-data/columns.ts
@@ -1,17 +1,13 @@
 import { type Readable, derived, writable } from 'svelte/store';
 
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+import { api } from '@mathesar/api/rpc';
 import type {
-  PaginatedResponse,
-  RequestStatus,
-} from '@mathesar/api/rest/utils/requestUtils';
-import {
-  addQueryParamsToUrl,
-  deleteAPI,
-  getAPI,
-  patchAPI,
-  postAPI,
-} from '@mathesar/api/rest/utils/requestUtils';
+  Column,
+  ColumnCreationSpec,
+  ColumnPatchSpec,
+} from '@mathesar/api/rpc/columns';
+import type { Database } from '@mathesar/api/rpc/databases';
 import type { Table } from '@mathesar/api/rpc/tables';
 import { getErrorMessage } from '@mathesar/utils/errors';
 import type { ShareConsumer } from '@mathesar/utils/shares';
@@ -21,36 +17,18 @@ import {
   WritableSet,
 } from '@mathesar-component-library';
 
-function api(url: string) {
-  return {
-    get(queryParams: Record<string, unknown>) {
-      const requestUrl = addQueryParamsToUrl(url, queryParams);
-      return getAPI<PaginatedResponse<Column>>(requestUrl);
-    },
-    add(columnDetails: Partial<Column>) {
-      return postAPI<Partial<Column>>(url, columnDetails);
-    },
-    remove(id: Column['id']) {
-      return deleteAPI(`${url}${id}/`);
-    },
-    update(id: Column['id'], data: Partial<Column>) {
-      return patchAPI<Partial<Column>>(`${url}${id}/`, data);
-    },
-  };
-}
-
 export class ColumnsDataStore extends EventHandler<{
-  columnRenamed: number;
-  columnAdded: Partial<Column>;
-  columnDeleted: number;
-  columnPatched: Partial<Column>;
-  columnsFetched: Column[];
+  columnRenamed: void;
+  columnAdded: void;
+  columnDeleted: Column['id'];
+  columnPatched: void;
 }> {
-  private tableId: Table['oid'];
-
-  private promise: CancellablePromise<PaginatedResponse<Column>> | undefined;
+  private apiContext: {
+    database_id: number;
+    table_oid: Table['oid'];
+  };
 
-  private api: ReturnType<typeof api>;
+  private promise: CancellablePromise<Column[]> | undefined;
 
   private fetchedColumns = writable<Column[]>([]);
 
@@ -66,19 +44,20 @@ export class ColumnsDataStore extends EventHandler<{
   readonly shareConsumer?: ShareConsumer;
 
   constructor({
-    tableId,
+    database,
+    tableOid,
     hiddenColumns,
     shareConsumer,
   }: {
-    tableId: Table['oid'];
+    database: Pick<Database, 'id'>;
+    tableOid: Table['oid'];
     /** Values are column ids */
     hiddenColumns?: Iterable<number>;
     shareConsumer?: ShareConsumer;
   }) {
     super();
-    this.tableId = tableId;
+    this.apiContext = { database_id: database.id, table_oid: tableOid };
     this.shareConsumer = shareConsumer;
-    this.api = api(`/api/db/v0/tables/${this.tableId}/columns/`);
     this.hiddenColumns = new WritableSet(hiddenColumns);
     this.columns = derived(
       [this.fetchedColumns, this.hiddenColumns],
@@ -94,15 +73,16 @@ export class ColumnsDataStore extends EventHandler<{
     try {
       this.fetchStatus.set({ state: 'processing' });
       this.promise?.cancel();
-      this.promise = this.api.get({
-        limit: 500,
-        ...this.shareConsumer?.getQueryParams(),
-      });
-      const response = await this.promise;
-      const columns = response.results;
+      // TODO_BETA: For some reason `...this.shareConsumer?.getQueryParams()`
+      // was getting passed into the API call when it was REST. I don't know
+      // why. We need to figure out if this is necessary to replicate for the
+      // RPC call.
+      this.promise = api.columns
+        .list_with_metadata({ ...this.apiContext })
+        .run();
+      const columns = await this.promise;
       this.fetchedColumns.set(columns);
       this.fetchStatus.set({ state: 'success' });
-      await this.dispatch('columnsFetched', columns);
       return columns;
     } catch (e) {
       this.fetchStatus.set({ state: 'failure', errors: [getErrorMessage(e)] });
@@ -112,33 +92,30 @@ export class ColumnsDataStore extends EventHandler<{
     }
   }
 
-  async add(columnDetails: Partial<Column>): Promise<Partial<Column>> {
-    const column = await this.api.add(columnDetails);
-    await this.dispatch('columnAdded', column);
+  async add(columnDetails: ColumnCreationSpec): Promise<void> {
+    await api.columns
+      .add({ ...this.apiContext, column_data_list: [columnDetails] })
+      .run();
+    await this.dispatch('columnAdded');
     await this.fetch();
-    return column;
   }
 
-  async rename(id: Column['id'], newName: string): Promise<void> {
-    await this.api.update(id, { name: newName });
-    await this.dispatch('columnRenamed', id);
+  async rename(id: Column['id'], name: string): Promise<void> {
+    await api.columns
+      .patch({ ...this.apiContext, column_data_list: [{ id, name }] })
+      .run();
+    await this.dispatch('columnRenamed');
   }
 
   async updateDescription(
     id: Column['id'],
     description: string | null,
   ): Promise<void> {
-    await this.api.update(id, { description });
+    await api.columns
+      .patch({ ...this.apiContext, column_data_list: [{ id, description }] })
+      .run();
     this.fetchedColumns.update((columns) =>
-      columns.map((column) => {
-        if (column.id === id) {
-          return {
-            ...column,
-            description,
-          };
-        }
-        return column;
-      }),
+      columns.map((c) => (c.id === id ? { ...c, description } : c)),
     );
   }
 
@@ -151,23 +128,24 @@ export class ColumnsDataStore extends EventHandler<{
         `Column "${column.name}" cannot allow NULL because it is a primary key.`,
       );
     }
-    await this.api.update(column.id, { nullable });
+    await api.columns
+      .patch({
+        ...this.apiContext,
+        column_data_list: [{ id: column.id, nullable }],
+      })
+      .run();
     await this.fetch();
   }
 
-  // TODO: Analyze: Might be cleaner to move following functions as a property of Column class
-  // but are the object instantiations worth it?
-
-  async patch(
-    columnId: Column['id'],
-    properties: Omit<Partial<Column>, 'id'>,
-  ): Promise<Partial<Column>> {
-    const column = await this.api.update(columnId, {
-      ...properties,
-    });
+  async patch(patchSpec: ColumnPatchSpec): Promise<void> {
+    await api.columns
+      .patch({
+        ...this.apiContext,
+        column_data_list: [patchSpec],
+      })
+      .run();
     await this.fetch();
-    await this.dispatch('columnPatched', column);
-    return column;
+    await this.dispatch('columnPatched');
   }
 
   destroy(): void {
@@ -177,7 +155,9 @@ export class ColumnsDataStore extends EventHandler<{
   }
 
   async deleteColumn(columnId: Column['id']): Promise<void> {
-    await this.api.remove(columnId);
+    await api.columns
+      .delete({ ...this.apiContext, column_attnums: [columnId] })
+      .run();
     await this.dispatch('columnDeleted', columnId);
     await this.fetch();
   }
diff --git a/mathesar_ui/src/stores/table-data/constraints.ts b/mathesar_ui/src/stores/table-data/constraints.ts
index ffb5de065f..64b9a05a7b 100644
--- a/mathesar_ui/src/stores/table-data/constraints.ts
+++ b/mathesar_ui/src/stores/table-data/constraints.ts
@@ -7,7 +7,6 @@ import type {
 } from 'svelte/store';
 import { derived, get as getStoreValue, writable } from 'svelte/store';
 
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { Constraint as ApiConstraint } from '@mathesar/api/rest/types/tables/constraints';
 import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
 import {
@@ -17,6 +16,7 @@ import {
   getAPI,
   postAPI,
 } from '@mathesar/api/rest/utils/requestUtils';
+import type { Column } from '@mathesar/api/rpc/columns';
 import type { Table } from '@mathesar/api/rpc/tables';
 import type { ShareConsumer } from '@mathesar/utils/shares';
 import type { CancellablePromise } from '@mathesar-component-library';
diff --git a/mathesar_ui/src/stores/table-data/constraintsUtils.ts b/mathesar_ui/src/stores/table-data/constraintsUtils.ts
index 31f616a838..c5a033b823 100644
--- a/mathesar_ui/src/stores/table-data/constraintsUtils.ts
+++ b/mathesar_ui/src/stores/table-data/constraintsUtils.ts
@@ -1,8 +1,8 @@
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type {
   Constraint,
   FkConstraint,
 } from '@mathesar/api/rest/types/tables/constraints';
+import type { Column } from '@mathesar/api/rpc/columns';
 
 export function constraintIsFk(c: Constraint): c is FkConstraint {
   return c.type === 'foreignkey';
diff --git a/mathesar_ui/src/stores/table-data/processedColumns.ts b/mathesar_ui/src/stores/table-data/processedColumns.ts
index ab1ccad0c5..036aae5b8f 100644
--- a/mathesar_ui/src/stores/table-data/processedColumns.ts
+++ b/mathesar_ui/src/stores/table-data/processedColumns.ts
@@ -1,7 +1,7 @@
 import type { Readable } from 'svelte/store';
 
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { Constraint } from '@mathesar/api/rest/types/tables/constraints';
+import type { Column } from '@mathesar/api/rpc/columns';
 import type { Table } from '@mathesar/api/rpc/tables';
 import type { CellColumnFabric } from '@mathesar/components/cell-fabric/types';
 import {
diff --git a/mathesar_ui/src/stores/table-data/records.ts b/mathesar_ui/src/stores/table-data/records.ts
index fbc4443993..f536769732 100644
--- a/mathesar_ui/src/stores/table-data/records.ts
+++ b/mathesar_ui/src/stores/table-data/records.ts
@@ -7,7 +7,6 @@ import {
   writable,
 } from 'svelte/store';
 
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type {
   GetRequestParams as ApiGetRequestParams,
   Group as ApiGroup,
@@ -24,6 +23,7 @@ import {
   patchAPI,
   postAPI,
 } from '@mathesar/api/rest/utils/requestUtils';
+import type { Column } from '@mathesar/api/rpc/columns';
 import type { Table } from '@mathesar/api/rpc/tables';
 import { getErrorMessage } from '@mathesar/utils/errors';
 import { pluralize } from '@mathesar/utils/languageUtils';
diff --git a/mathesar_ui/src/stores/table-data/tabularData.ts b/mathesar_ui/src/stores/table-data/tabularData.ts
index cead9d366b..c8c719f750 100644
--- a/mathesar_ui/src/stores/table-data/tabularData.ts
+++ b/mathesar_ui/src/stores/table-data/tabularData.ts
@@ -1,10 +1,10 @@
 import { getContext, setContext } from 'svelte';
 import { type Readable, type Writable, derived, writable } from 'svelte/store';
 
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import { States } from '@mathesar/api/rest/utils/requestUtils';
+import type { Column } from '@mathesar/api/rpc/columns';
+import type { Database } from '@mathesar/api/rpc/databases';
 import type { Table } from '@mathesar/api/rpc/tables';
-import type { DBObjectEntry } from '@mathesar/AppTypes';
 import Plane from '@mathesar/components/sheet/selection/Plane';
 import Series from '@mathesar/components/sheet/selection/Series';
 import SheetSelectionStore from '@mathesar/components/sheet/selection/SheetSelectionStore';
@@ -23,9 +23,9 @@ import type { TableRecordsData } from './records';
 import { RecordsData } from './records';
 
 export interface TabularDataProps {
-  id: DBObjectEntry['id'];
-  abstractTypesMap: AbstractTypesMap;
+  database: Pick<Database, 'id'>;
   table: Table;
+  abstractTypesMap: AbstractTypesMap;
   meta?: Meta;
   shareConsumer?: ShareConsumer;
   /**
@@ -42,7 +42,7 @@ export interface TabularDataProps {
 }
 
 export class TabularData {
-  id: DBObjectEntry['id'];
+  table: Table;
 
   meta: Meta;
 
@@ -60,27 +60,26 @@ export class TabularData {
 
   selection: SheetSelectionStore;
 
-  table: Table;
-
   shareConsumer?: ShareConsumer;
 
   constructor(props: TabularDataProps) {
     const contextualFilters =
       props.contextualFilters ?? new Map<number, string | number>();
-    this.id = props.id;
+    this.table = props.table;
     this.meta = props.meta ?? new Meta();
     this.shareConsumer = props.shareConsumer;
     this.columnsDataStore = new ColumnsDataStore({
-      tableId: this.id,
+      database: props.database,
+      tableOid: this.table.oid,
       hiddenColumns: contextualFilters.keys(),
       shareConsumer: this.shareConsumer,
     });
     this.constraintsDataStore = new ConstraintsDataStore({
-      tableId: this.id,
+      tableId: this.table.oid,
       shareConsumer: this.shareConsumer,
     });
     this.recordsData = new RecordsData({
-      tableId: this.id,
+      tableId: this.table.oid,
       meta: this.meta,
       columnsDataStore: this.columnsDataStore,
       contextualFilters,
@@ -102,7 +101,7 @@ export class TabularData {
             columns.map((column, columnIndex) => [
               column.id,
               processColumn({
-                tableId: this.id,
+                tableId: this.table.oid,
                 column,
                 columnIndex,
                 constraints: constraintsData.constraints,
diff --git a/mathesar_ui/src/stores/table-data/utils.ts b/mathesar_ui/src/stores/table-data/utils.ts
index 7557f7f9c8..7eac7ed9fd 100644
--- a/mathesar_ui/src/stores/table-data/utils.ts
+++ b/mathesar_ui/src/stores/table-data/utils.ts
@@ -1,8 +1,8 @@
 import { concat } from 'iter-tools';
 
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { getMostImportantRequestStatusState } from '@mathesar/api/rest/utils/requestUtils';
+import type { Column } from '@mathesar/api/rpc/columns';
 import {
   ImmutableMap,
   ImmutableSet,
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index e09222aae2..92261d8eca 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -446,7 +446,12 @@ export function getJoinableTablesResult(
   tableId: number,
   maxDepth = 1,
 ): Promise<JoinableTablesResult> {
-  throw new Error('Not implemented'); // TODO_BETA
+  return Promise.resolve({
+    joinable_tables: [],
+    tables: {},
+    columns: {},
+  });
+  // TODO_BETA: re-implement this with the RPC API.
 
   // return getAPI<JoinableTablesResult>(
   //   `/api/db/v0/tables/${tableId}/joinable_tables/?max_depth=${maxDepth}`,
diff --git a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
index 3551b2675e..a077f35d08 100644
--- a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
+++ b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
@@ -1,5 +1,5 @@
 import type { QueryInstanceSummarizationTransformation } from '@mathesar/api/rest/types/queries';
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type { Column } from '@mathesar/api/rpc/columns';
 import type { Table } from '@mathesar/api/rpc/tables';
 import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
 import type { UnsavedQueryInstance } from '@mathesar/stores/queries';
diff --git a/mathesar_ui/src/systems/data-explorer/utils.ts b/mathesar_ui/src/systems/data-explorer/utils.ts
index 7a3c77f1fd..b1e187f51c 100644
--- a/mathesar_ui/src/systems/data-explorer/utils.ts
+++ b/mathesar_ui/src/systems/data-explorer/utils.ts
@@ -1,3 +1,6 @@
+import type { Simplify } from 'type-fest';
+import type { SimplifyDeep } from 'type-fest/source/merge-deep';
+
 import type {
   QueryColumnMetaData,
   QueryGeneratedColumnSource,
@@ -5,11 +8,11 @@ import type {
   QueryResultColumn,
   QueryRunResponse,
 } from '@mathesar/api/rest/types/queries';
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type {
   JoinableTablesResult,
   JpPath,
 } from '@mathesar/api/rest/types/tables/joinable_tables';
+import type { Column } from '@mathesar/api/rpc/columns';
 import type { Table } from '@mathesar/api/rpc/tables';
 import type { CellColumnFabric } from '@mathesar/components/cell-fabric/types';
 import {
@@ -305,6 +308,10 @@ export function getTablesThatReferenceBaseTable(
   return references;
 }
 
+// type T = SimplifyDeep<Pick<QueryColumnMetaData, 'alias'> &
+// ProcessedQueryResultColumnSource &
+// Partial<QueryColumnMetaData>>;
+
 function processColumn(
   columnInfo: Pick<QueryColumnMetaData, 'alias'> &
     ProcessedQueryResultColumnSource &
@@ -468,9 +475,14 @@ export function speculateColumnMetaData({
                 type_options:
                   aggregation.function === 'distinct_aggregate_to_array'
                     ? {
-                        type:
-                          updatedColumnsMetaData.get(aggregation.inputAlias)
-                            ?.column.type ?? 'unknown',
+                        // TODO_3704: Ask Pavish.
+                        // `Column['type_options']` was previously typed loosely
+                        // as `Record<string, unknown> | null`. Now it's more
+                        // strict and it doesn't have a `type` property.
+                        //
+                        // type:
+                        //   updatedColumnsMetaData.get(aggregation.inputAlias)
+                        //     ?.column.type ?? 'unknown',
                       }
                     : null,
                 display_options: null,
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
index b30cd4b009..2305433c06 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
@@ -13,7 +13,6 @@
     renderTransitiveRecordSummary,
   } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
   import { getPkValueInRecord } from '@mathesar/stores/table-data/records';
-  import { currentTablesData } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
   import { getErrorMessage } from '@mathesar/utils/errors';
   import { Button, Icon, Spinner } from '@mathesar-component-library';
@@ -39,7 +38,7 @@
     isLoading,
     columnsDataStore,
     recordsData,
-    id: tableId,
+    table,
   } = tabularData);
   $: ({ purpose: rowType } = controller);
   $: ({ columns, fetchStatus } = columnsDataStore);
@@ -56,7 +55,10 @@
       controller.submit(result);
     } else if ($rowType === 'navigation') {
       const { recordId } = result;
-      const recordPageUrl = $storeToGetRecordPageUrl({ tableId, recordId });
+      const recordPageUrl = $storeToGetRecordPageUrl({
+        tableId: table.oid,
+        recordId,
+      });
       if (recordPageUrl) {
         router.goto(recordPageUrl);
         controller.cancel();
@@ -70,7 +72,7 @@
   }
 
   async function submitNewRecord() {
-    const url = `/api/db/v0/tables/${tableId}/records/`;
+    const url = `/api/db/v0/tables/${table.oid}/records/`;
     const body = getDataForNewRecord();
     try {
       isSubmittingNewRecord = true;
@@ -78,8 +80,7 @@
       const record = response.results[0];
       const recordId = getPkValueInRecord(record, $columns);
       const previewData = response.preview_data ?? [];
-      const table = $currentTablesData.tablesMap.get(tableId);
-      const template = table?.metadata?.record_summary_template;
+      const template = table.metadata?.record_summary_template;
       // TODO_RS_TEMPLATE
       //
       // We need to change the logic here to account for the fact that sometimes
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorController.ts b/mathesar_ui/src/systems/record-selector/RecordSelectorController.ts
index 933e5879df..6944a8e64a 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorController.ts
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorController.ts
@@ -1,8 +1,8 @@
 import { getContext, setContext } from 'svelte';
 import { writable } from 'svelte/store';
 
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
 import type { Result as ApiRecord } from '@mathesar/api/rest/types/tables/records';
+import type { Column } from '@mathesar/api/rpc/columns';
 import type { DBObjectEntry } from '@mathesar/AppTypes';
 
 import type { RecordSelectorPurpose } from './recordSelectorUtils';
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
index cf9a36368d..299d786088 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { onMount, tick } from 'svelte';
 
-  import type { Column } from '@mathesar/api/rest/types/tables/columns';
   import { States } from '@mathesar/api/rest/utils/requestUtils';
+  import type { Column } from '@mathesar/api/rpc/columns';
   import { storeToGetRecordPageUrl } from '@mathesar/stores/storeBasedUrls';
   import {
     type RecordRow,
@@ -52,11 +52,10 @@
     constraintsDataStore,
     meta,
     columnsDataStore,
-    id: tableId,
+    table,
     recordsData,
     processedColumns,
   } = tabularData);
-  $: table = $currentTablesData.tablesMap.get(tableId);
   $: ({ recordSummaries, state: recordsDataState } = recordsData);
   $: recordsDataIsLoading = $recordsDataState === States.Loading;
   $: ({ constraints } = $constraintsDataStore);
@@ -123,7 +122,7 @@
     if (!recordId) {
       return undefined;
     }
-    return $storeToGetRecordPageUrl({ tableId, recordId });
+    return $storeToGetRecordPageUrl({ tableId: table.oid, recordId });
   }
 
   function submitIndex(index: number) {
@@ -137,8 +136,7 @@
     if (!record || recordId === undefined) {
       return;
     }
-    const tableEntry = $currentTablesData.tablesMap.get(tableId);
-    const template = table?.metadata?.record_summary_template;
+    const template = table.metadata?.record_summary_template;
     if (!template) {
       throw new Error('TODO_RS_TEMPLATE');
       // TODO_RS_TEMPLATE
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
index 2471426b66..cd98a1e086 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
@@ -4,6 +4,7 @@
   import { RichText } from '@mathesar/components/rich-text';
   import TableName from '@mathesar/components/TableName.svelte';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
+  import { currentDatabase } from '@mathesar/stores/databases';
   import { Meta, TabularData } from '@mathesar/stores/table-data';
   import { currentTablesMap } from '@mathesar/stores/tables';
   import Pagination from '@mathesar/utils/Pagination';
@@ -34,7 +35,7 @@
   $: tabularData =
     $tableId && table
       ? new TabularData({
-          id: $tableId,
+          database: $currentDatabase,
           abstractTypesMap: $currentDbAbstractTypes.data,
           meta: new Meta({ pagination: new Pagination({ size: 10 }) }),
           hasEnhancedPrimaryKeyCell: false,
diff --git a/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts b/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts
index 8b2d4cc4e4..a78f39f697 100644
--- a/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts
+++ b/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts
@@ -1,4 +1,4 @@
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type { Column } from '@mathesar/api/rpc/columns';
 import type { Table } from '@mathesar/api/rpc/tables';
 
 /**
diff --git a/mathesar_ui/src/systems/table-view/Body.svelte b/mathesar_ui/src/systems/table-view/Body.svelte
index 1cba547258..2b9899e4a6 100644
--- a/mathesar_ui/src/systems/table-view/Body.svelte
+++ b/mathesar_ui/src/systems/table-view/Body.svelte
@@ -21,7 +21,8 @@
 
   export let usesVirtualList = false;
 
-  $: ({ id, display, columnsDataStore } = $tabularData);
+  $: ({ table, display, columnsDataStore } = $tabularData);
+  $: ({ oid } = table);
   $: ({ displayableRecords } = display);
   $: ({ pkColumn } = columnsDataStore);
 
@@ -49,7 +50,7 @@
   }
 </script>
 
-{#key id}
+{#key oid}
   {#if usesVirtualList}
     <SheetVirtualRows
       itemCount={$displayableRecords.length}
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte b/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
index 1e6e60e67b..d3efda3a0e 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rpc/tables';
   import EntityPageHeader from '@mathesar/components/EntityPageHeader.svelte';
   import ModificationStatus from '@mathesar/components/ModificationStatus.svelte';
   import { iconInspector, iconTable } from '@mathesar/icons';
@@ -18,9 +17,8 @@
   const tabularData = getTabularDataStoreFromContext();
 
   export let context: TableActionsContext = 'page';
-  export let table: Pick<Table, 'name' | 'description'>;
 
-  $: ({ id, meta, isLoading, display } = $tabularData);
+  $: ({ table, meta, isLoading, display } = $tabularData);
   $: ({ filtering, sorting, grouping, sheetState } = meta);
   $: ({ isTableInspectorVisible } = display);
 
@@ -50,7 +48,7 @@
 
   <div class="aux-actions" slot="actions-right">
     {#if context === 'page'}
-      <ShareTableDropdown {id} />
+      <ShareTableDropdown id={table.oid} />
 
       <Button
         appearance="secondary"
diff --git a/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte b/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
index bf0566c542..c897119a34 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Column } from '@mathesar/api/rest/types/tables/columns';
   import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
   import { getAPI } from '@mathesar/api/rest/utils/requestUtils';
+  import type { Column } from '@mathesar/api/rpc/columns';
   import { Icon, Spinner, iconError } from '@mathesar/component-library';
   import ColumnName from '@mathesar/components/column/ColumnName.svelte';
   import TableName from '@mathesar/components/TableName.svelte';
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
index 3acf717de2..946f0fd896 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
@@ -16,6 +16,7 @@
   import SelectTable from '@mathesar/components/SelectTable.svelte';
   import TableName from '@mathesar/components/TableName.svelte';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
+  import { currentDatabase } from '@mathesar/stores/databases';
   import {
     type ProcessedColumn,
     TableStructure,
@@ -72,13 +73,14 @@
   });
 
   $: tables = [...$importVerifiedTables.values()];
-  $: baseTableName = $importVerifiedTables.get($tabularData.id)?.name ?? '';
+  $: baseTableName = $tabularData.table.name;
   $: ({ processedColumns } = $tabularData);
   $: baseTableColumns = [...$processedColumns.values()];
 
   $: targetTableStructure = $targetTable
     ? new TableStructure({
-        id: $targetTable.oid,
+        database: $currentDatabase,
+        table: $targetTable,
         abstractTypesMap: $currentDbAbstractTypes.data,
       })
     : undefined;
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
index 07a369b0e0..07b9935cb2 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
@@ -8,7 +8,6 @@
     type ProcessedColumn,
     getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
-  import { currentTablesData } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
   import { getColumnConstraintTypeByColumnId } from '@mathesar/utils/columnUtils';
   import { getAvailableName } from '@mathesar/utils/db';
@@ -75,7 +74,7 @@
   $: existingConstraintNames = new Set(
     $constraintsDataStore.constraints.map((c) => c.name),
   );
-  $: tableName = $currentTablesData.tablesMap.get($tabularData.id)?.name ?? '';
+  $: tableName = $tabularData.table.name;
   $: ({ processedColumns } = $tabularData);
   $: columnsInTable = Array.from($processedColumns.values());
   $: nameValidationErrors = getNameValidationErrors(
diff --git a/mathesar_ui/src/systems/table-view/header/new-column-cell/NewColumnCell.svelte b/mathesar_ui/src/systems/table-view/header/new-column-cell/NewColumnCell.svelte
index 6581301ddc..2b0907ba64 100644
--- a/mathesar_ui/src/systems/table-view/header/new-column-cell/NewColumnCell.svelte
+++ b/mathesar_ui/src/systems/table-view/header/new-column-cell/NewColumnCell.svelte
@@ -24,13 +24,10 @@
   $: ({ isSubmitting } = form);
 
   async function addColumn(closeDropdown: () => void) {
-    const newColumn = {
+    await columnsDataStore.add({
       name: $columnName,
       type: $columnType,
-      nullable: true,
-      primary_key: false,
-    };
-    await columnsDataStore.add(newColumn);
+    });
     closeDropdown();
   }
 </script>
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index a03a1b3baa..e175643411 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -18,6 +18,7 @@
   import { RichText } from '@mathesar/components/rich-text';
   import SelectTable from '@mathesar/components/SelectTable.svelte';
   import { iconTableLink } from '@mathesar/icons';
+  import { currentDatabase } from '@mathesar/stores/databases';
   import {
     ColumnsDataStore,
     getTabularDataStoreFromContext,
@@ -76,7 +77,7 @@
   $: linkType = requiredField<LinkType>('manyToOne');
   $: $targetTable, linkType.reset();
   $: targetColumnsStore = target
-    ? new ColumnsDataStore({ tableId: target.oid })
+    ? new ColumnsDataStore({ database: $currentDatabase, tableOid: target.oid })
     : undefined;
   $: targetColumns = ensureReadable(targetColumnsStore?.columns ?? []);
   $: targetColumnsFetchStatus = ensureReadable(targetColumnsStore?.fetchStatus);
@@ -205,7 +206,7 @@
     if (!tableWithNewColumn) {
       return;
     }
-    if (tableWithNewColumn.oid === $tabularData.id) {
+    if (tableWithNewColumn.oid === $tabularData.table.oid) {
       await $tabularData.refresh();
     }
   }
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte
index b2e2a4859b..0814d26d64 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte
@@ -37,9 +37,11 @@
   async function save() {
     typeChangeState = { state: 'processing' };
     try {
-      await columnsDataStore.patch(column.id, {
-        display_options: displayOptions,
-      });
+      // TODO_BETA: fix this
+      //
+      // await columnsDataStore.patch(column.id, {
+      //   display_options: displayOptions,
+      // });
       actionButtonsVisible = false;
       typeChangeState = { state: 'success' };
     } catch (err) {
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnType.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnType.svelte
index 9e1bd69cbd..f7044e2b8f 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnType.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnType.svelte
@@ -18,10 +18,10 @@
   async function save(
     columnInfo: Pick<ColumnTypeOptionsSaveArgs, 'type' | 'type_options'>,
   ) {
-    await columnsDataStore.patch(column.id, {
+    await columnsDataStore.patch({
+      id: column.id,
       type: columnInfo.type,
       type_options: columnInfo.type_options,
-      display_options: null,
       default: null,
     });
   }
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte
index 77043b98c9..b01d564a32 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte
@@ -49,10 +49,18 @@
       ? null
       : {
           is_dynamic: !!column.column.default?.is_dynamic,
-          value,
+
+          // TODO_3704:
+          //
+          // We need to check with the backend team if we should actually be
+          // stringifying `value` in this case. The API docs indicated that
+          // `value` is to only be accepted as a string. But that seems weird to
+          // me.
+          value: String(value),
         };
     try {
-      await columnsDataStore.patch(column.id, {
+      await columnsDataStore.patch({
+        id: column.id,
         default: defaultRequest,
       });
       typeChangeState = { state: 'success' };
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
index 2464245eec..b522b7ec87 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
@@ -146,7 +146,11 @@
         if (!targetTableId) {
           throw new Error($_('no_target_table_selected'));
         }
-        await moveColumns($tabularData.id, extractedColumnIds, targetTableId);
+        await moveColumns(
+          $tabularData.table.oid,
+          extractedColumnIds,
+          targetTableId,
+        );
         const fkColumns = $linkedTable?.columns ?? [];
         let fkColumnId: number | undefined = undefined;
         if (fkColumns.length === 1) {
@@ -160,7 +164,7 @@
         );
       } else {
         const response = await splitTable({
-          id: $tabularData.id,
+          id: $tabularData.table.oid,
           idsOfColumnsToExtract: extractedColumnIds,
           extractedTableName: newTableName,
           newFkColumnName: $newFkColumnName,
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/AppendColumn.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/AppendColumn.svelte
index 1964dfceca..177d356ed7 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/AppendColumn.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/AppendColumn.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Column } from '@mathesar/api/rest/types/tables/columns';
+  import type { Column } from '@mathesar/api/rpc/columns';
   import { iconAddNew, iconConstraint, iconTableLink } from '@mathesar/icons';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import {
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
index 15432634ad..3b9a85190f 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import type { Table } from '@mathesar/api/rpc/tables';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
+  import { currentDatabase } from '@mathesar/stores/databases';
   import { Meta, TabularData } from '@mathesar/stores/table-data';
   import RecordSummaryConfig from '@mathesar/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte';
   import Pagination from '@mathesar/utils/Pagination';
@@ -9,10 +10,10 @@
 
   $: abstractTypesMap = $currentDbAbstractTypes.data;
   $: tabularData = new TabularData({
-    id: table.oid,
+    database: $currentDatabase,
+    table,
     abstractTypesMap,
     meta: new Meta({ pagination: new Pagination({ size: 1 }) }),
-    table,
   });
 </script>
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/TemplateInput.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/TemplateInput.svelte
index 41fbde2f6e..fdbef1188e 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/TemplateInput.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/TemplateInput.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import type { ComponentProps } from 'svelte';
 
-  import type { Column } from '@mathesar/api/rest/types/tables/columns';
+  import type { Column } from '@mathesar/api/rpc/columns';
   import { FormattedInput } from '@mathesar-component-library';
 
   import AppendColumn from './AppendColumn.svelte';
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/recordSummaryTemplateUtils.ts b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/recordSummaryTemplateUtils.ts
index 23d38882bf..f0a1eb9738 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/recordSummaryTemplateUtils.ts
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/recordSummaryTemplateUtils.ts
@@ -1,7 +1,7 @@
 import { get } from 'svelte/store';
 import { _ } from 'svelte-i18n';
 
-import type { Column } from '@mathesar/api/rest/types/tables/columns';
+import type { Column } from '@mathesar/api/rpc/columns';
 import { type ValidationFn, validIf } from '@mathesar/components/form';
 
 export type ColumnLike = Pick<Column, 'id' | 'name'>;
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
index 7be0b37dfc..70160a48ee 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
@@ -8,11 +8,7 @@
   import { databasesStore } from '@mathesar/stores/databases';
   import { currentSchema } from '@mathesar/stores/schemas';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
-  import {
-    currentTable,
-    currentTablesData,
-    deleteTable,
-  } from '@mathesar/stores/tables';
+  import { deleteTable } from '@mathesar/stores/tables';
   import {
     constructDataExplorerUrlToSummarizeFromGroup,
     createDataExplorerUrlToExploreATable,
@@ -30,7 +26,7 @@
   const tabularData = getTabularDataStoreFromContext();
   const { currentDatabase } = databasesStore;
 
-  $: ({ id, columnsDataStore, meta } = $tabularData);
+  $: ({ table, columnsDataStore, meta } = $tabularData);
   $: ({ grouping } = meta);
   $: ({ columns } = columnsDataStore);
   $: explorationPageUrl =
@@ -38,21 +34,18 @@
       ? createDataExplorerUrlToExploreATable(
           $currentDatabase?.id,
           $currentSchema.oid,
-          {
-            oid: $tabularData.id,
-            name: $currentTablesData.tablesMap.get($tabularData.id)?.name ?? '',
-          },
+          table,
         )
       : '';
   $: summarizationUrl = (() => {
-    if (!$currentTable || !$currentDatabase || !$currentSchema) {
+    if (!$currentDatabase || !$currentSchema) {
       return undefined;
     }
     return constructDataExplorerUrlToSummarizeFromGroup(
       $currentDatabase.id,
       $currentSchema.oid,
       {
-        baseTable: { oid: id, name: $currentTable.name },
+        baseTable: table,
         columns: $columns,
         terseGrouping: $grouping.terse(),
       },
@@ -65,7 +58,7 @@
       body: {
         component: TableDeleteConfirmationBody,
         props: {
-          tableName: $currentTable?.name,
+          tableName: table.name,
         },
       },
       onProceed: async () => {
@@ -74,7 +67,7 @@
         const database = $currentDatabase;
         const schema = $currentSchema;
         if (database && schema) {
-          await deleteTable(database, schema, $tabularData.id);
+          await deleteTable(database, schema, table.oid);
           router.goto(getSchemaPageUrl(database.id, schema.oid), true);
         }
       },
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
index 93e204d237..df2e3fba95 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
@@ -4,25 +4,23 @@
   import EditableTextWithActions from '@mathesar/components/EditableTextWithActions.svelte';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
-  import { currentTablesData, updateTable } from '@mathesar/stores/tables';
+  import { updateTable } from '@mathesar/stores/tables';
 
   const tabularData = getTabularDataStoreFromContext();
 
   export let disabled = false;
 
+  $: ({ table } = $tabularData);
+
   async function handleSave(description: string) {
-    await updateTable($currentDatabase, {
-      oid: $tabularData.table.oid,
-      description,
-    });
+    await updateTable($currentDatabase, { oid: table.oid, description });
   }
 </script>
 
 <div class="update-table-description-property-container">
   <span class="label">{$_('description')}</span>
   <EditableTextWithActions
-    initialValue={$currentTablesData.tablesMap.get($tabularData.id)
-      ?.description ?? ''}
+    initialValue={table.description ?? ''}
     onSubmit={handleSave}
     isLongText
     {disabled}
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
index 2f1c1b817d..1ffb43af18 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
@@ -5,7 +5,6 @@
   import { currentDatabase } from '@mathesar/stores/databases';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import {
-    currentTablesData,
     factoryToGetTableNameValidationErrors,
     updateTable,
   } from '@mathesar/stores/tables';
@@ -14,14 +13,15 @@
 
   export let disabled = false;
 
+  $: ({ table } = $tabularData);
   $: getNameValidationErrors = factoryToGetTableNameValidationErrors(
     $currentDatabase,
-    $tabularData.table,
+    table,
   );
 
   async function handleSubmit(name: string) {
     await updateTable($currentDatabase, {
-      oid: $tabularData.table.oid,
+      oid: table.oid,
       name,
     });
   }
@@ -30,7 +30,7 @@
 <div class="rename-table-property-container">
   <span class="label">{$_('name')}</span>
   <EditableTextWithActions
-    initialValue={$currentTablesData.tablesMap.get($tabularData.id)?.name ?? ''}
+    initialValue={table.name}
     onSubmit={handleSubmit}
     getValidationErrors={$getNameValidationErrors}
     {disabled}
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/links/TableLinks.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/links/TableLinks.svelte
index c359aab5bd..32b49f3406 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/links/TableLinks.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/links/TableLinks.svelte
@@ -8,12 +8,11 @@
 
   const tabularData = getTabularDataStoreFromContext();
 
-  $: tableId = $tabularData.id;
   $: columns = $tabularData.processedColumns;
 </script>
 
 <div>
-  {#await getJoinableTablesResult(tableId)}
+  {#await getJoinableTablesResult($tabularData.table.oid)}
     <Spinner />
   {:then joinableTablesResult}
     <LinksSectionContainer
diff --git a/mathesar_ui/src/utils/date-time/DateTimeSpecification.ts b/mathesar_ui/src/utils/date-time/DateTimeSpecification.ts
index 4c775e0fb4..df8ae49305 100644
--- a/mathesar_ui/src/utils/date-time/DateTimeSpecification.ts
+++ b/mathesar_ui/src/utils/date-time/DateTimeSpecification.ts
@@ -1,7 +1,4 @@
-import type {
-  DateFormat,
-  TimeFormat,
-} from '@mathesar/api/rest/types/tables/columns';
+import type { DateFormat, TimeFormat } from '@mathesar/api/rpc/columns';
 import { dayjs } from '@mathesar-component-library';
 
 interface DateConfig {
diff --git a/mathesar_ui/src/utils/duration/DurationFormatter.ts b/mathesar_ui/src/utils/duration/DurationFormatter.ts
index a9408b4476..7b38a4d6be 100644
--- a/mathesar_ui/src/utils/duration/DurationFormatter.ts
+++ b/mathesar_ui/src/utils/duration/DurationFormatter.ts
@@ -1,6 +1,6 @@
 import type { Duration, DurationUnitType } from 'dayjs/plugin/duration';
 
-import type { DurationUnit } from '@mathesar/api/rest/types/tables/columns';
+import type { DurationUnit } from '@mathesar/api/rpc/columns';
 import { dayjs } from '@mathesar-component-library';
 import type {
   InputFormatter,
diff --git a/mathesar_ui/src/utils/duration/DurationSpecification.ts b/mathesar_ui/src/utils/duration/DurationSpecification.ts
index 8f3cacfe44..c109897b69 100644
--- a/mathesar_ui/src/utils/duration/DurationSpecification.ts
+++ b/mathesar_ui/src/utils/duration/DurationSpecification.ts
@@ -1,14 +1,17 @@
-import type { DurationUnit } from '@mathesar/api/rest/types/tables/columns';
+import {
+  type DurationUnit,
+  allDurationUnits,
+  defaultColumnDisplayOptions,
+} from '@mathesar/api/rpc/columns';
 
 export interface DurationConfig {
   max: DurationUnit;
   min: DurationUnit;
 }
 
-const allUnits: DurationUnit[] = ['d', 'h', 'm', 's', 'ms'];
 const defaults: DurationConfig = {
-  max: 'm',
-  min: 's',
+  max: defaultColumnDisplayOptions.duration_max,
+  min: defaultColumnDisplayOptions.duration_min,
 };
 
 const formattingTokens: Record<DurationUnit, string> = {
@@ -30,18 +33,20 @@ export default class DurationSpecification {
   }
 
   getUnitsInRange(): DurationUnit[] {
-    return allUnits.slice(
-      allUnits.indexOf(this.max),
-      allUnits.indexOf(this.min) + 1,
+    return allDurationUnits.slice(
+      allDurationUnits.indexOf(this.max),
+      allDurationUnits.indexOf(this.min) + 1,
     );
   }
 
   getHigherUnit(unit: DurationUnit): DurationUnit | null {
-    const higherUnit = allUnits[allUnits.indexOf(unit) - 1];
+    const higherUnit = allDurationUnits[allDurationUnits.indexOf(unit) - 1];
     if (!higherUnit) {
       return null;
     }
-    if (allUnits.indexOf(higherUnit) < allUnits.indexOf(this.max)) {
+    if (
+      allDurationUnits.indexOf(higherUnit) < allDurationUnits.indexOf(this.max)
+    ) {
       return null;
     }
     return higherUnit;
@@ -62,7 +67,7 @@ export default class DurationSpecification {
   }
 
   static getAllUnits(): DurationUnit[] {
-    return allUnits;
+    return [...allDurationUnits];
   }
 
   static getDefaults(): DurationConfig {
diff --git a/mathesar_ui/src/utils/objectUtils.ts b/mathesar_ui/src/utils/objectUtils.ts
new file mode 100644
index 0000000000..40dfb9a7ec
--- /dev/null
+++ b/mathesar_ui/src/utils/objectUtils.ts
@@ -0,0 +1,14 @@
+function isObject(obj: unknown): obj is Record<string, unknown> {
+  return obj !== null && typeof obj === 'object';
+}
+
+export function objectsAreDeeplyEqual(a: unknown, b: unknown): boolean {
+  if (!isObject(a) || !isObject(b)) return a === b;
+
+  const aKeys = Object.keys(a);
+  const bKeys = Object.keys(b);
+
+  if (aKeys.length !== bKeys.length) return false;
+
+  return aKeys.every((key) => objectsAreDeeplyEqual(a[key], b[key]));
+}

From 5cd11e0d3e54d5e0cd99a61cc177bd3b1c5aa920 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 30 Jul 2024 17:17:36 +0800
Subject: [PATCH 0520/1141] add metadata to functions for speed, add date
 extractors

---
 db/sql/00_msar.sql | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index e4f740ab97..033224b395 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3239,12 +3239,12 @@ $f$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION msar.format_data(val date) RETURNS text AS $$
 SELECT to_char(val, 'YYYY-MM-DD AD');
-$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE SQL IMMUTABLE RETURNS NULL ON NULL INPUT PARALLEL SAFE;
 
 
 CREATE OR REPLACE FUNCTION msar.format_data(val time without time zone) RETURNS text AS $$
 SELECT concat(to_char(val, 'HH24:MI'), ':', to_char(date_part('seconds', val), 'FM00.0999999999'));
-$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE SQL IMMUTABLE RETURNS NULL ON NULL INPUT PARALLEL SAFE;
 
 
 CREATE OR REPLACE FUNCTION msar.format_data(val time with time zone) RETURNS text AS $$
@@ -3262,7 +3262,7 @@ SELECT CASE
       ltrim(to_char(date_part('timezone_minute', val), '00'), '+- ')
     )
 END;
-$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE SQL IMMUTABLE RETURNS NULL ON NULL INPUT PARALLEL SAFE;
 
 
 CREATE OR REPLACE FUNCTION msar.format_data(val timestamp without time zone) RETURNS text AS $$
@@ -3272,7 +3272,7 @@ SELECT
     ':', to_char(date_part('seconds', val), 'FM00.0999999999'),
     to_char(val, ' BC')
   );
-$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE SQL IMMUTABLE RETURNS NULL ON NULL INPUT PARALLEL SAFE;
 
 
 CREATE OR REPLACE FUNCTION msar.format_data(val timestamp with time zone) RETURNS text AS $$
@@ -3290,19 +3290,19 @@ SELECT CASE
       ':', ltrim(to_char(date_part('timezone_minute', val), '00'), '+- '), to_char(val, ' BC')
     )
 END;
-$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE SQL IMMUTABLE RETURNS NULL ON NULL INPUT PARALLEL SAFE;
 
 
 CREATE OR REPLACE FUNCTION msar.format_data(val interval) returns text AS $$
 SELECT concat(
   to_char(val, 'PFMYYYY"Y"FMMM"M"FMDD"D""T"FMHH24"H"FMMI"M"'), date_part('seconds', val), 'S'
 );
-$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE SQL IMMUTABLE RETURNS NULL ON NULL INPUT PARALLEL SAFE;
 
 
 CREATE OR REPLACE FUNCTION msar.format_data(val anyelement) returns anyelement AS $$
 SELECT val;
-$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE SQL IMMUTABLE RETURNS NULL ON NULL INPUT PARALLEL SAFE;
 
 
 DROP TABLE IF EXISTS msar.expr_templates;
@@ -3327,6 +3327,10 @@ INSERT INTO msar.expr_templates VALUES
   -- json(b) filters and expressions
   ('json_array_length', 'jsonb_array_length((%s)::jsonb)'),
   ('json_array_contains', '(%s)::jsonb @> (%s)::jsonb'),
+  -- date part extractors
+  ('truncate_to_year', 'to_char(%s, ''YYYY'')'),
+  ('truncate_to_month', 'to_char(%s, ''YYYY-MM'')'),
+  ('truncate_to_day', 'to_char(%s, ''YYYY-MM-DD'')'),
   -- URI part getters
   ('uri_scheme', 'mathesar_types.uri_scheme(%s)'),
   ('uri_authority', 'mathesar_types.uri_authority(%s)'),

From b8aed1d147e4a376825bcd1de57f1e7158a44528 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Tue, 30 Jul 2024 15:06:14 +0530
Subject: [PATCH 0521/1141] Fix linting errors

---
 mathesar_ui/src/pages/home/DatabaseRow.svelte   |  2 --
 .../create-database/ConnectDatabaseModal.svelte |  4 +++-
 .../ConnectExistingDatabase.svelte              | 17 +++++++++--------
 .../create-database/ConnectOption.svelte        |  1 -
 .../create-database/CreateNewDatabase.svelte    | 11 ++++++-----
 .../InstallationSchemaSelector.svelte           |  4 ++--
 .../create-database/createDatabaseUtils.ts      |  2 +-
 7 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/mathesar_ui/src/pages/home/DatabaseRow.svelte b/mathesar_ui/src/pages/home/DatabaseRow.svelte
index 133faa3d34..cee5066625 100644
--- a/mathesar_ui/src/pages/home/DatabaseRow.svelte
+++ b/mathesar_ui/src/pages/home/DatabaseRow.svelte
@@ -1,6 +1,4 @@
 <script lang="ts">
-  import { _ } from 'svelte-i18n';
-
   import type { Database } from '@mathesar/api/rpc/databases';
   import { iconConnection } from '@mathesar/icons';
   import { getDatabasePageUrl } from '@mathesar/routes/urls';
diff --git a/mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte b/mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte
index dc540ea4df..aa3adf1d8a 100644
--- a/mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
+
   import type { Database } from '@mathesar/api/rpc/databases';
   import { iconDatabase } from '@mathesar/icons';
   import { getDatabasePageUrl } from '@mathesar/routes/urls';
@@ -8,9 +9,10 @@
     ControlledModal,
     type ModalController,
   } from '@mathesar-component-library';
+
   import ConnectExistingDatabase from './ConnectExistingDatabase.svelte';
-  import CreateNewDatabase from './CreateNewDatabase.svelte';
   import ConnectOption from './ConnectOption.svelte';
+  import CreateNewDatabase from './CreateNewDatabase.svelte';
 
   export let controller: ModalController;
 
diff --git a/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte b/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte
index 51687b0591..756575beb4 100644
--- a/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte
@@ -1,25 +1,26 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
+  import type { Database } from '@mathesar/api/rpc/databases';
   import {
-    portalToWindowFooter,
-    PasswordInput,
-  } from '@mathesar-component-library';
-  import {
-    requiredField,
     FormSubmit,
     makeForm,
+    requiredField,
   } from '@mathesar/components/form';
+  import Field from '@mathesar/components/form/Field.svelte';
   import Form from '@mathesar/components/Form.svelte';
   import FormField from '@mathesar/components/FormField.svelte';
-  import Field from '@mathesar/components/form/Field.svelte';
-  import type { Database } from '@mathesar/api/rpc/databases';
   import { databasesStore } from '@mathesar/stores/databases';
-  import InstallationSchemaSelector from './InstallationSchemaSelector.svelte';
+  import {
+    PasswordInput,
+    portalToWindowFooter,
+  } from '@mathesar-component-library';
+
   import {
     type InstallationSchema,
     getSampleSchemasFromInstallationSchemas,
   } from './createDatabaseUtils';
+  import InstallationSchemaSelector from './InstallationSchemaSelector.svelte';
 
   export let onCancel: () => void;
   export let onSuccess: (db: Database) => void;
diff --git a/mathesar_ui/src/systems/databases/create-database/ConnectOption.svelte b/mathesar_ui/src/systems/databases/create-database/ConnectOption.svelte
index 729f9238b1..9cad5d0f40 100644
--- a/mathesar_ui/src/systems/databases/create-database/ConnectOption.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/ConnectOption.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import { _ } from 'svelte-i18n';
   import { Button, Icon } from '@mathesar-component-library';
   import type { IconProps } from '@mathesar-component-library/types';
 
diff --git a/mathesar_ui/src/systems/databases/create-database/CreateNewDatabase.svelte b/mathesar_ui/src/systems/databases/create-database/CreateNewDatabase.svelte
index ba58f3a2a9..77f89c19ca 100644
--- a/mathesar_ui/src/systems/databases/create-database/CreateNewDatabase.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/CreateNewDatabase.svelte
@@ -1,22 +1,23 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import { portalToWindowFooter } from '@mathesar-component-library';
+  import type { Database } from '@mathesar/api/rpc/databases';
   import {
-    requiredField,
     FormSubmit,
     makeForm,
+    requiredField,
   } from '@mathesar/components/form';
+  import Field from '@mathesar/components/form/Field.svelte';
   import Form from '@mathesar/components/Form.svelte';
   import FormField from '@mathesar/components/FormField.svelte';
-  import Field from '@mathesar/components/form/Field.svelte';
-  import type { Database } from '@mathesar/api/rpc/databases';
   import { databasesStore } from '@mathesar/stores/databases';
-  import InstallationSchemaSelector from './InstallationSchemaSelector.svelte';
+  import { portalToWindowFooter } from '@mathesar-component-library';
+
   import {
     type InstallationSchema,
     getSampleSchemasFromInstallationSchemas,
   } from './createDatabaseUtils';
+  import InstallationSchemaSelector from './InstallationSchemaSelector.svelte';
 
   export let onCancel: () => void;
   export let onSuccess: (db: Database) => void;
diff --git a/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte b/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte
index 833e63678c..276a3cf05c 100644
--- a/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import { CheckboxGroup } from '@mathesar-component-library';
   import {
-    sampleDataOptions,
     type SampleDataSchemaIdentifier,
+    sampleDataOptions,
   } from '@mathesar/api/rpc/database_setup';
   import type { RequiredField } from '@mathesar/components/form/field';
+  import { CheckboxGroup } from '@mathesar-component-library';
 
   type InstallationSchema = SampleDataSchemaIdentifier | 'internal';
   const installationSchemaOptions: InstallationSchema[] = [
diff --git a/mathesar_ui/src/systems/databases/create-database/createDatabaseUtils.ts b/mathesar_ui/src/systems/databases/create-database/createDatabaseUtils.ts
index e9bbef1ec8..8e38255a37 100644
--- a/mathesar_ui/src/systems/databases/create-database/createDatabaseUtils.ts
+++ b/mathesar_ui/src/systems/databases/create-database/createDatabaseUtils.ts
@@ -1,6 +1,6 @@
 import {
-  sampleDataOptions,
   type SampleDataSchemaIdentifier,
+  sampleDataOptions,
 } from '@mathesar/api/rpc/database_setup';
 
 export type InstallationSchema = SampleDataSchemaIdentifier | 'internal';

From 7dbd62b182af666d234977646dd1445debeadb9c Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 30 Jul 2024 19:02:09 +0800
Subject: [PATCH 0522/1141] add first-pass record grouping into record lister

---
 db/sql/00_msar.sql | 79 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 74 insertions(+), 5 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 033224b395..49d9865b2a 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3438,6 +3438,71 @@ SELECT 'ORDER BY ' || msar.build_total_order_expr(tab_id, order_)
 $$ LANGUAGE SQL;
 
 
+CREATE OR REPLACE FUNCTION
+msar.build_grouping_columns_expr(tab_id oid, group_ jsonb) RETURNS TEXT AS $$
+SELECT string_agg(quote_ident(msar.get_column_name(tab_id, col_id::smallint)), ', ')
+FROM jsonb_array_elements_text(group_ -> 'columns') AS col_id
+WHERE has_column_privilege(tab_id, col_id::smallint, 'SELECT')
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.build_group_id_expr(tab_id oid, group_ jsonb) RETURNS TEXT AS $$
+SELECT 'dense_rank() OVER (ORDER BY ' || msar.build_grouping_columns_expr(tab_id, group_) || ')';
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.build_group_count_expr(tab_id oid, group_ jsonb) RETURNS TEXT AS $$
+SELECT 'count(1) OVER (PARTITION BY ' || msar.build_grouping_columns_expr(tab_id, group_) || ')';
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.build_grouping_expr(tab_id oid, group_ jsonb) RETURNS TEXT AS $$
+SELECT concat(
+  COALESCE(msar.build_group_id_expr(tab_id, group_), 'NULL'), ' AS __mathesar_gid, ',
+  COALESCE(msar.build_group_count_expr(tab_id, group_), 'NULL'), ' AS __mathesar_gcount'
+);
+$$ LANGUAGE SQL;
+
+
+CREATE OR REPLACE FUNCTION
+msar.build_results_jsonb_expr(tab_id oid, cte_name text) RETURNS TEXT AS $$
+SELECT 'coalesce(jsonb_agg(json_build_object('
+  || string_agg(format('%1$L, %2$I.%1$I', attnum, cte_name), ', ')
+  || ')), jsonb_build_array())'
+FROM pg_catalog.pg_attribute
+WHERE
+  attrelid = tab_id
+  AND attnum > 0
+  AND NOT attisdropped
+  AND has_column_privilege(attrelid, attnum, 'SELECT');
+$$ LANGUAGE SQL;
+
+
+CREATE OR REPLACE FUNCTION
+msar.build_grouping_results_jsonb_expr(tab_id oid, cte_name text, group_ jsonb) RETURNS TEXT AS $$
+SELECT format(
+  $gj$
+    jsonb_build_object(
+      'groups', jsonb_agg(
+        DISTINCT jsonb_build_object(
+          'gid', %2$I.__mathesar_gid,
+          'gcount', %2$I.__mathesar_gcount,
+          'results_eq', jsonb_build_object(%1$s)
+        )
+      )
+    )
+  $gj$,
+  string_agg(format('%1$L, %2$I.%1$I', col_id, cte_name), ', '),
+  cte_name
+)
+FROM jsonb_array_elements_text(group_ -> 'columns') AS col_id
+WHERE has_column_privilege(tab_id, col_id::smallint, 'SELECT');
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
 CREATE OR REPLACE FUNCTION
 msar.build_selectable_column_expr(tab_id oid) RETURNS text AS $$/*
 Build an SQL select-target expression of only columns to which the user has access.
@@ -3489,15 +3554,16 @@ BEGIN
     $q$
     WITH count_cte AS (
       SELECT count(1) AS count FROM %2$I.%3$I %7$s
-    ), results_cte AS (
-      SELECT %1$s FROM %2$I.%3$I %7$s %6$s LIMIT %4$L OFFSET %5$L
+    ), enriched_results_cte AS (
+      SELECT %1$s, %8$s FROM %2$I.%3$I %7$s %6$s LIMIT %4$L OFFSET %5$L
     )
     SELECT jsonb_build_object(
-      'results', coalesce(jsonb_agg(row_to_json(results_cte.*)), jsonb_build_array()),
+      'results', %9$s,
       'count', coalesce(max(count_cte.count), 0),
+      'grouping', %10$s,
       'query', $iq$SELECT %1$s FROM %2$I.%3$I %7$s %6$s LIMIT %4$L OFFSET %5$L$iq$
     )
-    FROM results_cte, count_cte
+    FROM enriched_results_cte, count_cte
     $q$,
     msar.build_selectable_column_expr(tab_id),
     msar.get_relation_schema_name(tab_id),
@@ -3505,7 +3571,10 @@ BEGIN
     limit_,
     offset_,
     msar.build_order_by_expr(tab_id, order_),
-    msar.build_where_clause(tab_id, filter_)
+    msar.build_where_clause(tab_id, filter_),
+    msar.build_grouping_expr(tab_id, group_),
+    msar.build_results_jsonb_expr(tab_id, 'enriched_results_cte'),
+    COALESCE(msar.build_grouping_results_jsonb_expr(tab_id, 'enriched_results_cte', group_), 'NULL')
   ) INTO records;
   RETURN records;
 END;

From ddec88e9f3bac0992f1397fecdad3fc4cb4f37b6 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Tue, 30 Jul 2024 18:31:22 +0530
Subject: [PATCH 0523/1141] Update text and styling in connection creation
 modal

---
 mathesar_ui/src/i18n/languages/en/dict.json   |  9 ++-
 mathesar_ui/src/pages/home/HomePage.svelte    |  8 +-
 .../ConnectExistingDatabase.svelte            | 73 +++++++++++--------
 .../create-database/CreateNewDatabase.svelte  | 17 ++---
 4 files changed, 58 insertions(+), 49 deletions(-)

diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 14af6872a9..2251eaa1d9 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -10,7 +10,6 @@
   "actions": "Actions",
   "add": "Add",
   "add_columns_to_exploration_empty_message": "This exploration does not contain any columns. Edit the exploration to add columns to it.",
-  "add_connection": "Add Connection",
   "add_database_connection": "Add Database Connection",
   "add_filter": "Add Filter",
   "add_new_filter": "Add New Filter",
@@ -79,6 +78,7 @@
   "confirm_and_create_table": "Confirm & create table",
   "confirm_delete_table": "To confirm the deletion of the [tableName] table, please enter the table name into the input field below.",
   "confirm_password": "Confirm Password",
+  "connect_database": "Connect Database",
   "connect_existing_database": "Connect to an Existing Database",
   "connect_with_community_help": "Connect with Mathesar users and contributors in our community chat. Share ideas, get help, and contribute to discussions.",
   "connection_added_successfully": "The connection has been successfully added.",
@@ -107,6 +107,7 @@
   "count_records_deleted_successfully": "{count, plural, one {{count} record deleted successfully!} other {{count} records deleted successfully!}}",
   "count_tables": "{count, plural, one {{count} table} other {{count} tables}}",
   "create_a_table_by_importing": "Create a table by importing your data",
+  "create_database": "Create Database",
   "create_database_mathesar_internal_server": "Create a new PostgreSQL database on Mathesar's internal server",
   "create_db_if_not_exists": "Create this database if it does not already exist",
   "create_exploration_empty_state_help": "Use Data Explorer to analyze and share your data. Explorations are based on tables in your schema, to get started choose a table and start adding columns and transformations.",
@@ -281,6 +282,7 @@
   "loading_release_data": "Loading release data",
   "loading_spinner_no_progress_bar": "You will see a loading spinner but no progress bar.",
   "log_out": "Log Out",
+  "make_sure_database_exists": "Make sure this database already exists.",
   "manage_connections": "Manage Connections",
   "manage_database_access": "Manage [databaseName] Database Access",
   "manage_schema_access": "Manage [databaseName] Schema Access",
@@ -446,7 +448,7 @@
   "schemas": "Schemas",
   "schemas_matching_search": "{count, plural, one {{count} schema matches [searchValue]} other {{count} schemas match [searchValue]}}",
   "schemas_to_install": "Schemas to install",
-  "search_database_connections": "Search Database Connections",
+  "search_databases": "Search Databases",
   "search_explorations": "Search Explorations",
   "search_schemas": "Search Schemas",
   "search_tables": "Search Tables",
@@ -521,7 +523,6 @@
   "template_type": "Template type",
   "ten_best_matches_shown": "The 10 best matches are shown. Continue filtering to see more.",
   "the_credentials_will_be_copied_from_this_connection": "The username, password, host, and port will be copied from this connection.",
-  "this_database_must_exist_already": "This database must exist already.",
   "this_will_remove_following_columns": "This will remove the following column(s):",
   "this_will_remove_following_transformations": "This will remove the following transformation(s):",
   "time_to_create_exploration": "It's time to use your tables. Create your first exploration.",
@@ -563,7 +564,7 @@
   "use_text_for_all_columns": "Use \"Text\" for all column data types",
   "user": "User",
   "user_name": "User name",
-  "user_needs_create_connect_privileges": "The user will need to have CONNECT and CREATE privileges.",
+  "user_needs_create_connect_privileges": "The user needs CONNECT and CREATE privileges on the database.",
   "user_not_found": "User not found",
   "user_profile": "User Profile",
   "user_type": "User type",
diff --git a/mathesar_ui/src/pages/home/HomePage.svelte b/mathesar_ui/src/pages/home/HomePage.svelte
index 43f29d31dc..07a7fd0681 100644
--- a/mathesar_ui/src/pages/home/HomePage.svelte
+++ b/mathesar_ui/src/pages/home/HomePage.svelte
@@ -4,7 +4,7 @@
   import type { Database } from '@mathesar/api/rpc/databases';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
-  import { iconAddNew } from '@mathesar/icons';
+  import { iconConnection } from '@mathesar/icons';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { databasesStore } from '@mathesar/stores/databases';
@@ -65,7 +65,7 @@
       <DatabasesEmptyState />
     {:else}
       <EntityContainerWithFilterBar
-        searchPlaceholder={$_('search_database_connections')}
+        searchPlaceholder={$_('search_databases')}
         bind:searchQuery={filterQuery}
         on:clear={handleClearFilterQuery}
       >
@@ -75,8 +75,8 @@
               appearance="primary"
               on:click={() => connectDbModalController.open()}
             >
-              <Icon {...iconAddNew} />
-              <span>{$_('add_database_connection')}</span>
+              <Icon {...iconConnection} />
+              <span>{$_('connect_database')}</span>
             </Button>
           {/if}
         </svelte:fragment>
diff --git a/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte b/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte
index 756575beb4..fe727adcf0 100644
--- a/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte
@@ -3,15 +3,15 @@
 
   import type { Database } from '@mathesar/api/rpc/databases';
   import {
+    FieldLayout,
     FormSubmit,
     makeForm,
     requiredField,
   } from '@mathesar/components/form';
   import Field from '@mathesar/components/form/Field.svelte';
-  import Form from '@mathesar/components/Form.svelte';
-  import FormField from '@mathesar/components/FormField.svelte';
   import { databasesStore } from '@mathesar/stores/databases';
   import {
+    NumberInput,
     PasswordInput,
     portalToWindowFooter,
   } from '@mathesar-component-library';
@@ -47,37 +47,41 @@
   }
 </script>
 
-<div class="create-db-form">
-  <Form>
-    <FormField>
+<div class="connect-db-form">
+  <div class="field-group-horizontal">
+    <div>
       <Field label={$_('host')} layout="stacked" field={host} />
-    </FormField>
-
-    <FormField>
-      <Field label={$_('port')} layout="stacked" field={port} />
-    </FormField>
-
-    <FormField>
-      <Field label={$_('name')} layout="stacked" field={databaseName} />
-    </FormField>
-
-    <FormField>
-      <Field label={$_('username')} layout="stacked" field={role} />
-    </FormField>
-
-    <FormField>
+    </div>
+    <div>
       <Field
-        label={$_('password')}
+        label={$_('port')}
         layout="stacked"
-        field={password}
-        input={{ component: PasswordInput }}
+        field={port}
+        input={{ component: NumberInput }}
       />
-    </FormField>
-
-    <FormField>
-      <InstallationSchemaSelector {installationSchemas} />
-    </FormField>
-  </Form>
+    </div>
+  </div>
+  <Field
+    label={$_('database_name')}
+    layout="stacked"
+    field={databaseName}
+    help={$_('make_sure_database_exists')}
+  />
+  <Field
+    label={$_('username')}
+    layout="stacked"
+    field={role}
+    help={$_('user_needs_create_connect_privileges')}
+  />
+  <Field
+    label={$_('password')}
+    layout="stacked"
+    field={password}
+    input={{ component: PasswordInput }}
+  />
+  <FieldLayout>
+    <InstallationSchemaSelector {installationSchemas} />
+  </FieldLayout>
 
   <div use:portalToWindowFooter class="footer">
     <FormSubmit
@@ -85,8 +89,17 @@
       catchErrors
       {onCancel}
       onProceed={createDatabase}
-      proceedButton={{ label: $_('add_connection') }}
+      proceedButton={{ label: $_('connect_database') }}
       cancelButton={{ label: $_('cancel') }}
     />
   </div>
 </div>
+
+<style>
+  .field-group-horizontal {
+    display: grid;
+    grid-template-columns: 3fr 1fr;
+    gap: 1rem;
+    margin-bottom: 1rem;
+  }
+</style>
diff --git a/mathesar_ui/src/systems/databases/create-database/CreateNewDatabase.svelte b/mathesar_ui/src/systems/databases/create-database/CreateNewDatabase.svelte
index 77f89c19ca..48df6d0a25 100644
--- a/mathesar_ui/src/systems/databases/create-database/CreateNewDatabase.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/CreateNewDatabase.svelte
@@ -3,13 +3,12 @@
 
   import type { Database } from '@mathesar/api/rpc/databases';
   import {
+    FieldLayout,
     FormSubmit,
     makeForm,
     requiredField,
   } from '@mathesar/components/form';
   import Field from '@mathesar/components/form/Field.svelte';
-  import Form from '@mathesar/components/Form.svelte';
-  import FormField from '@mathesar/components/FormField.svelte';
   import { databasesStore } from '@mathesar/stores/databases';
   import { portalToWindowFooter } from '@mathesar-component-library';
 
@@ -37,15 +36,11 @@
 </script>
 
 <div class="create-db-form">
-  <Form>
-    <FormField>
-      <Field label={$_('name')} layout="stacked" field={databaseName} />
-    </FormField>
+  <Field label={$_('database_name')} layout="stacked" field={databaseName} />
 
-    <FormField>
-      <InstallationSchemaSelector {installationSchemas} />
-    </FormField>
-  </Form>
+  <FieldLayout>
+    <InstallationSchemaSelector {installationSchemas} />
+  </FieldLayout>
 
   <div use:portalToWindowFooter class="footer">
     <FormSubmit
@@ -53,7 +48,7 @@
       catchErrors
       {onCancel}
       onProceed={createDatabase}
-      proceedButton={{ label: $_('add_connection') }}
+      proceedButton={{ label: $_('create_database') }}
       cancelButton={{ label: $_('cancel') }}
     />
   </div>

From 19e52dbd81728ae97f780197648c4ccbdbc4b6a5 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 30 Jul 2024 19:33:01 +0530
Subject: [PATCH 0524/1141] enrich exploration response with column metadata

---
 mathesar/utils/explorations.py | 129 ++++++++++++++++++++++-----------
 1 file changed, 85 insertions(+), 44 deletions(-)

diff --git a/mathesar/utils/explorations.py b/mathesar/utils/explorations.py
index f5a9e9ca22..1ace2b5339 100644
--- a/mathesar/utils/explorations.py
+++ b/mathesar/utils/explorations.py
@@ -1,6 +1,11 @@
-from mathesar.models.base import Explorations
-from db.queries.base import DBQuery, InitialColumn, JoinParameter
 from db.engine import create_future_engine_with_custom_types
+from db.records.operations.group import GroupBy
+from db.records.operations.select import get_count
+from db.queries.base import DBQuery, InitialColumn, JoinParameter
+from db.tables.operations.select import get_table
+from mathesar.api.utils import process_annotated_records
+from mathesar.models.base import Explorations, ColumnMetaData
+from mathesar.rpc.columns.metadata import ColumnMetaDataRecord
 from mathesar.state import get_cached_metadata
 
 
@@ -12,7 +17,7 @@ def delete_exploration(exploration_id):
     Explorations.objects.get(id=exploration_id).delete()
 
 
-def run_exploration(exploration_def, conn):
+def run_exploration(exploration_def, database_id, conn):
     engine = create_future_engine_with_custom_types(
         conn.info.user,
         conn.info.password,
@@ -20,7 +25,10 @@ def run_exploration(exploration_def, conn):
         conn.info.dbname,
         conn.info.port
     )
+    metadata = get_cached_metadata()
+    base_table_oid = exploration_def["base_table_oid"]
     initial_columns = exploration_def.get('initial_columns')
+    params = exploration_def.get('parameters', {})
     processed_initial_columns = []
     for column in initial_columns:
         jp_path = column.get("join_path")
@@ -35,57 +43,90 @@ def run_exploration(exploration_def, conn):
             ]
         processed_initial_columns.append(
             InitialColumn(
-                reloid=column["table_oid"],
+                reloid=jp_path[-1][-1][0] if jp_path else base_table_oid,
                 attnum=column["attnum"],
                 alias=column["alias"],
-                jp_path=join_path
+                jp_path=join_path if jp_path else None
             )
         )
     db_query = DBQuery(
-        base_table_oid=exploration_def["base_table_oid"],
+        base_table_oid=base_table_oid,
         initial_columns=processed_initial_columns,
         engine=engine,
         transformations=exploration_def.get("transformations", []),
         name=None,
-        metadata=get_cached_metadata()
+        metadata=metadata
+    )
+    records = db_query.get_records(
+        limit=params.get('limit', 100),
+        offset=params.get('offset', 0),
+        filter=params.get('filter', None),
+        order_by=params.get('order_by', []),
+        group_by=GroupBy(**params.get('grouping')) if params.get('grouping', None) else None,
+        search=params.get('search', []),
+        duplicate_only=params.get('duplicate_only', None)
     )
+    processed_records = process_annotated_records(records)[0]
+    with conn:
+        column_metadata = _get_exploration_column_metadata(
+            exploration_def,
+            processed_initial_columns,
+            database_id,
+            db_query,
+            conn,
+            engine,
+            metadata
+        )
     return {
-        "query": (),
-        "records": db_query.get_records(),
-        "output_columns": (),
-        "column_metadata": (),
-        "parameters": {},
+        "query": exploration_def,
+        "records": {
+            "count": get_count(
+                table=db_query.transformed_relation,
+                engine=engine,
+                filter=params.get('filter', None)
+            ),
+            "grouping": None,
+            "preview_data": None,
+            "results": processed_records
+        },
+        "output_columns": tuple(sa_col.name for sa_col in db_query.sa_output_columns),
+        "column_metadata": column_metadata,
+        "parameters": params,
     }
 
-# {
-#     "base_table": 7,
-#     "initial_columns": [
-#         {
-#             "id": 13,
-#             "alias": "Checkouts_Item"
-#         },
-#         { 
-#             "id": 6,
-#             "alias": "Books_Page Count",
-#             "join_path": [
-#                 [
-#                     13,
-#                     29
-#                 ],
-#                 [
-#                     20,
-#                     27
-#                 ]
-#             ]
-#         }
-#     ],
-#     "transformations": [],
-#     "display_names": {
-#         "Checkouts_Item": "Checkouts_Item",
-#         "Books_Page Count": "Books_Page Count"
-#     },
-#     "parameters": {
-#         "limit": 100,
-#         "offset": 0 
-#     }
-# }
+
+def _get_exploration_column_metadata(
+    exploration_def,
+    processed_initial_columns,
+    database_id,
+    db_query,
+    conn,
+    engine,
+    metadata
+):
+    exploration_column_metadata = {}
+    for alias, sa_col in db_query.all_sa_columns_map.items():
+        initial_column = None
+        for col in processed_initial_columns:
+            if alias == col.alias:
+                initial_column = col
+        column_metadata = ColumnMetaData.objects.filter(
+            database__id=database_id,
+            table_oid=initial_column.reloid,
+            attnum=sa_col.column_attnum
+        ).first() if initial_column else None
+        input_table_name = get_table(initial_column.reloid, conn)["name"] if initial_column else None
+        input_column_name = initial_column.get_name(engine, metadata) if initial_column else None
+        exploration_column_metadata[alias] = {
+            "alias": alias,
+            "display_name": exploration_def["display_names"].get(alias),
+            "type": sa_col.db_type.id,
+            "type_options": sa_col.type_options,
+            "display_options": ColumnMetaDataRecord.from_model(column_metadata) if column_metadata else None,
+            "is_initial_column": True if initial_column else False,
+            "input_column_name": input_column_name,
+            "input_table_name": input_table_name,
+            "input_table_id": initial_column.reloid if initial_column else None,
+            "input_alias": db_query.get_input_alias_for_output_alias(alias)
+        }
+    return exploration_column_metadata

From efcad5f10bb697c26c61cd3a48d1b3485b0e74e4 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 30 Jul 2024 19:34:37 +0530
Subject: [PATCH 0525/1141] remove grouping and preview_data keys from response

---
 mathesar/utils/explorations.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mathesar/utils/explorations.py b/mathesar/utils/explorations.py
index 1ace2b5339..c42601378f 100644
--- a/mathesar/utils/explorations.py
+++ b/mathesar/utils/explorations.py
@@ -85,8 +85,6 @@ def run_exploration(exploration_def, database_id, conn):
                 engine=engine,
                 filter=params.get('filter', None)
             ),
-            "grouping": None,
-            "preview_data": None,
             "results": processed_records
         },
         "output_columns": tuple(sa_col.name for sa_col in db_query.sa_output_columns),

From e9e126edb0f830507ffc598c41576a2f07484353 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 30 Jul 2024 19:37:14 +0530
Subject: [PATCH 0526/1141] revert sql changes

---
 db/sql/00_msar.sql | 78 ----------------------------------------------
 1 file changed, 78 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 2c2ffd272c..aefcc77617 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3496,81 +3496,3 @@ BEGIN
   RETURN records;
 END;
 $$ LANGUAGE plpgsql;
-
-
-CREATE OR REPLACE FUNCTION
-msar.list_records_from_exploration(
-  exploration jsonb
-) RETURNS jsonb AS $$
-DECLARE
-  records jsonb;
-  base_table_oid bigint;
-  columns jsonb;
-  sel text;
-BEGIN
-  base_table_oid := exploration->'base_table_oid';
-  columns := exploration->'initial_columns';
-  sel := build_selectable_for_explorations(base_table_oid, columns);
-END;
-$$ LANGUAGE plpgsql;
-
-
-CREATE OR REPLACE FUNCTION
-msar.build_selectable_for_explorations(
-  base_table_oid bigint,
-  columns jsonb
-) RETURNS text AS $$
-DECLARE
-  sel text;
-BEGIN
-  WITH col_cte AS (
-    SELECT (x->>'id')::smallint AS id, x->>'alias' AS alias, x->'join_path' AS jp FROM jsonb_array_elements('[{"id": 2, "alias": "abcd"},{"id": 5, "alias":"efgh", "join_path":[[[2254329, 2], [2254334, 1]],[[2254334, 5], [2254321, 1]]]}]'::jsonb) WITH ORDINALITY AS j(x, idx)
-  ), jp_cte AS (
-    SELECT
-    (col#>>'{0,0}')::oid AS lt_oid,
-    (col#>>'{0,1}')::smallint AS lt_attnum,
-    (col#>>'{1,0}')::oid AS rt_oid,
-    (col#>>'{1,1}')::smallint AS rt_attnum
-    FROM (SELECT jsonb_array_elements(jp) FROM col_cte) AS y(col)
-  ), sel_base_cte AS (
-    SELECT 
-    CASE 
-      WHEN col_cte.jp IS NULL
-      AND has_column_privilege(2254329, col_cte.id, 'SELECT')
-    THEN
-      format('msar.format_data(%I) AS %I', msar.get_column_name(2254329, col_cte.id), col_cte.alias)
-    END as base_sel
-    FROM col_cte
-  ), join_text_cte AS (
-    SELECT 
-    CASE 
-      WHEN col_cte.jp IS NOT NULL
-      AND has_column_privilege((col_cte.jp#>>'{-1,-1,0}')::oid, col_cte.id, 'SELECT')
-      AND has_column_privilege(lt_oid, lt_attnum, 'SELECT')
-      AND has_column_privilege(rt_oid, rt_attnum, 'SELECT') 
-    THEN
-      jsonb_build_object(
-        'join_sel',
-        format(
-          'msar.format_data(%I.%I) AS %I',
-          col_cte.jp#>>'{-1,-1,0}',
-          col_cte.id,
-          col_cte.alias
-        ),
-        'join_text',
-        format(
-          'LEFT OUTER JOIN %I.%I AS %I ON %I.%I=%I.%I',
-          msar.get_relation_schema_name(rt_oid),
-          msar.get_relation_name(rt_oid),
-          rt_oid,
-          lt_oid,
-          msar.get_column_name(lt_oid, lt_attnum),
-          rt_oid,
-          msar.get_column_name(rt_oid, rt_attnum)
-        )
-      )
-    END AS joins
-    FROM jp_cte, col_cte
-  ) SELECT distinct *, joins->>'join_sel', joins->>'join_text' FROM join_text_cte, sel_base_cte;
-END;
-$$ LANGUAGE plpgsql;

From e490df776157b9177c4b2fe9cabd43f138545596 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 30 Jul 2024 11:33:02 -0400
Subject: [PATCH 0527/1141] Transition frontend to use RPC API for
 constraints.list

---
 .../src/api/rest/types/tables/constraints.ts  |  40 -------
 mathesar_ui/src/api/rpc/constraints.ts        |  86 +++++++++++++++
 mathesar_ui/src/api/rpc/index.ts              |   2 +
 .../data-types/components/typeDefinitions.ts  |   2 +-
 mathesar_ui/src/components/column/types.ts    |   2 +-
 .../filter-entry/FilterEntry.svelte           |   2 +-
 .../src/components/filter-entry/utils.ts      |   2 +-
 .../components/group-entry/GroupEntry.svelte  |   2 +-
 .../components/sort-entry/SortEntry.svelte    |   2 +-
 .../src/stores/table-data/TableStructure.ts   |   7 +-
 mathesar_ui/src/stores/table-data/columns.ts  |   6 +-
 .../src/stores/table-data/constraints.ts      | 102 +++++++-----------
 .../src/stores/table-data/constraintsUtils.ts |   5 +-
 mathesar_ui/src/stores/table-data/index.ts    |   6 +-
 .../src/stores/table-data/processedColumns.ts |   4 +-
 .../src/stores/table-data/tabularData.ts      |   5 +-
 .../ConstraintCollapseHeader.svelte           |   2 +-
 .../constraints/ConstraintDetails.svelte      |   2 +-
 .../constraints/ConstraintTypeSection.svelte  |  10 +-
 .../ForeignKeyConstraintDetails.svelte        |   6 +-
 .../constraints/NewFkConstraint.svelte        |   6 +-
 .../constraints/NewUniqueConstraint.svelte    |   2 +-
 .../constraints/TableConstraints.svelte       |  10 +-
 .../ColumnHeaderContextMenu.svelte            |   2 +-
 .../link-table/LinkTableForm.svelte           |   2 +-
 .../row/GroupHeaderCellValue.svelte           |   2 +-
 .../src/systems/table-view/row/RowCell.svelte |   2 +-
 .../table-inspector/column/ColumnMode.svelte  |   2 +-
 .../column/ColumnTypeSpecifierTag.svelte      |   2 +-
 .../columnExtractionTypes.ts                  |   2 +-
 .../columnExtractionUtils.ts                  |   5 +-
 31 files changed, 174 insertions(+), 158 deletions(-)
 delete mode 100644 mathesar_ui/src/api/rest/types/tables/constraints.ts
 create mode 100644 mathesar_ui/src/api/rpc/constraints.ts

diff --git a/mathesar_ui/src/api/rest/types/tables/constraints.ts b/mathesar_ui/src/api/rest/types/tables/constraints.ts
deleted file mode 100644
index 490b62163f..0000000000
--- a/mathesar_ui/src/api/rest/types/tables/constraints.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-export interface BaseConstraint {
-  id: number;
-  name: string;
-  /**
-   * Each number is a column id.
-   */
-  columns: number[];
-}
-
-export interface BasicConstraint extends BaseConstraint {
-  type: 'primary' | 'unique' | 'check' | 'exclude';
-}
-
-export interface FkConstraint extends BaseConstraint {
-  type: 'foreignkey';
-  /** The ids of the columns in the table which this FK references */
-  referent_columns: number[];
-  /** The id of the table which this FK references */
-  referent_table: number;
-  onupdate:
-    | 'RESTRICT'
-    | 'CASCADE'
-    | 'SET NULL'
-    | 'NO ACTION'
-    | 'SET DEFAULT'
-    | null;
-  ondelete:
-    | 'RESTRICT'
-    | 'CASCADE'
-    | 'SET NULL'
-    | 'NO ACTION'
-    | 'SET DEFAULT'
-    | null;
-  deferrable: boolean | null;
-  match: 'SIMPLE' | 'PARTIAL' | 'FULL' | null;
-}
-
-export type Constraint = BasicConstraint | FkConstraint;
-
-export type ConstraintType = Constraint['type'];
diff --git a/mathesar_ui/src/api/rpc/constraints.ts b/mathesar_ui/src/api/rpc/constraints.ts
new file mode 100644
index 0000000000..5c6aa2ee36
--- /dev/null
+++ b/mathesar_ui/src/api/rpc/constraints.ts
@@ -0,0 +1,86 @@
+import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
+
+interface BaseConstraint {
+  oid: number;
+  name: string;
+  /** Each number is a column attnum */
+  columns: number[];
+}
+
+export interface PkConstraint extends BaseConstraint {
+  type: 'primary';
+}
+
+export interface UniqueConstraint extends BaseConstraint {
+  type: 'unique';
+}
+
+export interface FkConstraint extends BaseConstraint {
+  type: 'foreignkey';
+  /** The ids of the columns in the table which this FK references */
+  referent_columns: number[];
+  /** The id of the table which this FK references */
+  referent_table_oid: number;
+}
+
+export interface CheckConstraint extends BaseConstraint {
+  type: 'check';
+}
+
+export interface ExcludeConstraint extends BaseConstraint {
+  type: 'exclude';
+}
+
+export type Constraint =
+  | PkConstraint
+  | UniqueConstraint
+  | FkConstraint
+  | CheckConstraint
+  | ExcludeConstraint;
+
+export type ConstraintType = Constraint['type'];
+
+export interface UniqueConstraintRecipe {
+  type: 'u';
+  name?: string | null;
+  /** Values are column attnums */
+  columns: number[];
+}
+
+export interface FkConstraintRecipe {
+  type: 'f';
+  name?: string | null;
+  columns: number[];
+  fkey_relation_id: number;
+  fkey_columns: number[];
+}
+
+export type ConstraintRecipe = UniqueConstraintRecipe | FkConstraintRecipe;
+
+export const constraints = {
+  list: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      table_oid: number;
+    },
+    Constraint[]
+  >(),
+
+  add: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      table_oid: number;
+      constraint_def_list: ConstraintRecipe[];
+    },
+    void
+  >(),
+
+  delete: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      table_oid: number;
+      constraint_oid: number;
+    },
+    void
+  >(),
+};
diff --git a/mathesar_ui/src/api/rpc/index.ts b/mathesar_ui/src/api/rpc/index.ts
index 4a0a5a9697..af5c4b1243 100644
--- a/mathesar_ui/src/api/rpc/index.ts
+++ b/mathesar_ui/src/api/rpc/index.ts
@@ -4,6 +4,7 @@ import { buildRpcApi } from '@mathesar/packages/json-rpc-client-builder';
 
 import { columns } from './columns';
 import { configured_roles } from './configured_roles';
+import { constraints } from './constraints';
 import { database_setup } from './database_setup';
 import { databases } from './databases';
 import { schemas } from './schemas';
@@ -22,5 +23,6 @@ export const api = buildRpcApi({
     servers,
     tables,
     columns,
+    constraints,
   },
 });
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts b/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts
index 2c07cdac98..e32705b26c 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts
@@ -1,5 +1,5 @@
-import type { FkConstraint } from '@mathesar/api/rest/types/tables/constraints';
 import type { Column } from '@mathesar/api/rpc/columns';
+import type { FkConstraint } from '@mathesar/api/rpc/constraints';
 import type { DBObjectEntry } from '@mathesar/AppTypes';
 import type { DateTimeFormatter } from '@mathesar/utils/date-time/types';
 import type {
diff --git a/mathesar_ui/src/components/column/types.ts b/mathesar_ui/src/components/column/types.ts
index 2b5d4023cb..b7e2140cbd 100644
--- a/mathesar_ui/src/components/column/types.ts
+++ b/mathesar_ui/src/components/column/types.ts
@@ -1,4 +1,4 @@
-import type { ConstraintType } from '@mathesar/api/rest/types/tables/constraints';
+import type { ConstraintType } from '@mathesar/api/rpc/constraints';
 import type { CellColumnLike } from '@mathesar/components/cell-fabric/data-types/typeDefinitions';
 
 // Since the ColumnName component is being used
diff --git a/mathesar_ui/src/components/filter-entry/FilterEntry.svelte b/mathesar_ui/src/components/filter-entry/FilterEntry.svelte
index a3d64c2743..74494a5fa0 100644
--- a/mathesar_ui/src/components/filter-entry/FilterEntry.svelte
+++ b/mathesar_ui/src/components/filter-entry/FilterEntry.svelte
@@ -2,7 +2,7 @@
   import { createEventDispatcher, onDestroy } from 'svelte';
   import { readable } from 'svelte/store';
 
-  import type { ConstraintType } from '@mathesar/api/rest/types/tables/constraints';
+  import type { ConstraintType } from '@mathesar/api/rpc/constraints';
   import DynamicInput from '@mathesar/components/cell-fabric/DynamicInput.svelte';
   import { getDbTypeBasedInputCap } from '@mathesar/components/cell-fabric/utils';
   import ColumnName from '@mathesar/components/column/ColumnName.svelte';
diff --git a/mathesar_ui/src/components/filter-entry/utils.ts b/mathesar_ui/src/components/filter-entry/utils.ts
index 179018cf85..90c48a8b64 100644
--- a/mathesar_ui/src/components/filter-entry/utils.ts
+++ b/mathesar_ui/src/components/filter-entry/utils.ts
@@ -1,4 +1,4 @@
-import type { FkConstraint } from '@mathesar/api/rest/types/tables/constraints';
+import type { FkConstraint } from '@mathesar/api/rpc/constraints';
 import {
   getEqualityFiltersForAbstractType,
   getFiltersForAbstractType,
diff --git a/mathesar_ui/src/components/group-entry/GroupEntry.svelte b/mathesar_ui/src/components/group-entry/GroupEntry.svelte
index b86e28fd9d..f852cd3c9e 100644
--- a/mathesar_ui/src/components/group-entry/GroupEntry.svelte
+++ b/mathesar_ui/src/components/group-entry/GroupEntry.svelte
@@ -2,7 +2,7 @@
   import { createEventDispatcher, tick } from 'svelte';
   import { _ } from 'svelte-i18n';
 
-  import type { ConstraintType } from '@mathesar/api/rest/types/tables/constraints';
+  import type { ConstraintType } from '@mathesar/api/rpc/constraints';
   import ColumnName from '@mathesar/components/column/ColumnName.svelte';
   import { iconDeleteMajor } from '@mathesar/icons';
   import type { ReadableMapLike } from '@mathesar/typeUtils';
diff --git a/mathesar_ui/src/components/sort-entry/SortEntry.svelte b/mathesar_ui/src/components/sort-entry/SortEntry.svelte
index 485d4931a7..4f872694e0 100644
--- a/mathesar_ui/src/components/sort-entry/SortEntry.svelte
+++ b/mathesar_ui/src/components/sort-entry/SortEntry.svelte
@@ -2,7 +2,7 @@
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
 
-  import type { ConstraintType } from '@mathesar/api/rest/types/tables/constraints';
+  import type { ConstraintType } from '@mathesar/api/rpc/constraints';
   import ColumnName from '@mathesar/components/column/ColumnName.svelte';
   import { iconDeleteMajor } from '@mathesar/icons';
   import type { ReadableMapLike } from '@mathesar/typeUtils';
diff --git a/mathesar_ui/src/stores/table-data/TableStructure.ts b/mathesar_ui/src/stores/table-data/TableStructure.ts
index 12444c7fa6..72d95070c3 100644
--- a/mathesar_ui/src/stores/table-data/TableStructure.ts
+++ b/mathesar_ui/src/stores/table-data/TableStructure.ts
@@ -33,11 +33,8 @@ export class TableStructure {
 
   constructor(props: TableStructureProps) {
     this.oid = props.table.oid;
-    this.columnsDataStore = new ColumnsDataStore({
-      database: props.database,
-      tableOid: this.oid,
-    });
-    this.constraintsDataStore = new ConstraintsDataStore({ tableId: this.oid });
+    this.columnsDataStore = new ColumnsDataStore(props);
+    this.constraintsDataStore = new ConstraintsDataStore(props);
     this.processedColumns = derived(
       [this.columnsDataStore.columns, this.constraintsDataStore],
       ([columns, constraintsData]) =>
diff --git a/mathesar_ui/src/stores/table-data/columns.ts b/mathesar_ui/src/stores/table-data/columns.ts
index 58b9bdfdc8..9e7530002b 100644
--- a/mathesar_ui/src/stores/table-data/columns.ts
+++ b/mathesar_ui/src/stores/table-data/columns.ts
@@ -45,18 +45,18 @@ export class ColumnsDataStore extends EventHandler<{
 
   constructor({
     database,
-    tableOid,
+    table,
     hiddenColumns,
     shareConsumer,
   }: {
     database: Pick<Database, 'id'>;
-    tableOid: Table['oid'];
+    table: Pick<Table, 'oid'>;
     /** Values are column ids */
     hiddenColumns?: Iterable<number>;
     shareConsumer?: ShareConsumer;
   }) {
     super();
-    this.apiContext = { database_id: database.id, table_oid: tableOid };
+    this.apiContext = { database_id: database.id, table_oid: table.oid };
     this.shareConsumer = shareConsumer;
     this.hiddenColumns = new WritableSet(hiddenColumns);
     this.columns = derived(
diff --git a/mathesar_ui/src/stores/table-data/constraints.ts b/mathesar_ui/src/stores/table-data/constraints.ts
index 64b9a05a7b..0542009b3a 100644
--- a/mathesar_ui/src/stores/table-data/constraints.ts
+++ b/mathesar_ui/src/stores/table-data/constraints.ts
@@ -7,31 +7,18 @@ import type {
 } from 'svelte/store';
 import { derived, get as getStoreValue, writable } from 'svelte/store';
 
-import type { Constraint as ApiConstraint } from '@mathesar/api/rest/types/tables/constraints';
-import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
-import {
-  States,
-  addQueryParamsToUrl,
-  deleteAPI,
-  getAPI,
-  postAPI,
-} from '@mathesar/api/rest/utils/requestUtils';
+import { States } from '@mathesar/api/rest/utils/requestUtils';
+import { api } from '@mathesar/api/rpc';
 import type { Column } from '@mathesar/api/rpc/columns';
+import type {
+  Constraint,
+  ConstraintRecipe,
+} from '@mathesar/api/rpc/constraints';
+import type { Database } from '@mathesar/api/rpc/databases';
 import type { Table } from '@mathesar/api/rpc/tables';
 import type { ShareConsumer } from '@mathesar/utils/shares';
 import type { CancellablePromise } from '@mathesar-component-library';
 
-/**
- * When representing a constraint on the front end, we directly use the object
- * schema from the API.
- *
- * In https://github.com/centerofci/mathesar/pull/776#issuecomment-963514261 we
- * had some discussion about converting the `columns` field to a Set instead of
- * an Array, but we chose to keep it as an Array because we didn't need the
- * performance gains from a Set here.
- */
-export type Constraint = ApiConstraint;
-
 export interface ConstraintsData {
   state: States;
   error?: string;
@@ -74,31 +61,15 @@ function uniqueColumns(
   );
 }
 
-function api(url: string) {
-  return {
-    get(queryParams: Record<string, unknown>) {
-      const requestUrl = addQueryParamsToUrl(url, queryParams);
-      return getAPI<PaginatedResponse<Constraint>>(requestUrl);
-    },
-    add(constraintDetails: Partial<Constraint>) {
-      return postAPI<Partial<Constraint>>(url, constraintDetails);
-    },
-    remove(constraintId: Constraint['id']) {
-      return deleteAPI(`${url}${constraintId}/`);
-    },
-  };
-}
-
 export class ConstraintsDataStore implements Writable<ConstraintsData> {
-  private tableId: Table['oid'];
+  private apiContext: {
+    database_id: number;
+    table_oid: Table['oid'];
+  };
 
   private store: Writable<ConstraintsData>;
 
-  private promise:
-    | CancellablePromise<PaginatedResponse<ApiConstraint>>
-    | undefined;
-
-  private api: ReturnType<typeof api>;
+  private promise: CancellablePromise<Constraint[]> | undefined;
 
   readonly shareConsumer?: ShareConsumer;
 
@@ -112,20 +83,21 @@ export class ConstraintsDataStore implements Writable<ConstraintsData> {
   uniqueColumns: Readable<Set<number>>;
 
   constructor({
-    tableId,
+    database,
+    table,
     shareConsumer,
   }: {
-    tableId: Table['oid'];
+    database: Pick<Database, 'id'>;
+    table: Pick<Table, 'oid'>;
     shareConsumer?: ShareConsumer;
   }) {
-    this.tableId = tableId;
+    this.apiContext = { database_id: database.id, table_oid: table.oid };
     this.shareConsumer = shareConsumer;
     this.store = writable({
       state: States.Loading,
       constraints: [],
     });
     this.uniqueColumns = uniqueColumns(this.store);
-    this.api = api(`/api/db/v0/tables/${this.tableId}/constraints/`);
     void this.fetch();
   }
 
@@ -153,17 +125,18 @@ export class ConstraintsDataStore implements Writable<ConstraintsData> {
 
     try {
       this.promise?.cancel();
-      this.promise = this.api.get({
-        limit: 500,
-        ...this.shareConsumer?.getQueryParams(),
-      });
 
-      const response = await this.promise;
+      // TODO_BETA Do we need shareConsumer here? Previously we had been
+      // passing:
+      //
+      // ```
+      // ...this.shareConsumer?.getQueryParams()
+      // ```
+      this.promise = api.constraints.list(this.apiContext).run();
+
+      const constraints = await this.promise;
 
-      const storeData: ConstraintsData = {
-        state: States.Done,
-        constraints: response.results,
-      };
+      const storeData: ConstraintsData = { state: States.Done, constraints };
       this.set(storeData);
       return storeData;
     } catch (err) {
@@ -178,16 +151,17 @@ export class ConstraintsDataStore implements Writable<ConstraintsData> {
     return undefined;
   }
 
-  async add(
-    constraintDetails: Partial<Constraint>,
-  ): Promise<Partial<Constraint>> {
-    const constraint = await this.api.add(constraintDetails);
+  async add(recipe: ConstraintRecipe): Promise<void> {
+    await api.constraints
+      .add({ ...this.apiContext, constraint_def_list: [recipe] })
+      .run();
     await this.fetch();
-    return constraint;
   }
 
   async remove(constraintId: number): Promise<void> {
-    await this.api.remove(constraintId);
+    await api.constraints
+      .delete({ ...this.apiContext, constraint_oid: constraintId })
+      .run();
     await this.fetch();
   }
 
@@ -209,7 +183,7 @@ export class ConstraintsDataStore implements Writable<ConstraintsData> {
       return;
     }
     if (shouldBeUnique) {
-      await this.add({ type: 'unique', columns: [column.id] });
+      await this.add({ type: 'u', columns: [column.id] });
       return;
     }
     // Technically, one column can have two unique constraints applied on it,
@@ -220,8 +194,10 @@ export class ConstraintsDataStore implements Writable<ConstraintsData> {
       [column.id],
     ).filter((c) => c.type === 'unique');
     await Promise.all(
-      uniqueConstraintsForColumn.map((constraint) =>
-        this.api.remove(constraint.id),
+      uniqueConstraintsForColumn.map((c) =>
+        api.constraints
+          .delete({ ...this.apiContext, constraint_oid: c.oid })
+          .run(),
       ),
     );
     await this.fetch();
diff --git a/mathesar_ui/src/stores/table-data/constraintsUtils.ts b/mathesar_ui/src/stores/table-data/constraintsUtils.ts
index c5a033b823..4aeed78408 100644
--- a/mathesar_ui/src/stores/table-data/constraintsUtils.ts
+++ b/mathesar_ui/src/stores/table-data/constraintsUtils.ts
@@ -1,8 +1,5 @@
-import type {
-  Constraint,
-  FkConstraint,
-} from '@mathesar/api/rest/types/tables/constraints';
 import type { Column } from '@mathesar/api/rpc/columns';
+import type { Constraint, FkConstraint } from '@mathesar/api/rpc/constraints';
 
 export function constraintIsFk(c: Constraint): c is FkConstraint {
   return c.type === 'foreignkey';
diff --git a/mathesar_ui/src/stores/table-data/index.ts b/mathesar_ui/src/stores/table-data/index.ts
index 2d68b467ac..8b25c28daa 100644
--- a/mathesar_ui/src/stores/table-data/index.ts
+++ b/mathesar_ui/src/stores/table-data/index.ts
@@ -48,11 +48,7 @@ export {
   type ProcessedColumns,
   type ProcessedColumnsStore,
 } from './processedColumns';
-export {
-  type Constraint,
-  type ConstraintsData,
-  type ConstraintsDataStore,
-} from './constraints';
+export { type ConstraintsData, type ConstraintsDataStore } from './constraints';
 export { TableStructure } from './TableStructure';
 export { SearchFuzzy } from './searchFuzzy';
 export { constraintIsFk, findFkConstraintsForColumn } from './constraintsUtils';
diff --git a/mathesar_ui/src/stores/table-data/processedColumns.ts b/mathesar_ui/src/stores/table-data/processedColumns.ts
index 036aae5b8f..4d6a8faa2a 100644
--- a/mathesar_ui/src/stores/table-data/processedColumns.ts
+++ b/mathesar_ui/src/stores/table-data/processedColumns.ts
@@ -1,7 +1,7 @@
 import type { Readable } from 'svelte/store';
 
-import type { Constraint } from '@mathesar/api/rest/types/tables/constraints';
 import type { Column } from '@mathesar/api/rpc/columns';
+import type { Constraint } from '@mathesar/api/rpc/constraints';
 import type { Table } from '@mathesar/api/rpc/tables';
 import type { CellColumnFabric } from '@mathesar/components/cell-fabric/types';
 import {
@@ -87,7 +87,7 @@ export function processColumn({
   );
   const linkFk = findFkConstraintsForColumn(exclusiveConstraints, column.id)[0];
   const isPk = (hasEnhancedPrimaryKeyCell ?? true) && column.primary_key;
-  const fkTargetTableId = linkFk ? linkFk.referent_table : undefined;
+  const fkTargetTableId = linkFk ? linkFk.referent_table_oid : undefined;
   return {
     id: column.id,
     column,
diff --git a/mathesar_ui/src/stores/table-data/tabularData.ts b/mathesar_ui/src/stores/table-data/tabularData.ts
index c8c719f750..39362c19df 100644
--- a/mathesar_ui/src/stores/table-data/tabularData.ts
+++ b/mathesar_ui/src/stores/table-data/tabularData.ts
@@ -70,12 +70,13 @@ export class TabularData {
     this.shareConsumer = props.shareConsumer;
     this.columnsDataStore = new ColumnsDataStore({
       database: props.database,
-      tableOid: this.table.oid,
+      table: this.table,
       hiddenColumns: contextualFilters.keys(),
       shareConsumer: this.shareConsumer,
     });
     this.constraintsDataStore = new ConstraintsDataStore({
-      tableId: this.table.oid,
+      database: props.database,
+      table: props.table,
       shareConsumer: this.shareConsumer,
     });
     this.recordsData = new RecordsData({
diff --git a/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte b/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte
index 83ae8ec355..3e60be951a 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Constraint } from '@mathesar/api/rest/types/tables/constraints';
+  import type { Constraint } from '@mathesar/api/rpc/constraints';
   import ColumnName from '@mathesar/components/column/ColumnName.svelte';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
 
diff --git a/mathesar_ui/src/systems/table-view/constraints/ConstraintDetails.svelte b/mathesar_ui/src/systems/table-view/constraints/ConstraintDetails.svelte
index 9822dfc13d..9e1014e9af 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ConstraintDetails.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ConstraintDetails.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Constraint } from '@mathesar/stores/table-data';
+  import type { Constraint } from '@mathesar/api/rpc/constraints';
 
   export let constraint: Constraint;
 </script>
diff --git a/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte b/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
index 093c147951..52c7b02da1 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
@@ -1,11 +1,13 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { ConstraintType } from '@mathesar/api/rest/types/tables/constraints';
+  import type {
+    Constraint,
+    ConstraintType,
+  } from '@mathesar/api/rpc/constraints';
   import { Button, Collapsible, Help, Icon } from '@mathesar/component-library';
   import { iconDeleteMajor } from '@mathesar/icons';
   import { confirmDelete } from '@mathesar/stores/confirmation';
-  import type { Constraint } from '@mathesar/stores/table-data';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
 
   import ConstraintCollapseHeader from './ConstraintCollapseHeader.svelte';
@@ -61,7 +63,7 @@
       identifierType: $_('constraint'),
       identifierName: constraint.name,
       body: [$_('are_you_sure_to_proceed')],
-      onProceed: () => constraintsDataStore.remove(constraint.id),
+      onProceed: () => constraintsDataStore.remove(constraint.oid),
     });
   }
 
@@ -90,7 +92,7 @@
       {/if}
     </div>
   {/if}
-  {#each constraints as constraint (constraint.id)}
+  {#each constraints as constraint (constraint.oid)}
     <Collapsible triggerAppearance="ghost">
       <span slot="header">
         <ConstraintCollapseHeader {constraint} />
diff --git a/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte b/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
index c897119a34..86d35a139d 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
@@ -4,24 +4,24 @@
   import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
   import { getAPI } from '@mathesar/api/rest/utils/requestUtils';
   import type { Column } from '@mathesar/api/rpc/columns';
+  import type { Constraint } from '@mathesar/api/rpc/constraints';
   import { Icon, Spinner, iconError } from '@mathesar/component-library';
   import ColumnName from '@mathesar/components/column/ColumnName.svelte';
   import TableName from '@mathesar/components/TableName.svelte';
-  import type { Constraint } from '@mathesar/stores/table-data';
   import { currentTablesData } from '@mathesar/stores/tables';
 
   export let constraint: Constraint;
 
   $: referentTable =
     constraint.type === 'foreignkey'
-      ? $currentTablesData.tablesMap.get(constraint.referent_table)
+      ? $currentTablesData.tablesMap.get(constraint.referent_table_oid)
       : undefined;
 
   async function getReferentColumns(_constraint: Constraint) {
     if (_constraint.type !== 'foreignkey') {
       return [];
     }
-    const tableId = _constraint.referent_table;
+    const tableId = _constraint.referent_table_oid;
     const url = `/api/db/v0/tables/${tableId}/columns/?limit=500`;
     const referentTableColumns = await getAPI<PaginatedResponse<Column>>(url);
     return referentTableColumns.results.filter((c) =>
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
index 946f0fd896..9f478ce067 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
@@ -106,10 +106,10 @@
   async function handleSave(values: FilledFormValues<typeof form>) {
     await constraintsDataStore.add({
       columns: [values.baseColumn.id],
-      type: 'foreignkey',
+      type: 'f',
       name: values.constraintName,
-      referent_table: values.targetTable.oid,
-      referent_columns: [values.targetColumn.id],
+      fkey_relation_id: values.targetTable.oid,
+      fkey_columns: [values.targetColumn.id],
     });
     // Why reset before close when the form is automatically reset during
     // mount? Because without reset here, there's a weird UI state during the
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
index 07b9935cb2..7f6769f498 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
@@ -101,7 +101,7 @@
     try {
       await constraintsDataStore.add({
         columns: constraintColumns.map((c) => c.id),
-        type: 'unique',
+        type: 'u',
         name: constraintName,
       });
       // Why init before close when we also init on open? Because without init
diff --git a/mathesar_ui/src/systems/table-view/constraints/TableConstraints.svelte b/mathesar_ui/src/systems/table-view/constraints/TableConstraints.svelte
index 70d97683cc..bb14bdd28c 100644
--- a/mathesar_ui/src/systems/table-view/constraints/TableConstraints.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/TableConstraints.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { ConstraintType } from '@mathesar/api/rest/types/tables/constraints';
   import { States } from '@mathesar/api/rest/utils/requestUtils';
-  import {
-    type Constraint,
-    getTabularDataStoreFromContext,
-  } from '@mathesar/stores/table-data';
+  import type {
+    Constraint,
+    ConstraintType,
+  } from '@mathesar/api/rpc/constraints';
+  import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import { Icon, iconLoading } from '@mathesar-component-library';
 
   import ConstraintTypeSection from './ConstraintTypeSection.svelte';
diff --git a/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte b/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte
index 557df61825..6823b47dfb 100644
--- a/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte
+++ b/mathesar_ui/src/systems/table-view/header/header-cell/ColumnHeaderContextMenu.svelte
@@ -53,7 +53,7 @@
 
   $: ({ linkFk } = processedColumn);
   $: linkedTable = linkFk
-    ? $currentTablesData.tablesMap.get(linkFk.referent_table)
+    ? $currentTablesData.tablesMap.get(linkFk.referent_table_oid)
     : undefined;
   $: linkedTableHref = linkedTable
     ? $storeToGetTablePageUrl({ tableId: linkedTable.oid })
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index e175643411..d288943939 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -77,7 +77,7 @@
   $: linkType = requiredField<LinkType>('manyToOne');
   $: $targetTable, linkType.reset();
   $: targetColumnsStore = target
-    ? new ColumnsDataStore({ database: $currentDatabase, tableOid: target.oid })
+    ? new ColumnsDataStore({ database: $currentDatabase, table: target })
     : undefined;
   $: targetColumns = ensureReadable(targetColumnsStore?.columns ?? []);
   $: targetColumnsFetchStatus = ensureReadable(targetColumnsStore?.fetchStatus);
diff --git a/mathesar_ui/src/systems/table-view/row/GroupHeaderCellValue.svelte b/mathesar_ui/src/systems/table-view/row/GroupHeaderCellValue.svelte
index 5be54f9819..8f703ca54a 100644
--- a/mathesar_ui/src/systems/table-view/row/GroupHeaderCellValue.svelte
+++ b/mathesar_ui/src/systems/table-view/row/GroupHeaderCellValue.svelte
@@ -17,7 +17,7 @@
     .get(String(columnId))
     ?.get(recordId);
   $: recordPageHref = $storeToGetRecordPageUrl({
-    tableId: processedColumnsMap?.get(columnId)?.linkFk?.referent_table,
+    tableId: processedColumnsMap?.get(columnId)?.linkFk?.referent_table_oid,
     recordId,
   });
 </script>
diff --git a/mathesar_ui/src/systems/table-view/row/RowCell.svelte b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
index 3bfbb3d143..641618cb48 100644
--- a/mathesar_ui/src/systems/table-view/row/RowCell.svelte
+++ b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
@@ -66,7 +66,7 @@
   $: isEditable = !column.primary_key;
   $: getRecordPageUrl = $storeToGetRecordPageUrl;
   $: linkedRecordHref = linkFk
-    ? getRecordPageUrl({ tableId: linkFk.referent_table, recordId: value })
+    ? getRecordPageUrl({ tableId: linkFk.referent_table_oid, recordId: value })
     : undefined;
   $: showLinkedRecordHyperLink = linkedRecordHref && canViewLinkedEntities;
   $: recordSummary = $recordSummaries
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
index 68588774e6..7b4684b7cc 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
@@ -124,7 +124,7 @@
     {/if}
 
     {#if column}
-      {@const referentTableId = column.linkFk?.referent_table}
+      {@const referentTableId = column.linkFk?.referent_table_oid}
       {@const referentTable =
         referentTableId === undefined
           ? undefined
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnTypeSpecifierTag.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnTypeSpecifierTag.svelte
index aa4cb9a510..6d6fd3b2ba 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnTypeSpecifierTag.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnTypeSpecifierTag.svelte
@@ -11,7 +11,7 @@
   export let type: 'primaryKey' | 'foreignKey';
   export let column: ProcessedColumn;
 
-  $: linkedTableId = column.linkFk?.referent_table;
+  $: linkedTableId = column.linkFk?.referent_table_oid;
   $: linkedTable = linkedTableId
     ? $currentTablesData.tablesMap.get(linkedTableId)
     : undefined;
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionTypes.ts b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionTypes.ts
index ec41de3e28..6e1eacca5c 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionTypes.ts
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionTypes.ts
@@ -1,4 +1,4 @@
-import type { FkConstraint } from '@mathesar/api/rest/types/tables/constraints';
+import type { FkConstraint } from '@mathesar/api/rpc/constraints';
 import type { Table } from '@mathesar/api/rpc/tables';
 import type { ProcessedColumn } from '@mathesar/stores/table-data';
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts
index b632eaeb34..b6e0b53dca 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts
@@ -1,7 +1,7 @@
 import { get } from 'svelte/store';
 import { _ } from 'svelte-i18n';
 
-import type { FkConstraint } from '@mathesar/api/rest/types/tables/constraints';
+import type { Constraint, FkConstraint } from '@mathesar/api/rpc/constraints';
 import type { Table } from '@mathesar/api/rpc/tables';
 import { isDefinedNonNullable } from '@mathesar/component-library';
 import {
@@ -10,7 +10,6 @@ import {
   valid,
 } from '@mathesar/components/form';
 import {
-  type Constraint,
   type ProcessedColumn,
   constraintIsFk,
 } from '@mathesar/stores/table-data';
@@ -26,7 +25,7 @@ function getLinkedTable({
   columns: Map<number, ProcessedColumn>;
   tables: Map<number, Table>;
 }): LinkedTable | undefined {
-  const table = tables.get(fkConstraint.referent_table);
+  const table = tables.get(fkConstraint.referent_table_oid);
   if (!table) {
     return undefined;
   }

From 32f8441c70b4b92ce567e80d475767033c7eda4c Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 30 Jul 2024 12:05:08 -0400
Subject: [PATCH 0528/1141] Migrate types for RPC-based joinable_tables API

---
 mathesar_ui/src/api/rest/types/queries.ts     |  4 +-
 .../api/rest/types/tables/joinable_tables.ts  | 39 -----------
 mathesar_ui/src/api/rpc/tables.ts             | 51 ++++++++++++++
 .../src/pages/record/RecordPageContent.svelte |  2 +-
 mathesar_ui/src/pages/record/Widgets.svelte   |  4 +-
 mathesar_ui/src/stores/tables.ts              |  3 +-
 .../src/systems/data-explorer/QueryManager.ts |  3 +-
 .../data-explorer/__tests__/mockData.ts       | 70 +++++++++----------
 .../src/systems/data-explorer/utils.ts        | 32 ++++-----
 .../table-inspector/table/links/utils.ts      | 14 ++--
 10 files changed, 116 insertions(+), 106 deletions(-)
 delete mode 100644 mathesar_ui/src/api/rest/types/tables/joinable_tables.ts

diff --git a/mathesar_ui/src/api/rest/types/queries.ts b/mathesar_ui/src/api/rest/types/queries.ts
index 6b5e72cea6..9affd4cabf 100644
--- a/mathesar_ui/src/api/rest/types/queries.ts
+++ b/mathesar_ui/src/api/rest/types/queries.ts
@@ -1,7 +1,7 @@
-import type { JpPath } from '@mathesar/api/rest/types/tables/joinable_tables';
 import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
 import type { Column } from '@mathesar/api/rpc/columns';
 import type { Schema } from '@mathesar/api/rpc/schemas';
+import type { JoinPath } from '@mathesar/api/rpc/tables';
 
 export type QueryColumnAlias = string;
 
@@ -12,7 +12,7 @@ export type QueryColumnAlias = string;
 export interface QueryInstanceInitialColumn {
   alias: QueryColumnAlias;
   id: Column['id'];
-  jp_path?: JpPath;
+  jp_path?: JoinPath;
 }
 
 // TODO: Extend this to support more complicated filters
diff --git a/mathesar_ui/src/api/rest/types/tables/joinable_tables.ts b/mathesar_ui/src/api/rest/types/tables/joinable_tables.ts
deleted file mode 100644
index c53a5742f7..0000000000
--- a/mathesar_ui/src/api/rest/types/tables/joinable_tables.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * @file
- *
- * endpoint: /api/db/v0/tables/<table_id>/joinable_tables/
- */
-
-import type { Table } from '@mathesar/api/rpc/tables';
-
-type ForeignKeyId = number;
-type IsLinkReversed = boolean;
-
-/** [attnum, attnum][] */
-export type JpPath = [number, number][];
-
-export interface JoinableTable {
-  target: Table['oid']; // baseTableId
-  jp_path: JpPath;
-  fk_path: [ForeignKeyId, IsLinkReversed][];
-  depth: number;
-  multiple_results: boolean;
-}
-
-export interface JoinableTablesResult {
-  joinable_tables: JoinableTable[];
-  tables: Record<
-    string, // tableId
-    {
-      name: Table['name'];
-      columns: number[];
-    }
-  >;
-  columns: Record<
-    string, // columnId
-    {
-      name: string;
-      type: string;
-    }
-  >;
-}
diff --git a/mathesar_ui/src/api/rpc/tables.ts b/mathesar_ui/src/api/rpc/tables.ts
index 11c269cd40..35d69b7374 100644
--- a/mathesar_ui/src/api/rpc/tables.ts
+++ b/mathesar_ui/src/api/rpc/tables.ts
@@ -19,6 +19,49 @@ export interface Table extends RawTable {
   metadata: TableMetadata | null;
 }
 
+/** [table oid, column attnum][] */
+export type JoinPath = [number, number][];
+
+export interface JoinableTable {
+  base: Table['oid'];
+  target: Table['oid'];
+  join_path: JoinPath;
+  /**
+   * [Constraint OID, is_reversed]
+   *
+   * When is_reversed is `false`, following the join path constitutes following
+   * a foreign key relationship from the base table to the target table. For
+   * example, following a join from `books` to `authors` when one book has one
+   * author.
+   *
+   * When is_reversed is `true`, following the join path constitutes following
+   * a foreign key relationship from the target table to the base table. For
+   * example, following a join from `authors` to `books` when one author has
+   * many books.
+   */
+  fkey_path: [number, boolean][];
+  depth: number;
+  multiple_results: boolean;
+}
+
+export interface JoinableTablesResult {
+  joinable_tables: JoinableTable[];
+  tables: Record<
+    string, // stringified table_oid
+    {
+      name: Table['name'];
+      columns: number[];
+    }
+  >;
+  columns: Record<
+    string, // stringified column_oid
+    {
+      name: string;
+      type: string;
+    }
+  >;
+}
+
 export const tables = {
   list: rpcMethodTypeContainer<
     {
@@ -87,4 +130,12 @@ export const tables = {
     },
     void
   >(),
+
+  list_joinable: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      schema_oid: number;
+    },
+    JoinableTablesResult
+  >(),
 };
diff --git a/mathesar_ui/src/pages/record/RecordPageContent.svelte b/mathesar_ui/src/pages/record/RecordPageContent.svelte
index fd603bf9dd..c7deb62017 100644
--- a/mathesar_ui/src/pages/record/RecordPageContent.svelte
+++ b/mathesar_ui/src/pages/record/RecordPageContent.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
   import { getDetailedRecordsErrors } from '@mathesar/api/rest/utils/recordUtils';
   import { getAPI } from '@mathesar/api/rest/utils/requestUtils';
+  import type { JoinableTablesResult } from '@mathesar/api/rpc/tables';
   import type { Table } from '@mathesar/api/rpc/tables';
   import {
     FormSubmit,
diff --git a/mathesar_ui/src/pages/record/Widgets.svelte b/mathesar_ui/src/pages/record/Widgets.svelte
index 21f23fd65f..34906815fd 100644
--- a/mathesar_ui/src/pages/record/Widgets.svelte
+++ b/mathesar_ui/src/pages/record/Widgets.svelte
@@ -4,7 +4,7 @@
   import type {
     JoinableTable,
     JoinableTablesResult,
-  } from '@mathesar/api/rest/types/tables/joinable_tables';
+  } from '@mathesar/api/rpc/tables';
   import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import { iconRecord } from '@mathesar/icons';
@@ -27,7 +27,7 @@
   function buildWidgetInput(joinableTable: JoinableTable) {
     const table = $currentTablesData.tablesMap.get(joinableTable.target);
     if (!table) return undefined;
-    const id = joinableTable.jp_path[0].slice(-1)[0];
+    const id = joinableTable.join_path[0].slice(-1)[0];
     const name = columnNameMap.get(id) ?? `(${$_('unknown_column')})`;
     return { table, fkColumn: { id, name } };
   }
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index 92261d8eca..d9179497a2 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -14,13 +14,12 @@ import type { Readable, Writable } from 'svelte/store';
 import { derived, get, readable, writable } from 'svelte/store';
 import { _ } from 'svelte-i18n';
 
-import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
 import type { SplitTableResponse } from '@mathesar/api/rest/types/tables/split_table';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { api } from '@mathesar/api/rpc';
 import type { Database } from '@mathesar/api/rpc/databases';
 import type { Schema } from '@mathesar/api/rpc/schemas';
-import type { Table } from '@mathesar/api/rpc/tables';
+import type { JoinableTablesResult, Table } from '@mathesar/api/rpc/tables';
 import { invalidIf } from '@mathesar/components/form';
 import { TupleMap } from '@mathesar/packages/tuple-map';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
diff --git a/mathesar_ui/src/systems/data-explorer/QueryManager.ts b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
index dbd73e9d64..9d2901d051 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryManager.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
@@ -6,11 +6,10 @@ import type {
   QueryInstance,
   QueryRunResponse,
 } from '@mathesar/api/rest/types/queries';
-import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { getAPI } from '@mathesar/api/rest/utils/requestUtils';
 import { api } from '@mathesar/api/rpc';
-import type { Table } from '@mathesar/api/rpc/tables';
+import type { JoinableTablesResult, Table } from '@mathesar/api/rpc/tables';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
 import { currentDatabase } from '@mathesar/stores/databases';
 import { createQuery, putQuery } from '@mathesar/stores/queries';
diff --git a/mathesar_ui/src/systems/data-explorer/__tests__/mockData.ts b/mathesar_ui/src/systems/data-explorer/__tests__/mockData.ts
index 6d66195cf3..092f0511c2 100644
--- a/mathesar_ui/src/systems/data-explorer/__tests__/mockData.ts
+++ b/mathesar_ui/src/systems/data-explorer/__tests__/mockData.ts
@@ -1,4 +1,4 @@
-import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
+import type { JoinableTablesResult } from '@mathesar/api/rpc/tables';
 
 export const ItemsTableId = 75;
 export const CheckoutsPkColumnId = 216;
@@ -8,25 +8,25 @@ export const checkoutsJoinableTables: JoinableTablesResult = {
   joinable_tables: [
     {
       target: ItemsTableId,
-      jp_path: [[CheckoutsPkColumnId, ItemsPkColumnId]],
-      fk_path: [[188, false]],
+      join_path: [[CheckoutsPkColumnId, ItemsPkColumnId]],
+      fkey_path: [[188, false]],
       depth: 1,
       multiple_results: false,
     },
     {
       target: 72,
-      jp_path: [[217, 228]],
-      fk_path: [[189, false]],
+      join_path: [[217, 228]],
+      fkey_path: [[189, false]],
       depth: 1,
       multiple_results: false,
     },
     {
       target: 78,
-      jp_path: [
+      join_path: [
         [CheckoutsPkColumnId, ItemsPkColumnId],
         [222, 229],
       ],
-      fk_path: [
+      fkey_path: [
         [188, false],
         [192, false],
       ],
@@ -35,12 +35,12 @@ export const checkoutsJoinableTables: JoinableTablesResult = {
     },
     {
       target: 74,
-      jp_path: [
+      join_path: [
         [CheckoutsPkColumnId, ItemsPkColumnId],
         [222, 229],
         [231, 235],
       ],
-      fk_path: [
+      fkey_path: [
         [188, false],
         [192, false],
         [196, false],
@@ -50,12 +50,12 @@ export const checkoutsJoinableTables: JoinableTablesResult = {
     },
     {
       target: 77,
-      jp_path: [
+      join_path: [
         [CheckoutsPkColumnId, ItemsPkColumnId],
         [222, 229],
         [232, 211],
       ],
-      fk_path: [
+      fkey_path: [
         [188, false],
         [192, false],
         [195, false],
@@ -196,25 +196,25 @@ export const selfRefTableJoinableTables: JoinableTablesResult = {
   joinable_tables: [
     {
       target: SelfRefTableId,
-      jp_path: [[SelfRefTableFkColumnId, SelfRefTablePkColumnId]],
-      fk_path: [[2529, false]],
+      join_path: [[SelfRefTableFkColumnId, SelfRefTablePkColumnId]],
+      fkey_path: [[2529, false]],
       depth: 1,
       multiple_results: false,
     },
     {
       target: SelfRefTableId,
-      jp_path: [[SelfRefTablePkColumnId, SelfRefTableFkColumnId]],
-      fk_path: [[2529, true]],
+      join_path: [[SelfRefTablePkColumnId, SelfRefTableFkColumnId]],
+      fkey_path: [[2529, true]],
       depth: 1,
       multiple_results: true,
     },
     {
       target: SelfRefTableId,
-      jp_path: [
+      join_path: [
         [SelfRefTableFkColumnId, SelfRefTablePkColumnId],
         [SelfRefTableFkColumnId, SelfRefTablePkColumnId],
       ],
-      fk_path: [
+      fkey_path: [
         [2529, false],
         [2529, false],
       ],
@@ -223,11 +223,11 @@ export const selfRefTableJoinableTables: JoinableTablesResult = {
     },
     {
       target: SelfRefTableId,
-      jp_path: [
+      join_path: [
         [SelfRefTablePkColumnId, SelfRefTableFkColumnId],
         [SelfRefTablePkColumnId, SelfRefTableFkColumnId],
       ],
-      fk_path: [
+      fkey_path: [
         [2529, true],
         [2529, true],
       ],
@@ -236,12 +236,12 @@ export const selfRefTableJoinableTables: JoinableTablesResult = {
     },
     {
       target: SelfRefTableId,
-      jp_path: [
+      join_path: [
         [SelfRefTableFkColumnId, SelfRefTablePkColumnId],
         [SelfRefTableFkColumnId, SelfRefTablePkColumnId],
         [SelfRefTableFkColumnId, SelfRefTablePkColumnId],
       ],
-      fk_path: [
+      fkey_path: [
         [2529, false],
         [2529, false],
         [2529, false],
@@ -251,12 +251,12 @@ export const selfRefTableJoinableTables: JoinableTablesResult = {
     },
     {
       target: SelfRefTableId,
-      jp_path: [
+      join_path: [
         [SelfRefTablePkColumnId, SelfRefTableFkColumnId],
         [SelfRefTablePkColumnId, SelfRefTableFkColumnId],
         [SelfRefTablePkColumnId, SelfRefTableFkColumnId],
       ],
-      fk_path: [
+      fkey_path: [
         [2529, true],
         [2529, true],
         [2529, true],
@@ -376,25 +376,25 @@ export const groupTable: JoinableTablesResult = {
   joinable_tables: [
     {
       target: personTableId,
-      jp_path: [[groupTablePerson1ColumnId, personTablePkColumnId]],
-      fk_path: [[2765, false]],
+      join_path: [[groupTablePerson1ColumnId, personTablePkColumnId]],
+      fkey_path: [[2765, false]],
       depth: 1,
       multiple_results: false,
     },
     {
       target: personTableId,
-      jp_path: [[groupTablePerson2ColumnId, personTablePkColumnId]],
-      fk_path: [[2801, false]],
+      join_path: [[groupTablePerson2ColumnId, personTablePkColumnId]],
+      fkey_path: [[2801, false]],
       depth: 1,
       multiple_results: false,
     },
     {
       target: 1295,
-      jp_path: [
+      join_path: [
         [groupTablePerson1ColumnId, personTablePkColumnId],
         [personTablePkColumnId, groupTablePerson2ColumnId],
       ],
-      fk_path: [
+      fkey_path: [
         [2765, false],
         [2801, true],
       ],
@@ -403,11 +403,11 @@ export const groupTable: JoinableTablesResult = {
     },
     {
       target: 1295,
-      jp_path: [
+      join_path: [
         [groupTablePerson2ColumnId, personTablePkColumnId],
         [personTablePkColumnId, groupTablePerson1ColumnId],
       ],
-      fk_path: [
+      fkey_path: [
         [2801, false],
         [2765, true],
       ],
@@ -416,12 +416,12 @@ export const groupTable: JoinableTablesResult = {
     },
     {
       target: personTableId,
-      jp_path: [
+      join_path: [
         [groupTablePerson1ColumnId, personTablePkColumnId],
         [personTablePkColumnId, groupTablePerson2ColumnId],
         [groupTablePerson1ColumnId, personTablePkColumnId],
       ],
-      fk_path: [
+      fkey_path: [
         [2765, false],
         [2801, true],
         [2765, false],
@@ -431,12 +431,12 @@ export const groupTable: JoinableTablesResult = {
     },
     {
       target: personTableId,
-      jp_path: [
+      join_path: [
         [groupTablePerson2ColumnId, personTablePkColumnId],
         [personTablePkColumnId, groupTablePerson1ColumnId],
         [groupTablePerson2ColumnId, personTablePkColumnId],
       ],
-      fk_path: [
+      fkey_path: [
         [2801, false],
         [2765, true],
         [2801, false],
diff --git a/mathesar_ui/src/systems/data-explorer/utils.ts b/mathesar_ui/src/systems/data-explorer/utils.ts
index b1e187f51c..5e6bc31802 100644
--- a/mathesar_ui/src/systems/data-explorer/utils.ts
+++ b/mathesar_ui/src/systems/data-explorer/utils.ts
@@ -8,12 +8,12 @@ import type {
   QueryResultColumn,
   QueryRunResponse,
 } from '@mathesar/api/rest/types/queries';
+import type { Column } from '@mathesar/api/rpc/columns';
 import type {
+  JoinPath,
   JoinableTablesResult,
-  JpPath,
-} from '@mathesar/api/rest/types/tables/joinable_tables';
-import type { Column } from '@mathesar/api/rpc/columns';
-import type { Table } from '@mathesar/api/rpc/tables';
+  Table,
+} from '@mathesar/api/rpc/tables';
 import type { CellColumnFabric } from '@mathesar/components/cell-fabric/types';
 import {
   getCellCap,
@@ -74,7 +74,7 @@ export interface InputColumn {
   id: Column['id'];
   name: Column['name'];
   tableName: Table['name'];
-  jpPath?: JpPath;
+  jpPath?: JoinPath;
   type: Column['type'];
   tableId: Table['oid'];
 }
@@ -132,9 +132,9 @@ export function getLinkFromColumn(
   const allLinksFromColumn = result.joinable_tables.filter(
     (entry) =>
       entry.depth === depth &&
-      entry.fk_path[depth - 1][1] === false &&
-      entry.jp_path[depth - 1][0] === columnId &&
-      entry.jp_path.join(',').indexOf(parentPath) === 0,
+      entry.fkey_path[depth - 1][1] === false &&
+      entry.join_path[depth - 1][0] === columnId &&
+      entry.join_path.join(',').indexOf(parentPath) === 0,
   );
   if (allLinksFromColumn.length === 0) {
     return undefined;
@@ -149,7 +149,7 @@ export function getLinkFromColumn(
     id: link.target,
     name: toTableInfo.name,
   };
-  const toColumnId = link.jp_path[depth - 1][1];
+  const toColumnId = link.join_path[depth - 1][1];
   const toColumn = {
     id: toColumnId,
     name: result.columns[toColumnId].name,
@@ -168,9 +168,9 @@ export function getLinkFromColumn(
             result,
             columnIdInLinkedTable,
             depth + 1,
-            link.jp_path.join(','),
+            link.join_path.join(','),
           ),
-          jpPath: link.jp_path,
+          jpPath: link.join_path,
           producesMultipleResults: link.multiple_results,
         },
       ];
@@ -248,15 +248,15 @@ export function getTablesThatReferenceBaseTable(
   baseTable: Pick<Table, 'oid' | 'name'>,
 ): ReferencedByTable[] {
   const referenceLinks = result.joinable_tables.filter(
-    (entry) => entry.depth === 1 && entry.fk_path[0][1] === true,
+    (entry) => entry.depth === 1 && entry.fkey_path[0][1] === true,
   );
   const references: ReferencedByTable[] = [];
 
   referenceLinks.forEach((reference) => {
     const tableId = reference.target;
     const table = result.tables[tableId];
-    const baseTableColumnId = reference.jp_path[0][0];
-    const referenceTableColumnId = reference.jp_path[0][1];
+    const baseTableColumnId = reference.join_path[0][0];
+    const referenceTableColumnId = reference.join_path[0][1];
 
     // TODO_BETA: figure out how to deal with the fact that our `Table` type no
     // longer has a `columns` field.
@@ -285,9 +285,9 @@ export function getTablesThatReferenceBaseTable(
                 result,
                 columnIdInTable,
                 2,
-                reference.jp_path.join(','),
+                reference.join_path.join(','),
               ),
-              jpPath: reference.jp_path,
+              jpPath: reference.join_path,
               producesMultipleResults: reference.multiple_results,
             },
           ];
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/links/utils.ts b/mathesar_ui/src/systems/table-view/table-inspector/table/links/utils.ts
index e81d64ef6d..55b96c6950 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/links/utils.ts
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/links/utils.ts
@@ -1,4 +1,4 @@
-import type { JoinableTablesResult } from '@mathesar/api/rest/types/tables/joinable_tables';
+import type { JoinableTablesResult } from '@mathesar/api/rpc/tables';
 import type { ProcessedColumn } from '@mathesar/stores/table-data';
 import { assertExhaustive } from '@mathesar-component-library';
 
@@ -16,7 +16,7 @@ export function getTableLinks(
   switch (type) {
     case 'in_this_table': {
       const linkedTables = joinableTablesResult.joinable_tables.filter(
-        (table) => !table.fk_path[0][1],
+        (table) => !table.fkey_path[0][1],
       );
       const links: TableLink[] = linkedTables.map((table) => ({
         table: {
@@ -24,17 +24,17 @@ export function getTableLinks(
           name: joinableTablesResult.tables[table.target].name,
         },
         column: {
-          id: table.jp_path[0][0],
+          id: table.join_path[0][0],
           // The joinable_tables API will not contain the columns from the current table
           name:
-            currentTableColumns.get(table.jp_path[0][0])?.column.name || '--',
+            currentTableColumns.get(table.join_path[0][0])?.column.name || '--',
         },
       }));
       return links;
     }
     case 'from_other_tables': {
       const linkedTables = joinableTablesResult.joinable_tables.filter(
-        (table) => table.fk_path[0][1],
+        (table) => table.fkey_path[0][1],
       );
       const links: TableLink[] = linkedTables.map((table) => ({
         table: {
@@ -42,8 +42,8 @@ export function getTableLinks(
           name: joinableTablesResult.tables[table.target].name,
         },
         column: {
-          id: table.jp_path[0][1],
-          name: joinableTablesResult.columns[table.jp_path[0][1]].name,
+          id: table.join_path[0][1],
+          name: joinableTablesResult.columns[table.join_path[0][1]].name,
         },
       }));
       return links;

From 732990284982a15e898dfb84f6a1c3939188e849 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 30 Jul 2024 12:20:02 -0400
Subject: [PATCH 0529/1141] Remove unused `base` property from JoinableTable

This was causing type errors in front end tests
---
 mathesar_ui/src/api/rpc/tables.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mathesar_ui/src/api/rpc/tables.ts b/mathesar_ui/src/api/rpc/tables.ts
index 35d69b7374..da27409597 100644
--- a/mathesar_ui/src/api/rpc/tables.ts
+++ b/mathesar_ui/src/api/rpc/tables.ts
@@ -23,7 +23,6 @@ export interface Table extends RawTable {
 export type JoinPath = [number, number][];
 
 export interface JoinableTable {
-  base: Table['oid'];
   target: Table['oid'];
   join_path: JoinPath;
   /**

From a6b9695ec0df31d6739b7821561845d32f1051dc Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 30 Jul 2024 13:41:27 -0400
Subject: [PATCH 0530/1141] Transition frontend to use RPC API for records.list

---
 mathesar_ui/src/api/rpc/index.ts              |   2 +
 .../api/{rest/types/tables => rpc}/records.ts |  16 +-
 mathesar_ui/src/pages/record/RecordStore.ts   |   4 +-
 .../src/stores/table-data/filtering.ts        |   6 +-
 mathesar_ui/src/stores/table-data/grouping.ts |   6 +-
 .../record-summaries/recordSummaryUtils.ts    |   2 +-
 mathesar_ui/src/stores/table-data/records.ts  | 226 +++++++++---------
 .../src/stores/table-data/searchFuzzy.ts      |   4 +-
 mathesar_ui/src/stores/table-data/sorting.ts  |   8 +-
 .../src/stores/table-data/tabularData.ts      |   3 +-
 .../RecordSelectorContent.svelte              |   4 +-
 .../RecordSelectorController.ts               |   2 +-
 .../record-operations/filter/Filter.svelte    |   2 +-
 .../filter/FilterEntries.svelte               |   2 +-
 .../row/GroupHeaderCellValue.svelte           |   2 +-
 15 files changed, 147 insertions(+), 142 deletions(-)
 rename mathesar_ui/src/api/{rest/types/tables => rpc}/records.ts (91%)

diff --git a/mathesar_ui/src/api/rpc/index.ts b/mathesar_ui/src/api/rpc/index.ts
index af5c4b1243..9e12fd779a 100644
--- a/mathesar_ui/src/api/rpc/index.ts
+++ b/mathesar_ui/src/api/rpc/index.ts
@@ -7,6 +7,7 @@ import { configured_roles } from './configured_roles';
 import { constraints } from './constraints';
 import { database_setup } from './database_setup';
 import { databases } from './databases';
+import { records } from './records';
 import { schemas } from './schemas';
 import { servers } from './servers';
 import { tables } from './tables';
@@ -19,6 +20,7 @@ export const api = buildRpcApi({
     configured_roles,
     database_setup,
     databases,
+    records,
     schemas,
     servers,
     tables,
diff --git a/mathesar_ui/src/api/rest/types/tables/records.ts b/mathesar_ui/src/api/rpc/records.ts
similarity index 91%
rename from mathesar_ui/src/api/rest/types/tables/records.ts
rename to mathesar_ui/src/api/rpc/records.ts
index fdbfafdd0e..8cb988c46b 100644
--- a/mathesar_ui/src/api/rest/types/tables/records.ts
+++ b/mathesar_ui/src/api/rpc/records.ts
@@ -1,3 +1,5 @@
+import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
+
 export interface Grouping {
   /** Each string is a column id */
   columns: number[];
@@ -34,11 +36,11 @@ export type FilterCondition = Record<string, FilterConditionParams>;
 type MakeFilteringOption<U> = U extends string
   ? { [k in U]: FilterRequest[] }
   : never;
-export type FilterRequest =
-  | FilterCondition
-  | MakeFilteringOption<FilterCombination>;
+type FilterRequest = FilterCondition | MakeFilteringOption<FilterCombination>;
 
-export interface GetRequestParams {
+export interface RecordsListParams {
+  database_id: number;
+  table_oid: number;
   limit?: number;
   offset?: number;
   order_by?: SortingEntry[];
@@ -117,7 +119,7 @@ export interface ApiDataForRecordSummariesInFkColumn {
   data: Record<string, ApiRecordSummaryInputData>;
 }
 
-export interface Response {
+export interface RecordsResponse {
   count: number;
   grouping: Grouping | null;
   results: Result[];
@@ -126,3 +128,7 @@ export interface Response {
    */
   preview_data: ApiDataForRecordSummariesInFkColumn[] | null;
 }
+
+export const records = {
+  list: rpcMethodTypeContainer<RecordsListParams, RecordsResponse>(),
+};
diff --git a/mathesar_ui/src/pages/record/RecordStore.ts b/mathesar_ui/src/pages/record/RecordStore.ts
index f750d69a32..c420c38647 100644
--- a/mathesar_ui/src/pages/record/RecordStore.ts
+++ b/mathesar_ui/src/pages/record/RecordStore.ts
@@ -1,11 +1,11 @@
 import { type Readable, derived, writable } from 'svelte/store';
 
-import type { Response as ApiResponse } from '@mathesar/api/rest/types/tables/records';
 import {
   type RequestStatus,
   getAPI,
   patchAPI,
 } from '@mathesar/api/rest/utils/requestUtils';
+import type { RecordsResponse } from '@mathesar/api/rpc/records';
 import type { Table } from '@mathesar/api/rpc/tables';
 import { WritableMap } from '@mathesar/component-library';
 import RecordSummaryStore from '@mathesar/stores/table-data/record-summaries/RecordSummaryStore';
@@ -59,7 +59,7 @@ export default class RecordStore {
     void this.fetch();
   }
 
-  private updateSelfWithApiResponseData(response: ApiResponse): void {
+  private updateSelfWithApiResponseData(response: RecordsResponse): void {
     const result = response.results[0];
     this.fieldValues.reconstruct(
       Object.entries(result).map(([k, v]) => [parseInt(k, 10), v]),
diff --git a/mathesar_ui/src/stores/table-data/filtering.ts b/mathesar_ui/src/stores/table-data/filtering.ts
index e19881229f..7bbbb184ee 100644
--- a/mathesar_ui/src/stores/table-data/filtering.ts
+++ b/mathesar_ui/src/stores/table-data/filtering.ts
@@ -2,8 +2,8 @@ import type {
   FilterCombination,
   FilterCondition,
   FilterConditionParams,
-  GetRequestParams,
-} from '@mathesar/api/rest/types/tables/records';
+  RecordsListParams,
+} from '@mathesar/api/rpc/records';
 
 export interface FilterEntry {
   readonly columnId: number;
@@ -117,7 +117,7 @@ export class Filtering {
     return true;
   }
 
-  recordsRequestParams(): Pick<GetRequestParams, 'filter'> {
+  recordsRequestParams(): Pick<RecordsListParams, 'filter'> {
     if (!this.entries.length) {
       return {};
     }
diff --git a/mathesar_ui/src/stores/table-data/grouping.ts b/mathesar_ui/src/stores/table-data/grouping.ts
index 193cb8f810..1180b6fea0 100644
--- a/mathesar_ui/src/stores/table-data/grouping.ts
+++ b/mathesar_ui/src/stores/table-data/grouping.ts
@@ -1,4 +1,4 @@
-import type { GetRequestParams } from '@mathesar/api/rest/types/tables/records';
+import type { RecordsListParams } from '@mathesar/api/rpc/records';
 import { isDefinedNonNullable } from '@mathesar/component-library';
 
 export interface GroupEntry {
@@ -75,11 +75,11 @@ export class Grouping {
     });
   }
 
-  recordsRequestParams(): Pick<GetRequestParams, 'grouping'> {
+  recordsRequestParams(): Pick<RecordsListParams, 'grouping'> {
     if (!this.entries.length) {
       return {};
     }
-    const request: GetRequestParams['grouping'] = {
+    const request: RecordsListParams['grouping'] = {
       columns: [],
       preproc: [],
     };
diff --git a/mathesar_ui/src/stores/table-data/record-summaries/recordSummaryUtils.ts b/mathesar_ui/src/stores/table-data/record-summaries/recordSummaryUtils.ts
index 445c2ac371..fb8745ea6d 100644
--- a/mathesar_ui/src/stores/table-data/record-summaries/recordSummaryUtils.ts
+++ b/mathesar_ui/src/stores/table-data/record-summaries/recordSummaryUtils.ts
@@ -1,7 +1,7 @@
 import type {
   ApiDataForRecordSummariesInFkColumn,
   ApiRecordSummaryInputData,
-} from '@mathesar/api/rest/types/tables/records';
+} from '@mathesar/api/rpc/records';
 import { escapeHtml } from '@mathesar/utils/stringUtils';
 import { ImmutableMap } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/stores/table-data/records.ts b/mathesar_ui/src/stores/table-data/records.ts
index f536769732..4c8221ef58 100644
--- a/mathesar_ui/src/stores/table-data/records.ts
+++ b/mathesar_ui/src/stores/table-data/records.ts
@@ -7,30 +7,25 @@ import {
   writable,
 } from 'svelte/store';
 
+import { States } from '@mathesar/api/rest/utils/requestUtils';
+import { api } from '@mathesar/api/rpc';
+import type { Column } from '@mathesar/api/rpc/columns';
+import type { Database } from '@mathesar/api/rpc/databases';
 import type {
-  GetRequestParams as ApiGetRequestParams,
   Group as ApiGroup,
   Grouping as ApiGrouping,
   Result as ApiRecord,
-  Response as ApiRecordsResponse,
   GroupingMode,
-} from '@mathesar/api/rest/types/tables/records';
-import {
-  States,
-  deleteAPI,
-  getAPI,
-  getQueryStringFromParams,
-  patchAPI,
-  postAPI,
-} from '@mathesar/api/rest/utils/requestUtils';
-import type { Column } from '@mathesar/api/rpc/columns';
+  RecordsListParams,
+  RecordsResponse,
+} from '@mathesar/api/rpc/records';
 import type { Table } from '@mathesar/api/rpc/tables';
 import { getErrorMessage } from '@mathesar/utils/errors';
 import { pluralize } from '@mathesar/utils/languageUtils';
 import type Pagination from '@mathesar/utils/Pagination';
 import type { ShareConsumer } from '@mathesar/utils/shares';
 import {
-  type CancellablePromise,
+  CancellablePromise,
   getGloballyUniqueId,
   isDefinedNonNullable,
 } from '@mathesar-component-library';
@@ -54,25 +49,6 @@ export interface RecordsRequestParamsData {
   searchFuzzy: SearchFuzzy;
 }
 
-interface RecordsFetchQueryParamsData extends RecordsRequestParamsData {
-  shareConsumer?: ShareConsumer;
-}
-
-function buildFetchQueryString(data: RecordsFetchQueryParamsData): string {
-  const params: ApiGetRequestParams = {
-    ...data.pagination.recordsRequestParams(),
-    ...data.sorting.recordsRequestParamsIncludingGrouping(data.grouping),
-    ...data.grouping.recordsRequestParams(),
-    ...data.filtering.recordsRequestParams(),
-    ...data.searchFuzzy.recordsRequestParams(),
-  };
-  const paramsWithShareConsumer = {
-    ...params,
-    ...data.shareConsumer?.getQueryParams(),
-  };
-  return getQueryStringFromParams(paramsWithShareConsumer);
-}
-
 export interface RecordGroup {
   count: number;
   eqValue: ApiGroup['eq_value'];
@@ -279,9 +255,10 @@ function preprocessRecords({
 }
 
 export class RecordsData {
-  private tableId: Table['oid'];
-
-  private url: string;
+  private apiContext: {
+    database_id: number;
+    table_oid: Table['oid'];
+  };
 
   private meta: Meta;
 
@@ -306,7 +283,7 @@ export class RecordsData {
   /** Keys are row selection ids */
   selectableRowsMap: Readable<Map<string, RecordRow>>;
 
-  private promise: CancellablePromise<ApiRecordsResponse> | undefined;
+  private promise: CancellablePromise<RecordsResponse> | undefined;
 
   // @ts-ignore: https://github.com/centerofci/mathesar/issues/1055
   private createPromises: Map<unknown, CancellablePromise<unknown>>;
@@ -327,19 +304,21 @@ export class RecordsData {
   readonly shareConsumer?: ShareConsumer;
 
   constructor({
-    tableId,
+    database,
+    table,
     meta,
     columnsDataStore,
     contextualFilters,
     shareConsumer,
   }: {
-    tableId: Table['oid'];
+    database: Pick<Database, 'id'>;
+    table: Pick<Table, 'oid'>;
     meta: Meta;
     columnsDataStore: ColumnsDataStore;
     contextualFilters: Map<number, number | string>;
     shareConsumer?: ShareConsumer;
   }) {
-    this.tableId = tableId;
+    this.apiContext = { database_id: database.id, table_oid: table.oid };
     this.shareConsumer = shareConsumer;
     this.state = writable(States.Loading);
     this.savedRecordRowsWithGroupHeaders = writable([]);
@@ -358,7 +337,6 @@ export class RecordsData {
     this.meta = meta;
     this.columnsDataStore = columnsDataStore;
     this.contextualFilters = contextualFilters;
-    this.url = `/api/db/v0/tables/${this.tableId}/records/`;
     void this.fetch();
 
     this.selectableRowsMap = derived(
@@ -410,12 +388,24 @@ export class RecordsData {
       const contextualFilterEntries = [...this.contextualFilters].map(
         ([columnId, value]) => ({ columnId, conditionId: 'equal', value }),
       );
-      const queryString = buildFetchQueryString({
-        ...params,
-        filtering: params.filtering.withEntries(contextualFilterEntries),
-        shareConsumer: this.shareConsumer,
-      });
-      this.promise = getAPI<ApiRecordsResponse>(`${this.url}?${queryString}`);
+
+      const recordsListParams: RecordsListParams = {
+        ...this.apiContext,
+        ...params.pagination.recordsRequestParams(),
+        ...params.sorting.recordsRequestParamsIncludingGrouping(
+          params.grouping,
+        ),
+        ...params.grouping.recordsRequestParams(),
+        ...params.filtering
+          .withEntries(contextualFilterEntries)
+          .recordsRequestParams(),
+        ...params.searchFuzzy.recordsRequestParams(),
+        // TODO_BETA Do we need shareConsumer here? Previously we had been
+        // passing `...this.shareConsumer?.getQueryParams()`
+      };
+
+      this.promise = api.records.list(recordsListParams).run();
+
       const response = await this.promise;
       const totalCount = response.count || 0;
       const grouping = response.grouping
@@ -494,9 +484,9 @@ export class RecordsData {
     let shouldReFetchRecords = successRowKeys.size > 0;
     if (keysToDelete.length > 0) {
       const recordIds = [...keysToDelete];
-      const bulkDeleteURL = `/api/ui/v0/tables/${this.tableId}/records/delete/`;
       try {
-        await deleteAPI<RowKey>(bulkDeleteURL, { pks: recordIds });
+        throw new Error('Not implemented'); // TODO_BETA
+        // await deleteAPI<RowKey>(bulkDeleteURL, { pks: recordIds });
         keysToDelete.forEach((key) => successRowKeys.add(key));
       } catch (error) {
         failures.set(keysToDelete.join(','), getErrorMessage(error));
@@ -580,33 +570,36 @@ export class RecordsData {
     const cellKey = getCellKey(rowKey, column.id);
     this.meta.cellModificationStatus.set(cellKey, { state: 'processing' });
     this.updatePromises?.get(cellKey)?.cancel();
-    const promise = patchAPI<ApiRecordsResponse>(
-      `${this.url}${String(primaryKeyValue)}/`,
-      { [column.id]: record[column.id] },
-    );
-    if (!this.updatePromises) {
-      this.updatePromises = new Map();
-    }
-    this.updatePromises.set(cellKey, promise);
 
-    try {
-      const result = await promise;
-      this.meta.cellModificationStatus.set(cellKey, { state: 'success' });
-      return {
-        ...row,
-        record: result.results[0],
-      };
-    } catch (err) {
-      this.meta.cellModificationStatus.set(cellKey, {
-        state: 'failure',
-        errors: [`Unable to save cell. ${getErrorMessage(err)}`],
-      });
-    } finally {
-      if (this.updatePromises.get(cellKey) === promise) {
-        this.updatePromises.delete(cellKey);
-      }
-    }
-    return row;
+    throw new Error('Not implemented'); // TODO_BETA
+    // const promise = patchAPI<RecordsResponse>(
+    //   `${this.url}${String(primaryKeyValue)}/`,
+    //   { [column.id]: record[column.id] },
+    // );
+
+    // if (!this.updatePromises) {
+    //   this.updatePromises = new Map();
+    // }
+    // this.updatePromises.set(cellKey, promise);
+
+    // try {
+    //   const result = await promise;
+    //   this.meta.cellModificationStatus.set(cellKey, { state: 'success' });
+    //   return {
+    //     ...row,
+    //     record: result.results[0],
+    //   };
+    // } catch (err) {
+    //   this.meta.cellModificationStatus.set(cellKey, {
+    //     state: 'failure',
+    //     errors: [`Unable to save cell. ${getErrorMessage(err)}`],
+    //   });
+    // } finally {
+    //   if (this.updatePromises.get(cellKey) === promise) {
+    //     this.updatePromises.delete(cellKey);
+    //   }
+    // }
+    // return row;
   }
 
   getNewEmptyRecord(): NewRecordRow {
@@ -654,48 +647,51 @@ export class RecordsData {
       ...Object.fromEntries(this.contextualFilters),
       ...row.record,
     };
-    const promise = postAPI<ApiRecordsResponse>(this.url, requestRecord);
-    if (!this.createPromises) {
-      this.createPromises = new Map();
-    }
-    this.createPromises.set(rowKeyOfBlankRow, promise);
 
-    try {
-      const response = await promise;
-      const record = response.results[0];
-      let newRow: NewRecordRow = {
-        ...row,
-        record,
-      };
-      if (isPlaceholderRow(newRow)) {
-        const { isAddPlaceholder, ...newRecordRow } = newRow;
-        newRow = newRecordRow;
-      }
-
-      const rowKeyWithRecord = getRowKey(newRow, pkColumn?.id);
-      this.meta.rowCreationStatus.delete(rowKeyOfBlankRow);
-      this.meta.rowCreationStatus.set(rowKeyWithRecord, { state: 'success' });
-      this.newRecords.update((existing) =>
-        existing.map((entry) => {
-          if (entry.identifier === row.identifier) {
-            return newRow;
-          }
-          return entry;
-        }),
-      );
-      this.totalCount.update((count) => (count ?? 0) + 1);
-      return newRow;
-    } catch (err) {
-      this.meta.rowCreationStatus.set(rowKeyOfBlankRow, {
-        state: 'failure',
-        errors: [getErrorMessage(err)],
-      });
-    } finally {
-      if (this.createPromises.get(rowKeyOfBlankRow) === promise) {
-        this.createPromises.delete(rowKeyOfBlankRow);
-      }
-    }
-    return row;
+    throw new Error('Not implemented'); // TODO_BETA
+
+    // const promise = postAPI<RecordsResponse>(this.url, requestRecord);
+    // if (!this.createPromises) {
+    //   this.createPromises = new Map();
+    // }
+    // this.createPromises.set(rowKeyOfBlankRow, promise);
+
+    // try {
+    //   const response = await promise;
+    //   const record = response.results[0];
+    //   let newRow: NewRecordRow = {
+    //     ...row,
+    //     record,
+    //   };
+    //   if (isPlaceholderRow(newRow)) {
+    //     const { isAddPlaceholder, ...newRecordRow } = newRow;
+    //     newRow = newRecordRow;
+    //   }
+
+    //   const rowKeyWithRecord = getRowKey(newRow, pkColumn?.id);
+    //   this.meta.rowCreationStatus.delete(rowKeyOfBlankRow);
+    //   this.meta.rowCreationStatus.set(rowKeyWithRecord, { state: 'success' });
+    //   this.newRecords.update((existing) =>
+    //     existing.map((entry) => {
+    //       if (entry.identifier === row.identifier) {
+    //         return newRow;
+    //       }
+    //       return entry;
+    //     }),
+    //   );
+    //   this.totalCount.update((count) => (count ?? 0) + 1);
+    //   return newRow;
+    // } catch (err) {
+    //   this.meta.rowCreationStatus.set(rowKeyOfBlankRow, {
+    //     state: 'failure',
+    //     errors: [getErrorMessage(err)],
+    //   });
+    // } finally {
+    //   if (this.createPromises.get(rowKeyOfBlankRow) === promise) {
+    //     this.createPromises.delete(rowKeyOfBlankRow);
+    //   }
+    // }
+    // return row;
   }
 
   async createOrUpdateRecord(
diff --git a/mathesar_ui/src/stores/table-data/searchFuzzy.ts b/mathesar_ui/src/stores/table-data/searchFuzzy.ts
index 411f9b6f5c..92040e486e 100644
--- a/mathesar_ui/src/stores/table-data/searchFuzzy.ts
+++ b/mathesar_ui/src/stores/table-data/searchFuzzy.ts
@@ -1,4 +1,4 @@
-import type { GetRequestParams } from '@mathesar/api/rest/types/tables/records';
+import type { RecordsListParams } from '@mathesar/api/rpc/records';
 import { ImmutableMap } from '@mathesar/component-library';
 
 /**
@@ -18,7 +18,7 @@ export class SearchFuzzy extends ImmutableMap<number, unknown> {
     this.valueIsValid = valueIsSearchable;
   }
 
-  recordsRequestParams(): Pick<GetRequestParams, 'search_fuzzy'> {
+  recordsRequestParams(): Pick<RecordsListParams, 'search_fuzzy'> {
     if (this.size === 0) {
       return {};
     }
diff --git a/mathesar_ui/src/stores/table-data/sorting.ts b/mathesar_ui/src/stores/table-data/sorting.ts
index f133a5a8f2..3b4a286123 100644
--- a/mathesar_ui/src/stores/table-data/sorting.ts
+++ b/mathesar_ui/src/stores/table-data/sorting.ts
@@ -1,8 +1,8 @@
 import type {
   SortDirection as ApiSortDirection,
   SortingEntry as ApiSortingEntry,
-  GetRequestParams,
-} from '@mathesar/api/rest/types/tables/records';
+  RecordsListParams,
+} from '@mathesar/api/rpc/records';
 import {
   type SortDirection,
   allowedSortDirections,
@@ -45,7 +45,7 @@ export class Sorting extends ImmutableMap<number, SortDirection> {
     super(entries);
   }
 
-  private recordsRequestParams(): Pick<GetRequestParams, 'order_by'> {
+  private recordsRequestParams(): Pick<RecordsListParams, 'order_by'> {
     const sortingEntries: ApiSortingEntry[] = [...this].map(
       ([columnId, sortDirection]) => ({
         field: columnId,
@@ -65,7 +65,7 @@ export class Sorting extends ImmutableMap<number, SortDirection> {
    */
   recordsRequestParamsIncludingGrouping(
     grouping: Grouping,
-  ): Pick<GetRequestParams, 'order_by'> {
+  ): Pick<RecordsListParams, 'order_by'> {
     const sortingFromGrouping = new Sorting(
       grouping.entries.map((g) => [g.columnId, 'ASCENDING']),
     );
diff --git a/mathesar_ui/src/stores/table-data/tabularData.ts b/mathesar_ui/src/stores/table-data/tabularData.ts
index 39362c19df..8fc01d60af 100644
--- a/mathesar_ui/src/stores/table-data/tabularData.ts
+++ b/mathesar_ui/src/stores/table-data/tabularData.ts
@@ -80,7 +80,8 @@ export class TabularData {
       shareConsumer: this.shareConsumer,
     });
     this.recordsData = new RecordsData({
-      tableId: this.table.oid,
+      database: props.database,
+      table: props.table,
       meta: this.meta,
       columnsDataStore: this.columnsDataStore,
       contextualFilters,
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
index 2305433c06..12e15c77bc 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
@@ -2,8 +2,8 @@
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
 
-  import type { Response as ApiRecordsResponse } from '@mathesar/api/rest/types/tables/records';
   import { States, postAPI } from '@mathesar/api/rest/utils/requestUtils';
+  import type { RecordsResponse } from '@mathesar/api/rpc/records';
   import { iconAddNew } from '@mathesar/icons';
   import { storeToGetRecordPageUrl } from '@mathesar/stores/storeBasedUrls';
   import type { TabularData } from '@mathesar/stores/table-data';
@@ -76,7 +76,7 @@
     const body = getDataForNewRecord();
     try {
       isSubmittingNewRecord = true;
-      const response = await postAPI<ApiRecordsResponse>(url, body);
+      const response = await postAPI<RecordsResponse>(url, body);
       const record = response.results[0];
       const recordId = getPkValueInRecord(record, $columns);
       const previewData = response.preview_data ?? [];
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorController.ts b/mathesar_ui/src/systems/record-selector/RecordSelectorController.ts
index 6944a8e64a..947ef816a6 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorController.ts
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorController.ts
@@ -1,8 +1,8 @@
 import { getContext, setContext } from 'svelte';
 import { writable } from 'svelte/store';
 
-import type { Result as ApiRecord } from '@mathesar/api/rest/types/tables/records';
 import type { Column } from '@mathesar/api/rpc/columns';
+import type { Result as ApiRecord } from '@mathesar/api/rpc/records';
 import type { DBObjectEntry } from '@mathesar/AppTypes';
 
 import type { RecordSelectorPurpose } from './recordSelectorUtils';
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/Filter.svelte b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/Filter.svelte
index f93483ae5e..141aeefa37 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/Filter.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/Filter.svelte
@@ -4,7 +4,7 @@
   import { type Writable, writable } from 'svelte/store';
   import { _ } from 'svelte-i18n';
 
-  import type { FilterCombination } from '@mathesar/api/rest/types/tables/records';
+  import type { FilterCombination } from '@mathesar/api/rpc/records';
   import type { LinkedRecordInputElement } from '@mathesar/components/cell-fabric/data-types/components/linked-record/LinkedRecordUtils';
   import { validateFilterEntry } from '@mathesar/components/filter-entry';
   import { FILTER_INPUT_CLASS } from '@mathesar/components/filter-entry/utils';
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterEntries.svelte b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterEntries.svelte
index 1de93aab34..6440d03dbe 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterEntries.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterEntries.svelte
@@ -2,7 +2,7 @@
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
 
-  import type { FilterCombination } from '@mathesar/api/rest/types/tables/records';
+  import type { FilterCombination } from '@mathesar/api/rpc/records';
   import { FilterEntry as FilterEntryComponent } from '@mathesar/components/filter-entry';
   import {
     type FilterEntry,
diff --git a/mathesar_ui/src/systems/table-view/row/GroupHeaderCellValue.svelte b/mathesar_ui/src/systems/table-view/row/GroupHeaderCellValue.svelte
index 8f703ca54a..3285a2be85 100644
--- a/mathesar_ui/src/systems/table-view/row/GroupHeaderCellValue.svelte
+++ b/mathesar_ui/src/systems/table-view/row/GroupHeaderCellValue.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { ResultValue } from '@mathesar/api/rest/types/tables/records';
+  import type { ResultValue } from '@mathesar/api/rpc/records';
   import CellValue from '@mathesar/components/CellValue.svelte';
   import LinkedRecord from '@mathesar/components/LinkedRecord.svelte';
   import { storeToGetRecordPageUrl } from '@mathesar/stores/storeBasedUrls';

From 9d2d7cd86b8f1db97e73d72ad1505a78ee4ba78f Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 30 Jul 2024 23:25:18 +0530
Subject: [PATCH 0531/1141] add run endpoint along with docstrings and endpoint
 test

---
 docs/docs/api/rpc.md                 |  3 ++
 mathesar/rpc/explorations.py         | 70 ++++++++++++++++++++++++++--
 mathesar/tests/rpc/test_endpoints.py |  5 ++
 mathesar/utils/explorations.py       | 21 ++++-----
 4 files changed, 85 insertions(+), 14 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 0f969220fb..dad6a1ee61 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -194,7 +194,10 @@ To use an RPC function:
       members:
       - list_
       - delete
+      - run
       - ExplorationInfo
+      - ExplorationDef
+      - ExplorationResult
 
 ## Roles
 
diff --git a/mathesar/rpc/explorations.py b/mathesar/rpc/explorations.py
index 5ac9bfc168..7313f12af2 100644
--- a/mathesar/rpc/explorations.py
+++ b/mathesar/rpc/explorations.py
@@ -3,16 +3,17 @@
 """
 from typing import Optional, TypedDict
 
-from modernrpc.core import rpc_method
+from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
-from mathesar.utils.explorations import get_explorations, delete_exploration
+from mathesar.rpc.utils import connect
+from mathesar.utils.explorations import get_explorations, delete_exploration, run_exploration
 
 
 class ExplorationInfo(TypedDict):
     """
-    Information about a Exploration.
+    Information about an exploration.
 
     Attributes:
         id: The Django id of an exploration.
@@ -50,6 +51,52 @@ def from_model(cls, model):
         )
 
 
+class ExplorationDef(TypedDict):
+    """
+    Definition about a runnable exploration.
+
+    Attributes:
+        base_table_oid: The OID of the base table of the exploration on the database.
+        initial_columns: A list describing the columns to be included in the exploration.
+        display_names: A map between the actual column names on the database and the alias to be displayed.
+        transformations: A list describing the transformations to be made on the included columns.
+        parameters: A dict describing the properties to be applied while retrieving records e.g. limit, offset, filter, order_by, etc.
+    """
+    base_table_oid: int
+    initial_columns: list
+    display_names: dict
+    transformations: Optional[list]
+    parameters: Optional[dict]
+
+
+class ExplorationResult(TypedDict):
+    """
+    Result of a ran exploration.
+
+    Attributes:
+        query: A dict describing the exploration that ran.
+        records: A dict describing the total count of records along with the contents of those records.
+        output_columns: A tuple describing the names of the columns included in the exploration.
+        column_metadata: A dict describing the metadata applied to included columns.
+        parameters: A dict describing the properties applied while retrieving records e.g. limit, offset, filter, order_by, etc.
+    """
+    query: dict
+    records: dict
+    output_columns: tuple
+    column_metadata: dict
+    parameters: dict
+
+    @classmethod
+    def from_dict(cls, e):
+        return cls(
+            query=e["query"],
+            records=e["records"],
+            output_columns=e["output_columns"],
+            column_metadata=e["column_metadata"],
+            parameters=e["parameters"]
+        )
+
+
 @rpc_method(name="explorations.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
@@ -78,3 +125,20 @@ def delete(*, exploration_id: int, **kwargs) -> None:
         exploration_id: The Django id of the exploration to delete.
     """
     delete_exploration(exploration_id)
+
+
+@rpc_method(name="explorations.run")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def run(*, exploration_def: ExplorationDef, database_id: int, **kwargs) -> ExplorationResult:
+    """
+    Run an exploration.
+
+    Args:
+        exploration_def: A dict describing an exploration to run.
+        database_id: The Django id of the database containing the base table for the exploration.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        exploration_result = run_exploration(exploration_def, database_id, conn)
+    return ExplorationResult.from_dict(exploration_result)
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 91db2de782..99817ea762 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -159,6 +159,11 @@
         "explorations.delete",
         [user_is_authenticated]
     ),
+    (
+        explorations.run,
+        "explorations.run",
+        [user_is_authenticated]
+    )
     (
         roles.list_,
         "roles.list",
diff --git a/mathesar/utils/explorations.py b/mathesar/utils/explorations.py
index c42601378f..97d88ecce7 100644
--- a/mathesar/utils/explorations.py
+++ b/mathesar/utils/explorations.py
@@ -27,7 +27,7 @@ def run_exploration(exploration_def, database_id, conn):
     )
     metadata = get_cached_metadata()
     base_table_oid = exploration_def["base_table_oid"]
-    initial_columns = exploration_def.get('initial_columns')
+    initial_columns = exploration_def['initial_columns']
     params = exploration_def.get('parameters', {})
     processed_initial_columns = []
     for column in initial_columns:
@@ -67,16 +67,15 @@ def run_exploration(exploration_def, database_id, conn):
         duplicate_only=params.get('duplicate_only', None)
     )
     processed_records = process_annotated_records(records)[0]
-    with conn:
-        column_metadata = _get_exploration_column_metadata(
-            exploration_def,
-            processed_initial_columns,
-            database_id,
-            db_query,
-            conn,
-            engine,
-            metadata
-        )
+    column_metadata = _get_exploration_column_metadata(
+        exploration_def,
+        processed_initial_columns,
+        database_id,
+        db_query,
+        conn,
+        engine,
+        metadata
+    )
     return {
         "query": exploration_def,
         "records": {

From 7722fccc2a648a63d01379a60f12c9b6db2a9c95 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 30 Jul 2024 23:48:53 +0530
Subject: [PATCH 0532/1141] fix test

---
 mathesar/tests/rpc/test_endpoints.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 99817ea762..6383d28b3a 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -163,7 +163,7 @@
         explorations.run,
         "explorations.run",
         [user_is_authenticated]
-    )
+    ),
     (
         roles.list_,
         "roles.list",

From 010f5c54ac3c4751ecf6e53877d25fe70b9ed58a Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 30 Jul 2024 14:23:41 -0400
Subject: [PATCH 0533/1141] Fix renamed records request params

---
 mathesar_ui/src/api/rpc/records.ts            | 6 +++---
 mathesar_ui/src/stores/table-data/grouping.ts | 6 +++---
 mathesar_ui/src/stores/table-data/sorting.ts  | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/records.ts b/mathesar_ui/src/api/rpc/records.ts
index 8cb988c46b..5389b42989 100644
--- a/mathesar_ui/src/api/rpc/records.ts
+++ b/mathesar_ui/src/api/rpc/records.ts
@@ -24,7 +24,7 @@ export interface Grouping {
 export type SortDirection = 'asc' | 'desc';
 export interface SortingEntry {
   /** column id */
-  field: number;
+  attnum: number;
   direction: SortDirection;
 }
 export type FilterCombination = 'and' | 'or';
@@ -43,8 +43,8 @@ export interface RecordsListParams {
   table_oid: number;
   limit?: number;
   offset?: number;
-  order_by?: SortingEntry[];
-  grouping?: Pick<Grouping, 'columns' | 'preproc'>;
+  order?: SortingEntry[];
+  group?: Pick<Grouping, 'columns' | 'preproc'>;
   filter?: FilterRequest;
   search_fuzzy?: Record<string, unknown>[];
 }
diff --git a/mathesar_ui/src/stores/table-data/grouping.ts b/mathesar_ui/src/stores/table-data/grouping.ts
index 1180b6fea0..4dbafb7511 100644
--- a/mathesar_ui/src/stores/table-data/grouping.ts
+++ b/mathesar_ui/src/stores/table-data/grouping.ts
@@ -75,11 +75,11 @@ export class Grouping {
     });
   }
 
-  recordsRequestParams(): Pick<RecordsListParams, 'grouping'> {
+  recordsRequestParams(): Pick<RecordsListParams, 'group'> {
     if (!this.entries.length) {
       return {};
     }
-    const request: RecordsListParams['grouping'] = {
+    const request: RecordsListParams['group'] = {
       columns: [],
       preproc: [],
     };
@@ -91,7 +91,7 @@ export class Grouping {
       request.preproc = null;
     }
     return {
-      grouping: request,
+      group: request,
     };
   }
 
diff --git a/mathesar_ui/src/stores/table-data/sorting.ts b/mathesar_ui/src/stores/table-data/sorting.ts
index 3b4a286123..f5b23f8b5b 100644
--- a/mathesar_ui/src/stores/table-data/sorting.ts
+++ b/mathesar_ui/src/stores/table-data/sorting.ts
@@ -45,17 +45,17 @@ export class Sorting extends ImmutableMap<number, SortDirection> {
     super(entries);
   }
 
-  private recordsRequestParams(): Pick<RecordsListParams, 'order_by'> {
+  private recordsRequestParams(): Pick<RecordsListParams, 'order'> {
     const sortingEntries: ApiSortingEntry[] = [...this].map(
       ([columnId, sortDirection]) => ({
-        field: columnId,
+        attnum: columnId,
         direction: getApiSortDirection(sortDirection),
       }),
     );
     if (!sortingEntries.length) {
       return {};
     }
-    return { order_by: sortingEntries };
+    return { order: sortingEntries };
   }
 
   /**
@@ -65,7 +65,7 @@ export class Sorting extends ImmutableMap<number, SortDirection> {
    */
   recordsRequestParamsIncludingGrouping(
     grouping: Grouping,
-  ): Pick<RecordsListParams, 'order_by'> {
+  ): Pick<RecordsListParams, 'order'> {
     const sortingFromGrouping = new Sorting(
       grouping.entries.map((g) => [g.columnId, 'ASCENDING']),
     );

From 2ca58524e1d38b0c57bc7a60102657d9d1b89273 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 30 Jul 2024 14:38:51 -0400
Subject: [PATCH 0534/1141] Update code comments

---
 mathesar_ui/src/systems/data-explorer/utils.ts             | 3 ++-
 .../table-inspector/column/SetDefaultValue.svelte          | 7 -------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/mathesar_ui/src/systems/data-explorer/utils.ts b/mathesar_ui/src/systems/data-explorer/utils.ts
index 5e6bc31802..24ef474430 100644
--- a/mathesar_ui/src/systems/data-explorer/utils.ts
+++ b/mathesar_ui/src/systems/data-explorer/utils.ts
@@ -475,7 +475,8 @@ export function speculateColumnMetaData({
                 type_options:
                   aggregation.function === 'distinct_aggregate_to_array'
                     ? {
-                        // TODO_3704: Ask Pavish.
+                        // TODO_BETA: Ask Pavish.
+                        //
                         // `Column['type_options']` was previously typed loosely
                         // as `Record<string, unknown> | null`. Now it's more
                         // strict and it doesn't have a `type` property.
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte
index b01d564a32..caa91703da 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte
@@ -49,13 +49,6 @@
       ? null
       : {
           is_dynamic: !!column.column.default?.is_dynamic,
-
-          // TODO_3704:
-          //
-          // We need to check with the backend team if we should actually be
-          // stringifying `value` in this case. The API docs indicated that
-          // `value` is to only be accepted as a string. But that seems weird to
-          // me.
           value: String(value),
         };
     try {

From acc76078af59ce7f1860494d02903aea1974976f Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 31 Jul 2024 00:35:06 +0530
Subject: [PATCH 0535/1141] alter column metadata fields

---
 ...mnmetadata_duration_show_units_and_more.py | 31 +++++++++++++++++++
 mathesar/models/base.py                       | 10 ++++--
 mathesar/rpc/columns/metadata.py              | 24 +++++++-------
 mathesar/tests/rpc/columns/test_c_metadata.py | 16 +++++-----
 4 files changed, 59 insertions(+), 22 deletions(-)
 create mode 100644 mathesar/migrations/0014_remove_columnmetadata_duration_show_units_and_more.py

diff --git a/mathesar/migrations/0014_remove_columnmetadata_duration_show_units_and_more.py b/mathesar/migrations/0014_remove_columnmetadata_duration_show_units_and_more.py
new file mode 100644
index 0000000000..1460cc3732
--- /dev/null
+++ b/mathesar/migrations/0014_remove_columnmetadata_duration_show_units_and_more.py
@@ -0,0 +1,31 @@
+# Generated by Django 4.2.11 on 2024-07-30 19:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mathesar', '0013_alter_columnmetadata_bool_false_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='columnmetadata',
+            name='duration_show_units',
+        ),
+        migrations.RemoveField(
+            model_name='columnmetadata',
+            name='num_show_as_perc',
+        ),
+        migrations.AddField(
+            model_name='columnmetadata',
+            name='num_format',
+            field=models.CharField(choices=[('english', 'english'), ('german', 'german'), ('french', 'french'), ('hindi', 'hindi'), ('swiss', 'swiss')], null=True),
+        ),
+        migrations.AddField(
+            model_name='columnmetadata',
+            name='num_grouping',
+            field=models.CharField(choices=[('force-yes', 'force-yes'), ('force-no', 'force-no')], null=True),
+        ),
+    ]
diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index cb0606bba8..62e53101cd 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -94,7 +94,14 @@ class ColumnMetaData(BaseModel):
     bool_false = models.CharField(null=True)
     num_min_frac_digits = models.PositiveIntegerField(null=True)
     num_max_frac_digits = models.PositiveIntegerField(null=True)
-    num_show_as_perc = models.BooleanField(null=True)
+    num_grouping = models.CharField(
+        choices=[("force-yes", "force-yes"), ("force-no", "force-no")],
+        null=True
+    )
+    num_format = models.CharField(
+        choices=[("english", "english"), ("german", "german"), ("french", "french"), ("hindi", "hindi"), ("swiss", "swiss")],
+        null=True
+    )
     mon_currency_symbol = models.CharField(null=True)
     mon_currency_location = models.CharField(
         choices=[("after-minus", "after-minus"), ("end-with-space", "end-with-space")],
@@ -104,7 +111,6 @@ class ColumnMetaData(BaseModel):
     date_format = models.CharField(null=True)
     duration_min = models.CharField(max_length=255, null=True)
     duration_max = models.CharField(max_length=255, null=True)
-    duration_show_units = models.BooleanField(null=True)
 
     class Meta:
         constraints = [
diff --git a/mathesar/rpc/columns/metadata.py b/mathesar/rpc/columns/metadata.py
index bfd9a64168..ea04788a41 100644
--- a/mathesar/rpc/columns/metadata.py
+++ b/mathesar/rpc/columns/metadata.py
@@ -25,14 +25,14 @@ class ColumnMetaDataRecord(TypedDict):
         bool_false: A string to display for `false` values.
         num_min_frac_digits: Minimum digits shown after the decimal point.
         num_max_frac_digits: Maximum digits shown after the decimal point.
-        num_show_as_perc: Whether to show a numeric value as a percentage.
+        num_grouping:
+        num_format:
         mon_currency_symbol: The currency symbol shown for money value.
         mon_currency_location: Where the currency symbol should be shown.
         time_format: A string representing the format of time values.
         date_format: A string representing the format of date values.
         duration_min: The smallest unit for displaying durations.
         duration_max: The largest unit for displaying durations.
-        duration_show_units: Whether to show the units for durations.
     """
     database_id: int
     table_oid: int
@@ -42,14 +42,14 @@ class ColumnMetaDataRecord(TypedDict):
     bool_false: Optional[str]
     num_min_frac_digits: Optional[int]
     num_max_frac_digits: Optional[int]
-    num_show_as_perc: Optional[bool]
+    num_grouping: Optional[bool]
+    num_format: Optional[bool]
     mon_currency_symbol: Optional[str]
     mon_currency_location: Optional[Literal["after-minus", "end-with-space"]]
     time_format: Optional[str]
     date_format: Optional[str]
     duration_min: Optional[str]
     duration_max: Optional[str]
-    duration_show_units: Optional[bool]
 
     @classmethod
     def from_model(cls, model):
@@ -62,14 +62,14 @@ def from_model(cls, model):
             bool_false=model.bool_false,
             num_min_frac_digits=model.num_min_frac_digits,
             num_max_frac_digits=model.num_max_frac_digits,
-            num_show_as_perc=model.num_show_as_perc,
+            num_grouping=model.num_grouping,
+            num_format=model.num_format,
             mon_currency_symbol=model.mon_currency_symbol,
             mon_currency_location=model.mon_currency_location,
             time_format=model.time_format,
             date_format=model.date_format,
             duration_min=model.duration_min,
             duration_max=model.duration_max,
-            duration_show_units=model.duration_show_units,
         )
 
 
@@ -84,14 +84,14 @@ class ColumnMetaDataBlob(TypedDict):
         bool_false: A string to display for `false` values.
         num_min_frac_digits: Minimum digits shown after the decimal point.
         num_max_frac_digits: Maximum digits shown after the decimal point.
-        num_show_as_perc: Whether to show a numeric value as a percentage.
+        num_grouping:
+        num_format:
         mon_currency_symbol: The currency symbol shown for money value.
         mon_currency_location: Where the currency symbol should be shown.
         time_format: A string representing the format of time values.
         date_format: A string representing the format of date values.
         duration_min: The smallest unit for displaying durations.
         duration_max: The largest unit for displaying durations.
-        duration_show_units: Whether to show the units for durations.
     """
     attnum: int
     bool_input: Optional[Literal["dropdown", "checkbox"]]
@@ -99,14 +99,14 @@ class ColumnMetaDataBlob(TypedDict):
     bool_false: Optional[str]
     num_min_frac_digits: Optional[int]
     num_max_frac_digits: Optional[int]
-    num_show_as_perc: Optional[bool]
+    num_grouping: Optional[str]
+    num_format: Optional[str]
     mon_currency_symbol: Optional[str]
     mon_currency_location: Optional[Literal["after-minus", "end-with-space"]]
     time_format: Optional[str]
     date_format: Optional[str]
     duration_min: Optional[str]
     duration_max: Optional[str]
-    duration_show_units: Optional[bool]
 
     @classmethod
     def from_model(cls, model):
@@ -117,14 +117,14 @@ def from_model(cls, model):
             bool_false=model.bool_false,
             num_min_frac_digits=model.num_min_frac_digits,
             num_max_frac_digits=model.num_max_frac_digits,
-            num_show_as_perc=model.num_show_as_perc,
+            num_grouping=model.num_grouping,
+            num_format=model.num_format,
             mon_currency_symbol=model.mon_currency_symbol,
             mon_currency_location=model.mon_currency_location,
             time_format=model.time_format,
             date_format=model.date_format,
             duration_min=model.duration_min,
             duration_max=model.duration_max,
-            duration_show_units=model.duration_show_units
         )
 
 
diff --git a/mathesar/tests/rpc/columns/test_c_metadata.py b/mathesar/tests/rpc/columns/test_c_metadata.py
index b76a3b31a6..3e28deb6e9 100644
--- a/mathesar/tests/rpc/columns/test_c_metadata.py
+++ b/mathesar/tests/rpc/columns/test_c_metadata.py
@@ -20,18 +20,18 @@ def mock_get_columns_meta_data(_table_oid, _database_id):
             ColumnMetaData(
                 database=db_model, table_oid=_table_oid, attnum=2,
                 bool_input="dropdown", bool_true="TRUE", bool_false="FALSE",
-                num_min_frac_digits=5, num_max_frac_digits=10, num_show_as_perc=False,
+                num_min_frac_digits=5, num_max_frac_digits=10, num_grouping="force-yes",
                 mon_currency_symbol="EUR", mon_currency_location="end-with-space",
                 time_format=None, date_format=None,
-                duration_min=None, duration_max=None, duration_show_units=True,
+                duration_min=None, duration_max=None, num_format="english",
             ),
             ColumnMetaData(
                 database=db_model, table_oid=_table_oid, attnum=8,
                 bool_input="checkbox", bool_true="true", bool_false="false",
-                num_min_frac_digits=2, num_max_frac_digits=8, num_show_as_perc=True,
+                num_min_frac_digits=2, num_max_frac_digits=8, num_grouping="force-no",
                 mon_currency_symbol="$", mon_currency_location="after-minus",
                 time_format=None, date_format=None,
-                duration_min=None, duration_max=None, duration_show_units=True,
+                duration_min=None, duration_max=None, num_format="german",
             )
         ]
 
@@ -41,18 +41,18 @@ def mock_get_columns_meta_data(_table_oid, _database_id):
         metadata.ColumnMetaDataRecord(
             database_id=database_id, table_oid=table_oid, attnum=2,
             bool_input="dropdown", bool_true="TRUE", bool_false="FALSE",
-            num_min_frac_digits=5, num_max_frac_digits=10, num_show_as_perc=False,
+            num_min_frac_digits=5, num_max_frac_digits=10, num_grouping="force-yes",
             mon_currency_symbol="EUR", mon_currency_location="end-with-space",
             time_format=None, date_format=None,
-            duration_min=None, duration_max=None, duration_show_units=True,
+            duration_min=None, duration_max=None, num_format="english",
         ),
         metadata.ColumnMetaDataRecord(
             database_id=database_id, table_oid=table_oid, attnum=8,
             bool_input="checkbox", bool_true="true", bool_false="false",
-            num_min_frac_digits=2, num_max_frac_digits=8, num_show_as_perc=True,
+            num_min_frac_digits=2, num_max_frac_digits=8, num_grouping="force-no",
             mon_currency_symbol="$", mon_currency_location="after-minus",
             time_format=None, date_format=None,
-            duration_min=None, duration_max=None, duration_show_units=True,
+            duration_min=None, duration_max=None, num_format="german",
         ),
     ]
     actual_metadata_list = metadata.list_(table_oid=table_oid, database_id=database_id)

From caa32633502058da4bf280dc56337e871e0e5f4a Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 31 Jul 2024 00:37:42 +0530
Subject: [PATCH 0536/1141] change datatype

---
 mathesar/rpc/columns/metadata.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mathesar/rpc/columns/metadata.py b/mathesar/rpc/columns/metadata.py
index ea04788a41..c0cafbbb93 100644
--- a/mathesar/rpc/columns/metadata.py
+++ b/mathesar/rpc/columns/metadata.py
@@ -42,8 +42,8 @@ class ColumnMetaDataRecord(TypedDict):
     bool_false: Optional[str]
     num_min_frac_digits: Optional[int]
     num_max_frac_digits: Optional[int]
-    num_grouping: Optional[bool]
-    num_format: Optional[bool]
+    num_grouping: Optional[str]
+    num_format: Optional[str]
     mon_currency_symbol: Optional[str]
     mon_currency_location: Optional[Literal["after-minus", "end-with-space"]]
     time_format: Optional[str]

From f3716d61736e70e7d5d61847ce26037b74d003bc Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 31 Jul 2024 00:55:01 +0530
Subject: [PATCH 0537/1141] Implement common card component

---
 mathesar_ui/src/components/Card.svelte | 148 +++++++++++++++++++++++++
 1 file changed, 148 insertions(+)
 create mode 100644 mathesar_ui/src/components/Card.svelte

diff --git a/mathesar_ui/src/components/Card.svelte b/mathesar_ui/src/components/Card.svelte
new file mode 100644
index 0000000000..a087856d19
--- /dev/null
+++ b/mathesar_ui/src/components/Card.svelte
@@ -0,0 +1,148 @@
+<script lang="ts">
+  import { iconMoreActions } from '@mathesar/icons';
+  import {
+    DropdownMenu,
+    makeStyleStringFromCssVariables,
+  } from '@mathesar-component-library';
+
+  export let href: string;
+  export let ariaLabel: string | undefined = undefined;
+  export let cssVariables: Record<string, string> | undefined = undefined;
+
+  let isHoveringMenuTrigger = false;
+  let isCardFocused = false;
+
+  $: style = cssVariables
+    ? makeStyleStringFromCssVariables(cssVariables)
+    : undefined;
+</script>
+
+<div
+  class="card"
+  class:focus={isCardFocused}
+  class:hovering-menu-trigger={isHoveringMenuTrigger}
+  {style}
+>
+  <a
+    class="link passthrough"
+    {href}
+    aria-label={ariaLabel}
+    on:focusin={() => {
+      isCardFocused = true;
+    }}
+    on:focusout={() => {
+      isCardFocused = false;
+    }}
+  >
+    <div class="top">
+      <slot />
+    </div>
+    {#if $$slots.description}
+      <div class="description">
+        <slot name="description" />
+      </div>
+    {/if}
+  </a>
+  {#if $$slots.menu}
+    <div
+      class="menu-container"
+      on:mouseenter={() => {
+        isHoveringMenuTrigger = true;
+      }}
+      on:mouseleave={() => {
+        isHoveringMenuTrigger = false;
+      }}
+    >
+      <DropdownMenu
+        showArrow={false}
+        triggerAppearance="ghost"
+        triggerClass="dropdown-menu-button"
+        closeOnInnerClick={true}
+        placements={['bottom-end', 'right-start', 'left-start']}
+        label=""
+        icon={iconMoreActions}
+        size="small"
+      >
+        <slot name="menu" />
+      </DropdownMenu>
+    </div>
+  {/if}
+  {#if $$slots.footer}
+    <div class="footer">
+      <slot name="footer" />
+    </div>
+  {/if}
+</div>
+
+<style>
+  .card {
+    position: relative;
+    isolation: isolate;
+    border-radius: var(--border-radius-l);
+    border: 1px solid var(--slate-200);
+    background-color: var(--white);
+    --padding-v-internal: 1rem;
+    --padding-h-internal: 1rem;
+  }
+  .card.focus {
+    outline: 2px solid var(--slate-300);
+    outline-offset: 1px;
+    border-radius: var(--border-radius-l);
+  }
+  .link {
+    display: grid;
+    grid-template: auto 1fr auto / 1fr;
+    border-radius: var(--border-radius-l);
+    cursor: pointer;
+    overflow: hidden;
+    height: 100%;
+    padding: var(--padding-v, var(--padding-v-internal)) 0;
+  }
+  .link:hover {
+    border-color: var(--slate-500);
+    background-color: var(--slate-50);
+    box-shadow: 0 0.2rem 0.4rem 0 rgba(0, 0, 0, 0.1);
+  }
+  .top {
+    overflow: hidden;
+    font-size: var(--text-size-large);
+    height: var(--menu-trigger-size, auto);
+    display: flex;
+    align-items: center;
+    padding: 0 var(--padding-h, var(--padding-h-internal));
+  }
+  .description:not(:empty) {
+    padding: var(--size-x-small) var(--padding-h, var(--padding-h-internal)) 0
+      var(--padding-h, var(--padding-h-internal));
+    font-size: var(--text-size-base);
+  }
+
+  .menu-container {
+    position: absolute;
+    top: 0;
+    right: 0;
+    margin: var(--size-ultra-small);
+    z-index: 1;
+  }
+  .menu-container :global(.dropdown-menu-button) {
+    width: 100%;
+    height: 100%;
+    font-size: var(--text-size-large);
+    color: var(--slate-500);
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+  }
+  .menu-container :global(.dropdown-menu-button:hover) {
+    color: var(--slate-800);
+    background: var(--slate-100);
+  }
+  .footer {
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    width: 100%;
+    z-index: 1;
+    cursor: pointer;
+  }
+</style>

From 655fa2cf72258cf28ab2b8bdf742017a4afc9fa2 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 31 Jul 2024 00:56:06 +0530
Subject: [PATCH 0538/1141] Use cards in home page

---
 mathesar_ui/src/pages/home/DatabaseRow.svelte | 65 ++++++++++++++----
 mathesar_ui/src/pages/home/HomePage.svelte    | 68 ++++++-------------
 2 files changed, 73 insertions(+), 60 deletions(-)

diff --git a/mathesar_ui/src/pages/home/DatabaseRow.svelte b/mathesar_ui/src/pages/home/DatabaseRow.svelte
index cee5066625..487fcc1db2 100644
--- a/mathesar_ui/src/pages/home/DatabaseRow.svelte
+++ b/mathesar_ui/src/pages/home/DatabaseRow.svelte
@@ -1,25 +1,66 @@
 <script lang="ts">
   import type { Database } from '@mathesar/api/rpc/databases';
-  import { iconConnection } from '@mathesar/icons';
+  import Card from '@mathesar/components/Card.svelte';
+  import { iconDatabase } from '@mathesar/icons';
   import { getDatabasePageUrl } from '@mathesar/routes/urls';
   import { Icon } from '@mathesar-component-library';
 
   export let database: Database;
 </script>
 
-<tr data-identifier="connection-row" class="grid-row">
-  <td>
-    <a href={getDatabasePageUrl(database.id)}>
-      <Icon {...iconConnection} />
-      {database.name}
-    </a>
-  </td>
-</tr>
+<Card
+  href={getDatabasePageUrl(database.id)}
+  cssVariables={{
+    '--padding-v': '1.4rem',
+  }}
+>
+  <div class="title">
+    <div class="icon-holder">
+      <div class="circle">
+        <Icon {...iconDatabase} size="1.1rem" />
+      </div>
+    </div>
+    <div class="content">
+      <div class="name">{database.name}</div>
+      <div class="server">{database.server_id}</div>
+    </div>
+  </div>
+</Card>
 
 <style lang="scss">
-  [data-identifier='connection-row'] {
-    td {
-      padding: var(--size-base);
+  .title {
+    display: grid;
+    width: 100%;
+    grid-template-columns: 4rem 1fr;
+  }
+  .icon-holder {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .circle {
+      background: var(--brand-500);
+      color: var(--white);
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      height: 2.8rem;
+      width: 2.8rem;
+      border-radius: 3rem;
+      border: 2px solid rgba(226, 211, 177, 0.5);
+    }
+  }
+  .content {
+    padding-left: var(--size-ultra-small);
+
+    .name {
+      font-size: var(--text-size-x-large);
+      font-weight: 500;
+    }
+
+    .server {
+      font-size: var(--text-size-base);
+      margin-top: var(--size-extreme-small);
     }
   }
 </style>
diff --git a/mathesar_ui/src/pages/home/HomePage.svelte b/mathesar_ui/src/pages/home/HomePage.svelte
index 07a7fd0681..22acbadedd 100644
--- a/mathesar_ui/src/pages/home/HomePage.svelte
+++ b/mathesar_ui/src/pages/home/HomePage.svelte
@@ -43,24 +43,26 @@
 </script>
 
 <svelte:head>
-  <title>{makeSimplePageTitle($_('connections'))}</title>
+  <title>{makeSimplePageTitle($_('databases'))}</title>
 </svelte:head>
 
 <LayoutWithHeader
   restrictWidth
   cssVariables={{
     '--page-padding': '0',
+    '--layout-background-color': 'var(--sand-100)',
     '--max-layout-width': 'var(--max-layout-width-console-pages)',
+    '--AppSecondaryHeader__padding': 'var(--size-x-large) 0',
   }}
 >
-  <div data-identifier="connections-header">
+  <div data-identifier="databases-header">
     <span>
-      {$_('database_connections')}
+      {$_('databases')}
       {#if $databases.size}({$databases.size}){/if}
     </span>
   </div>
 
-  <section data-identifier="connections-container">
+  <section data-identifier="databases-container">
     {#if $databases.size === 0}
       <DatabasesEmptyState />
     {:else}
@@ -81,9 +83,9 @@
           {/if}
         </svelte:fragment>
 
-        <p slot="resultInfo">
+        <span slot="resultInfo">
           <RichText
-            text={$_('connections_matching_search', {
+            text={$_('databases_matching_search', {
               values: {
                 count: filteredDatabases.length,
               },
@@ -94,23 +96,14 @@
               <strong>{filterQuery}</strong>
             {/if}
           </RichText>
-        </p>
+        </span>
 
         <svelte:fragment slot="content">
           {#if filteredDatabases.length}
-            <div data-identifier="connections-list-grid">
-              <table>
-                <thead>
-                  <tr>
-                    <th>{$_('database_name')}</th>
-                  </tr>
-                </thead>
-                <tbody>
-                  {#each filteredDatabases as database (database.id)}
-                    <DatabaseRow {database} />
-                  {/each}
-                </tbody>
-              </table>
+            <div data-identifier="databases-list-grid">
+              {#each filteredDatabases as database (database.id)}
+                <DatabaseRow {database} />
+              {/each}
             </div>
           {/if}
         </svelte:fragment>
@@ -122,11 +115,10 @@
 <ConnectDatabaseModal controller={connectDbModalController} />
 
 <style lang="scss">
-  [data-identifier='connections-header'] {
+  [data-identifier='databases-header'] {
     display: flex;
     padding: var(--size-x-large);
     align-items: center;
-    border-bottom: 1px solid var(--sand-200);
 
     span {
       flex: 1 0 0;
@@ -136,37 +128,17 @@
     }
   }
 
-  [data-identifier='connections-container'] {
+  [data-identifier='databases-container'] {
     display: flex;
     padding: var(--size-x-large);
     flex-direction: column;
     align-items: stretch;
     gap: var(--size-x-small);
+  }
 
-    [data-identifier='connections-list-grid'] {
-      border: 1px solid var(--slate-200);
-      border-radius: var(--border-radius-m);
-      overflow: auto;
-
-      table {
-        border-collapse: collapse;
-        min-width: 100%;
-      }
-
-      thead {
-        border-bottom: 1px solid var(--slate-200);
-        background: var(--slate-100);
-
-        th {
-          font-weight: 500;
-          padding: var(--size-xx-small) var(--size-large);
-          text-align: left;
-        }
-      }
-
-      tbody > :global(tr:not(first-child)) {
-        border-top: 1px solid var(--slate-200);
-      }
-    }
+  [data-identifier='databases-list-grid'] {
+    display: grid;
+    gap: 1rem;
+    margin-top: var(--size-x-large);
   }
 </style>

From 657e284e9e1881aa1041cd1ad70d0b931dc9aa7e Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 31 Jul 2024 00:56:36 +0530
Subject: [PATCH 0539/1141] Update text to Databases from Connections in home
 page

---
 mathesar_ui/src/components/AppHeader.svelte           |  2 +-
 .../src/components/breadcrumb/BreadcrumbItem.svelte   |  2 +-
 .../src/components/breadcrumb/DatabaseSelector.svelte |  6 +++---
 mathesar_ui/src/i18n/languages/en/dict.json           | 11 +++++------
 mathesar_ui/src/pages/WelcomePage.svelte              |  2 +-
 .../src/systems/databases/DatabasesEmptyState.svelte  |  2 +-
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/mathesar_ui/src/components/AppHeader.svelte b/mathesar_ui/src/components/AppHeader.svelte
index fb77c69754..8b58177a59 100644
--- a/mathesar_ui/src/components/AppHeader.svelte
+++ b/mathesar_ui/src/components/AppHeader.svelte
@@ -124,7 +124,7 @@
           </LinkMenuItem>
           <MenuDivider />
           <LinkMenuItem icon={iconConnection} href={HOME_URL}>
-            {$_('database_connections')}
+            {$_('databases')}
           </LinkMenuItem>
           {#if $userProfile.isSuperUser}
             <LinkMenuItem
diff --git a/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte b/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
index 2f557bbbf0..f4d6f4d095 100644
--- a/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
+++ b/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
@@ -34,7 +34,7 @@
   <div class="breadcrumb-item truncate">
     <BreadcrumbLink href={HOME_URL}>
       <NameWithIcon icon={iconConnection}>
-        {$_('connections')}
+        {$_('databases')}
       </NameWithIcon>
     </BreadcrumbLink>
   </div>
diff --git a/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte b/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
index ea61f78e71..44948a5df4 100644
--- a/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
@@ -29,12 +29,12 @@
 </script>
 
 <BreadcrumbSelector
-  data={new Map([[$_('connections'), breadcrumbEntries]])}
-  triggerLabel={$_('choose_connection')}
+  data={new Map([[$_('databases'), breadcrumbEntries]])}
+  triggerLabel={$_('choose_database')}
   persistentLinks={[
     {
       type: 'simple',
-      label: $_('manage_connections'),
+      label: $_('manage_databases'),
       href: HOME_URL,
       icon: iconConnection,
       // TODO: Handle active states for persistent links
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 2251eaa1d9..0168e285b6 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -46,7 +46,7 @@
   "cell": "Cell",
   "change_password": "Change Password",
   "check_for_updates": "Check for Updates",
-  "choose_connection": "Choose a Database Connection",
+  "choose_database": "Choose a Database",
   "choose_schema": "Choose a Schema",
   "choose_table_or_exploration": "Choose a Table or Exploration",
   "cleaning_up": "Cleaning up",
@@ -86,8 +86,6 @@
   "connection_name": "Connection Name",
   "connection_nickname": "Connection nickname",
   "connection_updated_successfully": "The connection has been successfully updated",
-  "connections": "Connections",
-  "connections_matching_search": "{count, plural, one {{count} connection matches [searchValue]} other {{count} connections match [searchValue]}}",
   "constraint": "Constraint",
   "constraint_name": "Constraint Name",
   "constraint_name_already_exists": "A constraint with that name already exists",
@@ -132,11 +130,12 @@
   "data_type_linked_column_restricted": "The data type of this column must match the referenced column and cannot be changed.",
   "data_type_pk_column_restricted": "The data type of the primary key column is restricted and cannot be changed.",
   "database": "Database",
-  "database_connections": "Database Connections",
   "database_name": "Database Name",
   "database_not_found": "Database with id [connectionId] is not found.",
   "database_server_credentials": "Database server credentials",
   "database_type": "Database Type",
+  "databases": "Databases",
+  "databases_matching_search": "{count, plural, one {{count} database matches [searchValue]} other {{count} databases match [searchValue]}}",
   "days": "Days",
   "default": "Default",
   "default_value": "Default Value",
@@ -283,8 +282,8 @@
   "loading_spinner_no_progress_bar": "You will see a loading spinner but no progress bar.",
   "log_out": "Log Out",
   "make_sure_database_exists": "Make sure this database already exists.",
-  "manage_connections": "Manage Connections",
   "manage_database_access": "Manage [databaseName] Database Access",
+  "manage_databases": "Manage Databases",
   "manage_schema_access": "Manage [databaseName] Schema Access",
   "manager": "Manager",
   "manager_access": "Manager Access",
@@ -333,7 +332,7 @@
   "no_actions_selected_record": "There are no actions to perform on the selected record(s).",
   "no_constraints": "No Constraints",
   "no_continue_without_summarization": "No, continue without summarizing",
-  "no_database_connections_yet": "No database connections yet",
+  "no_databases_connected": "No Databases Connected",
   "no_default_value": "No Default Value",
   "no_existing_records": "No existing records",
   "no_explorations": "No Explorations",
diff --git a/mathesar_ui/src/pages/WelcomePage.svelte b/mathesar_ui/src/pages/WelcomePage.svelte
index 3c52398d90..02030872de 100644
--- a/mathesar_ui/src/pages/WelcomePage.svelte
+++ b/mathesar_ui/src/pages/WelcomePage.svelte
@@ -28,7 +28,7 @@
   <div data-identifier="welcome-container">
     <section>
       <div class="header">
-        {$_('database_connections')}
+        {$_('databases')}
       </div>
       <DatabasesEmptyState />
     </section>
diff --git a/mathesar_ui/src/systems/databases/DatabasesEmptyState.svelte b/mathesar_ui/src/systems/databases/DatabasesEmptyState.svelte
index 4e3bb0bfd2..050d701fe8 100644
--- a/mathesar_ui/src/systems/databases/DatabasesEmptyState.svelte
+++ b/mathesar_ui/src/systems/databases/DatabasesEmptyState.svelte
@@ -17,7 +17,7 @@
         <Icon {...iconConnection} size="var(--size-super-ultra-large)" />
       </div>
       <div data-identifier="no-connections-text">
-        {$_('no_database_connections_yet')}
+        {$_('no_databases_connected')}
       </div>
       <div data-identifier="no-connections-help">
         {$_('setup_connections_help')}

From af451f598e422cdf59cce39425a5ba3de2c1ae4b Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 31 Jul 2024 01:41:18 +0530
Subject: [PATCH 0540/1141] Styling improvements for header and cards

---
 mathesar_ui/src/components/Card.svelte        |  9 +++++----
 mathesar_ui/src/pages/home/DatabaseRow.svelte |  4 ++--
 mathesar_ui/src/pages/home/HomePage.svelte    | 10 ++++------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/mathesar_ui/src/components/Card.svelte b/mathesar_ui/src/components/Card.svelte
index a087856d19..5988f778f1 100644
--- a/mathesar_ui/src/components/Card.svelte
+++ b/mathesar_ui/src/components/Card.svelte
@@ -96,7 +96,7 @@
     cursor: pointer;
     overflow: hidden;
     height: 100%;
-    padding: var(--padding-v, var(--padding-v-internal)) 0;
+    padding: var(--Card__padding-v, var(--padding-v-internal)) 0;
   }
   .link:hover {
     border-color: var(--slate-500);
@@ -109,11 +109,12 @@
     height: var(--menu-trigger-size, auto);
     display: flex;
     align-items: center;
-    padding: 0 var(--padding-h, var(--padding-h-internal));
+    padding: 0 var(--Card__padding-h, var(--padding-h-internal));
   }
   .description:not(:empty) {
-    padding: var(--size-x-small) var(--padding-h, var(--padding-h-internal)) 0
-      var(--padding-h, var(--padding-h-internal));
+    padding: var(--size-x-small)
+      var(--Card__padding-h, var(--padding-h-internal)) 0
+      var(--Card__padding-h, var(--padding-h-internal));
     font-size: var(--text-size-base);
   }
 
diff --git a/mathesar_ui/src/pages/home/DatabaseRow.svelte b/mathesar_ui/src/pages/home/DatabaseRow.svelte
index 487fcc1db2..3aeccbb30f 100644
--- a/mathesar_ui/src/pages/home/DatabaseRow.svelte
+++ b/mathesar_ui/src/pages/home/DatabaseRow.svelte
@@ -11,7 +11,7 @@
 <Card
   href={getDatabasePageUrl(database.id)}
   cssVariables={{
-    '--padding-v': '1.4rem',
+    '--Card__padding-v': '1.4rem',
   }}
 >
   <div class="title">
@@ -31,7 +31,7 @@
   .title {
     display: grid;
     width: 100%;
-    grid-template-columns: 4rem 1fr;
+    grid-template-columns: 3.5rem 1fr;
   }
   .icon-holder {
     display: flex;
diff --git a/mathesar_ui/src/pages/home/HomePage.svelte b/mathesar_ui/src/pages/home/HomePage.svelte
index 22acbadedd..ea011d28ee 100644
--- a/mathesar_ui/src/pages/home/HomePage.svelte
+++ b/mathesar_ui/src/pages/home/HomePage.svelte
@@ -49,10 +49,9 @@
 <LayoutWithHeader
   restrictWidth
   cssVariables={{
-    '--page-padding': '0',
+    '--page-padding': 'var(--size-xx-large) var(--size-x-large)',
     '--layout-background-color': 'var(--sand-100)',
     '--max-layout-width': 'var(--max-layout-width-console-pages)',
-    '--AppSecondaryHeader__padding': 'var(--size-x-large) 0',
   }}
 >
   <div data-identifier="databases-header">
@@ -117,20 +116,19 @@
 <style lang="scss">
   [data-identifier='databases-header'] {
     display: flex;
-    padding: var(--size-x-large);
     align-items: center;
 
     span {
       flex: 1 0 0;
       color: var(--slate-800);
-      font-size: var(--size-x-large);
-      font-weight: 600;
+      font-size: var(--size-xx-large);
+      font-weight: 500;
     }
   }
 
   [data-identifier='databases-container'] {
     display: flex;
-    padding: var(--size-x-large);
+    margin-top: var(--size-x-large);
     flex-direction: column;
     align-items: stretch;
     gap: var(--size-x-small);

From ef8b431a545d8e9ffe101db69e4204aef999c303 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 31 Jul 2024 02:17:53 +0530
Subject: [PATCH 0541/1141] Allow opening connect database modal in empty state

---
 .../src/components/breadcrumb/BreadcrumbItem.svelte    |  4 +---
 mathesar_ui/src/i18n/languages/en/dict.json            |  1 -
 mathesar_ui/src/pages/WelcomePage.svelte               |  7 ++++++-
 .../src/systems/databases/DatabasesEmptyState.svelte   | 10 +++++-----
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte b/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
index f4d6f4d095..7a49f316ee 100644
--- a/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
+++ b/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
@@ -33,9 +33,7 @@
   <DatabaseSelector />
   <div class="breadcrumb-item truncate">
     <BreadcrumbLink href={HOME_URL}>
-      <NameWithIcon icon={iconConnection}>
-        {$_('databases')}
-      </NameWithIcon>
+      {$_('databases')}
     </BreadcrumbLink>
   </div>
 {:else if item.type === 'database'}
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 0168e285b6..ffc63e4e3d 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -10,7 +10,6 @@
   "actions": "Actions",
   "add": "Add",
   "add_columns_to_exploration_empty_message": "This exploration does not contain any columns. Edit the exploration to add columns to it.",
-  "add_database_connection": "Add Database Connection",
   "add_filter": "Add Filter",
   "add_new_filter": "Add New Filter",
   "add_new_grouping": "Add New Grouping",
diff --git a/mathesar_ui/src/pages/WelcomePage.svelte b/mathesar_ui/src/pages/WelcomePage.svelte
index 02030872de..51eb628b28 100644
--- a/mathesar_ui/src/pages/WelcomePage.svelte
+++ b/mathesar_ui/src/pages/WelcomePage.svelte
@@ -13,8 +13,10 @@
 </script>
 
 <LayoutWithHeader
+  restrictWidth={true}
   cssVariables={{
     '--page-padding': '0',
+    '--max-layout-width': 'var(--max-layout-width-console-pages)',
   }}
 >
   <div data-identifier="welcome-header">
@@ -123,6 +125,8 @@
         border: 1px solid var(--sand-300);
         border-radius: var(--border-radius-l);
         padding: var(--size-large);
+        display: flex;
+        flex-direction: column;
 
         > .header {
           font-weight: 500;
@@ -131,7 +135,8 @@
           margin-top: var(--size-x-small);
         }
         > .footer {
-          margin-top: var(--size-x-large);
+          padding-top: var(--size-x-large);
+          margin-top: auto;
         }
       }
     }
diff --git a/mathesar_ui/src/systems/databases/DatabasesEmptyState.svelte b/mathesar_ui/src/systems/databases/DatabasesEmptyState.svelte
index 050d701fe8..8a495110bf 100644
--- a/mathesar_ui/src/systems/databases/DatabasesEmptyState.svelte
+++ b/mathesar_ui/src/systems/databases/DatabasesEmptyState.svelte
@@ -5,9 +5,9 @@
   import { modal } from '@mathesar/stores/modal';
   import { Button, Icon, Tutorial } from '@mathesar-component-library';
 
-  // import AddConnectionModal from './AddConnectionModal.svelte';
+  import ConnectDatabaseModal from './create-database/ConnectDatabaseModal.svelte';
 
-  const addDatabaseModalController = modal.spawnModalController();
+  const connectDatabaseModalController = modal.spawnModalController();
 </script>
 
 <div class="content" data-identifier="connection-empty-text">
@@ -26,15 +26,15 @@
     <Button
       slot="footer"
       appearance="primary"
-      on:click={() => addDatabaseModalController.open()}
+      on:click={() => connectDatabaseModalController.open()}
     >
       <Icon {...iconAddNew} />
-      <span>{$_('add_database_connection')}</span>
+      <span>{$_('connect_database')}</span>
     </Button>
   </Tutorial>
 </div>
 
-<!-- <AddConnectionModal controller={addDatabaseModalController} /> -->
+<ConnectDatabaseModal controller={connectDatabaseModalController} />
 
 <style lang="scss">
   [data-identifier='connection-empty-text'] {

From 2ea8ca735888cef69f311b403dc5bab4b11e784a Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 31 Jul 2024 02:53:11 +0530
Subject: [PATCH 0542/1141] Show server information in database card

---
 mathesar/views.py                             |  2 +
 mathesar_ui/src/api/rpc/database_setup.ts     |  8 +--
 mathesar_ui/src/api/rpc/databases.ts          | 11 +++--
 mathesar_ui/src/pages/home/DatabaseRow.svelte |  2 +-
 mathesar_ui/src/stores/databases.ts           | 49 ++++++++++++++++---
 .../data-explorer/__tests__/utils.test.ts     |  1 +
 mathesar_ui/src/utils/preloadData.ts          |  8 +--
 7 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/mathesar/views.py b/mathesar/views.py
index 131b321ac5..0db30e56b1 100644
--- a/mathesar/views.py
+++ b/mathesar/views.py
@@ -9,6 +9,7 @@
 
 from mathesar.rpc.databases import list_ as databases_list
 from mathesar.rpc.schemas import list_ as schemas_list
+from mathesar.rpc.servers import list_ as get_servers_list
 from mathesar.api.serializers.databases import TypeSerializer
 from mathesar.api.serializers.tables import TableSerializer
 from mathesar.api.serializers.queries import QuerySerializer
@@ -83,6 +84,7 @@ def _get_base_data_all_routes(request, database_id=None, schema_id=None):
         'current_schema': schema_id,
         'current_release_tag_name': __version__,
         'databases': get_database_list(request),
+        'servers': get_servers_list(),
         'internal_db_connection': _get_internal_db_meta(),
         'is_authenticated': not request.user.is_anonymous,
         'queries': [],
diff --git a/mathesar_ui/src/api/rpc/database_setup.ts b/mathesar_ui/src/api/rpc/database_setup.ts
index bcf52a17c4..41f42ef584 100644
--- a/mathesar_ui/src/api/rpc/database_setup.ts
+++ b/mathesar_ui/src/api/rpc/database_setup.ts
@@ -1,7 +1,7 @@
 import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
 
 import type { ConfiguredRole } from './configured_roles';
-import type { Database } from './databases';
+import type { DatabaseResponse } from './databases';
 import type { Server } from './servers';
 
 export const sampleDataOptions = [
@@ -13,7 +13,7 @@ export type SampleDataSchemaIdentifier = (typeof sampleDataOptions)[number];
 
 export interface DatabaseConnectionResult {
   server: Server;
-  database: Database;
+  database: DatabaseResponse;
   configured_role: ConfiguredRole;
 }
 
@@ -21,7 +21,7 @@ export interface DatabaseConnectionResult {
 export const database_setup = {
   create_new: rpcMethodTypeContainer<
     {
-      database: Database['name'];
+      database: DatabaseResponse['name'];
       sample_data?: SampleDataSchemaIdentifier[];
     },
     DatabaseConnectionResult
@@ -31,7 +31,7 @@ export const database_setup = {
     {
       host: Server['host'];
       port: Server['port'];
-      database: Database['name'];
+      database: DatabaseResponse['name'];
       role: ConfiguredRole['name'];
       password: string;
       sample_data?: SampleDataSchemaIdentifier[];
diff --git a/mathesar_ui/src/api/rpc/databases.ts b/mathesar_ui/src/api/rpc/databases.ts
index ae3fecc3b7..d347a264d7 100644
--- a/mathesar_ui/src/api/rpc/databases.ts
+++ b/mathesar_ui/src/api/rpc/databases.ts
@@ -2,17 +2,22 @@ import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-build
 
 import type { Server } from './servers';
 
-export interface Database {
+export interface DatabaseResponse {
   id: number;
   name: string;
   server_id: Server['id'];
 }
 
+export interface Database extends DatabaseResponse {
+  server_host: Server['host'];
+  server_port: Server['port'];
+}
+
 export const databases = {
   list: rpcMethodTypeContainer<
     {
-      server_id?: Database['server_id'];
+      server_id?: DatabaseResponse['server_id'];
     },
-    Array<Database>
+    Array<DatabaseResponse>
   >(),
 };
diff --git a/mathesar_ui/src/pages/home/DatabaseRow.svelte b/mathesar_ui/src/pages/home/DatabaseRow.svelte
index 3aeccbb30f..e807f733fe 100644
--- a/mathesar_ui/src/pages/home/DatabaseRow.svelte
+++ b/mathesar_ui/src/pages/home/DatabaseRow.svelte
@@ -22,7 +22,7 @@
     </div>
     <div class="content">
       <div class="name">{database.name}</div>
-      <div class="server">{database.server_id}</div>
+      <div class="server">{database.server_host}:{database.server_port}</div>
     </div>
   </div>
 </Card>
diff --git a/mathesar_ui/src/stores/databases.ts b/mathesar_ui/src/stores/databases.ts
index c5eae8f070..bc8dc9325a 100644
--- a/mathesar_ui/src/stores/databases.ts
+++ b/mathesar_ui/src/stores/databases.ts
@@ -29,8 +29,29 @@ class DatabasesStore {
   readonly currentDatabase: Readable<Database | undefined>;
 
   constructor() {
+    const serverMap = new Map(commonData.servers.map((s) => [s.id, s]));
     this.unsortedDatabases.reconstruct(
-      commonData.databases.map((d) => [d.id, d]),
+      commonData.databases.map((d) => {
+        const server = serverMap.get(d.server_id);
+        /**
+         * We're using a default value for host as 'unknown' when server is undefined
+         * instead of throwing an error.
+         *
+         * 1. We don't expect server to be undefined.
+         * 2. This is a runtime operation where the value is based on response from backend,
+         *    so we cannot assume server to be defined even though we expect it to be.
+         * 3. Displaying server info is not an important feature of the app,
+         *    so it's better to fail gracefully than to throw an error and crash the app.
+         */
+        return [
+          d.id,
+          {
+            ...d,
+            server_host: server?.host ?? 'unknown',
+            server_port: server?.port ?? 0,
+          },
+        ];
+      }),
     );
     this.databases = derived(
       this.unsortedDatabases,
@@ -51,17 +72,31 @@ class DatabasesStore {
   async connectExistingDatabase(
     props: Parameters<typeof api.database_setup.connect_existing>[0],
   ) {
-    const { database } = await api.database_setup.connect_existing(props).run();
-    this.addDatabase(database);
-    return database;
+    const { database, server } = await api.database_setup
+      .connect_existing(props)
+      .run();
+    const connectedDatabase: Database = {
+      ...database,
+      server_host: server.host,
+      server_port: server.port,
+    };
+    this.addDatabase(connectedDatabase);
+    return connectedDatabase;
   }
 
   async createNewDatabase(
     props: Parameters<typeof api.database_setup.create_new>[0],
   ) {
-    const { database } = await api.database_setup.create_new(props).run();
-    this.addDatabase(database);
-    return database;
+    const { database, server } = await api.database_setup
+      .create_new(props)
+      .run();
+    const connectedDatabase: Database = {
+      ...database,
+      server_host: server.host,
+      server_port: server.port,
+    };
+    this.addDatabase(connectedDatabase);
+    return connectedDatabase;
   }
 
   setCurrentDatabaseId(databaseId: Database['id']) {
diff --git a/mathesar_ui/src/systems/data-explorer/__tests__/utils.test.ts b/mathesar_ui/src/systems/data-explorer/__tests__/utils.test.ts
index 439dba8a90..89faeeb243 100644
--- a/mathesar_ui/src/systems/data-explorer/__tests__/utils.test.ts
+++ b/mathesar_ui/src/systems/data-explorer/__tests__/utils.test.ts
@@ -17,6 +17,7 @@ import {
 vi.mock('@mathesar/utils/preloadData', () => ({
   preloadCommonData: () => ({
     databases: [],
+    servers: [],
   }),
 }));
 
diff --git a/mathesar_ui/src/utils/preloadData.ts b/mathesar_ui/src/utils/preloadData.ts
index b9b710da55..323ce2b7f8 100644
--- a/mathesar_ui/src/utils/preloadData.ts
+++ b/mathesar_ui/src/utils/preloadData.ts
@@ -1,16 +1,18 @@
 import type { QueryInstance } from '@mathesar/api/rest/types/queries';
 import type { User } from '@mathesar/api/rest/users';
-import type { Database } from '@mathesar/api/rpc/databases';
+import type { DatabaseResponse } from '@mathesar/api/rpc/databases';
 import type { Schema } from '@mathesar/api/rpc/schemas';
+import type { Server } from '@mathesar/api/rpc/servers';
 import type { Table } from '@mathesar/api/rpc/tables';
 import type { AbstractTypeResponse } from '@mathesar/AppTypes';
 
 export interface CommonData {
-  databases: Database[];
+  databases: DatabaseResponse[];
+  servers: Server[];
   schemas: Schema[];
   tables: Table[];
   queries: QueryInstance[];
-  current_database: Database['id'] | null;
+  current_database: DatabaseResponse['id'] | null;
   internal_db_connection: {
     database: string;
     host: string;

From 2e4aed8b5a9187240d73cad55e5890a778b687d1 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 31 Jul 2024 04:12:12 +0530
Subject: [PATCH 0543/1141] add target_table_info in list_joinable's response

---
 db/sql/10_msar_joinable_tables.sql       |  30 +++-
 db/tables/operations/select.py           |   4 +-
 docs/docs/api/rpc.md                     |   1 +
 mathesar/rpc/tables/base.py              |  29 +++-
 mathesar/tests/rpc/tables/test_t_base.py | 188 +++++++++++++----------
 5 files changed, 158 insertions(+), 94 deletions(-)

diff --git a/db/sql/10_msar_joinable_tables.sql b/db/sql/10_msar_joinable_tables.sql
index eab50b25ec..a397d661c7 100644
--- a/db/sql/10_msar_joinable_tables.sql
+++ b/db/sql/10_msar_joinable_tables.sql
@@ -31,8 +31,8 @@ whether to travel from referrer to referant (when False) or from referant to ref
 
 DROP TYPE IF EXISTS msar.joinable_tables CASCADE;
 CREATE TYPE msar.joinable_tables AS (
-  base integer, -- The OID of the table from which the paths start
-  target integer, -- The OID of the table where the paths end
+  base bigint, -- The OID of the table from which the paths start
+  target bigint, -- The OID of the table where the paths end
   join_path jsonb, -- A JSONB array of arrays of arrays
   fkey_path jsonb,
   depth integer,
@@ -131,8 +131,28 @@ SELECT * FROM output_cte;
 $$ LANGUAGE sql;
 
 
+DROP FUNCTION IF EXISTS msar.get_joinable_tables(integer, oid);
 CREATE OR REPLACE FUNCTION
 msar.get_joinable_tables(max_depth integer, table_id oid) RETURNS
-  SETOF msar.joinable_tables AS $$
-  SELECT * FROM msar.get_joinable_tables(max_depth) WHERE base=table_id
-$$ LANGUAGE sql;
+jsonb AS $$
+  WITH jt_cte AS (
+    SELECT * FROM msar.get_joinable_tables(max_depth) WHERE base=table_id
+  ), target_cte AS (
+    SELECT jsonb_build_object(
+      pga.attrelid::text, msar.get_relation_name(pga.attrelid),
+      'columns', jsonb_agg(
+        jsonb_build_object(
+          pga.attnum::text, jsonb_build_object(
+            'name', pga.attname, 'type', CASE WHEN attndims>0 THEN '_array' ELSE atttypid::regtype::text END
+          )
+        )
+      )
+    ) as tt
+    FROM pg_catalog.pg_attribute AS pga, jt_cte
+    WHERE pga.attrelid=jt_cte.target AND pga.attnum > 0 and NOT pga.attisdropped GROUP BY pga.attrelid
+  )
+  SELECT jsonb_build_object(
+    'joinable_tables', jsonb_agg(to_jsonb(jt_cte.*)),
+    'target_table_info', jsonb_agg(target_cte.tt)
+  ) FROM target_cte, jt_cte
+$$ LANGUAGE sql RETURNS NULL ON NULL INPUT;
diff --git a/db/tables/operations/select.py b/db/tables/operations/select.py
index e0d4b7365e..a25fca1d43 100644
--- a/db/tables/operations/select.py
+++ b/db/tables/operations/select.py
@@ -3,7 +3,7 @@
 )
 from sqlalchemy.dialects.postgresql import JSONB
 
-from db.connection import exec_msar_func, select_from_msar_func
+from db.connection import exec_msar_func
 from db.utils import execute_statement, get_pg_catalog_table
 
 BASE = 'base'
@@ -60,7 +60,7 @@ def get_table_info(schema, conn):
 
 
 def list_joinable_tables(table_oid, conn, max_depth):
-    return select_from_msar_func(conn, 'get_joinable_tables', max_depth, table_oid)
+    return exec_msar_func(conn, 'get_joinable_tables', max_depth, table_oid).fetchone()[0]
 
 
 def reflect_table(name, schema, engine, metadata, connection_to_use=None, keep_existing=False):
diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 0f969220fb..d88f8489b9 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -113,6 +113,7 @@ To use an RPC function:
       - list_joinable
       - TableInfo
       - SettableTableInfo
+      - JoinableTableRecord
       - JoinableTableInfo
 
 ## Table Metadata
diff --git a/mathesar/rpc/tables/base.py b/mathesar/rpc/tables/base.py
index 8b076a94e5..9ee9b4e73e 100644
--- a/mathesar/rpc/tables/base.py
+++ b/mathesar/rpc/tables/base.py
@@ -56,9 +56,9 @@ class SettableTableInfo(TypedDict):
     columns: Optional[list[SettableColumnInfo]]
 
 
-class JoinableTableInfo(TypedDict):
+class JoinableTableRecord(TypedDict):
     """
-    Information about a joinable table.
+    Information about a singular joinable table.
 
     Attributes:
         base: The OID of the table from which the paths start
@@ -102,6 +102,25 @@ def from_dict(cls, joinables):
         )
 
 
+class JoinableTableInfo(TypedDict):
+    """
+    Information about joinable table(s).
+
+    Attributes:
+        joinable_tables: List of reachable joinable table(s) from a base table.
+        target_table_info: Additional info about target table(s) and its column(s).
+    """
+    joinable_tables: list[JoinableTableRecord]
+    target_table_info: list
+
+    @classmethod
+    def from_dict(cls, joinable_dict):
+        return cls(
+            joinable_tables=[JoinableTableRecord.from_dict(j) for j in joinable_dict["joinable_tables"]],
+            target_table_info=joinable_dict["target_table_info"]
+        )
+
+
 @rpc_method(name="tables.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
@@ -290,7 +309,7 @@ def list_joinable(
     database_id: int,
     max_depth: int = 3,
     **kwargs
-) -> list[JoinableTableInfo]:
+) -> JoinableTableInfo:
     """
     List details for joinable tables.
 
@@ -304,8 +323,8 @@ def list_joinable(
     """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
-        joinables = list_joinable_tables(table_oid, conn, max_depth)
-        return [JoinableTableInfo.from_dict(joinable) for joinable in joinables]
+        joinable_dict = list_joinable_tables(table_oid, conn, max_depth)
+        return JoinableTableInfo.from_dict(joinable_dict)
 
 
 @rpc_method(name="tables.list_with_metadata")
diff --git a/mathesar/tests/rpc/tables/test_t_base.py b/mathesar/tests/rpc/tables/test_t_base.py
index 3190502f9b..082315b783 100644
--- a/mathesar/tests/rpc/tables/test_t_base.py
+++ b/mathesar/tests/rpc/tables/test_t_base.py
@@ -288,107 +288,131 @@ def mock_connect(_database_id, user):
     def mock_list_joinable_tables(_table_oid, conn, max_depth):
         if _table_oid != table_oid:
             raise AssertionError('incorrect parameters passed')
-        return [
+        return {
+            'joinable_tables': [
+                {
+                    'base': 2254329,
+                    'depth': 1,
+                    'target': 2254334,
+                    'fkey_path': [[2254406, False]],
+                    'join_path': [[[2254329, 2], [2254334, 1]]],
+                    'multiple_results': False
+                },
+                {
+                    'base': 2254329,
+                    'depth': 1,
+                    'target': 2254334,
+                    'fkey_path': [[2254406, False]],
+                    'join_path': [[[2254329, 2], [2254334, 1]]],
+                    'multiple_results': False
+                },
+                {
+                    'base': 2254329,
+                    'depth': 1,
+                    'target': 2254350,
+                    'fkey_path': [[2254411, False]],
+                    'join_path': [[[2254329, 3], [2254350, 1]]],
+                    'multiple_results': False
+                },
+                {
+                    'base': 2254329,
+                    'depth': 1,
+                    'target': 2254350,
+                    'fkey_path': [[2254411, False]],
+                    'join_path': [[[2254329, 3], [2254350, 1]]],
+                    'multiple_results': False
+                }],
+            'target_table_info': [
+                {
+                    '2254334': 'Items',
+                    'columns': [{'1': {'name': 'id', 'type': 'integer'}},
+                                {'2': {'name': 'Barcode', 'type': 'text'}},
+                                {'3': {'name': 'Acquisition Date', 'type': 'date'}},
+                                {'5': {'name': 'Book', 'type': 'integer'}}]
+                },
+                {
+                    '2254350': 'Patrons',
+                    'columns': [{'1': {'name': 'id', 'type': 'integer'}},
+                                {'2': {'name': 'First Name', 'type': 'text'}},
+                                {'3': {'name': 'Last Name', 'type': 'text'}}]
+                },
+                {
+                    '2254334': 'Items',
+                    'columns': [{'1': {'name': 'id', 'type': 'integer'}},
+                                {'2': {'name': 'Barcode', 'type': 'text'}},
+                                {'3': {'name': 'Acquisition Date', 'type': 'date'}},
+                                {'5': {'name': 'Book', 'type': 'integer'}}]
+                },
+                {
+                    '2254350': 'Patrons',
+                    'columns': [{'1': {'name': 'id', 'type': 'integer'}},
+                                {'2': {'name': 'First Name', 'type': 'text'}},
+                                {'3': {'name': 'Last Name', 'type': 'text'}}]
+                }]
+        }
+    expected_dict = {
+        'joinable_tables': [
             {
                 'base': 2254329,
+                'depth': 1,
                 'target': 2254334,
-                'join_path': [[[2254329, 2], [2254334, 1]]],
                 'fkey_path': [[2254406, False]],
-                'depth': 1,
+                'join_path': [[[2254329, 2], [2254334, 1]]],
                 'multiple_results': False
             },
             {
                 'base': 2254329,
-                'target': 2254350,
-                'join_path': [[[2254329, 3], [2254350, 1]]],
-                'fkey_path': [[2254411, False]],
                 'depth': 1,
+                'target': 2254334,
+                'fkey_path': [[2254406, False]],
+                'join_path': [[[2254329, 2], [2254334, 1]]],
                 'multiple_results': False
             },
             {
                 'base': 2254329,
-                'target': 2254321,
-                'join_path': [[[2254329, 2], [2254334, 1]], [[2254334, 5], [2254321, 1]]],
-                'fkey_path': [[2254406, False], [2254399, False]],
-                'depth': 2,
+                'depth': 1,
+                'target': 2254350,
+                'fkey_path': [[2254411, False]],
+                'join_path': [[[2254329, 3], [2254350, 1]]],
                 'multiple_results': False
             },
             {
                 'base': 2254329,
-                'target': 2254358,
-                'join_path': [
-                    [[2254329, 2], [2254334, 1]],
-                    [[2254334, 5], [2254321, 1]],
-                    [[2254321, 11], [2254358, 1]]
-                ],
-                'fkey_path': [[2254406, False], [2254399, False], [2254394, False]],
-                'depth': 3,
+                'depth': 1,
+                'target': 2254350,
+                'fkey_path': [[2254411, False]],
+                'join_path': [[[2254329, 3], [2254350, 1]]],
                 'multiple_results': False
+            }],
+        'target_table_info': [
+            {
+                '2254334': 'Items',
+                'columns': [{'1': {'name': 'id', 'type': 'integer'}},
+                            {'2': {'name': 'Barcode', 'type': 'text'}},
+                            {'3': {'name': 'Acquisition Date', 'type': 'date'}},
+                            {'5': {'name': 'Book', 'type': 'integer'}}]
             },
             {
-                'base': 2254329,
-                'target': 2254313,
-                'join_path': [
-                    [[2254329, 2], [2254334, 1]],
-                    [[2254334, 5], [2254321, 1]],
-                    [[2254321, 10], [2254313, 1]]
-                ],
-                'fkey_path': [[2254406, False], [2254399, False], [2254389, False]],
-                'depth': 3,
-                'multiple_results': False
-            }
-        ]
-    expected_list = [
-        {
-            'base': 2254329,
-            'target': 2254334,
-            'join_path': [[[2254329, 2], [2254334, 1]]],
-            'fkey_path': [[2254406, False]],
-            'depth': 1,
-            'multiple_results': False
-        },
-        {
-            'base': 2254329,
-            'target': 2254350,
-            'join_path': [[[2254329, 3], [2254350, 1]]],
-            'fkey_path': [[2254411, False]],
-            'depth': 1,
-            'multiple_results': False
-        },
-        {
-            'base': 2254329,
-            'target': 2254321,
-            'join_path': [[[2254329, 2], [2254334, 1]], [[2254334, 5], [2254321, 1]]],
-            'fkey_path': [[2254406, False], [2254399, False]],
-            'depth': 2,
-            'multiple_results': False
-        },
-        {
-            'base': 2254329,
-            'target': 2254358,
-            'join_path': [
-                [[2254329, 2], [2254334, 1]],
-                [[2254334, 5], [2254321, 1]],
-                [[2254321, 11], [2254358, 1]]
-            ],
-            'fkey_path': [[2254406, False], [2254399, False], [2254394, False]],
-            'depth': 3,
-            'multiple_results': False
-        },
-        {
-            'base': 2254329,
-            'target': 2254313,
-            'join_path': [
-                [[2254329, 2], [2254334, 1]],
-                [[2254334, 5], [2254321, 1]],
-                [[2254321, 10], [2254313, 1]]
-            ],
-            'fkey_path': [[2254406, False], [2254399, False], [2254389, False]],
-            'depth': 3,
-            'multiple_results': False
-        }
-    ]
+                '2254350': 'Patrons',
+                'columns': [{'1': {'name': 'id', 'type': 'integer'}},
+                            {'2': {'name': 'First Name', 'type': 'text'}},
+                            {'3': {'name': 'Last Name', 'type': 'text'}}]
+            },
+            {
+                '2254334': 'Items',
+                'columns': [{'1': {'name': 'id', 'type': 'integer'}},
+                            {'2': {'name': 'Barcode', 'type': 'text'}},
+                            {'3': {'name': 'Acquisition Date', 'type': 'date'}},
+                            {'5': {'name': 'Book', 'type': 'integer'}}]
+            },
+            {
+                '2254350': 'Patrons',
+                'columns': [{'1': {'name': 'id', 'type': 'integer'}},
+                            {'2': {'name': 'First Name', 'type': 'text'}},
+                            {'3': {'name': 'Last Name', 'type': 'text'}}]
+            }]
+    }
     monkeypatch.setattr(tables.base, 'connect', mock_connect)
     monkeypatch.setattr(tables.base, 'list_joinable_tables', mock_list_joinable_tables)
-    actual_list = tables.list_joinable(table_oid=2254329, database_id=11, max_depth=3, request=request)
-    assert expected_list == actual_list
+    actual_dict = tables.list_joinable(table_oid=2254329, database_id=11, max_depth=1, request=request)
+    assert expected_dict == actual_dict

From 98e7f009ed95f0f286484b5f31f147061306769b Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 31 Jul 2024 04:50:10 +0530
Subject: [PATCH 0544/1141] Add custom icons for creating & connecting
 databases

---
 .../src/components/NameWithIcon.svelte        |  4 +-
 .../breadcrumb/BreadcrumbItem.svelte          | 10 +++-
 .../breadcrumb/DatabaseSelector.svelte        |  7 ++-
 mathesar_ui/src/icons/customIcons.ts          | 58 +++++++++++++++++++
 mathesar_ui/src/icons/index.ts                |  4 ++
 .../ConnectDatabaseModal.svelte               |  6 +-
 .../create-database/ConnectOption.svelte      |  2 +-
 7 files changed, 82 insertions(+), 9 deletions(-)

diff --git a/mathesar_ui/src/components/NameWithIcon.svelte b/mathesar_ui/src/components/NameWithIcon.svelte
index ebfde7ba55..9817367802 100644
--- a/mathesar_ui/src/components/NameWithIcon.svelte
+++ b/mathesar_ui/src/components/NameWithIcon.svelte
@@ -21,7 +21,7 @@
         <Spinner />
       {:else}
         {#each icons as innerIcon}
-          <Icon {...innerIcon} size="min(1em, 0.75em + 0.25rem)" />
+          <Icon size="min(1em, 0.75em + 0.25rem)" {...innerIcon} />
         {/each}
       {/if}
     </span>&nbsp;<span class="name">
@@ -44,6 +44,7 @@
   .icon {
     color: var(--icon-color, currentcolor);
     opacity: var(--NameWithIcon__icon-opacity, 0.75);
+    vertical-align: middle;
   }
   .icon > :global(.fa-icon + .fa-icon) {
     margin-left: 0.2em;
@@ -60,5 +61,6 @@
   }
   .name {
     color: var(--name-color, currentcolor);
+    vertical-align: middle;
   }
 </style>
diff --git a/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte b/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
index 7a49f316ee..33004b4a3e 100644
--- a/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
+++ b/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
@@ -6,7 +6,11 @@
   import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
   import SchemaName from '@mathesar/components/SchemaName.svelte';
   import TableName from '@mathesar/components/TableName.svelte';
-  import { iconConnection, iconExploration, iconRecord } from '@mathesar/icons';
+  import {
+    iconConnectDatabase,
+    iconExploration,
+    iconRecord,
+  } from '@mathesar/icons';
   import {
     HOME_URL,
     getDatabasePageUrl,
@@ -33,7 +37,9 @@
   <DatabaseSelector />
   <div class="breadcrumb-item truncate">
     <BreadcrumbLink href={HOME_URL}>
-      {$_('databases')}
+      <NameWithIcon icon={{ ...iconConnectDatabase, size: '1.4rem' }}>
+        {$_('databases')}
+      </NameWithIcon>
     </BreadcrumbLink>
   </div>
 {:else if item.type === 'database'}
diff --git a/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte b/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
index 44948a5df4..261a33469d 100644
--- a/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
@@ -2,7 +2,7 @@
   import { _ } from 'svelte-i18n';
 
   import type { Database } from '@mathesar/api/rpc/databases';
-  import { iconConnection, iconDatabase } from '@mathesar/icons';
+  import { iconConnectDatabase, iconDatabase } from '@mathesar/icons';
   import { HOME_URL, getDatabasePageUrl } from '@mathesar/routes/urls';
   import { databasesStore } from '@mathesar/stores/databases';
 
@@ -36,7 +36,10 @@
       type: 'simple',
       label: $_('manage_databases'),
       href: HOME_URL,
-      icon: iconConnection,
+      icon: {
+        ...iconConnectDatabase,
+        size: '1.4rem',
+      },
       // TODO: Handle active states for persistent links
       isActive: () => false,
     },
diff --git a/mathesar_ui/src/icons/customIcons.ts b/mathesar_ui/src/icons/customIcons.ts
index 47eb960714..393a5a244c 100644
--- a/mathesar_ui/src/icons/customIcons.ts
+++ b/mathesar_ui/src/icons/customIcons.ts
@@ -63,3 +63,61 @@ export const explorationIcon: IconProps['data'] = {
     ],
   ],
 };
+
+export const createDatabaseIcon: IconProps['data'] = {
+  icon: [
+    24,
+    24,
+    [],
+    '',
+    [
+      'M2.57143 12.4643C2.57143 12.7105 2.93365 13.1387 3.77394 13.5589C4.86104 14.1024 6.40318 14.4286 ' +
+        '8.07143 14.4286C9.73966 14.4286 11.2818 14.1024 12.3689 13.5589C13.2092 13.1387 13.5714 12.7105 ' +
+        '13.5714 12.4643V10.7583C12.275 11.5593 10.2929 12.0714 8.07143 12.0714C5.85 12.0714 3.86783 11.5593 ' +
+        '2.57143 10.7583V12.4643ZM13.5714 14.6868C12.275 15.4879 10.2929 16 8.07143 16C5.85 16 3.86783 ' +
+        '15.4879 2.57143 14.6868V16.3929C2.57143 16.6391 2.93365 17.0673 3.77394 17.4874C4.86104 18.031 ' +
+        '6.40318 18.3571 8.07143 18.3571C9.73966 18.3571 11.2818 18.031 12.3689 17.4874C13.2092 17.0673 ' +
+        '13.5714 16.6391 13.5714 16.3929V14.6868ZM1 16.3929V8.53571C1 6.58299 4.16599 5 8.07143 5C11.9769 ' +
+        '5 15.1429 6.58299 15.1429 8.53571V16.3929C15.1429 18.3456 11.9769 19.9286 8.07143 19.9286C4.16599 ' +
+        '19.9286 1 18.3456 1 16.3929ZM8.07143 10.5C9.73966 10.5 11.2818 10.1739 12.3689 9.63032C13.2092 ' +
+        '9.21017 13.5714 8.78197 13.5714 8.53571C13.5714 8.28946 13.2092 7.86126 12.3689 7.44111C11.2818 ' +
+        '6.89756 9.73966 6.57143 8.07143 6.57143C6.40318 6.57143 4.86104 6.89756 3.77394 7.44111C2.93365 ' +
+        '7.86126 2.57143 8.28946 2.57143 8.53571C2.57143 8.78197 2.93365 9.21017 3.77394 9.63032C4.86104 ' +
+        '10.1739 6.40318 10.5 8.07143 10.5Z',
+      'M19.0714 9.51786V11.875H16.7143V13.4464H19.0714V15.8036H20.6429V13.4464H23V11.875H20.6429V9.51786H19.0714Z',
+    ],
+  ],
+};
+
+export const connectDatabaseIcon: IconProps['data'] = {
+  icon: [
+    24,
+    24,
+    [],
+    '',
+    [
+      'M2.13666 11.9219C2.13666 12.1713 2.50345 12.6049 3.35432 13.0303C4.45512 13.5807 6.01668 13.911 ' +
+        '7.70595 13.911C9.39519 13.911 10.9567 13.5807 12.0575 13.0303C12.9085 12.6049 13.2752 12.1713 13.2752 ' +
+        '11.9219V10.1944C11.9625 11.0056 9.95538 11.5241 7.70595 11.5241C5.45654 11.5241 3.44939 11.0056 ' +
+        '2.13666 10.1944V11.9219ZM13.2752 14.1725C11.9625 14.9836 9.95538 15.5022 7.70595 15.5022C5.45654 ' +
+        '15.5022 3.44939 14.9836 2.13666 14.1725V15.9C2.13666 16.1494 2.50345 16.583 3.35432 17.0084C4.45512 ' +
+        '17.5588 6.01668 17.889 7.70595 17.889C9.39519 17.889 10.9567 17.5588 12.0575 17.0084C12.9085 16.583 ' +
+        '13.2752 16.1494 13.2752 15.9V14.1725ZM0.545441 15.9V7.94389C0.545441 5.96657 3.75131 4.36364 7.70595 ' +
+        '4.36364C11.6606 4.36364 14.8665 5.96657 14.8665 7.94389V15.9C14.8665 17.8773 11.6606 19.4803 7.70595 ' +
+        '19.4803C3.75131 19.4803 0.545441 17.8773 0.545441 15.9ZM7.70595 9.93292C9.39519 9.93292 10.9567 9.60268 ' +
+        '12.0575 9.05228C12.9085 8.62684 13.2752 8.19325 13.2752 7.94389C13.2752 7.69453 12.9085 7.26094 12.0575 ' +
+        '6.8355C10.9567 6.2851 9.39519 5.95486 7.70595 5.95486C6.01668 5.95486 4.45512 6.2851 3.35432 ' +
+        '6.8355C2.50345 7.26094 2.13666 7.69453 2.13666 7.94389C2.13666 8.19325 2.50345 8.62684 3.35432 ' +
+        '9.05228C4.45512 9.60268 6.01668 9.93292 7.70595 9.93292Z',
+      'M17.2467 12.5676C17.1975 12.3604 17.1714 12.1442 17.1714 11.9219C17.1714 11.6997 17.1975 11.4836 ' +
+        '17.2466 11.2764L16.4577 10.8209L17.2533 9.44284L18.0428 9.89866C18.3556 9.6028 18.7369 9.37868 ' +
+        '19.1605 9.25262V8.3417H20.7517V9.25262C21.1753 9.37867 21.5565 9.60279 21.8693 9.89863L22.6588 ' +
+        '9.44277L23.4545 10.8208L22.6654 11.2763C22.7147 11.4836 22.7407 11.6997 22.7407 11.9219C22.7407 ' +
+        '12.1442 22.7147 12.3603 22.6655 12.5675L23.4545 13.023L22.6589 14.4011L21.8694 13.9452C21.5566 ' +
+        '14.2411 21.1753 14.4652 20.7518 14.5912V15.5022H19.1605V14.5913C18.7369 14.4653 18.3556 14.2412 ' +
+        '18.0429 13.9453L17.2533 14.4012L16.4577 13.0231L17.2467 12.5676ZM19.9561 13.1154C20.6151 13.1154 ' +
+        '21.1495 12.581 21.1495 11.9219C21.1495 11.2629 20.6151 10.7285 19.9561 10.7285C19.297 10.7285 ' +
+        '18.7626 11.2629 18.7626 11.9219C18.7626 12.581 19.297 13.1154 19.9561 13.1154Z',
+    ],
+  ],
+};
diff --git a/mathesar_ui/src/icons/index.ts b/mathesar_ui/src/icons/index.ts
index 880ab8b918..ed004cbb89 100644
--- a/mathesar_ui/src/icons/index.ts
+++ b/mathesar_ui/src/icons/index.ts
@@ -78,6 +78,8 @@ import type { IconProps } from '@mathesar-component-library/types';
 
 import {
   arrayIcon,
+  connectDatabaseIcon,
+  createDatabaseIcon,
   explorationIcon,
   outcomeIcon,
   tableIcon,
@@ -103,10 +105,12 @@ export const iconAddFilter: IconProps = { data: faFilter };
 export const iconAddNew: IconProps = { data: faPlus };
 export const iconAddUser: IconProps = { data: faUserPlus };
 export const iconConfigure: IconProps = { data: faCogs };
+export const iconConnectDatabase = { data: connectDatabaseIcon };
 export const iconCopyMajor: IconProps = { data: faCopy };
 /** TODO: use faBinary once it's available (via newer FontAwesome version) */
 export const iconCopyRawContent: IconProps = { data: faCopy };
 export const iconCopyFormattedContent: IconProps = { data: faCopy };
+export const iconCreateDatabase = { data: createDatabaseIcon };
 /** When you're deleting something significant or difficult to recover */
 export const iconDeleteMajor: IconProps = { data: faTrashAlt };
 /** When you're deleting something smaller or more ephemeral */
diff --git a/mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte b/mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte
index aa3adf1d8a..3fda336b35 100644
--- a/mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte
@@ -3,7 +3,7 @@
   import { router } from 'tinro';
 
   import type { Database } from '@mathesar/api/rpc/databases';
-  import { iconDatabase } from '@mathesar/icons';
+  import { iconConnectDatabase, iconCreateDatabase } from '@mathesar/icons';
   import { getDatabasePageUrl } from '@mathesar/routes/urls';
   import {
     ControlledModal,
@@ -55,13 +55,13 @@
   {#if view === 'base'}
     <div class="connect-db-options">
       <ConnectOption
-        icon={iconDatabase}
+        icon={iconCreateDatabase}
         header={$_('create_new_database')}
         description={$_('create_database_mathesar_internal_server')}
         changeView={() => setView('create')}
       />
       <ConnectOption
-        icon={iconDatabase}
+        icon={iconConnectDatabase}
         header={$_('connect_existing_database')}
         description={$_('provide_details_connect_existing_database')}
         changeView={() => setView('connect')}
diff --git a/mathesar_ui/src/systems/databases/create-database/ConnectOption.svelte b/mathesar_ui/src/systems/databases/create-database/ConnectOption.svelte
index 9cad5d0f40..a56f5ed138 100644
--- a/mathesar_ui/src/systems/databases/create-database/ConnectOption.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/ConnectOption.svelte
@@ -12,7 +12,7 @@
 <Button class="option" on:click={changeView}>
   <div class="icon-holder">
     <div class="icon-circle">
-      <Icon {...icon} size="1.6rem" />
+      <Icon {...icon} size="2rem" />
     </div>
   </div>
   <div class="content-holder">

From 0c68c81a4d24edc70b7b285f709c20a098e82605 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 31 Jul 2024 04:50:24 +0530
Subject: [PATCH 0545/1141] Remove autocomplete on password field

---
 .../databases/create-database/ConnectExistingDatabase.svelte | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte b/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte
index fe727adcf0..f6bfda0b37 100644
--- a/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte
@@ -77,7 +77,10 @@
     label={$_('password')}
     layout="stacked"
     field={password}
-    input={{ component: PasswordInput }}
+    input={{
+      component: PasswordInput,
+      props: { autocomplete: 'new-password' },
+    }}
   />
   <FieldLayout>
     <InstallationSchemaSelector {installationSchemas} />

From 7116e7feaf653abec8c154fd6f27bd3c664b73f9 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 30 Jul 2024 20:45:14 -0400
Subject: [PATCH 0546/1141] Change num_grouping to boolean

---
 .../0015_alter_columnmetadata_num_grouping.py  | 18 ++++++++++++++++++
 mathesar/models/base.py                        |  5 +----
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 mathesar/migrations/0015_alter_columnmetadata_num_grouping.py

diff --git a/mathesar/migrations/0015_alter_columnmetadata_num_grouping.py b/mathesar/migrations/0015_alter_columnmetadata_num_grouping.py
new file mode 100644
index 0000000000..382b8df025
--- /dev/null
+++ b/mathesar/migrations/0015_alter_columnmetadata_num_grouping.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.11 on 2024-07-31 00:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mathesar', '0014_remove_columnmetadata_duration_show_units_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='columnmetadata',
+            name='num_grouping',
+            field=models.BooleanField(null=True),
+        ),
+    ]
diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index 62e53101cd..1ad174ab48 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -94,10 +94,7 @@ class ColumnMetaData(BaseModel):
     bool_false = models.CharField(null=True)
     num_min_frac_digits = models.PositiveIntegerField(null=True)
     num_max_frac_digits = models.PositiveIntegerField(null=True)
-    num_grouping = models.CharField(
-        choices=[("force-yes", "force-yes"), ("force-no", "force-no")],
-        null=True
-    )
+    num_grouping = models.BooleanField(null=True)
     num_format = models.CharField(
         choices=[("english", "english"), ("german", "german"), ("french", "french"), ("hindi", "hindi"), ("swiss", "swiss")],
         null=True

From e0d29e0ab14c29536ac6834387c8f5abebd2a6eb Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 30 Jul 2024 20:57:04 -0400
Subject: [PATCH 0547/1141] Fix code comment

---
 mathesar_ui/src/api/rpc/columns.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/columns.ts b/mathesar_ui/src/api/rpc/columns.ts
index e4a3838ce6..3cfd02c2c6 100644
--- a/mathesar_ui/src/api/rpc/columns.ts
+++ b/mathesar_ui/src/api/rpc/columns.ts
@@ -90,11 +90,6 @@ export interface RequiredColumnDisplayOptions {
   /** When `null`, the browser's locale will be used. */
   num_format: NumberFormat | null;
 
-  /**
-   * - `null`: display grouping separators if the locale prefers it.
-   * - `true`: display grouping separators.
-   * - `false`: do not display grouping separators.
-   */
   num_grouping: NumberGrouping;
 
   /** The currency symbol to show for a money type e.g. "$", "€", "NZD", etc. */

From b64dcf5f726dccb23034b1b0562a0e0b5f672960 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 30 Jul 2024 21:13:16 -0400
Subject: [PATCH 0548/1141] Change num_grouping to always|auto|never

---
 .../0016_alter_columnmetadata_num_grouping.py  | 18 ++++++++++++++++++
 mathesar/models/base.py                        |  5 ++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 mathesar/migrations/0016_alter_columnmetadata_num_grouping.py

diff --git a/mathesar/migrations/0016_alter_columnmetadata_num_grouping.py b/mathesar/migrations/0016_alter_columnmetadata_num_grouping.py
new file mode 100644
index 0000000000..bec63a82ff
--- /dev/null
+++ b/mathesar/migrations/0016_alter_columnmetadata_num_grouping.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.11 on 2024-07-31 01:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mathesar', '0015_alter_columnmetadata_num_grouping'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='columnmetadata',
+            name='num_grouping',
+            field=models.CharField(choices=[('always', 'always'), ('auto', 'auto'), ('never', 'never')], null=True),
+        ),
+    ]
diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index 1ad174ab48..d4502f4414 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -94,7 +94,10 @@ class ColumnMetaData(BaseModel):
     bool_false = models.CharField(null=True)
     num_min_frac_digits = models.PositiveIntegerField(null=True)
     num_max_frac_digits = models.PositiveIntegerField(null=True)
-    num_grouping = models.BooleanField(null=True)
+    num_grouping = models.CharField(
+        choices=[("always", "always"), ("auto", "auto"), ("never", "never")],
+        null=True
+    )
     num_format = models.CharField(
         choices=[("english", "english"), ("german", "german"), ("french", "french"), ("hindi", "hindi"), ("swiss", "swiss")],
         null=True

From f96a9d21a7335e62feaaf527960d8618615de205 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 30 Jul 2024 21:17:05 -0400
Subject: [PATCH 0549/1141] Squash three similar migrations

---
 ..._0016_alter_columnmetadata_num_grouping.py} |  6 ++++--
 .../0015_alter_columnmetadata_num_grouping.py  | 18 ------------------
 .../0016_alter_columnmetadata_num_grouping.py  | 18 ------------------
 3 files changed, 4 insertions(+), 38 deletions(-)
 rename mathesar/migrations/{0014_remove_columnmetadata_duration_show_units_and_more.py => 0014_remove_columnmetadata_duration_show_units_and_more_squashed_0016_alter_columnmetadata_num_grouping.py} (69%)
 delete mode 100644 mathesar/migrations/0015_alter_columnmetadata_num_grouping.py
 delete mode 100644 mathesar/migrations/0016_alter_columnmetadata_num_grouping.py

diff --git a/mathesar/migrations/0014_remove_columnmetadata_duration_show_units_and_more.py b/mathesar/migrations/0014_remove_columnmetadata_duration_show_units_and_more_squashed_0016_alter_columnmetadata_num_grouping.py
similarity index 69%
rename from mathesar/migrations/0014_remove_columnmetadata_duration_show_units_and_more.py
rename to mathesar/migrations/0014_remove_columnmetadata_duration_show_units_and_more_squashed_0016_alter_columnmetadata_num_grouping.py
index 1460cc3732..0037e0e0f7 100644
--- a/mathesar/migrations/0014_remove_columnmetadata_duration_show_units_and_more.py
+++ b/mathesar/migrations/0014_remove_columnmetadata_duration_show_units_and_more_squashed_0016_alter_columnmetadata_num_grouping.py
@@ -1,10 +1,12 @@
-# Generated by Django 4.2.11 on 2024-07-30 19:04
+# Generated by Django 4.2.11 on 2024-07-31 01:15
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
+    replaces = [('mathesar', '0014_remove_columnmetadata_duration_show_units_and_more'), ('mathesar', '0015_alter_columnmetadata_num_grouping'), ('mathesar', '0016_alter_columnmetadata_num_grouping')]
+
     dependencies = [
         ('mathesar', '0013_alter_columnmetadata_bool_false_and_more'),
     ]
@@ -26,6 +28,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='columnmetadata',
             name='num_grouping',
-            field=models.CharField(choices=[('force-yes', 'force-yes'), ('force-no', 'force-no')], null=True),
+            field=models.CharField(choices=[('always', 'always'), ('auto', 'auto'), ('never', 'never')], null=True),
         ),
     ]
diff --git a/mathesar/migrations/0015_alter_columnmetadata_num_grouping.py b/mathesar/migrations/0015_alter_columnmetadata_num_grouping.py
deleted file mode 100644
index 382b8df025..0000000000
--- a/mathesar/migrations/0015_alter_columnmetadata_num_grouping.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 4.2.11 on 2024-07-31 00:44
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mathesar', '0014_remove_columnmetadata_duration_show_units_and_more'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='columnmetadata',
-            name='num_grouping',
-            field=models.BooleanField(null=True),
-        ),
-    ]
diff --git a/mathesar/migrations/0016_alter_columnmetadata_num_grouping.py b/mathesar/migrations/0016_alter_columnmetadata_num_grouping.py
deleted file mode 100644
index bec63a82ff..0000000000
--- a/mathesar/migrations/0016_alter_columnmetadata_num_grouping.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 4.2.11 on 2024-07-31 01:11
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mathesar', '0015_alter_columnmetadata_num_grouping'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='columnmetadata',
-            name='num_grouping',
-            field=models.CharField(choices=[('always', 'always'), ('auto', 'auto'), ('never', 'never')], null=True),
-        ),
-    ]

From 6ea3d8bfc29153acda7f47668fd9b20d336273fa Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 31 Jul 2024 13:58:36 +0530
Subject: [PATCH 0550/1141] Change Database into a model class instead of a
 type

---
 mathesar_ui/src/api/rpc/databases.ts | 84 +++++++++++++++++++++++++++-
 mathesar_ui/src/stores/databases.ts  | 29 +++-------
 2 files changed, 90 insertions(+), 23 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/databases.ts b/mathesar_ui/src/api/rpc/databases.ts
index d347a264d7..d8b45b0833 100644
--- a/mathesar_ui/src/api/rpc/databases.ts
+++ b/mathesar_ui/src/api/rpc/databases.ts
@@ -8,9 +8,87 @@ export interface DatabaseResponse {
   server_id: Server['id'];
 }
 
-export interface Database extends DatabaseResponse {
-  server_host: Server['host'];
-  server_port: Server['port'];
+/**
+ * TODO: Figure out a better place to move classes like these.
+ * Perhaps `@mathesar/models/database`.
+ *
+ * Model classes should follow these rules:
+ * - The class should be immutable.
+ * - There should not be `undefined` properties.
+ * - All properties should be readonly.
+ *    - All properties should be initialized in the constructor.
+ *    - If a property has to be changed, we should return a new class.
+ * - Svelte stores should not be used inside Model classes.
+ *    - The Model classes themselves can be contained in a Svelte store.
+ *
+ * Good:
+ * ```
+ * export class Model {
+ *  readonly proprety: string;
+ *
+ *  constructor(value: string) {
+ *    this.proprety = value;
+ *  }
+ *
+ *  fetchAnotherProperty(): string {
+ *    const anotherProperty = api.model.getAnotherProp();
+ *    return anotherProperty;
+ *  }
+ *
+ *  changeProperty(newValue: string): Model {
+ *    return new Model(newValue);
+ *  }
+ * }
+ * ```
+ *
+ * Bad:
+ * ```
+ * export class Model {
+ *  // All properties should be readonly
+ *  proprety: string;
+ *
+ *  // Do not have undefined properties
+ *  anotherProp: string | undefined = undefined;
+ *
+ *  constructor(prop: string) {
+ *    this.proprety = prop;
+ *  }
+ *
+ *  fetchAnotherProperty(): string {
+ *    // Do not cache here
+ *    this.anotherProp = api.model.getAnotherProp();
+ *    return this.anotherProp;
+ *  }
+ *
+ *  changeProperty(newValue: string): Model {
+ *    // Do not mutate propreties
+ *    this.property = newValue;
+ *    return this;
+ *  }
+ * }
+ * ```
+ */
+export class Database implements DatabaseResponse {
+  readonly id: number;
+
+  readonly name: string;
+
+  readonly server_id: number;
+
+  readonly server_host: string;
+
+  readonly server_port: number;
+
+  constructor(databaseResponse: DatabaseResponse, server: Server) {
+    this.id = databaseResponse.id;
+    this.name = databaseResponse.name;
+    if (databaseResponse.server_id !== server.id) {
+      throw new Error('Server ids do not match');
+    }
+    this.server_id = databaseResponse.server_id;
+    this.server_host = server.host;
+    this.server_port = server.port;
+  }
 }
 
 export const databases = {
diff --git a/mathesar_ui/src/stores/databases.ts b/mathesar_ui/src/stores/databases.ts
index bc8dc9325a..d466ec0f9f 100644
--- a/mathesar_ui/src/stores/databases.ts
+++ b/mathesar_ui/src/stores/databases.ts
@@ -1,7 +1,7 @@
 import { type Readable, derived, writable } from 'svelte/store';
 
 import { api } from '@mathesar/api/rpc';
-import type { Database } from '@mathesar/api/rpc/databases';
+import { Database } from '@mathesar/api/rpc/databases';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import type { MakeWritablePropertiesReadable } from '@mathesar/utils/typeUtils';
 import {
@@ -32,7 +32,6 @@ class DatabasesStore {
     const serverMap = new Map(commonData.servers.map((s) => [s.id, s]));
     this.unsortedDatabases.reconstruct(
       commonData.databases.map((d) => {
-        const server = serverMap.get(d.server_id);
         /**
          * We're using a default value for host as 'unknown' when server is undefined
          * instead of throwing an error.
@@ -43,14 +42,12 @@ class DatabasesStore {
          * 3. Displaying server info is not an important feature of the app,
          *    so it's better to fail gracefully than to throw an error and crash the app.
          */
-        return [
-          d.id,
-          {
-            ...d,
-            server_host: server?.host ?? 'unknown',
-            server_port: server?.port ?? 0,
-          },
-        ];
+        const server = serverMap.get(d.server_id) ?? {
+          id: d.server_id,
+          host: 'unknown',
+          port: 0,
+        };
+        return [d.id, new Database(d, server)];
       }),
     );
     this.databases = derived(
@@ -75,11 +72,7 @@ class DatabasesStore {
     const { database, server } = await api.database_setup
       .connect_existing(props)
       .run();
-    const connectedDatabase: Database = {
-      ...database,
-      server_host: server.host,
-      server_port: server.port,
-    };
+    const connectedDatabase = new Database(database, server);
     this.addDatabase(connectedDatabase);
     return connectedDatabase;
   }
@@ -90,11 +83,7 @@ class DatabasesStore {
     const { database, server } = await api.database_setup
       .create_new(props)
       .run();
-    const connectedDatabase: Database = {
-      ...database,
-      server_host: server.host,
-      server_port: server.port,
-    };
+    const connectedDatabase = new Database(database, server);
     this.addDatabase(connectedDatabase);
     return connectedDatabase;
   }

From e3f0f923f760c6a2f8ac4271b0811ac23eed53d9 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 31 Jul 2024 16:35:44 +0800
Subject: [PATCH 0551/1141] add preproc functionality to grouping (slow for the
 moment)

---
 db/sql/00_msar.sql | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 49d9865b2a..e77ae95814 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3440,9 +3440,17 @@ $$ LANGUAGE SQL;
 
 CREATE OR REPLACE FUNCTION
 msar.build_grouping_columns_expr(tab_id oid, group_ jsonb) RETURNS TEXT AS $$
-SELECT string_agg(quote_ident(msar.get_column_name(tab_id, col_id::smallint)), ', ')
-FROM jsonb_array_elements_text(group_ -> 'columns') AS col_id
-WHERE has_column_privilege(tab_id, col_id::smallint, 'SELECT')
+SELECT string_agg(
+  COALESCE(
+    format(expr_template, quote_ident(msar.get_column_name(tab_id, col_id::smallint))),
+    quote_ident(msar.get_column_name(tab_id, col_id::smallint))
+  ), ', ' ORDER BY ordinality
+)
+FROM msar.expr_templates RIGHT JOIN ROWS FROM(
+  jsonb_array_elements_text(group_ -> 'columns'),
+  jsonb_array_elements_text(group_ -> 'preproc')
+) WITH ORDINALITY AS x(col_id, preproc) ON expr_key = preproc
+WHERE has_column_privilege(tab_id, col_id::smallint, 'SELECT');
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
@@ -3464,7 +3472,7 @@ SELECT concat(
   COALESCE(msar.build_group_id_expr(tab_id, group_), 'NULL'), ' AS __mathesar_gid, ',
   COALESCE(msar.build_group_count_expr(tab_id, group_), 'NULL'), ' AS __mathesar_gcount'
 );
-$$ LANGUAGE SQL;
+$$ LANGUAGE SQL ;
 
 
 CREATE OR REPLACE FUNCTION
@@ -3478,7 +3486,7 @@ WHERE
   AND attnum > 0
   AND NOT attisdropped
   AND has_column_privilege(attrelid, attnum, 'SELECT');
-$$ LANGUAGE SQL;
+$$ LANGUAGE SQL ;
 
 
 CREATE OR REPLACE FUNCTION

From 94b4595eb94f94f4bed832f1d890e31978029790 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 31 Jul 2024 16:42:05 +0800
Subject: [PATCH 0552/1141] add metadata to functions to avoid calling them
 repetitively

---
 db/sql/00_msar.sql | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index e77ae95814..6a7110f548 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3347,12 +3347,12 @@ SELECT CASE tree ->> 'type'
 END
 FROM jsonb_array_elements(tree -> 'args') inner_tree, msar.expr_templates
 WHERE tree ->> 'type' = expr_key
-$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION msar.build_where_clause(rel_id oid, tree jsonb) RETURNS text AS $$
 SELECT 'WHERE ' || msar.build_expr(rel_id, tree);
-$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
@@ -3362,14 +3362,14 @@ SELECT CASE lower(direction)
   WHEN 'asc' THEN 'ASC'
   WHEN 'desc' THEN 'DESC'
 END;
-$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE SQL IMMUTABLE RETURNS NULL ON NULL INPUT PARALLEL SAFE;
 
 
 CREATE OR REPLACE FUNCTION msar.get_pkey_order(tab_id oid) RETURNS jsonb AS $$
 SELECT jsonb_agg(jsonb_build_object('attnum', attnum, 'direction', 'asc'))
 FROM pg_constraint, LATERAL unnest(conkey) attnum
 WHERE contype='p' AND conrelid=tab_id AND has_column_privilege(tab_id, attnum, 'SELECT');
-$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION msar.get_total_order(tab_id oid) RETURNS jsonb AS $$
@@ -3399,7 +3399,7 @@ SELECT COALESCE(jsonb_agg(jsonb_build_object('attnum', attnum, 'direction', 'asc
 FROM orderable_cte
 -- This privilege check is redundant in context, but may be useful for other callers.
 WHERE has_column_privilege(tab_id, attnum, 'SELECT');
-$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
@@ -3418,7 +3418,7 @@ FROM jsonb_to_recordset(
 )
   AS x(attnum smallint, direction text)
 WHERE has_column_privilege(tab_id, attnum, 'SELECT');
-$$ LANGUAGE SQL;
+$$ LANGUAGE SQL STABLE;
 
 
 CREATE OR REPLACE FUNCTION
@@ -3435,7 +3435,7 @@ Args:
   order_: A JSONB array defining any desired ordering of columns.
 */
 SELECT 'ORDER BY ' || msar.build_total_order_expr(tab_id, order_)
-$$ LANGUAGE SQL;
+$$ LANGUAGE SQL STABLE;
 
 
 CREATE OR REPLACE FUNCTION
@@ -3451,19 +3451,19 @@ FROM msar.expr_templates RIGHT JOIN ROWS FROM(
   jsonb_array_elements_text(group_ -> 'preproc')
 ) WITH ORDINALITY AS x(col_id, preproc) ON expr_key = preproc
 WHERE has_column_privilege(tab_id, col_id::smallint, 'SELECT');
-$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
 msar.build_group_id_expr(tab_id oid, group_ jsonb) RETURNS TEXT AS $$
 SELECT 'dense_rank() OVER (ORDER BY ' || msar.build_grouping_columns_expr(tab_id, group_) || ')';
-$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
 msar.build_group_count_expr(tab_id oid, group_ jsonb) RETURNS TEXT AS $$
 SELECT 'count(1) OVER (PARTITION BY ' || msar.build_grouping_columns_expr(tab_id, group_) || ')';
-$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
@@ -3472,7 +3472,7 @@ SELECT concat(
   COALESCE(msar.build_group_id_expr(tab_id, group_), 'NULL'), ' AS __mathesar_gid, ',
   COALESCE(msar.build_group_count_expr(tab_id, group_), 'NULL'), ' AS __mathesar_gcount'
 );
-$$ LANGUAGE SQL ;
+$$ LANGUAGE SQL STABLE;
 
 
 CREATE OR REPLACE FUNCTION
@@ -3486,7 +3486,7 @@ WHERE
   AND attnum > 0
   AND NOT attisdropped
   AND has_column_privilege(attrelid, attnum, 'SELECT');
-$$ LANGUAGE SQL ;
+$$ LANGUAGE SQL STABLE;
 
 
 CREATE OR REPLACE FUNCTION
@@ -3508,7 +3508,7 @@ SELECT format(
 )
 FROM jsonb_array_elements_text(group_ -> 'columns') AS col_id
 WHERE has_column_privilege(tab_id, col_id::smallint, 'SELECT');
-$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
@@ -3530,7 +3530,7 @@ WHERE
   AND attnum > 0
   AND NOT attisdropped
   AND has_column_privilege(attrelid, attnum, 'SELECT');
-$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
@@ -3586,7 +3586,7 @@ BEGIN
   ) INTO records;
   RETURN records;
 END;
-$$ LANGUAGE plpgsql;
+$$ LANGUAGE plpgsql STABLE;
 
 
 CREATE OR REPLACE FUNCTION

From f2c62d92cedc0470fde0d57d562ce9273d7722fe Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 31 Jul 2024 17:53:54 +0530
Subject: [PATCH 0553/1141] fix aggregation for target_table_info

---
 db/sql/10_msar_joinable_tables.sql | 46 ++++++++++++++++++------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/db/sql/10_msar_joinable_tables.sql b/db/sql/10_msar_joinable_tables.sql
index a397d661c7..ebde573cd0 100644
--- a/db/sql/10_msar_joinable_tables.sql
+++ b/db/sql/10_msar_joinable_tables.sql
@@ -135,24 +135,32 @@ DROP FUNCTION IF EXISTS msar.get_joinable_tables(integer, oid);
 CREATE OR REPLACE FUNCTION
 msar.get_joinable_tables(max_depth integer, table_id oid) RETURNS
 jsonb AS $$
-  WITH jt_cte AS (
-    SELECT * FROM msar.get_joinable_tables(max_depth) WHERE base=table_id
-  ), target_cte AS (
-    SELECT jsonb_build_object(
-      pga.attrelid::text, msar.get_relation_name(pga.attrelid),
-      'columns', jsonb_agg(
-        jsonb_build_object(
-          pga.attnum::text, jsonb_build_object(
-            'name', pga.attname, 'type', CASE WHEN attndims>0 THEN '_array' ELSE atttypid::regtype::text END
+DECLARE
+  joinable_tables jsonb;
+  target_table_info jsonb;
+BEGIN
+  CREATE TEMP TABLE jt_cte AS 
+    SELECT * FROM msar.get_joinable_tables(max_depth) WHERE base=table_id;
+  SELECT jsonb_agg(to_jsonb(jt_cte.*)) INTO joinable_tables FROM jt_cte;
+  WITH target_cte AS (
+    SELECT pga.attrelid::text AS tt_oid, 
+      jsonb_build_object(
+        'name', msar.get_relation_name(pga.attrelid),
+        'columns', jsonb_object_agg(
+            pga.attnum::text, jsonb_build_object(
+              'name', pga.attname, 'type', CASE WHEN attndims>0 THEN '_array' ELSE atttypid::regtype::text END
+            )
           )
-        )
-      )
-    ) as tt
-    FROM pg_catalog.pg_attribute AS pga, jt_cte
-    WHERE pga.attrelid=jt_cte.target AND pga.attnum > 0 and NOT pga.attisdropped GROUP BY pga.attrelid
+      ) AS tt_info
+    FROM pg_catalog.pg_attribute AS pga
+    LEFT JOIN jt_cte ON pga.attrelid = jt_cte.target
+    WHERE pga.attrelid=jt_cte.target AND pga.attnum > 0 and NOT pga.attisdropped
+    GROUP BY pga.attrelid
   )
-  SELECT jsonb_build_object(
-    'joinable_tables', jsonb_agg(to_jsonb(jt_cte.*)),
-    'target_table_info', jsonb_agg(target_cte.tt)
-  ) FROM target_cte, jt_cte
-$$ LANGUAGE sql RETURNS NULL ON NULL INPUT;
+  SELECT jsonb_object_agg(tt_oid, tt_info) INTO target_table_info FROM target_cte;
+  RETURN jsonb_build_object(
+    'joinable_tables', joinable_tables,
+    'target_table_info', target_table_info
+  );
+END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;

From 67161ffdd99ad080577b09d0c51e7214a088bee4 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 31 Jul 2024 18:01:08 +0530
Subject: [PATCH 0554/1141] nest attnum

---
 db/sql/10_msar_joinable_tables.sql | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/db/sql/10_msar_joinable_tables.sql b/db/sql/10_msar_joinable_tables.sql
index ebde573cd0..05d4002ee9 100644
--- a/db/sql/10_msar_joinable_tables.sql
+++ b/db/sql/10_msar_joinable_tables.sql
@@ -143,12 +143,14 @@ BEGIN
     SELECT * FROM msar.get_joinable_tables(max_depth) WHERE base=table_id;
   SELECT jsonb_agg(to_jsonb(jt_cte.*)) INTO joinable_tables FROM jt_cte;
   WITH target_cte AS (
-    SELECT pga.attrelid::text AS tt_oid, 
+    SELECT pga.attrelid AS tt_oid, 
       jsonb_build_object(
         'name', msar.get_relation_name(pga.attrelid),
-        'columns', jsonb_object_agg(
-            pga.attnum::text, jsonb_build_object(
-              'name', pga.attname, 'type', CASE WHEN attndims>0 THEN '_array' ELSE atttypid::regtype::text END
+        'columns', jsonb_agg(
+            jsonb_build_object(
+              'attnum', pga.attnum,
+              'name', pga.attname,
+              'type', CASE WHEN attndims>0 THEN '_array' ELSE atttypid::regtype::text END
             )
           )
       ) AS tt_info

From f4aec66bf94dd8200cd1117a358d1e22cd55e83b Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 31 Jul 2024 18:24:43 +0530
Subject: [PATCH 0555/1141] add docstring and replace squashed migration

---
 ...remove_columnmetadata_duration_show_units_and_more.py} | 4 +---
 mathesar/rpc/columns/metadata.py                          | 8 ++++----
 2 files changed, 5 insertions(+), 7 deletions(-)
 rename mathesar/migrations/{0014_remove_columnmetadata_duration_show_units_and_more_squashed_0016_alter_columnmetadata_num_grouping.py => 0014_remove_columnmetadata_duration_show_units_and_more.py} (79%)

diff --git a/mathesar/migrations/0014_remove_columnmetadata_duration_show_units_and_more_squashed_0016_alter_columnmetadata_num_grouping.py b/mathesar/migrations/0014_remove_columnmetadata_duration_show_units_and_more.py
similarity index 79%
rename from mathesar/migrations/0014_remove_columnmetadata_duration_show_units_and_more_squashed_0016_alter_columnmetadata_num_grouping.py
rename to mathesar/migrations/0014_remove_columnmetadata_duration_show_units_and_more.py
index 0037e0e0f7..fe00b4f652 100644
--- a/mathesar/migrations/0014_remove_columnmetadata_duration_show_units_and_more_squashed_0016_alter_columnmetadata_num_grouping.py
+++ b/mathesar/migrations/0014_remove_columnmetadata_duration_show_units_and_more.py
@@ -1,12 +1,10 @@
-# Generated by Django 4.2.11 on 2024-07-31 01:15
+# Generated by Django 4.2.11 on 2024-07-31 12:52
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
-    replaces = [('mathesar', '0014_remove_columnmetadata_duration_show_units_and_more'), ('mathesar', '0015_alter_columnmetadata_num_grouping'), ('mathesar', '0016_alter_columnmetadata_num_grouping')]
-
     dependencies = [
         ('mathesar', '0013_alter_columnmetadata_bool_false_and_more'),
     ]
diff --git a/mathesar/rpc/columns/metadata.py b/mathesar/rpc/columns/metadata.py
index c0cafbbb93..4b3876de05 100644
--- a/mathesar/rpc/columns/metadata.py
+++ b/mathesar/rpc/columns/metadata.py
@@ -25,8 +25,8 @@ class ColumnMetaDataRecord(TypedDict):
         bool_false: A string to display for `false` values.
         num_min_frac_digits: Minimum digits shown after the decimal point.
         num_max_frac_digits: Maximum digits shown after the decimal point.
-        num_grouping:
-        num_format:
+        num_grouping: Specifies how grouping separators are displayed for numeric values.
+        num_format: Specifies the locale-specific format for displaying numeric values.
         mon_currency_symbol: The currency symbol shown for money value.
         mon_currency_location: Where the currency symbol should be shown.
         time_format: A string representing the format of time values.
@@ -84,8 +84,8 @@ class ColumnMetaDataBlob(TypedDict):
         bool_false: A string to display for `false` values.
         num_min_frac_digits: Minimum digits shown after the decimal point.
         num_max_frac_digits: Maximum digits shown after the decimal point.
-        num_grouping:
-        num_format:
+        num_grouping: Specifies how grouping separators are displayed for numeric values.
+        num_format: Specifies the locale-specific format for displaying numeric values.
         mon_currency_symbol: The currency symbol shown for money value.
         mon_currency_location: Where the currency symbol should be shown.
         time_format: A string representing the format of time values.

From aa42c5273a842ef2ab01166ca705960d88d70c90 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 31 Jul 2024 15:07:21 -0400
Subject: [PATCH 0556/1141] Refactor global CSS out

---
 .../ConnectDatabaseModal.svelte               |  8 ------
 .../create-database/ConnectOption.svelte      | 27 ++++++++++---------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte b/mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte
index 3fda336b35..4fb9656a3f 100644
--- a/mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte
@@ -81,13 +81,5 @@
   div.connect-db-options {
     display: grid;
     grid-gap: var(--size-xx-small);
-
-    > :global(.btn.option) {
-      display: grid;
-      width: 100%;
-      text-align: left;
-      grid-template-columns: 100px 1fr;
-      padding: var(--size-ultra-large) var(--size-large);
-    }
   }
 </style>
diff --git a/mathesar_ui/src/systems/databases/create-database/ConnectOption.svelte b/mathesar_ui/src/systems/databases/create-database/ConnectOption.svelte
index a56f5ed138..7e58573592 100644
--- a/mathesar_ui/src/systems/databases/create-database/ConnectOption.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/ConnectOption.svelte
@@ -9,27 +9,30 @@
   export let description: string;
 </script>
 
-<Button class="option" on:click={changeView}>
-  <div class="icon-holder">
+<Button on:click={changeView}>
+  <div class="content">
     <div class="icon-circle">
       <Icon {...icon} size="2rem" />
     </div>
-  </div>
-  <div class="content-holder">
-    <div class="header">
-      {header}
-    </div>
-    <div class="description">
-      {description}
+    <div>
+      <div class="header">
+        {header}
+      </div>
+      <div class="description">
+        {description}
+      </div>
     </div>
   </div>
 </Button>
 
 <style>
-  .icon-holder {
-    display: flex;
+  .content {
+    display: grid;
     align-items: center;
-    justify-content: center;
+    grid-template-columns: auto 1fr;
+    gap: var(--size-large);
+    text-align: left;
+    padding: var(--size-large);
   }
   .icon-circle {
     display: flex;

From 4cc4c144a3c634bffdd57e97ee6eec2da3239e39 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 1 Aug 2024 02:02:06 +0530
Subject: [PATCH 0557/1141] split parameters

---
 mathesar/rpc/explorations.py   | 54 ++++++++++++++++++++++++++++++----
 mathesar/utils/explorations.py | 24 ++++++++-------
 2 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/mathesar/rpc/explorations.py b/mathesar/rpc/explorations.py
index 7313f12af2..d197b27d1b 100644
--- a/mathesar/rpc/explorations.py
+++ b/mathesar/rpc/explorations.py
@@ -60,31 +60,68 @@ class ExplorationDef(TypedDict):
         initial_columns: A list describing the columns to be included in the exploration.
         display_names: A map between the actual column names on the database and the alias to be displayed.
         transformations: A list describing the transformations to be made on the included columns.
-        parameters: A dict describing the properties to be applied while retrieving records e.g. limit, offset, filter, order_by, etc.
+        limit: Specifies the number of rows to return.(default 100)
+        offset: Specifies the number of rows to skip.(default 0)
+        filter: A dict describing filters to be applied to an exploration.
+            e.g. Here is a dict describing getting records from exploration where "col1" = NULL and "col2" = "abc"
+            ```
+            {"and": [
+                {"null": [
+                    {"column_name": ["col1"]},
+                ]},
+                {"equal": [
+                    {"to_lowercase": [
+                        {"column_name": ["col2"]},
+                    ]},
+                    {"literal": ["abc"]},
+                ]},
+            ]}
+            ```
+            Refer to db/functions/base.py for all the possible filters.
+        order_by: A list of dicts, where each dict has a `field` and `direction` field.
+                  Here the value for `field` should be column name and `direction` should be either `asc` or `desc`.
+        search: A list of dicts, where each dict has a `column` and `literal` field.
+                Here the value for `column` should be a column name and `literal` should be a string to be searched in the aforementioned column.
+        duplicate_only: A list of column names for which you want duplicate records.
     """
     base_table_oid: int
     initial_columns: list
     display_names: dict
     transformations: Optional[list]
-    parameters: Optional[dict]
+    limit: Optional[int]
+    offset: Optional[int]
+    filter: Optional[dict]
+    order_by: Optional[list[dict]]
+    search: Optional[list[dict]]
+    duplicate_only: Optional[list]
 
 
 class ExplorationResult(TypedDict):
     """
-    Result of a ran exploration.
+    Result of an exploration run.
 
     Attributes:
         query: A dict describing the exploration that ran.
         records: A dict describing the total count of records along with the contents of those records.
         output_columns: A tuple describing the names of the columns included in the exploration.
         column_metadata: A dict describing the metadata applied to included columns.
-        parameters: A dict describing the properties applied while retrieving records e.g. limit, offset, filter, order_by, etc.
+        limit: Specifies the max number of rows returned.(default 100)
+        offset: Specifies the number of rows skipped.(default 0)
+        filter: A dict describing filters applied to an exploration.
+        order_by: The ordering applied to the columns of an exploration.
+        search: Specifies a list of dicts containing column names and searched expression.
+        duplicate_only: A list of column names for which you want duplicate records.
     """
     query: dict
     records: dict
     output_columns: tuple
     column_metadata: dict
-    parameters: dict
+    limit: Optional[int]
+    offset: Optional[int]
+    filter: Optional[dict]
+    order_by: Optional[list[dict]]
+    search: Optional[list[dict]]
+    duplicate_only: Optional[list]
 
     @classmethod
     def from_dict(cls, e):
@@ -93,7 +130,12 @@ def from_dict(cls, e):
             records=e["records"],
             output_columns=e["output_columns"],
             column_metadata=e["column_metadata"],
-            parameters=e["parameters"]
+            limit=e["limit"],
+            offset=e["offset"],
+            filter=e["filter"],
+            order_by=e["order_by"],
+            search=e["search"],
+            duplicate_only=e["duplicate_only"]
         )
 
 
diff --git a/mathesar/utils/explorations.py b/mathesar/utils/explorations.py
index 97d88ecce7..988b12a6e5 100644
--- a/mathesar/utils/explorations.py
+++ b/mathesar/utils/explorations.py
@@ -28,7 +28,6 @@ def run_exploration(exploration_def, database_id, conn):
     metadata = get_cached_metadata()
     base_table_oid = exploration_def["base_table_oid"]
     initial_columns = exploration_def['initial_columns']
-    params = exploration_def.get('parameters', {})
     processed_initial_columns = []
     for column in initial_columns:
         jp_path = column.get("join_path")
@@ -58,13 +57,13 @@ def run_exploration(exploration_def, database_id, conn):
         metadata=metadata
     )
     records = db_query.get_records(
-        limit=params.get('limit', 100),
-        offset=params.get('offset', 0),
-        filter=params.get('filter', None),
-        order_by=params.get('order_by', []),
-        group_by=GroupBy(**params.get('grouping')) if params.get('grouping', None) else None,
-        search=params.get('search', []),
-        duplicate_only=params.get('duplicate_only', None)
+        limit=exploration_def.get('limit', 100),
+        offset=exploration_def.get('offset', 0),
+        filter=exploration_def.get('filter', None),
+        order_by=exploration_def.get('order_by', []),
+        group_by=GroupBy(**exploration_def.get('grouping')) if exploration_def.get('grouping', None) else None,
+        search=exploration_def.get('search', []),
+        duplicate_only=exploration_def.get('duplicate_only', None)
     )
     processed_records = process_annotated_records(records)[0]
     column_metadata = _get_exploration_column_metadata(
@@ -82,13 +81,18 @@ def run_exploration(exploration_def, database_id, conn):
             "count": get_count(
                 table=db_query.transformed_relation,
                 engine=engine,
-                filter=params.get('filter', None)
+                filter=exploration_def.get('filter', None)
             ),
             "results": processed_records
         },
         "output_columns": tuple(sa_col.name for sa_col in db_query.sa_output_columns),
         "column_metadata": column_metadata,
-        "parameters": params,
+        "limit": exploration_def.get('limit', 100),
+        "offset": exploration_def.get('offset', 0),
+        "filter": exploration_def.get('filter', None),
+        "order_by": exploration_def.get('order_by', []),
+        "search": exploration_def.get('search', []),
+        "duplicate_only": exploration_def.get('duplicate_only', None)
     }
 
 

From 6e0c4356515a2b3308e49d425f0c4fb056c6adb6 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 1 Aug 2024 02:09:40 +0530
Subject: [PATCH 0558/1141] remove grouping from get_records

---
 mathesar/utils/explorations.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mathesar/utils/explorations.py b/mathesar/utils/explorations.py
index 988b12a6e5..6767718ab2 100644
--- a/mathesar/utils/explorations.py
+++ b/mathesar/utils/explorations.py
@@ -1,5 +1,4 @@
 from db.engine import create_future_engine_with_custom_types
-from db.records.operations.group import GroupBy
 from db.records.operations.select import get_count
 from db.queries.base import DBQuery, InitialColumn, JoinParameter
 from db.tables.operations.select import get_table
@@ -61,7 +60,6 @@ def run_exploration(exploration_def, database_id, conn):
         offset=exploration_def.get('offset', 0),
         filter=exploration_def.get('filter', None),
         order_by=exploration_def.get('order_by', []),
-        group_by=GroupBy(**exploration_def.get('grouping')) if exploration_def.get('grouping', None) else None,
         search=exploration_def.get('search', []),
         duplicate_only=exploration_def.get('duplicate_only', None)
     )

From 5e1172a30e7e456555e6839cfc2ba2201d077c77 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 1 Aug 2024 02:30:20 +0530
Subject: [PATCH 0559/1141] revert to attnum as keys instead of nested attumn

---
 db/sql/10_msar_joinable_tables.sql | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/db/sql/10_msar_joinable_tables.sql b/db/sql/10_msar_joinable_tables.sql
index 05d4002ee9..6fbe6e3d24 100644
--- a/db/sql/10_msar_joinable_tables.sql
+++ b/db/sql/10_msar_joinable_tables.sql
@@ -146,9 +146,8 @@ BEGIN
     SELECT pga.attrelid AS tt_oid, 
       jsonb_build_object(
         'name', msar.get_relation_name(pga.attrelid),
-        'columns', jsonb_agg(
-            jsonb_build_object(
-              'attnum', pga.attnum,
+        'columns', jsonb_object_agg(
+            pga.attnum, jsonb_build_object(
               'name', pga.attname,
               'type', CASE WHEN attndims>0 THEN '_array' ELSE atttypid::regtype::text END
             )

From b444f3bead577dd5c2de6cc6d4ad971bb0fb7c03 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 1 Aug 2024 15:13:31 +0800
Subject: [PATCH 0560/1141] fix bug preventing group preproc from being applied
 in result view

---
 db/sql/00_msar.sql | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 6a7110f548..9259541722 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3328,9 +3328,9 @@ INSERT INTO msar.expr_templates VALUES
   ('json_array_length', 'jsonb_array_length((%s)::jsonb)'),
   ('json_array_contains', '(%s)::jsonb @> (%s)::jsonb'),
   -- date part extractors
-  ('truncate_to_year', 'to_char(%s, ''YYYY'')'),
-  ('truncate_to_month', 'to_char(%s, ''YYYY-MM'')'),
-  ('truncate_to_day', 'to_char(%s, ''YYYY-MM-DD'')'),
+  ('truncate_to_year', 'to_char((%s)::date, ''YYYY AD'')'),
+  ('truncate_to_month', 'to_char((%s)::date, ''YYYY-MM AD'')'),
+  ('truncate_to_day', 'to_char((%s)::date, ''YYYY-MM-DD AD'')'),
   -- URI part getters
   ('uri_scheme', 'mathesar_types.uri_scheme(%s)'),
   ('uri_authority', 'mathesar_types.uri_authority(%s)'),
@@ -3503,10 +3503,23 @@ SELECT format(
       )
     )
   $gj$,
-  string_agg(format('%1$L, %2$I.%1$I', col_id, cte_name), ', '),
+  string_agg(
+    format(
+      '%1$L, %2$s',
+      col_id,
+      COALESCE(
+        format(expr_template, quote_ident(cte_name) || '.' || quote_ident(col_id)),
+        quote_ident(cte_name) || '.' || quote_ident(col_id)
+      )
+    ),
+    ', ' ORDER BY ordinality
+  ),
   cte_name
 )
-FROM jsonb_array_elements_text(group_ -> 'columns') AS col_id
+FROM msar.expr_templates RIGHT JOIN ROWS FROM(
+  jsonb_array_elements_text(group_ -> 'columns'),
+  jsonb_array_elements_text(group_ -> 'preproc')
+) WITH ORDINALITY AS x(col_id, preproc) ON expr_key = preproc
 WHERE has_column_privilege(tab_id, col_id::smallint, 'SELECT');
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 

From 2ef4b34674d2484e66c7cc5e64a1444460e1a3b0 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 1 Aug 2024 16:55:22 +0800
Subject: [PATCH 0561/1141] add initial tests for grouping

---
 db/sql/test_00_msar.sql | 102 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 96 insertions(+), 6 deletions(-)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 60568abc4b..2965efbf9d 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2890,6 +2890,42 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+CREATE OR REPLACE FUNCTION __setup_customers_table() RETURNS SETOF TEXT AS $$
+BEGIN
+CREATE TABLE "Customers" (
+  id integer PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
+  "First Name" text,
+  "Last Name" text,
+  "Subscription Date" date,
+  "dropmeee 1" text
+);
+ALTER TABLE "Customers" DROP COLUMN "dropmeee 1";
+INSERT INTO "Customers" ("First Name", "Last Name", "Subscription Date") VALUES
+  ('Aaron', 'Adams', '2020-03-21'),
+  ('Abigail', 'Acosta', '2020-04-16'),
+  ('Aaron', 'Adams', '2020-04-29'),
+  ('Abigail', 'Adams', '2020-05-29'),
+  ('Abigail', 'Abbott', '2020-07-05'),
+  ('Aaron', 'Adkins', '2020-08-16'),
+  ('Aaron', 'Acevedo', '2020-10-29'),
+  ('Abigail', 'Abbott', '2020-10-30'),
+  ('Abigail', 'Adams', '2021-02-14'),
+  ('Abigail', 'Acevedo', '2021-03-29'),
+  ('Aaron', 'Acosta', '2021-04-13'),
+  ('Aaron', 'Adams', '2021-06-30'),
+  ('Abigail', 'Adkins', '2021-09-12'),
+  ('Aaron', 'Adams', '2021-11-11'),
+  ('Abigail', 'Abbott', '2021-11-30'),
+  ('Aaron', 'Acevedo', '2022-02-04'),
+  ('Aaron', 'Adkins', '2022-03-10'),
+  ('Abigail', 'Abbott', '2022-03-23'),
+  ('Abigail', 'Adkins', '2022-03-27'),
+  ('Abigail', 'Abbott', '2022-04-29'),
+  ('Abigail', 'Adams', '2022-05-24');
+END;
+$$ LANGUAGE plpgsql;
+
+
 CREATE OR REPLACE FUNCTION test_list_records_from_table() RETURNS SETOF TEXT AS $$
 DECLARE
   rel_id oid;
@@ -2904,7 +2940,8 @@ BEGIN
         {"1": 1, "2": 5, "3": "sdflkj", "4": "s", "5": {"a": "val"}},
         {"1": 2, "2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]},
         {"1": 3, "2": 2, "3": "abcde", "4": {"k": 3242348}, "5": true}
-      ]
+      ],
+      "grouping": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data(col1) AS "2",'
@@ -2923,7 +2960,8 @@ BEGIN
       "results": [
         {"1": 2, "2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]},
         {"1": 1, "2": 5, "3": "sdflkj", "4": "s", "5": {"a": "val"}}
-      ]
+      ],
+      "grouping": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data(col1) AS "2",'
@@ -2942,7 +2980,8 @@ BEGIN
       "results": [
         {"1": 2, "2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]},
         {"1": 1, "2": 5, "3": "sdflkj", "4": "s", "5": {"a": "val"}}
-      ]
+      ],
+      "grouping": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data(col1) AS "2",',
@@ -2965,7 +3004,8 @@ BEGIN
         {"2": 2, "3": "abcde", "4": {"k": 3242348}, "5": true},
         {"2": 5, "3": "sdflkj", "4": "s", "5": {"a": "val"}},
         {"2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]}
-      ]
+      ],
+      "grouping": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(col1) AS "2", msar.format_data(col2) AS "3",',
@@ -2984,7 +3024,8 @@ BEGIN
         {"2": 5, "3": "sdflkj", "4": "s", "5": {"a": "val"}},
         {"2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]},
         {"2": 2, "3": "abcde", "4": {"k": 3242348}, "5": true}
-      ]
+      ],
+      "grouping": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(col1) AS "2", msar.format_data(col2) AS "3",',
@@ -2997,6 +3038,55 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+CREATE OR REPLACE FUNCTION test_list_records_with_grouping() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+BEGIN
+  PERFORM __setup_customers_table();
+  rel_id := '"Customers"'::regclass::oid;
+  RETURN NEXT is(
+    msar.list_records_from_table(
+      rel_id,
+      10, null,
+      '[{"attnum": 3, "direction": "asc"}, {"attnum": 2, "direction": "asc"}]',
+      null,
+      '{"columns": [3, 2]}'
+    ),
+    $j${
+      "count": 21,
+      "results": [
+        {"1": 5, "2": "Abigail", "3": "Abbott", "4": "2020-07-05 AD"},
+        {"1": 8, "2": "Abigail", "3": "Abbott", "4": "2020-10-30 AD"},
+        {"1": 15, "2": "Abigail", "3": "Abbott", "4": "2021-11-30 AD"},
+        {"1": 18, "2": "Abigail", "3": "Abbott", "4": "2022-03-23 AD"},
+        {"1": 20, "2": "Abigail", "3": "Abbott", "4": "2022-04-29 AD"},
+        {"1": 7, "2": "Aaron", "3": "Acevedo", "4": "2020-10-29 AD"},
+        {"1": 16, "2": "Aaron", "3": "Acevedo", "4": "2022-02-04 AD"},
+        {"1": 10, "2": "Abigail", "3": "Acevedo", "4": "2021-03-29 AD"},
+        {"1": 11, "2": "Aaron", "3": "Acosta", "4": "2021-04-13 AD"},
+        {"1": 2, "2": "Abigail", "3": "Acosta", "4": "2020-04-16 AD"}
+      ],
+      "grouping": {
+        "groups": [
+          {"gid": 1, "gcount": 5, "results_eq": {"2": "Abigail", "3": "Abbott"}},
+          {"gid": 2, "gcount": 2, "results_eq": {"2": "Aaron", "3": "Acevedo"}},
+          {"gid": 3, "gcount": 1, "results_eq": {"2": "Abigail", "3": "Acevedo"}},
+          {"gid": 4, "gcount": 1, "results_eq": {"2": "Aaron", "3": "Acosta"}},
+          {"gid": 5, "gcount": 1, "results_eq": {"2": "Abigail", "3": "Acosta"}}
+        ]
+      }
+    }$j$ || jsonb_build_object(
+      'query', concat(
+        'SELECT msar.format_data(id) AS "1", msar.format_data("First Name") AS "2",'
+        ' msar.format_data("Last Name") AS "3", msar.format_data("Subscription Date") AS "4"'
+        ' FROM public."Customers"  ORDER BY "3" ASC, "2" ASC, "1" ASC LIMIT ''10'' OFFSET NULL'
+      )
+    )
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
 -- msar.build_order_by_expr ------------------------------------------------------------------------
 
 CREATE OR REPLACE FUNCTION test_build_order_by_expr() RETURNS SETOF TEXT AS $$
@@ -3032,7 +3122,7 @@ END;
 $$ LANGUAGE plpgsql;
 
 
--- msar.build_expr --------------------------------------------------------------------------
+-- msar.build_expr ---------------------------------------------------------------------------------
 
 CREATE OR REPLACE FUNCTION test_build_expr() RETURNS SETOF TEXT AS $$
 DECLARE

From e528749585d21b952f4a5366d62fd5edfa7b0f07 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 1 Aug 2024 18:03:59 +0800
Subject: [PATCH 0562/1141] add input grouping metadata to output

---
 db/sql/00_msar.sql | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 9259541722..15877cc805 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3494,6 +3494,8 @@ msar.build_grouping_results_jsonb_expr(tab_id oid, cte_name text, group_ jsonb)
 SELECT format(
   $gj$
     jsonb_build_object(
+      'columns', %3$L::jsonb,
+      'preproc', %4$L::jsonb,
       'groups', jsonb_agg(
         DISTINCT jsonb_build_object(
           'gid', %2$I.__mathesar_gid,
@@ -3514,7 +3516,9 @@ SELECT format(
     ),
     ', ' ORDER BY ordinality
   ),
-  cte_name
+  cte_name,
+  group_ ->> 'columns',
+  group_ ->> 'preproc'
 )
 FROM msar.expr_templates RIGHT JOIN ROWS FROM(
   jsonb_array_elements_text(group_ -> 'columns'),

From 9a86a475854c85408cd82e1b77c68d7a08efdf16 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 1 Aug 2024 15:48:42 +0530
Subject: [PATCH 0563/1141] change to pure cte based implementation and make
 joinable table functions stable

---
 db/sql/10_msar_joinable_tables.sql | 33 ++++++++++++++----------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/db/sql/10_msar_joinable_tables.sql b/db/sql/10_msar_joinable_tables.sql
index 6fbe6e3d24..14902fbf05 100644
--- a/db/sql/10_msar_joinable_tables.sql
+++ b/db/sql/10_msar_joinable_tables.sql
@@ -40,6 +40,7 @@ CREATE TYPE msar.joinable_tables AS (
 );
 
 
+DROP FUNCTION IF EXISTS msar.get_joinable_tables(integer);
 CREATE OR REPLACE FUNCTION
 msar.get_joinable_tables(max_depth integer) RETURNS SETOF msar.joinable_tables AS $$/*
 This function returns a table of msar.joinable_tables objects, giving paths to various
@@ -128,21 +129,16 @@ UNION ALL
   FROM search_fkey_graph
 )
 SELECT * FROM output_cte;
-$$ LANGUAGE sql;
+$$ LANGUAGE SQL STABLE;
 
 
 DROP FUNCTION IF EXISTS msar.get_joinable_tables(integer, oid);
 CREATE OR REPLACE FUNCTION
 msar.get_joinable_tables(max_depth integer, table_id oid) RETURNS
 jsonb AS $$
-DECLARE
-  joinable_tables jsonb;
-  target_table_info jsonb;
-BEGIN
-  CREATE TEMP TABLE jt_cte AS 
-    SELECT * FROM msar.get_joinable_tables(max_depth) WHERE base=table_id;
-  SELECT jsonb_agg(to_jsonb(jt_cte.*)) INTO joinable_tables FROM jt_cte;
-  WITH target_cte AS (
+  WITH jt_cte AS (
+    SELECT * FROM msar.get_joinable_tables(max_depth) WHERE base=table_id
+  ), target_cte AS (
     SELECT pga.attrelid AS tt_oid, 
       jsonb_build_object(
         'name', msar.get_relation_name(pga.attrelid),
@@ -153,15 +149,16 @@ BEGIN
             )
           )
       ) AS tt_info
-    FROM pg_catalog.pg_attribute AS pga
-    LEFT JOIN jt_cte ON pga.attrelid = jt_cte.target
+    FROM pg_catalog.pg_attribute AS pga, jt_cte
     WHERE pga.attrelid=jt_cte.target AND pga.attnum > 0 and NOT pga.attisdropped
     GROUP BY pga.attrelid
+  ), joinable_tables AS (
+    SELECT jsonb_agg(to_jsonb(jt_cte.*)) AS jt FROM jt_cte
+  ), target_table_info AS (
+    SELECT jsonb_object_agg(tt_oid, tt_info) AS tt FROM target_cte
   )
-  SELECT jsonb_object_agg(tt_oid, tt_info) INTO target_table_info FROM target_cte;
-  RETURN jsonb_build_object(
-    'joinable_tables', joinable_tables,
-    'target_table_info', target_table_info
-  );
-END;
-$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+  SELECT jsonb_build_object(
+    'joinable_tables', joinable_tables.jt,
+    'target_table_info', target_table_info.tt
+  ) FROM joinable_tables, target_table_info;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;

From de8d91e8ce49d3e15b59aa6df47783509676c05c Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 1 Aug 2024 18:30:42 +0800
Subject: [PATCH 0564/1141] add tests to make sure grouping is working

---
 db/sql/test_00_msar.sql | 93 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 2965efbf9d..9de3f3525b 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -3067,6 +3067,8 @@ BEGIN
         {"1": 2, "2": "Abigail", "3": "Acosta", "4": "2020-04-16 AD"}
       ],
       "grouping": {
+        "columns": [3, 2],
+        "preproc": null,
         "groups": [
           {"gid": 1, "gcount": 5, "results_eq": {"2": "Abigail", "3": "Abbott"}},
           {"gid": 2, "gcount": 2, "results_eq": {"2": "Aaron", "3": "Acevedo"}},
@@ -3083,6 +3085,97 @@ BEGIN
       )
     )
   );
+  RETURN NEXT is(
+    msar.list_records_from_table(
+      rel_id,
+      3, null,
+      '[{"attnum": 3, "direction": "asc"}, {"attnum": 2, "direction": "asc"}]',
+      null,
+      '{"columns": [3, 2]}'
+    ),
+    $j${
+      "count": 21,
+      "results": [
+        {"1": 5, "2": "Abigail", "3": "Abbott", "4": "2020-07-05 AD"},
+        {"1": 8, "2": "Abigail", "3": "Abbott", "4": "2020-10-30 AD"},
+        {"1": 15, "2": "Abigail", "3": "Abbott", "4": "2021-11-30 AD"}
+      ],
+      "grouping": {
+        "columns": [3, 2],
+        "preproc": null,
+        "groups": [
+          {"gid": 1, "gcount": 5, "results_eq": {"2": "Abigail", "3": "Abbott"}}
+        ]
+      }
+    }$j$ || jsonb_build_object(
+      'query', concat(
+        'SELECT msar.format_data(id) AS "1", msar.format_data("First Name") AS "2",'
+        ' msar.format_data("Last Name") AS "3", msar.format_data("Subscription Date") AS "4"'
+        ' FROM public."Customers"  ORDER BY "3" ASC, "2" ASC, "1" ASC LIMIT ''3'' OFFSET NULL'
+      )
+    )
+  );
+  RETURN NEXT is(
+    msar.list_records_from_table(
+      rel_id,
+      3, null,
+      '[{"attnum": 4, "direction": "asc"}]',
+      null,
+      '{"columns": [4], "preproc": ["truncate_to_month"]}'
+    ),
+    $j${
+      "count": 21,
+      "results": [
+        {"1": 1, "2": "Aaron", "3": "Adams", "4": "2020-03-21 AD"},
+        {"1": 2, "2": "Abigail", "3": "Acosta", "4": "2020-04-16 AD"},
+        {"1": 3, "2": "Aaron", "3": "Adams", "4": "2020-04-29 AD"}
+      ],
+      "grouping": {
+        "columns": [4],
+        "preproc": ["truncate_to_month"],
+        "groups": [
+          {"gid": 1, "gcount": 1, "results_eq": {"4": "2020-03 AD"}},
+          {"gid": 2, "gcount": 2, "results_eq": {"4": "2020-04 AD"}}
+        ]
+      }
+    }$j$ || jsonb_build_object(
+      'query', concat(
+        'SELECT msar.format_data(id) AS "1", msar.format_data("First Name") AS "2",'
+        ' msar.format_data("Last Name") AS "3", msar.format_data("Subscription Date") AS "4"'
+        ' FROM public."Customers"  ORDER BY "4" ASC, "1" ASC LIMIT ''3'' OFFSET NULL'
+      )
+    )
+  );
+  RETURN NEXT is(
+    msar.list_records_from_table(
+      rel_id,
+      5, null,
+      '[{"attnum": 4, "direction": "asc"}]',
+      null,
+      '{"columns": [4], "preproc": ["truncate_to_year"]}'
+    ),
+    $j${
+      "count": 21,
+      "results": [
+        {"1": 1, "2": "Aaron", "3": "Adams", "4": "2020-03-21 AD"},
+        {"1": 2, "2": "Abigail", "3": "Acosta", "4": "2020-04-16 AD"},
+        {"1": 3, "2": "Aaron", "3": "Adams", "4": "2020-04-29 AD"},
+        {"1": 4, "2": "Abigail", "3": "Adams", "4": "2020-05-29 AD"},
+        {"1": 5, "2": "Abigail", "3": "Abbott", "4": "2020-07-05 AD"}
+      ],
+      "grouping": {
+        "columns": [4],
+        "preproc": ["truncate_to_year"],
+        "groups": [{"gid": 1, "gcount": 8, "results_eq": {"4": "2020 AD"}}]
+      }
+    }$j$ || jsonb_build_object(
+      'query', concat(
+        'SELECT msar.format_data(id) AS "1", msar.format_data("First Name") AS "2",'
+        ' msar.format_data("Last Name") AS "3", msar.format_data("Subscription Date") AS "4"'
+        ' FROM public."Customers"  ORDER BY "4" ASC, "1" ASC LIMIT ''5'' OFFSET NULL'
+      )
+    )
+  );
 END;
 $$ LANGUAGE plpgsql;
 

From 2aa5d04ecf0a7633c9d8b08c05ade4dff025a41d Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 1 Aug 2024 19:57:45 +0530
Subject: [PATCH 0565/1141] change test to conform to new response structure

---
 mathesar/tests/rpc/tables/test_t_base.py | 120 +++++++----------------
 1 file changed, 36 insertions(+), 84 deletions(-)

diff --git a/mathesar/tests/rpc/tables/test_t_base.py b/mathesar/tests/rpc/tables/test_t_base.py
index 082315b783..714c1e4af3 100644
--- a/mathesar/tests/rpc/tables/test_t_base.py
+++ b/mathesar/tests/rpc/tables/test_t_base.py
@@ -298,22 +298,6 @@ def mock_list_joinable_tables(_table_oid, conn, max_depth):
                     'join_path': [[[2254329, 2], [2254334, 1]]],
                     'multiple_results': False
                 },
-                {
-                    'base': 2254329,
-                    'depth': 1,
-                    'target': 2254334,
-                    'fkey_path': [[2254406, False]],
-                    'join_path': [[[2254329, 2], [2254334, 1]]],
-                    'multiple_results': False
-                },
-                {
-                    'base': 2254329,
-                    'depth': 1,
-                    'target': 2254350,
-                    'fkey_path': [[2254411, False]],
-                    'join_path': [[[2254329, 3], [2254350, 1]]],
-                    'multiple_results': False
-                },
                 {
                     'base': 2254329,
                     'depth': 1,
@@ -322,33 +306,25 @@ def mock_list_joinable_tables(_table_oid, conn, max_depth):
                     'join_path': [[[2254329, 3], [2254350, 1]]],
                     'multiple_results': False
                 }],
-            'target_table_info': [
-                {
-                    '2254334': 'Items',
-                    'columns': [{'1': {'name': 'id', 'type': 'integer'}},
-                                {'2': {'name': 'Barcode', 'type': 'text'}},
-                                {'3': {'name': 'Acquisition Date', 'type': 'date'}},
-                                {'5': {'name': 'Book', 'type': 'integer'}}]
-                },
-                {
-                    '2254350': 'Patrons',
-                    'columns': [{'1': {'name': 'id', 'type': 'integer'}},
-                                {'2': {'name': 'First Name', 'type': 'text'}},
-                                {'3': {'name': 'Last Name', 'type': 'text'}}]
-                },
-                {
-                    '2254334': 'Items',
-                    'columns': [{'1': {'name': 'id', 'type': 'integer'}},
-                                {'2': {'name': 'Barcode', 'type': 'text'}},
-                                {'3': {'name': 'Acquisition Date', 'type': 'date'}},
-                                {'5': {'name': 'Book', 'type': 'integer'}}]
+            'target_table_info': {
+                '2254334': {
+                    'name': 'Items',
+                    'columns': {
+                        '1': {'name': 'id', 'type': 'integer'},
+                        '2': {'name': 'Barcode', 'type': 'text'},
+                        '3': {'name': 'Acquisition Date', 'type': 'date'},
+                        '5': {'name': 'Book', 'type': 'integer'}
+                    }
                 },
-                {
-                    '2254350': 'Patrons',
-                    'columns': [{'1': {'name': 'id', 'type': 'integer'}},
-                                {'2': {'name': 'First Name', 'type': 'text'}},
-                                {'3': {'name': 'Last Name', 'type': 'text'}}]
-                }]
+                '2254350': {
+                    'name': 'Patrons',
+                    'columns': {
+                        '1': {'name': 'id', 'type': 'integer'},
+                        '2': {'name': 'First Name', 'type': 'text'},
+                        '3': {'name': 'Last Name', 'type': 'text'}
+                    }
+                }
+            }
         }
     expected_dict = {
         'joinable_tables': [
@@ -360,22 +336,6 @@ def mock_list_joinable_tables(_table_oid, conn, max_depth):
                 'join_path': [[[2254329, 2], [2254334, 1]]],
                 'multiple_results': False
             },
-            {
-                'base': 2254329,
-                'depth': 1,
-                'target': 2254334,
-                'fkey_path': [[2254406, False]],
-                'join_path': [[[2254329, 2], [2254334, 1]]],
-                'multiple_results': False
-            },
-            {
-                'base': 2254329,
-                'depth': 1,
-                'target': 2254350,
-                'fkey_path': [[2254411, False]],
-                'join_path': [[[2254329, 3], [2254350, 1]]],
-                'multiple_results': False
-            },
             {
                 'base': 2254329,
                 'depth': 1,
@@ -384,33 +344,25 @@ def mock_list_joinable_tables(_table_oid, conn, max_depth):
                 'join_path': [[[2254329, 3], [2254350, 1]]],
                 'multiple_results': False
             }],
-        'target_table_info': [
-            {
-                '2254334': 'Items',
-                'columns': [{'1': {'name': 'id', 'type': 'integer'}},
-                            {'2': {'name': 'Barcode', 'type': 'text'}},
-                            {'3': {'name': 'Acquisition Date', 'type': 'date'}},
-                            {'5': {'name': 'Book', 'type': 'integer'}}]
-            },
-            {
-                '2254350': 'Patrons',
-                'columns': [{'1': {'name': 'id', 'type': 'integer'}},
-                            {'2': {'name': 'First Name', 'type': 'text'}},
-                            {'3': {'name': 'Last Name', 'type': 'text'}}]
+        'target_table_info': {
+            '2254334': {
+                'name': 'Items',
+                'columns': {
+                    '1': {'name': 'id', 'type': 'integer'},
+                    '2': {'name': 'Barcode', 'type': 'text'},
+                    '3': {'name': 'Acquisition Date', 'type': 'date'},
+                    '5': {'name': 'Book', 'type': 'integer'}
+                }
             },
-            {
-                '2254334': 'Items',
-                'columns': [{'1': {'name': 'id', 'type': 'integer'}},
-                            {'2': {'name': 'Barcode', 'type': 'text'}},
-                            {'3': {'name': 'Acquisition Date', 'type': 'date'}},
-                            {'5': {'name': 'Book', 'type': 'integer'}}]
-            },
-            {
-                '2254350': 'Patrons',
-                'columns': [{'1': {'name': 'id', 'type': 'integer'}},
-                            {'2': {'name': 'First Name', 'type': 'text'}},
-                            {'3': {'name': 'Last Name', 'type': 'text'}}]
-            }]
+            '2254350': {
+                'name': 'Patrons',
+                'columns': {
+                    '1': {'name': 'id', 'type': 'integer'},
+                    '2': {'name': 'First Name', 'type': 'text'},
+                    '3': {'name': 'Last Name', 'type': 'text'}
+                }
+            }
+        }
     }
     monkeypatch.setattr(tables.base, 'connect', mock_connect)
     monkeypatch.setattr(tables.base, 'list_joinable_tables', mock_list_joinable_tables)

From 3d783bb24384f42b7ec3fd04f6e6674842b31b1c Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 1 Aug 2024 23:03:30 +0800
Subject: [PATCH 0566/1141] modify object keys to conform with previous API
 response

---
 db/sql/00_msar.sql      |  4 ++--
 db/sql/test_00_msar.sql | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 15877cc805..2e7b9dd3d7 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3498,8 +3498,8 @@ SELECT format(
       'preproc', %4$L::jsonb,
       'groups', jsonb_agg(
         DISTINCT jsonb_build_object(
-          'gid', %2$I.__mathesar_gid,
-          'gcount', %2$I.__mathesar_gcount,
+          'id', %2$I.__mathesar_gid,
+          'count', %2$I.__mathesar_gcount,
           'results_eq', jsonb_build_object(%1$s)
         )
       )
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 9de3f3525b..6141aad0a2 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -3070,11 +3070,11 @@ BEGIN
         "columns": [3, 2],
         "preproc": null,
         "groups": [
-          {"gid": 1, "gcount": 5, "results_eq": {"2": "Abigail", "3": "Abbott"}},
-          {"gid": 2, "gcount": 2, "results_eq": {"2": "Aaron", "3": "Acevedo"}},
-          {"gid": 3, "gcount": 1, "results_eq": {"2": "Abigail", "3": "Acevedo"}},
-          {"gid": 4, "gcount": 1, "results_eq": {"2": "Aaron", "3": "Acosta"}},
-          {"gid": 5, "gcount": 1, "results_eq": {"2": "Abigail", "3": "Acosta"}}
+          {"id": 1, "count": 5, "results_eq": {"2": "Abigail", "3": "Abbott"}},
+          {"id": 2, "count": 2, "results_eq": {"2": "Aaron", "3": "Acevedo"}},
+          {"id": 3, "count": 1, "results_eq": {"2": "Abigail", "3": "Acevedo"}},
+          {"id": 4, "count": 1, "results_eq": {"2": "Aaron", "3": "Acosta"}},
+          {"id": 5, "count": 1, "results_eq": {"2": "Abigail", "3": "Acosta"}}
         ]
       }
     }$j$ || jsonb_build_object(
@@ -3104,7 +3104,7 @@ BEGIN
         "columns": [3, 2],
         "preproc": null,
         "groups": [
-          {"gid": 1, "gcount": 5, "results_eq": {"2": "Abigail", "3": "Abbott"}}
+          {"id": 1, "count": 5, "results_eq": {"2": "Abigail", "3": "Abbott"}}
         ]
       }
     }$j$ || jsonb_build_object(
@@ -3134,8 +3134,8 @@ BEGIN
         "columns": [4],
         "preproc": ["truncate_to_month"],
         "groups": [
-          {"gid": 1, "gcount": 1, "results_eq": {"4": "2020-03 AD"}},
-          {"gid": 2, "gcount": 2, "results_eq": {"4": "2020-04 AD"}}
+          {"id": 1, "count": 1, "results_eq": {"4": "2020-03 AD"}},
+          {"id": 2, "count": 2, "results_eq": {"4": "2020-04 AD"}}
         ]
       }
     }$j$ || jsonb_build_object(
@@ -3166,7 +3166,7 @@ BEGIN
       "grouping": {
         "columns": [4],
         "preproc": ["truncate_to_year"],
-        "groups": [{"gid": 1, "gcount": 8, "results_eq": {"4": "2020 AD"}}]
+        "groups": [{"id": 1, "count": 8, "results_eq": {"4": "2020 AD"}}]
       }
     }$j$ || jsonb_build_object(
       'query', concat(

From 3a388ca9d1b79e95098a467dd08557dca41bd931 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 1 Aug 2024 23:04:05 +0800
Subject: [PATCH 0567/1141] specify group objects in RPC layer

---
 mathesar/rpc/records.py            | 52 ++++++++++++++++++++++++++----
 mathesar/tests/rpc/test_records.py | 15 +++++++--
 2 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index 028f5fe859..b3f9204cf1 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -74,6 +74,46 @@ class SearchParam(TypedDict):
     literal: Any
 
 
+class Grouping(TypedDict):
+    """
+    Grouping definition.
+
+    Attributes:
+        columns: The columns to be grouped by.
+        preproc: The preprocessing funtions to apply (if any).
+    """
+    columns: list[int]
+    preproc: list[str]
+
+
+class Group(TypedDict):
+    """
+    Group definition.
+
+    Attributes:
+        id: The id of the group. Consistent for same input.
+        count: The number of items in the group.
+        results_eq: The value the results of the group equal.
+    """
+    id: int
+    count: int
+    results_eq: list[dict]
+
+
+class GroupingResponse(TypedDict):
+    """
+    Grouping response object. Extends Grouping with actual groups.
+
+    Attributes:
+        columns: The columns to be grouped by.
+        preproc: The preprocessing funtions to apply (if any).
+        groups: The groups applicable to the records being returned.
+    """
+    columns: list[int]
+    preproc: list[str]
+    groups: list[Group]
+
+
 class RecordList(TypedDict):
     """
     Records from a table, along with some meta data
@@ -86,12 +126,12 @@ class RecordList(TypedDict):
     Attributes:
         count: The total number of records in the table.
         results: An array of record objects.
-        group: Information for displaying the records grouped in some way.
+        grouping: Information for displaying grouped records.
         preview_data: Information for previewing foreign key values.
     """
     count: int
     results: list[dict]
-    group: dict
+    grouping: dict
     preview_data: list[dict]
 
     @classmethod
@@ -99,7 +139,7 @@ def from_dict(cls, d):
         return cls(
             count=d["count"],
             results=d["results"],
-            group=None,
+            grouping=d.get("grouping"),
             preview_data=[],
             query=d["query"],
         )
@@ -116,7 +156,7 @@ def list_(
         offset: int = None,
         order: list[OrderBy] = None,
         filter: Filter = None,
-        group: list[dict] = None,
+        grouping: Grouping = None,
         **kwargs
 ) -> RecordList:
     """
@@ -130,7 +170,7 @@ def list_(
                  following rows.
         order: An array of ordering definition objects.
         filter: An array of filter definition objects.
-        group: An array of group definition objects.
+        grouping: An array of group definition objects.
 
     Returns:
         The requested records, along with some metadata.
@@ -144,7 +184,7 @@ def list_(
             offset=offset,
             order=order,
             filter=filter,
-            group=group,
+            group=grouping,
         )
     return RecordList.from_dict(record_info)
 
diff --git a/mathesar/tests/rpc/test_records.py b/mathesar/tests/rpc/test_records.py
index 8fc0229684..ba787d2aff 100644
--- a/mathesar/tests/rpc/test_records.py
+++ b/mathesar/tests/rpc/test_records.py
@@ -44,6 +44,12 @@ def mock_list_records(
             "count": 50123,
             "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],
             "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
+            "grouping": {
+                "columns": [2],
+                "groups": [
+                    {"id": 3, "count": 8, "results_eq": {"1": "lsfj", "2": 3422}}
+                ]
+            }
         }
 
     monkeypatch.setattr(records, 'connect', mock_connect)
@@ -51,7 +57,12 @@ def mock_list_records(
     expect_records_list = {
         "count": 50123,
         "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],
-        "group": None,
+        "grouping": {
+            "columns": [2],
+            "groups": [
+                {"id": 3, "count": 8, "results_eq": {"1": "lsfj", "2": 3422}}
+            ]
+        },
         "preview_data": [],
         "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
     }
@@ -98,7 +109,7 @@ def mock_search_records(
     expect_records_list = {
         "count": 50123,
         "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],
-        "group": None,
+        "grouping": None,
         "preview_data": [],
         "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
     }

From f6763aca91ab33882e26a2b73327bf7491410cb4 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 1 Aug 2024 23:06:36 +0800
Subject: [PATCH 0568/1141] wire up grouping docs to documentation

---
 docs/docs/api/rpc.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 34dfd1cc37..db8e9557cd 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -187,6 +187,9 @@ To use an RPC function:
       - Filter
       - FilterAttnum
       - FilterLiteral
+      - Grouping
+      - Group
+      - GroupingResponse
       - SearchParam
 
 ## Explorations

From 370d510c7f862c1aeb0ce11d80f7f4b782e2f383 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 1 Aug 2024 23:17:51 +0800
Subject: [PATCH 0569/1141] add documentation to SQL functions

---
 db/sql/00_msar.sql | 43 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 2e7b9dd3d7..c25bd841cc 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3439,7 +3439,23 @@ $$ LANGUAGE SQL STABLE;
 
 
 CREATE OR REPLACE FUNCTION
-msar.build_grouping_columns_expr(tab_id oid, group_ jsonb) RETURNS TEXT AS $$
+msar.build_grouping_columns_expr(tab_id oid, group_ jsonb) RETURNS TEXT AS $$/*
+Build a column expression for use in grouping window functions.
+
+Args:
+  tab_id: The OID of the table whose records we're grouping
+  group_ A grouping definition.
+
+The group_ object should have the form
+    {
+      "columns": [<int>, <int>, ...]
+      "preproc": [<str>, <str>, ...]
+    }
+
+The items in the preproc array should be keys appearing in the
+`expr_templates` table. The corresponding column will be wrapped
+in the preproc function before grouping.
+*/
 SELECT string_agg(
   COALESCE(
     format(expr_template, quote_ident(msar.get_column_name(tab_id, col_id::smallint))),
@@ -3455,19 +3471,28 @@ $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-msar.build_group_id_expr(tab_id oid, group_ jsonb) RETURNS TEXT AS $$
+msar.build_group_id_expr(tab_id oid, group_ jsonb) RETURNS TEXT AS $$/*
+Build an expression to define an id value for each group.
+*/
 SELECT 'dense_rank() OVER (ORDER BY ' || msar.build_grouping_columns_expr(tab_id, group_) || ')';
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-msar.build_group_count_expr(tab_id oid, group_ jsonb) RETURNS TEXT AS $$
+msar.build_group_count_expr(tab_id oid, group_ jsonb) RETURNS TEXT AS $$/*
+Build an expression that adds a column with a count for each group.
+*/
 SELECT 'count(1) OVER (PARTITION BY ' || msar.build_grouping_columns_expr(tab_id, group_) || ')';
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-msar.build_grouping_expr(tab_id oid, group_ jsonb) RETURNS TEXT AS $$
+msar.build_grouping_expr(tab_id oid, group_ jsonb) RETURNS TEXT AS $$/*
+Build an expression composed of an id and count for each group.
+
+A group is defined by distinct combinations of the (potentially transformed by preproc functions)
+columns passed in `group_`.
+*/
 SELECT concat(
   COALESCE(msar.build_group_id_expr(tab_id, group_), 'NULL'), ' AS __mathesar_gid, ',
   COALESCE(msar.build_group_count_expr(tab_id, group_), 'NULL'), ' AS __mathesar_gcount'
@@ -3476,7 +3501,10 @@ $$ LANGUAGE SQL STABLE;
 
 
 CREATE OR REPLACE FUNCTION
-msar.build_results_jsonb_expr(tab_id oid, cte_name text) RETURNS TEXT AS $$
+msar.build_results_jsonb_expr(tab_id oid, cte_name text) RETURNS TEXT AS $$/*
+Build an SQL expresson string that, when added to the record listing query, produces a JSON array
+with the records resulting from the request.
+*/
 SELECT 'coalesce(jsonb_agg(json_build_object('
   || string_agg(format('%1$L, %2$I.%1$I', attnum, cte_name), ', ')
   || ')), jsonb_build_array())'
@@ -3490,7 +3518,10 @@ $$ LANGUAGE SQL STABLE;
 
 
 CREATE OR REPLACE FUNCTION
-msar.build_grouping_results_jsonb_expr(tab_id oid, cte_name text, group_ jsonb) RETURNS TEXT AS $$
+msar.build_grouping_results_jsonb_expr(tab_id oid, cte_name text, group_ jsonb) RETURNS TEXT AS $$/*
+Build an SQL expresson string that, when added to the record listing query, produces a JSON array
+with the groups resulting from the request.
+*/
 SELECT format(
   $gj$
     jsonb_build_object(

From d2c24f8c3259b09e5baa130e1501f42c7dbd9f53 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 2 Aug 2024 11:33:08 +0800
Subject: [PATCH 0570/1141] Fix miscopied docstring

Co-authored-by: Anish Umale <umaleanish120@gmail.com>
---
 db/records/operations/select.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/records/operations/select.py b/db/records/operations/select.py
index a32ee0a382..1dc747011e 100644
--- a/db/records/operations/select.py
+++ b/db/records/operations/select.py
@@ -67,7 +67,7 @@ def search_records_from_table(
         limit: The maximum number of rows we'll return.
 
     The search definition objects should have the form
-    {"attnum": <int>, "direction": <text>}
+    {"attnum": <int>, "literal": <text>}
     """
     search = search or []
     result = db_conn.exec_msar_func(

From 9e2cfeec776e854b59f874e44250db6065d9d3ee Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 2 Aug 2024 13:31:35 +0800
Subject: [PATCH 0571/1141] modify search to handle empty search and nulls

---
 db/sql/00_msar.sql | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index e4f740ab97..6b4edc9dab 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3534,7 +3534,7 @@ WHERE
   pga.attrelid = tab_id
   AND NOT pga.attisdropped
   AND has_column_privilege(tab_id, x.attnum, 'SELECT')
-$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
@@ -3561,28 +3561,27 @@ BEGIN
   EXECUTE format(
     $q$
     WITH count_cte AS (
-      SELECT count(1) AS count FROM %2$I.%3$I WHERE %4$s > 0
+      SELECT count(1) AS count FROM %2$I.%3$I %4$s
     ), results_cte AS (
-      SELECT %1$s FROM %2$I.%3$I WHERE %4$s >0 ORDER BY %6$s LIMIT %5$L
+      SELECT %1$s FROM %2$I.%3$I %4$s ORDER BY %6$s LIMIT %5$L
     )
     SELECT jsonb_build_object(
       'results', coalesce(jsonb_agg(row_to_json(results_cte.*)), jsonb_build_array()),
       'count', coalesce(max(count_cte.count), 0),
-      'query', $iq$SELECT %1$s FROM %2$I.%3$I WHERE %4$s >0 ORDER BY %6$s LIMIT %5$L$iq$
+      'query', $iq$SELECT %1$s FROM %2$I.%3$I %4$s ORDER BY %6$s LIMIT %5$L$iq$
     )
     FROM results_cte, count_cte
     $q$,
     msar.build_selectable_column_expr(tab_id),
     msar.get_relation_schema_name(tab_id),
     msar.get_relation_name(tab_id),
-    msar.get_score_expr(tab_id, search_),
+    'WHERE ' || msar.get_score_expr(tab_id, search_) || ' > 0',
     limit_,
     concat(
-      msar.get_score_expr(tab_id, search_),
-      ' DESC, ',
+      msar.get_score_expr(tab_id, search_) || ' DESC, ',
       msar.build_total_order_expr(tab_id, null)
     )
   ) INTO records;
   RETURN records;
 END;
-$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE plpgsql;

From 1718a5fd192058b543d48f8e32d6c3bda4ae4646 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 2 Aug 2024 13:59:20 +0800
Subject: [PATCH 0572/1141] add tests for empty limits and searches

---
 db/sql/test_00_msar.sql | 48 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 60568abc4b..ec41be6652 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -3362,6 +3362,54 @@ BEGIN
   RETURN NEXT is(search_result -> 'results', jsonb_build_array());
   RETURN NEXT is((search_result -> 'count')::integer, 0);
 
+  search_result := msar.search_records_from_table(
+    rel_id,
+    jsonb_build_array(
+      jsonb_build_object('attnum', 3, 'literal', 'bc')
+    ),
+    null
+  );
+  RETURN NEXT is(
+    search_result -> 'results',
+    jsonb_build_array(
+      jsonb_build_object('1', 1, '2', 1, '3', 'bcdea'),
+      jsonb_build_object('1', 4, '2', 2, '3', 'abcde')
+    )
+  );
+  RETURN NEXT is((search_result -> 'count')::integer, 2);
+
+  search_result := msar.search_records_from_table(
+    rel_id,
+    jsonb_build_array(),
+    10
+  );
+  RETURN NEXT is(
+    search_result -> 'results',
+    jsonb_build_array(
+      jsonb_build_object('1', 1, '2', 1, '3', 'bcdea'),
+      jsonb_build_object('1', 2, '2', 12, '3', 'vwxyz'),
+      jsonb_build_object('1', 3, '2', 1, '3', 'edcba'),
+      jsonb_build_object('1', 4, '2', 2, '3', 'abcde')
+    )
+  );
+  RETURN NEXT is((search_result -> 'count')::integer, 4);
+
+  search_result := msar.search_records_from_table(
+    rel_id,
+    null,
+    10
+  );
+  RETURN NEXT is(
+    search_result -> 'results',
+    jsonb_build_array(
+      jsonb_build_object('1', 1, '2', 1, '3', 'bcdea'),
+      jsonb_build_object('1', 2, '2', 12, '3', 'vwxyz'),
+      jsonb_build_object('1', 3, '2', 1, '3', 'edcba'),
+      jsonb_build_object('1', 4, '2', 2, '3', 'abcde')
+    )
+  );
+  RETURN NEXT is((search_result -> 'count')::integer, 4);
+
   search_result := msar.search_records_from_table(
     rel_id,
     jsonb_build_array(

From 3f3e2993fe674d8c47f5160cb2b094091e826cd2 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Sat, 3 Aug 2024 00:02:57 -0400
Subject: [PATCH 0573/1141] Fix bug by narrowing type via assertion instead of
 error

---
 mathesar_ui/src/stores/databases.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/mathesar_ui/src/stores/databases.ts b/mathesar_ui/src/stores/databases.ts
index c5eae8f070..4780b8b646 100644
--- a/mathesar_ui/src/stores/databases.ts
+++ b/mathesar_ui/src/stores/databases.ts
@@ -76,13 +76,13 @@ class DatabasesStore {
 export const databasesStore: MakeWritablePropertiesReadable<DatabasesStore> =
   new DatabasesStore();
 
-/**
- * @throws an error when used in a context where no current database exists.
- * This behavior sacrifices some stability for the sake of developer ergonomics.
- * This sacrifice seems acceptable given that such a large part of the
- * application depends on the existence of one and only one database.
+/** ⚠️ This readable store contains a type assertion designed to sacrifice type
+ * safety for the benefit of convenience.
+ *
+ * We need to access `currentDatabase` like EVERYWHERE throughout the app, and
+ * we'd like to avoid checking if it's defined every time. So we assert that it
+ * is defined, and we'll just have to be careful to **never use the value from
+ * this store within a context where no database is set.**
  */
-export const currentDatabase = derived(databasesStore.currentDatabase, (c) => {
-  if (!c) throw new Error('No current database');
-  return c;
-});
+export const currentDatabase =
+  databasesStore.currentDatabase as Readable<Database>;

From df61f1745e9d7abf2b7e3069ef4e816df75021da Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 31 Jul 2024 21:01:48 -0400
Subject: [PATCH 0574/1141] Set up new records filter type at API layer

---
 mathesar_ui/src/api/rpc/records.ts | 41 ++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/records.ts b/mathesar_ui/src/api/rpc/records.ts
index 5389b42989..562b1571f6 100644
--- a/mathesar_ui/src/api/rpc/records.ts
+++ b/mathesar_ui/src/api/rpc/records.ts
@@ -27,16 +27,35 @@ export interface SortingEntry {
   attnum: number;
   direction: SortDirection;
 }
-export type FilterCombination = 'and' | 'or';
-export type FilterConditionParams = [
-  { column_id: [number] },
-  ...{ literal: [unknown] }[],
-];
-export type FilterCondition = Record<string, FilterConditionParams>;
-type MakeFilteringOption<U> = U extends string
-  ? { [k in U]: FilterRequest[] }
-  : never;
-type FilterRequest = FilterCondition | MakeFilteringOption<FilterCombination>;
+
+export type SqlExpr =
+  | {
+      type:
+        | 'and'
+        | 'or'
+        | 'equal'
+        | 'lesser'
+        | 'greater'
+        | 'lesser_or_equal'
+        | 'greater_or_equal'
+        | 'contains_case_insensitive'
+        | 'contains'
+        | 'starts_with'
+        | 'json_array_contains';
+      args: [SqlExpr, SqlExpr];
+    }
+  | {
+      type:
+        | 'null'
+        | 'not_null'
+        | 'json_array_length'
+        | 'uri_scheme'
+        | 'uri_authority'
+        | 'email_domain';
+      args: [SqlExpr];
+    }
+  | { type: 'literal'; value: string | number | null }
+  | { type: 'attnum'; value: number };
 
 export interface RecordsListParams {
   database_id: number;
@@ -45,7 +64,7 @@ export interface RecordsListParams {
   offset?: number;
   order?: SortingEntry[];
   group?: Pick<Grouping, 'columns' | 'preproc'>;
-  filter?: FilterRequest;
+  filter?: SqlExpr;
   search_fuzzy?: Record<string, unknown>[];
 }
 

From 39dcf5865467e76934812d6a74187ae6b3db6556 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 6 Aug 2024 00:43:01 +0530
Subject: [PATCH 0575/1141] add run_saved rpc endpoint

---
 docs/docs/api/rpc.md                 |  1 +
 mathesar/rpc/explorations.py         | 19 +++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py |  5 +++++
 3 files changed, 25 insertions(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 6d9d8e013e..a4c8a9eedf 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -198,6 +198,7 @@ To use an RPC function:
       - list_
       - delete
       - run
+      - run_saved
       - ExplorationInfo
       - ExplorationDef
       - ExplorationResult
diff --git a/mathesar/rpc/explorations.py b/mathesar/rpc/explorations.py
index d197b27d1b..cc01129aa4 100644
--- a/mathesar/rpc/explorations.py
+++ b/mathesar/rpc/explorations.py
@@ -6,6 +6,7 @@
 from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
 
+from mathesar.models.base import Explorations
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
 from mathesar.utils.explorations import get_explorations, delete_exploration, run_exploration
@@ -184,3 +185,21 @@ def run(*, exploration_def: ExplorationDef, database_id: int, **kwargs) -> Explo
     with connect(database_id, user) as conn:
         exploration_result = run_exploration(exploration_def, database_id, conn)
     return ExplorationResult.from_dict(exploration_result)
+
+
+@rpc_method(name='explorations.run_saved')
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def run_saved(*, exploration_id: int, **kwargs) -> ExplorationResult:
+    """
+    Run a saved exploration.
+
+    Args:
+        exploration_id: The Django id of the exploration to run.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    exploration_def = ExplorationInfo.from_model(Explorations.objects.get(id=exploration_id))
+    database_id = exploration_def["database_id"]
+    with connect(database_id, user) as conn:
+        exploration_result = run_exploration(exploration_def, database_id, conn)
+    return ExplorationResult.from_dict(exploration_result)
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 829b67cd8e..62602831e4 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -169,6 +169,11 @@
         "explorations.run",
         [user_is_authenticated]
     ),
+    (
+        explorations.run_saved,
+        "explorations.run_saved",
+        [user_is_authenticated]
+    ),
     (
         roles.list_,
         "roles.list",

From f2b95ec7320a12ef44322e2c89a773171b0e1c83 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 6 Aug 2024 01:06:33 +0530
Subject: [PATCH 0576/1141] implement get endpoint

---
 docs/docs/api/rpc.md                    |  1 +
 mathesar/rpc/explorations.py            | 21 +++++++++++++++++++--
 mathesar/tests/rpc/test_endpoints.py    |  5 +++++
 mathesar/tests/rpc/test_explorations.py |  2 +-
 mathesar/utils/explorations.py          |  6 +++++-
 5 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index a4c8a9eedf..2cb22331a9 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -196,6 +196,7 @@ To use an RPC function:
     options:
       members:
       - list_
+      - get
       - delete
       - run
       - run_saved
diff --git a/mathesar/rpc/explorations.py b/mathesar/rpc/explorations.py
index cc01129aa4..184269d56b 100644
--- a/mathesar/rpc/explorations.py
+++ b/mathesar/rpc/explorations.py
@@ -9,7 +9,7 @@
 from mathesar.models.base import Explorations
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
-from mathesar.utils.explorations import get_explorations, delete_exploration, run_exploration
+from mathesar.utils.explorations import list_explorations, get_exploration, delete_exploration, run_exploration
 
 
 class ExplorationInfo(TypedDict):
@@ -153,10 +153,27 @@ def list_(*, database_id: int, **kwargs) -> list[ExplorationInfo]:
     Returns:
         A list of exploration details.
     """
-    explorations = get_explorations(database_id)
+    explorations = list_explorations(database_id)
     return [ExplorationInfo.from_model(exploration) for exploration in explorations]
 
 
+@rpc_method(name="explorations.get")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def get(*, exploration_id: int, **kwargs) -> ExplorationInfo:
+    """
+    List information about an exploration.
+
+    Args:
+        exploration_id: The Django id of the exploration.
+
+    Returns:
+        Exploration details for a given exploration_id.
+    """
+    exploration = get_exploration(exploration_id)
+    return ExplorationInfo.from_model(exploration)
+
+
 @rpc_method(name="explorations.delete")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 62602831e4..4c1c00acb7 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -159,6 +159,11 @@
         "explorations.list",
         [user_is_authenticated]
     ),
+    (
+        explorations.get,
+        "explorations.get",
+        [user_is_authenticated]
+    ),
     (
         explorations.delete,
         "explorations.delete",
diff --git a/mathesar/tests/rpc/test_explorations.py b/mathesar/tests/rpc/test_explorations.py
index f43d15462a..74059f231e 100644
--- a/mathesar/tests/rpc/test_explorations.py
+++ b/mathesar/tests/rpc/test_explorations.py
@@ -74,7 +74,7 @@ def mock_exploration_info(_database_id):
                 description=None
             )
         ]
-    monkeypatch.setattr(explorations, 'get_explorations', mock_exploration_info)
+    monkeypatch.setattr(explorations, 'list_explorations', mock_exploration_info)
     expect_explorations_list = [
         {
             'id': 2,
diff --git a/mathesar/utils/explorations.py b/mathesar/utils/explorations.py
index 6767718ab2..2ce245e51f 100644
--- a/mathesar/utils/explorations.py
+++ b/mathesar/utils/explorations.py
@@ -8,10 +8,14 @@
 from mathesar.state import get_cached_metadata
 
 
-def get_explorations(database_id):
+def list_explorations(database_id):
     return Explorations.objects.filter(database__id=database_id)
 
 
+def get_exploration(exploration_id):
+    return Explorations.objects.get(id=exploration_id)
+
+
 def delete_exploration(exploration_id):
     Explorations.objects.get(id=exploration_id).delete()
 

From c3a0605fb4ffd1930f0ca3633a25be20e8a71826 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 6 Aug 2024 01:43:42 +0530
Subject: [PATCH 0577/1141] create run_saved_exploration function

---
 mathesar/rpc/explorations.py   | 18 ++++++++++++------
 mathesar/utils/explorations.py | 13 +++++++++++++
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/mathesar/rpc/explorations.py b/mathesar/rpc/explorations.py
index 184269d56b..63144d8ded 100644
--- a/mathesar/rpc/explorations.py
+++ b/mathesar/rpc/explorations.py
@@ -6,10 +6,15 @@
 from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
 
-from mathesar.models.base import Explorations
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
-from mathesar.utils.explorations import list_explorations, get_exploration, delete_exploration, run_exploration
+from mathesar.utils.explorations import (
+    list_explorations,
+    get_exploration,
+    delete_exploration,
+    run_exploration,
+    run_saved_exploration
+)
 
 
 class ExplorationInfo(TypedDict):
@@ -207,16 +212,17 @@ def run(*, exploration_def: ExplorationDef, database_id: int, **kwargs) -> Explo
 @rpc_method(name='explorations.run_saved')
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def run_saved(*, exploration_id: int, **kwargs) -> ExplorationResult:
+def run_saved(*, exploration_id: int, database_id: int, limit: int = 100, offset: int = 0, **kwargs) -> ExplorationResult:
     """
     Run a saved exploration.
 
     Args:
         exploration_id: The Django id of the exploration to run.
+        database_id: The Django id of the database containing the base table for the exploration.
+        limit: The max number of rows to return.(default 100)
+        offset: The number of rows to skip.(default 0)
     """
     user = kwargs.get(REQUEST_KEY).user
-    exploration_def = ExplorationInfo.from_model(Explorations.objects.get(id=exploration_id))
-    database_id = exploration_def["database_id"]
     with connect(database_id, user) as conn:
-        exploration_result = run_exploration(exploration_def, database_id, conn)
+        exploration_result = run_saved_exploration(exploration_id, limit, offset, database_id, conn)
     return ExplorationResult.from_dict(exploration_result)
diff --git a/mathesar/utils/explorations.py b/mathesar/utils/explorations.py
index 2ce245e51f..31fa36cbc8 100644
--- a/mathesar/utils/explorations.py
+++ b/mathesar/utils/explorations.py
@@ -98,6 +98,19 @@ def run_exploration(exploration_def, database_id, conn):
     }
 
 
+def run_saved_exploration(exploration_id, limit, offset, database_id, conn):
+    exp_model = Explorations.objects.get(id=exploration_id)
+    exploration_def = {
+        "base_table_oid": exp_model["base_table_oid"],
+        "initial_columns": exp_model["initial_columns"],
+        "display_names": exp_model["display_names"],
+        "transformations": exp_model["transformations"],
+        "limit": limit,
+        "offset": offset
+    }
+    return run_exploration(exploration_def, database_id, conn)
+
+
 def _get_exploration_column_metadata(
     exploration_def,
     processed_initial_columns,

From 41747e774b03eae02713a45846b815da812b48dd Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 6 Aug 2024 11:46:08 +0800
Subject: [PATCH 0578/1141] Fix grouping response type

Co-authored-by: Anish Umale <umaleanish120@gmail.com>
---
 mathesar/rpc/records.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index b3f9204cf1..3840cc3a4a 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -131,7 +131,7 @@ class RecordList(TypedDict):
     """
     count: int
     results: list[dict]
-    grouping: dict
+    grouping: GroupingResponse
     preview_data: list[dict]
 
     @classmethod

From 9909b18749c30082e547c403ea6c2c0cf58c5ad5 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 6 Aug 2024 12:20:09 +0800
Subject: [PATCH 0579/1141] use named kwargs for record listing tests

---
 db/sql/test_00_msar.sql | 83 ++++++++++++++++++++++++++++-------------
 1 file changed, 58 insertions(+), 25 deletions(-)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 6141aad0a2..bb97f1eb1a 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2933,7 +2933,14 @@ BEGIN
   PERFORM __setup_list_records_table();
   rel_id := 'atable'::regclass::oid;
   RETURN NEXT is(
-    msar.list_records_from_table(rel_id, null, null, null, null, null),
+    msar.list_records_from_table(
+      tab_id => rel_id,
+      limit_ => null,
+      offset_ => null,
+      order_ => null,
+      filter_ => null,
+      group_ => null
+    ),
     $j${
       "count": 3,
       "results": [
@@ -2953,7 +2960,12 @@ BEGIN
   );
   RETURN NEXT is(
     msar.list_records_from_table(
-      rel_id, 2, null, '[{"attnum": 2, "direction": "desc"}]', null, null
+      tab_id => rel_id,
+      limit_ => 2,
+      offset_ => null,
+      order_ => '[{"attnum": 2, "direction": "desc"}]',
+      filter_ => null,
+      group_ => null
     ),
     $j${
       "count": 3,
@@ -2973,7 +2985,12 @@ BEGIN
   );
   RETURN NEXT is(
     msar.list_records_from_table(
-      rel_id, null, 1, '[{"attnum": 1, "direction": "desc"}]', null, null
+      tab_id => rel_id,
+      limit_ => null,
+      offset_ => 1,
+      order_ => '[{"attnum": 1, "direction": "desc"}]',
+      filter_ => null,
+      group_ => null
     ),
     $j${
       "count": 3,
@@ -2997,7 +3014,14 @@ BEGIN
   GRANT SELECT (col1, col2, col3, col4) ON TABLE atable TO intern_no_pkey;
   SET ROLE intern_no_pkey;
   RETURN NEXT is(
-    msar.list_records_from_table(rel_id, null, null, null, null, null),
+    msar.list_records_from_table(
+      tab_id => rel_id,
+      limit_ => null,
+      offset_ => null,
+      order_ => null,
+      filter_ => null,
+      group_ => null
+    ),
     $j${
       "count": 3,
       "results": [
@@ -3016,7 +3040,12 @@ BEGIN
   );
   RETURN NEXT is(
     msar.list_records_from_table(
-      rel_id, null, null, '[{"attnum": 3, "direction": "desc"}]', null, null
+      tab_id => rel_id,
+      limit_ => null,
+      offset_ => null,
+      order_ => '[{"attnum": 3, "direction": "desc"}]',
+      filter_ => null,
+      group_ => null
     ),
     $j${
       "count": 3,
@@ -3046,11 +3075,12 @@ BEGIN
   rel_id := '"Customers"'::regclass::oid;
   RETURN NEXT is(
     msar.list_records_from_table(
-      rel_id,
-      10, null,
-      '[{"attnum": 3, "direction": "asc"}, {"attnum": 2, "direction": "asc"}]',
-      null,
-      '{"columns": [3, 2]}'
+      tab_id => rel_id,
+      limit_ => 10,
+      offset_ => null,
+      order_ => '[{"attnum": 3, "direction": "asc"}, {"attnum": 2, "direction": "asc"}]',
+      filter_ => null,
+      group_ => '{"columns": [3, 2]}'
     ),
     $j${
       "count": 21,
@@ -3087,11 +3117,12 @@ BEGIN
   );
   RETURN NEXT is(
     msar.list_records_from_table(
-      rel_id,
-      3, null,
-      '[{"attnum": 3, "direction": "asc"}, {"attnum": 2, "direction": "asc"}]',
-      null,
-      '{"columns": [3, 2]}'
+      tab_id => rel_id,
+      limit_ => 3,
+      offset_ => null,
+      order_ => '[{"attnum": 3, "direction": "asc"}, {"attnum": 2, "direction": "asc"}]',
+      filter_ => null,
+      group_ => '{"columns": [3, 2]}'
     ),
     $j${
       "count": 21,
@@ -3117,11 +3148,12 @@ BEGIN
   );
   RETURN NEXT is(
     msar.list_records_from_table(
-      rel_id,
-      3, null,
-      '[{"attnum": 4, "direction": "asc"}]',
-      null,
-      '{"columns": [4], "preproc": ["truncate_to_month"]}'
+      tab_id => rel_id,
+      limit_ => 3,
+      offset_ => null,
+      order_ => '[{"attnum": 4, "direction": "asc"}]',
+      filter_ => null,
+      group_ => '{"columns": [4], "preproc": ["truncate_to_month"]}'
     ),
     $j${
       "count": 21,
@@ -3148,11 +3180,12 @@ BEGIN
   );
   RETURN NEXT is(
     msar.list_records_from_table(
-      rel_id,
-      5, null,
-      '[{"attnum": 4, "direction": "asc"}]',
-      null,
-      '{"columns": [4], "preproc": ["truncate_to_year"]}'
+      tab_id => rel_id,
+      limit_ => 5,
+      offset_ => null,
+      order_ => '[{"attnum": 4, "direction": "asc"}]',
+      filter_ => null,
+      group_ => '{"columns": [4], "preproc": ["truncate_to_year"]}'
     ),
     $j${
       "count": 21,

From b4b462a85208dfb3cf146d657bf73fc03b7edf32 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 6 Aug 2024 08:49:50 -0400
Subject: [PATCH 0580/1141] Adapt front end to new filtering in records.list
 API

---
 mathesar_ui/src/api/rest/types/queries.ts     |   3 +-
 mathesar_ui/src/api/rpc/records.ts            |  66 +++++----
 .../filter-entry/FilterEntry.svelte           |  11 +-
 .../src/stores/abstract-types/types.ts        |  44 +++++-
 .../src/stores/table-data/filtering.ts        | 125 +++++++++++++++---
 mathesar_ui/src/stores/table-data/records.ts  |   8 +-
 .../QueryFilterTransformationModel.ts         |  29 ++--
 .../record-operations/filter/Filter.svelte    |   2 +-
 .../filter/FilterEntries.svelte               |   2 +-
 9 files changed, 220 insertions(+), 70 deletions(-)

diff --git a/mathesar_ui/src/api/rest/types/queries.ts b/mathesar_ui/src/api/rest/types/queries.ts
index 9affd4cabf..e5d5144e50 100644
--- a/mathesar_ui/src/api/rest/types/queries.ts
+++ b/mathesar_ui/src/api/rest/types/queries.ts
@@ -2,6 +2,7 @@ import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
 import type { Column } from '@mathesar/api/rpc/columns';
 import type { Schema } from '@mathesar/api/rpc/schemas';
 import type { JoinPath } from '@mathesar/api/rpc/tables';
+import type { FilterId } from '@mathesar/stores/abstract-types/types';
 
 export type QueryColumnAlias = string;
 
@@ -21,7 +22,7 @@ type FilterConditionParams = [
   { column_name: [string] },
   ...{ literal: [unknown] }[],
 ];
-type FilterCondition = Record<string, FilterConditionParams>;
+type FilterCondition = Partial<Record<FilterId, FilterConditionParams>>;
 
 export interface QueryInstanceFilterTransformation {
   type: 'filter';
diff --git a/mathesar_ui/src/api/rpc/records.ts b/mathesar_ui/src/api/rpc/records.ts
index 562b1571f6..1a000d7e8c 100644
--- a/mathesar_ui/src/api/rpc/records.ts
+++ b/mathesar_ui/src/api/rpc/records.ts
@@ -28,34 +28,44 @@ export interface SortingEntry {
   direction: SortDirection;
 }
 
-export type SqlExpr =
-  | {
-      type:
-        | 'and'
-        | 'or'
-        | 'equal'
-        | 'lesser'
-        | 'greater'
-        | 'lesser_or_equal'
-        | 'greater_or_equal'
-        | 'contains_case_insensitive'
-        | 'contains'
-        | 'starts_with'
-        | 'json_array_contains';
-      args: [SqlExpr, SqlExpr];
-    }
-  | {
-      type:
-        | 'null'
-        | 'not_null'
-        | 'json_array_length'
-        | 'uri_scheme'
-        | 'uri_authority'
-        | 'email_domain';
-      args: [SqlExpr];
-    }
-  | { type: 'literal'; value: string | number | null }
-  | { type: 'attnum'; value: number };
+export interface SqlComparison {
+  type:
+    | 'and'
+    | 'or'
+    | 'equal'
+    | 'lesser'
+    | 'greater'
+    | 'lesser_or_equal'
+    | 'greater_or_equal'
+    | 'contains_case_insensitive'
+    | 'contains'
+    | 'starts_with'
+    | 'json_array_contains';
+  args: [SqlExpr, SqlExpr];
+}
+
+export interface SqlFunction {
+  type:
+    | 'null'
+    | 'not_null'
+    | 'json_array_length'
+    | 'uri_scheme'
+    | 'uri_authority'
+    | 'email_domain';
+  args: [SqlExpr];
+}
+
+export interface SqlLiteral {
+  type: 'literal';
+  value: string | number | null;
+}
+
+export interface SqlColumn {
+  type: 'attnum';
+  value: number;
+}
+
+export type SqlExpr = SqlComparison | SqlFunction | SqlLiteral | SqlColumn;
 
 export interface RecordsListParams {
   database_id: number;
diff --git a/mathesar_ui/src/components/filter-entry/FilterEntry.svelte b/mathesar_ui/src/components/filter-entry/FilterEntry.svelte
index 74494a5fa0..e8cc490ff2 100644
--- a/mathesar_ui/src/components/filter-entry/FilterEntry.svelte
+++ b/mathesar_ui/src/components/filter-entry/FilterEntry.svelte
@@ -7,7 +7,10 @@
   import { getDbTypeBasedInputCap } from '@mathesar/components/cell-fabric/utils';
   import ColumnName from '@mathesar/components/column/ColumnName.svelte';
   import { iconDeleteMajor } from '@mathesar/icons';
-  import type { AbstractTypeFilterDefinition } from '@mathesar/stores/abstract-types/types';
+  import type {
+    AbstractTypeFilterDefinition,
+    FilterId,
+  } from '@mathesar/stores/abstract-types/types';
   import type RecordSummaryStore from '@mathesar/stores/table-data/record-summaries/RecordSummaryStore';
   import type { RecordSummariesForColumn } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
   import type { ReadableMapLike } from '@mathesar/typeUtils';
@@ -37,7 +40,7 @@
   ) => ConstraintType[] | undefined = () => undefined;
 
   export let columnIdentifier: ColumnLikeType['id'] | undefined;
-  export let conditionIdentifier: string | undefined;
+  export let conditionIdentifier: FilterId | undefined;
   export let value: unknown | undefined;
 
   export let layout: 'horizontal' | 'vertical' = 'horizontal';
@@ -106,7 +109,7 @@
     return undefined;
   }
 
-  function getConditionName(_conditionId?: string) {
+  function getConditionName(_conditionId?: FilterId) {
     if (_conditionId) {
       return selectedColumnFiltersMap.get(_conditionId)?.name ?? '';
     }
@@ -166,7 +169,7 @@
     dispatch('update');
   }
 
-  function onConditionChange(_conditionId?: string) {
+  function onConditionChange(_conditionId?: FilterId) {
     if (!_conditionId) {
       return;
     }
diff --git a/mathesar_ui/src/stores/abstract-types/types.ts b/mathesar_ui/src/stores/abstract-types/types.ts
index 6f04eaf055..0d96333b22 100644
--- a/mathesar_ui/src/stores/abstract-types/types.ts
+++ b/mathesar_ui/src/stores/abstract-types/types.ts
@@ -98,8 +98,50 @@ export interface AbstractTypesSubstance {
   error?: string;
 }
 
+/**
+ * These filter ids represent the filter functions used for the _old_ filtering
+ * system (circa 2023). The UI is still designed around these filter functions
+ * which is why we still have code for it within the front end.
+ *
+ * In 2024 we moved filtering logic from the service layer into the DB layer and
+ * introduced a new filtering system that is more flexible. The new filtering
+ * system is much more flexible and can handle complex filtering expressions
+ * with arbitrary nesting.
+ *
+ * Elsewhere in the front end codebase, we have a compatibility layer that
+ * translates between the old filtering system and the new filtering system.
+ * Search for `filterEntryToSqlExpr` to find that compatibility layer.
+ *
+ * If at some point we decide to design a more flexible user-facing filtering
+ * UI, then we could model that UI (and the resulting front end data structures)
+ * around the `SqlExpr` data structure. This would allow us to avoid the need to
+ * maintain the type below because we would be able to directly support the
+ * filtering expressions that the API expects.
+ */
+export type FilterId =
+  | 'contains_case_insensitive'
+  | 'email_domain_contains'
+  | 'email_domain_equals'
+  | 'equal'
+  | 'greater_or_equal'
+  | 'greater'
+  | 'json_array_contains'
+  | 'json_array_length_equals'
+  | 'json_array_length_greater_or_equal'
+  | 'json_array_length_greater_than'
+  | 'json_array_length_less_or_equal'
+  | 'json_array_length_less_than'
+  | 'json_array_not_empty'
+  | 'lesser_or_equal'
+  | 'lesser'
+  | 'not_null'
+  | 'null'
+  | 'starts_with_case_insensitive'
+  | 'uri_authority_contains'
+  | 'uri_scheme_equals';
+
 export interface AbstractTypeFilterDefinitionResponse {
-  id: string;
+  id: FilterId;
   name: string;
   aliases?: Record<AbstractTypeCategoryIdentifier, string>;
   uiTypeParameterMap: Partial<
diff --git a/mathesar_ui/src/stores/table-data/filtering.ts b/mathesar_ui/src/stores/table-data/filtering.ts
index 7bbbb184ee..94c1a1f508 100644
--- a/mathesar_ui/src/stores/table-data/filtering.ts
+++ b/mathesar_ui/src/stores/table-data/filtering.ts
@@ -1,26 +1,103 @@
 import type {
-  FilterCombination,
-  FilterCondition,
-  FilterConditionParams,
   RecordsListParams,
+  SqlColumn,
+  SqlComparison,
+  SqlExpr,
+  SqlFunction,
+  SqlLiteral,
 } from '@mathesar/api/rpc/records';
 
+import type { FilterId } from '../abstract-types/types';
+
+export type FilterCombination = 'and' | 'or';
+
 export interface FilterEntry {
   readonly columnId: number;
-  readonly conditionId: string;
+  readonly conditionId: FilterId;
   readonly value: unknown;
 }
 
-function makeApiFilterCondition(filterEntry: FilterEntry): FilterCondition {
-  const params: FilterConditionParams = [{ column_id: [filterEntry.columnId] }];
-  if (typeof filterEntry.value !== 'undefined') {
-    params.push({ literal: [filterEntry.value] });
+/**
+ * This function is glue code between the old filtering system (circa 2023) and
+ * the new filtering system (circa 2024).
+ *
+ * At the API layer, the old filtering system was relatively flat and not very
+ * flexible.
+ *
+ * The new filtering system is much more flexible and can handle complex
+ * filtering expressions with arbitrary nesting. Brent introduced this new
+ * system when moving the filtering logic from the service layer to the DB
+ * layer. As a result, the API changed. But in an effort to minimize disturbance
+ * within the front end, we introduced this compatibility layer.
+ *
+ * The `FilterEntry` argument to this function is a data structure from the
+ * _old_ filtering system. It is consistent with the behavior of the UI and the
+ * data structures used for filtering throughout the front end. The `SqlExpr`
+ * return value is a data structure from the _new_ filtering system. It is
+ * consistent with the behavior of the API.
+ *
+ * If, at some point, we'd like to design a more flexible user-facing filtering
+ * UI, then we could model that UI (and the resulting front end data structures)
+ * around the `SqlExpr` data structure. This would allow us to avoid the need
+ * for this compatibility layer.
+ */
+function filterEntryToSqlExpr(filterEntry: FilterEntry): SqlExpr {
+  const column: SqlColumn = { type: 'attnum', value: filterEntry.columnId };
+
+  /** Generate an SqlLiteral value */
+  function value(v = filterEntry.value): SqlLiteral {
+    return { type: 'literal', value: String(v) };
+  }
+
+  /** Generate an SqlComparison */
+  function cmp(
+    type: SqlComparison['type'],
+    args: [SqlExpr, SqlExpr] = [column, value()],
+  ): SqlComparison {
+    return { type, args };
+  }
+
+  /** Generate an SqlFunction */
+  function fn(type: SqlFunction['type'], arg: SqlExpr = column): SqlFunction {
+    return { type, args: [arg] };
+  }
+
+  /** Generate an SqlComparison of a JSON array length vs a value */
+  function arrayLengthCmp(
+    type: SqlComparison['type'],
+    v = value(),
+  ): SqlComparison {
+    return cmp(type, [fn('json_array_length'), v]);
   }
-  return { [filterEntry.conditionId]: params };
+
+  const compatibilityMap: Record<FilterId, SqlExpr> = {
+    contains_case_insensitive: cmp('contains_case_insensitive'),
+    email_domain_contains: cmp('contains', [fn('email_domain'), value()]),
+    email_domain_equals: cmp('equal', [fn('email_domain'), value()]),
+    equal: cmp('equal'),
+    greater_or_equal: cmp('greater_or_equal'),
+    greater: cmp('greater'),
+    json_array_contains: cmp('json_array_contains'),
+    json_array_length_equals: arrayLengthCmp('equal'),
+    json_array_length_greater_or_equal: arrayLengthCmp('greater_or_equal'),
+    json_array_length_greater_than: arrayLengthCmp('greater'),
+    json_array_length_less_or_equal: arrayLengthCmp('lesser_or_equal'),
+    json_array_length_less_than: arrayLengthCmp('lesser'),
+    json_array_not_empty: arrayLengthCmp('greater', value(0)),
+    lesser_or_equal: cmp('lesser_or_equal'),
+    lesser: cmp('lesser'),
+    not_null: fn('not_null'),
+    null: fn('null'),
+    starts_with_case_insensitive: cmp('starts_with'),
+    uri_authority_contains: cmp('contains', [fn('uri_authority'), value()]),
+    uri_scheme_equals: cmp('equal', [fn('uri_scheme'), value()]),
+  };
+
+  return compatibilityMap[filterEntry.conditionId];
 }
 
 /** [ columnId, operation, value ] */
-type TerseFilterEntry = [number, string, unknown];
+type TerseFilterEntry = [number, FilterId, unknown];
 
 function makeTerseFilterEntry(filterEntry: FilterEntry): TerseFilterEntry {
   return [filterEntry.columnId, filterEntry.conditionId, filterEntry.value];
@@ -39,6 +116,14 @@ export const defaultFilterCombination = filterCombinations[0];
 
 export type TerseFiltering = [FilterCombination, TerseFilterEntry[]];
 
+/**
+ * The data structure here is designed to model the behavior of the UI, however
+ * the API has a different (and much more flexible structure). When we first
+ * wrote this code, the UI and the API had similar structures, so the structure
+ * used in this class fit well with both. However, now that the API has changed,
+ * it might be worth using the (more flexible) data structure within this class
+ * should the need ever arise for any substantial refactoring here.
+ */
 export class Filtering {
   combination: FilterCombination;
 
@@ -118,16 +203,22 @@ export class Filtering {
   }
 
   recordsRequestParams(): Pick<RecordsListParams, 'filter'> {
-    if (!this.entries.length) {
+    if (this.entries.length === 0) {
       return {};
     }
-    const conditions = this.entries.map(makeApiFilterCondition);
-    if (conditions.length === 1) {
-      return { filter: conditions[0] };
+    if (this.entries.length === 1) {
+      return { filter: filterEntryToSqlExpr(this.entries[0]) };
     }
-    const filter =
-      this.combination === 'and' ? { and: conditions } : { or: conditions };
-    return { filter };
+
+    let expr = filterEntryToSqlExpr(this.entries[0]);
+    for (let i = 1; i < this.entries.length; i += 1) {
+      expr = {
+        type: this.combination,
+        args: [expr, filterEntryToSqlExpr(this.entries[i])],
+      };
+    }
+
+    return { filter: expr };
   }
 
   terse(): TerseFiltering {
diff --git a/mathesar_ui/src/stores/table-data/records.ts b/mathesar_ui/src/stores/table-data/records.ts
index 4c8221ef58..48eca6d941 100644
--- a/mathesar_ui/src/stores/table-data/records.ts
+++ b/mathesar_ui/src/stores/table-data/records.ts
@@ -31,7 +31,7 @@ import {
 } from '@mathesar-component-library';
 
 import type { ColumnsDataStore } from './columns';
-import type { Filtering } from './filtering';
+import type { FilterEntry, Filtering } from './filtering';
 import type { Grouping as GroupingRequest } from './grouping';
 import type { Meta } from './meta';
 import RecordSummaryStore from './record-summaries/RecordSummaryStore';
@@ -385,9 +385,9 @@ export class RecordsData {
 
     try {
       const params = get(this.meta.recordsRequestParamsData);
-      const contextualFilterEntries = [...this.contextualFilters].map(
-        ([columnId, value]) => ({ columnId, conditionId: 'equal', value }),
-      );
+      const contextualFilterEntries: FilterEntry[] = [
+        ...this.contextualFilters,
+      ].map(([columnId, value]) => ({ columnId, conditionId: 'equal', value }));
 
       const recordsListParams: RecordsListParams = {
         ...this.apiContext,
diff --git a/mathesar_ui/src/systems/data-explorer/QueryFilterTransformationModel.ts b/mathesar_ui/src/systems/data-explorer/QueryFilterTransformationModel.ts
index c5ff2a1405..1f4a069951 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryFilterTransformationModel.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryFilterTransformationModel.ts
@@ -4,10 +4,11 @@ import { _ } from 'svelte-i18n';
 import type { QueryInstanceFilterTransformation } from '@mathesar/api/rest/types/queries';
 import { validateFilterEntry } from '@mathesar/components/filter-entry';
 import { getLimitedFilterInformationById } from '@mathesar/stores/abstract-types';
+import type { FilterId } from '@mathesar/stores/abstract-types/types';
 
 export interface QueryFilterTransformationEntry {
   columnIdentifier: string;
-  conditionIdentifier: string;
+  conditionIdentifier: FilterId;
   value: unknown;
 }
 
@@ -20,7 +21,7 @@ export default class QueryFilterTransformationModel
 
   columnIdentifier;
 
-  conditionIdentifier;
+  conditionIdentifier: FilterId;
 
   value: unknown;
 
@@ -32,10 +33,13 @@ export default class QueryFilterTransformationModel
       this.conditionIdentifier = data.conditionIdentifier;
       this.value = data.value;
     } else {
-      [this.conditionIdentifier] = Object.keys(data.spec);
-      [this.columnIdentifier] =
-        data.spec[this.conditionIdentifier][0].column_name;
-      this.value = data.spec[this.conditionIdentifier][1]?.literal[0];
+      [this.conditionIdentifier] = Object.keys(data.spec) as FilterId[];
+      const filterConditionParams = data.spec[this.conditionIdentifier];
+      if (!filterConditionParams) {
+        throw new Error('Invalid QueryInstanceFilterTransformation');
+      }
+      [this.columnIdentifier] = filterConditionParams[0].column_name;
+      this.value = filterConditionParams[1]?.literal[0];
     }
   }
 
@@ -48,15 +52,14 @@ export default class QueryFilterTransformationModel
   }
 
   toJson(): QueryInstanceFilterTransformation {
-    const spec: QueryInstanceFilterTransformation['spec'] = {
-      [this.conditionIdentifier]: [{ column_name: [this.columnIdentifier] }],
-    };
-    if (typeof this.value !== 'undefined') {
-      spec[this.conditionIdentifier].push({ literal: [this.value] });
-    }
     return {
       type: 'filter',
-      spec,
+      spec: {
+        [this.conditionIdentifier]: [
+          { column_name: [this.columnIdentifier] },
+          ...(this.value !== undefined ? [{ literal: [this.value] }] : []),
+        ],
+      },
     };
   }
 
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/Filter.svelte b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/Filter.svelte
index 141aeefa37..efd14a53dd 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/Filter.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/Filter.svelte
@@ -4,7 +4,6 @@
   import { type Writable, writable } from 'svelte/store';
   import { _ } from 'svelte-i18n';
 
-  import type { FilterCombination } from '@mathesar/api/rpc/records';
   import type { LinkedRecordInputElement } from '@mathesar/components/cell-fabric/data-types/components/linked-record/LinkedRecordUtils';
   import { validateFilterEntry } from '@mathesar/components/filter-entry';
   import { FILTER_INPUT_CLASS } from '@mathesar/components/filter-entry/utils';
@@ -14,6 +13,7 @@
     Filtering,
     ProcessedColumns,
   } from '@mathesar/stores/table-data';
+  import type { FilterCombination } from '@mathesar/stores/table-data/filtering';
   import type RecordSummaryStore from '@mathesar/stores/table-data/record-summaries/RecordSummaryStore';
   import { Button, Icon } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterEntries.svelte b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterEntries.svelte
index 6440d03dbe..195963a41a 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterEntries.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterEntries.svelte
@@ -2,7 +2,6 @@
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
 
-  import type { FilterCombination } from '@mathesar/api/rpc/records';
   import { FilterEntry as FilterEntryComponent } from '@mathesar/components/filter-entry';
   import {
     type FilterEntry,
@@ -10,6 +9,7 @@
     defaultFilterCombination,
     filterCombinations,
   } from '@mathesar/stores/table-data';
+  import type { FilterCombination } from '@mathesar/stores/table-data/filtering';
   import type RecordSummaryStore from '@mathesar/stores/table-data/record-summaries/RecordSummaryStore';
   import { getColumnConstraintTypeByColumnId } from '@mathesar/utils/columnUtils';
   import { InputGroupText, Select } from '@mathesar-component-library';

From 5bed3f178453eb36c4b27c61cd0bcdc7d9985ba5 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 6 Aug 2024 19:15:23 +0530
Subject: [PATCH 0581/1141] implement explorations add and replace endpoint

---
 docs/docs/api/rpc.md                 |  2 +
 mathesar/rpc/explorations.py         | 79 ++++++++++++++++------------
 mathesar/tests/rpc/test_endpoints.py | 10 ++++
 mathesar/utils/explorations.py       | 53 ++++++++++++-------
 4 files changed, 91 insertions(+), 53 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 70c57156d4..15e6b22530 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -200,7 +200,9 @@ To use an RPC function:
       members:
       - list_
       - get
+      - add
       - delete
+      - replace
       - run
       - run_saved
       - ExplorationInfo
diff --git a/mathesar/rpc/explorations.py b/mathesar/rpc/explorations.py
index 63144d8ded..391cf0266e 100644
--- a/mathesar/rpc/explorations.py
+++ b/mathesar/rpc/explorations.py
@@ -13,7 +13,9 @@
     get_exploration,
     delete_exploration,
     run_exploration,
-    run_saved_exploration
+    run_saved_exploration,
+    replace_exploration,
+    create_exploration
 )
 
 
@@ -28,7 +30,7 @@ class ExplorationInfo(TypedDict):
         base_table_oid: The OID of the base table of the exploration on the database.
         initial_columns: A list describing the columns to be included in the exploration.
         transformations: A list describing the transformations to be made on the included columns.
-        display_options: A list desrcibing metadata for the columns in the explorations.
+        display_options: A list describing metadata for the columns in the explorations.
         display_names: A map between the actual column names on the database and the alias to be displayed(if any).
         description: The description of the exploration.
     """
@@ -62,44 +64,23 @@ class ExplorationDef(TypedDict):
     Definition about a runnable exploration.
 
     Attributes:
+        database_id: The Django id of the database containing the exploration.
+        name: The name of the exploration.
         base_table_oid: The OID of the base table of the exploration on the database.
         initial_columns: A list describing the columns to be included in the exploration.
-        display_names: A map between the actual column names on the database and the alias to be displayed.
         transformations: A list describing the transformations to be made on the included columns.
-        limit: Specifies the number of rows to return.(default 100)
-        offset: Specifies the number of rows to skip.(default 0)
-        filter: A dict describing filters to be applied to an exploration.
-            e.g. Here is a dict describing getting records from exploration where "col1" = NULL and "col2" = "abc"
-            ```
-            {"and": [
-                {"null": [
-                    {"column_name": ["col1"]},
-                ]},
-                {"equal": [
-                    {"to_lowercase": [
-                        {"column_name": ["col2"]},
-                    ]},
-                    {"literal": ["abc"]},
-                ]},
-            ]}
-            ```
-            Refer to db/functions/base.py for all the possible filters.
-        order_by: A list of dicts, where each dict has a `field` and `direction` field.
-                  Here the value for `field` should be column name and `direction` should be either `asc` or `desc`.
-        search: A list of dicts, where each dict has a `column` and `literal` field.
-                Here the value for `column` should be a column name and `literal` should be a string to be searched in the aforementioned column.
-        duplicate_only: A list of column names for which you want duplicate records.
+        display_options: A list describing metadata for the columns in the explorations.
+        display_names: A map between the actual column names on the database and the alias to be displayed(if any).
+        description: The description of the exploration.
     """
+    database_id: int
+    name: str
     base_table_oid: int
     initial_columns: list
-    display_names: dict
     transformations: Optional[list]
-    limit: Optional[int]
-    offset: Optional[int]
-    filter: Optional[dict]
-    order_by: Optional[list[dict]]
-    search: Optional[list[dict]]
-    duplicate_only: Optional[list]
+    display_options: Optional[list]
+    display_names: Optional[dict]
+    description: Optional[str]
 
 
 class ExplorationResult(TypedDict):
@@ -195,7 +176,7 @@ def delete(*, exploration_id: int, **kwargs) -> None:
 @rpc_method(name="explorations.run")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def run(*, exploration_def: ExplorationDef, database_id: int, **kwargs) -> ExplorationResult:
+def run(*, exploration_def: ExplorationDef, database_id: int, limit: int = 100, offset: int = 0, **kwargs) -> ExplorationResult:
     """
     Run an exploration.
 
@@ -205,7 +186,7 @@ def run(*, exploration_def: ExplorationDef, database_id: int, **kwargs) -> Explo
     """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
-        exploration_result = run_exploration(exploration_def, database_id, conn)
+        exploration_result = run_exploration(exploration_def, database_id, conn, limit, offset)
     return ExplorationResult.from_dict(exploration_result)
 
 
@@ -226,3 +207,31 @@ def run_saved(*, exploration_id: int, database_id: int, limit: int = 100, offset
     with connect(database_id, user) as conn:
         exploration_result = run_saved_exploration(exploration_id, limit, offset, database_id, conn)
     return ExplorationResult.from_dict(exploration_result)
+
+
+@rpc_method(name='explorations.replace')
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def replace(*, new_exploration: ExplorationInfo) -> ExplorationInfo:
+    """
+    Replace a saved exploration.
+
+    Args:
+        new_exploration: A dict describing the exploration to replace, including the updated fields.
+    """
+    replaced_exp_model = replace_exploration(new_exploration)
+    return ExplorationInfo.from_model(replaced_exp_model)
+
+
+@rpc_method(name='explorations.add')
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def add(*, exploration_def: ExplorationDef) -> ExplorationInfo:
+    """
+    Add a new exploration.
+
+    Args:
+        exploration_def: A dict describing the exploration to create.
+    """
+    exp_model = create_exploration(exploration_def)
+    return ExplorationInfo.from_model(exp_model)
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 4c1c00acb7..a1bc514a19 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -164,11 +164,21 @@
         "explorations.get",
         [user_is_authenticated]
     ),
+    (
+        explorations.add,
+        "explorations.add",
+        [user_is_authenticated]
+    ),
     (
         explorations.delete,
         "explorations.delete",
         [user_is_authenticated]
     ),
+    (
+        explorations.replace,
+        "explorations.replace",
+        [user_is_authenticated]
+    ),
     (
         explorations.run,
         "explorations.run",
diff --git a/mathesar/utils/explorations.py b/mathesar/utils/explorations.py
index 31fa36cbc8..c726829a08 100644
--- a/mathesar/utils/explorations.py
+++ b/mathesar/utils/explorations.py
@@ -3,7 +3,7 @@
 from db.queries.base import DBQuery, InitialColumn, JoinParameter
 from db.tables.operations.select import get_table
 from mathesar.api.utils import process_annotated_records
-from mathesar.models.base import Explorations, ColumnMetaData
+from mathesar.models.base import Explorations, ColumnMetaData, Database
 from mathesar.rpc.columns.metadata import ColumnMetaDataRecord
 from mathesar.state import get_cached_metadata
 
@@ -20,7 +20,34 @@ def delete_exploration(exploration_id):
     Explorations.objects.get(id=exploration_id).delete()
 
 
-def run_exploration(exploration_def, database_id, conn):
+def replace_exploration(new_exploration):
+    Explorations.objects.filter(id=new_exploration["id"]).update(
+        database=Database.objects.get(id=new_exploration["database_id"]),
+        name=new_exploration["name"],
+        base_table_oid=new_exploration["base_table_oid"],
+        initial_columns=new_exploration["initial_columns"],
+        transformations=new_exploration.get("transformations"),
+        display_options=new_exploration.get("display_options"),
+        display_names=new_exploration.get("display_names", {}),
+        description=new_exploration.get("description")
+    )
+    return get_exploration(new_exploration["id"])
+
+
+def create_exploration(exploration_def):
+    return Explorations.objects.create(
+        database=Database.objects.get(id=exploration_def["database_id"]),
+        name=exploration_def["name"],
+        base_table_oid=exploration_def["base_table_oid"],
+        initial_columns=exploration_def["initial_columns"],
+        transformations=exploration_def.get("transformations"),
+        display_options=exploration_def.get("display_options"),
+        display_names=exploration_def.get("display_names", {}),
+        description=exploration_def.get("description")
+    )
+
+
+def run_exploration(exploration_def, database_id, conn, limit=100, offset=0):
     engine = create_future_engine_with_custom_types(
         conn.info.user,
         conn.info.password,
@@ -60,12 +87,8 @@ def run_exploration(exploration_def, database_id, conn):
         metadata=metadata
     )
     records = db_query.get_records(
-        limit=exploration_def.get('limit', 100),
-        offset=exploration_def.get('offset', 0),
-        filter=exploration_def.get('filter', None),
-        order_by=exploration_def.get('order_by', []),
-        search=exploration_def.get('search', []),
-        duplicate_only=exploration_def.get('duplicate_only', None)
+        limit=limit,
+        offset=offset
     )
     processed_records = process_annotated_records(records)[0]
     column_metadata = _get_exploration_column_metadata(
@@ -89,12 +112,8 @@ def run_exploration(exploration_def, database_id, conn):
         },
         "output_columns": tuple(sa_col.name for sa_col in db_query.sa_output_columns),
         "column_metadata": column_metadata,
-        "limit": exploration_def.get('limit', 100),
-        "offset": exploration_def.get('offset', 0),
-        "filter": exploration_def.get('filter', None),
-        "order_by": exploration_def.get('order_by', []),
-        "search": exploration_def.get('search', []),
-        "duplicate_only": exploration_def.get('duplicate_only', None)
+        "limit": limit,
+        "offset": offset
     }
 
 
@@ -104,11 +123,9 @@ def run_saved_exploration(exploration_id, limit, offset, database_id, conn):
         "base_table_oid": exp_model["base_table_oid"],
         "initial_columns": exp_model["initial_columns"],
         "display_names": exp_model["display_names"],
-        "transformations": exp_model["transformations"],
-        "limit": limit,
-        "offset": offset
+        "transformations": exp_model["transformations"]
     }
-    return run_exploration(exploration_def, database_id, conn)
+    return run_exploration(exploration_def, database_id, conn, limit, offset)
 
 
 def _get_exploration_column_metadata(

From e6a70d922c0f6527acf96bb96f60d646824dbc63 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Tue, 6 Aug 2024 20:15:03 +0530
Subject: [PATCH 0582/1141] Add all fields to makeForm

---
 .../create-database/ConnectExistingDatabase.svelte       | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte b/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte
index f6bfda0b37..ffab09ef6b 100644
--- a/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte
@@ -31,7 +31,14 @@
   const role = requiredField('');
   const password = requiredField('');
   const installationSchemas = requiredField<InstallationSchema[]>(['internal']);
-  const form = makeForm({ databaseName, installationSchemas });
+  const form = makeForm({
+    databaseName,
+    host,
+    port,
+    role,
+    password,
+    installationSchemas,
+  });
 
   async function createDatabase() {
     const newDatabase = await databasesStore.connectExistingDatabase({

From bba0a6842f9f4e005cad85f87652733b310445fd Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Tue, 6 Aug 2024 20:15:11 +0530
Subject: [PATCH 0583/1141] Remove discussion comment

---
 mathesar_ui/src/api/rpc/databases.ts | 59 +---------------------------
 1 file changed, 1 insertion(+), 58 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/databases.ts b/mathesar_ui/src/api/rpc/databases.ts
index d8b45b0833..1fa2b32e37 100644
--- a/mathesar_ui/src/api/rpc/databases.ts
+++ b/mathesar_ui/src/api/rpc/databases.ts
@@ -9,64 +9,7 @@ export interface DatabaseResponse {
 }
 
 /**
- * TODO: Figure out a better place to move classes like these.
- * Perhaps `@mathesar/models/database`.
- *
- * Model classes should follow these rules:
- * - The class should be immutable.
- * - There should not be `undefined` properties.
- * - All properties should be readonly.
- *    - All properties should be initialized in the constructor.
- *    - If a property has to be changed, we should return a new class.
- * - Svelte stores should not be used inside Model classes.
- *    - The Model classes themselves can be contained in a Svelte store.
- *
- * Good:
- * ```
- * export class Model {
- *  readonly proprety: string;
- *
- *  constructor(value: string) {
- *    this.proprety = value;
- *  }
- *
- *  fetchAnotherProperty(): string {
- *    const anotherProperty = api.model.getAnotherProp();
- *    return anotherProperty;
- *  }
- *
- *  changeProperty(newValue: string): Model {
- *    return new Model(newValue);
- *  }
- * }
- * ```
- *
- * Bad:
- * ```
- * export class Model {
- *  // All properties should be readonly
- *  proprety: string;
- *
- *  // Do not have undefined properties
- *  anotherProp: string | undefined = undefined;
- *
- *  constructor(prop: string) {
- *    this.proprety = prop;
- *  }
- *
- *  fetchAnotherProperty(): string {
- *    // Do not cache here
- *    this.anotherProp = api.model.getAnotherProp();
- *    return this.anotherProp;
- *  }
- *
- *  changeProperty(newValue: string): Model {
- *    // Do not mutate propreties
- *    this.property = newValue;
- *    return this;
- *  }
- * }
- * ```
+ * TODO_BETA: Modify after store discussion is resolved
  */
 export class Database implements DatabaseResponse {
   readonly id: number;

From aced02e324761a10eb943bc3b9dd5fb54a89935a Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 7 Aug 2024 15:15:27 +0800
Subject: [PATCH 0584/1141] add single record getter convenience function in
 SQL

---
 db/sql/00_msar.sql | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index e860b15dd8..32caf1e1ff 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -571,7 +571,7 @@ Return the first column attnum in the primary key of a given relation (e.g., tab
 Args:
   rel_id: The OID of the relation.
 */
-SELECT conkey[1]
+SELECT CASE WHEN array_length(conkey, 1) = 1 THEN conkey[1] END
 FROM pg_constraint
 WHERE contype='p'
 AND conrelid=rel_id;
@@ -586,7 +586,7 @@ Args:
   sch_name: The schema of the relation, unquoted.
   rel_name: The name of the relation, unqualified and unquoted.
 */
-SELECT conkey[1]
+SELECT CASE WHEN array_length(conkey, 1) = 1 THEN conkey[1] END
 FROM pg_constraint
 WHERE contype='p'
 AND conrelid=msar.get_relation_oid(sch_name, rel_name);
@@ -3581,6 +3581,29 @@ WHERE
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION msar.get_record_from_table(tab_id oid, rec_id anyelement) RETURNS jsonb AS $$/*
+Get single record from a table. Only columns to which the user has access are returned.
+
+Args:
+  tab_id: The OID of the table whose record we'll get.
+  rec_id: The id value of the record.
+
+The table must have a single primary key column.
+*/
+SELECT msar.list_records_from_table(
+  tab_id, null, null, null,
+  jsonb_build_object(
+    'type', 'equal', 'args', jsonb_build_array(
+      jsonb_build_object('type', 'attnum', 'value', msar.get_pk_column(tab_id)),
+      jsonb_build_object('type', 'literal', 'value', rec_id)
+    )
+  ),
+  null
+)
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
+
 CREATE OR REPLACE FUNCTION
 msar.list_records_from_table(
   tab_id oid,

From 51ac26a036b84dd13992944065db7f456a4a79b7 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 7 Aug 2024 15:17:00 +0800
Subject: [PATCH 0585/1141] reorder function defs so installation works

---
 db/sql/00_msar.sql | 45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 32caf1e1ff..1620a33b0c 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3581,29 +3581,6 @@ WHERE
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
-CREATE OR REPLACE FUNCTION msar.get_record_from_table(tab_id oid, rec_id anyelement) RETURNS jsonb AS $$/*
-Get single record from a table. Only columns to which the user has access are returned.
-
-Args:
-  tab_id: The OID of the table whose record we'll get.
-  rec_id: The id value of the record.
-
-The table must have a single primary key column.
-*/
-SELECT msar.list_records_from_table(
-  tab_id, null, null, null,
-  jsonb_build_object(
-    'type', 'equal', 'args', jsonb_build_array(
-      jsonb_build_object('type', 'attnum', 'value', msar.get_pk_column(tab_id)),
-      jsonb_build_object('type', 'literal', 'value', rec_id)
-    )
-  ),
-  null
-)
-$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
-
-
-
 CREATE OR REPLACE FUNCTION
 msar.list_records_from_table(
   tab_id oid,
@@ -3737,3 +3714,25 @@ BEGIN
   RETURN records;
 END;
 $$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION msar.get_record_from_table(tab_id oid, rec_id anyelement) RETURNS jsonb AS $$/*
+Get single record from a table. Only columns to which the user has access are returned.
+
+Args:
+  tab_id: The OID of the table whose record we'll get.
+  rec_id: The id value of the record.
+
+The table must have a single primary key column.
+*/
+SELECT msar.list_records_from_table(
+  tab_id, null, null, null,
+  jsonb_build_object(
+    'type', 'equal', 'args', jsonb_build_array(
+      jsonb_build_object('type', 'attnum', 'value', msar.get_pk_column(tab_id)),
+      jsonb_build_object('type', 'literal', 'value', rec_id)
+    )
+  ),
+  null
+)
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;

From e1c70dd1b0abf6c7c39a24f41933b259a8de4443 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 7 Aug 2024 15:30:30 +0800
Subject: [PATCH 0586/1141] add SQL test for record getter

---
 db/sql/test_00_msar.sql | 42 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index c5c107cbee..0a861bf7d1 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -3696,3 +3696,45 @@ BEGIN
   RETURN NEXT is((search_result -> 'count')::integer, 3);
 END;
 $$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_get_record_from_table() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+BEGIN
+  PERFORM __setup_list_records_table();
+  rel_id := 'atable'::regclass::oid;
+  RETURN NEXT is(
+    msar.get_record_from_table(rel_id, 2),
+    $j${
+      "count": 1,
+      "results": [
+        {"1": 2, "2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]}
+      ],
+      "grouping": null
+    }$j$ || jsonb_build_object(
+      'query', concat(
+        'SELECT msar.format_data(id) AS "1", msar.format_data(col1) AS "2",',
+        ' msar.format_data(col2) AS "3", msar.format_data(col3) AS "4",',
+        ' msar.format_data(col4) AS "5" FROM public.atable WHERE (id) = (''2'')',
+        ' ORDER BY "1" ASC LIMIT NULL OFFSET NULL'
+      )
+    )
+  );
+  RETURN NEXT is(
+    msar.get_record_from_table(rel_id, 200),
+    $j${
+      "count": 0,
+      "results": [],
+      "grouping": null
+    }$j$ || jsonb_build_object(
+      'query', concat(
+        'SELECT msar.format_data(id) AS "1", msar.format_data(col1) AS "2",',
+        ' msar.format_data(col2) AS "3", msar.format_data(col3) AS "4",',
+        ' msar.format_data(col4) AS "5" FROM public.atable WHERE (id) = (''200'')',
+        ' ORDER BY "1" ASC LIMIT NULL OFFSET NULL'
+      )
+    )
+  );
+END;
+$$ LANGUAGE plpgsql;

From bad1ad5022b2e91e6b3db313407562794dafeabd Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 7 Aug 2024 15:33:08 +0800
Subject: [PATCH 0587/1141] add python wrapper for record getter

---
 db/records/operations/select.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/db/records/operations/select.py b/db/records/operations/select.py
index 1dc747011e..b93418626c 100644
--- a/db/records/operations/select.py
+++ b/db/records/operations/select.py
@@ -50,6 +50,29 @@ def list_records_from_table(
     return result
 
 
+def get_record_from_table(
+        conn,
+        record_id,
+        table_oid,
+):
+    """
+    Get single record from a table by its primary key
+
+    Only data from which the user is granted `SELECT` is returned.
+
+    Args:
+        record_id: The primary key value of the record.
+        table_id: The OID of the table whose record we'll get.
+    """
+    result = db_conn.exec_msar_func(
+        conn,
+        'get_record_from_table',
+        table_oid,
+        record_id,
+    ).fetchone()[0]
+    return result
+
+
 def search_records_from_table(
         conn,
         table_oid,

From 978d32df1a3628f4e5c02c23ca7fc1ef17762033 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 7 Aug 2024 15:35:18 +0800
Subject: [PATCH 0588/1141] wire up record getter to RPC endpoint

---
 mathesar/rpc/records.py              | 31 ++++++++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py |  5 +++++
 2 files changed, 36 insertions(+)

diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index 3840cc3a4a..8e9bf2d4a7 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -189,6 +189,37 @@ def list_(
     return RecordList.from_dict(record_info)
 
 
+@rpc_method(name="records.get")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def get(
+        *,
+        record_id: Any,
+        table_oid: int,
+        database_id: int,
+        **kwargs
+) -> RecordList:
+    """
+    List records from a table, and its row count. Exposed as `list`.
+
+    Args:
+        record_id: The primary key value of the record to be gotten.
+        table_oid: Identity of the table in the user's database.
+        database_id: The Django id of the database containing the table.
+
+    Returns:
+        The requested record, along with some metadata.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        record_info = record_select.get_record_from_table(
+            conn,
+            record_id,
+            table_oid,
+        )
+    return RecordList.from_dict(record_info)
+
+
 @rpc_method(name="records.search")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 4c1c00acb7..00c12c5c62 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -149,6 +149,11 @@
         "records.list",
         [user_is_authenticated]
     ),
+    (
+        records.get,
+        "records.get",
+        [user_is_authenticated]
+    ),
     (
         records.search,
         "records.search",

From 47ac0968dc9f120b09dca9ddebefbca3a83ca4d9 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 7 Aug 2024 15:41:16 +0800
Subject: [PATCH 0589/1141] add wiring test for record getter

---
 mathesar/tests/rpc/test_records.py | 48 ++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/mathesar/tests/rpc/test_records.py b/mathesar/tests/rpc/test_records.py
index ba787d2aff..ab7d13e650 100644
--- a/mathesar/tests/rpc/test_records.py
+++ b/mathesar/tests/rpc/test_records.py
@@ -72,6 +72,54 @@ def mock_list_records(
     assert actual_records_list == expect_records_list
 
 
+def test_records_get(rf, monkeypatch):
+    username = 'alice'
+    password = 'pass1234'
+    table_oid = 23457
+    database_id = 2
+    record_id = 2342
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=username, password=password)
+
+    @contextmanager
+    def mock_connect(_database_id, user):
+        if _database_id == database_id and user.username == username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_get_record(
+            conn,
+            _record_id,
+            _table_oid,
+    ):
+        if _table_oid != table_oid or _record_id != record_id:
+            raise AssertionError('incorrect parameters passed')
+        return {
+            "count": 1,
+            "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],
+            "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
+            "grouping": None,
+        }
+
+    monkeypatch.setattr(records, 'connect', mock_connect)
+    monkeypatch.setattr(records.record_select, 'get_record_from_table', mock_get_record)
+    expect_record = {
+        "count": 1,
+        "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],
+        "grouping": None,
+        "preview_data": [],
+        "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
+    }
+    actual_record = records.get(
+        record_id=record_id, table_oid=table_oid, database_id=database_id, request=request
+    )
+    assert actual_record == expect_record
+
+
 def test_records_search(rf, monkeypatch):
     username = 'alice'
     password = 'pass1234'

From 51be183b84f916d40bb9841580d40fbf43ea99a0 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 7 Aug 2024 15:42:56 +0800
Subject: [PATCH 0590/1141] add documentation for record getting

---
 docs/docs/api/rpc.md    | 1 +
 mathesar/rpc/records.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 70c57156d4..f23f4aa6d2 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -182,6 +182,7 @@ To use an RPC function:
     options:
       members:
       - list_
+      - get
       - search
       - RecordList
       - OrderBy
diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index 8e9bf2d4a7..87dbb812cc 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -200,7 +200,7 @@ def get(
         **kwargs
 ) -> RecordList:
     """
-    List records from a table, and its row count. Exposed as `list`.
+    Get single record from a table by its primary key.
 
     Args:
         record_id: The primary key value of the record to be gotten.

From 25c20e1b4d7cc2963530ccaa9c9762ab72fe708b Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 7 Aug 2024 15:47:57 +0800
Subject: [PATCH 0591/1141] fix formatting of record getting SQL function

---
 db/sql/00_msar.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 1620a33b0c..cb0c671c9f 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3716,7 +3716,8 @@ END;
 $$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION msar.get_record_from_table(tab_id oid, rec_id anyelement) RETURNS jsonb AS $$/*
+CREATE OR REPLACE FUNCTION
+msar.get_record_from_table(tab_id oid, rec_id anyelement) RETURNS jsonb AS $$/*
 Get single record from a table. Only columns to which the user has access are returned.
 
 Args:

From 646e60f93c0c009b2b254cc6b36417e467fcc2b5 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 7 Aug 2024 16:59:23 +0800
Subject: [PATCH 0592/1141] add record deleter SQL function

---
 db/sql/00_msar.sql | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index cb0c671c9f..3c20240ad7 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3327,6 +3327,7 @@ INSERT INTO msar.expr_templates VALUES
   -- json(b) filters and expressions
   ('json_array_length', 'jsonb_array_length((%s)::jsonb)'),
   ('json_array_contains', '(%s)::jsonb @> (%s)::jsonb'),
+  ('convert_to_json', 'to_jsonb(%s)'),
   -- date part extractors
   ('truncate_to_year', 'to_char((%s)::date, ''YYYY AD'')'),
   ('truncate_to_month', 'to_char((%s)::date, ''YYYY-MM AD'')'),
@@ -3737,3 +3738,41 @@ SELECT msar.list_records_from_table(
   null
 )
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.delete_records_from_table(tab_id oid, rec_ids jsonb) RETURNS integer AS $$/*
+Delete records from table by id.
+
+Args:
+  tab_id: The OID of the table whose record we'll get.
+  rec_ids: An array of primary keys
+
+The table must have a single primary key column.
+*/
+DECLARE
+  num_deleted integer;
+BEGIN
+  EXECUTE format(
+    $d$
+    WITH delete_cte AS (DELETE FROM %1$I.%2$I %3$s RETURNING *)
+    SELECT count(1) FROM delete_cte
+    $d$,
+    msar.get_relation_schema_name(tab_id),
+    msar.get_relation_name(tab_id),
+    msar.build_where_clause(
+      tab_id, jsonb_build_object(
+        'type', 'json_array_contains', 'args', jsonb_build_array(
+          jsonb_build_object('type', 'literal', 'value', rec_ids),
+          jsonb_build_object(
+            'type', 'convert_to_json', 'args', jsonb_build_array(
+              jsonb_build_object('type', 'attnum', 'value', msar.get_pk_column(tab_id))
+            )
+          )
+        )
+      )
+    )
+  ) INTO num_deleted;
+  RETURN num_deleted;
+END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;

From 4ea4fd0ab75b205e7e3ffc22f5223e0827e3abc4 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 7 Aug 2024 16:59:35 +0800
Subject: [PATCH 0593/1141] test record deleter SQL function

---
 db/sql/test_00_msar.sql | 129 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 129 insertions(+)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 0a861bf7d1..bb1ceb2386 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -3738,3 +3738,132 @@ BEGIN
   );
 END;
 $$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_delete_records_from_table_single() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+  delete_result integer;
+BEGIN
+  PERFORM __setup_list_records_table();
+  rel_id := 'atable'::regclass::oid;
+  delete_result := msar.delete_records_from_table(
+    rel_id,
+    '[2]'
+  );
+  RETURN NEXT is(delete_result, 1);
+  RETURN NEXT results_eq(
+    'SELECT id FROM atable ORDER BY id',
+    $v$VALUES ('1'::integer), ('3'::integer)$v$
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_delete_records_from_table_null() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+  delete_result integer;
+BEGIN
+  PERFORM __setup_list_records_table();
+  rel_id := 'atable'::regclass::oid;
+  delete_result := msar.delete_records_from_table(
+    rel_id,
+    null
+  );
+  RETURN NEXT is(delete_result, null);
+  RETURN NEXT results_eq(
+    'SELECT id FROM atable ORDER BY id',
+    $v$VALUES ('1'::integer), ('2'::integer), ('3'::integer)$v$
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_delete_records_from_table_empty() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+  delete_result integer;
+BEGIN
+  PERFORM __setup_list_records_table();
+  rel_id := 'atable'::regclass::oid;
+  delete_result := msar.delete_records_from_table(
+    rel_id,
+    '[]'
+  );
+  RETURN NEXT is(delete_result, 0);
+  RETURN NEXT results_eq(
+    'SELECT id FROM atable ORDER BY id',
+    $v$VALUES ('1'::integer), ('2'::integer), ('3'::integer)$v$
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_delete_records_from_table_multi() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+  delete_result integer;
+BEGIN
+  PERFORM __setup_list_records_table();
+  rel_id := 'atable'::regclass::oid;
+  delete_result := msar.delete_records_from_table(
+    rel_id,
+    '[1, 2]'
+  );
+  RETURN NEXT is(delete_result, 2);
+  RETURN NEXT results_eq(
+    'SELECT id FROM atable ORDER BY id',
+    $v$VALUES ('3'::integer)$v$
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_delete_records_from_table_multi_nonexist() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+  delete_result integer;
+BEGIN
+  PERFORM __setup_list_records_table();
+  rel_id := 'atable'::regclass::oid;
+  delete_result := msar.delete_records_from_table(
+    rel_id,
+    '[1, 2, 342]'
+  );
+  RETURN NEXT is(delete_result, 2);
+  RETURN NEXT results_eq(
+    'SELECT id FROM atable ORDER BY id',
+    $v$VALUES ('3'::integer)$v$
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_delete_records_from_table_no_pkey() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+  delete_result integer;
+BEGIN
+  PERFORM __setup_list_records_table();
+  rel_id := 'atable'::regclass::oid;
+  CREATE ROLE intern_no_pkey;
+  GRANT USAGE ON SCHEMA msar, __msar TO intern_no_pkey;
+  GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA msar, __msar TO intern_no_pkey;
+  GRANT SELECT ON ALL TABLES IN SCHEMA msar, __msar TO INTERN_no_pkey;
+  GRANT SELECT (col1, col2, col3, col4) ON TABLE atable TO intern_no_pkey;
+  SET ROLE intern_no_pkey;
+  RETURN NEXT throws_ok(
+    format('SELECT msar.delete_records_from_table(%s, ''[2, 3]'')', rel_id),
+    '42501',
+    'permission denied for table atable',
+    'Throw error when trying to delete without permission'
+  );
+  SET ROLE NONE;
+  RETURN NEXT results_eq(
+    'SELECT id FROM atable ORDER BY id',
+    $v$VALUES ('1'::integer), ('2'::integer), ('3'::integer)$v$
+  );
+END;
+$$ LANGUAGE plpgsql;
+

From 8350d5b1c37ef0f5f96a4cd2f6412e0a81526ca3 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 7 Aug 2024 17:17:00 +0800
Subject: [PATCH 0594/1141] fix docstring for record deleter

---
 db/sql/00_msar.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 3c20240ad7..18ee8ea129 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3745,8 +3745,8 @@ msar.delete_records_from_table(tab_id oid, rec_ids jsonb) RETURNS integer AS $$/
 Delete records from table by id.
 
 Args:
-  tab_id: The OID of the table whose record we'll get.
-  rec_ids: An array of primary keys
+  tab_id: The OID of the table whose record we'll delete.
+  rec_ids: An array of primary key values
 
 The table must have a single primary key column.
 */

From 312b5f4f3c2f979086205cad62ad2ba262a7dde6 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 7 Aug 2024 17:17:32 +0800
Subject: [PATCH 0595/1141] add python wrapper for record deleter

---
 db/records/operations/delete.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/db/records/operations/delete.py b/db/records/operations/delete.py
index 02454da56e..ff1f656514 100644
--- a/db/records/operations/delete.py
+++ b/db/records/operations/delete.py
@@ -1,8 +1,28 @@
+import json
 from sqlalchemy import delete
 
+from db import connection as db_conn
 from db.tables.utils import get_primary_key_column
 
 
+def delete_records_from_table(conn, record_ids, table_oid):
+    """
+    Delete records from table by id.
+
+    Args:
+        tab_id: The OID of the table whose record we'll delete.
+        record_ids: A list of primary values
+
+    The table must have a single primary key column.
+    """
+    return db_conn.exec_msar_func(
+        conn,
+        'delete_records_from_table',
+        table_oid,
+        json.dumps(record_ids),
+    ).fetchone()[0]
+
+
 def delete_record(table, engine, id_value):
     primary_key_column = get_primary_key_column(table)
     query = delete(table).where(primary_key_column == id_value)

From 273e7cd4d513cc9bf15dbc54c8aa7a4cb981d47c Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 7 Aug 2024 17:28:06 +0800
Subject: [PATCH 0596/1141] wire record deleting up to RPC endpoint

---
 mathesar/rpc/records.py              | 34 +++++++++++++++++++++++++++-
 mathesar/tests/rpc/test_endpoints.py |  5 ++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index 87dbb812cc..1f61336b13 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -1,11 +1,12 @@
 """
 Classes and functions exposed to the RPC endpoint for managing table records.
 """
-from typing import Any, Literal, TypedDict, Union
+from typing import Any, Literal, Optional, TypedDict, Union
 
 from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
 
+from db.records.operations import delete as record_delete
 from db.records.operations import select as record_select
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
@@ -220,6 +221,37 @@ def get(
     return RecordList.from_dict(record_info)
 
 
+@rpc_method(name="records.delete")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def delete(
+        *,
+        record_ids: list[Any],
+        table_oid: int,
+        database_id: int,
+        **kwargs
+) -> Optional[int]:
+    """
+    Delete records from a table by primary key.
+
+    Args:
+        record_ids: The primary key values of the records to be deleted.
+        table_oid: Identity of the table in the user's database.
+        database_id: The Django id of the database containing the table.
+
+    Returns:
+        The number of records deleted.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        num_deleted = record_delete.delete_records_from_table(
+            conn,
+            record_ids,
+            table_oid,
+        )
+    return num_deleted
+
+
 @rpc_method(name="records.search")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 00c12c5c62..19b6318902 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -154,6 +154,11 @@
         "records.get",
         [user_is_authenticated]
     ),
+    (
+        records.delete,
+        "records.delete",
+        [user_is_authenticated]
+    ),
     (
         records.search,
         "records.search",

From bbf1bb6537a18b7c096e425d700437e17d306cfa Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 7 Aug 2024 17:36:14 +0800
Subject: [PATCH 0597/1141] add test for record delete wiring

---
 mathesar/tests/rpc/test_records.py | 37 ++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/mathesar/tests/rpc/test_records.py b/mathesar/tests/rpc/test_records.py
index ab7d13e650..bb72a4bca5 100644
--- a/mathesar/tests/rpc/test_records.py
+++ b/mathesar/tests/rpc/test_records.py
@@ -120,6 +120,43 @@ def mock_get_record(
     assert actual_record == expect_record
 
 
+def test_records_delete(rf, monkeypatch):
+    username = 'alice'
+    password = 'pass1234'
+    table_oid = 23457
+    database_id = 2
+    record_ids = [2342, 321]
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=username, password=password)
+
+    @contextmanager
+    def mock_connect(_database_id, user):
+        if _database_id == database_id and user.username == username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_delete_records(
+            conn,
+            _record_ids,
+            _table_oid,
+    ):
+        if _table_oid != table_oid or _record_ids != record_ids:
+            raise AssertionError('incorrect parameters passed')
+        return 2
+
+    monkeypatch.setattr(records, 'connect', mock_connect)
+    monkeypatch.setattr(records.record_delete, 'delete_records_from_table', mock_delete_records)
+    expect_result = 2
+    actual_result = records.delete(
+        record_ids=record_ids, table_oid=table_oid, database_id=database_id, request=request
+    )
+    assert actual_result == expect_result
+
+
 def test_records_search(rf, monkeypatch):
     username = 'alice'
     password = 'pass1234'

From b6378a29f34f95b95d2fb709e345f8f7aab2402b Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 7 Aug 2024 17:38:09 +0800
Subject: [PATCH 0598/1141] improve and add documentation for record deleter

---
 docs/docs/api/rpc.md    | 1 +
 mathesar/rpc/records.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index f23f4aa6d2..129857f556 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -183,6 +183,7 @@ To use an RPC function:
       members:
       - list_
       - get
+      - delete
       - search
       - RecordList
       - OrderBy
diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index 1f61336b13..f10ce64003 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -236,7 +236,7 @@ def delete(
 
     Args:
         record_ids: The primary key values of the records to be deleted.
-        table_oid: Identity of the table in the user's database.
+        table_oid: The identity of the table in the user's database.
         database_id: The Django id of the database containing the table.
 
     Returns:

From 70894c8ce0c5de13ce45527a0669d230089e2fb8 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 8 Aug 2024 14:39:34 +0800
Subject: [PATCH 0599/1141] add SQL function to insert single record

---
 db/sql/00_msar.sql | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 18ee8ea129..2aa8ec5286 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3776,3 +3776,48 @@ BEGIN
   RETURN num_deleted;
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.build_single_insert_expr(tab_id oid, rec_def jsonb) RETURNS TEXT AS $$
+SELECT
+  format(
+    'INSERT INTO %I.%I (%s) VALUES (%s)',
+    msar.get_relation_schema_name(tab_id),
+    msar.get_relation_name(tab_id),
+    string_agg(format('%I', msar.get_column_name(tab_id, key::smallint)), ', '),
+    string_agg(format('%L', value), ', ')
+  )
+FROM jsonb_each_text(rec_def);
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.add_record_to_table(tab_id oid, rec_def jsonb) RETURNS jsonb AS $$/*
+Add a record to a table.
+
+Args:
+  tab_id: The OID of the table whose record we'll delete.
+  rec_def: A JSON object defining the record.
+
+The `rec_def` object's form is defined by the record being inserted.  It should have keys
+corresponding to the attnums of desired columns and values corresponding to values we should
+insert.
+
+*/
+DECLARE
+  rec_created jsonb;
+BEGIN
+  EXECUTE format(
+    $i$
+    WITH insert_cte AS (%1$s RETURNING %2$s)
+    SELECT jsonb_build_object('results', %3$s)
+    FROM insert_cte
+    $i$,
+    msar.build_single_insert_expr(tab_id, rec_def),
+    msar.build_selectable_column_expr(tab_id),
+    msar.build_results_jsonb_expr(tab_id, 'insert_cte')
+  ) INTO rec_created;
+  RETURN rec_created;
+END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;

From c0d6c202c7eb95b976c463073a9565fae7403f0c Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 8 Aug 2024 16:31:12 +0800
Subject: [PATCH 0600/1141] add basic tests for record adder

---
 db/sql/test_00_msar.sql | 93 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index bb1ceb2386..556b251cc8 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -3867,3 +3867,96 @@ BEGIN
 END;
 $$ LANGUAGE plpgsql;
 
+
+CREATE OR REPLACE FUNCTION __setup_add_record_table() RETURNS SETOF TEXT AS $$
+BEGIN
+  PERFORM __setup_list_records_table();
+  ALTER TABLE atable ADD UNIQUE (col2);
+  ALTER TABLE atable ALTER COLUMN col1 SET DEFAULT 200;
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_add_record_to_table_all() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+BEGIN
+  PERFORM __setup_add_record_table();
+  rel_id := 'atable'::regclass::oid;
+  RETURN NEXT is(
+    msar.add_record_to_table(
+      rel_id,
+      '{"2": 234, "3": "ab234", "4": {"key": "val"}, "5": {"key2": "val2"}}'
+    ),
+    '{"results": [{"1": 4, "2": 234, "3": "ab234", "4": {"key": "val"}, "5": {"key2": "val2"}}]}'
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_add_record_to_table_stringified_json() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+BEGIN
+  PERFORM __setup_add_record_table();
+  rel_id := 'atable'::regclass::oid;
+  RETURN NEXT is(
+    msar.add_record_to_table(
+      rel_id,
+      '{"2": 234, "3": "ab234", "4": {"key": "val"}, "5": "{\"key2\": \"val2\"}"}'
+    ),
+    '{"results": [{"1": 4, "2": 234, "3": "ab234", "4": {"key": "val"}, "5": {"key2": "val2"}}]}'
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_add_record_to_table_use_default() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+BEGIN
+  PERFORM __setup_add_record_table();
+  rel_id := 'atable'::regclass::oid;
+  RETURN NEXT is(
+    msar.add_record_to_table(
+      rel_id,
+      '{"3": "ab234", "4": {"key": "val"}, "5": {"key2": "val2"}}'
+    ),
+    '{"results": [{"1": 4, "2": 200, "3": "ab234", "4": {"key": "val"}, "5": {"key2": "val2"}}]}'
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_add_record_to_table_null_default() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+BEGIN
+  PERFORM __setup_add_record_table();
+  rel_id := 'atable'::regclass::oid;
+  RETURN NEXT is(
+    msar.add_record_to_table(
+      rel_id,
+      '{"2": null, "3": "ab234", "4": {"key": "val"}, "5": {"key2": "val2"}}'
+    ),
+    '{"results": [{"1": 4, "2": null, "3": "ab234", "4": {"key": "val"}, "5": {"key2": "val2"}}]}'
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_add_record_to_table_nonobj_json() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+BEGIN
+  PERFORM __setup_add_record_table();
+  rel_id := 'atable'::regclass::oid;
+  RETURN NEXT is(
+    msar.add_record_to_table(
+      rel_id,
+      '{"2": null, "3": "ab234", "4": 3, "5": "\"234\""}'
+    ),
+    '{"results": [{"1": 4, "2": null, "3": "ab234", "4": 3, "5": "234"}]}'
+  );
+END;
+$$ LANGUAGE plpgsql;

From fb93238caaaca24919578fafb392dfff2a560d96 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 8 Aug 2024 16:32:25 +0800
Subject: [PATCH 0601/1141] add python wrapper for record adder

---
 db/records/operations/insert.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/db/records/operations/insert.py b/db/records/operations/insert.py
index c61dacfebb..26def03bb0 100644
--- a/db/records/operations/insert.py
+++ b/db/records/operations/insert.py
@@ -5,6 +5,7 @@
 from psycopg2 import sql
 from sqlalchemy.exc import IntegrityError, ProgrammingError
 from psycopg2.errors import NotNullViolation, ForeignKeyViolation, DatatypeMismatch, UniqueViolation, ExclusionViolation
+from db import connection as db_conn
 from db.columns.exceptions import NotNullError, ForeignKeyError, TypeMismatchError, UniqueValueError, ExclusionError
 from db.columns.base import MathesarColumn
 from db.constants import ID, ID_ORIGINAL
@@ -15,6 +16,17 @@
 READ_SIZE = 20000
 
 
+def add_record_to_table(conn, record_def, table_oid):
+    """Add a record to a table."""
+    result = db_conn.exec_msar_func(
+        conn,
+        'add_record_to_table',
+        table_oid,
+        json.dumps(record_def)
+    ).fetchone()[0]
+    return result
+
+
 def insert_record_or_records(table, engine, record_data):
     """
     record_data can be a dictionary, tuple, or list of dictionaries or tuples.

From 6742d4bfc24979ac8d572ca9643fdeacab9a0d32 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 8 Aug 2024 16:34:28 +0800
Subject: [PATCH 0602/1141] wire up record adder to RPC endpoint

---
 mathesar/rpc/records.py              | 65 ++++++++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py |  5 +++
 2 files changed, 70 insertions(+)

diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index f10ce64003..046eb55fdb 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -7,6 +7,7 @@
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from db.records.operations import delete as record_delete
+from db.records.operations import insert as record_insert
 from db.records.operations import select as record_select
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
@@ -146,6 +147,32 @@ def from_dict(cls, d):
         )
 
 
+class RecordAdded(TypedDict):
+    """
+    Record from a table, along with some meta data
+
+    The form of the object in the `results` array is determined by the
+    underlying records being listed. The keys of each object are the
+    attnums of the retrieved columns. The values are the value for the
+    given row, for the given column.
+
+    Attributes:
+        results: An array of a single record objects (the one added).
+        preview_data: Information for previewing foreign key values.
+    """
+    count: int
+    results: list[dict]
+    grouping: GroupingResponse
+    preview_data: list[dict]
+
+    @classmethod
+    def from_dict(cls, d):
+        return cls(
+            results=d["results"],
+            preview_data=[],
+        )
+
+
 @rpc_method(name="records.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
@@ -221,6 +248,44 @@ def get(
     return RecordList.from_dict(record_info)
 
 
+@rpc_method(name="records.add")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def add(
+        *,
+        record_def: dict,
+        table_oid: int,
+        database_id: int,
+        **kwargs
+) -> RecordAdded:
+    """
+    Add a single record to a table.
+
+    The form of the `record_def` is determined by the underlying table.
+    Keys should be attnums, and values should be the desired value for
+    that column in the created record. Missing keys will use default
+    values (if set on the DB), and explicit `null` values will set null
+    for that value regardless of default (with obvious exceptions where
+    that would violate some constraint)
+
+    Args:
+        record_def: An object representing the record to be added.
+        table_oid: Identity of the table in the user's database.
+        database_id: The Django id of the database containing the table.
+
+    Returns:
+        The created record, along with some metadata.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        record_info = record_insert.add_record_to_table(
+            conn,
+            record_def,
+            table_oid,
+        )
+    return RecordAdded.from_dict(record_info)
+
+
 @rpc_method(name="records.delete")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 19b6318902..b022cbeca9 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -154,6 +154,11 @@
         "records.get",
         [user_is_authenticated]
     ),
+    (
+        records.add,
+        "records.add",
+        [user_is_authenticated]
+    ),
     (
         records.delete,
         "records.delete",

From f8d6d770727c8a2ba409edb87173d7a1fdd639bc Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 8 Aug 2024 16:38:55 +0800
Subject: [PATCH 0603/1141] add wiring test for record adder

---
 mathesar/tests/rpc/test_records.py | 42 ++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/mathesar/tests/rpc/test_records.py b/mathesar/tests/rpc/test_records.py
index bb72a4bca5..150e7ec12d 100644
--- a/mathesar/tests/rpc/test_records.py
+++ b/mathesar/tests/rpc/test_records.py
@@ -120,6 +120,48 @@ def mock_get_record(
     assert actual_record == expect_record
 
 
+def test_records_add(rf, monkeypatch):
+    username = 'alice'
+    password = 'pass1234'
+    table_oid = 23457
+    database_id = 2
+    record_def = {"1": "arecord"}
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=username, password=password)
+
+    @contextmanager
+    def mock_connect(_database_id, user):
+        if _database_id == database_id and user.username == username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_add_record(
+            conn,
+            _record_def,
+            _table_oid,
+    ):
+        if _table_oid != table_oid or _record_def != record_def:
+            raise AssertionError('incorrect parameters passed')
+        return {
+            "results": [_record_def],
+        }
+
+    monkeypatch.setattr(records, 'connect', mock_connect)
+    monkeypatch.setattr(records.record_insert, 'add_record_to_table', mock_add_record)
+    expect_record = {
+        "results": [record_def],
+        "preview_data": [],
+    }
+    actual_record = records.add(
+        record_def=record_def, table_oid=table_oid, database_id=database_id, request=request
+    )
+    assert actual_record == expect_record
+
+
 def test_records_delete(rf, monkeypatch):
     username = 'alice'
     password = 'pass1234'

From 50fba28a23a9167cf0f4beca5360589f7eaed810 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 8 Aug 2024 16:42:53 +0800
Subject: [PATCH 0604/1141] add documentation for new adder function

---
 docs/docs/api/rpc.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 129857f556..64a43c9d13 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -183,9 +183,11 @@ To use an RPC function:
       members:
       - list_
       - get
+      - add
       - delete
       - search
       - RecordList
+      - RecordAdded
       - OrderBy
       - Filter
       - FilterAttnum

From b29678b763159129a9751bf36d18ff82580e5b0f Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 8 Aug 2024 13:32:10 -0400
Subject: [PATCH 0605/1141] Adapt front end to new RPC-based records grouping

---
 mathesar_ui/src/api/rpc/tables.ts             |  26 +-
 .../src/pages/record/RecordPageContent.svelte |  13 +-
 mathesar_ui/src/pages/record/Widgets.svelte   |  14 +-
 mathesar_ui/src/stores/tables.ts              |  18 +-
 .../src/systems/data-explorer/QueryManager.ts |  21 +-
 .../data-explorer/__tests__/mockData.ts       | 510 ------------------
 .../data-explorer/__tests__/utils.test.ts     |  58 --
 .../src/systems/data-explorer/utils.ts        |  54 +-
 .../table/links/LinkItem.svelte               |  19 +-
 .../table/links/LinkSection.svelte            |  34 +-
 .../table/links/LinksSectionContainer.svelte  |  59 +-
 .../table/links/TableLinks.svelte             |  32 +-
 .../table-inspector/table/links/utils.ts      |  52 +-
 13 files changed, 151 insertions(+), 759 deletions(-)
 delete mode 100644 mathesar_ui/src/systems/data-explorer/__tests__/mockData.ts
 delete mode 100644 mathesar_ui/src/systems/data-explorer/__tests__/utils.test.ts

diff --git a/mathesar_ui/src/api/rpc/tables.ts b/mathesar_ui/src/api/rpc/tables.ts
index da27409597..db5748d334 100644
--- a/mathesar_ui/src/api/rpc/tables.ts
+++ b/mathesar_ui/src/api/rpc/tables.ts
@@ -20,7 +20,7 @@ export interface Table extends RawTable {
 }
 
 /** [table oid, column attnum][] */
-export type JoinPath = [number, number][];
+export type JoinPath = [number, number][][];
 
 export interface JoinableTable {
   target: Table['oid'];
@@ -45,18 +45,19 @@ export interface JoinableTable {
 
 export interface JoinableTablesResult {
   joinable_tables: JoinableTable[];
-  tables: Record<
-    string, // stringified table_oid
+  /** Keys are stringified table OID values */
+  target_table_info: Record<
+    string,
     {
       name: Table['name'];
-      columns: number[];
-    }
-  >;
-  columns: Record<
-    string, // stringified column_oid
-    {
-      name: string;
-      type: string;
+      /** Keys are stringified column attnum values */
+      columns: Record<
+        string,
+        {
+          name: string;
+          type: string;
+        }
+      >;
     }
   >;
 }
@@ -133,7 +134,8 @@ export const tables = {
   list_joinable: rpcMethodTypeContainer<
     {
       database_id: number;
-      schema_oid: number;
+      table_oid: number;
+      max_depth?: number;
     },
     JoinableTablesResult
   >(),
diff --git a/mathesar_ui/src/pages/record/RecordPageContent.svelte b/mathesar_ui/src/pages/record/RecordPageContent.svelte
index c7deb62017..19fa289d96 100644
--- a/mathesar_ui/src/pages/record/RecordPageContent.svelte
+++ b/mathesar_ui/src/pages/record/RecordPageContent.svelte
@@ -2,8 +2,7 @@
   import { _ } from 'svelte-i18n';
 
   import { getDetailedRecordsErrors } from '@mathesar/api/rest/utils/recordUtils';
-  import { getAPI } from '@mathesar/api/rest/utils/requestUtils';
-  import type { JoinableTablesResult } from '@mathesar/api/rpc/tables';
+  import { api } from '@mathesar/api/rpc';
   import type { Table } from '@mathesar/api/rpc/tables';
   import {
     FormSubmit,
@@ -17,6 +16,7 @@
   import TableName from '@mathesar/components/TableName.svelte';
   import { iconRecord, iconSave, iconUndo } from '@mathesar/icons';
   import InsetPageLayout from '@mathesar/layouts/InsetPageLayout.svelte';
+  import { currentDatabase } from '@mathesar/stores/databases';
   import type { TableStructure } from '@mathesar/stores/table-data';
   import { currentTable } from '@mathesar/stores/tables';
 
@@ -41,9 +41,12 @@
   $: form = makeForm(formFields);
 
   function getJoinableTablesResult(tableId: number) {
-    return getAPI<JoinableTablesResult>(
-      `/api/db/v0/tables/${tableId}/joinable_tables/?max_depth=1`,
-    );
+    return api.tables
+      .list_joinable({
+        database_id: $currentDatabase.id,
+        table_oid: tableId,
+      })
+      .run();
   }
 </script>
 
diff --git a/mathesar_ui/src/pages/record/Widgets.svelte b/mathesar_ui/src/pages/record/Widgets.svelte
index 34906815fd..4f9b9154e5 100644
--- a/mathesar_ui/src/pages/record/Widgets.svelte
+++ b/mathesar_ui/src/pages/record/Widgets.svelte
@@ -17,19 +17,13 @@
   export let recordSummary: string;
   export let joinableTablesResult: JoinableTablesResult;
 
-  $: columnNameMap = new Map(
-    Object.entries(joinableTablesResult.columns).map(([columnId, column]) => [
-      parseInt(columnId, 10),
-      column.name,
-    ]),
-  );
-
   function buildWidgetInput(joinableTable: JoinableTable) {
     const table = $currentTablesData.tablesMap.get(joinableTable.target);
     if (!table) return undefined;
-    const id = joinableTable.join_path[0].slice(-1)[0];
-    const name = columnNameMap.get(id) ?? `(${$_('unknown_column')})`;
-    return { table, fkColumn: { id, name } };
+    const fkColumnId = joinableTable.join_path[0].slice(-1)[0][1];
+    const { name } =
+      joinableTablesResult.target_table_info[table.oid].columns[fkColumnId];
+    return { table, fkColumn: { id: fkColumnId, name } };
   }
 
   $: tableWidgetInputs = joinableTablesResult.joinable_tables
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index d9179497a2..5bfcc644cd 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -19,7 +19,7 @@ import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { api } from '@mathesar/api/rpc';
 import type { Database } from '@mathesar/api/rpc/databases';
 import type { Schema } from '@mathesar/api/rpc/schemas';
-import type { JoinableTablesResult, Table } from '@mathesar/api/rpc/tables';
+import type { Table } from '@mathesar/api/rpc/tables';
 import { invalidIf } from '@mathesar/components/form';
 import { TupleMap } from '@mathesar/packages/tuple-map';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
@@ -441,22 +441,6 @@ export const currentTable = derived(
       : $tables.tablesMap.get($currentTableId),
 );
 
-export function getJoinableTablesResult(
-  tableId: number,
-  maxDepth = 1,
-): Promise<JoinableTablesResult> {
-  return Promise.resolve({
-    joinable_tables: [],
-    tables: {},
-    columns: {},
-  });
-  // TODO_BETA: re-implement this with the RPC API.
-
-  // return getAPI<JoinableTablesResult>(
-  //   `/api/db/v0/tables/${tableId}/joinable_tables/?max_depth=${maxDepth}`,
-  // );
-}
-
 export async function refetchTablesForCurrentSchema() {
   const database = get(currentDatabase);
   const schemaOid = get(currentSchemaId);
diff --git a/mathesar_ui/src/systems/data-explorer/QueryManager.ts b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
index 9d2901d051..4d40856160 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryManager.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
@@ -7,7 +7,6 @@ import type {
   QueryRunResponse,
 } from '@mathesar/api/rest/types/queries';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
-import { getAPI } from '@mathesar/api/rest/utils/requestUtils';
 import { api } from '@mathesar/api/rpc';
 import type { JoinableTablesResult, Table } from '@mathesar/api/rpc/tables';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
@@ -65,7 +64,7 @@ export default class QueryManager extends QueryRunner {
 
   private baseTableFetchPromise: CancellablePromise<Table> | undefined;
 
-  private joinableColumnsfetchPromise:
+  private joinableColumnsFetchPromise:
     | CancellablePromise<JoinableTablesResult>
     | undefined;
 
@@ -127,8 +126,9 @@ export default class QueryManager extends QueryRunner {
     }
 
     try {
+      const database = get(currentDatabase);
       this.baseTableFetchPromise?.cancel();
-      this.joinableColumnsfetchPromise?.cancel();
+      this.joinableColumnsFetchPromise?.cancel();
 
       this.state.update((state) => ({
         ...state,
@@ -137,17 +137,20 @@ export default class QueryManager extends QueryRunner {
 
       this.baseTableFetchPromise = api.tables
         .get_with_metadata({
-          database_id: get(currentDatabase).id,
+          database_id: database.id,
           table_oid: baseTableId,
         })
         .run();
 
-      this.joinableColumnsfetchPromise = getAPI<JoinableTablesResult>(
-        `/api/db/v0/tables/${baseTableId}/joinable_tables/`,
-      );
+      this.joinableColumnsFetchPromise = api.tables
+        .list_joinable({
+          database_id: database.id,
+          table_oid: baseTableId,
+        })
+        .run();
       const [baseTableResult, joinableColumnsResult] = await Promise.all([
         this.baseTableFetchPromise,
-        this.joinableColumnsfetchPromise,
+        this.joinableColumnsFetchPromise,
       ]);
       const baseTableColumns = getBaseTableColumnsWithLinks(
         joinableColumnsResult,
@@ -381,7 +384,7 @@ export default class QueryManager extends QueryRunner {
   destroy(): void {
     super.destroy();
     this.baseTableFetchPromise?.cancel();
-    this.joinableColumnsfetchPromise?.cancel();
+    this.joinableColumnsFetchPromise?.cancel();
     this.querySavePromise?.cancel();
   }
 }
diff --git a/mathesar_ui/src/systems/data-explorer/__tests__/mockData.ts b/mathesar_ui/src/systems/data-explorer/__tests__/mockData.ts
deleted file mode 100644
index 092f0511c2..0000000000
--- a/mathesar_ui/src/systems/data-explorer/__tests__/mockData.ts
+++ /dev/null
@@ -1,510 +0,0 @@
-import type { JoinableTablesResult } from '@mathesar/api/rpc/tables';
-
-export const ItemsTableId = 75;
-export const CheckoutsPkColumnId = 216;
-export const ItemsPkColumnId = 221;
-
-export const checkoutsJoinableTables: JoinableTablesResult = {
-  joinable_tables: [
-    {
-      target: ItemsTableId,
-      join_path: [[CheckoutsPkColumnId, ItemsPkColumnId]],
-      fkey_path: [[188, false]],
-      depth: 1,
-      multiple_results: false,
-    },
-    {
-      target: 72,
-      join_path: [[217, 228]],
-      fkey_path: [[189, false]],
-      depth: 1,
-      multiple_results: false,
-    },
-    {
-      target: 78,
-      join_path: [
-        [CheckoutsPkColumnId, ItemsPkColumnId],
-        [222, 229],
-      ],
-      fkey_path: [
-        [188, false],
-        [192, false],
-      ],
-      depth: 2,
-      multiple_results: false,
-    },
-    {
-      target: 74,
-      join_path: [
-        [CheckoutsPkColumnId, ItemsPkColumnId],
-        [222, 229],
-        [231, 235],
-      ],
-      fkey_path: [
-        [188, false],
-        [192, false],
-        [196, false],
-      ],
-      depth: 3,
-      multiple_results: false,
-    },
-    {
-      target: 77,
-      join_path: [
-        [CheckoutsPkColumnId, ItemsPkColumnId],
-        [222, 229],
-        [232, 211],
-      ],
-      fkey_path: [
-        [188, false],
-        [192, false],
-        [195, false],
-      ],
-      depth: 3,
-      multiple_results: false,
-    },
-  ],
-  tables: {
-    [ItemsTableId]: {
-      name: 'Items',
-      columns: [ItemsPkColumnId, 222],
-    },
-    72: { name: 'Patrons', columns: [228] },
-    78: { name: 'Publications', columns: [229, 231, 232] },
-    74: { name: 'Publishers', columns: [235] },
-    77: { name: 'Authors', columns: [211] },
-  },
-  columns: {
-    [ItemsPkColumnId]: { name: 'id', type: 'integer' },
-    222: { name: 'Publication', type: 'integer' },
-    228: { name: 'id', type: 'integer' },
-    229: { name: 'id', type: 'integer' },
-    231: { name: 'Publisher', type: 'integer' },
-    232: { name: 'Author', type: 'integer' },
-    235: { name: 'id', type: 'integer' },
-    211: { name: 'id', type: 'integer' },
-  },
-};
-
-export const checkoutsLinkTreeFromItems = {
-  id: ItemsTableId,
-  linkedToColumn: {
-    id: ItemsPkColumnId,
-    name: 'id',
-  },
-  name: 'Items',
-  columns: new Map([
-    [
-      ItemsPkColumnId,
-      expect.objectContaining({
-        id: ItemsPkColumnId,
-        jpPath: [[216, 221]],
-        linksTo: undefined,
-        name: 'id',
-      }),
-    ],
-    [
-      222,
-      expect.objectContaining({
-        id: 222,
-        jpPath: [[216, 221]],
-        linksTo: {
-          id: 78,
-          name: 'Publications',
-          linkedToColumn: { id: 229, name: 'id' },
-          columns: new Map([
-            [
-              229,
-              expect.objectContaining({
-                id: 228,
-                name: 'id',
-                jpPath: [
-                  [216, 221],
-                  [222, 229],
-                ],
-              }),
-            ],
-            [
-              231,
-              expect.objectContaining({
-                id: 231,
-                name: 'Publisher',
-                jpPath: [
-                  [216, 221],
-                  [222, 229],
-                ],
-                linksTo: {
-                  id: 74,
-                  name: 'Publishers',
-                  linkedToColumn: {
-                    id: 235,
-                    name: 'id',
-                  },
-                  columns: new Map([
-                    [
-                      235,
-                      expect.objectContaining({
-                        id: 235,
-                        name: 'id',
-                        jpPath: [
-                          [216, 221],
-                          [222, 229],
-                          [231, 235],
-                        ],
-                        linksTo: undefined,
-                      }),
-                    ],
-                  ]),
-                },
-              }),
-            ],
-            [
-              232,
-              expect.objectContaining({
-                id: 232,
-                name: 'Author',
-                jpPath: [
-                  [216, 221],
-                  [222, 229],
-                ],
-                linksTo: new Map([
-                  [
-                    77,
-                    expect.objectContaining({
-                      id: 77,
-                      name: 'Authors',
-                      linkedToColumn: { id: 211, name: 'id' },
-                      columns: new Map([[211, { id: 221, name: 'id' }]]),
-                    }),
-                  ],
-                ]),
-              }),
-            ],
-          ]),
-        },
-        name: 'Publication',
-      }),
-    ],
-  ]),
-};
-
-export const SelfRefTableId = 1158;
-export const SelfRefTablePkColumnId = 4898;
-export const SelfRefTableFkColumnId = 5355;
-
-export const selfRefTableJoinableTables: JoinableTablesResult = {
-  joinable_tables: [
-    {
-      target: SelfRefTableId,
-      join_path: [[SelfRefTableFkColumnId, SelfRefTablePkColumnId]],
-      fkey_path: [[2529, false]],
-      depth: 1,
-      multiple_results: false,
-    },
-    {
-      target: SelfRefTableId,
-      join_path: [[SelfRefTablePkColumnId, SelfRefTableFkColumnId]],
-      fkey_path: [[2529, true]],
-      depth: 1,
-      multiple_results: true,
-    },
-    {
-      target: SelfRefTableId,
-      join_path: [
-        [SelfRefTableFkColumnId, SelfRefTablePkColumnId],
-        [SelfRefTableFkColumnId, SelfRefTablePkColumnId],
-      ],
-      fkey_path: [
-        [2529, false],
-        [2529, false],
-      ],
-      depth: 2,
-      multiple_results: false,
-    },
-    {
-      target: SelfRefTableId,
-      join_path: [
-        [SelfRefTablePkColumnId, SelfRefTableFkColumnId],
-        [SelfRefTablePkColumnId, SelfRefTableFkColumnId],
-      ],
-      fkey_path: [
-        [2529, true],
-        [2529, true],
-      ],
-      depth: 2,
-      multiple_results: true,
-    },
-    {
-      target: SelfRefTableId,
-      join_path: [
-        [SelfRefTableFkColumnId, SelfRefTablePkColumnId],
-        [SelfRefTableFkColumnId, SelfRefTablePkColumnId],
-        [SelfRefTableFkColumnId, SelfRefTablePkColumnId],
-      ],
-      fkey_path: [
-        [2529, false],
-        [2529, false],
-        [2529, false],
-      ],
-      depth: 3,
-      multiple_results: false,
-    },
-    {
-      target: SelfRefTableId,
-      join_path: [
-        [SelfRefTablePkColumnId, SelfRefTableFkColumnId],
-        [SelfRefTablePkColumnId, SelfRefTableFkColumnId],
-        [SelfRefTablePkColumnId, SelfRefTableFkColumnId],
-      ],
-      fkey_path: [
-        [2529, true],
-        [2529, true],
-        [2529, true],
-      ],
-      depth: 3,
-      multiple_results: true,
-    },
-  ],
-  tables: {
-    [SelfRefTableId]: {
-      name: 'Self Referential Table',
-      columns: [SelfRefTablePkColumnId, SelfRefTableFkColumnId],
-    },
-  },
-  columns: {
-    [SelfRefTablePkColumnId]: { name: 'id', type: 'integer' },
-    [SelfRefTableFkColumnId]: { name: 'Self Referential Row', type: 'integer' },
-  },
-};
-
-export const selfRefTableLinkTree = {
-  id: SelfRefTableId,
-  name: 'Self Referential Table',
-  linkedToColumn: {
-    id: SelfRefTablePkColumnId,
-    name: 'id',
-  },
-  columns: new Map([
-    [
-      SelfRefTablePkColumnId,
-      expect.objectContaining({
-        id: SelfRefTablePkColumnId,
-        jpPath: [[SelfRefTableFkColumnId, SelfRefTablePkColumnId]],
-        linksTo: undefined,
-        name: 'id',
-      }),
-    ],
-    [
-      SelfRefTableFkColumnId,
-      expect.objectContaining({
-        id: SelfRefTableFkColumnId,
-        jpPath: [[SelfRefTableFkColumnId, SelfRefTablePkColumnId]],
-        linksTo: {
-          id: SelfRefTableId,
-          name: 'Self Referential Table',
-          linkedToColumn: { id: SelfRefTablePkColumnId, name: 'id' },
-          columns: new Map([
-            [
-              SelfRefTablePkColumnId,
-              expect.objectContaining({
-                id: SelfRefTablePkColumnId,
-                jpPath: [
-                  [SelfRefTableFkColumnId, SelfRefTablePkColumnId],
-                  [SelfRefTableFkColumnId, SelfRefTablePkColumnId],
-                ],
-                linksTo: undefined,
-              }),
-            ],
-            [
-              SelfRefTableFkColumnId,
-              expect.objectContaining({
-                id: SelfRefTableFkColumnId,
-                jpPath: [
-                  [SelfRefTableFkColumnId, SelfRefTablePkColumnId],
-                  [SelfRefTableFkColumnId, SelfRefTablePkColumnId],
-                ],
-                linksTo: {
-                  id: SelfRefTableId,
-                  linkedToColumn: {
-                    id: SelfRefTablePkColumnId,
-                    name: 'id',
-                  },
-                  columns: new Map([
-                    [
-                      SelfRefTablePkColumnId,
-                      expect.objectContaining({
-                        id: SelfRefTablePkColumnId,
-                        jpPath: [
-                          [SelfRefTableFkColumnId, SelfRefTablePkColumnId],
-                          [SelfRefTableFkColumnId, SelfRefTablePkColumnId],
-                          [SelfRefTableFkColumnId, SelfRefTablePkColumnId],
-                        ],
-                        linksTo: undefined,
-                        name: 'id',
-                      }),
-                    ],
-                    [
-                      SelfRefTableFkColumnId,
-                      expect.objectContaining({
-                        id: SelfRefTableFkColumnId,
-                        jpPath: [
-                          [SelfRefTableFkColumnId, SelfRefTablePkColumnId],
-                          [SelfRefTableFkColumnId, SelfRefTablePkColumnId],
-                          [SelfRefTableFkColumnId, SelfRefTablePkColumnId],
-                        ],
-                        linksTo: undefined,
-                        name: 'Self Referential Row',
-                      }),
-                    ],
-                  ]),
-                },
-              }),
-            ],
-          ]),
-        },
-        name: 'Self Referential Row',
-      }),
-    ],
-  ]),
-};
-
-export const personTableId = 1332;
-export const groupTablePerson1ColumnId = 5831;
-export const groupTablePerson2ColumnId = 5914;
-export const personTablePkColumnId = 5570;
-export const groupTable: JoinableTablesResult = {
-  joinable_tables: [
-    {
-      target: personTableId,
-      join_path: [[groupTablePerson1ColumnId, personTablePkColumnId]],
-      fkey_path: [[2765, false]],
-      depth: 1,
-      multiple_results: false,
-    },
-    {
-      target: personTableId,
-      join_path: [[groupTablePerson2ColumnId, personTablePkColumnId]],
-      fkey_path: [[2801, false]],
-      depth: 1,
-      multiple_results: false,
-    },
-    {
-      target: 1295,
-      join_path: [
-        [groupTablePerson1ColumnId, personTablePkColumnId],
-        [personTablePkColumnId, groupTablePerson2ColumnId],
-      ],
-      fkey_path: [
-        [2765, false],
-        [2801, true],
-      ],
-      depth: 2,
-      multiple_results: true,
-    },
-    {
-      target: 1295,
-      join_path: [
-        [groupTablePerson2ColumnId, personTablePkColumnId],
-        [personTablePkColumnId, groupTablePerson1ColumnId],
-      ],
-      fkey_path: [
-        [2801, false],
-        [2765, true],
-      ],
-      depth: 2,
-      multiple_results: true,
-    },
-    {
-      target: personTableId,
-      join_path: [
-        [groupTablePerson1ColumnId, personTablePkColumnId],
-        [personTablePkColumnId, groupTablePerson2ColumnId],
-        [groupTablePerson1ColumnId, personTablePkColumnId],
-      ],
-      fkey_path: [
-        [2765, false],
-        [2801, true],
-        [2765, false],
-      ],
-      depth: 3,
-      multiple_results: true,
-    },
-    {
-      target: personTableId,
-      join_path: [
-        [groupTablePerson2ColumnId, personTablePkColumnId],
-        [personTablePkColumnId, groupTablePerson1ColumnId],
-        [groupTablePerson2ColumnId, personTablePkColumnId],
-      ],
-      fkey_path: [
-        [2801, false],
-        [2765, true],
-        [2801, false],
-      ],
-      depth: 3,
-      multiple_results: true,
-    },
-  ],
-  tables: {
-    [personTableId]: { name: 'Person', columns: [personTablePkColumnId, 5781] },
-    1295: {
-      name: 'Group',
-      columns: [5431, groupTablePerson1ColumnId, groupTablePerson2ColumnId],
-    },
-  },
-  columns: {
-    [personTablePkColumnId]: { name: 'id', type: 'integer' },
-    5781: { name: 'name', type: 'text' },
-    5431: { name: 'id', type: 'integer' },
-    [groupTablePerson1ColumnId]: { name: 'Person1', type: 'integer' },
-    [groupTablePerson2ColumnId]: { name: 'Person2', type: 'integer' },
-  },
-};
-
-export const groupTableLinkTreeFromPerson1 = {
-  id: personTableId,
-  name: 'Person',
-  linkedToColumn: {
-    id: personTablePkColumnId,
-    name: 'id',
-  },
-  columns: new Map([
-    [
-      personTablePkColumnId,
-      expect.objectContaining({
-        id: personTablePkColumnId,
-        jpPath: [[groupTablePerson1ColumnId, personTablePkColumnId]],
-      }),
-    ],
-    [
-      5781,
-      expect.objectContaining({
-        id: 5781,
-      }),
-    ],
-  ]),
-};
-
-export const groupTableLinkTreeFromPerson2 = {
-  id: personTableId,
-  name: 'Person',
-  linkedToColumn: {
-    id: personTablePkColumnId,
-    name: 'id',
-  },
-  columns: new Map([
-    [
-      personTablePkColumnId,
-      expect.objectContaining({
-        id: personTablePkColumnId,
-        jpPath: [[groupTablePerson2ColumnId, personTablePkColumnId]],
-      }),
-    ],
-    [
-      5781,
-      expect.objectContaining({
-        id: 5781,
-      }),
-    ],
-  ]),
-};
diff --git a/mathesar_ui/src/systems/data-explorer/__tests__/utils.test.ts b/mathesar_ui/src/systems/data-explorer/__tests__/utils.test.ts
deleted file mode 100644
index 89faeeb243..0000000000
--- a/mathesar_ui/src/systems/data-explorer/__tests__/utils.test.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { getLinkFromColumn } from '../utils';
-
-import {
-  CheckoutsPkColumnId,
-  SelfRefTableFkColumnId,
-  checkoutsJoinableTables,
-  checkoutsLinkTreeFromItems,
-  groupTable,
-  groupTableLinkTreeFromPerson1,
-  groupTableLinkTreeFromPerson2,
-  groupTablePerson1ColumnId,
-  groupTablePerson2ColumnId,
-  selfRefTableJoinableTables,
-  selfRefTableLinkTree,
-} from './mockData';
-
-vi.mock('@mathesar/utils/preloadData', () => ({
-  preloadCommonData: () => ({
-    databases: [],
-    servers: [],
-  }),
-}));
-
-describe('Test getLinkFromColumn', () => {
-  test('should generate tree with forward links', () => {
-    const forwardLinksFromItem = getLinkFromColumn(
-      checkoutsJoinableTables,
-      CheckoutsPkColumnId,
-      1,
-    );
-    expect(forwardLinksFromItem).toEqual(checkoutsLinkTreeFromItems);
-  });
-
-  test('should include self referential links', () => {
-    const forwardLinks = getLinkFromColumn(
-      selfRefTableJoinableTables,
-      SelfRefTableFkColumnId,
-      1,
-    );
-    expect(forwardLinks).toEqual(selfRefTableLinkTree);
-  });
-
-  test('should generate tree when there are multiple columns linking to the same table', () => {
-    const forwardLinksFromFk1 = getLinkFromColumn(
-      groupTable,
-      groupTablePerson1ColumnId,
-      1,
-    );
-    const forwardLinksFromFk2 = getLinkFromColumn(
-      groupTable,
-      groupTablePerson2ColumnId,
-      1,
-    );
-    expect(forwardLinksFromFk1).toEqual(groupTableLinkTreeFromPerson1);
-
-    expect(forwardLinksFromFk2).toEqual(groupTableLinkTreeFromPerson2);
-  });
-});
diff --git a/mathesar_ui/src/systems/data-explorer/utils.ts b/mathesar_ui/src/systems/data-explorer/utils.ts
index 24ef474430..0c86c6601c 100644
--- a/mathesar_ui/src/systems/data-explorer/utils.ts
+++ b/mathesar_ui/src/systems/data-explorer/utils.ts
@@ -133,7 +133,7 @@ export function getLinkFromColumn(
     (entry) =>
       entry.depth === depth &&
       entry.fkey_path[depth - 1][1] === false &&
-      entry.join_path[depth - 1][0] === columnId &&
+      entry.join_path[depth - 1][0][1] === columnId &&
       entry.join_path.join(',').indexOf(parentPath) === 0,
   );
   if (allLinksFromColumn.length === 0) {
@@ -144,19 +144,19 @@ export function getLinkFromColumn(
     throw new Error(`Multiple links present for the same column: ${columnId}`);
   }
   const link = allLinksFromColumn[0];
-  const toTableInfo = result.tables[link.target];
+  const toTableInfo = result.target_table_info[link.target];
   const toTable = {
     id: link.target,
     name: toTableInfo.name,
   };
-  const toColumnId = link.join_path[depth - 1][1];
+  const toColumnId = link.join_path[depth - 1][1][1];
   const toColumn = {
     id: toColumnId,
-    name: result.columns[toColumnId].name,
+    name: toTableInfo.columns[toColumnId].name,
   };
   const columnMapEntries: [ColumnWithLink['id'], ColumnWithLink][] =
-    toTableInfo.columns.map((columnIdInLinkedTable) => {
-      const columnInLinkedTable = result.columns[columnIdInLinkedTable];
+    Object.entries(toTableInfo.columns).map(([id, columnInLinkedTable]) => {
+      const columnIdInLinkedTable = parseInt(id, 10);
       return [
         columnIdInLinkedTable,
         {
@@ -201,11 +201,10 @@ export function getColumnInformationMap(
   //     tableName: baseTable.name,
   //   });
   // });
-  Object.keys(result.tables).forEach((tableIdKey) => {
+  for (const [tableIdKey, table] of Object.entries(result.target_table_info)) {
     const tableId = parseInt(tableIdKey, 10);
-    const table = result.tables[tableId];
-    table.columns.forEach((columnId) => {
-      const column = result.columns[columnId];
+    for (const [columnIdKey, column] of Object.entries(table.columns)) {
+      const columnId = parseInt(columnIdKey, 10);
       map.set(columnId, {
         id: columnId,
         name: column.name,
@@ -213,8 +212,8 @@ export function getColumnInformationMap(
         tableId,
         tableName: table.name,
       });
-    });
-  });
+    }
+  }
   return map;
 }
 
@@ -254,9 +253,9 @@ export function getTablesThatReferenceBaseTable(
 
   referenceLinks.forEach((reference) => {
     const tableId = reference.target;
-    const table = result.tables[tableId];
+    const table = result.target_table_info[tableId];
     const baseTableColumnId = reference.join_path[0][0];
-    const referenceTableColumnId = reference.join_path[0][1];
+    const referenceTableColumnId = reference.join_path[0][1][1];
 
     // TODO_BETA: figure out how to deal with the fact that our `Table` type no
     // longer has a `columns` field.
@@ -269,24 +268,21 @@ export function getTablesThatReferenceBaseTable(
     if (!baseTableColumn) {
       return;
     }
+    // const table = 0;
     const columnMapEntries: [ColumnWithLink['id'], ColumnWithLink][] =
-      result.tables[reference.target].columns
-        .filter((columnId) => columnId !== referenceTableColumnId)
-        .map((columnIdInTable) => {
-          const columnInTable = result.columns[columnIdInTable];
+      Object.entries(table.columns)
+        .filter(([columnId]) => columnId !== String(referenceTableColumnId))
+        .map(([columnIdKey, column]) => {
+          const columnId = parseInt(columnIdKey, 10);
+          const parentPath = reference.join_path.join(',');
           return [
-            columnIdInTable,
+            columnId,
             {
-              id: columnIdInTable,
-              name: columnInTable.name,
-              type: columnInTable.type,
+              id: columnId,
+              name: column.name,
+              type: column.type,
               tableName: table.name,
-              linksTo: getLinkFromColumn(
-                result,
-                columnIdInTable,
-                2,
-                reference.join_path.join(','),
-              ),
+              linksTo: getLinkFromColumn(result, columnId, 2, parentPath),
               jpPath: reference.join_path,
               producesMultipleResults: reference.multiple_results,
             },
@@ -298,7 +294,7 @@ export function getTablesThatReferenceBaseTable(
       name: table.name,
       referencedViaColumn: {
         id: referenceTableColumnId,
-        ...result.columns[referenceTableColumnId],
+        ...table.columns[referenceTableColumnId],
       },
       linkedToColumn: baseTableColumn,
       columns: new Map(columnMapEntries.sort(compareColumnByLinks)),
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkItem.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkItem.svelte
index 910abe4286..3fb15a8c88 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkItem.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkItem.svelte
@@ -17,13 +17,15 @@
   <span class="table-name">
     <TableName table={link.table} truncate={false} />
   </span>
-  <span class="sub-text">
-    <RichText text={$_('linked_via_column')} let:slotName>
-      {#if slotName === 'columnName'}
-        <strong>{link.column.name}</strong>
-      {/if}
-    </RichText>
-  </span>
+  {#if link.column}
+    <span class="sub-text">
+      <RichText text={$_('linked_via_column')} let:slotName>
+        {#if slotName === 'columnName'}
+          <strong>{link.column.name}</strong>
+        {/if}
+      </RichText>
+    </span>
+  {/if}
 </a>
 
 <style lang="scss">
@@ -38,9 +40,6 @@
 
     &:hover {
       background: var(--slate-100);
-      .table-name {
-        text-decoration: underline;
-      }
     }
 
     > :global(* + *) {
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkSection.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkSection.svelte
index e7d2fd2768..c8d334777e 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkSection.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkSection.svelte
@@ -1,39 +1,15 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import {
-    iconLinksFromOtherTables,
-    iconLinksInThisTable,
-  } from '@mathesar/icons';
-  import { Icon, assertExhaustive } from '@mathesar-component-library';
+  import type { IconProps } from '@mathesar/component-library/types';
+  import { Icon } from '@mathesar-component-library';
 
   import LinkItem from './LinkItem.svelte';
-  import type { TableLink, TableLinkType } from './utils';
+  import type { TableLink } from './utils';
 
+  export let icon: IconProps;
+  export let title: string;
   export let links: TableLink[];
-  export let type: TableLinkType;
-
-  $: icon = (() => {
-    switch (type) {
-      case 'in_this_table':
-        return iconLinksInThisTable;
-      case 'from_other_tables':
-        return iconLinksFromOtherTables;
-      default:
-        return assertExhaustive(type);
-    }
-  })();
-
-  $: title = (() => {
-    switch (type) {
-      case 'in_this_table':
-        return $_('in_this_table');
-      case 'from_other_tables':
-        return $_('from_other_tables');
-      default:
-        return assertExhaustive(type);
-    }
-  })();
 </script>
 
 <div class="link-section-container">
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinksSectionContainer.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinksSectionContainer.svelte
index c580b6bcb0..24646bbfbf 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinksSectionContainer.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinksSectionContainer.svelte
@@ -1,27 +1,74 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
+  import type { JoinableTablesResult } from '@mathesar/api/rpc/tables';
   import { iconAddNew } from '@mathesar/icons';
+  import {
+    iconLinksFromOtherTables,
+    iconLinksInThisTable,
+  } from '@mathesar/icons';
   import { modal } from '@mathesar/stores/modal';
+  import type { ProcessedColumn } from '@mathesar/stores/table-data';
   import LinkTableModal from '@mathesar/systems/table-view/link-table/LinkTableModal.svelte';
-  import { Button, Icon } from '@mathesar-component-library';
+  import { Button, Icon, defined } from '@mathesar-component-library';
 
   import LinkSection from './LinkSection.svelte';
   import type { TableLink } from './utils';
 
-  export let linksInThisTable: TableLink[];
-  export let linksFromOtherTables: TableLink[];
-
   const linkTableModal = modal.spawnModalController();
+
+  export let joinableTablesResult: JoinableTablesResult;
+  export let currentTableColumns: Map<number, ProcessedColumn>;
+
+  $: joinableTables = joinableTablesResult.joinable_tables;
+
+  $: linksInThisTable = (() => {
+    const linkedTables = joinableTables.filter((t) => !t.fkey_path[0][1]);
+    const links: TableLink[] = linkedTables.map((joinableTable) => {
+      const table =
+        joinableTablesResult.target_table_info[joinableTable.target];
+      const columnId = joinableTable.join_path[0][0][1];
+      return {
+        table: { id: joinableTable.target, name: table.name },
+        column: defined(currentTableColumns.get(columnId), ({ column }) => ({
+          name: column.name,
+        })),
+      };
+    });
+    return links;
+  })();
+
+  $: linksFromOtherTables = (() => {
+    const linkedTables = joinableTables.filter((t) => t.fkey_path[0][1]);
+    const links: TableLink[] = linkedTables.map((joinableTable) => {
+      const table =
+        joinableTablesResult.target_table_info[joinableTable.target];
+      const columnId = joinableTable.join_path[0][1][1];
+      return {
+        table: { id: joinableTable.target, name: table.name },
+        column: table.columns[columnId],
+      };
+    });
+    return links;
+  })();
+
   $: showNullState = !linksInThisTable.length && !linksFromOtherTables.length;
 </script>
 
 <div class="links-section">
   {#if linksInThisTable.length}
-    <LinkSection type="in_this_table" links={linksInThisTable} />
+    <LinkSection
+      links={linksInThisTable}
+      icon={iconLinksInThisTable}
+      title={$_('in_this_table')}
+    />
   {/if}
   {#if linksFromOtherTables.length}
-    <LinkSection type="from_other_tables" links={linksFromOtherTables} />
+    <LinkSection
+      links={linksFromOtherTables}
+      icon={iconLinksFromOtherTables}
+      title={$_('from_other_tables')}
+    />
   {/if}
   {#if showNullState}
     <span class="null-text">{$_('table_does_not_link')}</span>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/links/TableLinks.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/links/TableLinks.svelte
index 32b49f3406..efeea905c3 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/links/TableLinks.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/links/TableLinks.svelte
@@ -1,31 +1,37 @@
 <script lang="ts">
+  import { api } from '@mathesar/api/rpc';
   import { Spinner } from '@mathesar/component-library';
+  import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
+  import { currentDatabase } from '@mathesar/stores/databases';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
-  import { getJoinableTablesResult } from '@mathesar/stores/tables';
+  import { getErrorMessage } from '@mathesar/utils/errors';
 
   import LinksSectionContainer from './LinksSectionContainer.svelte';
-  import { getTableLinks } from './utils';
 
   const tabularData = getTabularDataStoreFromContext();
 
   $: columns = $tabularData.processedColumns;
+
+  function getJoinableTables(databaseId: number, tableOid: number) {
+    return api.tables
+      .list_joinable({
+        database_id: databaseId,
+        table_oid: tableOid,
+        max_depth: 1,
+      })
+      .run();
+  }
 </script>
 
 <div>
-  {#await getJoinableTablesResult($tabularData.table.oid)}
+  {#await getJoinableTables($currentDatabase.id, $tabularData.table.oid)}
     <Spinner />
   {:then joinableTablesResult}
     <LinksSectionContainer
-      linksInThisTable={getTableLinks(
-        'in_this_table',
-        joinableTablesResult,
-        $columns,
-      )}
-      linksFromOtherTables={getTableLinks(
-        'from_other_tables',
-        joinableTablesResult,
-        $columns,
-      )}
+      currentTableColumns={$columns}
+      {joinableTablesResult}
     />
+  {:catch error}
+    <ErrorBox>{getErrorMessage(error)}</ErrorBox>
   {/await}
 </div>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/links/utils.ts b/mathesar_ui/src/systems/table-view/table-inspector/table/links/utils.ts
index 55b96c6950..27d1f8f4be 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/links/utils.ts
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/links/utils.ts
@@ -1,54 +1,4 @@
-import type { JoinableTablesResult } from '@mathesar/api/rpc/tables';
-import type { ProcessedColumn } from '@mathesar/stores/table-data';
-import { assertExhaustive } from '@mathesar-component-library';
-
-export type TableLinkType = 'in_this_table' | 'from_other_tables';
 export type TableLink = {
   table: { id: number; name: string };
-  column: { id: number; name: string };
+  column?: { name: string };
 };
-
-export function getTableLinks(
-  type: TableLinkType,
-  joinableTablesResult: JoinableTablesResult,
-  currentTableColumns: Map<number, ProcessedColumn>,
-): TableLink[] {
-  switch (type) {
-    case 'in_this_table': {
-      const linkedTables = joinableTablesResult.joinable_tables.filter(
-        (table) => !table.fkey_path[0][1],
-      );
-      const links: TableLink[] = linkedTables.map((table) => ({
-        table: {
-          id: table.target,
-          name: joinableTablesResult.tables[table.target].name,
-        },
-        column: {
-          id: table.join_path[0][0],
-          // The joinable_tables API will not contain the columns from the current table
-          name:
-            currentTableColumns.get(table.join_path[0][0])?.column.name || '--',
-        },
-      }));
-      return links;
-    }
-    case 'from_other_tables': {
-      const linkedTables = joinableTablesResult.joinable_tables.filter(
-        (table) => table.fkey_path[0][1],
-      );
-      const links: TableLink[] = linkedTables.map((table) => ({
-        table: {
-          id: table.target,
-          name: joinableTablesResult.tables[table.target].name,
-        },
-        column: {
-          id: table.join_path[0][1],
-          name: joinableTablesResult.columns[table.join_path[0][1]].name,
-        },
-      }));
-      return links;
-    }
-    default:
-      return assertExhaustive(type);
-  }
-}

From a2ca086e304876829f6f4e2d5e2ab6976be034ee Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 8 Aug 2024 23:20:49 +0530
Subject: [PATCH 0606/1141] fix edge case while getting joinable tables with no
 links

---
 db/sql/10_msar_joinable_tables.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/sql/10_msar_joinable_tables.sql b/db/sql/10_msar_joinable_tables.sql
index 14902fbf05..0b49dd99f1 100644
--- a/db/sql/10_msar_joinable_tables.sql
+++ b/db/sql/10_msar_joinable_tables.sql
@@ -158,7 +158,7 @@ jsonb AS $$
     SELECT jsonb_object_agg(tt_oid, tt_info) AS tt FROM target_cte
   )
   SELECT jsonb_build_object(
-    'joinable_tables', joinable_tables.jt,
-    'target_table_info', target_table_info.tt
+    'joinable_tables', COALESCE(joinable_tables.jt, '[]'::jsonb),
+    'target_table_info', COALESCE(target_table_info.tt, '{}'::jsonb)
   ) FROM joinable_tables, target_table_info;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;

From fee8db5d1bc957efec6203dde9e43f40492ed423 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 9 Aug 2024 15:25:51 +0800
Subject: [PATCH 0607/1141] add column patching SQL function

---
 db/sql/00_msar.sql | 54 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 2aa8ec5286..035d952224 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3821,3 +3821,57 @@ BEGIN
   RETURN rec_created;
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.build_update_expr(tab_id oid, rec_def jsonb) RETURNS TEXT AS $$
+SELECT
+  format(
+    'UPDATE %I.%I SET (%s) = ROW(%s)',
+    msar.get_relation_schema_name(tab_id),
+    msar.get_relation_name(tab_id),
+    string_agg(format('%I', msar.get_column_name(tab_id, key::smallint)), ', '),
+    string_agg(format('%L', value), ', ')
+  )
+FROM jsonb_each_text(rec_def);
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.patch_record_in_table(tab_id oid, rec_id anyelement, rec_def jsonb) RETURNS jsonb AS $$/*
+Modify (update/patch) a record in a table.
+
+Args:
+  tab_id: The OID of the table whose record we'll delete.
+  rec_id: The primary key value of the record we'll modify.
+  rec_patch: A JSON object defining the parts of the record to patch.
+
+Only tables with a single primary key column are supported.
+
+The `rec_def` object's form is defined by the record being updated.  It should have keys
+corresponding to the attnums of desired columns and values corresponding to values we should set.
+*/
+DECLARE
+  rec_modified jsonb;
+BEGIN
+  EXECUTE format(
+    $i$
+    WITH update_cte AS (%1$s %2$s RETURNING %3$s)
+    SELECT jsonb_build_object('results', %4$s)
+    FROM update_cte
+    $i$,
+    msar.build_update_expr(tab_id, rec_def),
+    msar.build_where_clause(
+      tab_id, jsonb_build_object(
+        'type', 'equal', 'args', jsonb_build_array(
+          jsonb_build_object('type', 'literal', 'value', rec_id),
+          jsonb_build_object('type', 'attnum', 'value', msar.get_pk_column(tab_id))
+        )
+      )
+    ),
+    msar.build_selectable_column_expr(tab_id),
+    msar.build_results_jsonb_expr(tab_id, 'update_cte')
+  ) INTO rec_modified;
+  RETURN rec_modified;
+END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;

From 64f33b65a67664bdcbf5e416c9999c22a3ba8e95 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 9 Aug 2024 15:56:40 +0800
Subject: [PATCH 0608/1141] add SQL tests for record patching

---
 db/sql/test_00_msar.sql | 44 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 556b251cc8..05d4f4c85f 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -3960,3 +3960,47 @@ BEGIN
   );
 END;
 $$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_patch_record_in_table_single() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+BEGIN
+  PERFORM __setup_add_record_table();
+  rel_id := 'atable'::regclass::oid;
+  RETURN NEXT is(
+    msar.patch_record_in_table( rel_id, 2, '{"2": 10}'),
+    '{"results": [{"1": 2, "2": 10, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]}]}'
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_patch_record_in_table_multi() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+BEGIN
+  PERFORM __setup_add_record_table();
+  rel_id := 'atable'::regclass::oid;
+  RETURN NEXT is(
+    msar.patch_record_in_table( rel_id, 2, '{"2": 10, "4": {"a": "json"}}'),
+    '{"results": [{"1": 2, "2": 10, "3": "sdflfflsk", "4": {"a": "json"}, "5": [1, 2, 3, 4]}]}'
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_patch_record_in_table_leaves_other_rows() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+  patch_result jsonb;
+BEGIN
+  PERFORM __setup_add_record_table();
+  rel_id := 'atable'::regclass::oid;
+  PERFORM msar.patch_record_in_table( rel_id, 2, '{"2": 10}');
+  RETURN NEXT results_eq(
+    'SELECT id, col1 FROM atable ORDER BY id',
+    'VALUES (1, 5), (2, 10), (3, 2)'
+  );
+END;
+$$ LANGUAGE plpgsql;

From 530664f28b7d22a5dde750e28513531b83a7a327 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 9 Aug 2024 16:07:38 +0800
Subject: [PATCH 0609/1141] add python wrapper for record patcher

---
 db/records/operations/update.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/db/records/operations/update.py b/db/records/operations/update.py
index 1c206669dd..62b797ed19 100644
--- a/db/records/operations/update.py
+++ b/db/records/operations/update.py
@@ -1,3 +1,5 @@
+import json
+from db import connection as db_conn
 from db.records.operations.select import get_record
 from db.tables.utils import get_primary_key_column
 from sqlalchemy.exc import DataError
@@ -5,6 +7,17 @@
 from db.records.exceptions import InvalidDate, InvalidDateFormat
 
 
+def patch_record_in_table(conn, record_def, record_id, table_oid):
+    """Update a record in a table."""
+    result = db_conn.exec_msar_func(
+        'patch_record_in_table',
+        table_oid,
+        record_id,
+        json.dumps(record_def)
+    ).fetchone()[0]
+    return result
+
+
 def update_record(table, engine, id_value, record_data):
     primary_key_column = get_primary_key_column(table)
     with engine.begin() as connection:

From b7feb9f19a66e2f8b588628fbffb0ea9df7d48d4 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 9 Aug 2024 21:58:01 +0800
Subject: [PATCH 0610/1141] wire up record patching to RPC endpoint

---
 db/records/operations/update.py      |  1 +
 mathesar/rpc/records.py              | 40 ++++++++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py |  5 ++++
 3 files changed, 46 insertions(+)

diff --git a/db/records/operations/update.py b/db/records/operations/update.py
index 62b797ed19..0d06bd2bb6 100644
--- a/db/records/operations/update.py
+++ b/db/records/operations/update.py
@@ -10,6 +10,7 @@
 def patch_record_in_table(conn, record_def, record_id, table_oid):
     """Update a record in a table."""
     result = db_conn.exec_msar_func(
+        conn,
         'patch_record_in_table',
         table_oid,
         record_id,
diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index 046eb55fdb..e115838f61 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -9,6 +9,7 @@
 from db.records.operations import delete as record_delete
 from db.records.operations import insert as record_insert
 from db.records.operations import select as record_select
+from db.records.operations import update as record_update
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
 
@@ -286,6 +287,45 @@ def add(
     return RecordAdded.from_dict(record_info)
 
 
+@rpc_method(name="records.patch")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def patch(
+        *,
+        record_def: dict,
+        record_id: Any,
+        table_oid: int,
+        database_id: int,
+        **kwargs
+) -> RecordAdded:
+    """
+    Modify a record in a table.
+
+    The form of the `record_def` is determined by the underlying table.  Keys
+    should be attnums, and values should be the desired value for that column in
+    the modified record. Explicit `null` values will set null for that value
+    (with obvious exceptions where that would violate some constraint).
+
+    Args:
+        record_def: An object representing the record to be added.
+        record_id: The primary key value of the record to modify.
+        table_oid: Identity of the table in the user's database.
+        database_id: The Django id of the database containing the table.
+
+    Returns:
+        The modified record, along with some metadata.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        record_info = record_update.patch_record_in_table(
+            conn,
+            record_def,
+            record_id,
+            table_oid,
+        )
+    return RecordAdded.from_dict(record_info)
+
+
 @rpc_method(name="records.delete")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 7b61ac8de4..081f0743bf 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -159,6 +159,11 @@
         "records.add",
         [user_is_authenticated]
     ),
+    (
+        records.patch,
+        "records.patch",
+        [user_is_authenticated]
+    ),
     (
         records.delete,
         "records.delete",

From 67d74ae7ce8846d68e073b1445a34234377ed40a Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 9 Aug 2024 22:03:08 +0800
Subject: [PATCH 0611/1141] add wiring test for record patching func

---
 mathesar/tests/rpc/test_records.py | 48 ++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/mathesar/tests/rpc/test_records.py b/mathesar/tests/rpc/test_records.py
index 150e7ec12d..c1f3fea2ef 100644
--- a/mathesar/tests/rpc/test_records.py
+++ b/mathesar/tests/rpc/test_records.py
@@ -162,6 +162,54 @@ def mock_add_record(
     assert actual_record == expect_record
 
 
+def test_records_add(rf, monkeypatch):
+    username = 'alice'
+    password = 'pass1234'
+    record_id = 243
+    table_oid = 23457
+    database_id = 2
+    record_def = {"2": "arecord"}
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=username, password=password)
+
+    @contextmanager
+    def mock_connect(_database_id, user):
+        if _database_id == database_id and user.username == username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_patch_record(
+            conn,
+            _record_def,
+            _record_id,
+            _table_oid,
+    ):
+        if _table_oid != table_oid or _record_def != record_def or _record_id != record_id:
+            raise AssertionError('incorrect parameters passed')
+        return {
+            "results": [_record_def | {"3": "another"}],
+        }
+
+    monkeypatch.setattr(records, 'connect', mock_connect)
+    monkeypatch.setattr(records.record_update, 'patch_record_in_table', mock_patch_record)
+    expect_record = {
+        "results": [record_def | {"3": "another"}],
+        "preview_data": [],
+    }
+    actual_record = records.patch(
+        record_def=record_def,
+        record_id=record_id,
+        table_oid=table_oid,
+        database_id=database_id,
+        request=request
+    )
+    assert actual_record == expect_record
+
+
 def test_records_delete(rf, monkeypatch):
     username = 'alice'
     password = 'pass1234'

From f0367ad1105d0b3219ef153f75856ca26a8b80f8 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 9 Aug 2024 22:04:30 +0800
Subject: [PATCH 0612/1141] wire up docs for record patching

---
 docs/docs/api/rpc.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 31f27e0538..fd58ec880e 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -184,6 +184,7 @@ To use an RPC function:
       - list_
       - get
       - add
+      - patch
       - delete
       - search
       - RecordList

From b8906a032abe7d07c0b16494a7dff0902dbedef5 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 9 Aug 2024 22:10:29 +0800
Subject: [PATCH 0613/1141] fix copy-pasted naming mistake

---
 mathesar/tests/rpc/test_records.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/tests/rpc/test_records.py b/mathesar/tests/rpc/test_records.py
index c1f3fea2ef..14bfbe5f74 100644
--- a/mathesar/tests/rpc/test_records.py
+++ b/mathesar/tests/rpc/test_records.py
@@ -162,7 +162,7 @@ def mock_add_record(
     assert actual_record == expect_record
 
 
-def test_records_add(rf, monkeypatch):
+def test_records_patch(rf, monkeypatch):
     username = 'alice'
     password = 'pass1234'
     record_id = 243

From 3833eaef40032caf68cfdffa5f5b5da5e052bfa9 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 9 Aug 2024 23:54:07 +0530
Subject: [PATCH 0614/1141] implement database_privileges.list_direct

---
 config/settings/common_settings.py   |  1 +
 db/roles/operations/select.py        |  4 +++
 db/sql/00_msar.sql                   | 39 ++++++++++++++++++++--
 docs/docs/api/rpc.md                 |  8 +++++
 mathesar/rpc/database_privileges.py  | 48 ++++++++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py |  6 ++++
 6 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 mathesar/rpc/database_privileges.py

diff --git a/config/settings/common_settings.py b/config/settings/common_settings.py
index 9c5c8d0f87..c36fd7e41a 100644
--- a/config/settings/common_settings.py
+++ b/config/settings/common_settings.py
@@ -71,6 +71,7 @@ def pipe_delim(pipe_string):
     'mathesar.rpc.constraints',
     'mathesar.rpc.columns',
     'mathesar.rpc.columns.metadata',
+    'mathesar.rpc.database_privileges',
     'mathesar.rpc.database_setup',
     'mathesar.rpc.databases',
     'mathesar.rpc.records',
diff --git a/db/roles/operations/select.py b/db/roles/operations/select.py
index 46ea86526c..7e22e0f3b2 100644
--- a/db/roles/operations/select.py
+++ b/db/roles/operations/select.py
@@ -3,3 +3,7 @@
 
 def get_roles(conn):
     return exec_msar_func(conn, 'get_roles').fetchone()[0]
+
+
+def list_db_priv(db_name, conn):
+    return exec_msar_func(conn, 'list_db_priv', db_name).fetchone()[0]
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 18ee8ea129..8f5676c715 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -153,6 +153,15 @@ Wraps the `?` jsonb operator for improved readability.
 $$ LANGUAGE plpgsql;
 
 
+CREATE OR REPLACE FUNCTION msar.get_db_oid(db_name text) RETURNS oid AS $$/*
+Given a database name, returns its oid.
+*/
+  SELECT pgd.oid
+  FROM pg_catalog.pg_database pgd
+  WHERE pgd.datname=db_name;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
 CREATE OR REPLACE FUNCTION msar.schema_exists(schema_name text) RETURNS boolean AS $$/*
 Return true if the schema exists, false otherwise.
 
@@ -894,7 +903,7 @@ FROM (
     s.oid,
     s.nspname
 ) AS schema_data;
-$$ LANGUAGE sql;
+$$ LANGUAGE SQL;
 
 
 CREATE OR REPLACE FUNCTION msar.get_roles() RETURNS jsonb AS $$/*
@@ -945,7 +954,33 @@ FROM (
     LEFT OUTER JOIN rolemembers ON r.oid = rolemembers.oid
   WHERE r.rolname NOT LIKE 'pg_%'
 ) AS role_data;
-$$ LANGUAGE sql;
+$$ LANGUAGE SQL STABLE;
+
+
+CREATE OR REPLACE FUNCTION msar.list_db_priv(db_name text) RETURNS jsonb AS $$/*
+Given a database name, returns a json array of objects with database privileges for non-inherited roles.
+
+Each returned JSON object in the array has the form:
+  {
+    "role_oid": <int>,
+    "direct" [<str>]
+  }
+*/
+WITH priv_cte AS (
+  SELECT
+    jsonb_build_object(
+      'role_oid', pgr.oid,
+      'direct',  jsonb_agg(acl.privilege_type)
+    ) AS p
+  FROM
+    pg_catalog.pg_roles AS pgr,
+    pg_catalog.pg_database AS pgd,
+    aclexplode(COALESCE(pgd.datacl, acldefault('d', pgd.datdba))) AS acl
+  WHERE pgd.oid=msar.get_db_oid(db_name) AND pgr.oid = acl.grantee AND pgr.rolname NOT LIKE 'pg_'
+  GROUP BY pgr.oid, pgd.oid
+)
+SELECT COALESCE(jsonb_agg(priv_cte.p), '[]'::jsonb) FROM priv_cte;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
 ----------------------------------------------------------------------------------------------------
diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 25f5a4d253..00c0ba7f90 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -77,6 +77,14 @@ To use an RPC function:
       - list_
       - DatabaseInfo
 
+## Database Privileges
+
+::: database_privileges
+    options:
+      members:
+      - list_direct
+      - DBPrivileges
+
 ## Database Setup
 
 ::: database_setup
diff --git a/mathesar/rpc/database_privileges.py b/mathesar/rpc/database_privileges.py
new file mode 100644
index 0000000000..b45e7714f4
--- /dev/null
+++ b/mathesar/rpc/database_privileges.py
@@ -0,0 +1,48 @@
+from typing import TypedDict
+
+from modernrpc.core import rpc_method, REQUEST_KEY
+from modernrpc.auth.basic import http_basic_auth_login_required
+
+from db.roles.operations.select import list_db_priv
+from mathesar.rpc.utils import connect
+from mathesar.models.base import Database
+from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+
+
+class DBPrivileges(TypedDict):
+    """
+    Information about database privileges.
+
+    Attributes:
+        role_oid: The `oid` of the role on the database server.
+        direct: A list of database privileges for the afforementioned role_oid.
+    """
+    role_oid: int
+    direct: list[str]
+
+    @classmethod
+    def from_dict(cls, d):
+        return cls(
+            role_oid=d["role_oid"],
+            direct=d["direct"]
+        )
+
+
+@rpc_method('database_privileges.list_direct')
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def list_direct(*, database_id: int, **kwargs) -> list[DBPrivileges]:
+    """
+    List database privileges for non-inherited roles.
+
+    Args:
+        database_id: The Django id of the database.
+
+    Returns:
+        A list of database privileges.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        db_name = Database.objects.get(id=database_id).name
+        raw_db_priv = list_db_priv(db_name, conn)
+    return [DBPrivileges.from_dict(i) for i in raw_db_priv]
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 04899cde75..14396110c2 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -13,6 +13,7 @@
 from mathesar.rpc import configured_roles
 from mathesar.rpc import connections
 from mathesar.rpc import constraints
+from mathesar.rpc import database_privileges
 from mathesar.rpc import database_setup
 from mathesar.rpc import databases
 from mathesar.rpc import explorations
@@ -129,6 +130,11 @@
         "constraints.delete",
         [user_is_authenticated]
     ),
+    (
+        database_privileges.list_direct,
+        "database_privileges.list_direct",
+        [user_is_authenticated]
+    ),
     (
         database_setup.create_new,
         "database_setup.create_new",

From 4cefbdc850dd5c9c9cf9cbfdf127d9f9264003af Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 9 Aug 2024 23:57:40 +0530
Subject: [PATCH 0615/1141] fix endpoint name

---
 mathesar/rpc/database_privileges.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/rpc/database_privileges.py b/mathesar/rpc/database_privileges.py
index b45e7714f4..8835d793bd 100644
--- a/mathesar/rpc/database_privileges.py
+++ b/mathesar/rpc/database_privileges.py
@@ -28,7 +28,7 @@ def from_dict(cls, d):
         )
 
 
-@rpc_method('database_privileges.list_direct')
+@rpc_method(name="database_privileges.list_direct")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
 def list_direct(*, database_id: int, **kwargs) -> list[DBPrivileges]:

From eb0df8d031cbc94a992ef087de109cc4adeab8bd Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 12 Aug 2024 17:19:47 +0800
Subject: [PATCH 0616/1141] add aggregation step to collect result indices

---
 db/sql/00_msar.sql      | 77 +++++++++++++++++++++++-----------
 db/sql/test_00_msar.sql | 92 +++++++++++++++++++++++++++--------------
 2 files changed, 114 insertions(+), 55 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 035d952224..0e9d39382b 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3502,13 +3502,16 @@ $$ LANGUAGE SQL STABLE;
 
 
 CREATE OR REPLACE FUNCTION
-msar.build_results_jsonb_expr(tab_id oid, cte_name text) RETURNS TEXT AS $$/*
+msar.build_results_jsonb_expr(tab_id oid, cte_name text, order_ jsonb) RETURNS TEXT AS $$/*
 Build an SQL expresson string that, when added to the record listing query, produces a JSON array
 with the records resulting from the request.
 */
-SELECT 'coalesce(jsonb_agg(json_build_object('
+SELECT format(
+  'coalesce(jsonb_agg(json_build_object('
   || string_agg(format('%1$L, %2$I.%1$I', attnum, cte_name), ', ')
-  || ')), jsonb_build_array())'
+  || ') %1$s), jsonb_build_array())',
+  msar.build_order_by_expr(tab_id, order_)
+)
 FROM pg_catalog.pg_attribute
 WHERE
   attrelid = tab_id
@@ -3519,23 +3522,16 @@ $$ LANGUAGE SQL STABLE;
 
 
 CREATE OR REPLACE FUNCTION
-msar.build_grouping_results_jsonb_expr(tab_id oid, cte_name text, group_ jsonb) RETURNS TEXT AS $$/*
-Build an SQL expresson string that, when added to the record listing query, produces a JSON array
-with the groups resulting from the request.
+msar.build_groups_cte_expr(tab_id oid, cte_name text, group_ jsonb) RETURNS TEXT AS $$/*
 */
 SELECT format(
   $gj$
-    jsonb_build_object(
-      'columns', %3$L::jsonb,
-      'preproc', %4$L::jsonb,
-      'groups', jsonb_agg(
-        DISTINCT jsonb_build_object(
-          'id', %2$I.__mathesar_gid,
-          'count', %2$I.__mathesar_gcount,
-          'results_eq', jsonb_build_object(%1$s)
-        )
-      )
-    )
+    __mathesar_gid AS id,
+    __mathesar_gcount AS count,
+    jsonb_build_object(%1$s) AS results_eq,
+    jsonb_agg(%2$I) AS result_indices
+  FROM %3$I
+  GROUP BY id, count, results_eq
   $gj$,
   string_agg(
     format(
@@ -3548,9 +3544,8 @@ SELECT format(
     ),
     ', ' ORDER BY ordinality
   ),
-  cte_name,
-  group_ ->> 'columns',
-  group_ ->> 'preproc'
+  msar.get_pk_column(tab_id),
+  cte_name
 )
 FROM msar.expr_templates RIGHT JOIN ROWS FROM(
   jsonb_array_elements_text(group_ -> 'columns'),
@@ -3560,6 +3555,33 @@ WHERE has_column_privilege(tab_id, col_id::smallint, 'SELECT');
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION
+msar.build_grouping_results_jsonb_expr(tab_id oid, cte_name text, group_ jsonb) RETURNS TEXT AS $$/*
+Build an SQL expresson string that, when added to the record listing query, produces a JSON array
+with the groups resulting from the request.
+*/
+SELECT format(
+  $gj$
+  jsonb_build_object(
+    'columns', %2$L::jsonb,
+    'preproc', %3$L::jsonb,
+    'groups', jsonb_agg(
+      DISTINCT jsonb_build_object(
+        'id', %1$I.id,
+        'count', %1$I.count,
+        'results_eq', %1$I.results_eq,
+        'result_indices', %1$I.result_indices
+      )
+    )
+  )
+  $gj$,
+  cte_name,
+  group_ ->> 'columns',
+  group_ ->> 'preproc'
+)
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
 CREATE OR REPLACE FUNCTION
 msar.build_selectable_column_expr(tab_id oid) RETURNS text AS $$/*
 Build an SQL select-target expression of only columns to which the user has access.
@@ -3613,6 +3635,8 @@ BEGIN
       SELECT count(1) AS count FROM %2$I.%3$I %7$s
     ), enriched_results_cte AS (
       SELECT %1$s, %8$s FROM %2$I.%3$I %7$s %6$s LIMIT %4$L OFFSET %5$L
+    ), groups_cte as (
+      SELECT %11$s
     )
     SELECT jsonb_build_object(
       'results', %9$s,
@@ -3620,7 +3644,9 @@ BEGIN
       'grouping', %10$s,
       'query', $iq$SELECT %1$s FROM %2$I.%3$I %7$s %6$s LIMIT %4$L OFFSET %5$L$iq$
     )
-    FROM enriched_results_cte, count_cte
+    FROM enriched_results_cte
+      LEFT JOIN groups_cte ON enriched_results_cte.__mathesar_gid = groups_cte.id
+      CROSS JOIN count_cte
     $q$,
     msar.build_selectable_column_expr(tab_id),
     msar.get_relation_schema_name(tab_id),
@@ -3630,8 +3656,9 @@ BEGIN
     msar.build_order_by_expr(tab_id, order_),
     msar.build_where_clause(tab_id, filter_),
     msar.build_grouping_expr(tab_id, group_),
-    msar.build_results_jsonb_expr(tab_id, 'enriched_results_cte'),
-    COALESCE(msar.build_grouping_results_jsonb_expr(tab_id, 'enriched_results_cte', group_), 'NULL')
+    msar.build_results_jsonb_expr(tab_id, 'enriched_results_cte', order_),
+    COALESCE(msar.build_grouping_results_jsonb_expr(tab_id, 'groups_cte', group_), 'NULL'),
+    COALESCE(msar.build_groups_cte_expr(tab_id, 'enriched_results_cte', group_), 'NULL AS id')
   ) INTO records;
   RETURN records;
 END;
@@ -3816,7 +3843,7 @@ BEGIN
     $i$,
     msar.build_single_insert_expr(tab_id, rec_def),
     msar.build_selectable_column_expr(tab_id),
-    msar.build_results_jsonb_expr(tab_id, 'insert_cte')
+    msar.build_results_jsonb_expr(tab_id, 'insert_cte', null)
   ) INTO rec_created;
   RETURN rec_created;
 END;
@@ -3870,7 +3897,7 @@ BEGIN
       )
     ),
     msar.build_selectable_column_expr(tab_id),
-    msar.build_results_jsonb_expr(tab_id, 'update_cte')
+    msar.build_results_jsonb_expr(tab_id, 'update_cte', null)
   ) INTO rec_modified;
   RETURN rec_modified;
 END;
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 05d4f4c85f..126c24c192 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2901,27 +2901,27 @@ CREATE TABLE "Customers" (
 );
 ALTER TABLE "Customers" DROP COLUMN "dropmeee 1";
 INSERT INTO "Customers" ("First Name", "Last Name", "Subscription Date") VALUES
-  ('Aaron', 'Adams', '2020-03-21'),
-  ('Abigail', 'Acosta', '2020-04-16'),
-  ('Aaron', 'Adams', '2020-04-29'),
-  ('Abigail', 'Adams', '2020-05-29'),
-  ('Abigail', 'Abbott', '2020-07-05'),
-  ('Aaron', 'Adkins', '2020-08-16'),
-  ('Aaron', 'Acevedo', '2020-10-29'),
-  ('Abigail', 'Abbott', '2020-10-30'),
-  ('Abigail', 'Adams', '2021-02-14'),
-  ('Abigail', 'Acevedo', '2021-03-29'),
-  ('Aaron', 'Acosta', '2021-04-13'),
-  ('Aaron', 'Adams', '2021-06-30'),
-  ('Abigail', 'Adkins', '2021-09-12'),
-  ('Aaron', 'Adams', '2021-11-11'),
-  ('Abigail', 'Abbott', '2021-11-30'),
-  ('Aaron', 'Acevedo', '2022-02-04'),
-  ('Aaron', 'Adkins', '2022-03-10'),
-  ('Abigail', 'Abbott', '2022-03-23'),
-  ('Abigail', 'Adkins', '2022-03-27'),
-  ('Abigail', 'Abbott', '2022-04-29'),
-  ('Abigail', 'Adams', '2022-05-24');
+  ('Aaron', 'Adams', '2020-03-21'),     --  1
+  ('Abigail', 'Acosta', '2020-04-16'),  --  2
+  ('Aaron', 'Adams', '2020-04-29'),     --  3
+  ('Abigail', 'Adams', '2020-05-29'),   --  4
+  ('Abigail', 'Abbott', '2020-07-05'),  --  5
+  ('Aaron', 'Adkins', '2020-08-16'),    --  6
+  ('Aaron', 'Acevedo', '2020-10-29'),   --  7
+  ('Abigail', 'Abbott', '2020-10-30'),  --  8
+  ('Abigail', 'Adams', '2021-02-14'),   --  9
+  ('Abigail', 'Acevedo', '2021-03-29'), -- 10
+  ('Aaron', 'Acosta', '2021-04-13'),    -- 11
+  ('Aaron', 'Adams', '2021-06-30'),     -- 12
+  ('Abigail', 'Adkins', '2021-09-12'),  -- 13
+  ('Aaron', 'Adams', '2021-11-11'),     -- 14
+  ('Abigail', 'Abbott', '2021-11-30'),  -- 15
+  ('Aaron', 'Acevedo', '2022-02-04'),   -- 16
+  ('Aaron', 'Adkins', '2022-03-10'),    -- 17
+  ('Abigail', 'Abbott', '2022-03-23'),  -- 18
+  ('Abigail', 'Adkins', '2022-03-27'),  -- 19
+  ('Abigail', 'Abbott', '2022-04-29'),  -- 20
+  ('Abigail', 'Adams', '2022-05-24');   -- 21
 END;
 $$ LANGUAGE plpgsql;
 
@@ -3100,11 +3100,36 @@ BEGIN
         "columns": [3, 2],
         "preproc": null,
         "groups": [
-          {"id": 1, "count": 5, "results_eq": {"2": "Abigail", "3": "Abbott"}},
-          {"id": 2, "count": 2, "results_eq": {"2": "Aaron", "3": "Acevedo"}},
-          {"id": 3, "count": 1, "results_eq": {"2": "Abigail", "3": "Acevedo"}},
-          {"id": 4, "count": 1, "results_eq": {"2": "Aaron", "3": "Acosta"}},
-          {"id": 5, "count": 1, "results_eq": {"2": "Abigail", "3": "Acosta"}}
+          {
+            "id": 1,
+            "count": 5,
+            "results_eq": {"2": "Abigail", "3": "Abbott"},
+            "result_indices": [5, 8, 15, 18, 20]
+          },
+          {
+            "id": 2,
+            "count": 2,
+            "results_eq": {"2": "Aaron", "3": "Acevedo"},
+            "result_indices": [7, 16]
+          },
+          {
+            "id": 3,
+            "count": 1,
+            "results_eq": {"2": "Abigail", "3": "Acevedo"},
+            "result_indices": [10]
+          },
+          {
+            "id": 4,
+            "count": 1,
+            "results_eq": {"2": "Aaron", "3": "Acosta"},
+            "result_indices": [11]
+          },
+          {
+            "id": 5,
+            "count": 1,
+            "results_eq": {"2": "Abigail", "3": "Acosta"},
+            "result_indices": [2]
+          }
         ]
       }
     }$j$ || jsonb_build_object(
@@ -3135,7 +3160,12 @@ BEGIN
         "columns": [3, 2],
         "preproc": null,
         "groups": [
-          {"id": 1, "count": 5, "results_eq": {"2": "Abigail", "3": "Abbott"}}
+          {
+            "id": 1,
+            "count": 5,
+            "results_eq": {"2": "Abigail", "3": "Abbott"},
+            "result_indices": [5, 8, 15]
+          }
         ]
       }
     }$j$ || jsonb_build_object(
@@ -3166,8 +3196,8 @@ BEGIN
         "columns": [4],
         "preproc": ["truncate_to_month"],
         "groups": [
-          {"id": 1, "count": 1, "results_eq": {"4": "2020-03 AD"}},
-          {"id": 2, "count": 2, "results_eq": {"4": "2020-04 AD"}}
+          {"id": 1, "count": 1, "results_eq": {"4": "2020-03 AD"}, "result_indices": [1]},
+          {"id": 2, "count": 2, "results_eq": {"4": "2020-04 AD"}, "result_indices": [2, 3]}
         ]
       }
     }$j$ || jsonb_build_object(
@@ -3199,7 +3229,9 @@ BEGIN
       "grouping": {
         "columns": [4],
         "preproc": ["truncate_to_year"],
-        "groups": [{"id": 1, "count": 8, "results_eq": {"4": "2020 AD"}}]
+        "groups": [
+          {"id": 1, "count": 8, "results_eq": {"4": "2020 AD"}, "result_indices": [1, 2, 3, 4, 5]}
+        ]
       }
     }$j$ || jsonb_build_object(
       'query', concat(

From 8ac46c7582fdbfbabb2839e9241d48dd6e8c5651 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 12 Aug 2024 17:54:59 +0800
Subject: [PATCH 0617/1141] update documentation to represent new behavior

---
 mathesar/rpc/records.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index e115838f61..b34359e8f5 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -81,6 +81,8 @@ class Grouping(TypedDict):
     """
     Grouping definition.
 
+    The table involved must have a single column primary key.
+
     Attributes:
         columns: The columns to be grouped by.
         preproc: The preprocessing funtions to apply (if any).
@@ -93,14 +95,21 @@ class Group(TypedDict):
     """
     Group definition.
 
+    Note that the `count` is over all rows in the group, whether returned
+    or not. However, `result_indices` is restricted to only the rows
+    returned. This is to avoid potential problems if there are many rows
+    in the group (e.g., the whole table), but we only return a few.
+
     Attributes:
         id: The id of the group. Consistent for same input.
         count: The number of items in the group.
         results_eq: The value the results of the group equal.
+        result_indices: The primary key values of group members.
     """
     id: int
     count: int
     results_eq: list[dict]
+    result_indices: list[Any]
 
 
 class GroupingResponse(TypedDict):

From 51269888d2a5ff807e6f65691abc2ce6428112ee Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Mon, 12 Aug 2024 15:30:49 +0530
Subject: [PATCH 0618/1141] filter using datname instead of oid

---
 db/sql/00_msar.sql | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 8f5676c715..aef5107aa7 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -153,15 +153,6 @@ Wraps the `?` jsonb operator for improved readability.
 $$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION msar.get_db_oid(db_name text) RETURNS oid AS $$/*
-Given a database name, returns its oid.
-*/
-  SELECT pgd.oid
-  FROM pg_catalog.pg_database pgd
-  WHERE pgd.datname=db_name;
-$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
-
-
 CREATE OR REPLACE FUNCTION msar.schema_exists(schema_name text) RETURNS boolean AS $$/*
 Return true if the schema exists, false otherwise.
 
@@ -976,7 +967,7 @@ WITH priv_cte AS (
     pg_catalog.pg_roles AS pgr,
     pg_catalog.pg_database AS pgd,
     aclexplode(COALESCE(pgd.datacl, acldefault('d', pgd.datdba))) AS acl
-  WHERE pgd.oid=msar.get_db_oid(db_name) AND pgr.oid = acl.grantee AND pgr.rolname NOT LIKE 'pg_'
+  WHERE pgd.datname = db_name AND pgr.oid = acl.grantee AND pgr.rolname NOT LIKE 'pg_'
   GROUP BY pgr.oid, pgd.oid
 )
 SELECT COALESCE(jsonb_agg(priv_cte.p), '[]'::jsonb) FROM priv_cte;

From 0b6761acdb77ca66e0bd41bc530d4d791df2078d Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 12 Aug 2024 23:12:48 +0530
Subject: [PATCH 0619/1141] Move database page contents into schema section
 within db page

---
 mathesar/urls.py                              |  2 +-
 mathesar_ui/src/App.svelte                    | 18 ++--
 .../src/components/AppSecondaryHeader.svelte  | 13 +--
 .../src/components/PageTitleAndMeta.svelte    | 17 ++--
 mathesar_ui/src/i18n/languages/en/dict.json   |  4 +
 .../src/pages/database/DatabasePage.svelte    | 84 +++++++++++++++--
 ...seDetails.svelte => SchemasSection.svelte} | 94 +------------------
 .../src/pages/database/SettingsSection.svelte |  0
 .../src/pages/schema/SchemaPage.svelte        |  2 -
 mathesar_ui/src/routes/AdminRoute.svelte      |  1 -
 mathesar_ui/src/routes/DatabaseRoute.svelte   | 17 +++-
 mathesar_ui/src/routes/urls.ts                | 10 +-
 12 files changed, 123 insertions(+), 139 deletions(-)
 rename mathesar_ui/src/pages/database/{DatabaseDetails.svelte => SchemasSection.svelte} (64%)
 create mode 100644 mathesar_ui/src/pages/database/SettingsSection.svelte

diff --git a/mathesar/urls.py b/mathesar/urls.py
index 1daba441f7..3a8d1d7c4c 100644
--- a/mathesar/urls.py
+++ b/mathesar/urls.py
@@ -60,7 +60,7 @@
     path('db/<database_id>/', views.schemas, name='schemas'),
     path('i18n/', include('django.conf.urls.i18n')),
     re_path(
-        r'^db/(?P<database_id>\w+)/(?P<schema_id>\w+)/',
+        r'^db/(?P<database_id>\w+)/schemas/(?P<schema_id>\w+)/',
         views.schemas_home,
         name='schema_home'
     ),
diff --git a/mathesar_ui/src/App.svelte b/mathesar_ui/src/App.svelte
index a0b1812e01..d4317163e0 100644
--- a/mathesar_ui/src/App.svelte
+++ b/mathesar_ui/src/App.svelte
@@ -56,15 +56,15 @@
     --color-text-muted: #6b7280;
     --color-substring-match: rgb(254, 221, 72);
     --color-substring-match-light: rgba(254, 221, 72, 0.2);
-    --text-size-xx-small: var(--size-xx-small); // 8px
-    --text-size-x-small: var(--size-x-small); // 10px
-    --text-size-small: var(--size-small); // 12px
-    --text-size-base: var(--size-base); // 14px
-    --text-size-large: var(--size-large); // 16px
-    --text-size-x-large: var(--size-x-large); // 18px
-    --text-size-xx-large: var(--size-xx-large); // 20px
-    --text-size-ultra-large: var(--size-ultra-large); // 24px
-    --text-size-super-ultra-large: var(--size-super-ultra-large); // 32px
+    --text-size-xx-small: var(--size-xx-small);
+    --text-size-x-small: var(--size-x-small);
+    --text-size-small: var(--size-small);
+    --text-size-base: var(--size-base);
+    --text-size-large: var(--size-large);
+    --text-size-x-large: var(--size-x-large);
+    --text-size-xx-large: var(--size-xx-large);
+    --text-size-ultra-large: var(--size-ultra-large);
+    --text-size-super-ultra-large: var(--size-super-ultra-large);
 
     --modal-z-index: 50;
     --modal-record-selector-z-index: 50;
diff --git a/mathesar_ui/src/components/AppSecondaryHeader.svelte b/mathesar_ui/src/components/AppSecondaryHeader.svelte
index 72d242b98d..602ab86476 100644
--- a/mathesar_ui/src/components/AppSecondaryHeader.svelte
+++ b/mathesar_ui/src/components/AppSecondaryHeader.svelte
@@ -5,14 +5,9 @@
 
   export let pageTitleAndMetaProps: ComponentProps<PageTitleAndMeta>;
   export let restrictWidth = true;
-  export let theme: 'dark' | 'light' | undefined = undefined;
 </script>
 
-<div
-  class="container"
-  class:theme-dark={theme === 'dark'}
-  class:theme-light={theme === 'light'}
->
+<div class="container">
   <div class="content" class:restrict-width={restrictWidth}>
     <div class="page-title-and-meta-container">
       <PageTitleAndMeta {...pageTitleAndMetaProps}>
@@ -24,11 +19,7 @@
 </div>
 
 <style>
-  .theme-dark {
-    background-color: var(--slate-500);
-    color: var(--white);
-  }
-  .theme-light {
+  .container {
     background-color: var(--sand-200);
   }
   .content {
diff --git a/mathesar_ui/src/components/PageTitleAndMeta.svelte b/mathesar_ui/src/components/PageTitleAndMeta.svelte
index f677527dec..8be3f265d7 100644
--- a/mathesar_ui/src/components/PageTitleAndMeta.svelte
+++ b/mathesar_ui/src/components/PageTitleAndMeta.svelte
@@ -3,8 +3,8 @@
   import type { IconProps } from '@mathesar-component-library-dir/icon/IconTypes';
 
   export let icon: IconProps;
-  export let type: string | undefined = undefined;
   export let name: string;
+  export let description: string | undefined = undefined;
 </script>
 
 <div class="container">
@@ -15,10 +15,10 @@
           <Icon {...icon} size="2em" />
         </div>
         <div class="left-meta-container">
-          {#if type}
-            <span class="entity-type">{type}</span>
-          {/if}
           <span class="entity-name">{name}</span>
+          {#if description}
+            <span class="entity-description">{description}</span>
+          {/if}
         </div>
       </div>
     </div>
@@ -64,17 +64,12 @@
     display: flex;
     flex-direction: column;
     margin-left: 0.75rem;
-  }
-
-  .entity-type {
-    font-size: var(--text-size-small);
-    font-weight: 600;
-    text-transform: uppercase;
+    gap: var(--size-super-ultra-small);
   }
 
   .entity-name {
     font-weight: 500;
-    font-size: var(--text-size-ultra-large);
+    font-size: var(--text-size-xx-large);
     line-height: 1;
   }
 </style>
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index ffc63e4e3d..7843238c83 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -131,6 +131,7 @@
   "database": "Database",
   "database_name": "Database Name",
   "database_not_found": "Database with id [connectionId] is not found.",
+  "database_permissions": "Database Permissions",
   "database_server_credentials": "Database server credentials",
   "database_type": "Database Type",
   "databases": "Databases",
@@ -148,6 +149,7 @@
   "delete_connection_db_delete_info": "If you would like to delete the database too, you will need to do so from outside Mathesar by deleting it directly in PostgreSQL.",
   "delete_connection_info": "The database will not be deleted and will still be accessible outside Mathesar. You may choose to reconnect to it in the future; however, upon disconnecting you will lose Mathesar-specific metadata such as saved explorations, customized column display options, and customized record summary templates.",
   "delete_connection_with_name": "Delete [connectionName] Database Connection?",
+  "delete_database": "Delete Database",
   "delete_exploration": "Delete Exploration",
   "delete_import": "Delete Import",
   "delete_item": "Delete {item}",
@@ -168,6 +170,7 @@
   "disallow_null_values_help": "Enable this option to prevent null values in the column. Null values are empty values that are not the same as zero or an empty string.",
   "discard_changes": "Discard Changes",
   "disconnect": "Disconnect",
+  "disconnect_database": "Disconnect Database",
   "display_language": "Display Language",
   "display_name": "Display Name",
   "documentation_and_resources": "Documentation & Resources",
@@ -470,6 +473,7 @@
   "select_user": "Select User",
   "set_constraint_name": "Set Constraint Name",
   "set_to": "Set to",
+  "settings": "Settings",
   "setup_connections_help": "Seems you haven't set up any databases. To use Mathesar, you'll need to connect one.",
   "share": "Share",
   "share_exploration": "Share Exploration",
diff --git a/mathesar_ui/src/pages/database/DatabasePage.svelte b/mathesar_ui/src/pages/database/DatabasePage.svelte
index b4f2d16aff..37ad749074 100644
--- a/mathesar_ui/src/pages/database/DatabasePage.svelte
+++ b/mathesar_ui/src/pages/database/DatabasePage.svelte
@@ -1,11 +1,49 @@
 <script lang="ts">
+  import { _ } from 'svelte-i18n';
+
   import type { Database } from '@mathesar/api/rpc/databases';
+  import AppSecondaryHeader from '@mathesar/components/AppSecondaryHeader.svelte';
+  import {
+    iconDatabase,
+    iconDeleteMajor,
+    iconMoreActions,
+  } from '@mathesar/icons';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
+  import {
+    getDatabasePageSchemasSectionUrl,
+    getDatabasePageSettingsSectionUrl,
+  } from '@mathesar/routes/urls';
+  import {
+    Button,
+    ButtonMenuItem,
+    DropdownMenu,
+    TabContainer,
+  } from '@mathesar-component-library';
 
-  import DatabaseDetails from './DatabaseDetails.svelte';
+  import SchemasSection from './SchemasSection.svelte';
+  import SettingsSection from './SettingsSection.svelte';
 
   export let database: Database;
+  export let section: string;
+
+  $: tabs = [
+    {
+      id: 'schemas',
+      label: $_('schemas'),
+      href: getDatabasePageSchemasSectionUrl(database.id),
+    },
+    {
+      id: 'settings',
+      label: $_('settings'),
+      href: getDatabasePageSettingsSectionUrl(database.id),
+    },
+  ];
+  $: activeTab = tabs.find((tab) => tab.id === section) ?? tabs[0];
+
+  function openPermissionsModal() {
+    //
+  }
 </script>
 
 <svelte:head>
@@ -13,14 +51,46 @@
 </svelte:head>
 
 <LayoutWithHeader
-  restrictWidth={true}
+  restrictWidth
   cssVariables={{
-    '--layout-background-color': 'var(--sand-100)',
     '--max-layout-width': 'var(--max-layout-width-console-pages)',
-    '--AppSecondaryHeader__padding': 'var(--size-x-large) 0',
   }}
 >
-  {#key database.id}
-    <DatabaseDetails {database} />
-  {/key}
+  <AppSecondaryHeader
+    slot="secondary-header"
+    pageTitleAndMetaProps={{
+      name: database.name,
+      icon: iconDatabase,
+      description: `DB server: ${database.server_host}:${database.server_port}`,
+    }}
+  >
+    <div slot="action">
+      <Button on:click={openPermissionsModal} appearance="secondary">
+        <span>{$_('database_permissions')}</span>
+      </Button>
+
+      <DropdownMenu
+        showArrow={false}
+        triggerAppearance="plain"
+        closeOnInnerClick={false}
+        icon={iconMoreActions}
+        preferredPlacement="bottom-end"
+      >
+        <ButtonMenuItem icon={iconDeleteMajor}>
+          {$_('disconnect_database')}
+        </ButtonMenuItem>
+        <ButtonMenuItem icon={iconDeleteMajor} danger>
+          {$_('delete_database')}
+        </ButtonMenuItem>
+      </DropdownMenu>
+    </div>
+  </AppSecondaryHeader>
+
+  <TabContainer {activeTab} {tabs} uniformTabWidth={false}>
+    {#if activeTab?.id === 'schemas'}
+      <SchemasSection {database} />
+    {:else if activeTab?.id === 'settings'}
+      <SettingsSection />
+    {/if}
+  </TabContainer>
 </LayoutWithHeader>
diff --git a/mathesar_ui/src/pages/database/DatabaseDetails.svelte b/mathesar_ui/src/pages/database/SchemasSection.svelte
similarity index 64%
rename from mathesar_ui/src/pages/database/DatabaseDetails.svelte
rename to mathesar_ui/src/pages/database/SchemasSection.svelte
index 8008fa11a0..0f50b468ac 100644
--- a/mathesar_ui/src/pages/database/DatabaseDetails.svelte
+++ b/mathesar_ui/src/pages/database/SchemasSection.svelte
@@ -1,21 +1,12 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import { reflectApi } from '@mathesar/api/rest/reflect';
   import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import AppSecondaryHeader from '@mathesar/components/AppSecondaryHeader.svelte';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { RichText } from '@mathesar/components/rich-text';
-  import {
-    iconAddNew,
-    iconDatabase,
-    iconDeleteMajor,
-    iconEdit,
-    iconMoreActions,
-    iconRefresh,
-  } from '@mathesar/icons';
+  import { iconAddNew } from '@mathesar/icons';
   import { confirmDelete } from '@mathesar/stores/confirmation';
   import { modal } from '@mathesar/stores/modal';
   import type { DBSchemaStoreData } from '@mathesar/stores/schemas';
@@ -24,26 +15,13 @@
     schemas as schemasStore,
   } from '@mathesar/stores/schemas';
   import { removeTablesStore } from '@mathesar/stores/tables';
-  import { toast } from '@mathesar/stores/toast';
-  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
-  import {
-    Button,
-    ButtonMenuItem,
-    DropdownMenu,
-    Help,
-    Icon,
-  } from '@mathesar-component-library';
+  import { Button, Icon } from '@mathesar-component-library';
 
   import AddEditSchemaModal from './AddEditSchemaModal.svelte';
   import SchemaListSkeleton from './SchemaListSkeleton.svelte';
   import SchemaRow from './SchemaRow.svelte';
 
   const addEditModal = modal.spawnModalController();
-  const editConnectionModal = modal.spawnModalController();
-  const deleteConnectionModal = modal.spawnModalController();
-
-  const userProfileStore = getUserProfileStoreFromContext();
-  $: userProfile = $userProfileStore;
 
   export let database: Database;
 
@@ -52,7 +30,6 @@
 
   let filterQuery = '';
   let targetSchema: Schema | undefined;
-  let isReflectionRunning = false;
 
   function filterSchemas(
     schemaData: DBSchemaStoreData['data'],
@@ -95,75 +72,8 @@
   function handleClearFilterQuery() {
     filterQuery = '';
   }
-
-  async function reflect() {
-    try {
-      isReflectionRunning = true;
-      await reflectApi.reflect();
-      window.location.reload();
-    } catch (e) {
-      toast.fromError(e);
-    } finally {
-      isReflectionRunning = false;
-    }
-  }
 </script>
 
-<AppSecondaryHeader
-  pageTitleAndMetaProps={{
-    name: database.name,
-    type: 'database',
-    icon: iconDatabase,
-  }}
->
-  <svelte:fragment slot="action">
-    <div>
-      <DropdownMenu
-        showArrow={false}
-        triggerAppearance="plain"
-        label=""
-        closeOnInnerClick={false}
-        icon={iconMoreActions}
-        preferredPlacement="bottom-end"
-        menuStyle="--spacing-y:0.8em;"
-      >
-        <ButtonMenuItem
-          icon={{ ...iconRefresh, spin: isReflectionRunning }}
-          disabled={isReflectionRunning}
-          on:click={reflect}
-        >
-          <div class="reflect">
-            {$_('sync_external_changes')}
-            <Help>
-              <p>
-                {$_('sync_external_changes_structure_help')}
-              </p>
-              <p>
-                {$_('sync_external_changes_data_help')}
-              </p>
-            </Help>
-          </div>
-        </ButtonMenuItem>
-        {#if userProfile?.isSuperUser}
-          <ButtonMenuItem
-            icon={iconEdit}
-            on:click={() => editConnectionModal.open()}
-          >
-            {$_('edit_connection')}
-          </ButtonMenuItem>
-          <ButtonMenuItem
-            icon={iconDeleteMajor}
-            danger
-            on:click={() => deleteConnectionModal.open()}
-          >
-            {$_('delete_connection')}
-          </ButtonMenuItem>
-        {/if}
-      </DropdownMenu>
-    </div>
-  </svelte:fragment>
-</AppSecondaryHeader>
-
 <div class="schema-list-wrapper">
   <div class="schema-list-title-container">
     <h2 class="schema-list-title">{$_('schemas')} ({schemasMap.size})</h2>
diff --git a/mathesar_ui/src/pages/database/SettingsSection.svelte b/mathesar_ui/src/pages/database/SettingsSection.svelte
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/mathesar_ui/src/pages/schema/SchemaPage.svelte b/mathesar_ui/src/pages/schema/SchemaPage.svelte
index 06f233263c..7340f7c5f2 100644
--- a/mathesar_ui/src/pages/schema/SchemaPage.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPage.svelte
@@ -91,10 +91,8 @@
 >
   <AppSecondaryHeader
     slot="secondary-header"
-    theme="light"
     pageTitleAndMetaProps={{
       name: schema.name,
-      type: 'schema',
       icon: iconSchema,
     }}
   >
diff --git a/mathesar_ui/src/routes/AdminRoute.svelte b/mathesar_ui/src/routes/AdminRoute.svelte
index ed9ad6a965..48cad96d58 100644
--- a/mathesar_ui/src/routes/AdminRoute.svelte
+++ b/mathesar_ui/src/routes/AdminRoute.svelte
@@ -34,7 +34,6 @@
 >
   <AppSecondaryHeader
     slot="secondary-header"
-    theme="light"
     pageTitleAndMetaProps={{
       name: $_('administration'),
       icon: iconSettingsMajor,
diff --git a/mathesar_ui/src/routes/DatabaseRoute.svelte b/mathesar_ui/src/routes/DatabaseRoute.svelte
index 119d5f40c8..4165a5bd75 100644
--- a/mathesar_ui/src/routes/DatabaseRoute.svelte
+++ b/mathesar_ui/src/routes/DatabaseRoute.svelte
@@ -7,6 +7,7 @@
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import Identifier from '@mathesar/components/Identifier.svelte';
   import { RichText } from '@mathesar/components/rich-text';
+  import MultiPathRoute from '@mathesar/components/routing/MultiPathRoute.svelte';
   import DatabasePage from '@mathesar/pages/database/DatabasePage.svelte';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import { databasesStore } from '@mathesar/stores/databases';
@@ -28,11 +29,19 @@
 {#if $currentDatabase}
   <AppendBreadcrumb item={{ type: 'database', database: $currentDatabase }} />
 
-  <Route path="/">
-    <DatabasePage database={$currentDatabase} />
-  </Route>
+  <Route path="/" redirect="schemas/"></Route>
+
+  <MultiPathRoute
+    paths={[
+      { name: 'schemas', path: '/schemas/' },
+      { name: 'settings', path: '/settings/' },
+    ]}
+    let:path
+  >
+    <DatabasePage database={$currentDatabase} section={path} />
+  </MultiPathRoute>
 
-  <Route path="/:schemaId/*" let:meta firstmatch>
+  <Route path="/schemas/:schemaId/*" let:meta firstmatch>
     <SchemaRoute
       database={$currentDatabase}
       schemaId={parseInt(meta.params.schemaId, 10)}
diff --git a/mathesar_ui/src/routes/urls.ts b/mathesar_ui/src/routes/urls.ts
index 64335e3283..bd7bbfbab0 100644
--- a/mathesar_ui/src/routes/urls.ts
+++ b/mathesar_ui/src/routes/urls.ts
@@ -2,8 +2,16 @@ export function getDatabasePageUrl(databaseId: number): string {
   return `/db/${databaseId}/`;
 }
 
+export function getDatabasePageSchemasSectionUrl(databaseId: number): string {
+  return `/db/${databaseId}/schemas/`;
+}
+
+export function getDatabasePageSettingsSectionUrl(databaseId: number): string {
+  return `/db/${databaseId}/settings/`;
+}
+
 export function getSchemaPageUrl(databaseId: number, schemaId: number): string {
-  return `${getDatabasePageUrl(databaseId)}${schemaId}/`;
+  return `${getDatabasePageSchemasSectionUrl(databaseId)}${schemaId}/`;
 }
 
 export function getSchemaPageTablesSectionUrl(

From 192d6520749a01c77abea6d9f827e873052905a8 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 12 Aug 2024 23:56:35 +0530
Subject: [PATCH 0620/1141] Set max depth to 1 for record page widgets list

---
 mathesar_ui/src/pages/record/RecordPageContent.svelte | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mathesar_ui/src/pages/record/RecordPageContent.svelte b/mathesar_ui/src/pages/record/RecordPageContent.svelte
index 19fa289d96..e442d051a2 100644
--- a/mathesar_ui/src/pages/record/RecordPageContent.svelte
+++ b/mathesar_ui/src/pages/record/RecordPageContent.svelte
@@ -45,6 +45,7 @@
       .list_joinable({
         database_id: $currentDatabase.id,
         table_oid: tableId,
+        max_depth: 1,
       })
       .run();
   }

From 6f842c258d72f1fe73ab3afb3b718b42f531d855 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Tue, 13 Aug 2024 00:50:07 +0530
Subject: [PATCH 0621/1141] Implement Database model class

---
 mathesar_ui/src/api/rpc/configured_roles.ts   | 20 +++++------
 mathesar_ui/src/api/rpc/database_setup.ts     | 22 ++++++------
 mathesar_ui/src/api/rpc/databases.ts          | 36 +++----------------
 mathesar_ui/src/api/rpc/servers.ts            |  4 +--
 .../src/components/DatabaseName.svelte        |  2 +-
 .../breadcrumb/DatabaseSelector.svelte        |  2 +-
 .../breadcrumb/EntitySelector.svelte          |  2 +-
 .../breadcrumb/SchemaSelector.svelte          |  2 +-
 .../components/breadcrumb/breadcrumbTypes.ts  |  2 +-
 mathesar_ui/src/models/databases.ts           | 20 +++++++++++
 mathesar_ui/src/models/servers.ts             | 15 ++++++++
 .../data-explorer/DataExplorerPage.svelte     |  2 +-
 .../pages/database/AddEditSchemaModal.svelte  |  2 +-
 .../src/pages/database/DatabasePage.svelte    |  4 +--
 .../src/pages/database/SchemaRow.svelte       |  2 +-
 .../src/pages/database/SchemasSection.svelte  |  2 +-
 .../pages/exploration/ExplorationPage.svelte  |  2 +-
 .../src/pages/exploration/Header.svelte       |  2 +-
 mathesar_ui/src/pages/home/DatabaseRow.svelte |  4 +--
 mathesar_ui/src/pages/home/HomePage.svelte    |  2 +-
 .../preview/ImportPreviewContent.svelte       |  2 +-
 .../import/preview/ImportPreviewPage.svelte   |  2 +-
 .../import/preview/importPreviewPageUtils.ts  |  2 +-
 .../import/upload/ImportUploadPage.svelte     |  2 +-
 .../schema/CreateEmptyTableButton.svelte      |  2 +-
 .../CreateNewExplorationTutorial.svelte       |  2 +-
 .../pages/schema/CreateNewTableButton.svelte  |  2 +-
 .../schema/CreateNewTableTutorial.svelte      |  2 +-
 .../src/pages/schema/ExplorationItem.svelte   |  2 +-
 .../src/pages/schema/ExplorationsList.svelte  |  2 +-
 .../pages/schema/SchemaExplorations.svelte    |  2 +-
 .../src/pages/schema/SchemaOverview.svelte    |  2 +-
 .../src/pages/schema/SchemaPage.svelte        |  2 +-
 .../src/pages/schema/SchemaTables.svelte      |  2 +-
 mathesar_ui/src/pages/schema/TableCard.svelte |  2 +-
 .../src/pages/schema/TablesList.svelte        |  2 +-
 .../src/routes/DataExplorerRoute.svelte       |  2 +-
 mathesar_ui/src/routes/DatabaseRoute.svelte   |  2 +-
 .../src/routes/ExplorationRoute.svelte        |  2 +-
 mathesar_ui/src/routes/ImportRoute.svelte     |  2 +-
 mathesar_ui/src/routes/RecordPageRoute.svelte |  2 +-
 mathesar_ui/src/routes/SchemaRoute.svelte     |  2 +-
 mathesar_ui/src/routes/TableRoute.svelte      |  2 +-
 .../src/stores/abstract-types/store.ts        |  2 +-
 mathesar_ui/src/stores/databases.ts           | 19 +++++++---
 mathesar_ui/src/stores/schemas.ts             |  2 +-
 .../src/stores/table-data/TableStructure.ts   |  2 +-
 mathesar_ui/src/stores/table-data/columns.ts  |  2 +-
 .../src/stores/table-data/constraints.ts      |  2 +-
 mathesar_ui/src/stores/table-data/records.ts  |  2 +-
 .../src/stores/table-data/tabularData.ts      |  2 +-
 mathesar_ui/src/stores/tables.ts              |  2 +-
 .../ConnectDatabaseModal.svelte               |  2 +-
 .../ConnectExistingDatabase.svelte            |  2 +-
 .../create-database/CreateNewDatabase.svelte  |  2 +-
 mathesar_ui/src/utils/preloadData.ts          | 10 +++---
 56 files changed, 132 insertions(+), 114 deletions(-)
 create mode 100644 mathesar_ui/src/models/databases.ts
 create mode 100644 mathesar_ui/src/models/servers.ts

diff --git a/mathesar_ui/src/api/rpc/configured_roles.ts b/mathesar_ui/src/api/rpc/configured_roles.ts
index 351452b2f6..bb30bae9ec 100644
--- a/mathesar_ui/src/api/rpc/configured_roles.ts
+++ b/mathesar_ui/src/api/rpc/configured_roles.ts
@@ -1,10 +1,10 @@
 import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
 
-import type { Server } from './servers';
+import type { RawServer } from './servers';
 
-export interface ConfiguredRole {
+export interface RawConfiguredRole {
   id: number;
-  server_id: Server['id'];
+  server_id: RawServer['id'];
   name: string;
 }
 
@@ -12,30 +12,30 @@ export interface ConfiguredRole {
 export const configured_roles = {
   list: rpcMethodTypeContainer<
     {
-      server_id: ConfiguredRole['server_id'];
+      server_id: RawConfiguredRole['server_id'];
     },
-    Array<ConfiguredRole>
+    Array<RawConfiguredRole>
   >(),
 
   add: rpcMethodTypeContainer<
     {
-      server_id: ConfiguredRole['server_id'];
-      name: ConfiguredRole['name'];
+      server_id: RawConfiguredRole['server_id'];
+      name: RawConfiguredRole['name'];
       password: string;
     },
-    ConfiguredRole
+    RawConfiguredRole
   >(),
 
   delete: rpcMethodTypeContainer<
     {
-      configured_role_id: ConfiguredRole['id'];
+      configured_role_id: RawConfiguredRole['id'];
     },
     void
   >(),
 
   set_password: rpcMethodTypeContainer<
     {
-      configured_role_id: ConfiguredRole['id'];
+      configured_role_id: RawConfiguredRole['id'];
       password: string;
     },
     void
diff --git a/mathesar_ui/src/api/rpc/database_setup.ts b/mathesar_ui/src/api/rpc/database_setup.ts
index 41f42ef584..81c5a0f93b 100644
--- a/mathesar_ui/src/api/rpc/database_setup.ts
+++ b/mathesar_ui/src/api/rpc/database_setup.ts
@@ -1,8 +1,8 @@
 import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
 
-import type { ConfiguredRole } from './configured_roles';
-import type { DatabaseResponse } from './databases';
-import type { Server } from './servers';
+import type { RawConfiguredRole } from './configured_roles';
+import type { RawDatabase } from './databases';
+import type { RawServer } from './servers';
 
 export const sampleDataOptions = [
   'library_management',
@@ -12,16 +12,16 @@ export const sampleDataOptions = [
 export type SampleDataSchemaIdentifier = (typeof sampleDataOptions)[number];
 
 export interface DatabaseConnectionResult {
-  server: Server;
-  database: DatabaseResponse;
-  configured_role: ConfiguredRole;
+  server: RawServer;
+  database: RawDatabase;
+  configured_role: RawConfiguredRole;
 }
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const database_setup = {
   create_new: rpcMethodTypeContainer<
     {
-      database: DatabaseResponse['name'];
+      database: RawDatabase['name'];
       sample_data?: SampleDataSchemaIdentifier[];
     },
     DatabaseConnectionResult
@@ -29,10 +29,10 @@ export const database_setup = {
 
   connect_existing: rpcMethodTypeContainer<
     {
-      host: Server['host'];
-      port: Server['port'];
-      database: DatabaseResponse['name'];
-      role: ConfiguredRole['name'];
+      host: RawServer['host'];
+      port: RawServer['port'];
+      database: RawDatabase['name'];
+      role: RawConfiguredRole['name'];
       password: string;
       sample_data?: SampleDataSchemaIdentifier[];
     },
diff --git a/mathesar_ui/src/api/rpc/databases.ts b/mathesar_ui/src/api/rpc/databases.ts
index 1fa2b32e37..10e9a11628 100644
--- a/mathesar_ui/src/api/rpc/databases.ts
+++ b/mathesar_ui/src/api/rpc/databases.ts
@@ -1,44 +1,18 @@
 import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
 
-import type { Server } from './servers';
+import type { RawServer } from './servers';
 
-export interface DatabaseResponse {
+export interface RawDatabase {
   id: number;
   name: string;
-  server_id: Server['id'];
-}
-
-/**
- * TODO_BETA: Modify after store discussion is resolved
- */
-export class Database implements DatabaseResponse {
-  readonly id: number;
-
-  readonly name: string;
-
-  readonly server_id: number;
-
-  readonly server_host: string;
-
-  readonly server_port: number;
-
-  constructor(databaseResponse: DatabaseResponse, server: Server) {
-    this.id = databaseResponse.id;
-    this.name = databaseResponse.name;
-    if (databaseResponse.server_id !== server.id) {
-      throw new Error('Server ids do not match');
-    }
-    this.server_id = databaseResponse.server_id;
-    this.server_host = server.host;
-    this.server_port = server.port;
-  }
+  server_id: RawServer['id'];
 }
 
 export const databases = {
   list: rpcMethodTypeContainer<
     {
-      server_id?: DatabaseResponse['server_id'];
+      server_id?: RawDatabase['server_id'];
     },
-    Array<DatabaseResponse>
+    Array<RawDatabase>
   >(),
 };
diff --git a/mathesar_ui/src/api/rpc/servers.ts b/mathesar_ui/src/api/rpc/servers.ts
index eaa9faec31..f92a29bebb 100644
--- a/mathesar_ui/src/api/rpc/servers.ts
+++ b/mathesar_ui/src/api/rpc/servers.ts
@@ -1,11 +1,11 @@
 import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
 
-export interface Server {
+export interface RawServer {
   id: number;
   host: string;
   port: number;
 }
 
 export const servers = {
-  list: rpcMethodTypeContainer<void, Array<Server>>(),
+  list: rpcMethodTypeContainer<void, Array<RawServer>>(),
 };
diff --git a/mathesar_ui/src/components/DatabaseName.svelte b/mathesar_ui/src/components/DatabaseName.svelte
index f7855f97eb..186344afc2 100644
--- a/mathesar_ui/src/components/DatabaseName.svelte
+++ b/mathesar_ui/src/components/DatabaseName.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import type { Database } from '@mathesar/api/rpc/databases';
   import { iconDatabase } from '@mathesar/icons';
+  import type { Database } from '@mathesar/models/databases';
 
   import NameWithIcon from './NameWithIcon.svelte';
 
diff --git a/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte b/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
index 261a33469d..db7bc78ac0 100644
--- a/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import { iconConnectDatabase, iconDatabase } from '@mathesar/icons';
+  import type { Database } from '@mathesar/models/databases';
   import { HOME_URL, getDatabasePageUrl } from '@mathesar/routes/urls';
   import { databasesStore } from '@mathesar/stores/databases';
 
diff --git a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
index 636f17acc2..8c1f5f9988 100644
--- a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
@@ -3,10 +3,10 @@
   import { meta } from 'tinro';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Table } from '@mathesar/api/rpc/tables';
   import { iconTable } from '@mathesar/icons';
+  import type { Database } from '@mathesar/models/databases';
   import { getExplorationPageUrl } from '@mathesar/routes/urls';
   import { queries as queriesStore } from '@mathesar/stores/queries';
   import { currentTableId, currentTables } from '@mathesar/stores/tables';
diff --git a/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte b/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte
index bd4ee89c19..7209a4da20 100644
--- a/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import { iconSchema } from '@mathesar/icons';
+  import type { Database } from '@mathesar/models/databases';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
   import {
     currentSchemaId,
diff --git a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
index ccf518aa65..0728141e6f 100644
--- a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
+++ b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
@@ -1,11 +1,11 @@
 import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-import type { Database } from '@mathesar/api/rpc/databases';
 import type { Schema } from '@mathesar/api/rpc/schemas';
 import type { Table } from '@mathesar/api/rpc/tables';
 import type {
   ComponentAndProps,
   IconProps,
 } from '@mathesar/component-library/types';
+import type { Database } from '@mathesar/models/databases';
 
 export interface BreadcrumbItemHome {
   type: 'home';
diff --git a/mathesar_ui/src/models/databases.ts b/mathesar_ui/src/models/databases.ts
new file mode 100644
index 0000000000..96b50c3f1e
--- /dev/null
+++ b/mathesar_ui/src/models/databases.ts
@@ -0,0 +1,20 @@
+import type { RawDatabase } from '@mathesar/api/rpc/databases';
+
+import type { Server } from './servers';
+
+export class Database {
+  readonly id: number;
+
+  name: string;
+
+  readonly server: Server;
+
+  constructor(props: { server: Server; rawDatabase: RawDatabase }) {
+    this.id = props.rawDatabase.id;
+    this.name = props.rawDatabase.name;
+    if (props.rawDatabase.server_id !== props.server.id) {
+      throw new Error('Server ids do not match');
+    }
+    this.server = props.server;
+  }
+}
diff --git a/mathesar_ui/src/models/servers.ts b/mathesar_ui/src/models/servers.ts
new file mode 100644
index 0000000000..203e13d398
--- /dev/null
+++ b/mathesar_ui/src/models/servers.ts
@@ -0,0 +1,15 @@
+import type { RawServer } from '@mathesar/api/rpc/servers';
+
+export class Server {
+  readonly id: number;
+
+  readonly host: string;
+
+  readonly port: number;
+
+  constructor(props: { rawServer: RawServer }) {
+    this.id = props.rawServer.id;
+    this.host = props.rawServer.host;
+    this.port = props.rawServer.port;
+  }
+}
diff --git a/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte b/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte
index 3a3e0d5303..9a41dca368 100644
--- a/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte
+++ b/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte
@@ -2,9 +2,9 @@
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
+  import type { Database } from '@mathesar/models/databases';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import {
     getExplorationPageUrl,
diff --git a/mathesar_ui/src/pages/database/AddEditSchemaModal.svelte b/mathesar_ui/src/pages/database/AddEditSchemaModal.svelte
index 2dc3925178..a1bc8d8cbe 100644
--- a/mathesar_ui/src/pages/database/AddEditSchemaModal.svelte
+++ b/mathesar_ui/src/pages/database/AddEditSchemaModal.svelte
@@ -2,12 +2,12 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import Identifier from '@mathesar/components/Identifier.svelte';
   import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
   import NameAndDescInputModalForm from '@mathesar/components/NameAndDescInputModalForm.svelte';
   import { RichText } from '@mathesar/components/rich-text';
+  import type { Database } from '@mathesar/models/databases';
   import {
     createSchema,
     schemas,
diff --git a/mathesar_ui/src/pages/database/DatabasePage.svelte b/mathesar_ui/src/pages/database/DatabasePage.svelte
index 37ad749074..20cd2c336a 100644
--- a/mathesar_ui/src/pages/database/DatabasePage.svelte
+++ b/mathesar_ui/src/pages/database/DatabasePage.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import AppSecondaryHeader from '@mathesar/components/AppSecondaryHeader.svelte';
   import {
     iconDatabase,
@@ -9,6 +8,7 @@
     iconMoreActions,
   } from '@mathesar/icons';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
+  import type { Database } from '@mathesar/models/databases';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import {
     getDatabasePageSchemasSectionUrl,
@@ -61,7 +61,7 @@
     pageTitleAndMetaProps={{
       name: database.name,
       icon: iconDatabase,
-      description: `DB server: ${database.server_host}:${database.server_port}`,
+      description: `DB server: ${database.server.host}:${database.server.port}`,
     }}
   >
     <div slot="action">
diff --git a/mathesar_ui/src/pages/database/SchemaRow.svelte b/mathesar_ui/src/pages/database/SchemaRow.svelte
index 32149dc4d3..75a657a349 100644
--- a/mathesar_ui/src/pages/database/SchemaRow.svelte
+++ b/mathesar_ui/src/pages/database/SchemaRow.svelte
@@ -2,7 +2,6 @@
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import DropdownMenu from '@mathesar/component-library/dropdown-menu/DropdownMenu.svelte';
   import MenuDivider from '@mathesar/component-library/menu/MenuDivider.svelte';
@@ -14,6 +13,7 @@
     iconMoreActions,
     iconNotEditable,
   } from '@mathesar/icons';
+  import type { Database } from '@mathesar/models/databases';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
   import { ButtonMenuItem, Icon } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/pages/database/SchemasSection.svelte b/mathesar_ui/src/pages/database/SchemasSection.svelte
index 0f50b468ac..75e1391820 100644
--- a/mathesar_ui/src/pages/database/SchemasSection.svelte
+++ b/mathesar_ui/src/pages/database/SchemasSection.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import { iconAddNew } from '@mathesar/icons';
+  import type { Database } from '@mathesar/models/databases';
   import { confirmDelete } from '@mathesar/stores/confirmation';
   import { modal } from '@mathesar/stores/modal';
   import type { DBSchemaStoreData } from '@mathesar/stores/schemas';
diff --git a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
index 9af3683cf6..d5bc0d3f10 100644
--- a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
+++ b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
@@ -3,9 +3,9 @@
   import { router } from 'tinro';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
+  import type { Database } from '@mathesar/models/databases';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
   import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
diff --git a/mathesar_ui/src/pages/exploration/Header.svelte b/mathesar_ui/src/pages/exploration/Header.svelte
index c50e7156a8..4d4c09fef3 100644
--- a/mathesar_ui/src/pages/exploration/Header.svelte
+++ b/mathesar_ui/src/pages/exploration/Header.svelte
@@ -2,10 +2,10 @@
   import { _ } from 'svelte-i18n';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import EntityPageHeader from '@mathesar/components/EntityPageHeader.svelte';
   import { iconExploration, iconInspector } from '@mathesar/icons';
+  import type { Database } from '@mathesar/models/databases';
   import { getExplorationEditorPageUrl } from '@mathesar/routes/urls';
   import { Button, Icon } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/pages/home/DatabaseRow.svelte b/mathesar_ui/src/pages/home/DatabaseRow.svelte
index e807f733fe..4e01751203 100644
--- a/mathesar_ui/src/pages/home/DatabaseRow.svelte
+++ b/mathesar_ui/src/pages/home/DatabaseRow.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import type { Database } from '@mathesar/api/rpc/databases';
   import Card from '@mathesar/components/Card.svelte';
   import { iconDatabase } from '@mathesar/icons';
+  import type { Database } from '@mathesar/models/databases';
   import { getDatabasePageUrl } from '@mathesar/routes/urls';
   import { Icon } from '@mathesar-component-library';
 
@@ -22,7 +22,7 @@
     </div>
     <div class="content">
       <div class="name">{database.name}</div>
-      <div class="server">{database.server_host}:{database.server_port}</div>
+      <div class="server">{database.server.host}:{database.server.port}</div>
     </div>
   </div>
 </Card>
diff --git a/mathesar_ui/src/pages/home/HomePage.svelte b/mathesar_ui/src/pages/home/HomePage.svelte
index ea011d28ee..b5c5fe77bc 100644
--- a/mathesar_ui/src/pages/home/HomePage.svelte
+++ b/mathesar_ui/src/pages/home/HomePage.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import { iconConnection } from '@mathesar/icons';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
+  import type { Database } from '@mathesar/models/databases';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { databasesStore } from '@mathesar/stores/databases';
   import { modal } from '@mathesar/stores/modal';
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index 3ce4b725a3..bc9c2f7c3e 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -6,7 +6,6 @@
   import { getAPI, postAPI } from '@mathesar/api/rest/utils/requestUtils';
   import { api } from '@mathesar/api/rpc';
   import type { Column } from '@mathesar/api/rpc/columns';
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Table } from '@mathesar/api/rpc/tables';
   import {
@@ -18,6 +17,7 @@
   } from '@mathesar/components/form';
   import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
   import { iconDeleteMajor } from '@mathesar/icons';
+  import type { Database } from '@mathesar/models/databases';
   import { runner } from '@mathesar/packages/json-rpc-client-builder';
   import {
     getImportPreviewPageUrl,
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
index eef280f22a..348c2e97ac 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
@@ -3,9 +3,9 @@
   import { router } from 'tinro';
 
   import { dataFilesApi } from '@mathesar/api/rest/dataFiles';
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
+  import type { Database } from '@mathesar/models/databases';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { getTablePageUrl } from '@mathesar/routes/urls';
   import AsyncStore from '@mathesar/stores/AsyncStore';
diff --git a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
index e60bc8a4dd..4f01708665 100644
--- a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
+++ b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
@@ -1,10 +1,10 @@
 import { dataFilesApi } from '@mathesar/api/rest/dataFiles';
 import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
 import type { Column } from '@mathesar/api/rpc/columns';
-import type { Database } from '@mathesar/api/rpc/databases';
 import type { Schema } from '@mathesar/api/rpc/schemas';
 import type { Table } from '@mathesar/api/rpc/tables';
 import { getCellCap } from '@mathesar/components/cell-fabric/utils';
+import type { Database } from '@mathesar/models/databases';
 import { getAbstractTypeForDbType } from '@mathesar/stores/abstract-types';
 import type {
   AbstractType,
diff --git a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
index 466be8caee..feda1919d0 100644
--- a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
+++ b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
@@ -4,7 +4,6 @@
 
   import { dataFilesApi } from '@mathesar/api/rest/dataFiles';
   import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import Spinner from '@mathesar/component-library/spinner/Spinner.svelte';
   import DocsLink from '@mathesar/components/DocsLink.svelte';
@@ -21,6 +20,7 @@
   import { RichText } from '@mathesar/components/rich-text';
   import { iconPaste, iconUrl } from '@mathesar/icons';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
+  import type { Database } from '@mathesar/models/databases';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { getImportPreviewPageUrl } from '@mathesar/routes/urls';
   import { createTable } from '@mathesar/stores/tables';
diff --git a/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte b/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
index d7d52d44b8..6805469e99 100644
--- a/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
+++ b/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { router } from 'tinro';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/models/databases';
   import { getTablePageUrl } from '@mathesar/routes/urls';
   import { createTable } from '@mathesar/stores/tables';
   import { Button, Spinner } from '@mathesar-component-library';
diff --git a/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte b/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte
index 3b476254c6..0745b1a098 100644
--- a/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte
+++ b/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/models/databases';
   import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
   import { AnchorButton, Tutorial } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte b/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
index dbfbfbbd08..46e2044a02 100644
--- a/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
+++ b/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
@@ -2,11 +2,11 @@
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import Icon from '@mathesar/component-library/icon/Icon.svelte';
   import LinkMenuItem from '@mathesar/component-library/menu/LinkMenuItem.svelte';
   import { iconAddNew } from '@mathesar/icons';
+  import type { Database } from '@mathesar/models/databases';
   import { getImportPageUrl, getTablePageUrl } from '@mathesar/routes/urls';
   import { createTable } from '@mathesar/stores/tables';
   import {
diff --git a/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte b/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte
index 62e81a4dcb..923a7e2dc2 100644
--- a/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte
+++ b/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Database } from '@mathesar/models/databases';
   import { getImportPageUrl } from '@mathesar/routes/urls';
   import { AnchorButton, Tutorial } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/pages/schema/ExplorationItem.svelte b/mathesar_ui/src/pages/schema/ExplorationItem.svelte
index b5fdee3e6b..7cf1515969 100644
--- a/mathesar_ui/src/pages/schema/ExplorationItem.svelte
+++ b/mathesar_ui/src/pages/schema/ExplorationItem.svelte
@@ -2,10 +2,10 @@
   import { _ } from 'svelte-i18n';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import TableName from '@mathesar/components/TableName.svelte';
   import { iconExploration } from '@mathesar/icons';
+  import type { Database } from '@mathesar/models/databases';
   import { getExplorationPageUrl } from '@mathesar/routes/urls';
   import { currentTablesData as tablesStore } from '@mathesar/stores/tables';
   import { Icon } from '@mathesar-component-library';
diff --git a/mathesar_ui/src/pages/schema/ExplorationsList.svelte b/mathesar_ui/src/pages/schema/ExplorationsList.svelte
index 8f2ae29584..73e4458c60 100644
--- a/mathesar_ui/src/pages/schema/ExplorationsList.svelte
+++ b/mathesar_ui/src/pages/schema/ExplorationsList.svelte
@@ -2,9 +2,9 @@
   import { _ } from 'svelte-i18n';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import { iconExploration } from '@mathesar/icons';
+  import type { Database } from '@mathesar/models/databases';
 
   import EmptyEntity from './EmptyEntity.svelte';
   import ExplorationItem from './ExplorationItem.svelte';
diff --git a/mathesar_ui/src/pages/schema/SchemaExplorations.svelte b/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
index 6afd536fb0..e2327b3099 100644
--- a/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
@@ -2,10 +2,10 @@
   import { _ } from 'svelte-i18n';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
+  import type { Database } from '@mathesar/models/databases';
   import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
   import { AnchorButton } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/pages/schema/SchemaOverview.svelte b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
index 7388f58c22..df16afaae4 100644
--- a/mathesar_ui/src/pages/schema/SchemaOverview.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
@@ -3,12 +3,12 @@
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Table } from '@mathesar/api/rpc/tables';
   import SpinnerButton from '@mathesar/component-library/spinner-button/SpinnerButton.svelte';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { iconRefresh } from '@mathesar/icons';
+  import type { Database } from '@mathesar/models/databases';
   import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
   import { refetchQueriesForSchema } from '@mathesar/stores/queries';
   import { refetchTablesForSchema } from '@mathesar/stores/tables';
diff --git a/mathesar_ui/src/pages/schema/SchemaPage.svelte b/mathesar_ui/src/pages/schema/SchemaPage.svelte
index 7340f7c5f2..7159d8d095 100644
--- a/mathesar_ui/src/pages/schema/SchemaPage.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPage.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import AppSecondaryHeader from '@mathesar/components/AppSecondaryHeader.svelte';
   import { iconEdit, iconSchema } from '@mathesar/icons';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
+  import type { Database } from '@mathesar/models/databases';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import {
     getSchemaPageExplorationsSectionUrl,
diff --git a/mathesar_ui/src/pages/schema/SchemaTables.svelte b/mathesar_ui/src/pages/schema/SchemaTables.svelte
index f0f2076005..0afe270774 100644
--- a/mathesar_ui/src/pages/schema/SchemaTables.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaTables.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Table } from '@mathesar/api/rpc/tables';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
+  import type { Database } from '@mathesar/models/databases';
 
   import CreateNewTableButton from './CreateNewTableButton.svelte';
   import CreateNewTableTutorial from './CreateNewTableTutorial.svelte';
diff --git a/mathesar_ui/src/pages/schema/TableCard.svelte b/mathesar_ui/src/pages/schema/TableCard.svelte
index c692676421..dafb32a706 100644
--- a/mathesar_ui/src/pages/schema/TableCard.svelte
+++ b/mathesar_ui/src/pages/schema/TableCard.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Table } from '@mathesar/api/rpc/tables';
   import LinkMenuItem from '@mathesar/component-library/menu/LinkMenuItem.svelte';
@@ -13,6 +12,7 @@
     iconMoreActions,
     iconSelectRecord,
   } from '@mathesar/icons';
+  import type { Database } from '@mathesar/models/databases';
   import {
     getImportPreviewPageUrl,
     getTablePageUrl,
diff --git a/mathesar_ui/src/pages/schema/TablesList.svelte b/mathesar_ui/src/pages/schema/TablesList.svelte
index 5b8a3e1ccd..c84ce9c470 100644
--- a/mathesar_ui/src/pages/schema/TablesList.svelte
+++ b/mathesar_ui/src/pages/schema/TablesList.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Table } from '@mathesar/api/rpc/tables';
   import { iconTable } from '@mathesar/icons';
+  import type { Database } from '@mathesar/models/databases';
 
   import EmptyEntity from './EmptyEntity.svelte';
   import TableCard from './TableCard.svelte';
diff --git a/mathesar_ui/src/routes/DataExplorerRoute.svelte b/mathesar_ui/src/routes/DataExplorerRoute.svelte
index 9b5388fbba..8fcf5f3735 100644
--- a/mathesar_ui/src/routes/DataExplorerRoute.svelte
+++ b/mathesar_ui/src/routes/DataExplorerRoute.svelte
@@ -4,11 +4,11 @@
   import { router } from 'tinro';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { CancellablePromise } from '@mathesar/component-library';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import { iconEdit, iconExploration } from '@mathesar/icons';
+  import type { Database } from '@mathesar/models/databases';
   import DataExplorerPage from '@mathesar/pages/data-explorer/DataExplorerPage.svelte';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import {
diff --git a/mathesar_ui/src/routes/DatabaseRoute.svelte b/mathesar_ui/src/routes/DatabaseRoute.svelte
index 4165a5bd75..f4ade64fbe 100644
--- a/mathesar_ui/src/routes/DatabaseRoute.svelte
+++ b/mathesar_ui/src/routes/DatabaseRoute.svelte
@@ -3,11 +3,11 @@
   import { _ } from 'svelte-i18n';
   import { Route } from 'tinro';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import Identifier from '@mathesar/components/Identifier.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import MultiPathRoute from '@mathesar/components/routing/MultiPathRoute.svelte';
+  import type { Database } from '@mathesar/models/databases';
   import DatabasePage from '@mathesar/pages/database/DatabasePage.svelte';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import { databasesStore } from '@mathesar/stores/databases';
diff --git a/mathesar_ui/src/routes/ExplorationRoute.svelte b/mathesar_ui/src/routes/ExplorationRoute.svelte
index 55d02030f0..6c56c154c4 100644
--- a/mathesar_ui/src/routes/ExplorationRoute.svelte
+++ b/mathesar_ui/src/routes/ExplorationRoute.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
+  import type { Database } from '@mathesar/models/databases';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import ExplorationPage from '@mathesar/pages/exploration/ExplorationPage.svelte';
   import { queries } from '@mathesar/stores/queries';
diff --git a/mathesar_ui/src/routes/ImportRoute.svelte b/mathesar_ui/src/routes/ImportRoute.svelte
index 0bcf4d339a..145d099fa4 100644
--- a/mathesar_ui/src/routes/ImportRoute.svelte
+++ b/mathesar_ui/src/routes/ImportRoute.svelte
@@ -2,10 +2,10 @@
   import { _ } from 'svelte-i18n';
   import { Route } from 'tinro';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import { iconImportData } from '@mathesar/icons';
+  import type { Database } from '@mathesar/models/databases';
   import ImportPreviewPage from '@mathesar/pages/import/preview/ImportPreviewPage.svelte';
   import ImportUploadPage from '@mathesar/pages/import/upload/ImportUploadPage.svelte';
 
diff --git a/mathesar_ui/src/routes/RecordPageRoute.svelte b/mathesar_ui/src/routes/RecordPageRoute.svelte
index 1d45f59fe0..fa8fe8e13b 100644
--- a/mathesar_ui/src/routes/RecordPageRoute.svelte
+++ b/mathesar_ui/src/routes/RecordPageRoute.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Table } from '@mathesar/api/rpc/tables';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
+  import type { Database } from '@mathesar/models/databases';
   import RecordPage from '@mathesar/pages/record/RecordPage.svelte';
   import RecordStore from '@mathesar/pages/record/RecordStore';
 
diff --git a/mathesar_ui/src/routes/SchemaRoute.svelte b/mathesar_ui/src/routes/SchemaRoute.svelte
index 02f55d66fe..9c74fb4f8d 100644
--- a/mathesar_ui/src/routes/SchemaRoute.svelte
+++ b/mathesar_ui/src/routes/SchemaRoute.svelte
@@ -3,9 +3,9 @@
   import { _ } from 'svelte-i18n';
   import { Route } from 'tinro';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import MultiPathRoute from '@mathesar/components/routing/MultiPathRoute.svelte';
+  import type { Database } from '@mathesar/models/databases';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import SchemaPage from '@mathesar/pages/schema/SchemaPage.svelte';
   import { currentSchemaId, schemas } from '@mathesar/stores/schemas';
diff --git a/mathesar_ui/src/routes/TableRoute.svelte b/mathesar_ui/src/routes/TableRoute.svelte
index d369b49db7..b23abc6219 100644
--- a/mathesar_ui/src/routes/TableRoute.svelte
+++ b/mathesar_ui/src/routes/TableRoute.svelte
@@ -3,9 +3,9 @@
   import { _ } from 'svelte-i18n';
   import { Route } from 'tinro';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
+  import type { Database } from '@mathesar/models/databases';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import TablePage from '@mathesar/pages/table/TablePage.svelte';
   import { currentTableId, currentTablesData } from '@mathesar/stores/tables';
diff --git a/mathesar_ui/src/stores/abstract-types/store.ts b/mathesar_ui/src/stores/abstract-types/store.ts
index cbe83182c9..140716b810 100644
--- a/mathesar_ui/src/stores/abstract-types/store.ts
+++ b/mathesar_ui/src/stores/abstract-types/store.ts
@@ -2,7 +2,7 @@ import type { Readable, Unsubscriber, Writable } from 'svelte/store';
 import { derived, get, writable } from 'svelte/store';
 
 import { States, getAPI } from '@mathesar/api/rest/utils/requestUtils';
-import type { Database } from '@mathesar/api/rpc/databases';
+import type { Database } from '@mathesar/models/databases';
 import { databasesStore } from '@mathesar/stores/databases';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import type { CancellablePromise } from '@mathesar-component-library';
diff --git a/mathesar_ui/src/stores/databases.ts b/mathesar_ui/src/stores/databases.ts
index b3d5908e0b..936aeeba21 100644
--- a/mathesar_ui/src/stores/databases.ts
+++ b/mathesar_ui/src/stores/databases.ts
@@ -1,7 +1,8 @@
 import { type Readable, derived, writable } from 'svelte/store';
 
 import { api } from '@mathesar/api/rpc';
-import { Database } from '@mathesar/api/rpc/databases';
+import { Database } from '@mathesar/models/databases';
+import { Server } from '@mathesar/models/servers';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import type { MakeWritablePropertiesReadable } from '@mathesar/utils/typeUtils';
 import {
@@ -29,7 +30,9 @@ class DatabasesStore {
   readonly currentDatabase: Readable<Database | undefined>;
 
   constructor() {
-    const serverMap = new Map(commonData.servers.map((s) => [s.id, s]));
+    const serverMap = new Map(
+      commonData.servers.map((s) => [s.id, new Server({ rawServer: s })]),
+    );
     this.unsortedDatabases.reconstruct(
       commonData.databases.map((d) => {
         /**
@@ -47,7 +50,7 @@ class DatabasesStore {
           host: 'unknown',
           port: 0,
         };
-        return [d.id, new Database(d, server)];
+        return [d.id, new Database({ rawDatabase: d, server })];
       }),
     );
     this.databases = derived(
@@ -72,7 +75,10 @@ class DatabasesStore {
     const { database, server } = await api.database_setup
       .connect_existing(props)
       .run();
-    const connectedDatabase = new Database(database, server);
+    const connectedDatabase = new Database({
+      rawDatabase: database,
+      server: new Server({ rawServer: server }),
+    });
     this.addDatabase(connectedDatabase);
     return connectedDatabase;
   }
@@ -83,7 +89,10 @@ class DatabasesStore {
     const { database, server } = await api.database_setup
       .create_new(props)
       .run();
-    const connectedDatabase = new Database(database, server);
+    const connectedDatabase = new Database({
+      rawDatabase: database,
+      server: new Server({ rawServer: server }),
+    });
     this.addDatabase(connectedDatabase);
     return connectedDatabase;
   }
diff --git a/mathesar_ui/src/stores/schemas.ts b/mathesar_ui/src/stores/schemas.ts
index b54de6d584..eaba581acb 100644
--- a/mathesar_ui/src/stores/schemas.ts
+++ b/mathesar_ui/src/stores/schemas.ts
@@ -3,8 +3,8 @@ import { derived, get, writable } from 'svelte/store';
 
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { api } from '@mathesar/api/rpc';
-import type { Database } from '@mathesar/api/rpc/databases';
 import type { Schema } from '@mathesar/api/rpc/schemas';
+import type { Database } from '@mathesar/models/databases';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import type { CancellablePromise } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/stores/table-data/TableStructure.ts b/mathesar_ui/src/stores/table-data/TableStructure.ts
index 72d95070c3..a43f21589b 100644
--- a/mathesar_ui/src/stores/table-data/TableStructure.ts
+++ b/mathesar_ui/src/stores/table-data/TableStructure.ts
@@ -3,9 +3,9 @@ import { derived } from 'svelte/store';
 
 import { States } from '@mathesar/api/rest/utils/requestUtils';
 import type { Column } from '@mathesar/api/rpc/columns';
-import type { Database } from '@mathesar/api/rpc/databases';
 import type { Table } from '@mathesar/api/rpc/tables';
 import type { DBObjectEntry } from '@mathesar/AppTypes';
+import type { Database } from '@mathesar/models/databases';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
 
 import { ColumnsDataStore } from './columns';
diff --git a/mathesar_ui/src/stores/table-data/columns.ts b/mathesar_ui/src/stores/table-data/columns.ts
index 9e7530002b..e5739cf117 100644
--- a/mathesar_ui/src/stores/table-data/columns.ts
+++ b/mathesar_ui/src/stores/table-data/columns.ts
@@ -7,8 +7,8 @@ import type {
   ColumnCreationSpec,
   ColumnPatchSpec,
 } from '@mathesar/api/rpc/columns';
-import type { Database } from '@mathesar/api/rpc/databases';
 import type { Table } from '@mathesar/api/rpc/tables';
+import type { Database } from '@mathesar/models/databases';
 import { getErrorMessage } from '@mathesar/utils/errors';
 import type { ShareConsumer } from '@mathesar/utils/shares';
 import {
diff --git a/mathesar_ui/src/stores/table-data/constraints.ts b/mathesar_ui/src/stores/table-data/constraints.ts
index 0542009b3a..1fbe7fd2c7 100644
--- a/mathesar_ui/src/stores/table-data/constraints.ts
+++ b/mathesar_ui/src/stores/table-data/constraints.ts
@@ -14,8 +14,8 @@ import type {
   Constraint,
   ConstraintRecipe,
 } from '@mathesar/api/rpc/constraints';
-import type { Database } from '@mathesar/api/rpc/databases';
 import type { Table } from '@mathesar/api/rpc/tables';
+import type { Database } from '@mathesar/models/databases';
 import type { ShareConsumer } from '@mathesar/utils/shares';
 import type { CancellablePromise } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/stores/table-data/records.ts b/mathesar_ui/src/stores/table-data/records.ts
index 48eca6d941..f57e52b7d1 100644
--- a/mathesar_ui/src/stores/table-data/records.ts
+++ b/mathesar_ui/src/stores/table-data/records.ts
@@ -10,7 +10,6 @@ import {
 import { States } from '@mathesar/api/rest/utils/requestUtils';
 import { api } from '@mathesar/api/rpc';
 import type { Column } from '@mathesar/api/rpc/columns';
-import type { Database } from '@mathesar/api/rpc/databases';
 import type {
   Group as ApiGroup,
   Grouping as ApiGrouping,
@@ -20,6 +19,7 @@ import type {
   RecordsResponse,
 } from '@mathesar/api/rpc/records';
 import type { Table } from '@mathesar/api/rpc/tables';
+import type { Database } from '@mathesar/models/databases';
 import { getErrorMessage } from '@mathesar/utils/errors';
 import { pluralize } from '@mathesar/utils/languageUtils';
 import type Pagination from '@mathesar/utils/Pagination';
diff --git a/mathesar_ui/src/stores/table-data/tabularData.ts b/mathesar_ui/src/stores/table-data/tabularData.ts
index 8fc01d60af..86d3352fa8 100644
--- a/mathesar_ui/src/stores/table-data/tabularData.ts
+++ b/mathesar_ui/src/stores/table-data/tabularData.ts
@@ -3,11 +3,11 @@ import { type Readable, type Writable, derived, writable } from 'svelte/store';
 
 import { States } from '@mathesar/api/rest/utils/requestUtils';
 import type { Column } from '@mathesar/api/rpc/columns';
-import type { Database } from '@mathesar/api/rpc/databases';
 import type { Table } from '@mathesar/api/rpc/tables';
 import Plane from '@mathesar/components/sheet/selection/Plane';
 import Series from '@mathesar/components/sheet/selection/Series';
 import SheetSelectionStore from '@mathesar/components/sheet/selection/SheetSelectionStore';
+import type { Database } from '@mathesar/models/databases';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
 import type { ShareConsumer } from '@mathesar/utils/shares';
 import { orderProcessedColumns } from '@mathesar/utils/tables';
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index d9179497a2..4ebe822a4a 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -17,10 +17,10 @@ import { _ } from 'svelte-i18n';
 import type { SplitTableResponse } from '@mathesar/api/rest/types/tables/split_table';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { api } from '@mathesar/api/rpc';
-import type { Database } from '@mathesar/api/rpc/databases';
 import type { Schema } from '@mathesar/api/rpc/schemas';
 import type { JoinableTablesResult, Table } from '@mathesar/api/rpc/tables';
 import { invalidIf } from '@mathesar/components/form';
+import type { Database } from '@mathesar/models/databases';
 import { TupleMap } from '@mathesar/packages/tuple-map';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import {
diff --git a/mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte b/mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte
index 4fb9656a3f..d2e912defb 100644
--- a/mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte
@@ -2,8 +2,8 @@
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import { iconConnectDatabase, iconCreateDatabase } from '@mathesar/icons';
+  import type { Database } from '@mathesar/models/databases';
   import { getDatabasePageUrl } from '@mathesar/routes/urls';
   import {
     ControlledModal,
diff --git a/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte b/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte
index ffab09ef6b..4b3864c96d 100644
--- a/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import {
     FieldLayout,
     FormSubmit,
@@ -9,6 +8,7 @@
     requiredField,
   } from '@mathesar/components/form';
   import Field from '@mathesar/components/form/Field.svelte';
+  import type { Database } from '@mathesar/models/databases';
   import { databasesStore } from '@mathesar/stores/databases';
   import {
     NumberInput,
diff --git a/mathesar_ui/src/systems/databases/create-database/CreateNewDatabase.svelte b/mathesar_ui/src/systems/databases/create-database/CreateNewDatabase.svelte
index 48df6d0a25..657a5dbadc 100644
--- a/mathesar_ui/src/systems/databases/create-database/CreateNewDatabase.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/CreateNewDatabase.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Database } from '@mathesar/api/rpc/databases';
   import {
     FieldLayout,
     FormSubmit,
@@ -9,6 +8,7 @@
     requiredField,
   } from '@mathesar/components/form';
   import Field from '@mathesar/components/form/Field.svelte';
+  import type { Database } from '@mathesar/models/databases';
   import { databasesStore } from '@mathesar/stores/databases';
   import { portalToWindowFooter } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/utils/preloadData.ts b/mathesar_ui/src/utils/preloadData.ts
index 323ce2b7f8..167c0d8bd0 100644
--- a/mathesar_ui/src/utils/preloadData.ts
+++ b/mathesar_ui/src/utils/preloadData.ts
@@ -1,18 +1,18 @@
 import type { QueryInstance } from '@mathesar/api/rest/types/queries';
 import type { User } from '@mathesar/api/rest/users';
-import type { DatabaseResponse } from '@mathesar/api/rpc/databases';
+import type { RawDatabase } from '@mathesar/api/rpc/databases';
 import type { Schema } from '@mathesar/api/rpc/schemas';
-import type { Server } from '@mathesar/api/rpc/servers';
+import type { RawServer } from '@mathesar/api/rpc/servers';
 import type { Table } from '@mathesar/api/rpc/tables';
 import type { AbstractTypeResponse } from '@mathesar/AppTypes';
 
 export interface CommonData {
-  databases: DatabaseResponse[];
-  servers: Server[];
+  databases: RawDatabase[];
+  servers: RawServer[];
   schemas: Schema[];
   tables: Table[];
   queries: QueryInstance[];
-  current_database: DatabaseResponse['id'] | null;
+  current_database: RawDatabase['id'] | null;
   internal_db_connection: {
     database: string;
     host: string;

From d42c037573e395cc34b6f346d6dde21369e5526d Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 13 Aug 2024 12:20:47 +0800
Subject: [PATCH 0622/1141] remove unused keys from response object

---
 mathesar/rpc/records.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index 046eb55fdb..5d7cef4fdd 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -160,9 +160,7 @@ class RecordAdded(TypedDict):
         results: An array of a single record objects (the one added).
         preview_data: Information for previewing foreign key values.
     """
-    count: int
     results: list[dict]
-    grouping: GroupingResponse
     preview_data: list[dict]
 
     @classmethod

From a32d79c7ac8d8a4230334ef693d58ed3025d4668 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 13 Aug 2024 13:28:52 +0800
Subject: [PATCH 0623/1141] use row_number from the result set for
 result_indices

---
 db/sql/00_msar.sql      | 11 ++++++-----
 db/sql/test_00_msar.sql | 18 +++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 0e9d39382b..eb94c36ab4 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3529,8 +3529,8 @@ SELECT format(
     __mathesar_gid AS id,
     __mathesar_gcount AS count,
     jsonb_build_object(%1$s) AS results_eq,
-    jsonb_agg(%2$I) AS result_indices
-  FROM %3$I
+    jsonb_agg(__mathesar_result_idx) AS result_indices
+  FROM %2$I
   GROUP BY id, count, results_eq
   $gj$,
   string_agg(
@@ -3544,7 +3544,6 @@ SELECT format(
     ),
     ', ' ORDER BY ordinality
   ),
-  msar.get_pk_column(tab_id),
   cte_name
 )
 FROM msar.expr_templates RIGHT JOIN ROWS FROM(
@@ -3635,7 +3634,9 @@ BEGIN
       SELECT count(1) AS count FROM %2$I.%3$I %7$s
     ), enriched_results_cte AS (
       SELECT %1$s, %8$s FROM %2$I.%3$I %7$s %6$s LIMIT %4$L OFFSET %5$L
-    ), groups_cte as (
+    ), results_ranked_cte AS (
+      SELECT *, row_number() OVER (%6$s) - 1 AS __mathesar_result_idx FROM enriched_results_cte
+    ), groups_cte AS (
       SELECT %11$s
     )
     SELECT jsonb_build_object(
@@ -3658,7 +3659,7 @@ BEGIN
     msar.build_grouping_expr(tab_id, group_),
     msar.build_results_jsonb_expr(tab_id, 'enriched_results_cte', order_),
     COALESCE(msar.build_grouping_results_jsonb_expr(tab_id, 'groups_cte', group_), 'NULL'),
-    COALESCE(msar.build_groups_cte_expr(tab_id, 'enriched_results_cte', group_), 'NULL AS id')
+    COALESCE(msar.build_groups_cte_expr(tab_id, 'results_ranked_cte', group_), 'NULL AS id')
   ) INTO records;
   RETURN records;
 END;
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 126c24c192..cf6b255d3b 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -3104,31 +3104,31 @@ BEGIN
             "id": 1,
             "count": 5,
             "results_eq": {"2": "Abigail", "3": "Abbott"},
-            "result_indices": [5, 8, 15, 18, 20]
+            "result_indices": [0, 1, 2, 3, 4]
           },
           {
             "id": 2,
             "count": 2,
             "results_eq": {"2": "Aaron", "3": "Acevedo"},
-            "result_indices": [7, 16]
+            "result_indices": [5, 6]
           },
           {
             "id": 3,
             "count": 1,
             "results_eq": {"2": "Abigail", "3": "Acevedo"},
-            "result_indices": [10]
+            "result_indices": [7]
           },
           {
             "id": 4,
             "count": 1,
             "results_eq": {"2": "Aaron", "3": "Acosta"},
-            "result_indices": [11]
+            "result_indices": [8]
           },
           {
             "id": 5,
             "count": 1,
             "results_eq": {"2": "Abigail", "3": "Acosta"},
-            "result_indices": [2]
+            "result_indices": [9]
           }
         ]
       }
@@ -3164,7 +3164,7 @@ BEGIN
             "id": 1,
             "count": 5,
             "results_eq": {"2": "Abigail", "3": "Abbott"},
-            "result_indices": [5, 8, 15]
+            "result_indices": [0, 1, 2]
           }
         ]
       }
@@ -3196,8 +3196,8 @@ BEGIN
         "columns": [4],
         "preproc": ["truncate_to_month"],
         "groups": [
-          {"id": 1, "count": 1, "results_eq": {"4": "2020-03 AD"}, "result_indices": [1]},
-          {"id": 2, "count": 2, "results_eq": {"4": "2020-04 AD"}, "result_indices": [2, 3]}
+          {"id": 1, "count": 1, "results_eq": {"4": "2020-03 AD"}, "result_indices": [0]},
+          {"id": 2, "count": 2, "results_eq": {"4": "2020-04 AD"}, "result_indices": [1, 2]}
         ]
       }
     }$j$ || jsonb_build_object(
@@ -3230,7 +3230,7 @@ BEGIN
         "columns": [4],
         "preproc": ["truncate_to_year"],
         "groups": [
-          {"id": 1, "count": 8, "results_eq": {"4": "2020 AD"}, "result_indices": [1, 2, 3, 4, 5]}
+          {"id": 1, "count": 8, "results_eq": {"4": "2020 AD"}, "result_indices": [0, 1, 2, 3, 4]}
         ]
       }
     }$j$ || jsonb_build_object(

From ceaede403a9ffdf4b7f82e80110bbce8c455b74a Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 13 Aug 2024 14:12:29 +0800
Subject: [PATCH 0624/1141] modify record deleter function to be forgiving
 about types

---
 db/sql/00_msar.sql      | 11 ++++-------
 db/sql/test_00_msar.sql | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index eb94c36ab4..2fda5dba09 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3327,6 +3327,7 @@ INSERT INTO msar.expr_templates VALUES
   -- json(b) filters and expressions
   ('json_array_length', 'jsonb_array_length((%s)::jsonb)'),
   ('json_array_contains', '(%s)::jsonb @> (%s)::jsonb'),
+  ('element_in_json_array_untyped', '(%s)::text IN (SELECT jsonb_array_elements_text(%s))'),
   ('convert_to_json', 'to_jsonb(%s)'),
   -- date part extractors
   ('truncate_to_year', 'to_char((%s)::date, ''YYYY AD'')'),
@@ -3790,13 +3791,9 @@ BEGIN
     msar.get_relation_name(tab_id),
     msar.build_where_clause(
       tab_id, jsonb_build_object(
-        'type', 'json_array_contains', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'literal', 'value', rec_ids),
-          jsonb_build_object(
-            'type', 'convert_to_json', 'args', jsonb_build_array(
-              jsonb_build_object('type', 'attnum', 'value', msar.get_pk_column(tab_id))
-            )
-          )
+        'type', 'element_in_json_array_untyped', 'args', jsonb_build_array(
+          jsonb_build_object('type', 'attnum', 'value', msar.get_pk_column(tab_id)),
+          jsonb_build_object('type', 'literal', 'value', rec_ids)
         )
       )
     )
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index cf6b255d3b..9c0030deaa 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -3900,6 +3900,26 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+CREATE OR REPLACE FUNCTION test_delete_records_from_table_stringy_pkey() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+  delete_result integer;
+BEGIN
+  PERFORM __setup_list_records_table();
+  rel_id := 'atable'::regclass::oid;
+  delete_result := msar.delete_records_from_table(
+    rel_id,
+    '["1", "2"]'
+  );
+  RETURN NEXT is(delete_result, 2);
+  RETURN NEXT results_eq(
+    'SELECT id FROM atable ORDER BY id',
+    $v$VALUES ('3'::integer)$v$
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
 CREATE OR REPLACE FUNCTION __setup_add_record_table() RETURNS SETOF TEXT AS $$
 BEGIN
   PERFORM __setup_list_records_table();

From c078a44fe5b9c7b2e3791a8d1922a163b7981cd8 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 13 Aug 2024 15:08:07 +0800
Subject: [PATCH 0625/1141] add mathesar formatting so pkeys can be submitted
 as expected

---
 db/sql/00_msar.sql | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 2fda5dba09..e95ae348d7 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3337,7 +3337,9 @@ INSERT INTO msar.expr_templates VALUES
   ('uri_scheme', 'mathesar_types.uri_scheme(%s)'),
   ('uri_authority', 'mathesar_types.uri_authority(%s)'),
   -- Email part getters
-  ('email_domain', 'mathesar_types.email_domain_name(%s)')
+  ('email_domain', 'mathesar_types.email_domain_name(%s)'),
+  -- Data formatter which is sometimes useful in comparison
+  ('format_data', 'msar.format_data(%s)')
 ;
 
 CREATE OR REPLACE FUNCTION msar.build_expr(rel_id oid, tree jsonb) RETURNS text AS $$
@@ -3792,7 +3794,11 @@ BEGIN
     msar.build_where_clause(
       tab_id, jsonb_build_object(
         'type', 'element_in_json_array_untyped', 'args', jsonb_build_array(
-          jsonb_build_object('type', 'attnum', 'value', msar.get_pk_column(tab_id)),
+          jsonb_build_object(
+            'type', 'format_data', 'args', jsonb_build_array(
+              jsonb_build_object('type', 'attnum', 'value', msar.get_pk_column(tab_id))
+            )
+          ),
           jsonb_build_object('type', 'literal', 'value', rec_ids)
         )
       )

From 0807a717a02f902c25b17e70b8f5230e94a719db Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 13 Aug 2024 09:11:41 -0400
Subject: [PATCH 0626/1141] Adapt front end to new records grouping API

---
 mathesar_ui/src/api/rpc/records.ts            | 85 ++++++-------------
 .../operations/preprocFunctions.ts            |  6 +-
 mathesar_ui/src/stores/table-data/grouping.ts | 18 ++--
 mathesar_ui/src/stores/table-data/records.ts  | 19 ++---
 4 files changed, 40 insertions(+), 88 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/records.ts b/mathesar_ui/src/api/rpc/records.ts
index 1a000d7e8c..055e3f3cd9 100644
--- a/mathesar_ui/src/api/rpc/records.ts
+++ b/mathesar_ui/src/api/rpc/records.ts
@@ -1,25 +1,6 @@
 import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
 
-export interface Grouping {
-  /** Each string is a column id */
-  columns: number[];
-  mode: GroupingMode;
-  /**
-   * Preproc needs to contain id of a preproc function.
-   * The number of preproc functions should match the
-   * number of columns, or it should be null.
-   */
-  preproc: (string | null)[] | null;
-  /**
-   * When `mode` === 'distinct', `num_groups` will always be `null`.
-   *
-   * When `mode` === 'percentile', `num_groups` will give the number of groups,
-   * as specified in the request params.
-   */
-  num_groups: number | null;
-  ranged: boolean;
-  groups: Group[] | null;
-}
+export type ResultValue = string | number | boolean | null;
 
 export type SortDirection = 'asc' | 'desc';
 export interface SortingEntry {
@@ -43,7 +24,6 @@ export interface SqlComparison {
     | 'json_array_contains';
   args: [SqlExpr, SqlExpr];
 }
-
 export interface SqlFunction {
   type:
     | 'null'
@@ -54,65 +34,52 @@ export interface SqlFunction {
     | 'email_domain';
   args: [SqlExpr];
 }
-
 export interface SqlLiteral {
   type: 'literal';
   value: string | number | null;
 }
-
 export interface SqlColumn {
   type: 'attnum';
   value: number;
 }
-
 export type SqlExpr = SqlComparison | SqlFunction | SqlLiteral | SqlColumn;
 
+export interface Group {
+  /**
+   * The total number of records in the group, even if the group extends beyond
+   * the current page of records.
+   */
+  count: number;
+  /**
+   * Keys are stringified column attnums. Values are the values of those
+   * columns _after_ the preproc functions have been applied.
+   */
+  results_eq: Record<string, ResultValue>;
+  result_indices: number[];
+}
+export interface Grouping {
+  /** Each value is a column attnum */
+  columns: number[];
+  preproc: (string | null)[];
+}
+export interface GroupingResponse extends Grouping {
+  groups: Group[] | null;
+}
+
 export interface RecordsListParams {
   database_id: number;
   table_oid: number;
   limit?: number;
   offset?: number;
   order?: SortingEntry[];
-  group?: Pick<Grouping, 'columns' | 'preproc'>;
+  grouping?: Grouping;
   filter?: SqlExpr;
   search_fuzzy?: Record<string, unknown>[];
 }
 
-export type ResultValue = string | number | boolean | null;
-
 /** keys are stringified column ids */
 export type Result = Record<string, ResultValue>;
 
-export type GroupingMode = 'distinct' | 'percentile';
-
-export interface Group {
-  /**
-   * The total number of records in the group, even if the group extends beyond
-   * the current page of records.
-   */
-  count: number;
-  /**
-   * eq_value will contain preprocessed value when grouping contains preproc
-   * functions. In other cases, it will be identical to first_value.
-   */
-  eq_value: Result;
-  first_value: Result;
-  /**
-   * When GroupingMode is 'distinct', then `first_value` and `last_value` will
-   * be identical. Separate first and last values are useful when GroupingMode
-   * is 'percentile'. In that case, the first and last values refer to the
-   * values in the order used for window function in the ranged grouping (which
-   * may not be the same as the order used to sort the result set).
-   */
-  last_value: Result;
-  /**
-   * Each number refers to the index of a record in the response result. This
-   * array will only indices for records returned on the page. If the page is
-   * too small to show all the records, some indices will be missing here.
-   */
-  result_indices: number[];
-}
-
 /**
  * Provides the data necessary to render one Record Summary, given a summary
  * template. The template will contain column aliases enclosed in curly braces
@@ -127,7 +94,7 @@ export interface Group {
  * value to be rendered within the template. Because record summaries can be
  * transitive, the value may lie within a column several tables away. The alias
  * needs to represent the full path so that we avoid collisions between two FK
- * columns which point to the same table. The front end does not need to parse
+ * columns whitttch point to the same table. The front end does not need to parse
  * the column alias -- it just needs to match aliases within templates to
  * aliases within sets of input data.
  *
@@ -150,7 +117,7 @@ export interface ApiDataForRecordSummariesInFkColumn {
 
 export interface RecordsResponse {
   count: number;
-  grouping: Grouping | null;
+  grouping: GroupingResponse | null;
   results: Result[];
   /**
    * Each item in this array can be matched to each FK column in the table.
diff --git a/mathesar_ui/src/stores/abstract-types/operations/preprocFunctions.ts b/mathesar_ui/src/stores/abstract-types/operations/preprocFunctions.ts
index ad2a03b6ba..33be7922d1 100644
--- a/mathesar_ui/src/stores/abstract-types/operations/preprocFunctions.ts
+++ b/mathesar_ui/src/stores/abstract-types/operations/preprocFunctions.ts
@@ -26,19 +26,19 @@ const preprocFunctionsResponse: AbstractTypePreprocFunctionsResponse[] = [
     returns: abstractTypeCategory.Text,
   },
   {
-    id: 'extract_uri_scheme',
+    id: 'uri_scheme',
     name: 'URI scheme',
     appliesTo: [abstractTypeCategory.Uri],
     returns: abstractTypeCategory.Text,
   },
   {
-    id: 'extract_uri_authority',
+    id: 'uri_authority',
     name: 'URI Authority',
     appliesTo: [abstractTypeCategory.Uri],
     returns: abstractTypeCategory.Text,
   },
   {
-    id: 'extract_email_domain',
+    id: 'email_domain',
     name: 'Domain',
     appliesTo: [abstractTypeCategory.Email],
     returns: abstractTypeCategory.Text,
diff --git a/mathesar_ui/src/stores/table-data/grouping.ts b/mathesar_ui/src/stores/table-data/grouping.ts
index 4dbafb7511..dc77e792c6 100644
--- a/mathesar_ui/src/stores/table-data/grouping.ts
+++ b/mathesar_ui/src/stores/table-data/grouping.ts
@@ -75,23 +75,15 @@ export class Grouping {
     });
   }
 
-  recordsRequestParams(): Pick<RecordsListParams, 'group'> {
+  recordsRequestParams(): Pick<RecordsListParams, 'grouping'> {
     if (!this.entries.length) {
       return {};
     }
-    const request: RecordsListParams['group'] = {
-      columns: [],
-      preproc: [],
-    };
-    this.entries.forEach((entry) => {
-      request.columns.push(entry.columnId);
-      request.preproc?.push(entry.preprocFnId ?? null);
-    });
-    if (request.preproc?.every((entry) => !isDefinedNonNullable(entry))) {
-      request.preproc = null;
-    }
     return {
-      group: request,
+      grouping: {
+        columns: this.entries.map((e) => e.columnId),
+        preproc: this.entries.map((e) => e.preprocFnId ?? null),
+      },
     };
   }
 
diff --git a/mathesar_ui/src/stores/table-data/records.ts b/mathesar_ui/src/stores/table-data/records.ts
index 48eca6d941..7b84112523 100644
--- a/mathesar_ui/src/stores/table-data/records.ts
+++ b/mathesar_ui/src/stores/table-data/records.ts
@@ -13,9 +13,8 @@ import type { Column } from '@mathesar/api/rpc/columns';
 import type { Database } from '@mathesar/api/rpc/databases';
 import type {
   Group as ApiGroup,
-  Grouping as ApiGrouping,
+  GroupingResponse as ApiGroupingResponse,
   Result as ApiRecord,
-  GroupingMode,
   RecordsListParams,
   RecordsResponse,
 } from '@mathesar/api/rpc/records';
@@ -51,34 +50,28 @@ export interface RecordsRequestParamsData {
 
 export interface RecordGroup {
   count: number;
-  eqValue: ApiGroup['eq_value'];
-  firstValue: ApiGroup['first_value'];
-  lastValue: ApiGroup['last_value'];
+  eqValue: ApiGroup['results_eq'];
   resultIndices: number[];
 }
 
 export interface RecordGrouping {
   columnIds: number[];
   preprocIds: (string | null)[];
-  mode: GroupingMode;
   groups: RecordGroup[];
 }
 
 function buildGroup(apiGroup: ApiGroup): RecordGroup {
   return {
     count: apiGroup.count,
-    eqValue: apiGroup.eq_value,
-    firstValue: apiGroup.first_value,
-    lastValue: apiGroup.last_value,
+    eqValue: apiGroup.results_eq,
     resultIndices: apiGroup.result_indices,
   };
 }
 
-function buildGrouping(apiGrouping: ApiGrouping): RecordGrouping {
+function buildGrouping(apiGrouping: ApiGroupingResponse): RecordGrouping {
   return {
     columnIds: apiGrouping.columns,
     preprocIds: apiGrouping.preproc ?? [],
-    mode: apiGrouping.mode,
     groups: (apiGrouping.groups ?? []).map(buildGroup),
   };
 }
@@ -98,7 +91,7 @@ export interface NewRecordRow extends RecordRow {
 
 export interface GroupHeaderRow extends BaseRow {
   group: RecordGroup;
-  groupValues: ApiGroup['first_value'];
+  groupValues: ApiGroup['results_eq'];
 }
 
 export interface HelpTextRow extends BaseRow {
@@ -230,7 +223,7 @@ function preprocessRecords({
         if (group.eqValue[columnId] !== undefined) {
           groupValues[columnId] = group.eqValue[columnId];
         } else {
-          groupValues[columnId] = group.firstValue[columnId];
+          groupValues[columnId] = group.eqValue[columnId];
         }
       });
       combinedRecords.push({

From 6910525c1944e6a0ccf4071beddaf000e1a7c0f8 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 13 Aug 2024 22:26:30 +0800
Subject: [PATCH 0627/1141] fix documentation to align with array indices
 rather than pkeys

---
 mathesar/rpc/records.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index 504673b976..39b8dbe173 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -104,12 +104,13 @@ class Group(TypedDict):
         id: The id of the group. Consistent for same input.
         count: The number of items in the group.
         results_eq: The value the results of the group equal.
-        result_indices: The primary key values of group members.
+        result_indices: The 0-indexed positions of group members in the
+            results array.
     """
     id: int
     count: int
     results_eq: list[dict]
-    result_indices: list[Any]
+    result_indices: list[int]
 
 
 class GroupingResponse(TypedDict):

From f4d345260bf4dc964d9a15351fea856a04a90ade Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 13 Aug 2024 13:25:34 -0400
Subject: [PATCH 0628/1141] Fix regression breaking placeholder row

---
 mathesar_ui/src/systems/table-view/Body.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mathesar_ui/src/systems/table-view/Body.svelte b/mathesar_ui/src/systems/table-view/Body.svelte
index 2b9899e4a6..4fec54d0a5 100644
--- a/mathesar_ui/src/systems/table-view/Body.svelte
+++ b/mathesar_ui/src/systems/table-view/Body.svelte
@@ -25,6 +25,7 @@
   $: ({ oid } = table);
   $: ({ displayableRecords } = display);
   $: ({ pkColumn } = columnsDataStore);
+  $: canEditTableRecords = true; // TODO_BETA: Implement permissions here
 
   function getItemSizeFromRow(row: RowType) {
     if (isHelpTextRow(row)) {
@@ -62,7 +63,7 @@
     >
       <ScrollAndResetHandler {api} />
       {#each items as item (item.key)}
-        {#if $displayableRecords[item.index] && !isPlaceholderRow($displayableRecords[item.index])}
+        {#if $displayableRecords[item.index] && !(isPlaceholderRow($displayableRecords[item.index]) && !canEditTableRecords)}
           <Row style={item.style} bind:row={$displayableRecords[item.index]} />
         {/if}
       {/each}

From e58b09a15de40bab6b246b49840faa87218137bc Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 13 Aug 2024 13:54:24 -0400
Subject: [PATCH 0629/1141] Use records.add RPC method on front end

---
 mathesar_ui/src/api/rpc/records.ts           | 10 +++
 mathesar_ui/src/stores/table-data/records.ts | 95 ++++++++++----------
 2 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/records.ts b/mathesar_ui/src/api/rpc/records.ts
index 1a000d7e8c..ed1bb4d6bd 100644
--- a/mathesar_ui/src/api/rpc/records.ts
+++ b/mathesar_ui/src/api/rpc/records.ts
@@ -159,5 +159,15 @@ export interface RecordsResponse {
 }
 
 export const records = {
+  add: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      table_oid: number;
+      /** Keys are stringified attnums */
+      record_def: Record<string, ResultValue>;
+    },
+    Pick<RecordsResponse, 'results' | 'preview_data'>
+  >(),
+
   list: rpcMethodTypeContainer<RecordsListParams, RecordsResponse>(),
 };
diff --git a/mathesar_ui/src/stores/table-data/records.ts b/mathesar_ui/src/stores/table-data/records.ts
index 48eca6d941..10d8828fdc 100644
--- a/mathesar_ui/src/stores/table-data/records.ts
+++ b/mathesar_ui/src/stores/table-data/records.ts
@@ -643,55 +643,58 @@ export class RecordsData {
     const rowKeyOfBlankRow = getRowKey(row, pkColumn?.id);
     this.meta.rowCreationStatus.set(rowKeyOfBlankRow, { state: 'processing' });
     this.createPromises?.get(rowKeyOfBlankRow)?.cancel();
-    const requestRecord = {
-      ...Object.fromEntries(this.contextualFilters),
-      ...row.record,
-    };
-
-    throw new Error('Not implemented'); // TODO_BETA
 
-    // const promise = postAPI<RecordsResponse>(this.url, requestRecord);
-    // if (!this.createPromises) {
-    //   this.createPromises = new Map();
-    // }
-    // this.createPromises.set(rowKeyOfBlankRow, promise);
+    const promise = api.records
+      .add({
+        ...this.apiContext,
+        record_def: {
+          ...Object.fromEntries(this.contextualFilters),
+          ...row.record,
+        },
+      })
+      .run();
+
+    if (!this.createPromises) {
+      this.createPromises = new Map();
+    }
+    this.createPromises.set(rowKeyOfBlankRow, promise);
 
-    // try {
-    //   const response = await promise;
-    //   const record = response.results[0];
-    //   let newRow: NewRecordRow = {
-    //     ...row,
-    //     record,
-    //   };
-    //   if (isPlaceholderRow(newRow)) {
-    //     const { isAddPlaceholder, ...newRecordRow } = newRow;
-    //     newRow = newRecordRow;
-    //   }
+    try {
+      const response = await promise;
+      const record = response.results[0];
+      let newRow: NewRecordRow = {
+        ...row,
+        record,
+      };
+      if (isPlaceholderRow(newRow)) {
+        const { isAddPlaceholder, ...newRecordRow } = newRow;
+        newRow = newRecordRow;
+      }
 
-    //   const rowKeyWithRecord = getRowKey(newRow, pkColumn?.id);
-    //   this.meta.rowCreationStatus.delete(rowKeyOfBlankRow);
-    //   this.meta.rowCreationStatus.set(rowKeyWithRecord, { state: 'success' });
-    //   this.newRecords.update((existing) =>
-    //     existing.map((entry) => {
-    //       if (entry.identifier === row.identifier) {
-    //         return newRow;
-    //       }
-    //       return entry;
-    //     }),
-    //   );
-    //   this.totalCount.update((count) => (count ?? 0) + 1);
-    //   return newRow;
-    // } catch (err) {
-    //   this.meta.rowCreationStatus.set(rowKeyOfBlankRow, {
-    //     state: 'failure',
-    //     errors: [getErrorMessage(err)],
-    //   });
-    // } finally {
-    //   if (this.createPromises.get(rowKeyOfBlankRow) === promise) {
-    //     this.createPromises.delete(rowKeyOfBlankRow);
-    //   }
-    // }
-    // return row;
+      const rowKeyWithRecord = getRowKey(newRow, pkColumn?.id);
+      this.meta.rowCreationStatus.delete(rowKeyOfBlankRow);
+      this.meta.rowCreationStatus.set(rowKeyWithRecord, { state: 'success' });
+      this.newRecords.update((existing) =>
+        existing.map((entry) => {
+          if (entry.identifier === row.identifier) {
+            return newRow;
+          }
+          return entry;
+        }),
+      );
+      this.totalCount.update((count) => (count ?? 0) + 1);
+      return newRow;
+    } catch (err) {
+      this.meta.rowCreationStatus.set(rowKeyOfBlankRow, {
+        state: 'failure',
+        errors: [getErrorMessage(err)],
+      });
+    } finally {
+      if (this.createPromises.get(rowKeyOfBlankRow) === promise) {
+        this.createPromises.delete(rowKeyOfBlankRow);
+      }
+    }
+    return row;
   }
 
   async createOrUpdateRecord(

From 7de2308416aaca0bc9222e66e3161eb8f150d97d Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 13 Aug 2024 14:00:24 -0400
Subject: [PATCH 0630/1141] Use records.patch RPC method on front end

---
 mathesar_ui/src/api/rpc/records.ts           | 11 ++++
 mathesar_ui/src/stores/table-data/records.ts | 62 +++++++++++---------
 2 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/records.ts b/mathesar_ui/src/api/rpc/records.ts
index ed1bb4d6bd..beeb88f866 100644
--- a/mathesar_ui/src/api/rpc/records.ts
+++ b/mathesar_ui/src/api/rpc/records.ts
@@ -169,5 +169,16 @@ export const records = {
     Pick<RecordsResponse, 'results' | 'preview_data'>
   >(),
 
+  patch: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      table_oid: number;
+      record_id: ResultValue;
+      /** Keys are stringified attnums */
+      record_def: Record<string, ResultValue>;
+    },
+    Pick<RecordsResponse, 'results' | 'preview_data'>
+  >(),
+
   list: rpcMethodTypeContainer<RecordsListParams, RecordsResponse>(),
 };
diff --git a/mathesar_ui/src/stores/table-data/records.ts b/mathesar_ui/src/stores/table-data/records.ts
index 10d8828fdc..c11f256e9c 100644
--- a/mathesar_ui/src/stores/table-data/records.ts
+++ b/mathesar_ui/src/stores/table-data/records.ts
@@ -571,35 +571,39 @@ export class RecordsData {
     this.meta.cellModificationStatus.set(cellKey, { state: 'processing' });
     this.updatePromises?.get(cellKey)?.cancel();
 
-    throw new Error('Not implemented'); // TODO_BETA
-    // const promise = patchAPI<RecordsResponse>(
-    //   `${this.url}${String(primaryKeyValue)}/`,
-    //   { [column.id]: record[column.id] },
-    // );
-
-    // if (!this.updatePromises) {
-    //   this.updatePromises = new Map();
-    // }
-    // this.updatePromises.set(cellKey, promise);
-
-    // try {
-    //   const result = await promise;
-    //   this.meta.cellModificationStatus.set(cellKey, { state: 'success' });
-    //   return {
-    //     ...row,
-    //     record: result.results[0],
-    //   };
-    // } catch (err) {
-    //   this.meta.cellModificationStatus.set(cellKey, {
-    //     state: 'failure',
-    //     errors: [`Unable to save cell. ${getErrorMessage(err)}`],
-    //   });
-    // } finally {
-    //   if (this.updatePromises.get(cellKey) === promise) {
-    //     this.updatePromises.delete(cellKey);
-    //   }
-    // }
-    // return row;
+    const promise = api.records
+      .patch({
+        ...this.apiContext,
+        record_id: primaryKeyValue,
+        record_def: {
+          [String(column.id)]: record[column.id],
+        },
+      })
+      .run();
+
+    if (!this.updatePromises) {
+      this.updatePromises = new Map();
+    }
+    this.updatePromises.set(cellKey, promise);
+
+    try {
+      const result = await promise;
+      this.meta.cellModificationStatus.set(cellKey, { state: 'success' });
+      return {
+        ...row,
+        record: result.results[0],
+      };
+    } catch (err) {
+      this.meta.cellModificationStatus.set(cellKey, {
+        state: 'failure',
+        errors: [`Unable to save cell. ${getErrorMessage(err)}`],
+      });
+    } finally {
+      if (this.updatePromises.get(cellKey) === promise) {
+        this.updatePromises.delete(cellKey);
+      }
+    }
+    return row;
   }
 
   getNewEmptyRecord(): NewRecordRow {

From 80d4715d8585305fc5732d957a449ec64bb1b67e Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 13 Aug 2024 10:35:32 -0400
Subject: [PATCH 0631/1141] Use RPC records.delete to delete records

---
 mathesar_ui/src/api/rpc/records.ts           | 5 +++++
 mathesar_ui/src/stores/table-data/records.ts | 9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/records.ts b/mathesar_ui/src/api/rpc/records.ts
index beeb88f866..ddbae7f716 100644
--- a/mathesar_ui/src/api/rpc/records.ts
+++ b/mathesar_ui/src/api/rpc/records.ts
@@ -181,4 +181,9 @@ export const records = {
   >(),
 
   list: rpcMethodTypeContainer<RecordsListParams, RecordsResponse>(),
+
+  delete: rpcMethodTypeContainer<
+    { database_id: number; table_oid: number; record_ids: ResultValue[] },
+    void
+  >(),
 };
diff --git a/mathesar_ui/src/stores/table-data/records.ts b/mathesar_ui/src/stores/table-data/records.ts
index c11f256e9c..0e170b62b4 100644
--- a/mathesar_ui/src/stores/table-data/records.ts
+++ b/mathesar_ui/src/stores/table-data/records.ts
@@ -485,8 +485,13 @@ export class RecordsData {
     if (keysToDelete.length > 0) {
       const recordIds = [...keysToDelete];
       try {
-        throw new Error('Not implemented'); // TODO_BETA
-        // await deleteAPI<RowKey>(bulkDeleteURL, { pks: recordIds });
+        await api.records
+          .delete({
+            database_id: this.apiContext.database_id,
+            table_oid: this.apiContext.table_oid,
+            record_ids: recordIds,
+          })
+          .run();
         keysToDelete.forEach((key) => successRowKeys.add(key));
       } catch (error) {
         failures.set(keysToDelete.join(','), getErrorMessage(error));

From 7e53185702a685d0f9604be99b1957a339f98487 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 13 Aug 2024 12:13:06 -0400
Subject: [PATCH 0632/1141] Allow confirmation to pass value to success handler

---
 .../confirmation/Confirmation.svelte          |  4 +-
 .../confirmation/ConfirmationController.ts    | 37 ++++++++++---------
 mathesar_ui/src/stores/confirmation.ts        |  6 +--
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/mathesar_ui/src/component-library/confirmation/Confirmation.svelte b/mathesar_ui/src/component-library/confirmation/Confirmation.svelte
index 0e18864837..05d5d4289c 100644
--- a/mathesar_ui/src/component-library/confirmation/Confirmation.svelte
+++ b/mathesar_ui/src/component-library/confirmation/Confirmation.svelte
@@ -29,8 +29,8 @@
   async function handleProceedButton() {
     try {
       allowClose = false;
-      await onProceed();
-      onSuccess();
+      const result = await onProceed();
+      onSuccess(result);
       $resolve(true);
       modal.close();
     } catch (error) {
diff --git a/mathesar_ui/src/component-library/confirmation/ConfirmationController.ts b/mathesar_ui/src/component-library/confirmation/ConfirmationController.ts
index 85fb7c1c00..d79a672d5b 100644
--- a/mathesar_ui/src/component-library/confirmation/ConfirmationController.ts
+++ b/mathesar_ui/src/component-library/confirmation/ConfirmationController.ts
@@ -10,18 +10,18 @@ interface ButtonDetails {
   icon?: IconProps;
 }
 
-export interface ConfirmationProps {
+export interface ConfirmationProps<T> {
   title?: string | ComponentAndProps;
   /** An array of strings will be transformed into paragraphs. */
   body: string | string[] | ComponentAndProps;
   proceedButton: ButtonDetails;
   cancelButton: ButtonDetails;
-  onProceed: () => Promise<void>;
-  onSuccess: () => void;
+  onProceed: () => Promise<T>;
+  onSuccess: (value: T) => void;
   onError: (error: Error) => void;
 }
 
-const baseConfirmationProps: ConfirmationProps = {
+const baseConfirmationProps: ConfirmationProps<unknown> = {
   body: 'Are you sure?',
   proceedButton: {
     label: 'Yes',
@@ -37,7 +37,7 @@ const baseConfirmationProps: ConfirmationProps = {
 export class ConfirmationController {
   modal: ModalController;
 
-  confirmationProps: Writable<ConfirmationProps>;
+  confirmationProps: Writable<ConfirmationProps<unknown>>;
 
   resolve = writable<(isConfirmed: boolean) => void>(() => {});
 
@@ -45,7 +45,7 @@ export class ConfirmationController {
 
   constructor(
     modalController: ModalController,
-    initialConfirmationProps: ConfirmationProps,
+    initialConfirmationProps: ConfirmationProps<unknown>,
   ) {
     this.modal = modalController;
     this.confirmationProps = writable(initialConfirmationProps);
@@ -53,7 +53,7 @@ export class ConfirmationController {
 }
 
 interface MakeConfirm {
-  confirm: (props: Partial<ConfirmationProps>) => Promise<boolean>;
+  confirm: <T>(props: Partial<ConfirmationProps<T>>) => Promise<boolean>;
   confirmationController: ConfirmationController;
 }
 
@@ -62,7 +62,7 @@ export function makeConfirm({
   defaultConfirmationProps,
 }: {
   confirmationModal: ModalController;
-  defaultConfirmationProps?: ConfirmationProps;
+  defaultConfirmationProps?: ConfirmationProps<unknown>;
 }): MakeConfirm {
   const fullDefaultConfirmationProps = {
     ...baseConfirmationProps,
@@ -72,16 +72,19 @@ export function makeConfirm({
     confirmationModal,
     fullDefaultConfirmationProps,
   );
-  async function confirm(props: Partial<ConfirmationProps>) {
-    return new Promise<boolean>((resolve) => {
-      controller.resolve.set(resolve);
-      controller.canProceed.set(true);
-      controller.confirmationProps.set({
+  return {
+    async confirm(props) {
+      const fullProps = {
         ...fullDefaultConfirmationProps,
         ...props,
+      } as ConfirmationProps<unknown>;
+      return new Promise<boolean>((resolve) => {
+        controller.resolve.set(resolve);
+        controller.canProceed.set(true);
+        controller.confirmationProps.set(fullProps);
+        controller.modal.open();
       });
-      controller.modal.open();
-    });
-  }
-  return { confirm, confirmationController: controller };
+    },
+    confirmationController: controller,
+  };
 }
diff --git a/mathesar_ui/src/stores/confirmation.ts b/mathesar_ui/src/stores/confirmation.ts
index bbd5d17e7b..6f3095a677 100644
--- a/mathesar_ui/src/stores/confirmation.ts
+++ b/mathesar_ui/src/stores/confirmation.ts
@@ -15,15 +15,15 @@ export const { confirm, confirmationController } = makeConfirm({
   confirmationModal,
 });
 
-interface ConfirmDeleteProps extends Partial<ConfirmationProps> {
+interface ConfirmDeleteProps<T> extends Partial<ConfirmationProps<T>> {
   /** e.g. the name of the table, column, etc */
   identifierName?: string;
   /** the "thing" you're deleting, e.g. 'column', 'table', 'tables', '3 rows' etc. */
   identifierType: string;
 }
 
-export function confirmDelete(
-  props: ConfirmDeleteProps,
+export function confirmDelete<T>(
+  props: ConfirmDeleteProps<T>,
 ): ReturnType<typeof confirm> {
   const type = props.identifierType;
 

From 2926e7e39e9f7c48161f5eff468473df10ff66e9 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 13 Aug 2024 12:13:17 -0400
Subject: [PATCH 0633/1141] Show correct number of deleted records in toast
 message

---
 mathesar_ui/src/stores/table-data/records.ts               | 7 +++++--
 .../table-view/table-inspector/record/RowActions.svelte    | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mathesar_ui/src/stores/table-data/records.ts b/mathesar_ui/src/stores/table-data/records.ts
index 0e170b62b4..66b197fb4b 100644
--- a/mathesar_ui/src/stores/table-data/records.ts
+++ b/mathesar_ui/src/stores/table-data/records.ts
@@ -444,7 +444,8 @@ export class RecordsData {
     return undefined;
   }
 
-  async deleteSelected(rowSelectionIds: Iterable<string>): Promise<void> {
+  /** @returns the number of selected rows deleted */
+  async deleteSelected(rowSelectionIds: Iterable<string>): Promise<number> {
     const ids =
       typeof rowSelectionIds === 'string' ? [rowSelectionIds] : rowSelectionIds;
     const pkColumn = get(this.columnsDataStore.pkColumn);
@@ -464,7 +465,7 @@ export class RecordsData {
     const rowKeys = [...primaryKeysOfSavedRows, ...identifiersOfUnsavedRows];
 
     if (rowKeys.length === 0) {
-      return;
+      return 0;
     }
 
     this.meta.rowDeletionStatus.setMultiple(rowKeys, { state: 'processing' });
@@ -547,6 +548,8 @@ export class RecordsData {
       const apiMsg = [...failures.values()].join('\n');
       throw new Error(`${uiMsg} ${apiMsg}`);
     }
+
+    return primaryKeysOfSavedRows.length + identifiersOfUnsavedRows.length;
   }
 
   // TODO: It would be better to throw errors instead of silently failing
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
index 377bd933c7..3b89b9ec7f 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
@@ -52,10 +52,10 @@
       ],
       onProceed: () => recordsData.deleteSelected(selectedRowIds),
       onError: (e) => toast.fromError(e),
-      onSuccess: () => {
+      onSuccess: (count) => {
         toast.success({
           title: $_('count_records_deleted_successfully', {
-            values: { count: selectedRowCount },
+            values: { count },
           }),
         });
       },

From d701e0c9f50a38341f2575d90a723e5b913bf8fa Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 14 Aug 2024 23:52:31 +0530
Subject: [PATCH 0634/1141] add sql for get_curr_role_db_priv

---
 db/roles/operations/select.py |  4 ++++
 db/sql/00_msar.sql            | 29 +++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/db/roles/operations/select.py b/db/roles/operations/select.py
index 7e22e0f3b2..1d2b29aa94 100644
--- a/db/roles/operations/select.py
+++ b/db/roles/operations/select.py
@@ -7,3 +7,7 @@ def get_roles(conn):
 
 def list_db_priv(db_name, conn):
     return exec_msar_func(conn, 'list_db_priv', db_name).fetchone()[0]
+
+
+def get_curr_role_db_priv(db_name, conn):
+    return exec_msar_func(conn, 'get_curr_role_db_priv', db_name).fetchone()[0]
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 406844459f..a902607320 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -974,6 +974,35 @@ SELECT COALESCE(jsonb_agg(priv_cte.p), '[]'::jsonb) FROM priv_cte;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION msar.get_curr_role_db_priv(db_name text) RETURNS jsonb AS $$/*
+Given a database name, returns a json object with database owner oid and database privileges
+for the role executing the function.
+
+The returned JSON object has the form:
+  {
+    "owner_oid": <int>,
+    "current_role_db_priv" [<str>]
+  }
+*/
+WITH priv_cte AS (
+  SELECT unnest(
+    ARRAY[
+      CASE WHEN has_database_privilege(pgd.oid, 'CREATE') THEN 'CREATE' END,
+      CASE WHEN has_database_privilege(pgd.oid, 'TEMPORARY') THEN 'TEMPORARY' END,
+      CASE WHEN has_database_privilege(pgd.oid, 'CONNECT') THEN 'CONNECT' END
+    ]
+  ) AS p 
+  FROM pg_catalog.pg_database AS pgd WHERE pgd.datname = db_name
+)
+SELECT jsonb_build_object(
+  'owner_oid', pgd.datdba,
+  'current_role_db_priv', COALESCE(jsonb_agg(priv_cte.p), '[]'::jsonb)
+) FROM pg_catalog.pg_database AS pgd, priv_cte
+WHERE pgd.datname = db_name AND priv_cte.p IS NOT NULL
+GROUP BY pgd.datdba;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 -- ROLE MANIPULATION FUNCTIONS

From b1602f0f0c49afd8dd04659b0c958d9a0aa7f348 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 15 Aug 2024 00:05:25 +0530
Subject: [PATCH 0635/1141] add rpc function, test and docs

---
 docs/docs/api/rpc.md                 |  2 ++
 mathesar/rpc/database_privileges.py  | 41 +++++++++++++++++++++++++++-
 mathesar/tests/rpc/test_endpoints.py |  5 ++++
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index da1292cded..23eb0deea9 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -83,7 +83,9 @@ To use an RPC function:
     options:
       members:
       - list_direct
+      - get_curr_role_priv
       - DBPrivileges
+      - CurrentDBPrivileges
 
 ## Database Setup
 
diff --git a/mathesar/rpc/database_privileges.py b/mathesar/rpc/database_privileges.py
index 8835d793bd..0ab9e0effd 100644
--- a/mathesar/rpc/database_privileges.py
+++ b/mathesar/rpc/database_privileges.py
@@ -3,7 +3,7 @@
 from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
 
-from db.roles.operations.select import list_db_priv
+from db.roles.operations.select import list_db_priv, get_curr_role_db_priv
 from mathesar.rpc.utils import connect
 from mathesar.models.base import Database
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
@@ -28,6 +28,25 @@ def from_dict(cls, d):
         )
 
 
+class CurrentDBPrivileges(TypedDict):
+    """
+    Information about database privileges for current user.
+
+    Attributes:
+        owner_oid: The `oid` of the owner of the database.
+        current_role_db_priv: A list of database privileges for the current user.
+    """
+    owner_oid: int
+    current_role_db_priv: list[str]
+
+    @classmethod
+    def from_dict(cls, d):
+        return cls(
+            owner_oid=d["owner_oid"],
+            current_role_db_priv=d["current_role_db_priv"]
+        )
+
+
 @rpc_method(name="database_privileges.list_direct")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
@@ -46,3 +65,23 @@ def list_direct(*, database_id: int, **kwargs) -> list[DBPrivileges]:
         db_name = Database.objects.get(id=database_id).name
         raw_db_priv = list_db_priv(db_name, conn)
     return [DBPrivileges.from_dict(i) for i in raw_db_priv]
+
+
+@rpc_method(name="database_privileges.get_curr_role_priv")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def get_curr_role_priv(*, database_id: int, **kwargs) -> CurrentDBPrivileges:
+    """
+    Get database privileges for the current user.
+
+    Args:
+        database_id: The Django id of the database.
+
+    Returns:
+        A dict describing current user's database privilege.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        db_name = Database.objects.get(id=database_id).name
+        curr_role_db_priv = get_curr_role_db_priv(db_name, conn)
+    return CurrentDBPrivileges.from_dict(curr_role_db_priv)
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 10ceee0ca7..8062e2b8e7 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -135,6 +135,11 @@
         "database_privileges.list_direct",
         [user_is_authenticated]
     ),
+    (
+        database_privileges.get_curr_role_priv,
+        "database_privileges.get_curr_role_priv",
+        [user_is_authenticated]
+    ),
     (
         database_setup.create_new,
         "database_setup.create_new",

From 83e9fb680ecc84449833ef433ee250ccc196f66a Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 15 Aug 2024 17:29:38 +0800
Subject: [PATCH 0636/1141] add first draft summary getting into record lister

---
 db/sql/00_msar.sql | 104 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 101 insertions(+), 3 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 406844459f..712752283d 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3632,6 +3632,100 @@ WHERE
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION msar.get_default_summary_column(tab_id oid) RETURNS smallint AS $$/*
+Choose a column to use for summarizing rows of a table.
+
+If a string type column exists, we choose the one with a minimal attnum. If no such column exists,
+we just return the column (of any type) with minimum attnum.
+
+Only columns to which the user has access are returned.
+
+Args:
+  tab_id: The OID of the table for which we're finding a good summary column
+*/
+SELECT attnum
+FROM pg_catalog.pg_attribute pga JOIN pg_catalog.pg_type pgt ON pga.atttypid = pgt.oid
+WHERE pga.attrelid = tab_id
+  AND pga.attnum > 0
+  AND NOT pga.attisdropped
+  AND has_column_privilege(pga.attrelid, pga.attnum, 'SELECT')
+ORDER BY (CASE WHEN pgt.typcategory='S' THEN 0 ELSE 1 END), pga.attnum
+LIMIT 1;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION msar.get_fkey_map_cte(tab_id oid)
+  RETURNS TABLE (target_oid oid, conkey smallint, confkey smallint)
+AS $$/*
+*/
+SELECT pgc.confrelid AS target_oid, x.conkey AS conkey, min(y.confkey) AS confkey
+FROM pg_constraint pgc, LATERAL unnest(conkey) x(conkey), LATERAL unnest(confkey) y(confkey)
+WHERE
+  pgc.conrelid = tab_id
+  AND pgc.contype='f'
+  AND cardinality(pgc.confkey) = 1
+  AND has_column_privilege(tab_id, x.conkey, 'SELECT')
+  AND has_column_privilege(pgc.confrelid, y.confkey, 'SELECT')
+GROUP BY pgc.confrelid, x.conkey
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION msar.build_summary_cte_expr_for_table(tab_id oid) RETURNS TEXT AS $$/*
+*/
+WITH fkey_map_cte AS (SELECT * FROM msar.get_fkey_map_cte(tab_id))
+SELECT ', ' || string_agg(
+  format(
+    $c$summary_cte_%1$s AS (
+      SELECT
+        msar.format_data(%2$I) AS key,
+        msar.format_data(%3$I)::text AS summary
+      FROM %4$I.%5$I
+    )$c$,
+    conkey,
+    msar.get_column_name(target_oid, confkey),
+    msar.get_column_name(target_oid, msar.get_default_summary_column(target_oid)),
+    msar.get_relation_schema_name(target_oid),
+    msar.get_relation_name(target_oid)
+  ), ', '
+)
+FROM fkey_map_cte;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.build_summary_join_expr_for_table(tab_id oid, cte_name text) RETURNS TEXT AS $$/*
+*/
+WITH fkey_map_cte AS (SELECT * FROM msar.get_fkey_map_cte(tab_id))
+SELECT string_agg(
+  format(
+    $j$
+    LEFT JOIN summary_cte_%1$s ON %2$I.%1$I = summary_cte_%1$s.key$j$,
+    conkey,
+    cte_name
+  ), ' '
+)
+FROM fkey_map_cte;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.build_summary_json_expr_for_table(tab_id oid) RETURNS TEXT AS $$/*
+*/
+WITH fkey_map_cte AS (SELECT * FROM msar.get_fkey_map_cte(tab_id))
+SELECT 'jsonb_build_object(' || string_agg(
+  format(
+    $j$
+    %1$L, jsonb_agg(
+      DISTINCT jsonb_build_object('key', summary_cte_%1$s.key, 'summary', summary_cte_%1$s.summary)
+    )
+    $j$,
+    conkey
+  ), ', '
+) || ')'
+FROM fkey_map_cte;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
 CREATE OR REPLACE FUNCTION
 msar.list_records_from_table(
   tab_id oid,
@@ -3667,15 +3761,16 @@ BEGIN
       SELECT *, row_number() OVER (%6$s) - 1 AS __mathesar_result_idx FROM enriched_results_cte
     ), groups_cte AS (
       SELECT %11$s
-    )
+    )%12$s
     SELECT jsonb_build_object(
       'results', %9$s,
       'count', coalesce(max(count_cte.count), 0),
       'grouping', %10$s,
+      'preview_data', %14$s,
       'query', $iq$SELECT %1$s FROM %2$I.%3$I %7$s %6$s LIMIT %4$L OFFSET %5$L$iq$
     )
     FROM enriched_results_cte
-      LEFT JOIN groups_cte ON enriched_results_cte.__mathesar_gid = groups_cte.id
+      LEFT JOIN groups_cte ON enriched_results_cte.__mathesar_gid = groups_cte.id %13$s
       CROSS JOIN count_cte
     $q$,
     msar.build_selectable_column_expr(tab_id),
@@ -3688,7 +3783,10 @@ BEGIN
     msar.build_grouping_expr(tab_id, group_),
     msar.build_results_jsonb_expr(tab_id, 'enriched_results_cte', order_),
     COALESCE(msar.build_grouping_results_jsonb_expr(tab_id, 'groups_cte', group_), 'NULL'),
-    COALESCE(msar.build_groups_cte_expr(tab_id, 'results_ranked_cte', group_), 'NULL AS id')
+    COALESCE(msar.build_groups_cte_expr(tab_id, 'results_ranked_cte', group_), 'NULL AS id'),
+    msar.build_summary_cte_expr_for_table(tab_id),
+    msar.build_summary_join_expr_for_table(tab_id, 'enriched_results_cte'),
+    COALESCE(msar.build_summary_json_expr_for_table(tab_id), 'NULL')
   ) INTO records;
   RETURN records;
 END;

From e64e1fec22822457e9d22f25a276459b0ed59921 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 15 Aug 2024 17:54:14 +0800
Subject: [PATCH 0637/1141] add record previews into search function

---
 db/sql/00_msar.sql | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 712752283d..79e57bec87 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3849,13 +3849,15 @@ BEGIN
       SELECT count(1) AS count FROM %2$I.%3$I %4$s
     ), results_cte AS (
       SELECT %1$s FROM %2$I.%3$I %4$s ORDER BY %6$s LIMIT %5$L
-    )
+    )%7$s
     SELECT jsonb_build_object(
       'results', coalesce(jsonb_agg(row_to_json(results_cte.*)), jsonb_build_array()),
       'count', coalesce(max(count_cte.count), 0),
+      'preview_data', %9$s,
       'query', $iq$SELECT %1$s FROM %2$I.%3$I %4$s ORDER BY %6$s LIMIT %5$L$iq$
     )
-    FROM results_cte, count_cte
+    FROM results_cte %8$s
+      CROSS JOIN count_cte
     $q$,
     msar.build_selectable_column_expr(tab_id),
     msar.get_relation_schema_name(tab_id),
@@ -3865,7 +3867,10 @@ BEGIN
     concat(
       msar.get_score_expr(tab_id, search_) || ' DESC, ',
       msar.build_total_order_expr(tab_id, null)
-    )
+    ),
+    msar.build_summary_cte_expr_for_table(tab_id),
+    msar.build_summary_join_expr_for_table(tab_id, 'results_cte'),
+    COALESCE(msar.build_summary_json_expr_for_table(tab_id), 'NULL')
   ) INTO records;
   RETURN records;
 END;

From 63dd1cbf5bff95d86a888884ddfe56a783a18709 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 15 Aug 2024 15:53:39 +0530
Subject: [PATCH 0638/1141] Reorganize items in databases directory

---
 .../src/pages/database/DatabasePage.svelte    | 22 +++++++++++++------
 .../src/pages/database/SettingsSection.svelte |  0
 .../SchemaConstituentCounts.svelte            |  0
 .../{ => schemas}/SchemaListSkeleton.svelte   |  0
 .../database/{ => schemas}/SchemaRow.svelte   |  0
 .../{ => schemas}/SchemasSection.svelte       |  2 +-
 .../database/settings/SettingsSection.svelte  |  3 +++
 .../src/pages/schema/SchemaPage.svelte        |  3 +--
 .../schemas}/AddEditSchemaModal.svelte        |  1 -
 9 files changed, 20 insertions(+), 11 deletions(-)
 delete mode 100644 mathesar_ui/src/pages/database/SettingsSection.svelte
 rename mathesar_ui/src/pages/database/{ => schemas}/SchemaConstituentCounts.svelte (100%)
 rename mathesar_ui/src/pages/database/{ => schemas}/SchemaListSkeleton.svelte (100%)
 rename mathesar_ui/src/pages/database/{ => schemas}/SchemaRow.svelte (100%)
 rename mathesar_ui/src/pages/database/{ => schemas}/SchemasSection.svelte (98%)
 create mode 100644 mathesar_ui/src/pages/database/settings/SettingsSection.svelte
 rename mathesar_ui/src/{pages/database => systems/schemas}/AddEditSchemaModal.svelte (97%)

diff --git a/mathesar_ui/src/pages/database/DatabasePage.svelte b/mathesar_ui/src/pages/database/DatabasePage.svelte
index 20cd2c336a..e286b3f829 100644
--- a/mathesar_ui/src/pages/database/DatabasePage.svelte
+++ b/mathesar_ui/src/pages/database/DatabasePage.svelte
@@ -21,8 +21,8 @@
     TabContainer,
   } from '@mathesar-component-library';
 
-  import SchemasSection from './SchemasSection.svelte';
-  import SettingsSection from './SettingsSection.svelte';
+  import SchemasSection from './schemas/SchemasSection.svelte';
+  import SettingsSection from './settings/SettingsSection.svelte';
 
   export let database: Database;
   export let section: string;
@@ -87,10 +87,18 @@
   </AppSecondaryHeader>
 
   <TabContainer {activeTab} {tabs} uniformTabWidth={false}>
-    {#if activeTab?.id === 'schemas'}
-      <SchemasSection {database} />
-    {:else if activeTab?.id === 'settings'}
-      <SettingsSection />
-    {/if}
+    <div class="tab-content">
+      {#if activeTab?.id === 'schemas'}
+        <SchemasSection {database} />
+      {:else if activeTab?.id === 'settings'}
+        <SettingsSection />
+      {/if}
+    </div>
   </TabContainer>
 </LayoutWithHeader>
+
+<style>
+  .tab-content {
+    padding: 1rem 0;
+  }
+</style>
diff --git a/mathesar_ui/src/pages/database/SettingsSection.svelte b/mathesar_ui/src/pages/database/SettingsSection.svelte
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/mathesar_ui/src/pages/database/SchemaConstituentCounts.svelte b/mathesar_ui/src/pages/database/schemas/SchemaConstituentCounts.svelte
similarity index 100%
rename from mathesar_ui/src/pages/database/SchemaConstituentCounts.svelte
rename to mathesar_ui/src/pages/database/schemas/SchemaConstituentCounts.svelte
diff --git a/mathesar_ui/src/pages/database/SchemaListSkeleton.svelte b/mathesar_ui/src/pages/database/schemas/SchemaListSkeleton.svelte
similarity index 100%
rename from mathesar_ui/src/pages/database/SchemaListSkeleton.svelte
rename to mathesar_ui/src/pages/database/schemas/SchemaListSkeleton.svelte
diff --git a/mathesar_ui/src/pages/database/SchemaRow.svelte b/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
similarity index 100%
rename from mathesar_ui/src/pages/database/SchemaRow.svelte
rename to mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
diff --git a/mathesar_ui/src/pages/database/SchemasSection.svelte b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
similarity index 98%
rename from mathesar_ui/src/pages/database/SchemasSection.svelte
rename to mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
index 75e1391820..c07f2b92b5 100644
--- a/mathesar_ui/src/pages/database/SchemasSection.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
@@ -15,9 +15,9 @@
     schemas as schemasStore,
   } from '@mathesar/stores/schemas';
   import { removeTablesStore } from '@mathesar/stores/tables';
+  import AddEditSchemaModal from '@mathesar/systems/schemas/AddEditSchemaModal.svelte';
   import { Button, Icon } from '@mathesar-component-library';
 
-  import AddEditSchemaModal from './AddEditSchemaModal.svelte';
   import SchemaListSkeleton from './SchemaListSkeleton.svelte';
   import SchemaRow from './SchemaRow.svelte';
 
diff --git a/mathesar_ui/src/pages/database/settings/SettingsSection.svelte b/mathesar_ui/src/pages/database/settings/SettingsSection.svelte
new file mode 100644
index 0000000000..220a4ef6f0
--- /dev/null
+++ b/mathesar_ui/src/pages/database/settings/SettingsSection.svelte
@@ -0,0 +1,3 @@
+<script lang="ts">
+
+</script>
diff --git a/mathesar_ui/src/pages/schema/SchemaPage.svelte b/mathesar_ui/src/pages/schema/SchemaPage.svelte
index 7159d8d095..31e3c9adee 100644
--- a/mathesar_ui/src/pages/schema/SchemaPage.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPage.svelte
@@ -15,11 +15,10 @@
   import { modal } from '@mathesar/stores/modal';
   import { queries } from '@mathesar/stores/queries';
   import { currentTablesData as tablesStore } from '@mathesar/stores/tables';
+  import AddEditSchemaModal from '@mathesar/systems/schemas/AddEditSchemaModal.svelte';
   import { logEvent } from '@mathesar/utils/telemetry';
   import { Button, Icon, TabContainer } from '@mathesar-component-library';
 
-  import AddEditSchemaModal from '../database/AddEditSchemaModal.svelte';
-
   import ExplorationSkeleton from './ExplorationSkeleton.svelte';
   import SchemaExplorations from './SchemaExplorations.svelte';
   import SchemaOverview from './SchemaOverview.svelte';
diff --git a/mathesar_ui/src/pages/database/AddEditSchemaModal.svelte b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
similarity index 97%
rename from mathesar_ui/src/pages/database/AddEditSchemaModal.svelte
rename to mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
index a1bc8d8cbe..c96c8faf39 100644
--- a/mathesar_ui/src/pages/database/AddEditSchemaModal.svelte
+++ b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
@@ -1,4 +1,3 @@
-<!-- TODO: Shouldn't this be inside the schema page instead? -->
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 

From 126e27b4eb265d39f8d75ead138e7b18c5638df8 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 15 Aug 2024 21:36:32 +0530
Subject: [PATCH 0639/1141] Update menu component styling

---
 .../dropdown-menu/DropdownMenu.svelte            |  2 +-
 mathesar_ui/src/component-library/menu/Menu.scss | 16 ++++++++--------
 mathesar_ui/src/components/AppHeader.svelte      |  2 +-
 .../src/pages/admin-users/AdminNavigation.svelte |  2 +-
 .../src/pages/database/schemas/SchemaRow.svelte  |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/mathesar_ui/src/component-library/dropdown-menu/DropdownMenu.svelte b/mathesar_ui/src/component-library/dropdown-menu/DropdownMenu.svelte
index 7c3850de7e..ddac9b8416 100644
--- a/mathesar_ui/src/component-library/dropdown-menu/DropdownMenu.svelte
+++ b/mathesar_ui/src/component-library/dropdown-menu/DropdownMenu.svelte
@@ -30,7 +30,7 @@
       {/if}
     </span>
   </slot>
-  <Menu slot="content" style="--min-width: 100%;{menuStyle}">
+  <Menu slot="content" style="--Menu__min-width: 100%;{menuStyle}">
     <slot />
   </Menu>
 </Dropdown>
diff --git a/mathesar_ui/src/component-library/menu/Menu.scss b/mathesar_ui/src/component-library/menu/Menu.scss
index 60c5c058dc..11b43435d8 100644
--- a/mathesar_ui/src/component-library/menu/Menu.scss
+++ b/mathesar_ui/src/component-library/menu/Menu.scss
@@ -1,9 +1,9 @@
 .menu {
-  $spacing-x-default: 0.5em;
-  $spacing-y-default: 0.5em;
+  $padding-x-default: 0.5em;
+  $padding-y-default: 0.5em;
   display: inline-flex;
   flex-direction: column;
-  min-width: var(--min-width, 0);
+  min-width: var(--Menu__min-width, 0);
 
   .menu-heading {
     color: var(--slate-500);
@@ -22,7 +22,7 @@
     flex-grow: 1;
     align-items: center;
     background-color: var(--Menu__item-background, transparent);
-    padding: 0 var(--spacing-x, $spacing-x-default);
+    padding: 0 var(--Menu__padding-x, $padding-x-default);
     border-radius: var(--Menu__item-border-radius, 0);
 
     &.menu-item-link {
@@ -52,8 +52,8 @@
       flex-grow: 1;
     }
     > .cell:not(:empty) {
-      padding: var(--spacing-y, $spacing-y-default)
-        calc(var(--spacing-x, $spacing-x-default) / 2);
+      padding: var(--Menu__padding-y, $padding-y-default)
+        calc(var(--Menu__padding-x, $padding-x-default) / 2);
     }
     > .control,
     > .icon {
@@ -81,14 +81,14 @@
   &.has-icon {
     .menu-item > .icon {
       width: calc(
-        var(--Menu__icon-width) + var(--spacing-x, $spacing-x-default)
+        var(--Menu__icon-width) + var(--Menu__padding-x, $padding-x-default)
       );
     }
   }
   &.has-control {
     .menu-item > .control {
       width: calc(
-        var(--Menu__control-width) + var(--spacing-x, $spacing-x-default)
+        var(--Menu__control-width) + var(--Menu__padding-x, $padding-x-default)
       );
     }
   }
diff --git a/mathesar_ui/src/components/AppHeader.svelte b/mathesar_ui/src/components/AppHeader.svelte
index 8b58177a59..d12f8feaab 100644
--- a/mathesar_ui/src/components/AppHeader.svelte
+++ b/mathesar_ui/src/components/AppHeader.svelte
@@ -103,7 +103,7 @@
           triggerAppearance="ghost"
           size="small"
           closeOnInnerClick={true}
-          menuStyle="--spacing-x: 0.3em;"
+          menuStyle="--Menu__padding-x: 0.3em;"
         >
           <div class="user-switcher" slot="trigger">
             <Icon {...iconSettingsMajor} hasNotificationDot={upgradable} />
diff --git a/mathesar_ui/src/pages/admin-users/AdminNavigation.svelte b/mathesar_ui/src/pages/admin-users/AdminNavigation.svelte
index 4a43fb56e0..6bfdb22d03 100644
--- a/mathesar_ui/src/pages/admin-users/AdminNavigation.svelte
+++ b/mathesar_ui/src/pages/admin-users/AdminNavigation.svelte
@@ -46,7 +46,7 @@
 <style lang="scss">
   .admin-navigation {
     font-size: var(--text-size-base);
-    --min-width: 100%;
+    --Menu__min-width: 100%;
     --Menu__item-border-radius: var(--border-radius-m);
     --Menu__item-hover-background: var(--sand-100);
     --Menu__item-active-background: var(--sand-200);
diff --git a/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte b/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
index 75a657a349..aeb199667a 100644
--- a/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
@@ -50,7 +50,7 @@
           triggerAppearance="plain"
           preferredPlacement="bottom-end"
           icon={iconMoreActions}
-          menuStyle="--spacing-y:0.8em;"
+          menuStyle="--Menu__padding-x:0.8em;"
         >
           <ButtonMenuItem on:click={() => dispatch('edit')} icon={iconEdit}>
             {$_('edit_schema')}

From 15a0951be6ecc107903e406b3c8313bb495ef5df Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 15 Aug 2024 21:41:00 +0530
Subject: [PATCH 0640/1141] Use callbacks in Route utility components instead
 of events

---
 .../components/routing/EventfulRoute.svelte   |  6 ++--
 .../components/routing/MultiPathRoute.svelte  |  4 +--
 .../components/routing/RouteObserver.svelte   | 34 ++++++-------------
 3 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/mathesar_ui/src/components/routing/EventfulRoute.svelte b/mathesar_ui/src/components/routing/EventfulRoute.svelte
index 211235e1e2..602b28acc6 100644
--- a/mathesar_ui/src/components/routing/EventfulRoute.svelte
+++ b/mathesar_ui/src/components/routing/EventfulRoute.svelte
@@ -1,13 +1,15 @@
 <script lang="ts">
-  import { Route } from 'tinro';
+  import { Route, type TinroRouteMeta } from 'tinro';
 
   import RouteObserver from './RouteObserver.svelte';
 
   export let path: string;
   export let firstmatch = false;
+  export let onLoad: (metaInfo: TinroRouteMeta) => void = () => {};
+  export let onUnload: () => void = () => {};
 </script>
 
 <Route {path} {firstmatch} let:meta>
-  <RouteObserver {meta} on:load on:unload />
+  <RouteObserver {meta} {onLoad} {onUnload} />
   <slot {meta} />
 </Route>
diff --git a/mathesar_ui/src/components/routing/MultiPathRoute.svelte b/mathesar_ui/src/components/routing/MultiPathRoute.svelte
index 7be61b5539..abc4ecbe59 100644
--- a/mathesar_ui/src/components/routing/MultiPathRoute.svelte
+++ b/mathesar_ui/src/components/routing/MultiPathRoute.svelte
@@ -37,8 +37,8 @@
 {#each paths as rp (rp.name)}
   <EventfulRoute
     path={rp.path}
-    on:load={(e) => setPath(rp, e.detail)}
-    on:unload={() => clearPath(rp)}
+    onLoad={(meta) => setPath(rp, meta)}
+    onUnload={() => clearPath(rp)}
     firstmatch
   />
 {/each}
diff --git a/mathesar_ui/src/components/routing/RouteObserver.svelte b/mathesar_ui/src/components/routing/RouteObserver.svelte
index 105f5c5df8..55f214cb28 100644
--- a/mathesar_ui/src/components/routing/RouteObserver.svelte
+++ b/mathesar_ui/src/components/routing/RouteObserver.svelte
@@ -1,33 +1,21 @@
 <script lang="ts">
-  import { createEventDispatcher, onMount } from 'svelte';
+  import { onMount } from 'svelte';
   import type { TinroRouteMeta } from 'tinro';
 
-  const dispatch = createEventDispatcher<{
-    load: TinroRouteMeta;
-    update: TinroRouteMeta;
-    unload: undefined;
-  }>();
-
-  export let meta: TinroRouteMeta | undefined = undefined;
+  export let meta: TinroRouteMeta;
+  export let onLoad: (metaInfo: TinroRouteMeta) => void = () => {};
+  export let onUnload: () => void = () => {};
 
   onMount(() => {
-    if (meta?.subscribe) {
-      const unsubsriber = meta.subscribe((metaInfo) => {
-        if (metaInfo) {
-          dispatch('load', metaInfo);
-        }
-      });
-
-      return () => {
-        unsubsriber();
-        dispatch('unload');
-      };
-    }
-
-    dispatch('load');
+    const unsubsriber = meta.subscribe((metaInfo) => {
+      if (metaInfo) {
+        onLoad(metaInfo);
+      }
+    });
 
     return () => {
-      dispatch('unload');
+      unsubsriber();
+      onUnload();
     };
   });
 </script>

From 8133181e670734991fe7382e6dc24295536274f1 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 15 Aug 2024 21:48:38 +0530
Subject: [PATCH 0641/1141] Add routes for all sections in database page

---
 mathesar/urls.py                              |  6 +-
 mathesar_ui/src/i18n/languages/en/dict.json   |  5 ++
 mathesar_ui/src/models/databases.ts           |  5 +-
 ...Page.svelte => DatabasePageWrapper.svelte} | 21 ++---
 .../database/settings/Collaborators.svelte    |  5 ++
 .../settings/RoleConfiguration.svelte         |  5 ++
 .../src/pages/database/settings/Roles.svelte  |  5 ++
 .../database/settings/SettingsSection.svelte  |  3 -
 .../database/settings/SettingsWrapper.svelte  | 77 +++++++++++++++++++
 mathesar_ui/src/routes/DatabaseRoute.svelte   | 61 +++++++++++----
 mathesar_ui/src/routes/urls.ts                | 12 +++
 11 files changed, 170 insertions(+), 35 deletions(-)
 rename mathesar_ui/src/pages/database/{DatabasePage.svelte => DatabasePageWrapper.svelte} (81%)
 create mode 100644 mathesar_ui/src/pages/database/settings/Collaborators.svelte
 create mode 100644 mathesar_ui/src/pages/database/settings/RoleConfiguration.svelte
 create mode 100644 mathesar_ui/src/pages/database/settings/Roles.svelte
 delete mode 100644 mathesar_ui/src/pages/database/settings/SettingsSection.svelte
 create mode 100644 mathesar_ui/src/pages/database/settings/SettingsWrapper.svelte

diff --git a/mathesar/urls.py b/mathesar/urls.py
index 3a8d1d7c4c..004d216c42 100644
--- a/mathesar/urls.py
+++ b/mathesar/urls.py
@@ -57,11 +57,15 @@
     path('shares/tables/<slug>/', views.shared_table, name='shared_table'),
     path('shares/explorations/<slug>/', views.shared_query, name='shared_query'),
     path('databases/', views.databases, name='databases'),
-    path('db/<database_id>/', views.schemas, name='schemas'),
     path('i18n/', include('django.conf.urls.i18n')),
     re_path(
         r'^db/(?P<database_id>\w+)/schemas/(?P<schema_id>\w+)/',
         views.schemas_home,
         name='schema_home'
     ),
+    re_path(
+        r'^db/(?P<database_id>\w+)/((schemas|settings)/)?',
+        views.schemas,
+        name='schemas'
+    ),
 ]
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 7843238c83..0733249cf7 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -51,6 +51,7 @@
   "cleaning_up": "Cleaning up",
   "clear": "Clear",
   "clear_value": "Clear value",
+  "collaborators": "Collaborators",
   "column": "Column",
   "column_added_number_of_times": "{count, plural, one {This column has been added once.} other {This column has been added {count} times.}}",
   "column_data_types": "Column Data Types",
@@ -251,6 +252,7 @@
   "if_upgrade_succeeds_help": "If the upgrade succeeds, you will see that you're running the latest version.",
   "import": "Import",
   "import_from_file": "Import from a File",
+  "in_mathesar": "In Mathesar",
   "in_this_table": "In this table",
   "individual_permissions_admin_modify_warning": "Individual permissions cannot be modified for users with Admin access.",
   "inherited": "Inherited",
@@ -358,6 +360,7 @@
   "number_of_matches_in_category": "{count, plural, one {{count} match for [searchValue] in [categoryName]} other {{count} matches for [searchValue] in [categoryName]}}",
   "old_password": "Old Password",
   "oldest_to_newest_sort": "Oldest-Newest",
+  "on_the_server": "On The Server",
   "one_column_from_base_is_required": "At least one column from the base table is required to add columns from linked tables.",
   "one_to_many": "One to Many",
   "one_to_many_link_desc": "One [baseTable] record can be linked from multiple [targetTable] records.",
@@ -431,6 +434,8 @@
   "retry": "Retry",
   "reuse_credentials_from_known_connection": "Reuse credentials from a known connection",
   "role": "Role",
+  "role_configuration": "Role Configuration",
+  "roles": "Roles",
   "row": "Row",
   "running_latest_version": "You are running the latest version",
   "sample_data_library_help": "Sample data from a fictional library.",
diff --git a/mathesar_ui/src/models/databases.ts b/mathesar_ui/src/models/databases.ts
index 96b50c3f1e..4d56f06833 100644
--- a/mathesar_ui/src/models/databases.ts
+++ b/mathesar_ui/src/models/databases.ts
@@ -5,16 +5,13 @@ import type { Server } from './servers';
 export class Database {
   readonly id: number;
 
-  name: string;
+  readonly name: string;
 
   readonly server: Server;
 
   constructor(props: { server: Server; rawDatabase: RawDatabase }) {
     this.id = props.rawDatabase.id;
     this.name = props.rawDatabase.name;
-    if (props.rawDatabase.server_id !== props.server.id) {
-      throw new Error('Server ids do not match');
-    }
     this.server = props.server;
   }
 }
diff --git a/mathesar_ui/src/pages/database/DatabasePage.svelte b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
similarity index 81%
rename from mathesar_ui/src/pages/database/DatabasePage.svelte
rename to mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
index e286b3f829..2e82d9ffb3 100644
--- a/mathesar_ui/src/pages/database/DatabasePage.svelte
+++ b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
@@ -21,11 +21,10 @@
     TabContainer,
   } from '@mathesar-component-library';
 
-  import SchemasSection from './schemas/SchemasSection.svelte';
-  import SettingsSection from './settings/SettingsSection.svelte';
-
   export let database: Database;
-  export let section: string;
+
+  type Section = 'schemas' | 'settings';
+  let section: Section = 'schemas';
 
   $: tabs = [
     {
@@ -39,10 +38,10 @@
       href: getDatabasePageSettingsSectionUrl(database.id),
     },
   ];
-  $: activeTab = tabs.find((tab) => tab.id === section) ?? tabs[0];
+  $: activeTab = tabs.find((tab) => tab.id === section);
 
-  function openPermissionsModal() {
-    //
+  export function setSection(_section: Section) {
+    section = _section;
   }
 </script>
 
@@ -65,7 +64,7 @@
     }}
   >
     <div slot="action">
-      <Button on:click={openPermissionsModal} appearance="secondary">
+      <Button appearance="secondary">
         <span>{$_('database_permissions')}</span>
       </Button>
 
@@ -88,11 +87,7 @@
 
   <TabContainer {activeTab} {tabs} uniformTabWidth={false}>
     <div class="tab-content">
-      {#if activeTab?.id === 'schemas'}
-        <SchemasSection {database} />
-      {:else if activeTab?.id === 'settings'}
-        <SettingsSection />
-      {/if}
+      <slot {setSection} />
     </div>
   </TabContainer>
 </LayoutWithHeader>
diff --git a/mathesar_ui/src/pages/database/settings/Collaborators.svelte b/mathesar_ui/src/pages/database/settings/Collaborators.svelte
new file mode 100644
index 0000000000..5c75a672eb
--- /dev/null
+++ b/mathesar_ui/src/pages/database/settings/Collaborators.svelte
@@ -0,0 +1,5 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+</script>
+
+{$_('collaborators')}
diff --git a/mathesar_ui/src/pages/database/settings/RoleConfiguration.svelte b/mathesar_ui/src/pages/database/settings/RoleConfiguration.svelte
new file mode 100644
index 0000000000..23aa8257fd
--- /dev/null
+++ b/mathesar_ui/src/pages/database/settings/RoleConfiguration.svelte
@@ -0,0 +1,5 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+</script>
+
+{$_('role_configuration')}
diff --git a/mathesar_ui/src/pages/database/settings/Roles.svelte b/mathesar_ui/src/pages/database/settings/Roles.svelte
new file mode 100644
index 0000000000..3636bb90da
--- /dev/null
+++ b/mathesar_ui/src/pages/database/settings/Roles.svelte
@@ -0,0 +1,5 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+</script>
+
+{$_('roles')}
diff --git a/mathesar_ui/src/pages/database/settings/SettingsSection.svelte b/mathesar_ui/src/pages/database/settings/SettingsSection.svelte
deleted file mode 100644
index 220a4ef6f0..0000000000
--- a/mathesar_ui/src/pages/database/settings/SettingsSection.svelte
+++ /dev/null
@@ -1,3 +0,0 @@
-<script lang="ts">
-
-</script>
diff --git a/mathesar_ui/src/pages/database/settings/SettingsWrapper.svelte b/mathesar_ui/src/pages/database/settings/SettingsWrapper.svelte
new file mode 100644
index 0000000000..320be93c8f
--- /dev/null
+++ b/mathesar_ui/src/pages/database/settings/SettingsWrapper.svelte
@@ -0,0 +1,77 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import PageLayoutWithSidebar from '@mathesar/layouts/PageLayoutWithSidebar.svelte';
+  import { Database } from '@mathesar/models/databases';
+  import {
+    getDatabaseCollaboratorsUrl,
+    getDatabaseRoleConfigurationUrl,
+    getDatabaseRolesUrl,
+  } from '@mathesar/routes/urls';
+  import { LinkMenuItem, Menu, MenuHeading } from '@mathesar-component-library';
+
+  export let database: Database;
+
+  type Section = 'roleConfiguration' | 'collaborators' | 'roles';
+  let section = 'roleConfiguration';
+
+  export function setSection(_section: Section) {
+    section = _section;
+  }
+</script>
+
+<PageLayoutWithSidebar>
+  <div class="navigation" slot="sidebar">
+    <Menu>
+      <MenuHeading>
+        <div class="heading">{$_('in_mathesar')}</div>
+      </MenuHeading>
+      <LinkMenuItem
+        href={getDatabaseRoleConfigurationUrl(database.id)}
+        class={section === 'roleConfiguration' ? 'active' : ''}
+      >
+        {$_('role_configuration')}
+      </LinkMenuItem>
+      <LinkMenuItem
+        href={getDatabaseCollaboratorsUrl(database.id)}
+        class={section === 'collaborators' ? 'active' : ''}
+      >
+        {$_('collaborators')}
+      </LinkMenuItem>
+      <div class="menu-divider" />
+      <MenuHeading>
+        <div class="heading">{$_('on_the_server')}</div>
+      </MenuHeading>
+      <LinkMenuItem
+        href={getDatabaseRolesUrl(database.id)}
+        class={section === 'roles' ? 'active' : ''}
+      >
+        {$_('roles')}
+      </LinkMenuItem>
+    </Menu>
+  </div>
+  <div>
+    <slot {setSection} />
+  </div>
+</PageLayoutWithSidebar>
+
+<style lang="scss">
+  .navigation {
+    --Menu__min-width: 100%;
+    --Menu__item-border-radius: var(--border-radius-m);
+    --Menu__item-hover-background: var(--sand-100);
+    --Menu__item-active-background: var(--sand-200);
+    --Menu__item-active-hover-background: var(--sand-200);
+    --Menu__item-focus-outline-color: var(--sand-300);
+
+    .heading {
+      font-size: var(--text-size-small);
+      font-weight: 500;
+      text-transform: uppercase;
+      margin-bottom: var(--size-ultra-small);
+    }
+    .menu-divider {
+      margin: 0.5rem 0.1rem 0.8rem 0.1rem;
+    }
+  }
+</style>
diff --git a/mathesar_ui/src/routes/DatabaseRoute.svelte b/mathesar_ui/src/routes/DatabaseRoute.svelte
index f4ade64fbe..5ffacc0b19 100644
--- a/mathesar_ui/src/routes/DatabaseRoute.svelte
+++ b/mathesar_ui/src/routes/DatabaseRoute.svelte
@@ -6,9 +6,14 @@
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import Identifier from '@mathesar/components/Identifier.svelte';
   import { RichText } from '@mathesar/components/rich-text';
-  import MultiPathRoute from '@mathesar/components/routing/MultiPathRoute.svelte';
+  import EventfulRoute from '@mathesar/components/routing/EventfulRoute.svelte';
   import type { Database } from '@mathesar/models/databases';
-  import DatabasePage from '@mathesar/pages/database/DatabasePage.svelte';
+  import DatabasePageWrapper from '@mathesar/pages/database/DatabasePageWrapper.svelte';
+  import DatabasePageSchemasSection from '@mathesar/pages/database/schemas/SchemasSection.svelte';
+  import DatabaseCollaborators from '@mathesar/pages/database/settings/Collaborators.svelte';
+  import DatabaseRoleConfiguration from '@mathesar/pages/database/settings/RoleConfiguration.svelte';
+  import DatabaseRoles from '@mathesar/pages/database/settings/Roles.svelte';
+  import DatabasePageSettingsWrapper from '@mathesar/pages/database/settings/SettingsWrapper.svelte';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import { databasesStore } from '@mathesar/stores/databases';
 
@@ -29,24 +34,52 @@
 {#if $currentDatabase}
   <AppendBreadcrumb item={{ type: 'database', database: $currentDatabase }} />
 
-  <Route path="/" redirect="schemas/"></Route>
-
-  <MultiPathRoute
-    paths={[
-      { name: 'schemas', path: '/schemas/' },
-      { name: 'settings', path: '/settings/' },
-    ]}
-    let:path
-  >
-    <DatabasePage database={$currentDatabase} section={path} />
-  </MultiPathRoute>
-
   <Route path="/schemas/:schemaId/*" let:meta firstmatch>
     <SchemaRoute
       database={$currentDatabase}
       schemaId={parseInt(meta.params.schemaId, 10)}
     />
   </Route>
+
+  <Route path="/*" firstmatch>
+    <Route path="/" redirect="schemas/" />
+
+    <DatabasePageWrapper database={$currentDatabase} let:setSection>
+      <EventfulRoute path="/schemas" onLoad={() => setSection('schemas')}>
+        <DatabasePageSchemasSection database={$currentDatabase} />
+      </EventfulRoute>
+      <EventfulRoute
+        path="/settings/*"
+        onLoad={() => setSection('settings')}
+        firstmatch
+      >
+        <DatabasePageSettingsWrapper
+          database={$currentDatabase}
+          let:setSection={setSettingsSection}
+        >
+          <Route path="/" redirect="role-configuration/" />
+          <EventfulRoute
+            path="/role-configuration"
+            onLoad={() => setSettingsSection('roleConfiguration')}
+          >
+            <DatabaseRoleConfiguration />
+          </EventfulRoute>
+          <EventfulRoute
+            path="/collaborators"
+            onLoad={() => setSettingsSection('collaborators')}
+          >
+            <DatabaseCollaborators />
+          </EventfulRoute>
+          <EventfulRoute
+            path="/roles"
+            onLoad={() => setSettingsSection('roles')}
+          >
+            <DatabaseRoles />
+          </EventfulRoute>
+        </DatabasePageSettingsWrapper>
+      </EventfulRoute>
+    </DatabasePageWrapper>
+  </Route>
 {:else}
   <ErrorPage>
     <RichText text={$_('database_not_found')} let:slotName>
diff --git a/mathesar_ui/src/routes/urls.ts b/mathesar_ui/src/routes/urls.ts
index bd7bbfbab0..879c3874ce 100644
--- a/mathesar_ui/src/routes/urls.ts
+++ b/mathesar_ui/src/routes/urls.ts
@@ -10,6 +10,18 @@ export function getDatabasePageSettingsSectionUrl(databaseId: number): string {
   return `/db/${databaseId}/settings/`;
 }
 
+export function getDatabaseRoleConfigurationUrl(databaseId: number): string {
+  return `${getDatabasePageSettingsSectionUrl(databaseId)}role-configuration/`;
+}
+
+export function getDatabaseCollaboratorsUrl(databaseId: number): string {
+  return `${getDatabasePageSettingsSectionUrl(databaseId)}collaborators/`;
+}
+
+export function getDatabaseRolesUrl(databaseId: number): string {
+  return `${getDatabasePageSettingsSectionUrl(databaseId)}roles/`;
+}
+
 export function getSchemaPageUrl(databaseId: number, schemaId: number): string {
   return `${getDatabasePageSchemasSectionUrl(databaseId)}${schemaId}/`;
 }

From 4ce7ec5e3681e383029f35e09638b412ce515d9c Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 15 Aug 2024 22:18:18 +0530
Subject: [PATCH 0642/1141] remove cte and change endpoint name

---
 db/roles/operations/select.py        |  2 +-
 db/sql/00_msar.sql                   | 21 ++++++++-------------
 mathesar/rpc/database_privileges.py  |  5 +++--
 mathesar/tests/rpc/test_endpoints.py |  4 ++--
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/db/roles/operations/select.py b/db/roles/operations/select.py
index 1d2b29aa94..1d0d94434b 100644
--- a/db/roles/operations/select.py
+++ b/db/roles/operations/select.py
@@ -10,4 +10,4 @@ def list_db_priv(db_name, conn):
 
 
 def get_curr_role_db_priv(db_name, conn):
-    return exec_msar_func(conn, 'get_curr_role_db_priv', db_name).fetchone()[0]
+    return exec_msar_func(conn, 'get_owner_oid_and_curr_role_db_priv', db_name).fetchone()[0]
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index a902607320..b0c400ee99 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -974,7 +974,7 @@ SELECT COALESCE(jsonb_agg(priv_cte.p), '[]'::jsonb) FROM priv_cte;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
-CREATE OR REPLACE FUNCTION msar.get_curr_role_db_priv(db_name text) RETURNS jsonb AS $$/*
+CREATE OR REPLACE FUNCTION msar.get_owner_oid_and_curr_role_db_priv(db_name text) RETURNS jsonb AS $$/*
 Given a database name, returns a json object with database owner oid and database privileges
 for the role executing the function.
 
@@ -984,22 +984,17 @@ The returned JSON object has the form:
     "current_role_db_priv" [<str>]
   }
 */
-WITH priv_cte AS (
-  SELECT unnest(
+SELECT jsonb_build_object(
+  'owner_oid', pgd.datdba,
+  'current_role_db_priv', array_remove(
     ARRAY[
       CASE WHEN has_database_privilege(pgd.oid, 'CREATE') THEN 'CREATE' END,
       CASE WHEN has_database_privilege(pgd.oid, 'TEMPORARY') THEN 'TEMPORARY' END,
       CASE WHEN has_database_privilege(pgd.oid, 'CONNECT') THEN 'CONNECT' END
-    ]
-  ) AS p 
-  FROM pg_catalog.pg_database AS pgd WHERE pgd.datname = db_name
-)
-SELECT jsonb_build_object(
-  'owner_oid', pgd.datdba,
-  'current_role_db_priv', COALESCE(jsonb_agg(priv_cte.p), '[]'::jsonb)
-) FROM pg_catalog.pg_database AS pgd, priv_cte
-WHERE pgd.datname = db_name AND priv_cte.p IS NOT NULL
-GROUP BY pgd.datdba;
+    ], NULL
+  )
+) FROM pg_catalog.pg_database AS pgd
+WHERE pgd.datname = db_name;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
diff --git a/mathesar/rpc/database_privileges.py b/mathesar/rpc/database_privileges.py
index 0ab9e0effd..16d8971677 100644
--- a/mathesar/rpc/database_privileges.py
+++ b/mathesar/rpc/database_privileges.py
@@ -67,10 +67,11 @@ def list_direct(*, database_id: int, **kwargs) -> list[DBPrivileges]:
     return [DBPrivileges.from_dict(i) for i in raw_db_priv]
 
 
-@rpc_method(name="database_privileges.get_curr_role_priv")
+# TODO: Think of something concise for the endpoint name.
+@rpc_method(name="database_privileges.get_owner_oid_and_curr_role_db_priv")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def get_curr_role_priv(*, database_id: int, **kwargs) -> CurrentDBPrivileges:
+def get_owner_oid_and_curr_role_db_priv(*, database_id: int, **kwargs) -> CurrentDBPrivileges:
     """
     Get database privileges for the current user.
 
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 8062e2b8e7..067bff05d1 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -136,8 +136,8 @@
         [user_is_authenticated]
     ),
     (
-        database_privileges.get_curr_role_priv,
-        "database_privileges.get_curr_role_priv",
+        database_privileges.get_owner_oid_and_curr_role_db_priv,
+        "database_privileges.get_owner_oid_and_curr_role_db_priv",
         [user_is_authenticated]
     ),
     (

From 7ebf47a184a175abdd2627a48c2605ce72735bf5 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 15 Aug 2024 23:19:58 +0530
Subject: [PATCH 0643/1141] update docs

---
 docs/docs/api/rpc.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 23eb0deea9..1dc1378d00 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -83,7 +83,7 @@ To use an RPC function:
     options:
       members:
       - list_direct
-      - get_curr_role_priv
+      - get_owner_oid_and_curr_role_db_priv
       - DBPrivileges
       - CurrentDBPrivileges
 

From a2981e03fb0b2bba22e6e1450c68ad5f2abba186 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 16 Aug 2024 13:53:47 +0530
Subject: [PATCH 0644/1141] Implement batching api requests

---
 .../json-rpc-client-builder/requests.ts       | 80 +++++++++++++++----
 1 file changed, 66 insertions(+), 14 deletions(-)

diff --git a/mathesar_ui/src/packages/json-rpc-client-builder/requests.ts b/mathesar_ui/src/packages/json-rpc-client-builder/requests.ts
index 0ad5cfd337..c25af1f163 100644
--- a/mathesar_ui/src/packages/json-rpc-client-builder/requests.ts
+++ b/mathesar_ui/src/packages/json-rpc-client-builder/requests.ts
@@ -26,6 +26,15 @@ function cancellableFetch(
   );
 }
 
+function getRpcRequestBody(request: RpcRequest<unknown>, id = 0) {
+  return {
+    jsonrpc,
+    id,
+    method: request.method,
+    params: request.params,
+  };
+}
+
 function makeRpcResponse<T = unknown>(value: unknown): RpcResponse<T> {
   if (hasProperty(value, 'result')) {
     const response: RpcResult<T> = {
@@ -44,12 +53,7 @@ function send<T>(request: RpcRequest<T>): CancellablePromise<RpcResponse<T>> {
       ...request.getHeaders(),
       'Content-Type': 'application/json',
     },
-    body: JSON.stringify({
-      jsonrpc,
-      id: 0,
-      method: request.method,
-      params: request.params,
-    }),
+    body: JSON.stringify(getRpcRequestBody(request)),
   });
   return new CancellablePromise(
     (resolve) =>
@@ -67,6 +71,47 @@ function send<T>(request: RpcRequest<T>): CancellablePromise<RpcResponse<T>> {
   );
 }
 
+function makeRpcBatchResponse<T extends RpcRequest<unknown>[]>(
+  values: unknown,
+): RpcBatchResponse<T> {
+  if (!Array.isArray(values)) {
+    throw new Error('Response is not an array');
+  }
+  return values.map((value) => makeRpcResponse(value)) as RpcBatchResponse<T>;
+}
+
+function sendBatchRequest<T extends RpcRequest<unknown>[]>(
+  endpoint: string,
+  headers: Record<string, string | undefined>,
+  requests: T,
+): CancellablePromise<RpcBatchResponse<T>> {
+  const fetch = cancellableFetch(endpoint, {
+    method: 'POST',
+    headers: {
+      ...headers,
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify(
+      requests.map((request, index) => getRpcRequestBody(request, index)),
+    ),
+  });
+  return new CancellablePromise(
+    (resolve) =>
+      void fetch
+        .then(
+          (response) => response.json(),
+          (rejectionReason) =>
+            resolve(
+              requests.map(() =>
+                RpcError.fromAnything(rejectionReason),
+              ) as RpcBatchResponse<T>,
+            ),
+        )
+        .then((json) => resolve(makeRpcBatchResponse(json))),
+    () => fetch.cancel(),
+  );
+}
+
 export type GetHeaders = () => Record<string, string | undefined>;
 
 export class RpcRequest<T> {
@@ -126,16 +171,23 @@ export class RpcRequest<T> {
   }
 }
 
-export type RpcBatchResponse<T extends RpcRequest<unknown>[]> =
-  CancellablePromise<{
-    [K in keyof T]: T[K] extends RpcRequest<infer R> ? RpcResponse<R> : never;
-  }>;
+export type RpcBatchResponse<T extends RpcRequest<unknown>[]> = {
+  [K in keyof T]: T[K] extends RpcRequest<infer R> ? RpcResponse<R> : never;
+};
 
 export function batchSend<T extends RpcRequest<unknown>[]>(
-  ...requests: T
-): RpcBatchResponse<T> {
-  // TODO implement batch sending
-  throw new Error('Not implemented');
+  requests: T,
+): CancellablePromise<RpcBatchResponse<T>> {
+  if (requests.length === 0) {
+    throw new Error('There must be atleast one request');
+  }
+  const [firstRequest, ...rest] = requests;
+  const { endpoint } = firstRequest;
+  if (rest.some((request) => request.endpoint !== endpoint)) {
+    throw new Error('Only RPC requests to the same endpoint can be batched');
+  }
+  // TODO: Decide if headers need to be merged
+  return sendBatchRequest(endpoint, firstRequest.getHeaders(), requests);
 }
 
 /**

From 805c6d0e2ee439ba809405226f7f00b0fdf73cc7 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 16 Aug 2024 13:54:14 +0530
Subject: [PATCH 0645/1141] Implement AsyncRpcApiStore

---
 mathesar_ui/src/stores/AsyncRpcApiStore.ts | 69 ++++++++++++++++++++++
 mathesar_ui/src/stores/AsyncStore.ts       | 44 ++++++++++++--
 2 files changed, 108 insertions(+), 5 deletions(-)
 create mode 100644 mathesar_ui/src/stores/AsyncRpcApiStore.ts

diff --git a/mathesar_ui/src/stores/AsyncRpcApiStore.ts b/mathesar_ui/src/stores/AsyncRpcApiStore.ts
new file mode 100644
index 0000000000..68c1057bdc
--- /dev/null
+++ b/mathesar_ui/src/stores/AsyncRpcApiStore.ts
@@ -0,0 +1,69 @@
+import { CancellablePromise } from '@mathesar/component-library';
+import {
+  type RpcRequest,
+  type RpcResponse,
+  batchSend,
+} from '@mathesar/packages/json-rpc-client-builder';
+
+import AsyncStore from './AsyncStore';
+
+export default class AsyncRpcApiStore<Props, T, U> extends AsyncStore<
+  Props,
+  U
+> {
+  apiRpcFn: (props: Props) => RpcRequest<T>;
+
+  postProcess: (response: T) => U;
+
+  constructor(
+    rpcFn: (props: Props) => RpcRequest<T>,
+    options?: Partial<{
+      getError: (caughtValue: unknown) => string;
+      initialValue: U;
+      postProcess: (response: T) => U;
+    }>,
+  ) {
+    const postProcess =
+      options?.postProcess ?? ((response: T) => response as unknown as U);
+    super(
+      (props: Props) =>
+        new CancellablePromise((resolve, reject) => {
+          rpcFn(props)
+            .run()
+            .then(
+              (value) => resolve(postProcess(value)),
+              (error) => reject(error),
+            )
+            .catch((error) => reject(error));
+        }),
+    );
+    this.apiRpcFn = rpcFn;
+    this.postProcess = postProcess;
+  }
+
+  batchRunner(
+    props: Props,
+  ): [RpcRequest<T>, (response: RpcResponse<T>) => void] {
+    const onReponse = (response: RpcResponse<T>) => {
+      if (response.status === 'ok') {
+        this.setResolvedValue(this.postProcess(response.value));
+      } else {
+        this.setRejectedError(response);
+      }
+    };
+    return [this.apiRpcFn(props), onReponse];
+  }
+
+  static async runBatched(
+    batchRunners: [
+      RpcRequest<unknown>,
+      (response: RpcResponse<unknown>) => void,
+    ][],
+  ) {
+    const requests = batchRunners.map((runner) => runner[0]);
+    const results = await batchSend(requests);
+    batchRunners.forEach((runner, index) => {
+      runner[1](results[index]);
+    });
+  }
+}
diff --git a/mathesar_ui/src/stores/AsyncStore.ts b/mathesar_ui/src/stores/AsyncStore.ts
index a21be3ae1d..33830f3d0e 100644
--- a/mathesar_ui/src/stores/AsyncStore.ts
+++ b/mathesar_ui/src/stores/AsyncStore.ts
@@ -10,7 +10,10 @@ import {
 } from 'svelte/store';
 
 import { getErrorMessage } from '@mathesar/utils/errors';
-import type { CancellablePromise } from '@mathesar-component-library';
+import {
+  type CancellablePromise,
+  hasProperty,
+} from '@mathesar-component-library';
 
 export type AsyncStoreSettlement<T, E> =
   | { state: 'resolved'; value: T }
@@ -111,19 +114,30 @@ export default class AsyncStore<Props, T>
 
   constructor(
     run: (props: Props) => Promise<T> | CancellablePromise<T>,
-    getError: (caughtValue: unknown) => string = getErrorMessage,
+    options?: Partial<{
+      getError: (caughtValue: unknown) => string;
+      initialValue: T;
+    }>,
   ) {
     this.runFn = run;
-    this.getError = getError;
+    this.getError = options?.getError ?? getErrorMessage;
+    if (hasProperty(options, 'initialValue')) {
+      this.value = writable(
+        new AsyncStoreValue<T, string>({
+          isLoading: false,
+          settlement: { state: 'resolved', value: options.initialValue as T },
+        }),
+      );
+    }
   }
 
   subscribe(
-    run: Subscriber<AsyncStoreValue<T, string>>,
+    subscriber: Subscriber<AsyncStoreValue<T, string>>,
     invalidate?:
       | ((value?: AsyncStoreValue<T, string> | undefined) => void)
       | undefined,
   ): Unsubscriber {
-    return this.value.subscribe(run, invalidate);
+    return this.value.subscribe(subscriber, invalidate);
   }
 
   async run(props: Props): Promise<AsyncStoreValue<T, string>> {
@@ -165,6 +179,26 @@ export default class AsyncStore<Props, T>
     this.cancel();
     this.value.set(new AsyncStoreValue({ isLoading: false }));
   }
+
+  setResolvedValue(value: T) {
+    this.cancel();
+    this.value.set(
+      new AsyncStoreValue({
+        isLoading: false,
+        settlement: { state: 'resolved', value },
+      }),
+    );
+  }
+
+  setRejectedError(error: unknown) {
+    this.cancel();
+    this.value.set(
+      new AsyncStoreValue({
+        settlement: { state: 'rejected', error: this.getError(error) },
+        isLoading: false,
+      }),
+    );
+  }
 }
 
 /* eslint-enable max-classes-per-file */

From 52abcdb4c9f966fba0f6cf9ec1f28aebabd125b5 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 16 Aug 2024 14:57:58 +0530
Subject: [PATCH 0646/1141] Name model class files appropriately

---
 mathesar_ui/src/components/DatabaseName.svelte                | 2 +-
 mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte | 2 +-
 mathesar_ui/src/components/breadcrumb/EntitySelector.svelte   | 2 +-
 mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte   | 2 +-
 mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts      | 2 +-
 mathesar_ui/src/models/{databases.ts => Database.ts}          | 2 +-
 mathesar_ui/src/models/{servers.ts => Server.ts}              | 0
 mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte   | 2 +-
 mathesar_ui/src/pages/database/DatabasePageWrapper.svelte     | 2 +-
 mathesar_ui/src/pages/database/schemas/SchemaRow.svelte       | 2 +-
 mathesar_ui/src/pages/database/schemas/SchemasSection.svelte  | 2 +-
 .../src/pages/database/settings/SettingsWrapper.svelte        | 2 +-
 mathesar_ui/src/pages/exploration/ExplorationPage.svelte      | 2 +-
 mathesar_ui/src/pages/exploration/Header.svelte               | 2 +-
 mathesar_ui/src/pages/home/DatabaseRow.svelte                 | 2 +-
 mathesar_ui/src/pages/home/HomePage.svelte                    | 2 +-
 .../src/pages/import/preview/ImportPreviewContent.svelte      | 2 +-
 mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte | 2 +-
 .../src/pages/import/preview/importPreviewPageUtils.ts        | 2 +-
 mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte   | 2 +-
 mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte    | 2 +-
 .../src/pages/schema/CreateNewExplorationTutorial.svelte      | 2 +-
 mathesar_ui/src/pages/schema/CreateNewTableButton.svelte      | 2 +-
 mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte    | 2 +-
 mathesar_ui/src/pages/schema/ExplorationItem.svelte           | 2 +-
 mathesar_ui/src/pages/schema/ExplorationsList.svelte          | 2 +-
 mathesar_ui/src/pages/schema/SchemaExplorations.svelte        | 2 +-
 mathesar_ui/src/pages/schema/SchemaOverview.svelte            | 2 +-
 mathesar_ui/src/pages/schema/SchemaPage.svelte                | 2 +-
 mathesar_ui/src/pages/schema/SchemaTables.svelte              | 2 +-
 mathesar_ui/src/pages/schema/TableCard.svelte                 | 2 +-
 mathesar_ui/src/pages/schema/TablesList.svelte                | 2 +-
 mathesar_ui/src/routes/DataExplorerRoute.svelte               | 2 +-
 mathesar_ui/src/routes/DatabaseRoute.svelte                   | 2 +-
 mathesar_ui/src/routes/ExplorationRoute.svelte                | 2 +-
 mathesar_ui/src/routes/ImportRoute.svelte                     | 2 +-
 mathesar_ui/src/routes/RecordPageRoute.svelte                 | 2 +-
 mathesar_ui/src/routes/SchemaRoute.svelte                     | 2 +-
 mathesar_ui/src/routes/TableRoute.svelte                      | 2 +-
 mathesar_ui/src/stores/abstract-types/store.ts                | 2 +-
 mathesar_ui/src/stores/databases.ts                           | 4 ++--
 mathesar_ui/src/stores/schemas.ts                             | 2 +-
 mathesar_ui/src/stores/table-data/TableStructure.ts           | 2 +-
 mathesar_ui/src/stores/table-data/columns.ts                  | 2 +-
 mathesar_ui/src/stores/table-data/constraints.ts              | 2 +-
 mathesar_ui/src/stores/table-data/records.ts                  | 2 +-
 mathesar_ui/src/stores/table-data/tabularData.ts              | 2 +-
 mathesar_ui/src/stores/tables.ts                              | 2 +-
 .../databases/create-database/ConnectDatabaseModal.svelte     | 2 +-
 .../databases/create-database/ConnectExistingDatabase.svelte  | 2 +-
 .../databases/create-database/CreateNewDatabase.svelte        | 2 +-
 mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte     | 2 +-
 52 files changed, 52 insertions(+), 52 deletions(-)
 rename mathesar_ui/src/models/{databases.ts => Database.ts} (89%)
 rename mathesar_ui/src/models/{servers.ts => Server.ts} (100%)

diff --git a/mathesar_ui/src/components/DatabaseName.svelte b/mathesar_ui/src/components/DatabaseName.svelte
index 186344afc2..3876453dce 100644
--- a/mathesar_ui/src/components/DatabaseName.svelte
+++ b/mathesar_ui/src/components/DatabaseName.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { iconDatabase } from '@mathesar/icons';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
 
   import NameWithIcon from './NameWithIcon.svelte';
 
diff --git a/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte b/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
index db7bc78ac0..2de97b3e83 100644
--- a/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
@@ -2,7 +2,7 @@
   import { _ } from 'svelte-i18n';
 
   import { iconConnectDatabase, iconDatabase } from '@mathesar/icons';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { HOME_URL, getDatabasePageUrl } from '@mathesar/routes/urls';
   import { databasesStore } from '@mathesar/stores/databases';
 
diff --git a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
index 8c1f5f9988..f5b685439f 100644
--- a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
@@ -6,7 +6,7 @@
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Table } from '@mathesar/api/rpc/tables';
   import { iconTable } from '@mathesar/icons';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { getExplorationPageUrl } from '@mathesar/routes/urls';
   import { queries as queriesStore } from '@mathesar/stores/queries';
   import { currentTableId, currentTables } from '@mathesar/stores/tables';
diff --git a/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte b/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte
index 7209a4da20..d495654006 100644
--- a/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte
@@ -3,7 +3,7 @@
 
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import { iconSchema } from '@mathesar/icons';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
   import {
     currentSchemaId,
diff --git a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
index 0728141e6f..1266acf62a 100644
--- a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
+++ b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
@@ -5,7 +5,7 @@ import type {
   ComponentAndProps,
   IconProps,
 } from '@mathesar/component-library/types';
-import type { Database } from '@mathesar/models/databases';
+import type { Database } from '@mathesar/models/Database';
 
 export interface BreadcrumbItemHome {
   type: 'home';
diff --git a/mathesar_ui/src/models/databases.ts b/mathesar_ui/src/models/Database.ts
similarity index 89%
rename from mathesar_ui/src/models/databases.ts
rename to mathesar_ui/src/models/Database.ts
index 4d56f06833..f9c3093975 100644
--- a/mathesar_ui/src/models/databases.ts
+++ b/mathesar_ui/src/models/Database.ts
@@ -1,6 +1,6 @@
 import type { RawDatabase } from '@mathesar/api/rpc/databases';
 
-import type { Server } from './servers';
+import type { Server } from './Server';
 
 export class Database {
   readonly id: number;
diff --git a/mathesar_ui/src/models/servers.ts b/mathesar_ui/src/models/Server.ts
similarity index 100%
rename from mathesar_ui/src/models/servers.ts
rename to mathesar_ui/src/models/Server.ts
diff --git a/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte b/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte
index 9a41dca368..a97cb5e3aa 100644
--- a/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte
+++ b/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte
@@ -4,7 +4,7 @@
 
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import {
     getExplorationPageUrl,
diff --git a/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
index 2e82d9ffb3..2efe2a7c06 100644
--- a/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
+++ b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
@@ -8,7 +8,7 @@
     iconMoreActions,
   } from '@mathesar/icons';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import {
     getDatabasePageSchemasSectionUrl,
diff --git a/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte b/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
index aeb199667a..2e83202e50 100644
--- a/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
@@ -13,7 +13,7 @@
     iconMoreActions,
     iconNotEditable,
   } from '@mathesar/icons';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
   import { ButtonMenuItem, Icon } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
index c07f2b92b5..7250f40d08 100644
--- a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
@@ -6,7 +6,7 @@
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import { iconAddNew } from '@mathesar/icons';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { confirmDelete } from '@mathesar/stores/confirmation';
   import { modal } from '@mathesar/stores/modal';
   import type { DBSchemaStoreData } from '@mathesar/stores/schemas';
diff --git a/mathesar_ui/src/pages/database/settings/SettingsWrapper.svelte b/mathesar_ui/src/pages/database/settings/SettingsWrapper.svelte
index 320be93c8f..69b1a23ffc 100644
--- a/mathesar_ui/src/pages/database/settings/SettingsWrapper.svelte
+++ b/mathesar_ui/src/pages/database/settings/SettingsWrapper.svelte
@@ -2,7 +2,7 @@
   import { _ } from 'svelte-i18n';
 
   import PageLayoutWithSidebar from '@mathesar/layouts/PageLayoutWithSidebar.svelte';
-  import { Database } from '@mathesar/models/databases';
+  import { Database } from '@mathesar/models/Database';
   import {
     getDatabaseCollaboratorsUrl,
     getDatabaseRoleConfigurationUrl,
diff --git a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
index d5bc0d3f10..fd103a1cee 100644
--- a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
+++ b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
@@ -5,7 +5,7 @@
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
   import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
   import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
diff --git a/mathesar_ui/src/pages/exploration/Header.svelte b/mathesar_ui/src/pages/exploration/Header.svelte
index 4d4c09fef3..98ada6f753 100644
--- a/mathesar_ui/src/pages/exploration/Header.svelte
+++ b/mathesar_ui/src/pages/exploration/Header.svelte
@@ -5,7 +5,7 @@
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import EntityPageHeader from '@mathesar/components/EntityPageHeader.svelte';
   import { iconExploration, iconInspector } from '@mathesar/icons';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { getExplorationEditorPageUrl } from '@mathesar/routes/urls';
   import { Button, Icon } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/pages/home/DatabaseRow.svelte b/mathesar_ui/src/pages/home/DatabaseRow.svelte
index 4e01751203..210e6e081d 100644
--- a/mathesar_ui/src/pages/home/DatabaseRow.svelte
+++ b/mathesar_ui/src/pages/home/DatabaseRow.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import Card from '@mathesar/components/Card.svelte';
   import { iconDatabase } from '@mathesar/icons';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { getDatabasePageUrl } from '@mathesar/routes/urls';
   import { Icon } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/pages/home/HomePage.svelte b/mathesar_ui/src/pages/home/HomePage.svelte
index b5c5fe77bc..9a020a5e5a 100644
--- a/mathesar_ui/src/pages/home/HomePage.svelte
+++ b/mathesar_ui/src/pages/home/HomePage.svelte
@@ -5,7 +5,7 @@
   import { RichText } from '@mathesar/components/rich-text';
   import { iconConnection } from '@mathesar/icons';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { databasesStore } from '@mathesar/stores/databases';
   import { modal } from '@mathesar/stores/modal';
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index bc9c2f7c3e..cab3b75235 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -17,7 +17,7 @@
   } from '@mathesar/components/form';
   import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
   import { iconDeleteMajor } from '@mathesar/icons';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { runner } from '@mathesar/packages/json-rpc-client-builder';
   import {
     getImportPreviewPageUrl,
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
index 348c2e97ac..673b356164 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
@@ -5,7 +5,7 @@
   import { dataFilesApi } from '@mathesar/api/rest/dataFiles';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { getTablePageUrl } from '@mathesar/routes/urls';
   import AsyncStore from '@mathesar/stores/AsyncStore';
diff --git a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
index 4f01708665..6be01a57a0 100644
--- a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
+++ b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
@@ -4,7 +4,7 @@ import type { Column } from '@mathesar/api/rpc/columns';
 import type { Schema } from '@mathesar/api/rpc/schemas';
 import type { Table } from '@mathesar/api/rpc/tables';
 import { getCellCap } from '@mathesar/components/cell-fabric/utils';
-import type { Database } from '@mathesar/models/databases';
+import type { Database } from '@mathesar/models/Database';
 import { getAbstractTypeForDbType } from '@mathesar/stores/abstract-types';
 import type {
   AbstractType,
diff --git a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
index feda1919d0..caf81c523b 100644
--- a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
+++ b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
@@ -20,7 +20,7 @@
   import { RichText } from '@mathesar/components/rich-text';
   import { iconPaste, iconUrl } from '@mathesar/icons';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { getImportPreviewPageUrl } from '@mathesar/routes/urls';
   import { createTable } from '@mathesar/stores/tables';
diff --git a/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte b/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
index 6805469e99..0a34daf1ef 100644
--- a/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
+++ b/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
@@ -2,7 +2,7 @@
   import { router } from 'tinro';
 
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { getTablePageUrl } from '@mathesar/routes/urls';
   import { createTable } from '@mathesar/stores/tables';
   import { Button, Spinner } from '@mathesar-component-library';
diff --git a/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte b/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte
index 0745b1a098..a6087c57ff 100644
--- a/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte
+++ b/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte
@@ -2,7 +2,7 @@
   import { _ } from 'svelte-i18n';
 
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
   import { AnchorButton, Tutorial } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte b/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
index 46e2044a02..c4bfb13489 100644
--- a/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
+++ b/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
@@ -6,7 +6,7 @@
   import Icon from '@mathesar/component-library/icon/Icon.svelte';
   import LinkMenuItem from '@mathesar/component-library/menu/LinkMenuItem.svelte';
   import { iconAddNew } from '@mathesar/icons';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { getImportPageUrl, getTablePageUrl } from '@mathesar/routes/urls';
   import { createTable } from '@mathesar/stores/tables';
   import {
diff --git a/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte b/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte
index 923a7e2dc2..45d88ef382 100644
--- a/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte
+++ b/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte
@@ -2,7 +2,7 @@
   import { _ } from 'svelte-i18n';
 
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { getImportPageUrl } from '@mathesar/routes/urls';
   import { AnchorButton, Tutorial } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/pages/schema/ExplorationItem.svelte b/mathesar_ui/src/pages/schema/ExplorationItem.svelte
index 7cf1515969..31a5030312 100644
--- a/mathesar_ui/src/pages/schema/ExplorationItem.svelte
+++ b/mathesar_ui/src/pages/schema/ExplorationItem.svelte
@@ -5,7 +5,7 @@
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import TableName from '@mathesar/components/TableName.svelte';
   import { iconExploration } from '@mathesar/icons';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { getExplorationPageUrl } from '@mathesar/routes/urls';
   import { currentTablesData as tablesStore } from '@mathesar/stores/tables';
   import { Icon } from '@mathesar-component-library';
diff --git a/mathesar_ui/src/pages/schema/ExplorationsList.svelte b/mathesar_ui/src/pages/schema/ExplorationsList.svelte
index 73e4458c60..136fb76e50 100644
--- a/mathesar_ui/src/pages/schema/ExplorationsList.svelte
+++ b/mathesar_ui/src/pages/schema/ExplorationsList.svelte
@@ -4,7 +4,7 @@
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import { iconExploration } from '@mathesar/icons';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
 
   import EmptyEntity from './EmptyEntity.svelte';
   import ExplorationItem from './ExplorationItem.svelte';
diff --git a/mathesar_ui/src/pages/schema/SchemaExplorations.svelte b/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
index e2327b3099..ac89d6569b 100644
--- a/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
@@ -5,7 +5,7 @@
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
   import { AnchorButton } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/pages/schema/SchemaOverview.svelte b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
index df16afaae4..ca570f8383 100644
--- a/mathesar_ui/src/pages/schema/SchemaOverview.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
@@ -8,7 +8,7 @@
   import SpinnerButton from '@mathesar/component-library/spinner-button/SpinnerButton.svelte';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { iconRefresh } from '@mathesar/icons';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
   import { refetchQueriesForSchema } from '@mathesar/stores/queries';
   import { refetchTablesForSchema } from '@mathesar/stores/tables';
diff --git a/mathesar_ui/src/pages/schema/SchemaPage.svelte b/mathesar_ui/src/pages/schema/SchemaPage.svelte
index 31e3c9adee..bd4d311427 100644
--- a/mathesar_ui/src/pages/schema/SchemaPage.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPage.svelte
@@ -5,7 +5,7 @@
   import AppSecondaryHeader from '@mathesar/components/AppSecondaryHeader.svelte';
   import { iconEdit, iconSchema } from '@mathesar/icons';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import {
     getSchemaPageExplorationsSectionUrl,
diff --git a/mathesar_ui/src/pages/schema/SchemaTables.svelte b/mathesar_ui/src/pages/schema/SchemaTables.svelte
index 0afe270774..0c4da003e3 100644
--- a/mathesar_ui/src/pages/schema/SchemaTables.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaTables.svelte
@@ -5,7 +5,7 @@
   import type { Table } from '@mathesar/api/rpc/tables';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
 
   import CreateNewTableButton from './CreateNewTableButton.svelte';
   import CreateNewTableTutorial from './CreateNewTableTutorial.svelte';
diff --git a/mathesar_ui/src/pages/schema/TableCard.svelte b/mathesar_ui/src/pages/schema/TableCard.svelte
index dafb32a706..be81b93a6a 100644
--- a/mathesar_ui/src/pages/schema/TableCard.svelte
+++ b/mathesar_ui/src/pages/schema/TableCard.svelte
@@ -12,7 +12,7 @@
     iconMoreActions,
     iconSelectRecord,
   } from '@mathesar/icons';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import {
     getImportPreviewPageUrl,
     getTablePageUrl,
diff --git a/mathesar_ui/src/pages/schema/TablesList.svelte b/mathesar_ui/src/pages/schema/TablesList.svelte
index c84ce9c470..32eea054b7 100644
--- a/mathesar_ui/src/pages/schema/TablesList.svelte
+++ b/mathesar_ui/src/pages/schema/TablesList.svelte
@@ -4,7 +4,7 @@
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Table } from '@mathesar/api/rpc/tables';
   import { iconTable } from '@mathesar/icons';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
 
   import EmptyEntity from './EmptyEntity.svelte';
   import TableCard from './TableCard.svelte';
diff --git a/mathesar_ui/src/routes/DataExplorerRoute.svelte b/mathesar_ui/src/routes/DataExplorerRoute.svelte
index 8fcf5f3735..d1bc8bcc33 100644
--- a/mathesar_ui/src/routes/DataExplorerRoute.svelte
+++ b/mathesar_ui/src/routes/DataExplorerRoute.svelte
@@ -8,7 +8,7 @@
   import type { CancellablePromise } from '@mathesar/component-library';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import { iconEdit, iconExploration } from '@mathesar/icons';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import DataExplorerPage from '@mathesar/pages/data-explorer/DataExplorerPage.svelte';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import {
diff --git a/mathesar_ui/src/routes/DatabaseRoute.svelte b/mathesar_ui/src/routes/DatabaseRoute.svelte
index 5ffacc0b19..28b73a564b 100644
--- a/mathesar_ui/src/routes/DatabaseRoute.svelte
+++ b/mathesar_ui/src/routes/DatabaseRoute.svelte
@@ -7,7 +7,7 @@
   import Identifier from '@mathesar/components/Identifier.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import EventfulRoute from '@mathesar/components/routing/EventfulRoute.svelte';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import DatabasePageWrapper from '@mathesar/pages/database/DatabasePageWrapper.svelte';
   import DatabasePageSchemasSection from '@mathesar/pages/database/schemas/SchemasSection.svelte';
   import DatabaseCollaborators from '@mathesar/pages/database/settings/Collaborators.svelte';
diff --git a/mathesar_ui/src/routes/ExplorationRoute.svelte b/mathesar_ui/src/routes/ExplorationRoute.svelte
index 6c56c154c4..7b6689956e 100644
--- a/mathesar_ui/src/routes/ExplorationRoute.svelte
+++ b/mathesar_ui/src/routes/ExplorationRoute.svelte
@@ -3,7 +3,7 @@
 
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import ExplorationPage from '@mathesar/pages/exploration/ExplorationPage.svelte';
   import { queries } from '@mathesar/stores/queries';
diff --git a/mathesar_ui/src/routes/ImportRoute.svelte b/mathesar_ui/src/routes/ImportRoute.svelte
index 145d099fa4..920a20f0f9 100644
--- a/mathesar_ui/src/routes/ImportRoute.svelte
+++ b/mathesar_ui/src/routes/ImportRoute.svelte
@@ -5,7 +5,7 @@
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import { iconImportData } from '@mathesar/icons';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import ImportPreviewPage from '@mathesar/pages/import/preview/ImportPreviewPage.svelte';
   import ImportUploadPage from '@mathesar/pages/import/upload/ImportUploadPage.svelte';
 
diff --git a/mathesar_ui/src/routes/RecordPageRoute.svelte b/mathesar_ui/src/routes/RecordPageRoute.svelte
index fa8fe8e13b..10d1c49023 100644
--- a/mathesar_ui/src/routes/RecordPageRoute.svelte
+++ b/mathesar_ui/src/routes/RecordPageRoute.svelte
@@ -2,7 +2,7 @@
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Table } from '@mathesar/api/rpc/tables';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import RecordPage from '@mathesar/pages/record/RecordPage.svelte';
   import RecordStore from '@mathesar/pages/record/RecordStore';
 
diff --git a/mathesar_ui/src/routes/SchemaRoute.svelte b/mathesar_ui/src/routes/SchemaRoute.svelte
index 9c74fb4f8d..d37f770227 100644
--- a/mathesar_ui/src/routes/SchemaRoute.svelte
+++ b/mathesar_ui/src/routes/SchemaRoute.svelte
@@ -5,7 +5,7 @@
 
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import MultiPathRoute from '@mathesar/components/routing/MultiPathRoute.svelte';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import SchemaPage from '@mathesar/pages/schema/SchemaPage.svelte';
   import { currentSchemaId, schemas } from '@mathesar/stores/schemas';
diff --git a/mathesar_ui/src/routes/TableRoute.svelte b/mathesar_ui/src/routes/TableRoute.svelte
index b23abc6219..302e30a593 100644
--- a/mathesar_ui/src/routes/TableRoute.svelte
+++ b/mathesar_ui/src/routes/TableRoute.svelte
@@ -5,7 +5,7 @@
 
   import type { Schema } from '@mathesar/api/rpc/schemas';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import TablePage from '@mathesar/pages/table/TablePage.svelte';
   import { currentTableId, currentTablesData } from '@mathesar/stores/tables';
diff --git a/mathesar_ui/src/stores/abstract-types/store.ts b/mathesar_ui/src/stores/abstract-types/store.ts
index 140716b810..3a58807aa8 100644
--- a/mathesar_ui/src/stores/abstract-types/store.ts
+++ b/mathesar_ui/src/stores/abstract-types/store.ts
@@ -2,7 +2,7 @@ import type { Readable, Unsubscriber, Writable } from 'svelte/store';
 import { derived, get, writable } from 'svelte/store';
 
 import { States, getAPI } from '@mathesar/api/rest/utils/requestUtils';
-import type { Database } from '@mathesar/models/databases';
+import type { Database } from '@mathesar/models/Database';
 import { databasesStore } from '@mathesar/stores/databases';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import type { CancellablePromise } from '@mathesar-component-library';
diff --git a/mathesar_ui/src/stores/databases.ts b/mathesar_ui/src/stores/databases.ts
index 936aeeba21..c688d01ecd 100644
--- a/mathesar_ui/src/stores/databases.ts
+++ b/mathesar_ui/src/stores/databases.ts
@@ -1,8 +1,8 @@
 import { type Readable, derived, writable } from 'svelte/store';
 
 import { api } from '@mathesar/api/rpc';
-import { Database } from '@mathesar/models/databases';
-import { Server } from '@mathesar/models/servers';
+import { Database } from '@mathesar/models/Database';
+import { Server } from '@mathesar/models/Server';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import type { MakeWritablePropertiesReadable } from '@mathesar/utils/typeUtils';
 import {
diff --git a/mathesar_ui/src/stores/schemas.ts b/mathesar_ui/src/stores/schemas.ts
index eaba581acb..572c6ead38 100644
--- a/mathesar_ui/src/stores/schemas.ts
+++ b/mathesar_ui/src/stores/schemas.ts
@@ -4,7 +4,7 @@ import { derived, get, writable } from 'svelte/store';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { api } from '@mathesar/api/rpc';
 import type { Schema } from '@mathesar/api/rpc/schemas';
-import type { Database } from '@mathesar/models/databases';
+import type { Database } from '@mathesar/models/Database';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import type { CancellablePromise } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/stores/table-data/TableStructure.ts b/mathesar_ui/src/stores/table-data/TableStructure.ts
index a43f21589b..1188b3fc4e 100644
--- a/mathesar_ui/src/stores/table-data/TableStructure.ts
+++ b/mathesar_ui/src/stores/table-data/TableStructure.ts
@@ -5,7 +5,7 @@ import { States } from '@mathesar/api/rest/utils/requestUtils';
 import type { Column } from '@mathesar/api/rpc/columns';
 import type { Table } from '@mathesar/api/rpc/tables';
 import type { DBObjectEntry } from '@mathesar/AppTypes';
-import type { Database } from '@mathesar/models/databases';
+import type { Database } from '@mathesar/models/Database';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
 
 import { ColumnsDataStore } from './columns';
diff --git a/mathesar_ui/src/stores/table-data/columns.ts b/mathesar_ui/src/stores/table-data/columns.ts
index e5739cf117..5f9ff410ad 100644
--- a/mathesar_ui/src/stores/table-data/columns.ts
+++ b/mathesar_ui/src/stores/table-data/columns.ts
@@ -8,7 +8,7 @@ import type {
   ColumnPatchSpec,
 } from '@mathesar/api/rpc/columns';
 import type { Table } from '@mathesar/api/rpc/tables';
-import type { Database } from '@mathesar/models/databases';
+import type { Database } from '@mathesar/models/Database';
 import { getErrorMessage } from '@mathesar/utils/errors';
 import type { ShareConsumer } from '@mathesar/utils/shares';
 import {
diff --git a/mathesar_ui/src/stores/table-data/constraints.ts b/mathesar_ui/src/stores/table-data/constraints.ts
index 1fbe7fd2c7..675a3113ab 100644
--- a/mathesar_ui/src/stores/table-data/constraints.ts
+++ b/mathesar_ui/src/stores/table-data/constraints.ts
@@ -15,7 +15,7 @@ import type {
   ConstraintRecipe,
 } from '@mathesar/api/rpc/constraints';
 import type { Table } from '@mathesar/api/rpc/tables';
-import type { Database } from '@mathesar/models/databases';
+import type { Database } from '@mathesar/models/Database';
 import type { ShareConsumer } from '@mathesar/utils/shares';
 import type { CancellablePromise } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/stores/table-data/records.ts b/mathesar_ui/src/stores/table-data/records.ts
index f57e52b7d1..8f1c28712b 100644
--- a/mathesar_ui/src/stores/table-data/records.ts
+++ b/mathesar_ui/src/stores/table-data/records.ts
@@ -19,7 +19,7 @@ import type {
   RecordsResponse,
 } from '@mathesar/api/rpc/records';
 import type { Table } from '@mathesar/api/rpc/tables';
-import type { Database } from '@mathesar/models/databases';
+import type { Database } from '@mathesar/models/Database';
 import { getErrorMessage } from '@mathesar/utils/errors';
 import { pluralize } from '@mathesar/utils/languageUtils';
 import type Pagination from '@mathesar/utils/Pagination';
diff --git a/mathesar_ui/src/stores/table-data/tabularData.ts b/mathesar_ui/src/stores/table-data/tabularData.ts
index 86d3352fa8..f7debf7ec9 100644
--- a/mathesar_ui/src/stores/table-data/tabularData.ts
+++ b/mathesar_ui/src/stores/table-data/tabularData.ts
@@ -7,7 +7,7 @@ import type { Table } from '@mathesar/api/rpc/tables';
 import Plane from '@mathesar/components/sheet/selection/Plane';
 import Series from '@mathesar/components/sheet/selection/Series';
 import SheetSelectionStore from '@mathesar/components/sheet/selection/SheetSelectionStore';
-import type { Database } from '@mathesar/models/databases';
+import type { Database } from '@mathesar/models/Database';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
 import type { ShareConsumer } from '@mathesar/utils/shares';
 import { orderProcessedColumns } from '@mathesar/utils/tables';
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index 2536edd9eb..6cf2d71867 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -20,7 +20,7 @@ import { api } from '@mathesar/api/rpc';
 import type { Schema } from '@mathesar/api/rpc/schemas';
 import type { Table } from '@mathesar/api/rpc/tables';
 import { invalidIf } from '@mathesar/components/form';
-import type { Database } from '@mathesar/models/databases';
+import type { Database } from '@mathesar/models/Database';
 import { TupleMap } from '@mathesar/packages/tuple-map';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import {
diff --git a/mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte b/mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte
index d2e912defb..fd83e7af65 100644
--- a/mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/ConnectDatabaseModal.svelte
@@ -3,7 +3,7 @@
   import { router } from 'tinro';
 
   import { iconConnectDatabase, iconCreateDatabase } from '@mathesar/icons';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { getDatabasePageUrl } from '@mathesar/routes/urls';
   import {
     ControlledModal,
diff --git a/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte b/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte
index 4b3864c96d..3da71d8e70 100644
--- a/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/ConnectExistingDatabase.svelte
@@ -8,7 +8,7 @@
     requiredField,
   } from '@mathesar/components/form';
   import Field from '@mathesar/components/form/Field.svelte';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { databasesStore } from '@mathesar/stores/databases';
   import {
     NumberInput,
diff --git a/mathesar_ui/src/systems/databases/create-database/CreateNewDatabase.svelte b/mathesar_ui/src/systems/databases/create-database/CreateNewDatabase.svelte
index 657a5dbadc..edbe27f976 100644
--- a/mathesar_ui/src/systems/databases/create-database/CreateNewDatabase.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/CreateNewDatabase.svelte
@@ -8,7 +8,7 @@
     requiredField,
   } from '@mathesar/components/form';
   import Field from '@mathesar/components/form/Field.svelte';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import { databasesStore } from '@mathesar/stores/databases';
   import { portalToWindowFooter } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
index c96c8faf39..140593c671 100644
--- a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
+++ b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
@@ -6,7 +6,7 @@
   import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
   import NameAndDescInputModalForm from '@mathesar/components/NameAndDescInputModalForm.svelte';
   import { RichText } from '@mathesar/components/rich-text';
-  import type { Database } from '@mathesar/models/databases';
+  import type { Database } from '@mathesar/models/Database';
   import {
     createSchema,
     schemas,

From 101eab7bacaac43a79fcc2a5621ab895bdb73bcb Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 16 Aug 2024 22:08:29 +0530
Subject: [PATCH 0647/1141] Implement SortedImmutableMap

---
 .../common/utils/ImmutableMap.ts              |   8 +-
 .../common/utils/SortedImmutableMap.ts        |  22 ++++
 .../__tests__/SortedImmutableMap.test.ts      | 113 ++++++++++++++++++
 .../component-library/common/utils/index.ts   |   1 +
 4 files changed, 143 insertions(+), 1 deletion(-)
 create mode 100644 mathesar_ui/src/component-library/common/utils/SortedImmutableMap.ts
 create mode 100644 mathesar_ui/src/component-library/common/utils/__tests__/SortedImmutableMap.test.ts

diff --git a/mathesar_ui/src/component-library/common/utils/ImmutableMap.ts b/mathesar_ui/src/component-library/common/utils/ImmutableMap.ts
index ebd2697940..2e68c25e7c 100644
--- a/mathesar_ui/src/component-library/common/utils/ImmutableMap.ts
+++ b/mathesar_ui/src/component-library/common/utils/ImmutableMap.ts
@@ -19,7 +19,7 @@ export default class ImmutableMap<Key, Value> {
    * know.
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  private getNewInstance(...args: any[]): this {
+  protected getNewInstance(...args: any[]): this {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-explicit-any
     return new (this.constructor as any)(...args) as this;
   }
@@ -134,6 +134,12 @@ export default class ImmutableMap<Key, Value> {
     );
   }
 
+  mapKeys<NewKey>(fn: (value: Value) => NewKey): ImmutableMap<NewKey, Value> {
+    return new ImmutableMap(
+      [...this.values()].map((value) => [fn(value), value]),
+    );
+  }
+
   filterValues(fn: (value: Value) => boolean): ImmutableMap<Key, Value> {
     return new ImmutableMap(
       [...this.entries()].filter(([, value]) => fn(value)),
diff --git a/mathesar_ui/src/component-library/common/utils/SortedImmutableMap.ts b/mathesar_ui/src/component-library/common/utils/SortedImmutableMap.ts
new file mode 100644
index 0000000000..8d51ef62eb
--- /dev/null
+++ b/mathesar_ui/src/component-library/common/utils/SortedImmutableMap.ts
@@ -0,0 +1,22 @@
+import ImmutableMap from './ImmutableMap';
+
+export default class SortedImmutableMap<Key, Value> extends ImmutableMap<
+  Key,
+  Value
+> {
+  sortFn;
+
+  constructor(
+    sortFn: (j: Iterable<[Key, Value]>) => Iterable<[Key, Value]>,
+    i: Iterable<[Key, Value]> = [],
+  ) {
+    const sorted = sortFn(i);
+    super(sorted);
+    this.sortFn = sortFn;
+  }
+
+  protected getNewInstance(...args: any[]): this {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-explicit-any
+    return new (this.constructor as any)(this.sortFn, ...args) as this;
+  }
+}
diff --git a/mathesar_ui/src/component-library/common/utils/__tests__/SortedImmutableMap.test.ts b/mathesar_ui/src/component-library/common/utils/__tests__/SortedImmutableMap.test.ts
new file mode 100644
index 0000000000..c7a32a3248
--- /dev/null
+++ b/mathesar_ui/src/component-library/common/utils/__tests__/SortedImmutableMap.test.ts
@@ -0,0 +1,113 @@
+import SortedImmutableMap from '../SortedImmutableMap';
+
+const sample = new SortedImmutableMap<number, string>(
+  (v) => [...v].sort(([, a], [, b]) => a.localeCompare(b)),
+  [
+    [2, 'b'],
+    [1, 'a'],
+  ],
+);
+
+test('with', () => {
+  expect([...sample.with(2, 'b')]).toEqual([
+    [1, 'a'],
+    [2, 'b'],
+  ]);
+  expect([...sample.with(2, 'c')]).toEqual([
+    [1, 'a'],
+    [2, 'c'],
+  ]);
+  expect([...sample.with(3, 'c')]).toEqual([
+    [1, 'a'],
+    [2, 'b'],
+    [3, 'c'],
+  ]);
+  expect([...sample.with(0, '')]).toEqual([
+    [0, ''],
+    [1, 'a'],
+    [2, 'b'],
+  ]);
+});
+
+test('without', () => {
+  expect([...sample.without(2)]).toEqual([[1, 'a']]);
+  expect([...sample.without(3)]).toEqual([
+    [1, 'a'],
+    [2, 'b'],
+  ]);
+});
+
+test('has', () => {
+  expect(sample.has(2)).toBe(true);
+  expect(sample.has(3)).toBe(false);
+});
+
+test('size', () => {
+  expect(sample.size).toBe(2);
+  expect(new SortedImmutableMap((v) => [...v].sort()).size).toBe(0);
+});
+
+test('withEntries', () => {
+  expect([
+    ...sample.withEntries([
+      [2, 'FOO'],
+      [3, 'c'],
+    ]),
+  ]).toEqual([
+    [1, 'a'],
+    [3, 'c'],
+    [2, 'FOO'],
+  ]);
+  expect([...sample.withEntries([])]).toEqual([
+    [1, 'a'],
+    [2, 'b'],
+  ]);
+  expect([
+    ...sample.withEntries(
+      [
+        [3, 'c'],
+        [2, 'FOO'],
+      ],
+      (a, b) => `${a}-${b}`,
+    ),
+  ]).toEqual([
+    [1, 'a'],
+    [2, 'b-FOO'],
+    [3, 'c'],
+  ]);
+});
+
+test('mapValues', () => {
+  expect([...sample.mapValues((v) => `(${v})`)]).toEqual([
+    [1, '(a)'],
+    [2, '(b)'],
+  ]);
+});
+
+test('coalesce', () => {
+  expect([...sample.coalesce(1, 'FOO')]).toEqual([
+    [1, 'a'],
+    [2, 'b'],
+  ]);
+  expect([...sample.coalesce(3, 'FOO')]).toEqual([
+    [1, 'a'],
+    [2, 'b'],
+    [3, 'FOO'],
+  ]);
+});
+
+test('coalesceEntries', () => {
+  expect([...sample.coalesceEntries([[1, 'FOO']])]).toEqual([
+    [1, 'a'],
+    [2, 'b'],
+  ]);
+  expect([...sample.coalesceEntries([])]).toEqual([
+    [1, 'a'],
+    [2, 'b'],
+  ]);
+  expect([...sample.coalesceEntries([[3, 'FOO']])]).toEqual([
+    [1, 'a'],
+    [2, 'b'],
+    [3, 'FOO'],
+  ]);
+});
diff --git a/mathesar_ui/src/component-library/common/utils/index.ts b/mathesar_ui/src/component-library/common/utils/index.ts
index 24bc24a805..9520d453a0 100644
--- a/mathesar_ui/src/component-library/common/utils/index.ts
+++ b/mathesar_ui/src/component-library/common/utils/index.ts
@@ -3,6 +3,7 @@ export { default as CancellablePromise } from './CancellablePromise';
 export { default as EventHandler } from './EventHandler';
 export { default as ImmutableSet } from './ImmutableSet';
 export { default as ImmutableMap } from './ImmutableMap';
+export { default as SortedImmutableMap } from './SortedImmutableMap';
 export { default as WritableMap } from './WritableMap';
 export { default as WritableSet } from './WritableSet';
 export { default as dayjs } from './dayjs';

From 44f8b95ff9200d9717df8263898f10761d20e531 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 16 Aug 2024 23:02:18 +0530
Subject: [PATCH 0648/1141] Add roles rpc methods

---
 mathesar_ui/src/api/rpc/index.ts |  2 ++
 mathesar_ui/src/api/rpc/roles.ts | 29 +++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 mathesar_ui/src/api/rpc/roles.ts

diff --git a/mathesar_ui/src/api/rpc/index.ts b/mathesar_ui/src/api/rpc/index.ts
index 9e12fd779a..cb0400b48f 100644
--- a/mathesar_ui/src/api/rpc/index.ts
+++ b/mathesar_ui/src/api/rpc/index.ts
@@ -8,6 +8,7 @@ import { constraints } from './constraints';
 import { database_setup } from './database_setup';
 import { databases } from './databases';
 import { records } from './records';
+import { roles } from './roles';
 import { schemas } from './schemas';
 import { servers } from './servers';
 import { tables } from './tables';
@@ -21,6 +22,7 @@ export const api = buildRpcApi({
     database_setup,
     databases,
     records,
+    roles,
     schemas,
     servers,
     tables,
diff --git a/mathesar_ui/src/api/rpc/roles.ts b/mathesar_ui/src/api/rpc/roles.ts
new file mode 100644
index 0000000000..f030b5d6a3
--- /dev/null
+++ b/mathesar_ui/src/api/rpc/roles.ts
@@ -0,0 +1,29 @@
+import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
+
+import type { RawDatabase } from './databases';
+
+export interface RawRoleMember {
+  oid: number;
+  admin: boolean;
+}
+
+export interface RawRole {
+  oid: number;
+  name: string;
+  super: boolean;
+  inherits: boolean;
+  create_role: boolean;
+  create_db: boolean;
+  login: boolean;
+  description?: string;
+  members?: RawRoleMember[];
+}
+
+export const roles = {
+  list: rpcMethodTypeContainer<
+    {
+      database_id: RawDatabase['id'];
+    },
+    Array<RawRole>
+  >(),
+};

From ebc9667c77efdcaf7a88e987561e6c0dfaf74a88 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 16 Aug 2024 23:23:26 +0530
Subject: [PATCH 0649/1141] Add Role and ConfiguredRole models

---
 mathesar_ui/src/models/ConfiguredRole.ts | 20 +++++++++++++
 mathesar_ui/src/models/Role.ts           | 38 ++++++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 mathesar_ui/src/models/ConfiguredRole.ts
 create mode 100644 mathesar_ui/src/models/Role.ts

diff --git a/mathesar_ui/src/models/ConfiguredRole.ts b/mathesar_ui/src/models/ConfiguredRole.ts
new file mode 100644
index 0000000000..6217f9e760
--- /dev/null
+++ b/mathesar_ui/src/models/ConfiguredRole.ts
@@ -0,0 +1,20 @@
+import type { RawConfiguredRole } from '@mathesar/api/rpc/configured_roles';
+
+import type { Database } from './Database';
+
+export class ConfiguredRole {
+  readonly id: number;
+
+  readonly name: string;
+
+  readonly database: Database;
+
+  constructor(props: {
+    database: Database;
+    rawConfiguredRole: RawConfiguredRole;
+  }) {
+    this.id = props.rawConfiguredRole.id;
+    this.name = props.rawConfiguredRole.name;
+    this.database = props.database;
+  }
+}
diff --git a/mathesar_ui/src/models/Role.ts b/mathesar_ui/src/models/Role.ts
new file mode 100644
index 0000000000..a39f997fcf
--- /dev/null
+++ b/mathesar_ui/src/models/Role.ts
@@ -0,0 +1,38 @@
+import type { RawRole, RawRoleMember } from '@mathesar/api/rpc/roles';
+
+import type { Database } from './Database';
+
+export class Role {
+  readonly oid: number;
+
+  readonly name: string;
+
+  readonly super: boolean;
+
+  readonly inherits: boolean;
+
+  readonly createRole: boolean;
+
+  readonly createDb: boolean;
+
+  readonly login: boolean;
+
+  readonly description?: string;
+
+  readonly members?: RawRoleMember[];
+
+  readonly database: Database;
+
+  constructor(props: { database: Database; rawRole: RawRole }) {
+    this.oid = props.rawRole.oid;
+    this.name = props.rawRole.name;
+    this.super = props.rawRole.super;
+    this.inherits = props.rawRole.inherits;
+    this.createRole = props.rawRole.create_role;
+    this.createDb = props.rawRole.create_db;
+    this.login = props.rawRole.login;
+    this.description = props.rawRole.description;
+    this.members = props.rawRole.members;
+    this.database = props.database;
+  }
+}

From fd541a494dbc4e0512aefd3328b74b946e531f67 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 16 Aug 2024 23:24:51 +0530
Subject: [PATCH 0650/1141] Add before run and on response calls to
 AsyncRpcApiStore's batch runner

---
 mathesar_ui/src/stores/AsyncRpcApiStore.ts | 52 +++++++++++++++-------
 mathesar_ui/src/stores/AsyncStore.ts       | 34 +++++++-------
 2 files changed, 55 insertions(+), 31 deletions(-)

diff --git a/mathesar_ui/src/stores/AsyncRpcApiStore.ts b/mathesar_ui/src/stores/AsyncRpcApiStore.ts
index 68c1057bdc..741e6ac803 100644
--- a/mathesar_ui/src/stores/AsyncRpcApiStore.ts
+++ b/mathesar_ui/src/stores/AsyncRpcApiStore.ts
@@ -1,3 +1,5 @@
+import { get } from 'svelte/store';
+
 import { CancellablePromise } from '@mathesar/component-library';
 import {
   type RpcRequest,
@@ -5,7 +7,14 @@ import {
   batchSend,
 } from '@mathesar/packages/json-rpc-client-builder';
 
-import AsyncStore from './AsyncStore';
+import AsyncStore, { AsyncStoreValue } from './AsyncStore';
+
+type BatchRunner<T = any, U = any> = {
+  send: RpcRequest<T>;
+  beforeRequest: () => void;
+  onResponse: (response: RpcResponse<T>) => void;
+  getValue: () => AsyncStoreValue<U, string>;
+};
 
 export default class AsyncRpcApiStore<Props, T, U> extends AsyncStore<
   Props,
@@ -41,29 +50,42 @@ export default class AsyncRpcApiStore<Props, T, U> extends AsyncStore<
     this.postProcess = postProcess;
   }
 
-  batchRunner(
-    props: Props,
-  ): [RpcRequest<T>, (response: RpcResponse<T>) => void] {
-    const onReponse = (response: RpcResponse<T>) => {
+  batchRunner(props: Props): BatchRunner<T, U> {
+    const onResponse = (response: RpcResponse<T>) => {
       if (response.status === 'ok') {
         this.setResolvedValue(this.postProcess(response.value));
       } else {
         this.setRejectedError(response);
       }
     };
-    return [this.apiRpcFn(props), onReponse];
+    const beforeRequest = () => {
+      this.beforeRun();
+    };
+    return {
+      send: this.apiRpcFn(props),
+      beforeRequest,
+      onResponse,
+      getValue: () => get(this.value),
+    };
   }
 
   static async runBatched(
-    batchRunners: [
-      RpcRequest<unknown>,
-      (response: RpcResponse<unknown>) => void,
-    ][],
+    batchRunners: BatchRunner[],
+    options?: Partial<{
+      onlyRunIfNotInitialized: boolean;
+    }>,
   ) {
-    const requests = batchRunners.map((runner) => runner[0]);
-    const results = await batchSend(requests);
-    batchRunners.forEach((runner, index) => {
-      runner[1](results[index]);
-    });
+    const toRun = options?.onlyRunIfNotInitialized
+      ? batchRunners.filter((runner) => !runner.getValue().hasInitialized)
+      : batchRunners;
+    if (toRun.length > 0) {
+      toRun.forEach((runner) => {
+        runner.beforeRequest();
+      });
+      const results = await batchSend(toRun.map((runner) => runner.send));
+      toRun.forEach((runner, index) => {
+        runner.onResponse(results[index]);
+      });
+    }
   }
 }
diff --git a/mathesar_ui/src/stores/AsyncStore.ts b/mathesar_ui/src/stores/AsyncStore.ts
index 33830f3d0e..9ede933009 100644
--- a/mathesar_ui/src/stores/AsyncStore.ts
+++ b/mathesar_ui/src/stores/AsyncStore.ts
@@ -106,7 +106,7 @@ export default class AsyncStore<Props, T>
 
   private getError: (caughtValue: unknown) => string;
 
-  private value: Writable<AsyncStoreValue<T, string>> = writable(
+  protected value: Writable<AsyncStoreValue<T, string>> = writable(
     new AsyncStoreValue({ isLoading: false }),
   );
 
@@ -141,28 +141,25 @@ export default class AsyncStore<Props, T>
   }
 
   async run(props: Props): Promise<AsyncStoreValue<T, string>> {
-    this.cancel();
-    this.value.update((v) => new AsyncStoreValue({ ...v, isLoading: true }));
+    this.beforeRun();
     this.promise = this.runFn(props);
     try {
-      this.value.set(
-        new AsyncStoreValue({
-          settlement: { state: 'resolved', value: await this.promise },
-          isLoading: false,
-        }),
-      );
+      this.setResolvedValue(await this.promise);
       return get(this.value);
     } catch (error) {
-      this.value.set(
-        new AsyncStoreValue({
-          settlement: { state: 'rejected', error: this.getError(error) },
-          isLoading: false,
-        }),
-      );
+      this.setRejectedError(error);
       return get(this.value);
     }
   }
 
+  async runIfNotInitialized(props: Props): Promise<AsyncStoreValue<T, string>> {
+    const value = get(this.value);
+    if (!value.hasInitialized) {
+      return this.run(props);
+    }
+    return value;
+  }
+
   /**
    * Cancels the promise, if possible. Retains the current value.
    */
@@ -180,6 +177,11 @@ export default class AsyncStore<Props, T>
     this.value.set(new AsyncStoreValue({ isLoading: false }));
   }
 
+  protected beforeRun() {
+    this.cancel();
+    this.value.update((v) => new AsyncStoreValue({ ...v, isLoading: true }));
+  }
+
   setResolvedValue(value: T) {
     this.cancel();
     this.value.set(
@@ -190,7 +192,7 @@ export default class AsyncStore<Props, T>
     );
   }
 
-  setRejectedError(error: unknown) {
+  protected setRejectedError(error: unknown) {
     this.cancel();
     this.value.set(
       new AsyncStoreValue({

From b5a002339c8941fb2f70603adb73a5a071aed3a3 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 16 Aug 2024 23:27:22 +0530
Subject: [PATCH 0651/1141] Add GridTable component

---
 .../components/grid-table/GridTable.svelte    | 24 ++++++++++
 .../grid-table/GridTableCell.svelte           | 46 +++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 mathesar_ui/src/components/grid-table/GridTable.svelte
 create mode 100644 mathesar_ui/src/components/grid-table/GridTableCell.svelte

diff --git a/mathesar_ui/src/components/grid-table/GridTable.svelte b/mathesar_ui/src/components/grid-table/GridTable.svelte
new file mode 100644
index 0000000000..c4863d481d
--- /dev/null
+++ b/mathesar_ui/src/components/grid-table/GridTable.svelte
@@ -0,0 +1,24 @@
+<div class="grid-table" {...$$restProps}>
+  <slot />
+</div>
+
+<style>
+  .grid-table {
+    --Grid-table__border-size-internal: var(--Grid-table__border-size, 1px);
+    --Grid-table__border-color-internal: var(
+      --Grid-table__border-color,
+      var(--slate-300)
+    );
+    --Grid-table__cell-border-color-internal: var(
+      --Grid-table__cell-border-color,
+      var(--slate-200)
+    );
+    display: grid;
+    border: var(--Grid-table__border-size-internal) solid
+      var(--Grid-table__border-color-internal);
+    border-radius: var(--border-radius-l);
+    overflow: hidden;
+    grid-template-columns: var(--Grid-table__template-columns);
+    grid-template-rows: var(--Grid-table__template-rows);
+  }
+</style>
diff --git a/mathesar_ui/src/components/grid-table/GridTableCell.svelte b/mathesar_ui/src/components/grid-table/GridTableCell.svelte
new file mode 100644
index 0000000000..03f952876c
--- /dev/null
+++ b/mathesar_ui/src/components/grid-table/GridTableCell.svelte
@@ -0,0 +1,46 @@
+<script lang="ts">
+  export let header = false;
+</script>
+
+<div class="gt-cell" class:gt-header={header} {...$$restProps}>
+  <slot />
+</div>
+
+<style lang="scss">
+  .gt-cell {
+    display: flex;
+    position: relative;
+    align-items: center;
+    min-height: 100%;
+    padding: var(--size-x-small) var(--size-base);
+
+    &::before,
+    &::after {
+      content: '';
+      position: absolute;
+      background-color: var(--Grid-table__cell-border-color-internal);
+      z-index: 1;
+    }
+    // row
+    &::after {
+      inline-size: 100vw;
+      block-size: var(--Grid-table__border-size-internal);
+      inset-inline-start: 0;
+      inset-block-end: calc(var(--Grid-table__border-size-internal) * -1);
+    }
+    // column
+    &::before {
+      inline-size: var(--Grid-table__border-size-internal);
+      block-size: 100vh;
+      inset-inline-start: calc(var(--Grid-table__border-size-internal) * -1);
+    }
+
+    &.gt-header {
+      font-weight: 500;
+
+      &::after {
+        background-color: var(--Grid-table__border-color-internal);
+      }
+    }
+  }
+</style>

From c49cf79b432d89667e5a9e36ec3c2a8d16069124 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 16 Aug 2024 23:27:57 +0530
Subject: [PATCH 0652/1141] Add database page settings content layout component

---
 .../settings/SettingsContentLayout.svelte     | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 mathesar_ui/src/pages/database/settings/SettingsContentLayout.svelte

diff --git a/mathesar_ui/src/pages/database/settings/SettingsContentLayout.svelte b/mathesar_ui/src/pages/database/settings/SettingsContentLayout.svelte
new file mode 100644
index 0000000000..a9bc582a92
--- /dev/null
+++ b/mathesar_ui/src/pages/database/settings/SettingsContentLayout.svelte
@@ -0,0 +1,34 @@
+<div class="settings-content">
+  <header>
+    <div class="title">
+      <slot name="title" />
+    </div>
+    <div class="actions">
+      <slot name="actions" />
+    </div>
+  </header>
+  <div class="content">
+    <slot />
+  </div>
+</div>
+
+<style lang="scss">
+  .settings-content {
+    padding: var(--size-x-small);
+
+    header {
+      display: flex;
+      align-items: center;
+    }
+    .title {
+      font-size: var(--text-size-x-large);
+      font-weight: 500;
+    }
+    .actions {
+      margin-left: auto;
+    }
+    .content {
+      padding: var(--size-x-large) 0;
+    }
+  }
+</style>

From df5495afc1938cff8940737cd78a77ace4e49bb5 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 16 Aug 2024 23:28:15 +0530
Subject: [PATCH 0653/1141] Add methods to fetch configured roles and roles
 from database model

---
 mathesar_ui/src/models/Database.ts | 31 ++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/mathesar_ui/src/models/Database.ts b/mathesar_ui/src/models/Database.ts
index f9c3093975..c8b1771553 100644
--- a/mathesar_ui/src/models/Database.ts
+++ b/mathesar_ui/src/models/Database.ts
@@ -1,5 +1,10 @@
+import { api } from '@mathesar/api/rpc';
 import type { RawDatabase } from '@mathesar/api/rpc/databases';
+import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
+import { SortedImmutableMap } from '@mathesar-component-library';
 
+import { ConfiguredRole } from './ConfiguredRole';
+import { Role } from './Role';
 import type { Server } from './Server';
 
 export class Database {
@@ -14,4 +19,30 @@ export class Database {
     this.name = props.rawDatabase.name;
     this.server = props.server;
   }
+
+  fetchConfiguredRoles() {
+    return new AsyncRpcApiStore(api.configured_roles.list, {
+      postProcess: (rawConfiguredRoles) =>
+        new SortedImmutableMap(
+          (v) => [...v].sort(([, a], [, b]) => a.name.localeCompare(b.name)),
+          rawConfiguredRoles.map((rawConfiguredRole) => [
+            rawConfiguredRole.id,
+            new ConfiguredRole({ database: this, rawConfiguredRole }),
+          ]),
+        ),
+    });
+  }
+
+  fetchRoles() {
+    return new AsyncRpcApiStore(api.roles.list, {
+      postProcess: (rawRoles) =>
+        new SortedImmutableMap(
+          (v) => [...v].sort(([, a], [, b]) => a.name.localeCompare(b.name)),
+          rawRoles.map((rawRole) => [
+            rawRole.oid,
+            new Role({ database: this, rawRole }),
+          ]),
+        ),
+    });
+  }
 }

From 8e79ac0f1fa7441b748ca26554b567c00fc2a1f0 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 16 Aug 2024 23:31:39 +0530
Subject: [PATCH 0654/1141] Implement database settings context and basic
 RoleConfiguration page

---
 .../common/styles/variables.scss              |  1 +
 mathesar_ui/src/i18n/languages/en/dict.json   |  8 ++
 .../pages/database/DatabasePageWrapper.svelte |  1 +
 .../settings/RoleConfiguration.svelte         | 72 +++++++++++++++++-
 .../database/settings/SettingsWrapper.svelte  |  4 +
 .../settings/databaseSettingsUtils.ts         | 76 +++++++++++++++++++
 6 files changed, 161 insertions(+), 1 deletion(-)
 create mode 100644 mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts

diff --git a/mathesar_ui/src/component-library/common/styles/variables.scss b/mathesar_ui/src/component-library/common/styles/variables.scss
index 4e31fd79b5..48e55adc2d 100644
--- a/mathesar_ui/src/component-library/common/styles/variables.scss
+++ b/mathesar_ui/src/component-library/common/styles/variables.scss
@@ -34,6 +34,7 @@
   --slate-700: #424952;
   --slate-800: #25292e;
 
+  --sand-50: #fcfbf8;
   --sand-100: #f9f8f6;
   --sand-200: #efece7;
   --sand-300: #e2dcd4;
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 0733249cf7..3e5c6117be 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -45,6 +45,7 @@
   "cell": "Cell",
   "change_password": "Change Password",
   "check_for_updates": "Check for Updates",
+  "child_roles": "Child Roles",
   "choose_database": "Choose a Database",
   "choose_schema": "Choose a Schema",
   "choose_table_or_exploration": "Choose a Table or Exploration",
@@ -75,6 +76,8 @@
   "columns_removed_from_table_added_to_target": "{count, plural, one {The column above will be removed from [tableName] and added to [targetTableName]} other {The columns above will be removed from [tableName] and added to [targetTableName]}}",
   "columns_to_extract": "Columns to Extract",
   "columns_to_move": "Columns to Move",
+  "configure_in_mathesar": "Configure in Mathesar",
+  "configure_password": "Configure Password",
   "confirm_and_create_table": "Confirm & create table",
   "confirm_delete_table": "To confirm the deletion of the [tableName] table, please enter the table name into the input field below.",
   "confirm_password": "Confirm Password",
@@ -114,6 +117,7 @@
   "create_new_pg_user": "Create a new PostgreSQL user",
   "create_new_schema": "Create New Schema",
   "create_record_from_search": "Create Record From Search Criteria",
+  "create_role": "Create Role",
   "create_schema": "Create Schema",
   "create_share_explorations_of_your_data": "Create and Share Explorations of Your Data",
   "create_table_move_columns": "Create Table and Move Columns",
@@ -175,6 +179,7 @@
   "display_language": "Display Language",
   "display_name": "Display Name",
   "documentation_and_resources": "Documentation & Resources",
+  "drop_role": "Drop Role",
   "edit": "Edit",
   "edit_connection": "Edit Connection",
   "edit_connection_with_name": "Edit Connection: [connectionName]",
@@ -333,6 +338,7 @@
   "new_user_name": "New user name",
   "new_version_available": "New Version Available",
   "newest_to_oldest_sort": "Newest-Oldest",
+  "no": "No",
   "no_actions_selected_record": "There are no actions to perform on the selected record(s).",
   "no_constraints": "No Constraints",
   "no_continue_without_summarization": "No, continue without summarizing",
@@ -421,6 +427,7 @@
   "release_notes": "Release Notes",
   "release_notes_and_upgrade_instructions": "Release Notes and Upgrade Instructions",
   "released_date": "Released {date}",
+  "remove": "Remove",
   "remove_filters": "{count, plural, one {Remove Filter} other {Remove {count} Filters}}",
   "remove_grouping": "Remove Grouping",
   "remove_old_link_create_new": "Remove old link and create a new link?",
@@ -603,6 +610,7 @@
   "while_upgrading": "While Upgrading",
   "why_is_this_needed": "Why is this needed?",
   "window_remains_open_mathesar_unusable": "This window will remain open but all features within Mathesar will be unusable.",
+  "yes": "Yes",
   "yes_summarize_as_list": "Yes, summarize as a list",
   "yesterday": "Yesterday"
 }
diff --git a/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
index 2efe2a7c06..67915d4daf 100644
--- a/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
+++ b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
@@ -53,6 +53,7 @@
   restrictWidth
   cssVariables={{
     '--max-layout-width': 'var(--max-layout-width-console-pages)',
+    '--layout-background-color': 'var(--sand-50)'
   }}
 >
   <AppSecondaryHeader
diff --git a/mathesar_ui/src/pages/database/settings/RoleConfiguration.svelte b/mathesar_ui/src/pages/database/settings/RoleConfiguration.svelte
index 23aa8257fd..199e28d18e 100644
--- a/mathesar_ui/src/pages/database/settings/RoleConfiguration.svelte
+++ b/mathesar_ui/src/pages/database/settings/RoleConfiguration.svelte
@@ -1,5 +1,75 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
+  import GridTable from '@mathesar/components/grid-table/GridTable.svelte';
+  import GridTableCell from '@mathesar/components/grid-table/GridTableCell.svelte';
+  import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
+  import { Button, Spinner } from '@mathesar-component-library';
+
+  import { getDatabaseSettingsContext } from './databaseSettingsUtils';
+  import SettingsContentLayout from './SettingsContentLayout.svelte';
+
+  const databaseContext = getDatabaseSettingsContext();
+  $: ({ database, configuredRoles, roles, combinedRoles } = $databaseContext);
+
+  $: void AsyncRpcApiStore.runBatched(
+    [
+      configuredRoles.batchRunner({ server_id: database.server.id }),
+      roles.batchRunner({ database_id: database.id }),
+    ],
+    { onlyRunIfNotInitialized: true },
+  );
+  $: isLoading = $configuredRoles.isLoading || $roles.isLoading;
 </script>
 
-{$_('role_configuration')}
+<SettingsContentLayout>
+  <svelte:fragment slot="title">
+    {$_('role_configuration')}
+  </svelte:fragment>
+  {#if isLoading}
+    <Spinner />
+  {:else}
+    {#if $combinedRoles.length > 0}
+      <div class="role-configuration-table">
+        <GridTable>
+          <GridTableCell header>{$_('role')}</GridTableCell>
+          <GridTableCell header>{$_('actions')}</GridTableCell>
+
+          {#each $combinedRoles as combinedRole (combinedRole.name)}
+            <GridTableCell>{combinedRole.name}</GridTableCell>
+            <GridTableCell>
+              {#if combinedRole.configuredRole}
+                <div>
+                  <Button appearance="secondary">
+                    {$_('configure_password')}
+                  </Button>
+                  <Button appearance="secondary">
+                    {$_('remove')}
+                  </Button>
+                </div>
+              {:else if combinedRole.role}
+                <Button appearance="secondary">
+                  {$_('configure_in_mathesar')}
+                </Button>
+              {/if}
+            </GridTableCell>
+          {/each}
+        </GridTable>
+      </div>
+    {/if}
+
+    {#if $configuredRoles.error}
+      {$configuredRoles.error}
+    {/if}
+    {#if $roles.error}
+      {$roles.error}
+    {/if}
+  {/if}
+</SettingsContentLayout>
+
+<style lang="scss">
+  .role-configuration-table {
+    background: var(--white);
+    --Grid-table__template-columns: 3fr 2fr;
+  }
+</style>
diff --git a/mathesar_ui/src/pages/database/settings/SettingsWrapper.svelte b/mathesar_ui/src/pages/database/settings/SettingsWrapper.svelte
index 69b1a23ffc..786b7f3ebc 100644
--- a/mathesar_ui/src/pages/database/settings/SettingsWrapper.svelte
+++ b/mathesar_ui/src/pages/database/settings/SettingsWrapper.svelte
@@ -10,7 +10,10 @@
   } from '@mathesar/routes/urls';
   import { LinkMenuItem, Menu, MenuHeading } from '@mathesar-component-library';
 
+  import { setDatabaseSettingsContext } from './databaseSettingsUtils';
+
   export let database: Database;
+  $: setDatabaseSettingsContext(database);
 
   type Section = 'roleConfiguration' | 'collaborators' | 'roles';
   let section = 'roleConfiguration';
@@ -63,6 +66,7 @@
     --Menu__item-active-background: var(--sand-200);
     --Menu__item-active-hover-background: var(--sand-200);
     --Menu__item-focus-outline-color: var(--sand-300);
+    padding: var(--size-x-small) 0;
 
     .heading {
       font-size: var(--text-size-small);
diff --git a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
new file mode 100644
index 0000000000..2bc64cf4b6
--- /dev/null
+++ b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
@@ -0,0 +1,76 @@
+import { getContext, setContext } from 'svelte';
+import { type Readable, type Writable, derived, writable } from 'svelte/store';
+
+import { ConfiguredRole } from '@mathesar/models/ConfiguredRole';
+import type { Database } from '@mathesar/models/Database';
+import { Role } from '@mathesar/models/Role';
+
+const contextKey = Symbol('database settings store');
+
+class DatabaseSettingsContext {
+  database: Database;
+
+  configuredRoles;
+
+  roles;
+
+  combinedRoles: Readable<
+    { name: string; role?: Role; configuredRole?: ConfiguredRole }[]
+  >;
+
+  constructor(database: Database) {
+    this.database = database;
+    this.configuredRoles = database.fetchConfiguredRoles();
+    this.roles = database.fetchRoles();
+    this.combinedRoles = derived(
+      [this.roles, this.configuredRoles],
+      ([$roles, $configuredRoles]) => {
+        const isLoading = $configuredRoles.isLoading || $roles.isLoading;
+        if (isLoading) {
+          return [];
+        }
+        const isStable = $configuredRoles.isStable && $roles.isStable;
+        const roles = $roles.resolvedValue;
+        const configuredRoles = $configuredRoles.resolvedValue?.mapKeys(
+          (cr) => cr.name,
+        );
+        if (isStable && roles && configuredRoles) {
+          return [...roles.values()].map((role) => ({
+            name: role.name,
+            role,
+            configuredRole: configuredRoles.get(role.name),
+          }));
+        }
+        if ($configuredRoles.isStable && configuredRoles) {
+          [...configuredRoles.values()].map((configuredRole) => ({
+            name: configuredRole.name,
+            configuredRole,
+          }));
+        }
+        return [];
+      },
+    );
+  }
+}
+
+export function getDatabaseSettingsContext(): Readable<DatabaseSettingsContext> {
+  const store = getContext<Writable<DatabaseSettingsContext>>(contextKey);
+  if (store === undefined) {
+    throw Error('Database settings context has not been set');
+  }
+  return store;
+}
+
+export function setDatabaseSettingsContext(
+  database: Database,
+): Readable<DatabaseSettingsContext> {
+  let store = getContext<Writable<DatabaseSettingsContext>>(contextKey);
+  const databaseSettingsContext = new DatabaseSettingsContext(database);
+  if (store !== undefined) {
+    store.set(databaseSettingsContext);
+    return store;
+  }
+  store = writable(databaseSettingsContext);
+  setContext(contextKey, store);
+  return store;
+}

From 3509aabe50966aec5810c9341cb6a5ceff0af3ad Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 16 Aug 2024 23:32:09 +0530
Subject: [PATCH 0655/1141] Implement basic Roles page

---
 .../src/pages/database/settings/Roles.svelte  | 64 ++++++++++++++++++-
 1 file changed, 63 insertions(+), 1 deletion(-)

diff --git a/mathesar_ui/src/pages/database/settings/Roles.svelte b/mathesar_ui/src/pages/database/settings/Roles.svelte
index 3636bb90da..0aadca8891 100644
--- a/mathesar_ui/src/pages/database/settings/Roles.svelte
+++ b/mathesar_ui/src/pages/database/settings/Roles.svelte
@@ -1,5 +1,67 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+
+  import GridTable from '@mathesar/components/grid-table/GridTable.svelte';
+  import GridTableCell from '@mathesar/components/grid-table/GridTableCell.svelte';
+  import { Button, Spinner } from '@mathesar-component-library';
+
+  import { getDatabaseSettingsContext } from './databaseSettingsUtils';
+  import SettingsContentLayout from './SettingsContentLayout.svelte';
+
+  const databaseContext = getDatabaseSettingsContext();
+  $: ({ database, roles } = $databaseContext);
+
+  $: void roles.runIfNotInitialized({ database_id: database.id });
+  $: roleList = [...($roles.resolvedValue?.values() ?? [])];
 </script>
 
-{$_('roles')}
+<SettingsContentLayout>
+  <svelte:fragment slot="title">
+    {$_('roles')}
+  </svelte:fragment>
+  <svelte:fragment slot="actions">
+    <Button appearance="primary">
+      {$_('create_role')}
+    </Button>
+  </svelte:fragment>
+  {#if $roles.isLoading}
+    <Spinner />
+  {:else if $roles.isOk}
+    <div class="roles-table">
+      <GridTable>
+        <GridTableCell header>{$_('role')}</GridTableCell>
+        <!--eslint-disable-next-line @intlify/svelte/no-raw-text -->
+        <GridTableCell header>LOGIN</GridTableCell>
+        <GridTableCell header>
+          {$_('child_roles')}
+        </GridTableCell>
+        <GridTableCell header>{$_('actions')}</GridTableCell>
+        {#each roleList as role (role.name)}
+          <GridTableCell>{role.name}</GridTableCell>
+          <GridTableCell>
+            {role.login ? $_('yes') : $_('no')}
+          </GridTableCell>
+          <GridTableCell>
+            {#each role.members ?? [] as member (member.oid)}
+              {member.oid}
+            {/each}
+          </GridTableCell>
+          <GridTableCell>
+            <Button appearance="outline-primary">
+              {$_('drop_role')}
+            </Button>
+          </GridTableCell>
+        {/each}
+      </GridTable>
+    </div>
+  {:else if $roles.error}
+    {$roles.error}
+  {/if}
+</SettingsContentLayout>
+
+<style lang="scss">
+  .roles-table {
+    --Grid-table__template-columns: 3fr 2fr 3fr 2fr;
+    background: var(--white);
+  }
+</style>

From 8ae3daa6dbb8cf4cf15a0d64091a9d96e002cd7a Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Sat, 17 Aug 2024 02:20:14 +0530
Subject: [PATCH 0656/1141] Add collaborators api and model

---
 mathesar_ui/src/api/rpc/collaborators.ts | 20 ++++++++++++++++++++
 mathesar_ui/src/api/rpc/index.ts         |  2 ++
 mathesar_ui/src/models/Collaborator.ts   | 23 +++++++++++++++++++++++
 3 files changed, 45 insertions(+)
 create mode 100644 mathesar_ui/src/api/rpc/collaborators.ts
 create mode 100644 mathesar_ui/src/models/Collaborator.ts

diff --git a/mathesar_ui/src/api/rpc/collaborators.ts b/mathesar_ui/src/api/rpc/collaborators.ts
new file mode 100644
index 0000000000..1fbfe47a68
--- /dev/null
+++ b/mathesar_ui/src/api/rpc/collaborators.ts
@@ -0,0 +1,20 @@
+import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
+
+import type { RawConfiguredRole } from './configured_roles';
+import type { RawDatabase } from './databases';
+
+export interface RawCollaborator {
+  id: number;
+  user_id: number;
+  database_id: RawDatabase['id'];
+  configured_role_id: RawConfiguredRole['id'];
+}
+
+export const collaborators = {
+  list: rpcMethodTypeContainer<
+    {
+      database_id: RawDatabase['id'];
+    },
+    Array<RawCollaborator>
+  >(),
+};
diff --git a/mathesar_ui/src/api/rpc/index.ts b/mathesar_ui/src/api/rpc/index.ts
index cb0400b48f..a48b958e06 100644
--- a/mathesar_ui/src/api/rpc/index.ts
+++ b/mathesar_ui/src/api/rpc/index.ts
@@ -2,6 +2,7 @@ import Cookies from 'js-cookie';
 
 import { buildRpcApi } from '@mathesar/packages/json-rpc-client-builder';
 
+import { collaborators } from './collaborators';
 import { columns } from './columns';
 import { configured_roles } from './configured_roles';
 import { constraints } from './constraints';
@@ -18,6 +19,7 @@ export const api = buildRpcApi({
   endpoint: '/api/rpc/v0/',
   getHeaders: () => ({ 'X-CSRFToken': Cookies.get('csrftoken') }),
   methodTree: {
+    collaborators,
     configured_roles,
     database_setup,
     databases,
diff --git a/mathesar_ui/src/models/Collaborator.ts b/mathesar_ui/src/models/Collaborator.ts
new file mode 100644
index 0000000000..48cf7ce151
--- /dev/null
+++ b/mathesar_ui/src/models/Collaborator.ts
@@ -0,0 +1,23 @@
+import type { RawCollaborator } from '@mathesar/api/rpc/collaborators';
+
+import type { Database } from './Database';
+
+export class Collaborator {
+  readonly id;
+
+  readonly user_id;
+
+  readonly configured_role_id;
+
+  readonly database;
+
+  constructor(props: {
+    database: Database;
+    rawCollaborator: RawCollaborator;
+  }) {
+    this.id = props.rawCollaborator.id;
+    this.user_id = props.rawCollaborator.user_id;
+    this.configured_role_id = props.rawCollaborator.configured_role_id;
+    this.database = props.database;
+  }
+}

From 3b5a443c1bae10f4f084fd0cd976b9ab9430a707 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Sun, 18 Aug 2024 01:28:09 +0530
Subject: [PATCH 0657/1141] Implement Role Configuration page

---
 mathesar_ui/src/i18n/languages/en/dict.json   |  10 ++
 mathesar_ui/src/icons/index.ts                |   1 +
 mathesar_ui/src/models/ConfiguredRole.ts      |  14 ++
 mathesar_ui/src/models/Role.ts                |  31 ++++
 mathesar_ui/src/models/Server.ts              |   4 +
 .../pages/database/DatabasePageWrapper.svelte |   6 +-
 .../settings/RoleConfiguration.svelte         |  75 --------
 .../settings/databaseSettingsUtils.ts         |  45 ++++-
 .../ConfigureRoleModal.svelte                 |  85 +++++++++
 .../RoleConfiguration.svelte                  | 169 ++++++++++++++++++
 mathesar_ui/src/routes/DatabaseRoute.svelte   |   2 +-
 mathesar_ui/src/stores/AsyncStore.ts          |  10 +-
 12 files changed, 366 insertions(+), 86 deletions(-)
 delete mode 100644 mathesar_ui/src/pages/database/settings/RoleConfiguration.svelte
 create mode 100644 mathesar_ui/src/pages/database/settings/role-configuration/ConfigureRoleModal.svelte
 create mode 100644 mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte

diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 3e5c6117be..fc051a044f 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -32,6 +32,7 @@
   "ascending": "Ascending",
   "ascending_id": "Ascending ID",
   "attempt_exploration_recovery": "Attempt Exploration recovery",
+  "authenticate": "Authenticate",
   "automatically": "Automatically",
   "base_table_exploration_help": "The base table is the table that is being explored and determines the columns that are available for exploration.",
   "based_on": "Based on",
@@ -78,6 +79,7 @@
   "columns_to_move": "Columns to Move",
   "configure_in_mathesar": "Configure in Mathesar",
   "configure_password": "Configure Password",
+  "configure_value": "Configure ''{value}''",
   "confirm_and_create_table": "Confirm & create table",
   "confirm_delete_table": "To confirm the deletion of the [tableName] table, please enter the table name into the input field below.",
   "confirm_password": "Confirm Password",
@@ -142,6 +144,7 @@
   "databases": "Databases",
   "databases_matching_search": "{count, plural, one {{count} database matches [searchValue]} other {{count} databases match [searchValue]}}",
   "days": "Days",
+  "db_server": "DB server",
   "default": "Default",
   "default_value": "Default Value",
   "delete": "Delete",
@@ -428,10 +431,13 @@
   "release_notes_and_upgrade_instructions": "Release Notes and Upgrade Instructions",
   "released_date": "Released {date}",
   "remove": "Remove",
+  "remove_configuration": "Remove Configuration",
+  "remove_configuration_for_identifier": "Remove Configuration for [identifier]?",
   "remove_filters": "{count, plural, one {Remove Filter} other {Remove {count} Filters}}",
   "remove_grouping": "Remove Grouping",
   "remove_old_link_create_new": "Remove old link and create a new link?",
   "remove_sorting_type": "Remove {sortingType} Sorting",
+  "removing_role_configuration_warning": "Removing this configuration will prevent collaborators assigned to this role from accessing databases on server ''{server}''.",
   "rename_schema": "Rename [schemaName] Schema",
   "reset": "Reset",
   "restrict_to_unique": "Restrict to Unique",
@@ -442,6 +448,10 @@
   "reuse_credentials_from_known_connection": "Reuse credentials from a known connection",
   "role": "Role",
   "role_configuration": "Role Configuration",
+  "role_configuration_removed": "The role configuration has been removed successfully",
+  "role_configured_all_databases_in_server": "This role will be configured for all databases on DB Server ''{server}''",
+  "role_configured_successfully": "Role configured successfully",
+  "role_configured_successfully_new_password": "Role configured successfully with new password",
   "roles": "Roles",
   "row": "Row",
   "running_latest_version": "You are running the latest version",
diff --git a/mathesar_ui/src/icons/index.ts b/mathesar_ui/src/icons/index.ts
index ed004cbb89..9048599c0f 100644
--- a/mathesar_ui/src/icons/index.ts
+++ b/mathesar_ui/src/icons/index.ts
@@ -105,6 +105,7 @@ export const iconAddFilter: IconProps = { data: faFilter };
 export const iconAddNew: IconProps = { data: faPlus };
 export const iconAddUser: IconProps = { data: faUserPlus };
 export const iconConfigure: IconProps = { data: faCogs };
+export const iconConfigurePassword = { data: faKey };
 export const iconConnectDatabase = { data: connectDatabaseIcon };
 export const iconCopyMajor: IconProps = { data: faCopy };
 /** TODO: use faBinary once it's available (via newer FontAwesome version) */
diff --git a/mathesar_ui/src/models/ConfiguredRole.ts b/mathesar_ui/src/models/ConfiguredRole.ts
index 6217f9e760..3ebfaf5a46 100644
--- a/mathesar_ui/src/models/ConfiguredRole.ts
+++ b/mathesar_ui/src/models/ConfiguredRole.ts
@@ -1,3 +1,4 @@
+import { api } from '@mathesar/api/rpc';
 import type { RawConfiguredRole } from '@mathesar/api/rpc/configured_roles';
 
 import type { Database } from './Database';
@@ -17,4 +18,17 @@ export class ConfiguredRole {
     this.name = props.rawConfiguredRole.name;
     this.database = props.database;
   }
+
+  setPassword(password: string) {
+    return api.configured_roles
+      .set_password({
+        configured_role_id: this.id,
+        password,
+      })
+      .run();
+  }
+
+  delete() {
+    return api.configured_roles.delete({ configured_role_id: this.id }).run();
+  }
 }
diff --git a/mathesar_ui/src/models/Role.ts b/mathesar_ui/src/models/Role.ts
index a39f997fcf..683f018311 100644
--- a/mathesar_ui/src/models/Role.ts
+++ b/mathesar_ui/src/models/Role.ts
@@ -1,5 +1,8 @@
+import { api } from '@mathesar/api/rpc';
 import type { RawRole, RawRoleMember } from '@mathesar/api/rpc/roles';
+import { CancellablePromise } from '@mathesar/component-library';
 
+import { ConfiguredRole } from './ConfiguredRole';
 import type { Database } from './Database';
 
 export class Role {
@@ -35,4 +38,32 @@ export class Role {
     this.members = props.rawRole.members;
     this.database = props.database;
   }
+
+  configure(password: string): CancellablePromise<ConfiguredRole> {
+    const promise = api.configured_roles
+      .add({
+        server_id: this.database.server.id,
+        name: this.name,
+        password,
+      })
+      .run();
+
+    return new CancellablePromise(
+      (resolve, reject) => {
+        promise
+          .then(
+            (rawConfiguredRole) =>
+              resolve(
+                new ConfiguredRole({
+                  database: this.database,
+                  rawConfiguredRole,
+                }),
+              ),
+            reject,
+          )
+          .catch(reject);
+      },
+      () => promise.cancel(),
+    );
+  }
 }
diff --git a/mathesar_ui/src/models/Server.ts b/mathesar_ui/src/models/Server.ts
index 203e13d398..1d51f3ed00 100644
--- a/mathesar_ui/src/models/Server.ts
+++ b/mathesar_ui/src/models/Server.ts
@@ -12,4 +12,8 @@ export class Server {
     this.host = props.rawServer.host;
     this.port = props.rawServer.port;
   }
+
+  getConnectionString() {
+    return `${this.host}:${this.port}`;
+  }
 }
diff --git a/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
index 67915d4daf..df871fcf34 100644
--- a/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
+++ b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
@@ -53,7 +53,7 @@
   restrictWidth
   cssVariables={{
     '--max-layout-width': 'var(--max-layout-width-console-pages)',
-    '--layout-background-color': 'var(--sand-50)'
+    '--layout-background-color': 'var(--sand-50)',
   }}
 >
   <AppSecondaryHeader
@@ -61,7 +61,9 @@
     pageTitleAndMetaProps={{
       name: database.name,
       icon: iconDatabase,
-      description: `DB server: ${database.server.host}:${database.server.port}`,
+      description: `${$_(
+        'db_server',
+      )}: ${database.server.getConnectionString()}`,
     }}
   >
     <div slot="action">
diff --git a/mathesar_ui/src/pages/database/settings/RoleConfiguration.svelte b/mathesar_ui/src/pages/database/settings/RoleConfiguration.svelte
deleted file mode 100644
index 199e28d18e..0000000000
--- a/mathesar_ui/src/pages/database/settings/RoleConfiguration.svelte
+++ /dev/null
@@ -1,75 +0,0 @@
-<script lang="ts">
-  import { _ } from 'svelte-i18n';
-
-  import GridTable from '@mathesar/components/grid-table/GridTable.svelte';
-  import GridTableCell from '@mathesar/components/grid-table/GridTableCell.svelte';
-  import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
-  import { Button, Spinner } from '@mathesar-component-library';
-
-  import { getDatabaseSettingsContext } from './databaseSettingsUtils';
-  import SettingsContentLayout from './SettingsContentLayout.svelte';
-
-  const databaseContext = getDatabaseSettingsContext();
-  $: ({ database, configuredRoles, roles, combinedRoles } = $databaseContext);
-
-  $: void AsyncRpcApiStore.runBatched(
-    [
-      configuredRoles.batchRunner({ server_id: database.server.id }),
-      roles.batchRunner({ database_id: database.id }),
-    ],
-    { onlyRunIfNotInitialized: true },
-  );
-  $: isLoading = $configuredRoles.isLoading || $roles.isLoading;
-</script>
-
-<SettingsContentLayout>
-  <svelte:fragment slot="title">
-    {$_('role_configuration')}
-  </svelte:fragment>
-  {#if isLoading}
-    <Spinner />
-  {:else}
-    {#if $combinedRoles.length > 0}
-      <div class="role-configuration-table">
-        <GridTable>
-          <GridTableCell header>{$_('role')}</GridTableCell>
-          <GridTableCell header>{$_('actions')}</GridTableCell>
-
-          {#each $combinedRoles as combinedRole (combinedRole.name)}
-            <GridTableCell>{combinedRole.name}</GridTableCell>
-            <GridTableCell>
-              {#if combinedRole.configuredRole}
-                <div>
-                  <Button appearance="secondary">
-                    {$_('configure_password')}
-                  </Button>
-                  <Button appearance="secondary">
-                    {$_('remove')}
-                  </Button>
-                </div>
-              {:else if combinedRole.role}
-                <Button appearance="secondary">
-                  {$_('configure_in_mathesar')}
-                </Button>
-              {/if}
-            </GridTableCell>
-          {/each}
-        </GridTable>
-      </div>
-    {/if}
-
-    {#if $configuredRoles.error}
-      {$configuredRoles.error}
-    {/if}
-    {#if $roles.error}
-      {$roles.error}
-    {/if}
-  {/if}
-</SettingsContentLayout>
-
-<style lang="scss">
-  .role-configuration-table {
-    background: var(--white);
-    --Grid-table__template-columns: 3fr 2fr;
-  }
-</style>
diff --git a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
index 2bc64cf4b6..8c3a8bad1b 100644
--- a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
+++ b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
@@ -7,6 +7,12 @@ import { Role } from '@mathesar/models/Role';
 
 const contextKey = Symbol('database settings store');
 
+export type CombinedLoginRole = {
+  name: string;
+  role?: Role;
+  configuredRole?: ConfiguredRole;
+};
+
 class DatabaseSettingsContext {
   database: Database;
 
@@ -14,15 +20,15 @@ class DatabaseSettingsContext {
 
   roles;
 
-  combinedRoles: Readable<
-    { name: string; role?: Role; configuredRole?: ConfiguredRole }[]
-  >;
+  combinedLoginRoles: Readable<CombinedLoginRole[]>;
+
+  collaborators;
 
   constructor(database: Database) {
     this.database = database;
     this.configuredRoles = database.fetchConfiguredRoles();
     this.roles = database.fetchRoles();
-    this.combinedRoles = derived(
+    this.combinedLoginRoles = derived(
       [this.roles, this.configuredRoles],
       ([$roles, $configuredRoles]) => {
         const isLoading = $configuredRoles.isLoading || $roles.isLoading;
@@ -30,12 +36,14 @@ class DatabaseSettingsContext {
           return [];
         }
         const isStable = $configuredRoles.isStable && $roles.isStable;
-        const roles = $roles.resolvedValue;
+        const loginRoles = $roles.resolvedValue?.filterValues(
+          (value) => value.login,
+        );
         const configuredRoles = $configuredRoles.resolvedValue?.mapKeys(
           (cr) => cr.name,
         );
-        if (isStable && roles && configuredRoles) {
-          return [...roles.values()].map((role) => ({
+        if (isStable && loginRoles && configuredRoles) {
+          return [...loginRoles.values()].map((role) => ({
             name: role.name,
             role,
             configuredRole: configuredRoles.get(role.name),
@@ -50,6 +58,29 @@ class DatabaseSettingsContext {
         return [];
       },
     );
+    this.collaborators = database.fetchCollaborators();
+  }
+
+  async configureRole(combinedLoginRole: CombinedLoginRole, password: string) {
+    if (combinedLoginRole.configuredRole) {
+      return combinedLoginRole.configuredRole.setPassword(password);
+    }
+
+    if (combinedLoginRole.role) {
+      const configuredRole = await combinedLoginRole.role.configure(password);
+      this.configuredRoles.updateResolvedValue((configuredRoles) =>
+        configuredRoles.with(configuredRole.id, configuredRole),
+      );
+    }
+
+    return undefined;
+  }
+
+  async removeConfiguredRole(configuredRole: ConfiguredRole) {
+    await configuredRole.delete();
+    this.configuredRoles.updateResolvedValue((configuredRoles) =>
+      configuredRoles.without(configuredRole.id),
+    );
   }
 }
 
diff --git a/mathesar_ui/src/pages/database/settings/role-configuration/ConfigureRoleModal.svelte b/mathesar_ui/src/pages/database/settings/role-configuration/ConfigureRoleModal.svelte
new file mode 100644
index 0000000000..434047a119
--- /dev/null
+++ b/mathesar_ui/src/pages/database/settings/role-configuration/ConfigureRoleModal.svelte
@@ -0,0 +1,85 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import {
+    FieldLayout,
+    FormSubmit,
+    makeForm,
+    requiredField,
+  } from '@mathesar/components/form';
+  import Field from '@mathesar/components/form/Field.svelte';
+  import WarningBox from '@mathesar/components/message-boxes/WarningBox.svelte';
+  import { toast } from '@mathesar/stores/toast';
+  import {
+    ControlledModal,
+    type ModalController,
+    PasswordInput,
+    portalToWindowFooter,
+  } from '@mathesar-component-library';
+
+  import {
+    type CombinedLoginRole,
+    getDatabaseSettingsContext,
+  } from '../databaseSettingsUtils';
+
+  const databaseContext = getDatabaseSettingsContext();
+  $: ({ database } = $databaseContext);
+
+  export let controller: ModalController;
+  export let combinedLoginRole: CombinedLoginRole;
+
+  const password = requiredField('');
+  const form = makeForm({ password });
+
+  async function configureRole() {
+    await $databaseContext.configureRole(combinedLoginRole, $password);
+    controller.close();
+    if (combinedLoginRole.configuredRole) {
+      toast.success($_('role_configured_successfully_new_password'));
+    } else {
+      toast.success($_('role_configured_successfully'));
+    }
+    form.reset();
+  }
+</script>
+
+<ControlledModal {controller} on:close={() => form.reset()}>
+  <span slot="title">
+    {$_('configure_value', {
+      values: { value: combinedLoginRole.name },
+    })}
+  </span>
+  <div>
+    <Field
+      label={$_('password')}
+      layout="stacked"
+      field={password}
+      input={{
+        component: PasswordInput,
+        props: { autocomplete: 'off' },
+      }}
+    />
+    <FieldLayout>
+      <WarningBox>
+        {$_('role_configured_all_databases_in_server', {
+          values: {
+            server: database.server.getConnectionString(),
+          },
+        })}
+      </WarningBox>
+    </FieldLayout>
+  </div>
+  <div use:portalToWindowFooter class="footer">
+    <FormSubmit
+      {form}
+      catchErrors
+      onCancel={() => {
+        form.reset();
+        controller.close();
+      }}
+      onProceed={configureRole}
+      proceedButton={{ label: $_('authenticate') }}
+      cancelButton={{ label: $_('cancel') }}
+    />
+  </div>
+</ControlledModal>
diff --git a/mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte b/mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte
new file mode 100644
index 0000000000..e98b2ec426
--- /dev/null
+++ b/mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte
@@ -0,0 +1,169 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import GridTable from '@mathesar/components/grid-table/GridTable.svelte';
+  import GridTableCell from '@mathesar/components/grid-table/GridTableCell.svelte';
+  import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
+  import PhraseContainingIdentifier from '@mathesar/components/PhraseContainingIdentifier.svelte';
+  import {
+    iconConfigurePassword,
+    iconDeleteMajor,
+    iconEdit,
+  } from '@mathesar/icons';
+  import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
+  import { confirm } from '@mathesar/stores/confirmation';
+  import { modal } from '@mathesar/stores/modal';
+  import { toast } from '@mathesar/stores/toast';
+  import { getErrorMessage } from '@mathesar/utils/errors';
+  import {
+    Button,
+    Icon,
+    Spinner,
+    SpinnerButton,
+  } from '@mathesar-component-library';
+
+  import {
+    type CombinedLoginRole,
+    getDatabaseSettingsContext,
+  } from '../databaseSettingsUtils';
+  import SettingsContentLayout from '../SettingsContentLayout.svelte';
+
+  import ConfigureRoleModal from './ConfigureRoleModal.svelte';
+
+  const databaseContext = getDatabaseSettingsContext();
+  const configureRoleModalController = modal.spawnModalController();
+
+  $: ({ database, configuredRoles, roles, combinedLoginRoles } =
+    $databaseContext);
+  $: void AsyncRpcApiStore.runBatched(
+    [
+      configuredRoles.batchRunner({ server_id: database.server.id }),
+      roles.batchRunner({ database_id: database.id }),
+    ],
+    { onlyRunIfNotInitialized: true },
+  );
+  $: isLoading = $configuredRoles.isLoading || $roles.isLoading;
+
+  let targetCombinedLoginRole: CombinedLoginRole | undefined;
+
+  function configureRole(combinedLoginRole: CombinedLoginRole) {
+    targetCombinedLoginRole = combinedLoginRole;
+    configureRoleModalController.open();
+  }
+
+  async function removeConfiguredRole(combinedLoginRole: CombinedLoginRole) {
+    if (combinedLoginRole.configuredRole) {
+      try {
+        await $databaseContext.removeConfiguredRole(
+          combinedLoginRole.configuredRole,
+        );
+        toast.success($_('role_configuration_removed'));
+      } catch (err) {
+        toast.success(getErrorMessage(err));
+      }
+    }
+  }
+</script>
+
+<SettingsContentLayout>
+  <svelte:fragment slot="title">
+    {$_('role_configuration')}
+  </svelte:fragment>
+  {#if isLoading}
+    <Spinner />
+  {:else}
+    {#if $combinedLoginRoles.length > 0}
+      <div class="role-configuration-table">
+        <GridTable>
+          <GridTableCell header>{$_('role')}</GridTableCell>
+          <GridTableCell header>{$_('actions')}</GridTableCell>
+
+          {#each $combinedLoginRoles as combinedLoginRole (combinedLoginRole.name)}
+            <GridTableCell>
+              <span class="role-name">
+                {combinedLoginRole.name}
+              </span>
+            </GridTableCell>
+            <GridTableCell>
+              {#if combinedLoginRole.configuredRole}
+                <div>
+                  <Button
+                    appearance="secondary"
+                    on:click={() => configureRole(combinedLoginRole)}
+                  >
+                    <Icon {...iconEdit} size="0.8em" />
+                    <span>{$_('configure_password')}</span>
+                  </Button>
+                  <SpinnerButton
+                    appearance="secondary"
+                    confirm={() =>
+                      confirm({
+                        title: {
+                          component: PhraseContainingIdentifier,
+                          props: {
+                            identifier: combinedLoginRole.name,
+                            wrappingString: $_(
+                              'remove_configuration_for_identifier',
+                            ),
+                          },
+                        },
+                        body: $_('removing_role_configuration_warning', {
+                          values: {
+                            server:
+                              combinedLoginRole.configuredRole?.database.server.getConnectionString(),
+                          },
+                        }),
+                        proceedButton: {
+                          label: $_('remove_configuration'),
+                          icon: iconDeleteMajor,
+                        },
+                      })}
+                    label={$_('remove')}
+                    onClick={() => removeConfiguredRole(combinedLoginRole)}
+                  />
+                </div>
+              {:else if combinedLoginRole.role}
+                <Button
+                  appearance="secondary"
+                  on:click={() => configureRole(combinedLoginRole)}
+                >
+                  <Icon {...iconConfigurePassword} size="0.8em" />
+                  <span>{$_('configure_in_mathesar')}</span>
+                </Button>
+              {/if}
+            </GridTableCell>
+          {/each}
+        </GridTable>
+      </div>
+    {/if}
+
+    {#if $configuredRoles.error}
+      <ErrorBox fullWidth>
+        {$configuredRoles.error}
+      </ErrorBox>
+    {/if}
+    {#if $roles.error}
+      <ErrorBox fullWidth>
+        {$roles.error}
+      </ErrorBox>
+    {/if}
+  {/if}
+</SettingsContentLayout>
+
+{#if targetCombinedLoginRole}
+  <ConfigureRoleModal
+    controller={configureRoleModalController}
+    combinedLoginRole={targetCombinedLoginRole}
+  />
+{/if}
+
+<style lang="scss">
+  .role-configuration-table {
+    background: var(--white);
+    --Grid-table__template-columns: 3fr 2fr;
+
+    .role-name {
+      font-weight: 500;
+    }
+  }
+</style>
diff --git a/mathesar_ui/src/routes/DatabaseRoute.svelte b/mathesar_ui/src/routes/DatabaseRoute.svelte
index 28b73a564b..40c48b206a 100644
--- a/mathesar_ui/src/routes/DatabaseRoute.svelte
+++ b/mathesar_ui/src/routes/DatabaseRoute.svelte
@@ -11,7 +11,7 @@
   import DatabasePageWrapper from '@mathesar/pages/database/DatabasePageWrapper.svelte';
   import DatabasePageSchemasSection from '@mathesar/pages/database/schemas/SchemasSection.svelte';
   import DatabaseCollaborators from '@mathesar/pages/database/settings/Collaborators.svelte';
-  import DatabaseRoleConfiguration from '@mathesar/pages/database/settings/RoleConfiguration.svelte';
+  import DatabaseRoleConfiguration from '@mathesar/pages/database/settings/role-configuration/RoleConfiguration.svelte';
   import DatabaseRoles from '@mathesar/pages/database/settings/Roles.svelte';
   import DatabasePageSettingsWrapper from '@mathesar/pages/database/settings/SettingsWrapper.svelte';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
diff --git a/mathesar_ui/src/stores/AsyncStore.ts b/mathesar_ui/src/stores/AsyncStore.ts
index 9ede933009..3d382ede09 100644
--- a/mathesar_ui/src/stores/AsyncStore.ts
+++ b/mathesar_ui/src/stores/AsyncStore.ts
@@ -177,12 +177,20 @@ export default class AsyncStore<Props, T>
     this.value.set(new AsyncStoreValue({ isLoading: false }));
   }
 
+  updateResolvedValue(updater: (resolvedValue: T) => T) {
+    const value = get(this.value);
+    if (value.isOk && value.resolvedValue) {
+      const updatedValue = updater(value.resolvedValue);
+      this.setResolvedValue(updatedValue);
+    }
+  }
+
   protected beforeRun() {
     this.cancel();
     this.value.update((v) => new AsyncStoreValue({ ...v, isLoading: true }));
   }
 
-  setResolvedValue(value: T) {
+  protected setResolvedValue(value: T) {
     this.cancel();
     this.value.set(
       new AsyncStoreValue({

From dbeae24f511b11231cbab5488716bfd4c3137a7b Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Sun, 18 Aug 2024 01:28:59 +0530
Subject: [PATCH 0658/1141] Implement base collaborator page

---
 mathesar_ui/src/models/Database.ts            | 15 ++++-
 .../database/settings/Collaborators.svelte    |  5 --
 .../collaborators/Collaborators.svelte        | 67 +++++++++++++++++++
 mathesar_ui/src/routes/DatabaseRoute.svelte   |  2 +-
 4 files changed, 82 insertions(+), 7 deletions(-)
 delete mode 100644 mathesar_ui/src/pages/database/settings/Collaborators.svelte
 create mode 100644 mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte

diff --git a/mathesar_ui/src/models/Database.ts b/mathesar_ui/src/models/Database.ts
index c8b1771553..1f72416ccf 100644
--- a/mathesar_ui/src/models/Database.ts
+++ b/mathesar_ui/src/models/Database.ts
@@ -1,8 +1,9 @@
 import { api } from '@mathesar/api/rpc';
 import type { RawDatabase } from '@mathesar/api/rpc/databases';
 import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
-import { SortedImmutableMap } from '@mathesar-component-library';
+import { ImmutableMap, SortedImmutableMap } from '@mathesar-component-library';
 
+import { Collaborator } from './Collaborator';
 import { ConfiguredRole } from './ConfiguredRole';
 import { Role } from './Role';
 import type { Server } from './Server';
@@ -45,4 +46,16 @@ export class Database {
         ),
     });
   }
+
+  fetchCollaborators() {
+    return new AsyncRpcApiStore(api.collaborators.list, {
+      postProcess: (rawCollaborators) =>
+        new ImmutableMap(
+          rawCollaborators.map((rawCollaborator) => [
+            rawCollaborator.id,
+            new Collaborator({ database: this, rawCollaborator }),
+          ]),
+        ),
+    });
+  }
 }
diff --git a/mathesar_ui/src/pages/database/settings/Collaborators.svelte b/mathesar_ui/src/pages/database/settings/Collaborators.svelte
deleted file mode 100644
index 5c75a672eb..0000000000
--- a/mathesar_ui/src/pages/database/settings/Collaborators.svelte
+++ /dev/null
@@ -1,5 +0,0 @@
-<script lang="ts">
-  import { _ } from 'svelte-i18n';
-</script>
-
-{$_('collaborators')}
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
new file mode 100644
index 0000000000..b87613e613
--- /dev/null
+++ b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
@@ -0,0 +1,67 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import Icon from '@mathesar/component-library/icon/Icon.svelte';
+  import GridTable from '@mathesar/components/grid-table/GridTable.svelte';
+  import GridTableCell from '@mathesar/components/grid-table/GridTableCell.svelte';
+  import { iconDeleteMajor } from '@mathesar/icons';
+  import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
+  import { Button, Spinner } from '@mathesar-component-library';
+
+  import { getDatabaseSettingsContext } from '../databaseSettingsUtils';
+  import SettingsContentLayout from '../SettingsContentLayout.svelte';
+
+  const databaseContext = getDatabaseSettingsContext();
+  $: ({ database, roles, collaborators } = $databaseContext);
+
+  $: void AsyncRpcApiStore.runBatched(
+    [
+      collaborators.batchRunner({ database_id: database.id }),
+      roles.batchRunner({ database_id: database.id }),
+    ],
+    { onlyRunIfNotInitialized: true },
+  );
+  $: isLoading = $collaborators.isLoading || $roles.isLoading;
+</script>
+
+<SettingsContentLayout>
+  <svelte:fragment slot="title">
+    {$_('collaborators')}
+  </svelte:fragment>
+  <svelte:fragment slot="actions">
+    <Button appearance="primary">
+      {$_('add_collaborator')}
+    </Button>
+  </svelte:fragment>
+  {#if isLoading}
+    <Spinner />
+  {:else if $collaborators.isOk}
+    <div class="collaborators-table">
+      <GridTable>
+        <GridTableCell header>{$_('mathesar_user')}</GridTableCell>
+        <GridTableCell header>{$_('role')}</GridTableCell>
+        <GridTableCell header>{$_('actions')}</GridTableCell>
+        {#each [...($collaborators.resolvedValue?.values() ?? [])] as collaborator (collaborator.id)}
+          <GridTableCell>{collaborator.user_id}</GridTableCell>
+          <GridTableCell>
+            {collaborator.configured_role_id}
+          </GridTableCell>
+          <GridTableCell>
+            <Button appearance="secondary">
+              <Icon {...iconDeleteMajor} />
+            </Button>
+          </GridTableCell>
+        {/each}
+      </GridTable>
+    </div>
+  {:else if $roles.error}
+    {$roles.error}
+  {/if}
+</SettingsContentLayout>
+
+<style lang="scss">
+  .collaborators-table {
+    --Grid-table__template-columns: 3fr 3fr 1fr;
+    background: var(--white);
+  }
+</style>
diff --git a/mathesar_ui/src/routes/DatabaseRoute.svelte b/mathesar_ui/src/routes/DatabaseRoute.svelte
index 40c48b206a..9e0b759987 100644
--- a/mathesar_ui/src/routes/DatabaseRoute.svelte
+++ b/mathesar_ui/src/routes/DatabaseRoute.svelte
@@ -10,7 +10,7 @@
   import type { Database } from '@mathesar/models/Database';
   import DatabasePageWrapper from '@mathesar/pages/database/DatabasePageWrapper.svelte';
   import DatabasePageSchemasSection from '@mathesar/pages/database/schemas/SchemasSection.svelte';
-  import DatabaseCollaborators from '@mathesar/pages/database/settings/Collaborators.svelte';
+  import DatabaseCollaborators from '@mathesar/pages/database/settings/collaborators/Collaborators.svelte';
   import DatabaseRoleConfiguration from '@mathesar/pages/database/settings/role-configuration/RoleConfiguration.svelte';
   import DatabaseRoles from '@mathesar/pages/database/settings/Roles.svelte';
   import DatabasePageSettingsWrapper from '@mathesar/pages/database/settings/SettingsWrapper.svelte';

From 77dbbf1e3e050e2556408c9e86074964192865bb Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Sun, 18 Aug 2024 16:36:41 +0530
Subject: [PATCH 0659/1141] Display user and role information in collaborators
 page

---
 mathesar_ui/src/components/Errors.svelte      |  3 +-
 mathesar_ui/src/i18n/languages/en/dict.json   |  2 +
 .../src/pages/database/settings/Roles.svelte  |  5 +-
 .../collaborators/CollaboratorRow.svelte      | 63 +++++++++++++++++++
 .../collaborators/Collaborators.svelte        | 39 +++++++-----
 .../settings/databaseSettingsUtils.ts         | 25 ++++++++
 6 files changed, 118 insertions(+), 19 deletions(-)
 create mode 100644 mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte

diff --git a/mathesar_ui/src/components/Errors.svelte b/mathesar_ui/src/components/Errors.svelte
index 10fb4c0834..f196d95a32 100644
--- a/mathesar_ui/src/components/Errors.svelte
+++ b/mathesar_ui/src/components/Errors.svelte
@@ -2,10 +2,11 @@
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
 
   export let errors: string[];
+  export let fullWidth = false;
 </script>
 
 {#if errors.length}
-  <ErrorBox>
+  <ErrorBox {fullWidth}>
     {#if errors.length === 1}
       {errors[0]}
     {:else}
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index fc051a044f..5d4912658c 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -9,6 +9,7 @@
   "action_cannot_be_undone": "This action cannot be undone",
   "actions": "Actions",
   "add": "Add",
+  "add_collaborator": "Add Collaborator",
   "add_columns_to_exploration_empty_message": "This exploration does not contain any columns. Edit the exploration to add columns to it.",
   "add_filter": "Add Filter",
   "add_new_filter": "Add New Filter",
@@ -306,6 +307,7 @@
   "many_to_one": "Many to One",
   "many_to_one_link_description": "Multiple [baseTable] records can link to the same [targetTable] record.",
   "mathesar": "Mathesar",
+  "mathesar_user": "Mathesar User",
   "max_time_unit": "Max Time Unit",
   "milliseconds": "Milliseconds",
   "min_time_unit": "Min Time Unit",
diff --git a/mathesar_ui/src/pages/database/settings/Roles.svelte b/mathesar_ui/src/pages/database/settings/Roles.svelte
index 0aadca8891..c0dc96f557 100644
--- a/mathesar_ui/src/pages/database/settings/Roles.svelte
+++ b/mathesar_ui/src/pages/database/settings/Roles.svelte
@@ -3,6 +3,7 @@
 
   import GridTable from '@mathesar/components/grid-table/GridTable.svelte';
   import GridTableCell from '@mathesar/components/grid-table/GridTableCell.svelte';
+  import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { Button, Spinner } from '@mathesar-component-library';
 
   import { getDatabaseSettingsContext } from './databaseSettingsUtils';
@@ -55,7 +56,9 @@
       </GridTable>
     </div>
   {:else if $roles.error}
-    {$roles.error}
+    <ErrorBox fullWidth>
+      {$roles.error}
+    </ErrorBox>
   {/if}
 </SettingsContentLayout>
 
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
new file mode 100644
index 0000000000..aaf3a69df3
--- /dev/null
+++ b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
@@ -0,0 +1,63 @@
+<script lang="ts">
+  import Icon from '@mathesar/component-library/icon/Icon.svelte';
+  import GridTableCell from '@mathesar/components/grid-table/GridTableCell.svelte';
+  import { iconDeleteMajor, iconEdit } from '@mathesar/icons';
+  import { Collaborator } from '@mathesar/models/Collaborator';
+  import { Button } from '@mathesar-component-library';
+
+  import { getDatabaseSettingsContext } from '../databaseSettingsUtils';
+
+  export let collaborator: Collaborator;
+
+  const databaseContext = getDatabaseSettingsContext();
+  $: ({ configuredRoles, users } = $databaseContext);
+
+  $: user = $users.resolvedValue?.get(collaborator.user_id);
+  $: configuredRole = $configuredRoles.resolvedValue?.get(
+    collaborator.configured_role_id,
+  );
+</script>
+
+<GridTableCell>
+  <div>
+    {#if user}
+      <div>{user.full_name ?? user.username}</div>
+      <div>{user.email}</div>
+    {:else}
+      {collaborator.user_id}
+    {/if}
+  </div>
+</GridTableCell>
+<GridTableCell>
+  <div class="role-info">
+    <div>
+      {#if configuredRole}
+        {configuredRole.name}
+      {:else}
+        {collaborator.configured_role_id}
+      {/if}
+    </div>
+    <div class="actions">
+      <Button appearance="secondary">
+        <Icon {...iconEdit} size="0.8em" />
+      </Button>
+    </div>
+  </div>
+</GridTableCell>
+<GridTableCell>
+  <Button appearance="secondary">
+    <Icon {...iconDeleteMajor} size="0.8em" />
+  </Button>
+</GridTableCell>
+
+<style lang="scss">
+  .role-info {
+    display: flex;
+    width: 100%;
+    align-items: center;
+
+    .actions {
+      margin-left: auto;
+    }
+  }
+</style>
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
index b87613e613..019283858c 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
@@ -2,26 +2,38 @@
   import { _ } from 'svelte-i18n';
 
   import Icon from '@mathesar/component-library/icon/Icon.svelte';
+  import Errors from '@mathesar/components/Errors.svelte';
   import GridTable from '@mathesar/components/grid-table/GridTable.svelte';
   import GridTableCell from '@mathesar/components/grid-table/GridTableCell.svelte';
-  import { iconDeleteMajor } from '@mathesar/icons';
+  import { iconAddNew } from '@mathesar/icons';
   import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
+  import { isDefined } from '@mathesar/utils/language';
   import { Button, Spinner } from '@mathesar-component-library';
 
   import { getDatabaseSettingsContext } from '../databaseSettingsUtils';
   import SettingsContentLayout from '../SettingsContentLayout.svelte';
 
+  import CollaboratorRow from './CollaboratorRow.svelte';
+
   const databaseContext = getDatabaseSettingsContext();
-  $: ({ database, roles, collaborators } = $databaseContext);
+  $: ({ database, configuredRoles, collaborators, users } = $databaseContext);
 
   $: void AsyncRpcApiStore.runBatched(
     [
       collaborators.batchRunner({ database_id: database.id }),
-      roles.batchRunner({ database_id: database.id }),
+      configuredRoles.batchRunner({ server_id: database.server.id }),
     ],
     { onlyRunIfNotInitialized: true },
   );
-  $: isLoading = $collaborators.isLoading || $roles.isLoading;
+  $: void users.runIfNotInitialized();
+  $: isLoading =
+    $collaborators.isLoading || $configuredRoles.isLoading || $users.isLoading;
+  $: isSuccess = $collaborators.isOk && $configuredRoles.isOk && $users.isOk;
+  $: errors = [
+    $collaborators.error,
+    $configuredRoles.error,
+    $users.error,
+  ].filter((entry): entry is string => isDefined(entry));
 </script>
 
 <SettingsContentLayout>
@@ -30,32 +42,25 @@
   </svelte:fragment>
   <svelte:fragment slot="actions">
     <Button appearance="primary">
-      {$_('add_collaborator')}
+      <Icon {...iconAddNew} />
+      <span>{$_('add_collaborator')}</span>
     </Button>
   </svelte:fragment>
   {#if isLoading}
     <Spinner />
-  {:else if $collaborators.isOk}
+  {:else if isSuccess}
     <div class="collaborators-table">
       <GridTable>
         <GridTableCell header>{$_('mathesar_user')}</GridTableCell>
         <GridTableCell header>{$_('role')}</GridTableCell>
         <GridTableCell header>{$_('actions')}</GridTableCell>
         {#each [...($collaborators.resolvedValue?.values() ?? [])] as collaborator (collaborator.id)}
-          <GridTableCell>{collaborator.user_id}</GridTableCell>
-          <GridTableCell>
-            {collaborator.configured_role_id}
-          </GridTableCell>
-          <GridTableCell>
-            <Button appearance="secondary">
-              <Icon {...iconDeleteMajor} />
-            </Button>
-          </GridTableCell>
+          <CollaboratorRow {collaborator} />
         {/each}
       </GridTable>
     </div>
-  {:else if $roles.error}
-    {$roles.error}
+  {:else}
+    <Errors {errors} />
   {/if}
 </SettingsContentLayout>
 
diff --git a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
index 8c3a8bad1b..d21a914256 100644
--- a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
+++ b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
@@ -1,9 +1,12 @@
 import { getContext, setContext } from 'svelte';
 import { type Readable, type Writable, derived, writable } from 'svelte/store';
 
+import userApi, { type User } from '@mathesar/api/rest/users';
 import { ConfiguredRole } from '@mathesar/models/ConfiguredRole';
 import type { Database } from '@mathesar/models/Database';
 import { Role } from '@mathesar/models/Role';
+import AsyncStore from '@mathesar/stores/AsyncStore';
+import { CancellablePromise, ImmutableMap } from '@mathesar-component-library';
 
 const contextKey = Symbol('database settings store');
 
@@ -13,6 +16,25 @@ export type CombinedLoginRole = {
   configuredRole?: ConfiguredRole;
 };
 
+// TODO: Make CancellablePromise chainable
+const getUsersPromise = () => {
+  const promise = userApi.list();
+  return new CancellablePromise<ImmutableMap<User['id'], User>>(
+    (resolve, reject) => {
+      promise
+        .then(
+          (response) =>
+            resolve(
+              new ImmutableMap(response.results.map((user) => [user.id, user])),
+            ),
+          (err) => reject(err),
+        )
+        .catch((err) => reject(err));
+    },
+    () => promise.cancel(),
+  );
+};
+
 class DatabaseSettingsContext {
   database: Database;
 
@@ -24,6 +46,8 @@ class DatabaseSettingsContext {
 
   collaborators;
 
+  users: AsyncStore<void, ImmutableMap<User['id'], User>>;
+
   constructor(database: Database) {
     this.database = database;
     this.configuredRoles = database.fetchConfiguredRoles();
@@ -59,6 +83,7 @@ class DatabaseSettingsContext {
       },
     );
     this.collaborators = database.fetchCollaborators();
+    this.users = new AsyncStore(getUsersPromise);
   }
 
   async configureRole(combinedLoginRole: CombinedLoginRole, password: string) {

From cd97e2d062b25f2500e3668add0ecea60d3d7591 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Sun, 18 Aug 2024 18:59:20 +0530
Subject: [PATCH 0660/1141] Implement add collaborator modal

---
 mathesar_ui/src/api/rpc/collaborators.ts      |   8 ++
 mathesar_ui/src/i18n/languages/en/dict.json   |   2 +
 mathesar_ui/src/models/Database.ts            |  37 +++++-
 .../collaborators/AddCollaboratorModal.svelte | 110 ++++++++++++++++++
 .../collaborators/CollaboratorRow.svelte      |   2 +-
 .../collaborators/Collaborators.svelte        |  23 +++-
 .../settings/databaseSettingsUtils.ts         |  13 +++
 7 files changed, 189 insertions(+), 6 deletions(-)
 create mode 100644 mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte

diff --git a/mathesar_ui/src/api/rpc/collaborators.ts b/mathesar_ui/src/api/rpc/collaborators.ts
index 1fbfe47a68..fceb67c9dc 100644
--- a/mathesar_ui/src/api/rpc/collaborators.ts
+++ b/mathesar_ui/src/api/rpc/collaborators.ts
@@ -17,4 +17,12 @@ export const collaborators = {
     },
     Array<RawCollaborator>
   >(),
+  add: rpcMethodTypeContainer<
+    {
+      database_id: RawDatabase['id'];
+      user_id: number;
+      configured_role_id: RawConfiguredRole['id'];
+    },
+    RawCollaborator
+  >(),
 };
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 5d4912658c..7dc4793ca0 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -54,6 +54,7 @@
   "cleaning_up": "Cleaning up",
   "clear": "Clear",
   "clear_value": "Clear value",
+  "collaborator_added_successfully": "Collaborator added successfully",
   "collaborators": "Collaborators",
   "column": "Column",
   "column_added_number_of_times": "{count, plural, one {This column has been added once.} other {This column has been added {count} times.}}",
@@ -492,6 +493,7 @@
   "select_columns_to_hide": "Select Columns to Hide",
   "select_columns_view_properties": "Select a column to view it's properties.",
   "select_permission": "Select Permission",
+  "select_role": "Select Role",
   "select_table": "Select Table",
   "select_type": "Select Type",
   "select_user": "Select User",
diff --git a/mathesar_ui/src/models/Database.ts b/mathesar_ui/src/models/Database.ts
index 1f72416ccf..b39c443b6d 100644
--- a/mathesar_ui/src/models/Database.ts
+++ b/mathesar_ui/src/models/Database.ts
@@ -1,7 +1,11 @@
 import { api } from '@mathesar/api/rpc';
 import type { RawDatabase } from '@mathesar/api/rpc/databases';
 import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
-import { ImmutableMap, SortedImmutableMap } from '@mathesar-component-library';
+import {
+  CancellablePromise,
+  ImmutableMap,
+  SortedImmutableMap,
+} from '@mathesar-component-library';
 
 import { Collaborator } from './Collaborator';
 import { ConfiguredRole } from './ConfiguredRole';
@@ -58,4 +62,35 @@ export class Database {
         ),
     });
   }
+
+  addCollaborator(
+    userId: number,
+    configuredRoleId: ConfiguredRole['id'],
+  ): CancellablePromise<Collaborator> {
+    const promise = api.collaborators
+      .add({
+        database_id: this.id,
+        user_id: userId,
+        configured_role_id: configuredRoleId,
+      })
+      .run();
+
+    return new CancellablePromise(
+      (resolve, reject) => {
+        promise
+          .then(
+            (rawCollaborator) =>
+              resolve(
+                new Collaborator({
+                  database: this,
+                  rawCollaborator,
+                }),
+              ),
+            reject,
+          )
+          .catch(reject);
+      },
+      () => promise.cancel(),
+    );
+  }
 }
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte b/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte
new file mode 100644
index 0000000000..6b5052735a
--- /dev/null
+++ b/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte
@@ -0,0 +1,110 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import type { User } from '@mathesar/api/rest/users';
+  import {
+    FormSubmit,
+    makeForm,
+    requiredField,
+  } from '@mathesar/components/form';
+  import Field from '@mathesar/components/form/Field.svelte';
+  import { Collaborator } from '@mathesar/models/Collaborator';
+  import { ConfiguredRole } from '@mathesar/models/ConfiguredRole';
+  import { toast } from '@mathesar/stores/toast';
+  import {
+    ControlledModal,
+    ImmutableMap,
+    type ModalController,
+    Select,
+    portalToWindowFooter,
+  } from '@mathesar-component-library';
+
+  import { getDatabaseSettingsContext } from '../databaseSettingsUtils';
+
+  const databaseContext = getDatabaseSettingsContext();
+
+  export let controller: ModalController;
+  export let configuredRolesMap: ImmutableMap<number, ConfiguredRole>;
+  export let usersMap: ImmutableMap<number, User>;
+  export let collaboratorsMap: ImmutableMap<number, Collaborator>;
+
+  const userId = requiredField<number | undefined>(undefined);
+  const configuredRoleId = requiredField<number | undefined>(undefined);
+  const form = makeForm({ userId, configuredRoleId });
+
+  const SelectUser = Select<User['id']>;
+  const SelectConfiguredRole = Select<ConfiguredRole['id']>;
+
+  $: addedUsers = new Set(
+    [...collaboratorsMap.values()].map((cbr) => cbr.user_id),
+  );
+  $: usersNotAdded = [...usersMap.values()].filter(
+    (user) => !addedUsers.has(user.id),
+  );
+
+  async function addCollaborator() {
+    if ($userId && $configuredRoleId) {
+      await $databaseContext.addCollaborator($userId, $configuredRoleId);
+      controller.close();
+      toast.success($_('collaborator_added_successfully'));
+      form.reset();
+    }
+  }
+</script>
+
+<ControlledModal {controller} on:close={() => form.reset()}>
+  <span slot="title">
+    {$_('add_collaborator')}
+  </span>
+  <div>
+    <Field
+      label={$_('mathesar_user')}
+      layout="stacked"
+      field={userId}
+      input={{
+        component: SelectUser,
+        props: {
+          options: usersNotAdded.map((user) => user.id),
+          getLabel: (option) => {
+            if (option) {
+              return usersMap.get(option)?.username ?? String(option);
+            }
+            return $_('select_user');
+          },
+          autoSelect: 'none',
+        },
+      }}
+    />
+    <Field
+      label={$_('role')}
+      layout="stacked"
+      field={configuredRoleId}
+      input={{
+        component: SelectConfiguredRole,
+        props: {
+          options: [...configuredRolesMap.values()].map((r) => r.id),
+          getLabel: (option) => {
+            if (option) {
+              return configuredRolesMap.get(option)?.name ?? String(option);
+            }
+            return $_('select_role');
+          },
+          autoSelect: 'none',
+        },
+      }}
+    />
+  </div>
+  <div use:portalToWindowFooter class="footer">
+    <FormSubmit
+      {form}
+      catchErrors
+      onCancel={() => {
+        form.reset();
+        controller.close();
+      }}
+      onProceed={addCollaborator}
+      proceedButton={{ label: $_('add_collaborator') }}
+      cancelButton={{ label: $_('cancel') }}
+    />
+  </div>
+</ControlledModal>
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
index aaf3a69df3..a4cc0590ff 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
@@ -21,7 +21,7 @@
 <GridTableCell>
   <div>
     {#if user}
-      <div>{user.full_name ?? user.username}</div>
+      <div>{user.full_name || user.username}</div>
       <div>{user.email}</div>
     {:else}
       {collaborator.user_id}
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
index 019283858c..a26d9c8078 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
@@ -7,15 +7,19 @@
   import GridTableCell from '@mathesar/components/grid-table/GridTableCell.svelte';
   import { iconAddNew } from '@mathesar/icons';
   import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
+  import { modal } from '@mathesar/stores/modal';
   import { isDefined } from '@mathesar/utils/language';
   import { Button, Spinner } from '@mathesar-component-library';
 
   import { getDatabaseSettingsContext } from '../databaseSettingsUtils';
   import SettingsContentLayout from '../SettingsContentLayout.svelte';
 
+  import AddCollaboratorModel from './AddCollaboratorModal.svelte';
   import CollaboratorRow from './CollaboratorRow.svelte';
 
   const databaseContext = getDatabaseSettingsContext();
+  const addCollaboratorModal = modal.spawnModalController();
+
   $: ({ database, configuredRoles, collaborators, users } = $databaseContext);
 
   $: void AsyncRpcApiStore.runBatched(
@@ -41,10 +45,12 @@
     {$_('collaborators')}
   </svelte:fragment>
   <svelte:fragment slot="actions">
-    <Button appearance="primary">
-      <Icon {...iconAddNew} />
-      <span>{$_('add_collaborator')}</span>
-    </Button>
+    {#if isSuccess}
+      <Button appearance="primary" on:click={() => addCollaboratorModal.open()}>
+        <Icon {...iconAddNew} />
+        <span>{$_('add_collaborator')}</span>
+      </Button>
+    {/if}
   </svelte:fragment>
   {#if isLoading}
     <Spinner />
@@ -64,6 +70,15 @@
   {/if}
 </SettingsContentLayout>
 
+{#if $users.resolvedValue && $configuredRoles.resolvedValue && $collaborators.resolvedValue}
+  <AddCollaboratorModel
+    controller={addCollaboratorModal}
+    usersMap={$users.resolvedValue}
+    configuredRolesMap={$configuredRoles.resolvedValue}
+    collaboratorsMap={$collaborators.resolvedValue}
+  />
+{/if}
+
 <style lang="scss">
   .collaborators-table {
     --Grid-table__template-columns: 3fr 3fr 1fr;
diff --git a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
index d21a914256..d9bc5d7699 100644
--- a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
+++ b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
@@ -107,6 +107,19 @@ class DatabaseSettingsContext {
       configuredRoles.without(configuredRole.id),
     );
   }
+
+  async addCollaborator(
+    userId: User['id'],
+    configuredRoleId: ConfiguredRole['id'],
+  ) {
+    const newCollaborator = await this.database.addCollaborator(
+      userId,
+      configuredRoleId,
+    );
+    this.collaborators.updateResolvedValue((collaborators) =>
+      collaborators.with(newCollaborator.id, newCollaborator),
+    );
+  }
 }
 
 export function getDatabaseSettingsContext(): Readable<DatabaseSettingsContext> {

From f73beb1b3d9597e6a11b176bdc233d06e068d864 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Sun, 18 Aug 2024 19:26:12 +0530
Subject: [PATCH 0661/1141] Implement updating role for collaborator

---
 mathesar_ui/src/api/rpc/collaborators.ts      |  7 ++
 mathesar_ui/src/i18n/languages/en/dict.json   |  2 +
 mathesar_ui/src/models/Collaborator.ts        | 38 +++++++-
 .../collaborators/CollaboratorRow.svelte      |  6 +-
 .../collaborators/Collaborators.svelte        | 21 ++++-
 .../EditRoleForCollaboratorModal.svelte       | 92 +++++++++++++++++++
 .../settings/databaseSettingsUtils.ts         | 12 +++
 7 files changed, 172 insertions(+), 6 deletions(-)
 create mode 100644 mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte

diff --git a/mathesar_ui/src/api/rpc/collaborators.ts b/mathesar_ui/src/api/rpc/collaborators.ts
index fceb67c9dc..0712af42a0 100644
--- a/mathesar_ui/src/api/rpc/collaborators.ts
+++ b/mathesar_ui/src/api/rpc/collaborators.ts
@@ -25,4 +25,11 @@ export const collaborators = {
     },
     RawCollaborator
   >(),
+  set_role: rpcMethodTypeContainer<
+    {
+      collaborator_id: RawCollaborator['id'];
+      configured_role_id: RawConfiguredRole['id'];
+    },
+    RawCollaborator
+  >(),
 };
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 7dc4793ca0..e008f0619b 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -55,6 +55,7 @@
   "clear": "Clear",
   "clear_value": "Clear value",
   "collaborator_added_successfully": "Collaborator added successfully",
+  "collaborator_role_updated_successfully": "Role updated successfully for collaborator.",
   "collaborators": "Collaborators",
   "column": "Column",
   "column_added_number_of_times": "{count, plural, one {This column has been added once.} other {This column has been added {count} times.}}",
@@ -190,6 +191,7 @@
   "edit_connection_with_name": "Edit Connection: [connectionName]",
   "edit_exploration_attempt_recovery": "You can edit the exploration in the Data Explorer to attempt recovering it.",
   "edit_in_data_explorer": "Edit in Data Explorer",
+  "edit_role_for_collaborator_value": "Edit Role for ''{collaborator}''",
   "edit_schema": "Edit Schema",
   "edit_table": "Edit Table",
   "edit_table_with_name": "Edit [tableName] Table",
diff --git a/mathesar_ui/src/models/Collaborator.ts b/mathesar_ui/src/models/Collaborator.ts
index 48cf7ce151..9c18a44ebd 100644
--- a/mathesar_ui/src/models/Collaborator.ts
+++ b/mathesar_ui/src/models/Collaborator.ts
@@ -1,5 +1,8 @@
+import { api } from '@mathesar/api/rpc';
 import type { RawCollaborator } from '@mathesar/api/rpc/collaborators';
+import { CancellablePromise } from '@mathesar/component-library';
 
+import { ConfiguredRole } from './ConfiguredRole';
 import type { Database } from './Database';
 
 export class Collaborator {
@@ -7,17 +10,44 @@ export class Collaborator {
 
   readonly user_id;
 
+  // TODO: Use a store for configured_role_id
   readonly configured_role_id;
 
   readonly database;
 
-  constructor(props: {
-    database: Database;
-    rawCollaborator: RawCollaborator;
-  }) {
+  constructor(props: { database: Database; rawCollaborator: RawCollaborator }) {
     this.id = props.rawCollaborator.id;
     this.user_id = props.rawCollaborator.user_id;
     this.configured_role_id = props.rawCollaborator.configured_role_id;
     this.database = props.database;
   }
+
+  setConfiguredRole(
+    configuredRoleId: ConfiguredRole['id'],
+  ): CancellablePromise<Collaborator> {
+    const promise = api.collaborators
+      .set_role({
+        collaborator_id: this.id,
+        configured_role_id: configuredRoleId,
+      })
+      .run();
+
+    return new CancellablePromise(
+      (resolve, reject) => {
+        promise
+          .then(
+            (rawCollaborator) =>
+              resolve(
+                new Collaborator({
+                  database: this.database,
+                  rawCollaborator,
+                }),
+              ),
+            reject,
+          )
+          .catch(reject);
+      },
+      () => promise.cancel(),
+    );
+  }
 }
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
index a4cc0590ff..1d6910a00c 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
@@ -8,6 +8,7 @@
   import { getDatabaseSettingsContext } from '../databaseSettingsUtils';
 
   export let collaborator: Collaborator;
+  export let editRoleForCollaborator: (collaborator: Collaborator) => void;
 
   const databaseContext = getDatabaseSettingsContext();
   $: ({ configuredRoles, users } = $databaseContext);
@@ -38,7 +39,10 @@
       {/if}
     </div>
     <div class="actions">
-      <Button appearance="secondary">
+      <Button
+        appearance="secondary"
+        on:click={() => editRoleForCollaborator(collaborator)}
+      >
         <Icon {...iconEdit} size="0.8em" />
       </Button>
     </div>
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
index a26d9c8078..ca8ca6cfe0 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
@@ -6,6 +6,7 @@
   import GridTable from '@mathesar/components/grid-table/GridTable.svelte';
   import GridTableCell from '@mathesar/components/grid-table/GridTableCell.svelte';
   import { iconAddNew } from '@mathesar/icons';
+  import { Collaborator } from '@mathesar/models/Collaborator';
   import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
   import { modal } from '@mathesar/stores/modal';
   import { isDefined } from '@mathesar/utils/language';
@@ -16,9 +17,11 @@
 
   import AddCollaboratorModel from './AddCollaboratorModal.svelte';
   import CollaboratorRow from './CollaboratorRow.svelte';
+  import EditRoleForCollaboratorModal from './EditRoleForCollaboratorModal.svelte';
 
   const databaseContext = getDatabaseSettingsContext();
   const addCollaboratorModal = modal.spawnModalController();
+  const editCollaboratorRoleModal = modal.spawnModalController();
 
   $: ({ database, configuredRoles, collaborators, users } = $databaseContext);
 
@@ -38,6 +41,13 @@
     $configuredRoles.error,
     $users.error,
   ].filter((entry): entry is string => isDefined(entry));
+
+  let targetCollaborator: Collaborator | undefined;
+
+  function editRoleForCollaborator(collaborator: Collaborator) {
+    targetCollaborator = collaborator;
+    editCollaboratorRoleModal.open();
+  }
 </script>
 
 <SettingsContentLayout>
@@ -61,7 +71,7 @@
         <GridTableCell header>{$_('role')}</GridTableCell>
         <GridTableCell header>{$_('actions')}</GridTableCell>
         {#each [...($collaborators.resolvedValue?.values() ?? [])] as collaborator (collaborator.id)}
-          <CollaboratorRow {collaborator} />
+          <CollaboratorRow {collaborator} {editRoleForCollaborator} />
         {/each}
       </GridTable>
     </div>
@@ -79,6 +89,15 @@
   />
 {/if}
 
+{#if $configuredRoles.resolvedValue && $users.resolvedValue && targetCollaborator}
+  <EditRoleForCollaboratorModal
+    collaborator={targetCollaborator}
+    usersMap={$users.resolvedValue}
+    controller={editCollaboratorRoleModal}
+    configuredRolesMap={$configuredRoles.resolvedValue}
+  />
+{/if}
+
 <style lang="scss">
   .collaborators-table {
     --Grid-table__template-columns: 3fr 3fr 1fr;
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte b/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte
new file mode 100644
index 0000000000..602fea0426
--- /dev/null
+++ b/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte
@@ -0,0 +1,92 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import type { User } from '@mathesar/api/rest/users';
+  import {
+    FormSubmit,
+    makeForm,
+    requiredField,
+  } from '@mathesar/components/form';
+  import Field from '@mathesar/components/form/Field.svelte';
+  import { Collaborator } from '@mathesar/models/Collaborator';
+  import { ConfiguredRole } from '@mathesar/models/ConfiguredRole';
+  import { toast } from '@mathesar/stores/toast';
+  import {
+    ControlledModal,
+    ImmutableMap,
+    type ModalController,
+    Select,
+    portalToWindowFooter,
+  } from '@mathesar-component-library';
+
+  import { getDatabaseSettingsContext } from '../databaseSettingsUtils';
+
+  const databaseContext = getDatabaseSettingsContext();
+
+  export let controller: ModalController;
+  export let collaborator: Collaborator;
+  export let configuredRolesMap: ImmutableMap<number, ConfiguredRole>;
+  export let usersMap: ImmutableMap<number, User>;
+
+  $: configuredRoleId = requiredField<number>(collaborator.configured_role_id);
+  $: form = makeForm({ configuredRoleId });
+
+  $: userName =
+    usersMap.get(collaborator.user_id)?.username ??
+    String(collaborator.user_id);
+
+  const SelectConfiguredRole = Select<ConfiguredRole['id']>;
+
+  async function updateRoleForCollaborator() {
+    await $databaseContext.updateRoleForCollaborator(
+      collaborator,
+      $configuredRoleId,
+    );
+    controller.close();
+    toast.success($_('collaborator_role_updated_successfully'));
+    form.reset();
+  }
+</script>
+
+<ControlledModal {controller} on:close={() => form.reset()}>
+  <span slot="title">
+    {$_('edit_role_for_collaborator_value', {
+      values: {
+        collaborator: userName,
+      },
+    })}
+  </span>
+  <div>
+    <Field
+      label={$_('role')}
+      layout="stacked"
+      field={configuredRoleId}
+      input={{
+        component: SelectConfiguredRole,
+        props: {
+          options: [...configuredRolesMap.values()].map((r) => r.id),
+          getLabel: (option) => {
+            if (option) {
+              return configuredRolesMap.get(option)?.name ?? String(option);
+            }
+            return $_('select_role');
+          },
+          autoSelect: 'none',
+        },
+      }}
+    />
+  </div>
+  <div use:portalToWindowFooter class="footer">
+    <FormSubmit
+      {form}
+      catchErrors
+      onCancel={() => {
+        form.reset();
+        controller.close();
+      }}
+      onProceed={updateRoleForCollaborator}
+      proceedButton={{ label: $_('save') }}
+      cancelButton={{ label: $_('cancel') }}
+    />
+  </div>
+</ControlledModal>
diff --git a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
index d9bc5d7699..edd334f794 100644
--- a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
+++ b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
@@ -2,6 +2,7 @@ import { getContext, setContext } from 'svelte';
 import { type Readable, type Writable, derived, writable } from 'svelte/store';
 
 import userApi, { type User } from '@mathesar/api/rest/users';
+import { Collaborator } from '@mathesar/models/Collaborator';
 import { ConfiguredRole } from '@mathesar/models/ConfiguredRole';
 import type { Database } from '@mathesar/models/Database';
 import { Role } from '@mathesar/models/Role';
@@ -120,6 +121,17 @@ class DatabaseSettingsContext {
       collaborators.with(newCollaborator.id, newCollaborator),
     );
   }
+
+  async updateRoleForCollaborator(
+    collaborator: Collaborator,
+    configuredRoleId: ConfiguredRole['id'],
+  ) {
+    const updatedCollaborator =
+      await collaborator.setConfiguredRole(configuredRoleId);
+    this.collaborators.updateResolvedValue((collaborators) =>
+      collaborators.with(updatedCollaborator.id, updatedCollaborator),
+    );
+  }
 }
 
 export function getDatabaseSettingsContext(): Readable<DatabaseSettingsContext> {

From 6cfe5df972f5f8d067dc8bdf3fdc106caa610843 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Sun, 18 Aug 2024 20:14:32 +0530
Subject: [PATCH 0662/1141] Add help content to role selector, move configured
 role selector into a separate component

---
 mathesar_ui/src/components/form/index.ts      |  8 ++++-
 mathesar_ui/src/i18n/languages/en/dict.json   |  1 +
 .../collaborators/AddCollaboratorModal.svelte | 22 ++-----------
 .../EditRoleForCollaboratorModal.svelte       | 25 ++------------
 .../SelectConfiguredRoleField.svelte          | 33 +++++++++++++++++++
 5 files changed, 47 insertions(+), 42 deletions(-)
 create mode 100644 mathesar_ui/src/pages/database/settings/collaborators/SelectConfiguredRoleField.svelte

diff --git a/mathesar_ui/src/components/form/index.ts b/mathesar_ui/src/components/form/index.ts
index 16fd0f0a3f..a4b201f6f5 100644
--- a/mathesar_ui/src/components/form/index.ts
+++ b/mathesar_ui/src/components/form/index.ts
@@ -2,5 +2,11 @@ export * from './validators';
 export { default as Field } from './Field.svelte';
 export { default as FormSubmit } from './FormSubmit.svelte';
 export { default as FieldLayout } from './FieldLayout.svelte';
-export { field, requiredField, optionalField, type FieldStore } from './field';
+export {
+  field,
+  requiredField,
+  optionalField,
+  type FieldStore,
+  type RequiredField,
+} from './field';
 export * from './form';
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index e008f0619b..997af8a790 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -55,6 +55,7 @@
   "clear": "Clear",
   "clear_value": "Clear value",
   "collaborator_added_successfully": "Collaborator added successfully",
+  "collaborator_role_help": "This role determines permissions for this collaborator. Mathesar will use this PostgreSQL role for all database interactions by this user.",
   "collaborator_role_updated_successfully": "Role updated successfully for collaborator.",
   "collaborators": "Collaborators",
   "column": "Column",
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte b/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte
index 6b5052735a..00e45edce3 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte
@@ -21,6 +21,8 @@
 
   import { getDatabaseSettingsContext } from '../databaseSettingsUtils';
 
+  import SelectConfiguredRoleField from './SelectConfiguredRoleField.svelte';
+
   const databaseContext = getDatabaseSettingsContext();
 
   export let controller: ModalController;
@@ -33,7 +35,6 @@
   const form = makeForm({ userId, configuredRoleId });
 
   const SelectUser = Select<User['id']>;
-  const SelectConfiguredRole = Select<ConfiguredRole['id']>;
 
   $: addedUsers = new Set(
     [...collaboratorsMap.values()].map((cbr) => cbr.user_id),
@@ -75,24 +76,7 @@
         },
       }}
     />
-    <Field
-      label={$_('role')}
-      layout="stacked"
-      field={configuredRoleId}
-      input={{
-        component: SelectConfiguredRole,
-        props: {
-          options: [...configuredRolesMap.values()].map((r) => r.id),
-          getLabel: (option) => {
-            if (option) {
-              return configuredRolesMap.get(option)?.name ?? String(option);
-            }
-            return $_('select_role');
-          },
-          autoSelect: 'none',
-        },
-      }}
-    />
+    <SelectConfiguredRoleField {configuredRoleId} {configuredRolesMap} />
   </div>
   <div use:portalToWindowFooter class="footer">
     <FormSubmit
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte b/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte
index 602fea0426..667692e72c 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte
@@ -7,7 +7,6 @@
     makeForm,
     requiredField,
   } from '@mathesar/components/form';
-  import Field from '@mathesar/components/form/Field.svelte';
   import { Collaborator } from '@mathesar/models/Collaborator';
   import { ConfiguredRole } from '@mathesar/models/ConfiguredRole';
   import { toast } from '@mathesar/stores/toast';
@@ -15,12 +14,13 @@
     ControlledModal,
     ImmutableMap,
     type ModalController,
-    Select,
     portalToWindowFooter,
   } from '@mathesar-component-library';
 
   import { getDatabaseSettingsContext } from '../databaseSettingsUtils';
 
+  import SelectConfiguredRoleField from './SelectConfiguredRoleField.svelte';
+
   const databaseContext = getDatabaseSettingsContext();
 
   export let controller: ModalController;
@@ -35,8 +35,6 @@
     usersMap.get(collaborator.user_id)?.username ??
     String(collaborator.user_id);
 
-  const SelectConfiguredRole = Select<ConfiguredRole['id']>;
-
   async function updateRoleForCollaborator() {
     await $databaseContext.updateRoleForCollaborator(
       collaborator,
@@ -57,24 +55,7 @@
     })}
   </span>
   <div>
-    <Field
-      label={$_('role')}
-      layout="stacked"
-      field={configuredRoleId}
-      input={{
-        component: SelectConfiguredRole,
-        props: {
-          options: [...configuredRolesMap.values()].map((r) => r.id),
-          getLabel: (option) => {
-            if (option) {
-              return configuredRolesMap.get(option)?.name ?? String(option);
-            }
-            return $_('select_role');
-          },
-          autoSelect: 'none',
-        },
-      }}
-    />
+    <SelectConfiguredRoleField {configuredRoleId} {configuredRolesMap} />
   </div>
   <div use:portalToWindowFooter class="footer">
     <FormSubmit
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/SelectConfiguredRoleField.svelte b/mathesar_ui/src/pages/database/settings/collaborators/SelectConfiguredRoleField.svelte
new file mode 100644
index 0000000000..a231aafbbb
--- /dev/null
+++ b/mathesar_ui/src/pages/database/settings/collaborators/SelectConfiguredRoleField.svelte
@@ -0,0 +1,33 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import { type RequiredField } from '@mathesar/components/form';
+  import Field from '@mathesar/components/form/Field.svelte';
+  import { ConfiguredRole } from '@mathesar/models/ConfiguredRole';
+  import { ImmutableMap, Select } from '@mathesar-component-library';
+
+  const SelectConfiguredRole = Select<ConfiguredRole['id']>;
+
+  export let configuredRoleId: RequiredField<number | undefined>;
+  export let configuredRolesMap: ImmutableMap<number, ConfiguredRole>;
+</script>
+
+<Field
+  label={$_('role')}
+  layout="stacked"
+  field={configuredRoleId}
+  input={{
+    component: SelectConfiguredRole,
+    props: {
+      options: [...configuredRolesMap.values()].map((r) => r.id),
+      getLabel: (option) => {
+        if (option) {
+          return configuredRolesMap.get(option)?.name ?? String(option);
+        }
+        return $_('select_role');
+      },
+      autoSelect: 'none',
+    },
+  }}
+  help={$_('collaborator_role_help')}
+/>

From 5c39e4325f3df9bc6ec57c322b8212271b7cff12 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Sun, 18 Aug 2024 20:51:29 +0530
Subject: [PATCH 0663/1141] Implement delete action for collaborators

---
 mathesar_ui/src/api/rpc/collaborators.ts      |  6 +++++
 mathesar_ui/src/i18n/languages/en/dict.json   |  1 +
 mathesar_ui/src/models/Collaborator.ts        |  4 ++++
 .../collaborators/CollaboratorRow.svelte      | 22 ++++++++++++++-----
 .../settings/databaseSettingsUtils.ts         |  5 +++++
 5 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/collaborators.ts b/mathesar_ui/src/api/rpc/collaborators.ts
index 0712af42a0..5c89d2829f 100644
--- a/mathesar_ui/src/api/rpc/collaborators.ts
+++ b/mathesar_ui/src/api/rpc/collaborators.ts
@@ -32,4 +32,10 @@ export const collaborators = {
     },
     RawCollaborator
   >(),
+  delete: rpcMethodTypeContainer<
+    {
+      collaborator_id: RawCollaborator['id'];
+    },
+    void
+  >(),
 };
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 997af8a790..890a3609cc 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -54,6 +54,7 @@
   "cleaning_up": "Cleaning up",
   "clear": "Clear",
   "clear_value": "Clear value",
+  "collaborator": "Collaborator",
   "collaborator_added_successfully": "Collaborator added successfully",
   "collaborator_role_help": "This role determines permissions for this collaborator. Mathesar will use this PostgreSQL role for all database interactions by this user.",
   "collaborator_role_updated_successfully": "Role updated successfully for collaborator.",
diff --git a/mathesar_ui/src/models/Collaborator.ts b/mathesar_ui/src/models/Collaborator.ts
index 9c18a44ebd..7577703ace 100644
--- a/mathesar_ui/src/models/Collaborator.ts
+++ b/mathesar_ui/src/models/Collaborator.ts
@@ -50,4 +50,8 @@ export class Collaborator {
       () => promise.cancel(),
     );
   }
+
+  delete() {
+    return api.collaborators.delete({ collaborator_id: this.id }).run();
+  }
 }
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
index 1d6910a00c..90e17bf5f7 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
@@ -1,9 +1,12 @@
 <script lang="ts">
+  import { _ } from 'svelte-i18n';
+
   import Icon from '@mathesar/component-library/icon/Icon.svelte';
   import GridTableCell from '@mathesar/components/grid-table/GridTableCell.svelte';
   import { iconDeleteMajor, iconEdit } from '@mathesar/icons';
   import { Collaborator } from '@mathesar/models/Collaborator';
-  import { Button } from '@mathesar-component-library';
+  import { confirmDelete } from '@mathesar/stores/confirmation';
+  import { Button, SpinnerButton } from '@mathesar-component-library';
 
   import { getDatabaseSettingsContext } from '../databaseSettingsUtils';
 
@@ -17,12 +20,13 @@
   $: configuredRole = $configuredRoles.resolvedValue?.get(
     collaborator.configured_role_id,
   );
+  $: userName = user ? user.full_name || user.username : '';
 </script>
 
 <GridTableCell>
   <div>
     {#if user}
-      <div>{user.full_name || user.username}</div>
+      <div>{userName}</div>
       <div>{user.email}</div>
     {:else}
       {collaborator.user_id}
@@ -49,9 +53,17 @@
   </div>
 </GridTableCell>
 <GridTableCell>
-  <Button appearance="secondary">
-    <Icon {...iconDeleteMajor} size="0.8em" />
-  </Button>
+  <SpinnerButton
+    confirm={() =>
+      confirmDelete({
+        identifierName: userName,
+        identifierType: $_('collaborator'),
+      })}
+    onClick={() => $databaseContext.deleteCollaborator(collaborator)}
+    icon={{ ...iconDeleteMajor, size: '0.8em' }}
+    label=""
+    appearance="secondary"
+  />
 </GridTableCell>
 
 <style lang="scss">
diff --git a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
index edd334f794..4cbfeebe11 100644
--- a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
+++ b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
@@ -132,6 +132,11 @@ class DatabaseSettingsContext {
       collaborators.with(updatedCollaborator.id, updatedCollaborator),
     );
   }
+
+  async deleteCollaborator(collaborator: Collaborator) {
+    await collaborator.delete();
+    this.collaborators.updateResolvedValue((c) => c.without(collaborator.id));
+  }
 }
 
 export function getDatabaseSettingsContext(): Readable<DatabaseSettingsContext> {

From b7a45291a72c60caaf144eff8d65aa4d7e5e9be0 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Sun, 18 Aug 2024 22:24:42 +0530
Subject: [PATCH 0664/1141] Implement basic ui for create role modal, display
 child role names in role list table

---
 mathesar_ui/src/i18n/languages/en/dict.json   |  1 +
 .../settings/roles/CreateRoleModal.svelte     | 98 +++++++++++++++++++
 .../settings/{ => roles}/Roles.svelte         | 60 ++++++++++--
 mathesar_ui/src/routes/DatabaseRoute.svelte   |  2 +-
 4 files changed, 150 insertions(+), 11 deletions(-)
 create mode 100644 mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte
 rename mathesar_ui/src/pages/database/settings/{ => roles}/Roles.svelte (53%)

diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 890a3609cc..2c52d1842a 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -459,6 +459,7 @@
   "role_configured_all_databases_in_server": "This role will be configured for all databases on DB Server ''{server}''",
   "role_configured_successfully": "Role configured successfully",
   "role_configured_successfully_new_password": "Role configured successfully with new password",
+  "role_name": "Role Name",
   "roles": "Roles",
   "row": "Row",
   "running_latest_version": "You are running the latest version",
diff --git a/mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte b/mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte
new file mode 100644
index 0000000000..6bd66f7262
--- /dev/null
+++ b/mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte
@@ -0,0 +1,98 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import {
+    Field,
+    FieldLayout,
+    FormSubmit,
+    comboMustBeEqual,
+    makeForm,
+    requiredField,
+  } from '@mathesar/components/form';
+  import {
+    Checkbox,
+    ControlledModal,
+    LabeledInput,
+    ModalController,
+    PasswordInput,
+    portalToWindowFooter,
+  } from '@mathesar-component-library';
+
+  export let controller: ModalController;
+
+  const roleName = requiredField('');
+  const password = requiredField('');
+  const confirmPassword = requiredField('');
+
+  let login = true;
+
+  $: formFields = (() => {
+    const fields = {
+      roleName,
+    };
+    return login
+      ? {
+          ...fields,
+          password,
+          confirmPassword,
+        }
+      : fields;
+  })();
+  $: form = makeForm(formFields, [
+    comboMustBeEqual([password, confirmPassword], $_('passwords_do_not_match')),
+  ]);
+  $: login, password.reset(), confirmPassword.reset();
+
+  function createRole() {
+    //
+  }
+</script>
+
+<ControlledModal {controller} on:close={() => form.reset()}>
+  <span slot="title">
+    {$_('create_role')}
+  </span>
+  <div>
+    <Field label={$_('role_name')} layout="stacked" field={roleName} />
+    <FieldLayout>
+      <!-- eslint-disable-next-line @intlify/svelte/no-raw-text -->
+      <LabeledInput label="LOGIN" layout="inline-input-first">
+        <Checkbox bind:checked={login} />
+      </LabeledInput>
+    </FieldLayout>
+    {#if login}
+      <Field
+        label={$_('password')}
+        layout="stacked"
+        field={password}
+        input={{
+          component: PasswordInput,
+          props: { autocomplete: 'new-password' },
+        }}
+      />
+      <Field
+        label={$_('confirm_password')}
+        layout="stacked"
+        field={confirmPassword}
+        input={{
+          component: PasswordInput,
+          props: { autocomplete: 'new-password' },
+        }}
+      />
+    {/if}
+  </div>
+
+  <div use:portalToWindowFooter class="footer">
+    <FormSubmit
+      {form}
+      catchErrors
+      onCancel={() => {
+        form.reset();
+        controller.close();
+      }}
+      onProceed={createRole}
+      proceedButton={{ label: $_('create_role') }}
+      cancelButton={{ label: $_('cancel') }}
+    />
+  </div>
+</ControlledModal>
diff --git a/mathesar_ui/src/pages/database/settings/Roles.svelte b/mathesar_ui/src/pages/database/settings/roles/Roles.svelte
similarity index 53%
rename from mathesar_ui/src/pages/database/settings/Roles.svelte
rename to mathesar_ui/src/pages/database/settings/roles/Roles.svelte
index c0dc96f557..3a07394bb8 100644
--- a/mathesar_ui/src/pages/database/settings/Roles.svelte
+++ b/mathesar_ui/src/pages/database/settings/roles/Roles.svelte
@@ -4,12 +4,18 @@
   import GridTable from '@mathesar/components/grid-table/GridTable.svelte';
   import GridTableCell from '@mathesar/components/grid-table/GridTableCell.svelte';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
-  import { Button, Spinner } from '@mathesar-component-library';
+  import { iconAddNew, iconEdit } from '@mathesar/icons';
+  import { modal } from '@mathesar/stores/modal';
+  import { Button, Icon, Spinner } from '@mathesar-component-library';
 
-  import { getDatabaseSettingsContext } from './databaseSettingsUtils';
-  import SettingsContentLayout from './SettingsContentLayout.svelte';
+  import { getDatabaseSettingsContext } from '../databaseSettingsUtils';
+  import SettingsContentLayout from '../SettingsContentLayout.svelte';
+
+  import CreateRoleModal from './CreateRoleModal.svelte';
 
   const databaseContext = getDatabaseSettingsContext();
+  const createRoleModalController = modal.spawnModalController();
+
   $: ({ database, roles } = $databaseContext);
 
   $: void roles.runIfNotInitialized({ database_id: database.id });
@@ -21,9 +27,15 @@
     {$_('roles')}
   </svelte:fragment>
   <svelte:fragment slot="actions">
-    <Button appearance="primary">
-      {$_('create_role')}
-    </Button>
+    {#if !$roles.isLoading}
+      <Button
+        appearance="primary"
+        on:click={() => createRoleModalController.open()}
+      >
+        <Icon {...iconAddNew} />
+        <span>{$_('create_role')}</span>
+      </Button>
+    {/if}
   </svelte:fragment>
   {#if $roles.isLoading}
     <Spinner />
@@ -43,9 +55,20 @@
             {role.login ? $_('yes') : $_('no')}
           </GridTableCell>
           <GridTableCell>
-            {#each role.members ?? [] as member (member.oid)}
-              {member.oid}
-            {/each}
+            <div class="child-roles">
+              <div class="role-list">
+                {#each role.members ?? [] as member (member.oid)}
+                  <span class="role-name">
+                    {$roles.resolvedValue?.get(member.oid)?.name ?? ''}
+                  </span>
+                {/each}
+              </div>
+              <div class="actions">
+                <Button appearance="secondary">
+                  <Icon {...iconEdit} size="0.8em" />
+                </Button>
+              </div>
+            </div>
           </GridTableCell>
           <GridTableCell>
             <Button appearance="outline-primary">
@@ -62,9 +85,26 @@
   {/if}
 </SettingsContentLayout>
 
+<CreateRoleModal controller={createRoleModalController} />
+
 <style lang="scss">
   .roles-table {
-    --Grid-table__template-columns: 3fr 2fr 3fr 2fr;
+    --Grid-table__template-columns: 3fr 2fr 4fr 2fr;
     background: var(--white);
+
+    .child-roles {
+      display: flex;
+      width: 100%;
+      align-items: center;
+
+      .role-list {
+        display: flex;
+        gap: 6px;
+      }
+
+      .actions {
+        margin-left: auto;
+      }
+    }
   }
 </style>
diff --git a/mathesar_ui/src/routes/DatabaseRoute.svelte b/mathesar_ui/src/routes/DatabaseRoute.svelte
index 9e0b759987..bc2f3c465a 100644
--- a/mathesar_ui/src/routes/DatabaseRoute.svelte
+++ b/mathesar_ui/src/routes/DatabaseRoute.svelte
@@ -12,7 +12,7 @@
   import DatabasePageSchemasSection from '@mathesar/pages/database/schemas/SchemasSection.svelte';
   import DatabaseCollaborators from '@mathesar/pages/database/settings/collaborators/Collaborators.svelte';
   import DatabaseRoleConfiguration from '@mathesar/pages/database/settings/role-configuration/RoleConfiguration.svelte';
-  import DatabaseRoles from '@mathesar/pages/database/settings/Roles.svelte';
+  import DatabaseRoles from '@mathesar/pages/database/settings/roles/Roles.svelte';
   import DatabasePageSettingsWrapper from '@mathesar/pages/database/settings/SettingsWrapper.svelte';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import { databasesStore } from '@mathesar/stores/databases';

From 3566d3d1a1f74f574e9b2deb77044edd0fdb226b Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Sun, 18 Aug 2024 22:41:54 +0530
Subject: [PATCH 0665/1141] fix type errors

---
 mathesar_ui/src/models/Collaborator.ts             |  2 +-
 .../pages/database/settings/SettingsWrapper.svelte |  2 +-
 .../collaborators/AddCollaboratorModal.svelte      |  6 +++---
 .../settings/collaborators/CollaboratorRow.svelte  |  2 +-
 .../settings/collaborators/Collaborators.svelte    |  2 +-
 .../EditRoleForCollaboratorModal.svelte            |  6 +++---
 .../collaborators/SelectConfiguredRoleField.svelte |  6 +++---
 .../database/settings/databaseSettingsUtils.ts     |  6 +++---
 .../database/settings/roles/CreateRoleModal.svelte |  2 +-
 mathesar_ui/src/routes/RootRoute.svelte            |  8 ++++----
 mathesar_ui/src/stores/databases.ts                | 14 +++++++++-----
 11 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/mathesar_ui/src/models/Collaborator.ts b/mathesar_ui/src/models/Collaborator.ts
index 7577703ace..4ba7dae50e 100644
--- a/mathesar_ui/src/models/Collaborator.ts
+++ b/mathesar_ui/src/models/Collaborator.ts
@@ -2,7 +2,7 @@ import { api } from '@mathesar/api/rpc';
 import type { RawCollaborator } from '@mathesar/api/rpc/collaborators';
 import { CancellablePromise } from '@mathesar/component-library';
 
-import { ConfiguredRole } from './ConfiguredRole';
+import type { ConfiguredRole } from './ConfiguredRole';
 import type { Database } from './Database';
 
 export class Collaborator {
diff --git a/mathesar_ui/src/pages/database/settings/SettingsWrapper.svelte b/mathesar_ui/src/pages/database/settings/SettingsWrapper.svelte
index 786b7f3ebc..1831c267a2 100644
--- a/mathesar_ui/src/pages/database/settings/SettingsWrapper.svelte
+++ b/mathesar_ui/src/pages/database/settings/SettingsWrapper.svelte
@@ -2,7 +2,7 @@
   import { _ } from 'svelte-i18n';
 
   import PageLayoutWithSidebar from '@mathesar/layouts/PageLayoutWithSidebar.svelte';
-  import { Database } from '@mathesar/models/Database';
+  import type { Database } from '@mathesar/models/Database';
   import {
     getDatabaseCollaboratorsUrl,
     getDatabaseRoleConfigurationUrl,
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte b/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte
index 00e45edce3..79b4825a90 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte
@@ -8,12 +8,12 @@
     requiredField,
   } from '@mathesar/components/form';
   import Field from '@mathesar/components/form/Field.svelte';
-  import { Collaborator } from '@mathesar/models/Collaborator';
-  import { ConfiguredRole } from '@mathesar/models/ConfiguredRole';
+  import type { Collaborator } from '@mathesar/models/Collaborator';
+  import type { ConfiguredRole } from '@mathesar/models/ConfiguredRole';
   import { toast } from '@mathesar/stores/toast';
   import {
     ControlledModal,
-    ImmutableMap,
+    type ImmutableMap,
     type ModalController,
     Select,
     portalToWindowFooter,
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
index 90e17bf5f7..3bce77a219 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
@@ -4,7 +4,7 @@
   import Icon from '@mathesar/component-library/icon/Icon.svelte';
   import GridTableCell from '@mathesar/components/grid-table/GridTableCell.svelte';
   import { iconDeleteMajor, iconEdit } from '@mathesar/icons';
-  import { Collaborator } from '@mathesar/models/Collaborator';
+  import type { Collaborator } from '@mathesar/models/Collaborator';
   import { confirmDelete } from '@mathesar/stores/confirmation';
   import { Button, SpinnerButton } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
index ca8ca6cfe0..f74c581d0e 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
@@ -6,7 +6,7 @@
   import GridTable from '@mathesar/components/grid-table/GridTable.svelte';
   import GridTableCell from '@mathesar/components/grid-table/GridTableCell.svelte';
   import { iconAddNew } from '@mathesar/icons';
-  import { Collaborator } from '@mathesar/models/Collaborator';
+  import type { Collaborator } from '@mathesar/models/Collaborator';
   import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
   import { modal } from '@mathesar/stores/modal';
   import { isDefined } from '@mathesar/utils/language';
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte b/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte
index 667692e72c..9d6ca95e6c 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte
@@ -7,12 +7,12 @@
     makeForm,
     requiredField,
   } from '@mathesar/components/form';
-  import { Collaborator } from '@mathesar/models/Collaborator';
-  import { ConfiguredRole } from '@mathesar/models/ConfiguredRole';
+  import type { Collaborator } from '@mathesar/models/Collaborator';
+  import type { ConfiguredRole } from '@mathesar/models/ConfiguredRole';
   import { toast } from '@mathesar/stores/toast';
   import {
     ControlledModal,
-    ImmutableMap,
+    type ImmutableMap,
     type ModalController,
     portalToWindowFooter,
   } from '@mathesar-component-library';
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/SelectConfiguredRoleField.svelte b/mathesar_ui/src/pages/database/settings/collaborators/SelectConfiguredRoleField.svelte
index a231aafbbb..b508350f47 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/SelectConfiguredRoleField.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/SelectConfiguredRoleField.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import { type RequiredField } from '@mathesar/components/form';
+  import type { RequiredField } from '@mathesar/components/form';
   import Field from '@mathesar/components/form/Field.svelte';
-  import { ConfiguredRole } from '@mathesar/models/ConfiguredRole';
-  import { ImmutableMap, Select } from '@mathesar-component-library';
+  import type { ConfiguredRole } from '@mathesar/models/ConfiguredRole';
+  import { type ImmutableMap, Select } from '@mathesar-component-library';
 
   const SelectConfiguredRole = Select<ConfiguredRole['id']>;
 
diff --git a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
index 4cbfeebe11..9f114c2554 100644
--- a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
+++ b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
@@ -2,10 +2,10 @@ import { getContext, setContext } from 'svelte';
 import { type Readable, type Writable, derived, writable } from 'svelte/store';
 
 import userApi, { type User } from '@mathesar/api/rest/users';
-import { Collaborator } from '@mathesar/models/Collaborator';
-import { ConfiguredRole } from '@mathesar/models/ConfiguredRole';
+import type { Collaborator } from '@mathesar/models/Collaborator';
+import type { ConfiguredRole } from '@mathesar/models/ConfiguredRole';
 import type { Database } from '@mathesar/models/Database';
-import { Role } from '@mathesar/models/Role';
+import type { Role } from '@mathesar/models/Role';
 import AsyncStore from '@mathesar/stores/AsyncStore';
 import { CancellablePromise, ImmutableMap } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte b/mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte
index 6bd66f7262..e715031b29 100644
--- a/mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte
+++ b/mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte
@@ -13,7 +13,7 @@
     Checkbox,
     ControlledModal,
     LabeledInput,
-    ModalController,
+    type ModalController,
     PasswordInput,
     portalToWindowFooter,
   } from '@mathesar-component-library';
diff --git a/mathesar_ui/src/routes/RootRoute.svelte b/mathesar_ui/src/routes/RootRoute.svelte
index 56cf138c13..8c9a219c80 100644
--- a/mathesar_ui/src/routes/RootRoute.svelte
+++ b/mathesar_ui/src/routes/RootRoute.svelte
@@ -27,9 +27,9 @@
       </Route>
     </Route>
 
-    <Route fallback>
+    <Route fallback let:meta>
       <!--Reload page to let server routing take over-->
-      <RouteObserver on:load={() => window.location.reload()} />
+      <RouteObserver {meta} on:load={() => window.location.reload()} />
     </Route>
   </Route>
 {:else}
@@ -38,9 +38,9 @@
       <AuthenticatedRoutes />
     {/if}
 
-    <Route path="/shares/*">
+    <Route path="/shares/*" let:meta>
       <!--Reload page to let server routing take over-->
-      <RouteObserver on:load={() => window.location.reload()} />
+      <RouteObserver {meta} on:load={() => window.location.reload()} />
     </Route>
 
     <Route fallback>
diff --git a/mathesar_ui/src/stores/databases.ts b/mathesar_ui/src/stores/databases.ts
index c688d01ecd..574262215a 100644
--- a/mathesar_ui/src/stores/databases.ts
+++ b/mathesar_ui/src/stores/databases.ts
@@ -45,11 +45,15 @@ class DatabasesStore {
          * 3. Displaying server info is not an important feature of the app,
          *    so it's better to fail gracefully than to throw an error and crash the app.
          */
-        const server = serverMap.get(d.server_id) ?? {
-          id: d.server_id,
-          host: 'unknown',
-          port: 0,
-        };
+        const server =
+          serverMap.get(d.server_id) ??
+          new Server({
+            rawServer: {
+              id: d.server_id,
+              host: 'unknown',
+              port: 0,
+            },
+          });
         return [d.id, new Database({ rawDatabase: d, server })];
       }),
     );

From 07a9b7a4d961a125bf6ff33bdfba83e4667c1b8f Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Sun, 18 Aug 2024 22:47:17 +0530
Subject: [PATCH 0666/1141] Add todo item for eslint rules to add

---
 mathesar_ui/.eslintrc.cjs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mathesar_ui/.eslintrc.cjs b/mathesar_ui/.eslintrc.cjs
index 6b30ababfa..74e522d2c4 100644
--- a/mathesar_ui/.eslintrc.cjs
+++ b/mathesar_ui/.eslintrc.cjs
@@ -48,6 +48,9 @@ module.exports = {
     'array-bracket-spacing': 'off',
     'no-restricted-syntax': 0,
     '@typescript-eslint/require-await': 'off',
+    // TODO_BETA: Add following eslint rules
+    // '@typescript-eslint/consistent-type-imports': 'error',
+    // 'no-duplicate-imports': 'error',
     'class-methods-use-this': 'off',
     'no-multiple-empty-lines': 1,
     'import/order': [

From 53eada2acb2d46d6f55853781c0a8558e047b53e Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 19 Aug 2024 16:09:34 +0800
Subject: [PATCH 0667/1141] add null preview data to previous test

---
 db/sql/test_00_msar.sql | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 9c0030deaa..a1399a18cb 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2948,7 +2948,8 @@ BEGIN
         {"1": 2, "2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]},
         {"1": 3, "2": 2, "3": "abcde", "4": {"k": 3242348}, "5": true}
       ],
-      "grouping": null
+      "grouping": null,
+      "preview_data": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data(col1) AS "2",'
@@ -2973,7 +2974,8 @@ BEGIN
         {"1": 2, "2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]},
         {"1": 1, "2": 5, "3": "sdflkj", "4": "s", "5": {"a": "val"}}
       ],
-      "grouping": null
+      "grouping": null,
+      "preview_data": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data(col1) AS "2",'
@@ -2998,7 +3000,8 @@ BEGIN
         {"1": 2, "2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]},
         {"1": 1, "2": 5, "3": "sdflkj", "4": "s", "5": {"a": "val"}}
       ],
-      "grouping": null
+      "grouping": null,
+      "preview_data": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data(col1) AS "2",',
@@ -3029,7 +3032,8 @@ BEGIN
         {"2": 5, "3": "sdflkj", "4": "s", "5": {"a": "val"}},
         {"2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]}
       ],
-      "grouping": null
+      "grouping": null,
+      "preview_data": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(col1) AS "2", msar.format_data(col2) AS "3",',
@@ -3054,7 +3058,8 @@ BEGIN
         {"2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]},
         {"2": 2, "3": "abcde", "4": {"k": 3242348}, "5": true}
       ],
-      "grouping": null
+      "grouping": null,
+      "preview_data": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(col1) AS "2", msar.format_data(col2) AS "3",',
@@ -3131,7 +3136,8 @@ BEGIN
             "result_indices": [9]
           }
         ]
-      }
+      },
+      "preview_data": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data("First Name") AS "2",'
@@ -3167,7 +3173,8 @@ BEGIN
             "result_indices": [0, 1, 2]
           }
         ]
-      }
+      },
+      "preview_data": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data("First Name") AS "2",'
@@ -3199,7 +3206,8 @@ BEGIN
           {"id": 1, "count": 1, "results_eq": {"4": "2020-03 AD"}, "result_indices": [0]},
           {"id": 2, "count": 2, "results_eq": {"4": "2020-04 AD"}, "result_indices": [1, 2]}
         ]
-      }
+      },
+      "preview_data": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data("First Name") AS "2",'
@@ -3232,7 +3240,8 @@ BEGIN
         "groups": [
           {"id": 1, "count": 8, "results_eq": {"4": "2020 AD"}, "result_indices": [0, 1, 2, 3, 4]}
         ]
-      }
+      },
+      "preview_data": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data("First Name") AS "2",'
@@ -3743,7 +3752,8 @@ BEGIN
       "results": [
         {"1": 2, "2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]}
       ],
-      "grouping": null
+      "grouping": null,
+      "preview_data": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data(col1) AS "2",',
@@ -3758,7 +3768,8 @@ BEGIN
     $j${
       "count": 0,
       "results": [],
-      "grouping": null
+      "grouping": null,
+      "preview_data": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data(col1) AS "2",',

From a39c2a5d937323afcfeb446b92a42acac4a5d1a5 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 19 Aug 2024 16:35:54 +0800
Subject: [PATCH 0668/1141] add basic test for record previews

---
 db/sql/test_00_msar.sql | 92 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index a1399a18cb..3604f74a7b 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -4067,3 +4067,95 @@ BEGIN
   );
 END;
 $$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION __setup_preview_fkey_cols() RETURNS SETOF TEXT AS $$
+BEGIN
+CREATE TABLE "Counselors" (
+    coid numeric UNIQUE,
+    "Name" text,
+    "Email" text
+);
+CREATE TABLE "Teachers" (
+    id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
+    "Counselor" numeric REFERENCES "Counselors" (coid),
+    "Name" text,
+    "Email" text
+);
+CREATE TABLE "Students" (
+    id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
+    "Counselor" numeric REFERENCES "Counselors" (coid),
+    "Teacher" integer REFERENCES "Teachers" (id),
+    "Name" text,
+    "Grade" integer,
+    "Email" text
+);
+
+INSERT INTO "Counselors" VALUES
+  (1.234, 'Alice Alison', 'aalison@example.edu'),
+  (2.345, 'Bob Bobinson', 'bbobinson@example.edu');
+
+INSERT INTO "Teachers" ("Counselor", "Name", "Email") VALUES
+  (1.234, 'Carol Carlson', 'ccarlson@example.edu'),
+  (2.345, 'Dave Davidson', 'ddavison@example.edu'),
+  (1.234, 'Eve Evilson', 'eevilson@example.edu');
+
+INSERT INTO "Students" ("Counselor", "Teacher", "Name", "Grade", "Email") VALUES
+  (2.345, 3, 'Fred Fredrickson', 95, 'ffredrickson@example.edu'),
+  (1.234, 1, 'Gabby Gabberson', 100, 'ggabberson@example.edu'),
+  (1.234, 2, 'Hank Hankson', 75, 'hhankson@example.edu'),
+  (2.345, 1, 'Ida Idalia', 90, 'iidalia@example.edu'),
+  (2.345, 2, 'James Jameson', 80, 'jjameson@example.edu'),
+  (1.234, 3, 'Kelly Kellison', 80, 'kkellison@example.edu');
+
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_list_records_with_preview() RETURNS SETOF TEXT AS $$
+DECLARE
+  list_result jsonb;
+BEGIN
+  PERFORM __setup_preview_fkey_cols();
+  RETURN NEXT is(
+    msar.list_records_from_table(
+      tab_id => '"Students"'::regclass::oid,
+      limit_ => null,
+      offset_ => null,
+      order_ => null,
+      filter_ => null,
+      group_ => null
+    ),
+    $j${
+      "count": 6,
+      "results": [
+        {"1": 1, "2": 2.345, "3": 3, "4": "Fred Fredrickson", "5": 95, "6": "ffredrickson@example.edu"},
+        {"1": 2, "2": 1.234, "3": 1, "4": "Gabby Gabberson", "5": 100, "6": "ggabberson@example.edu"},
+        {"1": 3, "2": 1.234, "3": 2, "4": "Hank Hankson", "5": 75, "6": "hhankson@example.edu"},
+        {"1": 4, "2": 2.345, "3": 1, "4": "Ida Idalia", "5": 90, "6": "iidalia@example.edu"},
+        {"1": 5, "2": 2.345, "3": 2, "4": "James Jameson", "5": 80, "6": "jjameson@example.edu"},
+        {"1": 6, "2": 1.234, "3": 3, "4": "Kelly Kellison", "5": 80, "6": "kkellison@example.edu"}
+      ],
+      "grouping": null,
+      "preview_data": {
+        "2": [
+          {"key": 1.234, "summary": "Alice Alison"},
+          {"key": 2.345, "summary": "Bob Bobinson"}
+        ],
+        "3": [
+          {"key": 1, "summary": "Carol Carlson"},
+          {"key": 2, "summary": "Dave Davidson"},
+          {"key": 3, "summary": "Eve Evilson"}
+        ]
+      }
+    }$j$ || jsonb_build_object(
+      'query', concat(
+        'SELECT msar.format_data(id) AS "1", msar.format_data("Counselor") AS "2",',
+        ' msar.format_data("Teacher") AS "3", msar.format_data("Name") AS "4",',
+        ' msar.format_data("Grade") AS "5", msar.format_data("Email") AS "6"',
+        ' FROM public."Students"  ORDER BY "1" ASC LIMIT NULL OFFSET NULL'
+      )
+    )
+  );
+END;
+$$ LANGUAGE plpgsql;

From 132598aad1402bad4a4352f0be2754010278902a Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 19 Aug 2024 17:03:40 +0800
Subject: [PATCH 0669/1141] add limit and grouping tests for previews

---
 db/sql/test_00_msar.sql | 74 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 3604f74a7b..d194e42220 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -4157,5 +4157,79 @@ BEGIN
       )
     )
   );
+  RETURN NEXT is(
+    msar.list_records_from_table(
+      tab_id => '"Students"'::regclass::oid,
+      limit_ => 3,
+      offset_ => 1,
+      order_ => null,
+      filter_ => null,
+      group_ => null
+    ),
+    $j${
+      "count": 6,
+      "results": [
+        {"1": 2, "2": 1.234, "3": 1, "4": "Gabby Gabberson", "5": 100, "6": "ggabberson@example.edu"},
+        {"1": 3, "2": 1.234, "3": 2, "4": "Hank Hankson", "5": 75, "6": "hhankson@example.edu"},
+        {"1": 4, "2": 2.345, "3": 1, "4": "Ida Idalia", "5": 90, "6": "iidalia@example.edu"}
+      ],
+      "grouping": null,
+      "preview_data": {
+        "2": [
+          {"key": 1.234, "summary": "Alice Alison"},
+          {"key": 2.345, "summary": "Bob Bobinson"}
+        ],
+        "3": [
+          {"key": 1, "summary": "Carol Carlson"},
+          {"key": 2, "summary": "Dave Davidson"}
+        ]
+      }
+    }$j$ || jsonb_build_object(
+      'query', concat(
+        'SELECT msar.format_data(id) AS "1", msar.format_data("Counselor") AS "2",',
+        ' msar.format_data("Teacher") AS "3", msar.format_data("Name") AS "4",',
+        ' msar.format_data("Grade") AS "5", msar.format_data("Email") AS "6"',
+        ' FROM public."Students"  ORDER BY "1" ASC LIMIT ''3'' OFFSET ''1'''
+      )
+    )
+  );
+  RETURN NEXT is(
+    msar.list_records_from_table(
+      tab_id => '"Students"'::regclass::oid,
+      limit_ => 2,
+      offset_ => null,
+      order_ => '[{"attnum": 2, "direction": "asc"}]',
+      filter_ => null,
+      group_ => '{"columns": [2]}'
+    ),
+    $j${
+      "count": 6,
+      "results": [
+        {"1": 2, "2": 1.234, "3": 1, "4": "Gabby Gabberson", "5": 100, "6": "ggabberson@example.edu"},
+        {"1": 3, "2": 1.234, "3": 2, "4": "Hank Hankson", "5": 75, "6": "hhankson@example.edu"}
+      ],
+      "grouping": {
+        "columns": [2],
+        "preproc": null,
+        "groups": [{"id": 1, "count": 3, "results_eq": {"2": 1.234}, "result_indices": [0, 1]}]
+      },
+      "preview_data": {
+        "2": [
+          {"key": 1.234, "summary": "Alice Alison"}
+        ],
+        "3": [
+          {"key": 1, "summary": "Carol Carlson"},
+          {"key": 2, "summary": "Dave Davidson"}
+        ]
+      }
+    }$j$ || jsonb_build_object(
+      'query', concat(
+        'SELECT msar.format_data(id) AS "1", msar.format_data("Counselor") AS "2",',
+        ' msar.format_data("Teacher") AS "3", msar.format_data("Name") AS "4",',
+        ' msar.format_data("Grade") AS "5", msar.format_data("Email") AS "6"',
+        ' FROM public."Students"  ORDER BY "2" ASC, "1" ASC LIMIT ''2'' OFFSET NULL'
+      )
+    )
+  );
 END;
 $$ LANGUAGE plpgsql;

From a1d8c3de003b55beebdedb9473aab4b4279376cd Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 19 Aug 2024 18:05:32 +0800
Subject: [PATCH 0670/1141] expose preview results through RPC functions

---
 mathesar/rpc/records.py            | 20 ++++++++++++++++----
 mathesar/tests/rpc/test_records.py | 17 +++++++++++------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index 39b8dbe173..2239b0aab3 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -127,6 +127,18 @@ class GroupingResponse(TypedDict):
     groups: list[Group]
 
 
+class PreviewEntry(TypedDict):
+    """
+    Preview entry object. Maps a foreign key to a text summary.
+
+    Attributes:
+        key: The foreign key value.
+        summary: The summary of the referenced record.
+    """
+    key: Any
+    summary: str
+
+
 class RecordList(TypedDict):
     """
     Records from a table, along with some meta data
@@ -145,7 +157,7 @@ class RecordList(TypedDict):
     count: int
     results: list[dict]
     grouping: GroupingResponse
-    preview_data: list[dict]
+    preview_data: dict[str, list[PreviewEntry]]
 
     @classmethod
     def from_dict(cls, d):
@@ -153,7 +165,7 @@ def from_dict(cls, d):
             count=d["count"],
             results=d["results"],
             grouping=d.get("grouping"),
-            preview_data=[],
+            preview_data=d.get("preview_data"),
             query=d["query"],
         )
 
@@ -172,13 +184,13 @@ class RecordAdded(TypedDict):
         preview_data: Information for previewing foreign key values.
     """
     results: list[dict]
-    preview_data: list[dict]
+    preview_data: dict[str, list[PreviewEntry]]
 
     @classmethod
     def from_dict(cls, d):
         return cls(
             results=d["results"],
-            preview_data=[],
+            preview_data=d.get("preview_data"),
         )
 
 
diff --git a/mathesar/tests/rpc/test_records.py b/mathesar/tests/rpc/test_records.py
index 14bfbe5f74..7a9099a4df 100644
--- a/mathesar/tests/rpc/test_records.py
+++ b/mathesar/tests/rpc/test_records.py
@@ -49,7 +49,8 @@ def mock_list_records(
                 "groups": [
                     {"id": 3, "count": 8, "results_eq": {"1": "lsfj", "2": 3422}}
                 ]
-            }
+            },
+            "preview_data": {"2": [{"key": 12345, "summary": "blkjdfslkj"}]},
         }
 
     monkeypatch.setattr(records, 'connect', mock_connect)
@@ -63,7 +64,7 @@ def mock_list_records(
                 {"id": 3, "count": 8, "results_eq": {"1": "lsfj", "2": 3422}}
             ]
         },
-        "preview_data": [],
+        "preview_data": {"2": [{"key": 12345, "summary": "blkjdfslkj"}]},
         "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
     }
     actual_records_list = records.list_(
@@ -103,6 +104,7 @@ def mock_get_record(
             "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],
             "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
             "grouping": None,
+            "preview_data": {"2": [{"key": 12345, "summary": "blkjdfslkj"}]},
         }
 
     monkeypatch.setattr(records, 'connect', mock_connect)
@@ -111,7 +113,7 @@ def mock_get_record(
         "count": 1,
         "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],
         "grouping": None,
-        "preview_data": [],
+        "preview_data": {"2": [{"key": 12345, "summary": "blkjdfslkj"}]},
         "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
     }
     actual_record = records.get(
@@ -148,13 +150,14 @@ def mock_add_record(
             raise AssertionError('incorrect parameters passed')
         return {
             "results": [_record_def],
+            "preview_data": {"2": [{"key": 12345, "summary": "blkjdfslkj"}]},
         }
 
     monkeypatch.setattr(records, 'connect', mock_connect)
     monkeypatch.setattr(records.record_insert, 'add_record_to_table', mock_add_record)
     expect_record = {
         "results": [record_def],
-        "preview_data": [],
+        "preview_data": {"2": [{"key": 12345, "summary": "blkjdfslkj"}]},
     }
     actual_record = records.add(
         record_def=record_def, table_oid=table_oid, database_id=database_id, request=request
@@ -192,13 +195,14 @@ def mock_patch_record(
             raise AssertionError('incorrect parameters passed')
         return {
             "results": [_record_def | {"3": "another"}],
+            "preview_data": {"2": [{"key": 12345, "summary": "blkjdfslkj"}]},
         }
 
     monkeypatch.setattr(records, 'connect', mock_connect)
     monkeypatch.setattr(records.record_update, 'patch_record_in_table', mock_patch_record)
     expect_record = {
         "results": [record_def | {"3": "another"}],
-        "preview_data": [],
+        "preview_data": {"2": [{"key": 12345, "summary": "blkjdfslkj"}]},
     }
     actual_record = records.patch(
         record_def=record_def,
@@ -276,6 +280,7 @@ def mock_search_records(
         return {
             "count": 50123,
             "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],
+            "preview_data": {"2": [{"key": 12345, "summary": "blkjdfslkj"}]},
             "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
         }
 
@@ -285,7 +290,7 @@ def mock_search_records(
         "count": 50123,
         "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],
         "grouping": None,
-        "preview_data": [],
+        "preview_data": {"2": [{"key": 12345, "summary": "blkjdfslkj"}]},
         "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
     }
     actual_records_list = records.search(

From 13c6511cac2eeb776a93bf6389996d1fd9125233 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 19 Aug 2024 18:30:53 +0800
Subject: [PATCH 0671/1141] add record previewing into record adder function

---
 db/sql/00_msar.sql      | 14 +++++++----
 db/sql/test_00_msar.sql | 51 +++++++++++++++++++++++++++++++++++++----
 2 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 79e57bec87..07d8df1126 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3970,13 +3970,19 @@ DECLARE
 BEGIN
   EXECUTE format(
     $i$
-    WITH insert_cte AS (%1$s RETURNING %2$s)
-    SELECT jsonb_build_object('results', %3$s)
-    FROM insert_cte
+    WITH insert_cte AS (%1$s RETURNING %2$s)%4$s
+    SELECT jsonb_build_object(
+      'results', %3$s,
+      'preview_data', %6$s
+    )
+    FROM insert_cte %5$s
     $i$,
     msar.build_single_insert_expr(tab_id, rec_def),
     msar.build_selectable_column_expr(tab_id),
-    msar.build_results_jsonb_expr(tab_id, 'insert_cte', null)
+    msar.build_results_jsonb_expr(tab_id, 'insert_cte', null),
+    msar.build_summary_cte_expr_for_table(tab_id),
+    msar.build_summary_join_expr_for_table(tab_id, 'insert_cte'),
+    COALESCE(msar.build_summary_json_expr_for_table(tab_id), 'NULL')
   ) INTO rec_created;
   RETURN rec_created;
 END;
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index d194e42220..740d9a91cd 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -3951,7 +3951,10 @@ BEGIN
       rel_id,
       '{"2": 234, "3": "ab234", "4": {"key": "val"}, "5": {"key2": "val2"}}'
     ),
-    '{"results": [{"1": 4, "2": 234, "3": "ab234", "4": {"key": "val"}, "5": {"key2": "val2"}}]}'
+    $a${
+      "results": [{"1": 4, "2": 234, "3": "ab234", "4": {"key": "val"}, "5": {"key2": "val2"}}],
+      "preview_data": null
+    }$a$
   );
 END;
 $$ LANGUAGE plpgsql;
@@ -3968,7 +3971,10 @@ BEGIN
       rel_id,
       '{"2": 234, "3": "ab234", "4": {"key": "val"}, "5": "{\"key2\": \"val2\"}"}'
     ),
-    '{"results": [{"1": 4, "2": 234, "3": "ab234", "4": {"key": "val"}, "5": {"key2": "val2"}}]}'
+    $a${
+      "results": [{"1": 4, "2": 234, "3": "ab234", "4": {"key": "val"}, "5": {"key2": "val2"}}],
+      "preview_data": null
+    }$a$
   );
 END;
 $$ LANGUAGE plpgsql;
@@ -3985,7 +3991,10 @@ BEGIN
       rel_id,
       '{"3": "ab234", "4": {"key": "val"}, "5": {"key2": "val2"}}'
     ),
-    '{"results": [{"1": 4, "2": 200, "3": "ab234", "4": {"key": "val"}, "5": {"key2": "val2"}}]}'
+    $a${
+      "results": [{"1": 4, "2": 200, "3": "ab234", "4": {"key": "val"}, "5": {"key2": "val2"}}],
+      "preview_data": null
+    }$a$
   );
 END;
 $$ LANGUAGE plpgsql;
@@ -4002,7 +4011,10 @@ BEGIN
       rel_id,
       '{"2": null, "3": "ab234", "4": {"key": "val"}, "5": {"key2": "val2"}}'
     ),
-    '{"results": [{"1": 4, "2": null, "3": "ab234", "4": {"key": "val"}, "5": {"key2": "val2"}}]}'
+    $a${
+      "results": [{"1": 4, "2": null, "3": "ab234", "4": {"key": "val"}, "5": {"key2": "val2"}}],
+      "preview_data": null
+    }$a$
   );
 END;
 $$ LANGUAGE plpgsql;
@@ -4019,7 +4031,10 @@ BEGIN
       rel_id,
       '{"2": null, "3": "ab234", "4": 3, "5": "\"234\""}'
     ),
-    '{"results": [{"1": 4, "2": null, "3": "ab234", "4": 3, "5": "234"}]}'
+    $a${
+      "results": [{"1": 4, "2": null, "3": "ab234", "4": 3, "5": "234"}],
+      "preview_data": null
+    }$a$
   );
 END;
 $$ LANGUAGE plpgsql;
@@ -4233,3 +4248,29 @@ BEGIN
   );
 END;
 $$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_add_record_to_table_with_preview() RETURNS SETOF TEXT AS $$
+BEGIN
+  PERFORM __setup_preview_fkey_cols();
+  RETURN NEXT is(
+    msar.add_record_to_table(
+      '"Students"'::regclass::oid,
+      '{"2": 2.345, "3": 1, "4": "Larry Laurelson", "5": 70, "6": "llaurelson@example.edu"}'
+    ),
+    $a${
+      "results": [
+        {"1": 7, "2": 2.345, "3": 1, "4": "Larry Laurelson", "5": 70, "6": "llaurelson@example.edu"}
+      ],
+      "preview_data": {
+        "2": [
+          {"key": 2.345, "summary": "Bob Bobinson"}
+        ],
+        "3": [
+          {"key": 1, "summary": "Carol Carlson"}
+        ]
+      }
+    }$a$
+  );
+END;
+$$ LANGUAGE plpgsql;

From 619cd4686cc362073e5cbcbdc90fb98bed91595d Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 19 Aug 2024 22:04:05 +0800
Subject: [PATCH 0672/1141] add record summaries into record patching function

---
 db/sql/00_msar.sql      | 14 ++++++++++----
 db/sql/test_00_msar.sql | 41 +++++++++++++++++++++++++++++++++--------
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 07d8df1126..69a9dfb865 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -4022,9 +4022,12 @@ DECLARE
 BEGIN
   EXECUTE format(
     $i$
-    WITH update_cte AS (%1$s %2$s RETURNING %3$s)
-    SELECT jsonb_build_object('results', %4$s)
-    FROM update_cte
+    WITH update_cte AS (%1$s %2$s RETURNING %3$s)%5$s
+    SELECT jsonb_build_object(
+      'results', %4$s,
+      'preview_data', %7$s
+    )
+    FROM update_cte %6$s
     $i$,
     msar.build_update_expr(tab_id, rec_def),
     msar.build_where_clause(
@@ -4036,7 +4039,10 @@ BEGIN
       )
     ),
     msar.build_selectable_column_expr(tab_id),
-    msar.build_results_jsonb_expr(tab_id, 'update_cte', null)
+    msar.build_results_jsonb_expr(tab_id, 'update_cte', null),
+    msar.build_summary_cte_expr_for_table(tab_id),
+    msar.build_summary_join_expr_for_table(tab_id, 'update_cte'),
+    COALESCE(msar.build_summary_json_expr_for_table(tab_id), 'NULL')
   ) INTO rec_modified;
   RETURN rec_modified;
 END;
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 740d9a91cd..0cc52aabfb 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -4048,7 +4048,10 @@ BEGIN
   rel_id := 'atable'::regclass::oid;
   RETURN NEXT is(
     msar.patch_record_in_table( rel_id, 2, '{"2": 10}'),
-    '{"results": [{"1": 2, "2": 10, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]}]}'
+    $p${
+      "results": [{"1": 2, "2": 10, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]}],
+      "preview_data": null
+    }$p$
   );
 END;
 $$ LANGUAGE plpgsql;
@@ -4062,7 +4065,10 @@ BEGIN
   rel_id := 'atable'::regclass::oid;
   RETURN NEXT is(
     msar.patch_record_in_table( rel_id, 2, '{"2": 10, "4": {"a": "json"}}'),
-    '{"results": [{"1": 2, "2": 10, "3": "sdflfflsk", "4": {"a": "json"}, "5": [1, 2, 3, 4]}]}'
+    $p${
+      "results": [{"1": 2, "2": 10, "3": "sdflfflsk", "4": {"a": "json"}, "5": [1, 2, 3, 4]}],
+      "preview_data": null
+    }$p$
   );
 END;
 $$ LANGUAGE plpgsql;
@@ -4263,12 +4269,31 @@ BEGIN
         {"1": 7, "2": 2.345, "3": 1, "4": "Larry Laurelson", "5": 70, "6": "llaurelson@example.edu"}
       ],
       "preview_data": {
-        "2": [
-          {"key": 2.345, "summary": "Bob Bobinson"}
-        ],
-        "3": [
-          {"key": 1, "summary": "Carol Carlson"}
-        ]
+        "2": [{"key": 2.345, "summary": "Bob Bobinson"}],
+        "3": [{"key": 1, "summary": "Carol Carlson"}]
+      }
+    }$a$
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_patch_record_in_table_with_preview() RETURNS SETOF TEXT AS $$
+BEGIN
+  PERFORM __setup_preview_fkey_cols();
+  RETURN NEXT is(
+    msar.patch_record_in_table(
+      '"Students"'::regclass::oid,
+      2,
+      '{"2": 2.345, "3": 2, "5": 85}'
+    ),
+    $a${
+      "results": [
+        {"1": 2, "2": 2.345, "3": 2, "4": "Gabby Gabberson", "5": 85, "6": "ggabberson@example.edu"}
+      ],
+      "preview_data": {
+        "2": [{"key": 2.345, "summary": "Bob Bobinson"}],
+        "3": [{"key": 2, "summary": "Dave Davidson"}]
       }
     }$a$
   );

From 12d6e8f88cbcaebe4e06716f798ab4bfd24954d0 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 19 Aug 2024 22:15:19 +0800
Subject: [PATCH 0673/1141] add test for previews in record searching

---
 db/sql/test_00_msar.sql | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 0cc52aabfb..3544bead5b 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -4299,3 +4299,21 @@ BEGIN
   );
 END;
 $$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_search_records_in_table_with_preview() RETURNS SETOF TEXT AS $$
+BEGIN
+  PERFORM __setup_preview_fkey_cols();
+  RETURN NEXT is(
+    msar.search_records_from_table(
+      '"Students"'::regclass::oid,
+      '[{"attnum": 4, "literal": "k"}]',
+      2
+    ) -> 'preview_data',
+    $a${
+      "2": [{"key": 1.234, "summary": "Alice Alison"}, {"key": 2.345, "summary": "Bob Bobinson"}],
+      "3": [{"key": 3, "summary": "Eve Evilson"}]
+    }$a$
+  );
+END;
+$$ LANGUAGE plpgsql;

From 04409c5826535a2ee0c921a705d7bdb9ecb3eb56 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 19 Aug 2024 22:50:06 +0800
Subject: [PATCH 0674/1141] fix edge-case bug involving multitarget fkeys

---
 db/sql/00_msar.sql | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 69a9dfb865..7d11c1b9ea 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3657,8 +3657,16 @@ $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 CREATE OR REPLACE FUNCTION msar.get_fkey_map_cte(tab_id oid)
   RETURNS TABLE (target_oid oid, conkey smallint, confkey smallint)
 AS $$/*
+Generate a table mapping foreign key values from refererrer to referant tables.
+
+Given an input table (identified by OID), we return a table with each row representing a foreign key
+constraint on that table. We return only single-column foreign keys, and only one per foreign key
+column.
+
+Args:
+  tab_id: The OID of the table containing the foreign key columns to map.
 */
-SELECT pgc.confrelid AS target_oid, x.conkey AS conkey, min(y.confkey) AS confkey
+SELECT DISTINCT ON (conkey) pgc.confrelid AS target_oid, x.conkey AS conkey, y.confkey AS confkey
 FROM pg_constraint pgc, LATERAL unnest(conkey) x(conkey), LATERAL unnest(confkey) y(confkey)
 WHERE
   pgc.conrelid = tab_id
@@ -3666,7 +3674,7 @@ WHERE
   AND cardinality(pgc.confkey) = 1
   AND has_column_privilege(tab_id, x.conkey, 'SELECT')
   AND has_column_privilege(pgc.confrelid, y.confkey, 'SELECT')
-GROUP BY pgc.confrelid, x.conkey
+ORDER BY conkey, target_oid, confkey;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 

From 56f93b394c2c6aa01e7e63435f57e350531d6c51 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 19 Aug 2024 22:56:06 +0800
Subject: [PATCH 0675/1141] add SQL function docstrings

---
 db/sql/00_msar.sql | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 7d11c1b9ea..1bfeaa6843 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3679,6 +3679,12 @@ $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION msar.build_summary_cte_expr_for_table(tab_id oid) RETURNS TEXT AS $$/*
+Build an SQL text expression defining a sequence of CTEs that give summaries for linked records.
+
+This summary amounts to just the first string-like column value for that linked record.
+
+Args:
+  tab_oid: The table for whose fkey values' linked records we'll get summaries.
 */
 WITH fkey_map_cte AS (SELECT * FROM msar.get_fkey_map_cte(tab_id))
 SELECT ', ' || string_agg(
@@ -3702,6 +3708,11 @@ $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 CREATE OR REPLACE FUNCTION
 msar.build_summary_join_expr_for_table(tab_id oid, cte_name text) RETURNS TEXT AS $$/*
+Build an SQL expression to join the summary CTEs to the main CTE along fkey values.
+
+Args:
+  tab_oid: The table defining the columns of the main CTE.
+  cte_name: The name of the main CTE we'll join the summary CTEs to.
 */
 WITH fkey_map_cte AS (SELECT * FROM msar.get_fkey_map_cte(tab_id))
 SELECT string_agg(
@@ -3718,6 +3729,10 @@ $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 CREATE OR REPLACE FUNCTION
 msar.build_summary_json_expr_for_table(tab_id oid) RETURNS TEXT AS $$/*
+Build a JSON object with the results of summarizing linked records.
+
+Args:
+  tab_oid: The OID of the table for which we're getting linked record summaries.
 */
 WITH fkey_map_cte AS (SELECT * FROM msar.get_fkey_map_cte(tab_id))
 SELECT 'jsonb_build_object(' || string_agg(

From a2651f6e2611f05976a4a637f64b45bc4258a387 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 20 Aug 2024 01:15:37 +0800
Subject: [PATCH 0676/1141] add preview object to docs

---
 docs/docs/api/rpc.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 1dc1378d00..972c12f7fd 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -203,6 +203,7 @@ To use an RPC function:
       - Filter
       - FilterAttnum
       - FilterLiteral
+      - PreviewEntry
       - Grouping
       - Group
       - GroupingResponse

From 05ff464440e0d3312c726b57d1c52aa41640fb71 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 20 Aug 2024 13:20:56 +0800
Subject: [PATCH 0677/1141] update mkdocs dependencies to get pipeline passing

---
 docs/requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 489148efae..700485f293 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -3,5 +3,5 @@ mkdocs-material==8.5.11
 mkdocs-redirects==1.2.0
 mkdocs-macros-plugin==0.7.0
 mkdocs-placeholder-plugin==0.3.1
-mkdocstrings==0.24.2
-mkdocstrings-python==1.9.2
+mkdocstrings==0.25.2
+mkdocstrings-python==1.10.8

From 2411e59a4ff1e9d308888422f179ce83955e7c6a Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 20 Aug 2024 14:47:13 +0800
Subject: [PATCH 0678/1141] update foreign key column creation function name

---
 db/links/operations/create.py            |  6 +++---
 db/sql/00_msar.sql                       | 14 +++++++-------
 db/sql/test_00_msar.sql                  |  6 +++---
 db/tests/links/operations/test_create.py |  6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/db/links/operations/create.py b/db/links/operations/create.py
index d179745be6..2bdb2c33c7 100644
--- a/db/links/operations/create.py
+++ b/db/links/operations/create.py
@@ -25,10 +25,10 @@ def create_foreign_key_link(
     """
     return execute_msar_func_with_engine(
         engine,
-        'create_many_to_one_link',
-        referent_table_oid,
-        referrer_table_oid,
+        'add_foreign_key_column',
         referrer_column_name,
+        referrer_table_oid,
+        referent_table_oid,
         unique_link
     ).fetchone()[0]
 
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index b0c400ee99..8d10688cf8 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3112,19 +3112,19 @@ $$ LANGUAGE SQL;
 
 
 CREATE OR REPLACE FUNCTION
-msar.create_many_to_one_link(
-  frel_id oid,
-  rel_id oid,
+msar.add_foreign_key_column(
   col_name text,
+  rel_id oid,
+  frel_id oid,
   unique_link boolean DEFAULT false
 ) RETURNS smallint AS $$/* 
 Create a many-to-one or a one-to-one link between tables, returning the attnum of the newly created
 column, returning the attnum of the added column.
 
 Args:
-  frel_id: The OID of the referent table, named for confrelid in the pg_attribute table.
-  rel_id: The OID of the referrer table, named for conrelid in the pg_attribute table.
   col_name: Name of the new column to be created in the referrer table, unquoted.
+  rel_id: The OID of the referrer table, named for conrelid in the pg_attribute table.
+  frel_id: The OID of the referent table, named for confrelid in the pg_attribute table.
   unique_link: Whether to make the link one-to-one instead of many-to-one.
 */
 DECLARE
@@ -3186,7 +3186,7 @@ DECLARE
   added_table_id oid;
 BEGIN
   added_table_id := msar.add_mathesar_table(sch_id, tab_name , NULL, NULL, NULL);
-  PERFORM msar.create_many_to_one_link(a.rel_id, added_table_id, b.col_name)
+  PERFORM msar.add_foreign_key_column(b.col_name, added_table_id, a.rel_id)
   FROM unnest(from_rel_ids) WITH ORDINALITY AS a(rel_id, idx)
   JOIN unnest(col_names) WITH ORDINALITY AS b(col_name, idx) USING (idx);
   RETURN added_table_id;
@@ -3236,7 +3236,7 @@ BEGIN
     format('Extracted from %s', __msar.get_qualified_relation_name(tab_id))
   );
   -- Create a new fkey column and foreign key linking the original table to the extracted one.
-  fkey_attnum := msar.create_many_to_one_link(extracted_table_id, tab_id, fkey_name);
+  fkey_attnum := msar.add_foreign_key_column(fkey_name, tab_id, extracted_table_id);
   -- Insert the data from the original table's columns into the extracted columns, and add
   -- appropriate fkey values to the new fkey column in the original table to give the proper
   -- mapping.
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 9c0030deaa..4d011b532e 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -1129,10 +1129,10 @@ END;
 $$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION test_create_many_to_one_link() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION test_add_foreign_key_column() RETURNS SETOF TEXT AS $$
 BEGIN
   PERFORM __setup_link_tables();
-  PERFORM msar.create_many_to_one_link(
+  PERFORM msar.add_foreign_key_column(
     frel_id => 'actors'::regclass::oid,
     rel_id => 'movies'::regclass::oid,
     col_name => 'act_id'
@@ -1147,7 +1147,7 @@ $$ LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION test_create_one_to_one_link() RETURNS SETOF TEXT AS $$
 BEGIN
   PERFORM __setup_link_tables();
-  PERFORM msar.create_many_to_one_link(
+  PERFORM msar.add_foreign_key_column(
     frel_id => 'actors'::regclass::oid,
     rel_id => 'movies'::regclass::oid,
     col_name => 'act_id',
diff --git a/db/tests/links/operations/test_create.py b/db/tests/links/operations/test_create.py
index 27b974d1e3..7799351ebc 100644
--- a/db/tests/links/operations/test_create.py
+++ b/db/tests/links/operations/test_create.py
@@ -18,10 +18,10 @@ def test_create_foreign_key_link(engine_with_schema, unique_link):
         )
     call_args = mock_exec.call_args_list[0][0]
     assert call_args[0] == engine
-    assert call_args[1] == "create_many_to_one_link"
-    assert call_args[2] == 12345
+    assert call_args[1] == "add_foreign_key_column"
+    assert call_args[2] == "actor_id"
     assert call_args[3] == 54321
-    assert call_args[4] == "actor_id"
+    assert call_args[4] == 12345
     assert call_args[5] == unique_link or False
 
 

From c8ee530af464708eb4ea3b2deb1f0e349c49f402 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 20 Aug 2024 14:53:07 +0800
Subject: [PATCH 0679/1141] add python wrapper for fkey creator function

---
 db/links/operations/create.py | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/db/links/operations/create.py b/db/links/operations/create.py
index 2bdb2c33c7..001f8b68cc 100644
--- a/db/links/operations/create.py
+++ b/db/links/operations/create.py
@@ -1,4 +1,4 @@
-from db.connection import execute_msar_func_with_engine
+from db.connection import execute_msar_func_with_engine, exec_msar_func
 
 
 def create_foreign_key_link(
@@ -33,6 +33,38 @@ def create_foreign_key_link(
     ).fetchone()[0]
 
 
+def add_foreign_key_column(
+        conn,
+        column_name,
+        referrer_table_oid,
+        referent_table_oid,
+        unique_link=False
+):
+    """
+    Creates a Many-to-One or One-to-One link.
+
+    Args:
+        conn: psycopg3 conneciton object.
+        column_name: Name of the new column to be created in the referrer
+                     table.
+        referrer_table_oid: The OID of the referrer table.
+        referent_table_oid: The OID of the referent table.
+        unique_link: Whether to make the link one-to-one
+                     instead of many-to-one.
+
+    Returns:
+        Returns the attnum of the newly created column.
+    """
+    return execute_msar_func(
+        conn,
+        'add_foreign_key_column',
+        column_name,
+        referrer_table_oid,
+        referent_table_oid,
+        unique_link
+    ).fetchone()[0]
+
+
 def create_many_to_many_link(engine, schema_oid, map_table_name, referents_dict):
     """
     Creates a Many-to-Many link.

From 3ea882f9377dcc9f1ac8828e1e590217473746f0 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 20 Aug 2024 15:06:55 +0800
Subject: [PATCH 0680/1141] wire up fkey creation function to RPC endpoint

---
 config/settings/common_settings.py   |  1 +
 db/links/operations/create.py        |  4 ++--
 mathesar/rpc/data_modeling.py        | 27 +++++++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py |  6 ++++++
 4 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 mathesar/rpc/data_modeling.py

diff --git a/config/settings/common_settings.py b/config/settings/common_settings.py
index c36fd7e41a..a736588e1d 100644
--- a/config/settings/common_settings.py
+++ b/config/settings/common_settings.py
@@ -71,6 +71,7 @@ def pipe_delim(pipe_string):
     'mathesar.rpc.constraints',
     'mathesar.rpc.columns',
     'mathesar.rpc.columns.metadata',
+    'mathesar.rpc.data_modeling',
     'mathesar.rpc.database_privileges',
     'mathesar.rpc.database_setup',
     'mathesar.rpc.databases',
diff --git a/db/links/operations/create.py b/db/links/operations/create.py
index 001f8b68cc..12f7eb5294 100644
--- a/db/links/operations/create.py
+++ b/db/links/operations/create.py
@@ -55,14 +55,14 @@ def add_foreign_key_column(
     Returns:
         Returns the attnum of the newly created column.
     """
-    return execute_msar_func(
+    exec_msar_func(
         conn,
         'add_foreign_key_column',
         column_name,
         referrer_table_oid,
         referent_table_oid,
         unique_link
-    ).fetchone()[0]
+    )
 
 
 def create_many_to_many_link(engine, schema_oid, map_table_name, referents_dict):
diff --git a/mathesar/rpc/data_modeling.py b/mathesar/rpc/data_modeling.py
new file mode 100644
index 0000000000..1404313334
--- /dev/null
+++ b/mathesar/rpc/data_modeling.py
@@ -0,0 +1,27 @@
+"""
+Classes and functions exposed to the RPC endpoint for managing data models.
+"""
+from modernrpc.core import rpc_method, REQUEST_KEY
+from modernrpc.auth.basic import http_basic_auth_login_required
+
+from db.links.operations import create as links_create
+from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+from mathesar.rpc.utils import connect
+
+
+@rpc_method(name="data_modeling.add_foreign_key_column")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def add_foreign_key_column(
+        *,
+        column_name: str,
+        referrer_table_oid: int,
+        referent_table_oid: int,
+        database_id: int,
+        **kwargs
+) -> None:
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        links_create.add_foreign_key_column(
+            conn, column_name, referrer_table_oid, referent_table_oid
+        )
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 067bff05d1..04260352d7 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -13,6 +13,7 @@
 from mathesar.rpc import configured_roles
 from mathesar.rpc import connections
 from mathesar.rpc import constraints
+from mathesar.rpc import data_modeling
 from mathesar.rpc import database_privileges
 from mathesar.rpc import database_setup
 from mathesar.rpc import databases
@@ -130,6 +131,11 @@
         "constraints.delete",
         [user_is_authenticated]
     ),
+    (
+        data_modeling.add_foreign_key_column,
+        "data_modeling.add_foreign_key_column",
+        [user_is_authenticated]
+    ),
     (
         database_privileges.list_direct,
         "database_privileges.list_direct",

From a9ef1352c5809d0e8d2a8d008827d7414d7e8e2f Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 20 Aug 2024 15:14:36 +0800
Subject: [PATCH 0681/1141] add docstring to new fkey adder RPC function

---
 mathesar/rpc/data_modeling.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mathesar/rpc/data_modeling.py b/mathesar/rpc/data_modeling.py
index 1404313334..24480935dc 100644
--- a/mathesar/rpc/data_modeling.py
+++ b/mathesar/rpc/data_modeling.py
@@ -20,6 +20,17 @@ def add_foreign_key_column(
         database_id: int,
         **kwargs
 ) -> None:
+    """
+    Add a foreign key column to a table.
+
+    The foreign key column will be newly created, and will reference the
+    `id` column of the referent table.
+
+    Args:
+        column_name: The name of the column to create.
+        referrer_table_oid: The OID of the table getting the new column.
+        referent_table_oid: The OID of the table being referenced.
+    """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
         links_create.add_foreign_key_column(

From a79abc0d382ef09a3acfb0de7f0ee702d602dea3 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 20 Aug 2024 15:28:30 +0800
Subject: [PATCH 0682/1141] add wiring test for fkey adding function

---
 docs/docs/api/rpc.md                     |  7 +++
 mathesar/tests/rpc/test_data_modeling.py | 56 ++++++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 mathesar/tests/rpc/test_data_modeling.py

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 1dc1378d00..7bfbfd4f70 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -241,6 +241,13 @@ To use an RPC function:
       - list_
       - ServerInfo
 
+## Data Modeling
+
+:::data_modeling
+    options:
+      members:
+      - add_foreign_key_column
+
 ## Responses
 
 ### Success
diff --git a/mathesar/tests/rpc/test_data_modeling.py b/mathesar/tests/rpc/test_data_modeling.py
new file mode 100644
index 0000000000..33568696f8
--- /dev/null
+++ b/mathesar/tests/rpc/test_data_modeling.py
@@ -0,0 +1,56 @@
+"""
+This file tests the data modeling RPC functions.
+
+Fixtures:
+    rf(pytest-django): Provides mocked `Request` objects.
+    monkeypatch(pytest): Lets you monkeypatch an object for testing.
+"""
+from contextlib import contextmanager
+
+from mathesar.rpc import data_modeling
+from mathesar.models.users import User
+
+
+def test_data_modeling_add_foreign_key_column(rf, monkeypatch):
+    _username = 'alice'
+    _password = 'pass1234'
+    _column_name = 'new_fkey_col'
+    _referrer_table_oid = 23457
+    _referent_table_oid = 67890
+    _database_id = 2
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=_username, password=_password)
+
+    @contextmanager
+    def mock_connect(database_id, user):
+        if database_id == _database_id and user.username == _username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_add_fkey_col(
+            conn,
+            column_name,
+            referrer_table_oid,
+            referent_table_oid,
+            unique_link=False
+    ):
+        if (
+                column_name != _column_name
+                or referent_table_oid != _referent_table_oid
+                or referrer_table_oid != _referrer_table_oid
+        ):
+            raise AssertionError('incorrect parameters passed')
+
+    monkeypatch.setattr(data_modeling, 'connect', mock_connect)
+    monkeypatch.setattr(data_modeling.links_create, 'add_foreign_key_column', mock_add_fkey_col)
+    data_modeling.add_foreign_key_column(
+        column_name=_column_name,
+        referrer_table_oid=_referrer_table_oid,
+        referent_table_oid=_referent_table_oid,
+        database_id=_database_id,
+        request=request,
+    )

From c7273e070afe9ae0acd296ae5ac5d1dc43a26f8c Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 20 Aug 2024 16:49:56 +0800
Subject: [PATCH 0683/1141] rename function for adding mapping table

---
 db/links/operations/create.py            | 15 ++++++++++++---
 db/sql/00_msar.sql                       | 16 +++++++---------
 db/sql/test_00_msar.sql                  | 10 ++++++----
 db/tests/links/operations/test_create.py |  8 +++++---
 4 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/db/links/operations/create.py b/db/links/operations/create.py
index 12f7eb5294..ec0cb4f687 100644
--- a/db/links/operations/create.py
+++ b/db/links/operations/create.py
@@ -1,3 +1,5 @@
+import json
+
 from db.connection import execute_msar_func_with_engine, exec_msar_func
 
 
@@ -83,9 +85,16 @@ def create_many_to_many_link(engine, schema_oid, map_table_name, referents_dict)
     """
     return execute_msar_func_with_engine(
         engine,
-        'create_many_to_many_link',
+        'add_mapping_table',
         schema_oid,
         map_table_name,
-        referents_dict['referent_table_oids'],
-        referents_dict['column_names']
+        json.dumps(
+            [
+                {"column_name": c, "referent_table_oid": i}
+                for c, i in zip(
+                        referents_dict['column_names'],
+                        referents_dict['referent_table_oids'],
+                )
+             ]
+        )
     ).fetchone()[0]
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 8d10688cf8..b642564351 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3168,27 +3168,25 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-msar.create_many_to_many_link(
+msar.add_mapping_table(
   sch_id oid,
   tab_name text,
-  from_rel_ids oid[],
-  col_names text[]
-) RETURNS oid AS $$/* 
+  mapping_columns jsonb
+) RETURNS oid AS $$/*
 Create a many-to-many link between tables, returning the oid of the newly created table.
 
 Args:
   sch_id: The OID of the schema in which new referrer table is to be created.
   tab_name: Name of the referrer table to be created.
-  from_rel_ids: The OIDs of the referent tables.
+  referent_tab_ids: The OIDs of the referent tables.
   col_names: Names of the new column to be created in the referrer table, unqoted.
 */
 DECLARE
   added_table_id oid;
 BEGIN
-  added_table_id := msar.add_mathesar_table(sch_id, tab_name , NULL, NULL, NULL);
-  PERFORM msar.add_foreign_key_column(b.col_name, added_table_id, a.rel_id)
-  FROM unnest(from_rel_ids) WITH ORDINALITY AS a(rel_id, idx)
-  JOIN unnest(col_names) WITH ORDINALITY AS b(col_name, idx) USING (idx);
+  added_table_id := msar.add_mathesar_table(sch_id, tab_name, NULL, NULL, NULL);
+  PERFORM msar.add_foreign_key_column(column_name, added_table_id, referent_table_oid)
+  FROM jsonb_to_recordset(mapping_columns) AS x(column_name text, referent_table_oid oid);
   RETURN added_table_id;
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 4d011b532e..f8b450c850 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -1161,14 +1161,16 @@ END;
 $$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION test_create_many_to_many_link() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION test_add_mapping_table() RETURNS SETOF TEXT AS $$
 BEGIN
   PERFORM __setup_link_tables();
-  PERFORM msar.create_many_to_many_link(
+  PERFORM msar.add_mapping_table(
     sch_id => 'public'::regnamespace::oid,
     tab_name => 'movies_actors',
-    from_rel_ids => '{}'::oid[] || 'movies'::regclass::oid || 'actors'::regclass::oid,
-    col_names => '{"movie_id", "actor_id"}'::text[]
+    mapping_columns => jsonb_build_array(
+      jsonb_build_object('column_name', 'movie_id', 'referent_table_oid', 'movies'::regclass::oid),
+      jsonb_build_object('column_name', 'actor_id', 'referent_table_oid', 'actors'::regclass::oid)
+    )
   );
   RETURN NEXT has_table('public'::name, 'movies_actors'::name);
   RETURN NEXT has_column('movies_actors', 'movie_id');
diff --git a/db/tests/links/operations/test_create.py b/db/tests/links/operations/test_create.py
index 7799351ebc..48c3e2fc16 100644
--- a/db/tests/links/operations/test_create.py
+++ b/db/tests/links/operations/test_create.py
@@ -37,8 +37,10 @@ def test_many_to_many_link(engine_with_schema):
         )
     call_args = mock_exec.call_args_list[0][0]
     assert call_args[0] == engine
-    assert call_args[1] == "create_many_to_many_link"
+    assert call_args[1] == "add_mapping_table"
     assert call_args[2] == 2200
     assert call_args[3] == "movies_actors"
-    assert call_args[4] == referents['referent_table_oids']
-    assert call_args[5] == referents['column_names']
+    assert call_args[4] == [
+        {"column_name": "movie_id", "referent_table_oid": 12345},
+        {"column_name": "actor_id", "referent_table_oid": 54321}
+    ]

From 5b227869c3c4f68423773480a76d472a24a094cf Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 20 Aug 2024 17:41:27 +0800
Subject: [PATCH 0684/1141] add python wrapper for mapping table adder

---
 db/links/operations/create.py            | 33 +++++++++++++++++++++---
 db/tests/links/operations/test_create.py |  3 ++-
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/db/links/operations/create.py b/db/links/operations/create.py
index ec0cb4f687..6b667f285d 100644
--- a/db/links/operations/create.py
+++ b/db/links/operations/create.py
@@ -46,16 +46,13 @@ def add_foreign_key_column(
     Creates a Many-to-One or One-to-One link.
 
     Args:
-        conn: psycopg3 conneciton object.
+        conn: psycopg3 connection object.
         column_name: Name of the new column to be created in the referrer
                      table.
         referrer_table_oid: The OID of the referrer table.
         referent_table_oid: The OID of the referent table.
         unique_link: Whether to make the link one-to-one
                      instead of many-to-one.
-
-    Returns:
-        Returns the attnum of the newly created column.
     """
     exec_msar_func(
         conn,
@@ -98,3 +95,31 @@ def create_many_to_many_link(engine, schema_oid, map_table_name, referents_dict)
              ]
         )
     ).fetchone()[0]
+
+
+def add_mapping_table(
+        conn,
+        schema_oid,
+        table_name,
+        mapping_columns,
+):
+    """
+    Add a mapping table to give a many-to-many link between referents.
+
+    Args:
+        conn: psycopg3 connection object.
+        schema_oid: The OID of the schema for the mapping table.
+        table_name: The name for the new mapping table.
+        mapping_columns: A list of dictionaries giving the foreign key
+                        columns to create in the mapping table.
+
+    The elements of the mapping_columns list must have the form
+        {"column_name": <str>, "referent_table_oid": <int>}
+    """
+    exec_msar_func(
+        conn,
+        'add_mapping_table',
+        schema_oid,
+        map_table_name,
+        json.dumps(mapping_columns)
+    )
diff --git a/db/tests/links/operations/test_create.py b/db/tests/links/operations/test_create.py
index 48c3e2fc16..6172e78371 100644
--- a/db/tests/links/operations/test_create.py
+++ b/db/tests/links/operations/test_create.py
@@ -1,3 +1,4 @@
+import json
 import pytest
 from unittest.mock import patch
 import db.links.operations.create as link_create
@@ -40,7 +41,7 @@ def test_many_to_many_link(engine_with_schema):
     assert call_args[1] == "add_mapping_table"
     assert call_args[2] == 2200
     assert call_args[3] == "movies_actors"
-    assert call_args[4] == [
+    assert json.loads(call_args[4]) == [
         {"column_name": "movie_id", "referent_table_oid": 12345},
         {"column_name": "actor_id", "referent_table_oid": 54321}
     ]

From 4749fa1777b0d76ecbbfcb8c524de6686d89df30 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 20 Aug 2024 17:42:26 +0800
Subject: [PATCH 0685/1141] wire mapping table adder up to RPC endpoint

---
 mathesar/rpc/data_modeling.py        | 44 ++++++++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py |  5 ++++
 2 files changed, 49 insertions(+)

diff --git a/mathesar/rpc/data_modeling.py b/mathesar/rpc/data_modeling.py
index 24480935dc..947d215bd5 100644
--- a/mathesar/rpc/data_modeling.py
+++ b/mathesar/rpc/data_modeling.py
@@ -1,6 +1,8 @@
 """
 Classes and functions exposed to the RPC endpoint for managing data models.
 """
+from typing import TypedDict
+
 from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
 
@@ -36,3 +38,45 @@ def add_foreign_key_column(
         links_create.add_foreign_key_column(
             conn, column_name, referrer_table_oid, referent_table_oid
         )
+
+
+class MappingColumn(TypedDict):
+    """
+    An object defining a foreign key column in a mapping table.
+
+    Attributes:
+        column_name: The name of the foreign key column.
+        referent_table_oid: The OID of the table the column references.
+    """
+    column_name: str
+    referent_table_oid: int
+
+
+@rpc_method(name="data_modeling.add_mapping_table")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def add_mapping_table(
+        *,
+        table_name: str,
+        mapping_columns: list[MappingColumn],
+        schema_oid: int,
+        database_id: int,
+        **kwargs
+) -> None:
+    """
+    Add a mapping table to give a many-to-many link between referents.
+
+    The foreign key columns in the mapping table will reference the `id`
+    column of the referent tables.
+
+    Args:
+        table_name: The name for the new mapping table.
+        schema_oid: The OID of the schema for the mapping table.
+        mapping_columns: The foreign key columns to create in the
+            mapping table.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        links_create.add_mapping_table(
+            conn, schema_oid, table_name, mapping_columns
+        )
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 04260352d7..71fb0726d6 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -136,6 +136,11 @@
         "data_modeling.add_foreign_key_column",
         [user_is_authenticated]
     ),
+    (
+        data_modeling.add_mapping_table,
+        "data_modeling.add_mapping_table",
+        [user_is_authenticated]
+    ),
     (
         database_privileges.list_direct,
         "database_privileges.list_direct",

From ac3e716d3c83a0749b67e7bd145f6338ba8a6e74 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 20 Aug 2024 17:42:56 +0800
Subject: [PATCH 0686/1141] improve documentation of mapping table adder

---
 db/sql/00_msar.sql   | 7 +++++--
 docs/docs/api/rpc.md | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index b642564351..ed06fdf657 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3178,8 +3178,11 @@ Create a many-to-many link between tables, returning the oid of the newly create
 Args:
   sch_id: The OID of the schema in which new referrer table is to be created.
   tab_name: Name of the referrer table to be created.
-  referent_tab_ids: The OIDs of the referent tables.
-  col_names: Names of the new column to be created in the referrer table, unqoted.
+  mapping_columns: An array of objects giving the foreign key columns for the new table.
+
+The elements of the mapping_columns array must have the form
+  {"column_name": <str>, "referent_table_oid": <int>}
+
 */
 DECLARE
   added_table_id oid;
diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 7bfbfd4f70..1626c406be 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -247,6 +247,8 @@ To use an RPC function:
     options:
       members:
       - add_foreign_key_column
+      - add_mapping_table
+      - MappingColumn
 
 ## Responses
 

From 4a2d6c79c54ac71c02d4e884cd74974afdb488e3 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 20 Aug 2024 17:58:58 +0800
Subject: [PATCH 0687/1141] add test for mapping table adder wiring

---
 mathesar/tests/rpc/test_data_modeling.py | 47 ++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/mathesar/tests/rpc/test_data_modeling.py b/mathesar/tests/rpc/test_data_modeling.py
index 33568696f8..483092939b 100644
--- a/mathesar/tests/rpc/test_data_modeling.py
+++ b/mathesar/tests/rpc/test_data_modeling.py
@@ -54,3 +54,50 @@ def mock_add_fkey_col(
         database_id=_database_id,
         request=request,
     )
+
+
+def test_data_modeling_add_mapping_table(rf, monkeypatch):
+    _username = 'alice'
+    _password = 'pass1234'
+    _schema_oid = 1234
+    _table_name = 't1_t2'
+    _mapping_columns = [
+        {"column_name": "t1_id", "referent_table_oid": 11111},
+        {"column_name": "t2_id", "referent_table_oid": 22222},
+    ]
+    _database_id = 2
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=_username, password=_password)
+
+    @contextmanager
+    def mock_connect(database_id, user):
+        if database_id == _database_id and user.username == _username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_add_mapping_table(
+            conn,
+            schema_oid,
+            table_name,
+            mapping_columns,
+    ):
+        if (
+                schema_oid != _schema_oid
+                or table_name != _table_name
+                or mapping_columns != _mapping_columns
+        ):
+            raise AssertionError('incorrect parameters passed')
+
+    monkeypatch.setattr(data_modeling, 'connect', mock_connect)
+    monkeypatch.setattr(data_modeling.links_create, 'add_mapping_table', mock_add_mapping_table)
+    data_modeling.add_mapping_table(
+        table_name=_table_name,
+        mapping_columns=_mapping_columns,
+        schema_oid=_schema_oid,
+        database_id=_database_id,
+        request=request,
+    )

From a02d5a102956e87634660922ea4e29d3c2a5540a Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 20 Aug 2024 18:05:11 +0800
Subject: [PATCH 0688/1141] fix bug in mapping table python wrapper

---
 db/links/operations/create.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/db/links/operations/create.py b/db/links/operations/create.py
index 6b667f285d..1ffc89a738 100644
--- a/db/links/operations/create.py
+++ b/db/links/operations/create.py
@@ -89,10 +89,10 @@ def create_many_to_many_link(engine, schema_oid, map_table_name, referents_dict)
             [
                 {"column_name": c, "referent_table_oid": i}
                 for c, i in zip(
-                        referents_dict['column_names'],
-                        referents_dict['referent_table_oids'],
+                    referents_dict['column_names'],
+                    referents_dict['referent_table_oids'],
                 )
-             ]
+            ]
         )
     ).fetchone()[0]
 
@@ -120,6 +120,6 @@ def add_mapping_table(
         conn,
         'add_mapping_table',
         schema_oid,
-        map_table_name,
+        table_name,
         json.dumps(mapping_columns)
     )

From 21fb4153481ed0d1f69e6231dd0e063883ddf827 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 21 Aug 2024 03:01:57 +0530
Subject: [PATCH 0689/1141] implement sql functions for adding roles

---
 db/sql/00_msar.sql | 89 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 84 insertions(+), 5 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index b0c400ee99..10279b1e5c 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -948,6 +948,54 @@ FROM (
 $$ LANGUAGE SQL STABLE;
 
 
+CREATE OR REPLACE FUNCTION msar.get_role(rolename text) RETURNS jsonb AS $$/*
+Given a rolename, return a JSON object describing the role in a database server.
+
+The returned JSON object has the form:
+  {
+    "oid": <int>
+    "name": <str>
+    "super": <bool>
+    "inherits": <bool>
+    "create_role": <bool>
+    "create_db": <bool>
+    "login": <bool>
+    "description": <str|null>
+    "members": <[
+        { "oid": <int>, "admin": <bool> }
+      ]|null>
+  }
+*/
+WITH rolemembers as (
+  SELECT
+    pgr.oid AS oid,
+    jsonb_agg(
+      jsonb_build_object(
+        'oid', pgm.member::bigint,
+        'admin', pgm.admin_option
+      )
+    ) AS members
+  FROM pg_catalog.pg_roles pgr
+    INNER JOIN pg_catalog.pg_auth_members pgm ON pgr.oid=pgm.roleid
+  GROUP BY pgr.oid
+)
+SELECT jsonb_build_object(
+  'oid', r.oid::bigint,
+  'name', r.rolname,
+  'super', r.rolsuper,
+  'inherits', r.rolinherit,
+  'create_role', r.rolcreaterole,
+  'create_db', r.rolcreatedb,
+  'login', r.rolcanlogin,
+  'description', pg_catalog.shobj_description(r.oid, 'pg_authid'),
+  'members', rolemembers.members
+)
+FROM pg_catalog.pg_roles r
+  LEFT OUTER JOIN rolemembers ON r.oid = rolemembers.oid
+WHERE r.rolname = rolename;
+$$ LANGUAGE SQL STABLE;
+
+
 CREATE OR REPLACE FUNCTION msar.list_db_priv(db_name text) RETURNS jsonb AS $$/*
 Given a database name, returns a json array of objects with database privileges for non-inherited roles.
 
@@ -1014,9 +1062,6 @@ $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 CREATE OR REPLACE FUNCTION
 msar.create_basic_mathesar_user(username text, password_ text) RETURNS TEXT AS $$/*
 */
-DECLARE
-  sch_name text;
-  mathesar_schemas text[] := ARRAY['mathesar_types', '__msar', 'msar'];
 BEGIN
   PERFORM __msar.exec_ddl('CREATE USER %I WITH PASSWORD %L', username, password_);
   PERFORM __msar.exec_ddl(
@@ -1024,19 +1069,53 @@ BEGIN
     current_database()::text,
     username
   );
+  PERFORM msar.grant_usage_on_mathesar_schemas(username);
+  RETURN username;
+END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.grant_usage_on_mathesar_schemas(rolename text) RETURNS void AS $$
+DECLARE
+  sch_name text;
+  mathesar_schemas text[] := ARRAY['mathesar_types', '__msar', 'msar'];
+BEGIN
   FOREACH sch_name IN ARRAY mathesar_schemas LOOP
     BEGIN
-      PERFORM __msar.exec_ddl('GRANT USAGE ON SCHEMA %I TO %I', sch_name, username);
+      PERFORM __msar.exec_ddl('GRANT USAGE ON SCHEMA %I TO %I', sch_name, rolename);
     EXCEPTION
       WHEN invalid_schema_name THEN
         RAISE NOTICE 'Schema % does not exist', sch_name;
     END;
   END LOOP;
-  RETURN username;
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION
+msar.create_role(rolename text, password_ text, login_ boolean) RETURNS jsonb AS $$/*
+*/
+DECLARE
+  sch_name text;
+  mathesar_schemas text[] := ARRAY['mathesar_types', '__msar', 'msar'];
+BEGIN
+  CASE WHEN login_ THEN
+    PERFORM create_basic_mathesar_user(rolename, password_);
+  ELSE
+    PERFORM __msar.exec_ddl('CREATE ROLE %I', rolename);
+    PERFORM __msar.exec_ddl(
+      'GRANT CREATE, TEMP ON DATABASE %I TO %I',
+      current_database()::text,
+      rolename
+    );
+    PERFORM msar.grant_usage_on_mathesar_schemas(rolename);
+  END CASE;
+  RETURN msar.get_role(rolename);
+END;
+$$ LANGUAGE plpgsql;
+
+
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 -- ALTER SCHEMA FUNCTIONS

From c7a9c0597e5e18ae506f19147fb112df97ff7375 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 21 Aug 2024 03:02:23 +0530
Subject: [PATCH 0690/1141] wire up sql functions to python

---
 db/roles/operations/create.py |  5 +++++
 mathesar/rpc/roles.py         | 16 +++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 db/roles/operations/create.py

diff --git a/db/roles/operations/create.py b/db/roles/operations/create.py
new file mode 100644
index 0000000000..afb1460186
--- /dev/null
+++ b/db/roles/operations/create.py
@@ -0,0 +1,5 @@
+from db.connection import exec_msar_func
+
+
+def create_role(rolename, password, login, conn):
+    return exec_msar_func(conn, 'create_role', rolename, password, login).fetchone()[0]
diff --git a/mathesar/rpc/roles.py b/mathesar/rpc/roles.py
index 0db0c10c3c..a7aad1890c 100644
--- a/mathesar/rpc/roles.py
+++ b/mathesar/rpc/roles.py
@@ -9,6 +9,7 @@
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
 from db.roles.operations.select import get_roles
+from db.roles.operations.create import create_role
 
 
 class RoleMember(TypedDict):
@@ -53,6 +54,10 @@ class RoleInfo(TypedDict):
     description: Optional[str]
     members: Optional[list[RoleMember]]
 
+    @classmethod
+    def from_dict(cls, d):
+        return cls
+
 
 @rpc_method(name="roles.list")
 @http_basic_auth_login_required
@@ -71,5 +76,14 @@ def list_(*, database_id: int, **kwargs) -> list[RoleInfo]:
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
         roles = get_roles(conn)
+    return [RoleInfo.from_dict(role) for role in roles]
+
 
-    return roles
+@rpc_method(name="roles.add")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def add(*, rolename: str, database_id: int, password: str, login: bool, **kwargs) -> RoleInfo:
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        role = create_role(rolename, password, login, conn)
+    return RoleInfo.from_dict(role)

From ac8853ead9df2857dc59137f1b897a0de706865b Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 21 Aug 2024 16:20:57 +0800
Subject: [PATCH 0691/1141] add table column type inference SQL function

---
 db/sql/00_msar.sql      | 97 +++++++++++++++++++++++++++++++++++++++++
 db/sql/test_00_msar.sql | 44 +++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index ed06fdf657..259aaf3a82 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2747,6 +2747,103 @@ END;
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION
+msar.build_cast_expr(tab_id regclass, col_id smallint, typ_id regtype) RETURNS text AS $$/*
+Build an expression for casting a column in Mathesar, returning the text of that expression.
+
+We fall back silently to default casting behavior if the mathesar_types namespace is missing.
+However, we do throw an error in cases where the schema exists, but the type casting function
+doesn't. This is assumed to be an error the user should know about.
+
+Args:
+  tab_id: The OID of the table whose column we're casting.
+  col_id: The attnum of the column in the table.
+  typ_id: The OID of the type we will cast to.
+*/
+SELECT CASE
+  WHEN msar.schema_exists('mathesar_types') THEN
+    msar.get_cast_function_name(typ_id)
+    || '('
+    || format('%I', msar.get_column_name(tab_id, col_id))
+    || ')'
+  ELSE
+    format('%I', msar.get_column_name(tab_id, col_id)) || '::' || typ_id::text
+END;
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.infer_column_data_type(tab_id regclass, col_id smallint) RETURNS regtype AS $$
+DECLARE
+  inferred_type regtype;
+  infer_sequence_raw text[] := ARRAY[
+    'boolean',
+    'date',
+    'numeric',
+    'mathesar_types.mathesar_money',
+    'timestamp without time zone',
+    'timestamp with time zone',
+    'time without time zone',
+    'interval',
+    'mathesar_types.email',
+    'mathesar_types.mathesar_json_array',
+    'mathesar_types.mathesar_json_object',
+    'mathesar_types.uri'
+  ];
+  infer_sequence regtype[];
+  column_nonempty boolean;
+  test_type regtype;
+BEGIN
+  infer_sequence := array_agg(pg_catalog.to_regtype(t))
+    FILTER (WHERE pg_catalog.to_regtype(t) IS NOT NULL)
+    FROM unnest(infer_sequence_raw) AS x(t);
+  EXECUTE format(
+    'SELECT EXISTS (SELECT 1 FROM %1$I.%2$I WHERE %3$I IS NOT NULL)',
+    msar.get_relation_schema_name(tab_id),
+    msar.get_relation_name(tab_id),
+    msar.get_column_name(tab_id, col_id)
+  ) INTO column_nonempty;
+  inferred_type := atttypid FROM pg_catalog.pg_attribute WHERE attrelid=tab_id AND attnum=col_id;
+  IF inferred_type = 'text'::regtype AND column_nonempty THEN
+    FOREACH test_type IN ARRAY infer_sequence
+      LOOP
+        BEGIN
+          EXECUTE format(
+            'EXPLAIN ANALYZE SELECT %1$s FROM %2$I.%3$I',
+            msar.build_cast_expr(tab_id, col_id, test_type),
+            msar.get_relation_schema_name(tab_id),
+            msar.get_relation_name(tab_id)
+          );
+          inferred_type := test_type;
+          EXIT;
+        EXCEPTION WHEN OTHERS THEN
+          RAISE NOTICE 'Test failed: %', format(
+            'EXPLAIN ANALYZE SELECT %1$s FROM %2$I.%3$I',
+            msar.build_cast_expr(tab_id, col_id, test_type),
+            msar.get_relation_schema_name(tab_id),
+            msar.get_relation_name(tab_id)
+          );
+          -- do nothing, just try the next type.
+        END;
+      END LOOP;
+    END IF;
+  RETURN inferred_type;
+END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.infer_table_column_data_types(tab_id regclass) RETURNS jsonb AS $$
+SELECT jsonb_object_agg(attnum, msar.infer_column_data_type(attrelid, attnum))
+FROM pg_catalog.pg_attribute
+WHERE
+  attrelid = tab_id
+  AND attnum > 0
+  AND NOT attisdropped
+  AND has_column_privilege(attrelid, attnum, 'SELECT');
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+
 CREATE OR REPLACE FUNCTION
 __msar.build_col_drop_default_expr(tab_id oid, col_id integer, new_type text, new_default jsonb)
   RETURNS TEXT AS $$/*
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index f8b450c850..e456ee9b74 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -1423,6 +1423,50 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+-- msar.infer_table_column_data_types --------------------------------------------------------------
+
+CREATE OR REPLACE FUNCTION __setup_type_inference() RETURNS SETOF TEXT AS $$
+BEGIN
+CREATE TABLE "Types Test" (
+-- We can't test custom types in this context.
+  id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
+  "Empty" text,
+  "Boolean" text,
+  "Date" text,
+  "Numeric" text,
+  "Interval" text,
+  "Text" text
+);
+INSERT INTO "Types Test"
+  ("Boolean", "Date", "Numeric", "Interval", "Text")
+VALUES
+  ('0', '2000-01-01', '0', '3 days', 'cat'),
+  ('1', '6/23/2004', '3.14', '3 hours', 'bat'),
+  ('t', 'May-2007-29', '-234.22', '3 minutes', 'rat'),
+  ('false', '20200909', '1', '3 seconds', 'mat');
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_infer_table_column_data_types() RETURNS SETOF TEXT AS $f$
+BEGIN
+  PERFORM __setup_type_inference();
+  RETURN NEXT is(
+    msar.infer_table_column_data_types('"Types Test"'::regclass),
+    jsonb_build_object(
+      1, 'integer',
+      2, 'text',
+      3, 'boolean',
+      4, 'date',
+      5, 'numeric',
+      6, 'interval',
+      7, 'text'
+    )
+  );
+END;
+$f$ LANGUAGE plpgsql;
+
+
 -- msar.add_mathesar_table
 
 CREATE OR REPLACE FUNCTION __setup_create_table() RETURNS SETOF TEXT AS $f$

From d9522d00bec7f415b11144a5ad1ceb8c54b05e17 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 21 Aug 2024 16:34:47 +0800
Subject: [PATCH 0692/1141] document type inference SQL functions

---
 db/sql/00_msar.sql | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 259aaf3a82..8be0b12da9 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2773,7 +2773,16 @@ $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-msar.infer_column_data_type(tab_id regclass, col_id smallint) RETURNS regtype AS $$
+msar.infer_column_data_type(tab_id regclass, col_id smallint) RETURNS regtype AS $$/*
+Infer the best type for a given column.
+
+Note that we currently only try for `text` columns, since we only do this at import. I.e.,
+if the column is some other type we just return that original type.
+
+Args:
+  tab_id: The OID of the table of the column whose type we're inferring.
+  col_id: The attnum of the column whose type we're inferring.
+*/
 DECLARE
   inferred_type regtype;
   infer_sequence_raw text[] := ARRAY[
@@ -2833,8 +2842,20 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-msar.infer_table_column_data_types(tab_id regclass) RETURNS jsonb AS $$
-SELECT jsonb_object_agg(attnum, msar.infer_column_data_type(attrelid, attnum))
+msar.infer_table_column_data_types(tab_id regclass) RETURNS jsonb AS $$/*
+Infer the best type for each column in the table.
+
+Currently we only suggest different types for columns which originate as type `text`.
+
+Args:
+  tab_id: The OID of the table whose columns we're inferring types for.
+
+The response JSON will have attnum keys, and values will be the result of `format_type`
+for the inferred type of each column. Restricted to columns to which the user has access.
+*/
+SELECT jsonb_object_agg(
+  attnum, pg_catalog.format_type(msar.infer_column_data_type(attrelid, attnum), null)
+)
 FROM pg_catalog.pg_attribute
 WHERE
   attrelid = tab_id

From 97757a0ebf8b668b1eacc3294b43e435f7f444a3 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 21 Aug 2024 16:39:38 +0800
Subject: [PATCH 0693/1141] add python wrapper for new type inference function

---
 db/tables/operations/infer_types.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/db/tables/operations/infer_types.py b/db/tables/operations/infer_types.py
index 11c571103c..54cc2b5b59 100644
--- a/db/tables/operations/infer_types.py
+++ b/db/tables/operations/infer_types.py
@@ -5,6 +5,7 @@
 from db import constants
 from db.columns.base import MathesarColumn
 from db.columns.operations.infer_types import infer_column_type
+from db.connection import exec_msar_func
 from db.schemas.operations.create import create_schema_if_not_exists_via_sql_alchemy
 from db.tables.operations.create import CreateTableAs
 from db.tables.operations.select import reflect_table
@@ -16,6 +17,25 @@
 TEMP_TABLE = f"{constants.MATHESAR_PREFIX}temp_table_%s"
 
 
+def infer_table_column_data_types(conn, table_oid):
+    """
+    Infer the best type for each column in the table.
+
+    Currently we only suggest different types for columns which originate
+    as type `text`.
+
+    Args:
+        tab_id: The OID of the table whose columns we're inferring types for.
+
+    The response JSON will have attnum keys, and values will be the
+    result of `format_type` for the inferred type of each column.
+    Restricted to columns to which the user has access.
+    """
+    return exec_msar_func(
+        conn, 'infer_table_column_data_types', table_oid
+    ).fetchone()[0]
+
+
 def update_table_column_types(schema, table_name, engine, metadata=None, columns_might_have_defaults=True):
     metadata = metadata if metadata else get_empty_metadata()
     table = reflect_table(table_name, schema, engine, metadata=metadata)

From 916eb5b4cbef8e1cf92ab5e739ca8f26da18b40b Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 21 Aug 2024 16:52:14 +0800
Subject: [PATCH 0694/1141] wire up type inference to RPC endpoint

---
 mathesar/rpc/data_modeling.py            | 24 ++++++++++++++++++
 mathesar/tests/rpc/test_data_modeling.py | 31 ++++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py     |  5 ++++
 3 files changed, 60 insertions(+)

diff --git a/mathesar/rpc/data_modeling.py b/mathesar/rpc/data_modeling.py
index 947d215bd5..f0dcae9f9c 100644
--- a/mathesar/rpc/data_modeling.py
+++ b/mathesar/rpc/data_modeling.py
@@ -7,6 +7,7 @@
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from db.links.operations import create as links_create
+from db.tables.operations import infer_types
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
 
@@ -80,3 +81,26 @@ def add_mapping_table(
         links_create.add_mapping_table(
             conn, schema_oid, table_name, mapping_columns
         )
+
+
+@rpc_method(name="data_modeling.suggest_types")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def suggest_types(*, table_oid: int, database_id: int, **kwargs) -> None:
+    """
+    Infer the best type for each column in the table.
+
+    Currently we only suggest different types for columns which originate
+    as type `text`.
+
+    Args:
+        tab_id: The OID of the table whose columns we're inferring types for.
+        database_id: The Django id of the database containing the table.
+
+    The response JSON will have attnum keys, and values will be the
+    result of `format_type` for the inferred type of each column, i.e., the
+    canonical string referring to the type.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        return infer_types.infer_table_column_data_types(conn, table_oid)
diff --git a/mathesar/tests/rpc/test_data_modeling.py b/mathesar/tests/rpc/test_data_modeling.py
index 483092939b..963acf055b 100644
--- a/mathesar/tests/rpc/test_data_modeling.py
+++ b/mathesar/tests/rpc/test_data_modeling.py
@@ -101,3 +101,34 @@ def mock_add_mapping_table(
         database_id=_database_id,
         request=request,
     )
+
+
+def test_data_modeling_suggest_types(rf, monkeypatch):
+    _username = 'alice'
+    _password = 'pass1234'
+    _table_oid = 12345
+    _database_id = 2
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=_username, password=_password)
+
+    @contextmanager
+    def mock_connect(database_id, user):
+        if database_id == _database_id and user.username == _username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_suggest_types(conn, table_oid):
+        if table_oid != _table_oid:
+            raise AssertionError('incorrect parameters passed')
+
+    monkeypatch.setattr(data_modeling, 'connect', mock_connect)
+    monkeypatch.setattr(data_modeling.infer_types, 'infer_table_column_data_types', mock_suggest_types)
+    data_modeling.suggest_types(
+        table_oid=_table_oid,
+        database_id=_database_id,
+        request=request,
+    )
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 71fb0726d6..6eb231af8c 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -141,6 +141,11 @@
         "data_modeling.add_mapping_table",
         [user_is_authenticated]
     ),
+    (
+        data_modeling.suggest_types,
+        "data_modeling.suggest_types",
+        [user_is_authenticated]
+    ),
     (
         database_privileges.list_direct,
         "database_privileges.list_direct",

From 7295eaa26c0569fc89bc25f514273d790a91488e Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 21 Aug 2024 16:55:14 +0800
Subject: [PATCH 0695/1141] add type inference function to docs

---
 docs/docs/api/rpc.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 1626c406be..e5bc79aa47 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -248,6 +248,7 @@ To use an RPC function:
       members:
       - add_foreign_key_column
       - add_mapping_table
+      - suggest_types
       - MappingColumn
 
 ## Responses

From bacf05d7f09d9431959bcc2860cad7539c5f0d46 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 21 Aug 2024 21:47:52 +0800
Subject: [PATCH 0696/1141] fix variable doc ref in RPC function

---
 mathesar/rpc/data_modeling.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/rpc/data_modeling.py b/mathesar/rpc/data_modeling.py
index f0dcae9f9c..d6b3445a83 100644
--- a/mathesar/rpc/data_modeling.py
+++ b/mathesar/rpc/data_modeling.py
@@ -94,7 +94,7 @@ def suggest_types(*, table_oid: int, database_id: int, **kwargs) -> None:
     as type `text`.
 
     Args:
-        tab_id: The OID of the table whose columns we're inferring types for.
+        tab_oid: The OID of the table whose columns we're inferring types for.
         database_id: The Django id of the database containing the table.
 
     The response JSON will have attnum keys, and values will be the

From 8771107b03c4f6baa00d85be3ec4348771b31c84 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 21 Aug 2024 21:55:32 +0800
Subject: [PATCH 0697/1141] fix variable doc ref in RPC function :hankey:
 :hankey:

---
 mathesar/rpc/data_modeling.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/rpc/data_modeling.py b/mathesar/rpc/data_modeling.py
index d6b3445a83..6e496ac95d 100644
--- a/mathesar/rpc/data_modeling.py
+++ b/mathesar/rpc/data_modeling.py
@@ -94,7 +94,7 @@ def suggest_types(*, table_oid: int, database_id: int, **kwargs) -> None:
     as type `text`.
 
     Args:
-        tab_oid: The OID of the table whose columns we're inferring types for.
+        table_oid: The OID of the table whose columns we're inferring types for.
         database_id: The Django id of the database containing the table.
 
     The response JSON will have attnum keys, and values will be the

From 44c2ce2cd6fcc6d5b2446379b9b3359a56d8b51e Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 21 Aug 2024 22:07:44 +0530
Subject: [PATCH 0698/1141] add endpoint test

---
 mathesar/tests/rpc/test_endpoints.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 067bff05d1..4109a9bd10 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -225,6 +225,11 @@
         "roles.list",
         [user_is_authenticated]
     ),
+    (
+        roles.add,
+        "roles.add",
+        [user_is_authenticated]
+    ),
     (
         schemas.add,
         "schemas.add",

From 0448f6b12ad7600227e1c8c8cbe130676001470d Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 21 Aug 2024 23:45:35 +0530
Subject: [PATCH 0699/1141] add docstrings for sql and python functions

---
 db/sql/00_msar.sql    | 28 ++++++++++++++++++++++++++++
 mathesar/rpc/roles.py | 23 +++++++++++++++++++++--
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 10279b1e5c..015811e03a 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1061,6 +1061,12 @@ $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 CREATE OR REPLACE FUNCTION
 msar.create_basic_mathesar_user(username text, password_ text) RETURNS TEXT AS $$/*
+Given the username and password_, creates a user on the database server.
+Additionally, grants CREATE, CONNECT and TEMP on the current database to the created user.
+
+Args:
+  username: The name of the user to be created, unquoted.
+  password_: The password for the user to set, unquoted.
 */
 BEGIN
   PERFORM __msar.exec_ddl('CREATE USER %I WITH PASSWORD %L', username, password_);
@@ -1095,6 +1101,28 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 CREATE OR REPLACE FUNCTION
 msar.create_role(rolename text, password_ text, login_ boolean) RETURNS jsonb AS $$/*
+Creates a login/non-login role, depending on whether the login_ flag is set.
+Only the rolename field is required, the password field is required only if login_ is set to true.
+
+Returns a JSON object describing the created role in the form:
+  {
+    "oid": <int>
+    "name": <str>
+    "super": <bool>
+    "inherits": <bool>
+    "create_role": <bool>
+    "create_db": <bool>
+    "login": <bool>
+    "description": <str|null>
+    "members": <[
+        { "oid": <int>, "admin": <bool> }
+      ]|null>
+  }
+
+Args:
+  rolename: The name of the role to be created, unquoted.
+  password_: The password for the rolename to set, unquoted.
+  login_: Specify whether the role to be created could login.
 */
 DECLARE
   sch_name text;
diff --git a/mathesar/rpc/roles.py b/mathesar/rpc/roles.py
index a7aad1890c..1c940e3e7f 100644
--- a/mathesar/rpc/roles.py
+++ b/mathesar/rpc/roles.py
@@ -68,7 +68,7 @@ def list_(*, database_id: int, **kwargs) -> list[RoleInfo]:
     Requires a database id inorder to connect to the server.
 
     Args:
-        database_id: The Django id of the database containing the table.
+        database_id: The Django id of the database.
 
     Returns:
         A list of roles present on the database server.
@@ -82,7 +82,26 @@ def list_(*, database_id: int, **kwargs) -> list[RoleInfo]:
 @rpc_method(name="roles.add")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def add(*, rolename: str, database_id: int, password: str, login: bool, **kwargs) -> RoleInfo:
+def add(
+    *,
+    rolename: str,
+    database_id: int,
+    password: str = None,
+    login: bool = None,
+    **kwargs
+) -> RoleInfo:
+    """
+    Add a new login/non-login role on a database server.
+
+    Args:
+        rolename: The name of the role to be created.
+        database_id: The Django id of the database.
+        password: The password for the rolename to set.
+        login: Whether the role to be created could login.
+
+    Returns:
+        A dict describing the created role.
+    """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
         role = create_role(rolename, password, login, conn)

From 83f86bd78f772697c7eede0575d58a194b14d40c Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 21 Aug 2024 23:45:48 +0530
Subject: [PATCH 0700/1141] add docs

---
 docs/docs/api/rpc.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 1dc1378d00..cc70568626 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -230,6 +230,7 @@ To use an RPC function:
     options:
       members:
       - list_
+      - add
       - RoleInfo
       - RoleMember
 

From 4a3d96d642834e8a6902c6bf89bb1f0b7aa7b99a Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 22 Aug 2024 18:18:49 +0530
Subject: [PATCH 0701/1141] change return type for suggest_types from None ->
 dict

---
 mathesar/rpc/data_modeling.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/rpc/data_modeling.py b/mathesar/rpc/data_modeling.py
index 6e496ac95d..30c385b4ff 100644
--- a/mathesar/rpc/data_modeling.py
+++ b/mathesar/rpc/data_modeling.py
@@ -86,7 +86,7 @@ def add_mapping_table(
 @rpc_method(name="data_modeling.suggest_types")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def suggest_types(*, table_oid: int, database_id: int, **kwargs) -> None:
+def suggest_types(*, table_oid: int, database_id: int, **kwargs) -> dict:
     """
     Infer the best type for each column in the table.
 

From efbe539764f98a1dad03563c66c7c7668eb695fd Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 22 Aug 2024 18:49:19 +0530
Subject: [PATCH 0702/1141] Add model functions in Role for setting members and
 deleting

---
 mathesar_ui/src/api/rpc/roles.ts | 27 +++++++++++++++++
 mathesar_ui/src/models/Role.ts   | 51 ++++++++++++++++++++++++++++++--
 2 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/roles.ts b/mathesar_ui/src/api/rpc/roles.ts
index f030b5d6a3..82bbb2366c 100644
--- a/mathesar_ui/src/api/rpc/roles.ts
+++ b/mathesar_ui/src/api/rpc/roles.ts
@@ -26,4 +26,31 @@ export const roles = {
     },
     Array<RawRole>
   >(),
+
+  add: rpcMethodTypeContainer<
+    {
+      database_id: RawDatabase['id'];
+      rolename: RawRole['name'];
+      login: boolean;
+      password?: string;
+    },
+    RawRole
+  >(),
+
+  set_members: rpcMethodTypeContainer<
+    {
+      database_id: RawDatabase['id'];
+      role_oid: RawRole['oid'];
+      members: RawRole['oid'][];
+    },
+    RawRole
+  >(),
+
+  delete: rpcMethodTypeContainer<
+    {
+      database_id: RawDatabase['id'];
+      role_oid: RawRole['oid'];
+    },
+    void
+  >(),
 };
diff --git a/mathesar_ui/src/models/Role.ts b/mathesar_ui/src/models/Role.ts
index 683f018311..97ebbe432f 100644
--- a/mathesar_ui/src/models/Role.ts
+++ b/mathesar_ui/src/models/Role.ts
@@ -1,10 +1,20 @@
+import type { Readable } from 'svelte/store';
+
 import { api } from '@mathesar/api/rpc';
 import type { RawRole, RawRoleMember } from '@mathesar/api/rpc/roles';
-import { CancellablePromise } from '@mathesar/component-library';
+import {
+  CancellablePromise,
+  type ImmutableMap,
+  WritableMap,
+} from '@mathesar-component-library';
 
 import { ConfiguredRole } from './ConfiguredRole';
 import type { Database } from './Database';
 
+function getMembersWritableMap(members: RawRole['members']) {
+  return new WritableMap((members ?? []).map((member) => [member.oid, member]));
+}
+
 export class Role {
   readonly oid: number;
 
@@ -22,7 +32,11 @@ export class Role {
 
   readonly description?: string;
 
-  readonly members?: RawRoleMember[];
+  private _members;
+
+  get members(): Readable<ImmutableMap<RawRoleMember['oid'], RawRoleMember>> {
+    return this._members;
+  }
 
   readonly database: Database;
 
@@ -35,7 +49,7 @@ export class Role {
     this.createDb = props.rawRole.create_db;
     this.login = props.rawRole.login;
     this.description = props.rawRole.description;
-    this.members = props.rawRole.members;
+    this._members = getMembersWritableMap(props.rawRole.members);
     this.database = props.database;
   }
 
@@ -66,4 +80,35 @@ export class Role {
       () => promise.cancel(),
     );
   }
+
+  setMembers(memberOids: Set<Role['oid']>): CancellablePromise<Role> {
+    const promise = api.roles
+      .set_members({
+        database_id: this.database.id,
+        role_oid: this.oid,
+        members: [...memberOids],
+      })
+      .run();
+
+    return new CancellablePromise(
+      (resolve, reject) => {
+        promise
+          .then((rawRole) => {
+            const newMembers = rawRole.members ?? [];
+            this._members.reconstruct(
+              newMembers.map((member) => [member.oid, member]),
+            );
+            return resolve(this);
+          }, reject)
+          .catch(reject);
+      },
+      () => promise.cancel(),
+    );
+  }
+
+  delete(): CancellablePromise<void> {
+    return api.roles
+      .delete({ database_id: this.database.id, role_oid: this.oid })
+      .run();
+  }
 }

From 841ae420c739ae9a29215e42067eaacae513c55c Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 22 Aug 2024 18:55:26 +0530
Subject: [PATCH 0703/1141] Implement UI for setting role members and deleting
 role

---
 .../components/message-boxes/InfoBox.svelte   |   3 -
 mathesar_ui/src/i18n/languages/en/dict.json   |   8 +
 .../settings/databaseSettingsUtils.ts         |   5 +
 .../RoleConfiguration.svelte                  |   2 +-
 .../settings/roles/ModifyRoleMembers.svelte   | 154 ++++++++++++++++++
 .../database/settings/roles/RoleRow.svelte    | 105 ++++++++++++
 .../database/settings/roles/Roles.svelte      |  70 +++-----
 7 files changed, 300 insertions(+), 47 deletions(-)
 create mode 100644 mathesar_ui/src/pages/database/settings/roles/ModifyRoleMembers.svelte
 create mode 100644 mathesar_ui/src/pages/database/settings/roles/RoleRow.svelte

diff --git a/mathesar_ui/src/components/message-boxes/InfoBox.svelte b/mathesar_ui/src/components/message-boxes/InfoBox.svelte
index 987e09f385..31382656e5 100644
--- a/mathesar_ui/src/components/message-boxes/InfoBox.svelte
+++ b/mathesar_ui/src/components/message-boxes/InfoBox.svelte
@@ -18,7 +18,4 @@
     --MessageBox__border: solid 1px var(--sky-300);
     --MessageBox__icon-color: var(--sky-800);
   }
-  .info-box:not(.full-width) {
-    max-width: max-content;
-  }
 </style>
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 2c52d1842a..ecf6615823 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -9,6 +9,7 @@
   "action_cannot_be_undone": "This action cannot be undone",
   "actions": "Actions",
   "add": "Add",
+  "add_child_roles": "Add Child Role(s)",
   "add_collaborator": "Add Collaborator",
   "add_columns_to_exploration_empty_message": "This exploration does not contain any columns. Edit the exploration to add columns to it.",
   "add_filter": "Add Filter",
@@ -48,12 +49,14 @@
   "change_password": "Change Password",
   "check_for_updates": "Check for Updates",
   "child_roles": "Child Roles",
+  "child_roles_saved_successfully": "The Child Roles have been successfully saved.",
   "choose_database": "Choose a Database",
   "choose_schema": "Choose a Schema",
   "choose_table_or_exploration": "Choose a Table or Exploration",
   "cleaning_up": "Cleaning up",
   "clear": "Clear",
   "clear_value": "Clear value",
+  "click_save_button_to_save_changes": "Click Save button to save changes.",
   "collaborator": "Collaborator",
   "collaborator_added_successfully": "Collaborator added successfully",
   "collaborator_role_help": "This role determines permissions for this collaborator. Mathesar will use this PostgreSQL role for all database interactions by this user.",
@@ -188,7 +191,10 @@
   "display_name": "Display Name",
   "documentation_and_resources": "Documentation & Resources",
   "drop_role": "Drop Role",
+  "drop_role_warning": "This role will be dropped on the database server and will not be available for any databases configured on the same server.",
+  "drop_role_with_identifier": "Drop Role [identifier]?",
   "edit": "Edit",
+  "edit_child_roles_for_parent": "Edit Child Roles for ''{parent}''",
   "edit_connection": "Edit Connection",
   "edit_connection_with_name": "Edit Connection: [connectionName]",
   "edit_exploration_attempt_recovery": "You can edit the exploration in the Data Explorer to attempt recovering it.",
@@ -459,6 +465,8 @@
   "role_configured_all_databases_in_server": "This role will be configured for all databases on DB Server ''{server}''",
   "role_configured_successfully": "Role configured successfully",
   "role_configured_successfully_new_password": "Role configured successfully with new password",
+  "role_dropped_successfully": "The role has been dropped successfully",
+  "role_has_no_child_roles": "The Role does not have any Child Roles",
   "role_name": "Role Name",
   "roles": "Roles",
   "row": "Row",
diff --git a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
index 9f114c2554..8821495ebd 100644
--- a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
+++ b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
@@ -137,6 +137,11 @@ class DatabaseSettingsContext {
     await collaborator.delete();
     this.collaborators.updateResolvedValue((c) => c.without(collaborator.id));
   }
+
+  async deleteRole(role: Role) {
+    await role.delete();
+    this.roles.updateResolvedValue((r) => r.without(role.oid));
+  }
 }
 
 export function getDatabaseSettingsContext(): Readable<DatabaseSettingsContext> {
diff --git a/mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte b/mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte
index e98b2ec426..1aca99fedc 100644
--- a/mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte
+++ b/mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte
@@ -59,7 +59,7 @@
         );
         toast.success($_('role_configuration_removed'));
       } catch (err) {
-        toast.success(getErrorMessage(err));
+        toast.error(getErrorMessage(err));
       }
     }
   }
diff --git a/mathesar_ui/src/pages/database/settings/roles/ModifyRoleMembers.svelte b/mathesar_ui/src/pages/database/settings/roles/ModifyRoleMembers.svelte
new file mode 100644
index 0000000000..cdfd9db7df
--- /dev/null
+++ b/mathesar_ui/src/pages/database/settings/roles/ModifyRoleMembers.svelte
@@ -0,0 +1,154 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import {
+    FormSubmit,
+    makeForm,
+    requiredField,
+  } from '@mathesar/components/form';
+  import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
+  import WarningBox from '@mathesar/components/message-boxes/WarningBox.svelte';
+  import { iconDeleteMajor } from '@mathesar/icons';
+  import type { Role } from '@mathesar/models/Role';
+  import { toast } from '@mathesar/stores/toast';
+  import {
+    Button,
+    ButtonMenuItem,
+    ControlledModal,
+    DropdownMenu,
+    Icon,
+    type ImmutableMap,
+    ImmutableSet,
+    type ModalController,
+    portalToWindowFooter,
+  } from '@mathesar-component-library';
+
+  export let controller: ModalController;
+  export let parentRole: Role;
+  export let rolesMap: ImmutableMap<number, Role>;
+
+  $: savedMembers = parentRole.members;
+  $: savedMemberOids = new Set([...$savedMembers.keys()]);
+  $: memberOids = requiredField<ImmutableSet<number>>(
+    new ImmutableSet(savedMemberOids),
+  );
+  $: form = makeForm({ memberOids });
+  $: ({ hasChanges } = $form);
+
+  $: rolesAvailableToAddAsMember = [...rolesMap.values()].filter(
+    (role) => role.oid !== parentRole.oid,
+  );
+
+  function addMember(memberOid: Role['oid']) {
+    memberOids.update((_existingMembers) => _existingMembers.with(memberOid));
+  }
+
+  function removeMember(memberOid: Role['oid']) {
+    memberOids.update((_existingMembers) =>
+      _existingMembers.without(memberOid),
+    );
+  }
+
+  async function saveMembers() {
+    await parentRole.setMembers(new Set($memberOids));
+    controller.close();
+    toast.success($_('child_roles_saved_successfully'));
+  }
+</script>
+
+<ControlledModal {controller} on:close={() => form.reset()}>
+  <span slot="title">
+    {$_('edit_child_roles_for_parent', {
+      values: {
+        parent: parentRole.name,
+      },
+    })}
+  </span>
+  <div>
+    <div class="menu-section">
+      <DropdownMenu label={$_('add_child_roles')} triggerAppearance="secondary">
+        {#each rolesAvailableToAddAsMember as role (role.oid)}
+          <ButtonMenuItem
+            on:click={() => addMember(role.oid)}
+            disabled={$memberOids.has(role.oid)}
+          >
+            {role.name}
+          </ButtonMenuItem>
+        {/each}
+      </DropdownMenu>
+
+      {#if hasChanges}
+        <div class="changes-warning">
+          <WarningBox>
+            {$_('click_save_button_to_save_changes')}
+          </WarningBox>
+        </div>
+      {/if}
+    </div>
+    <div class="member-list">
+      {#if $memberOids.size > 0}
+        {#each [...$memberOids] as memberOid (memberOid)}
+          <div class="member">
+            <span>
+              {rolesMap.get(memberOid)?.name ?? memberOid}
+            </span>
+            <span class="remove">
+              <Button
+                appearance="secondary"
+                on:click={() => removeMember(memberOid)}
+              >
+                <Icon {...iconDeleteMajor} size="0.8em" />
+              </Button>
+            </span>
+          </div>
+        {/each}
+      {:else}
+        <InfoBox fullWidth>
+          {$_('role_has_no_child_roles')}
+        </InfoBox>
+      {/if}
+    </div>
+  </div>
+  <div use:portalToWindowFooter class="footer">
+    <FormSubmit
+      {form}
+      catchErrors
+      canProceed={hasChanges}
+      onCancel={() => {
+        form.reset();
+        controller.close();
+      }}
+      onProceed={saveMembers}
+      proceedButton={{ label: $_('save') }}
+      cancelButton={{ label: $_('cancel') }}
+    />
+  </div>
+</ControlledModal>
+
+<style lang="scss">
+  .menu-section {
+    display: flex;
+
+    .changes-warning {
+      margin-left: auto;
+      font-size: var(--text-size-small);
+    }
+  }
+  .member-list {
+    margin-top: var(--size-x-small);
+
+    .member {
+      display: flex;
+      align-items: center;
+      padding: var(--size-x-small) 0;
+
+      .remove {
+        margin-left: auto;
+      }
+
+      &:not(:last-child) {
+        border-bottom: 1px solid var(--slate-200);
+      }
+    }
+  }
+</style>
diff --git a/mathesar_ui/src/pages/database/settings/roles/RoleRow.svelte b/mathesar_ui/src/pages/database/settings/roles/RoleRow.svelte
new file mode 100644
index 0000000000..88ead522d6
--- /dev/null
+++ b/mathesar_ui/src/pages/database/settings/roles/RoleRow.svelte
@@ -0,0 +1,105 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import GridTableCell from '@mathesar/components/grid-table/GridTableCell.svelte';
+  import PhraseContainingIdentifier from '@mathesar/components/PhraseContainingIdentifier.svelte';
+  import { iconDeleteMajor, iconEdit } from '@mathesar/icons';
+  import type { Role } from '@mathesar/models/Role';
+  import { confirm } from '@mathesar/stores/confirmation';
+  import { toast } from '@mathesar/stores/toast';
+  import { getErrorMessage } from '@mathesar/utils/errors';
+  import {
+    Button,
+    Icon,
+    type ImmutableMap,
+    SpinnerButton,
+  } from '@mathesar-component-library';
+
+  import { getDatabaseSettingsContext } from '../databaseSettingsUtils';
+
+  const databaseContext = getDatabaseSettingsContext();
+
+  export let role: Role;
+  export let rolesMap: ImmutableMap<number, Role>;
+  export let modifyMembersForRole: (role: Role) => unknown;
+
+  $: members = role.members;
+
+  async function dropRole() {
+    try {
+      await $databaseContext.deleteRole(role);
+      toast.success($_('role_dropped_successfully'));
+    } catch (err) {
+      toast.error(getErrorMessage(err));
+    }
+  }
+</script>
+
+<GridTableCell>{role.name}</GridTableCell>
+<GridTableCell>
+  {#if role.login}
+    {$_('yes')}
+  {/if}
+</GridTableCell>
+<GridTableCell>
+  <div class="child-roles">
+    <div class="role-list">
+      {#each [...$members.values()] as member (member.oid)}
+        <span class="role-name">
+          {rolesMap.get(member.oid)?.name ?? ''}
+        </span>
+      {/each}
+    </div>
+    <div class="actions">
+      <Button
+        appearance="secondary"
+        on:click={() => modifyMembersForRole(role)}
+      >
+        <Icon {...iconEdit} size="0.8em" />
+      </Button>
+    </div>
+  </div>
+</GridTableCell>
+<GridTableCell>
+  <SpinnerButton
+    appearance="outline-primary"
+    confirm={() =>
+      confirm({
+        title: {
+          component: PhraseContainingIdentifier,
+          props: {
+            identifier: role.name,
+            wrappingString: $_('drop_role_with_identifier'),
+          },
+        },
+        body: [
+          $_('action_cannot_be_undone'),
+          $_('drop_role_warning'),
+          $_('are_you_sure_to_proceed'),
+        ],
+        proceedButton: {
+          label: $_('drop_role'),
+          icon: iconDeleteMajor,
+        },
+      })}
+    label={$_('drop_role')}
+    onClick={dropRole}
+  />
+</GridTableCell>
+
+<style lang="scss">
+  .child-roles {
+    display: flex;
+    width: 100%;
+    align-items: center;
+
+    .role-list {
+      display: flex;
+      gap: 6px;
+    }
+
+    .actions {
+      margin-left: auto;
+    }
+  }
+</style>
diff --git a/mathesar_ui/src/pages/database/settings/roles/Roles.svelte b/mathesar_ui/src/pages/database/settings/roles/Roles.svelte
index 3a07394bb8..6739b68f8b 100644
--- a/mathesar_ui/src/pages/database/settings/roles/Roles.svelte
+++ b/mathesar_ui/src/pages/database/settings/roles/Roles.svelte
@@ -4,7 +4,8 @@
   import GridTable from '@mathesar/components/grid-table/GridTable.svelte';
   import GridTableCell from '@mathesar/components/grid-table/GridTableCell.svelte';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
-  import { iconAddNew, iconEdit } from '@mathesar/icons';
+  import { iconAddNew } from '@mathesar/icons';
+  import type { Role } from '@mathesar/models/Role';
   import { modal } from '@mathesar/stores/modal';
   import { Button, Icon, Spinner } from '@mathesar-component-library';
 
@@ -12,14 +13,24 @@
   import SettingsContentLayout from '../SettingsContentLayout.svelte';
 
   import CreateRoleModal from './CreateRoleModal.svelte';
+  import ModifyRoleMembers from './ModifyRoleMembers.svelte';
+  import RoleRow from './RoleRow.svelte';
 
   const databaseContext = getDatabaseSettingsContext();
   const createRoleModalController = modal.spawnModalController();
+  const modifyRoleMembersModalController = modal.spawnModalController();
 
   $: ({ database, roles } = $databaseContext);
 
   $: void roles.runIfNotInitialized({ database_id: database.id });
   $: roleList = [...($roles.resolvedValue?.values() ?? [])];
+
+  let targetRole: Role | undefined = undefined;
+
+  function modifyMembersForRole(role: Role) {
+    targetRole = role;
+    modifyRoleMembersModalController.open();
+  }
 </script>
 
 <SettingsContentLayout>
@@ -39,7 +50,7 @@
   </svelte:fragment>
   {#if $roles.isLoading}
     <Spinner />
-  {:else if $roles.isOk}
+  {:else if $roles.isOk && $roles.resolvedValue}
     <div class="roles-table">
       <GridTable>
         <GridTableCell header>{$_('role')}</GridTableCell>
@@ -49,32 +60,12 @@
           {$_('child_roles')}
         </GridTableCell>
         <GridTableCell header>{$_('actions')}</GridTableCell>
-        {#each roleList as role (role.name)}
-          <GridTableCell>{role.name}</GridTableCell>
-          <GridTableCell>
-            {role.login ? $_('yes') : $_('no')}
-          </GridTableCell>
-          <GridTableCell>
-            <div class="child-roles">
-              <div class="role-list">
-                {#each role.members ?? [] as member (member.oid)}
-                  <span class="role-name">
-                    {$roles.resolvedValue?.get(member.oid)?.name ?? ''}
-                  </span>
-                {/each}
-              </div>
-              <div class="actions">
-                <Button appearance="secondary">
-                  <Icon {...iconEdit} size="0.8em" />
-                </Button>
-              </div>
-            </div>
-          </GridTableCell>
-          <GridTableCell>
-            <Button appearance="outline-primary">
-              {$_('drop_role')}
-            </Button>
-          </GridTableCell>
+        {#each roleList as role (role.oid)}
+          <RoleRow
+            {role}
+            rolesMap={$roles.resolvedValue}
+            {modifyMembersForRole}
+          />
         {/each}
       </GridTable>
     </div>
@@ -87,24 +78,17 @@
 
 <CreateRoleModal controller={createRoleModalController} />
 
+{#if $roles.resolvedValue && targetRole}
+  <ModifyRoleMembers
+    parentRole={targetRole}
+    rolesMap={$roles.resolvedValue}
+    controller={modifyRoleMembersModalController}
+  />
+{/if}
+
 <style lang="scss">
   .roles-table {
     --Grid-table__template-columns: 3fr 2fr 4fr 2fr;
     background: var(--white);
-
-    .child-roles {
-      display: flex;
-      width: 100%;
-      align-items: center;
-
-      .role-list {
-        display: flex;
-        gap: 6px;
-      }
-
-      .actions {
-        margin-left: auto;
-      }
-    }
   }
 </style>

From d7f14ae969178393cbb3fda9017f2c1ea5afe842 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 22 Aug 2024 19:05:13 +0530
Subject: [PATCH 0704/1141] Reset stores when items in dependent stores are
 deleted

---
 .../pages/database/settings/databaseSettingsUtils.ts   | 10 ++++++++++
 .../role-configuration/ConfigureRoleModal.svelte       |  2 --
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
index 8821495ebd..8699581c6f 100644
--- a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
+++ b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
@@ -107,6 +107,13 @@ class DatabaseSettingsContext {
     this.configuredRoles.updateResolvedValue((configuredRoles) =>
       configuredRoles.without(configuredRole.id),
     );
+    /**
+     * When a configured role is removed from the Role Configuration page,
+     * Collaborators list needs to be reset, since the drop statement cascades.
+     *
+     * TODO_BETA: Discuss on whether we should cascade or throw error?
+     */
+    this.collaborators.reset();
   }
 
   async addCollaborator(
@@ -141,6 +148,9 @@ class DatabaseSettingsContext {
   async deleteRole(role: Role) {
     await role.delete();
     this.roles.updateResolvedValue((r) => r.without(role.oid));
+    // When a role is deleted, both Collaborators & ConfiguredRoles needs to be reset
+    this.configuredRoles.reset();
+    this.collaborators.reset();
   }
 }
 
diff --git a/mathesar_ui/src/pages/database/settings/role-configuration/ConfigureRoleModal.svelte b/mathesar_ui/src/pages/database/settings/role-configuration/ConfigureRoleModal.svelte
index 434047a119..c7f2eab7a5 100644
--- a/mathesar_ui/src/pages/database/settings/role-configuration/ConfigureRoleModal.svelte
+++ b/mathesar_ui/src/pages/database/settings/role-configuration/ConfigureRoleModal.svelte
@@ -39,7 +39,6 @@
     } else {
       toast.success($_('role_configured_successfully'));
     }
-    form.reset();
   }
 </script>
 
@@ -74,7 +73,6 @@
       {form}
       catchErrors
       onCancel={() => {
-        form.reset();
         controller.close();
       }}
       onProceed={configureRole}

From a9707925705e564a82a1b50a4da303ef6ededa0c Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 22 Aug 2024 19:09:18 +0530
Subject: [PATCH 0705/1141] change get_roles->list_roles and extract pg_roles
 logic to role_info_table

---
 db/roles/operations/select.py            |   4 +-
 db/sql/00_msar.sql                       | 114 +++++++++++------------
 db/sql/test_00_msar.sql                  |  20 ++--
 db/tests/roles/operations/test_select.py |   6 +-
 mathesar/rpc/roles.py                    |  16 +++-
 5 files changed, 81 insertions(+), 79 deletions(-)

diff --git a/db/roles/operations/select.py b/db/roles/operations/select.py
index 1d0d94434b..9ad7131f21 100644
--- a/db/roles/operations/select.py
+++ b/db/roles/operations/select.py
@@ -1,8 +1,8 @@
 from db.connection import exec_msar_func
 
 
-def get_roles(conn):
-    return exec_msar_func(conn, 'get_roles').fetchone()[0]
+def list_roles(conn):
+    return exec_msar_func(conn, 'list_roles').fetchone()[0]
 
 
 def list_db_priv(db_name, conn):
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 015811e03a..b33fe5d133 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -897,7 +897,49 @@ FROM (
 $$ LANGUAGE SQL;
 
 
-CREATE OR REPLACE FUNCTION msar.get_roles() RETURNS jsonb AS $$/*
+CREATE OR REPLACE FUNCTION msar.role_info_table() RETURNS TABLE
+(
+  oid oid,
+  name name,
+  super boolean,
+  inherits boolean,
+  create_role boolean,
+  create_db boolean,
+  login boolean,
+  description text,
+  members jsonb
+) AS $$/*
+Returns a table describing all the roles present on the database server.
+*/
+WITH rolemembers as (
+  SELECT
+    pgr.oid AS oid,
+    jsonb_agg(
+      jsonb_build_object(
+        'oid', pgm.member::bigint,
+        'admin', pgm.admin_option
+      )
+    ) AS members
+    FROM pg_catalog.pg_roles pgr
+      INNER JOIN pg_catalog.pg_auth_members pgm ON pgr.oid=pgm.roleid
+    GROUP BY pgr.oid
+)
+SELECT
+  r.oid::bigint AS oid,
+  r.rolname AS name,
+  r.rolsuper AS super,
+  r.rolinherit AS inherits,
+  r.rolcreaterole AS create_role,
+  r.rolcreatedb AS create_db,
+  r.rolcanlogin AS login,
+  pg_catalog.shobj_description(r.oid, 'pg_authid') AS description,
+  rolemembers.members AS members
+FROM pg_catalog.pg_roles r
+LEFT OUTER JOIN rolemembers ON r.oid = rolemembers.oid;
+$$ LANGUAGE SQL STABLE;
+
+
+CREATE OR REPLACE FUNCTION msar.list_roles() RETURNS jsonb AS $$/*
 Return a json array of objects with the list of roles in a database server,
 excluding pg system roles.
 
@@ -916,35 +958,9 @@ Each returned JSON object in the array has the form:
       ]|null>
   }
 */
-WITH rolemembers as (
-  SELECT
-    pgr.oid AS oid,
-    jsonb_agg(
-      jsonb_build_object(
-        'oid', pgm.member::bigint,
-        'admin', pgm.admin_option
-      )
-    ) AS members
-    FROM pg_catalog.pg_roles pgr
-      INNER JOIN pg_catalog.pg_auth_members pgm ON pgr.oid=pgm.roleid
-    GROUP BY pgr.oid
-)
 SELECT jsonb_agg(role_data)
-FROM (
-  SELECT
-    r.oid::bigint AS oid,
-    r.rolname AS name,
-    r.rolsuper AS super,
-    r.rolinherit AS inherits,
-    r.rolcreaterole AS create_role,
-    r.rolcreatedb AS create_db,
-    r.rolcanlogin AS login,
-    pg_catalog.shobj_description(r.oid, 'pg_authid') AS description,
-    rolemembers.members AS members
-  FROM pg_catalog.pg_roles r
-    LEFT OUTER JOIN rolemembers ON r.oid = rolemembers.oid
-  WHERE r.rolname NOT LIKE 'pg_%'
-) AS role_data;
+FROM msar.role_info_table() AS role_data
+WHERE role_data.name NOT LIKE 'pg_%';
 $$ LANGUAGE SQL STABLE;
 
 
@@ -966,33 +982,9 @@ The returned JSON object has the form:
       ]|null>
   }
 */
-WITH rolemembers as (
-  SELECT
-    pgr.oid AS oid,
-    jsonb_agg(
-      jsonb_build_object(
-        'oid', pgm.member::bigint,
-        'admin', pgm.admin_option
-      )
-    ) AS members
-  FROM pg_catalog.pg_roles pgr
-    INNER JOIN pg_catalog.pg_auth_members pgm ON pgr.oid=pgm.roleid
-  GROUP BY pgr.oid
-)
-SELECT jsonb_build_object(
-  'oid', r.oid::bigint,
-  'name', r.rolname,
-  'super', r.rolsuper,
-  'inherits', r.rolinherit,
-  'create_role', r.rolcreaterole,
-  'create_db', r.rolcreatedb,
-  'login', r.rolcanlogin,
-  'description', pg_catalog.shobj_description(r.oid, 'pg_authid'),
-  'members', rolemembers.members
-)
-FROM pg_catalog.pg_roles r
-  LEFT OUTER JOIN rolemembers ON r.oid = rolemembers.oid
-WHERE r.rolname = rolename;
+SELECT to_jsonb(role_data)
+FROM msar.role_info_table() AS role_data
+WHERE role_data.name = rolename;
 $$ LANGUAGE SQL STABLE;
 
 
@@ -1069,8 +1061,8 @@ Args:
   password_: The password for the user to set, unquoted.
 */
 BEGIN
-  PERFORM __msar.exec_ddl('CREATE USER %I WITH PASSWORD %L', username, password_);
-  PERFORM __msar.exec_ddl(
+  EXECUTE format('CREATE USER %I WITH PASSWORD %L', username, password_);
+  EXECUTE format(
     'GRANT CREATE, CONNECT, TEMP ON DATABASE %I TO %I',
     current_database()::text,
     username
@@ -1129,10 +1121,10 @@ DECLARE
   mathesar_schemas text[] := ARRAY['mathesar_types', '__msar', 'msar'];
 BEGIN
   CASE WHEN login_ THEN
-    PERFORM create_basic_mathesar_user(rolename, password_);
+    PERFORM msar.create_basic_mathesar_user(rolename, password_);
   ELSE
-    PERFORM __msar.exec_ddl('CREATE ROLE %I', rolename);
-    PERFORM __msar.exec_ddl(
+    EXECUTE format('CREATE ROLE %I', rolename);
+    EXECUTE format(
       'GRANT CREATE, TEMP ON DATABASE %I TO %I',
       current_database()::text,
       rolename
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 9c0030deaa..4bb11424aa 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2760,18 +2760,18 @@ END;
 $$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION test_get_roles() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION test_list_roles() RETURNS SETOF TEXT AS $$
 DECLARE
   initial_role_count int;
   foo_role jsonb;
   bar_role jsonb;
 BEGIN
-  SELECT jsonb_array_length(msar.get_roles()) INTO initial_role_count;
+  SELECT jsonb_array_length(msar.list_roles()) INTO initial_role_count;
 
   -- Create role and check if role is present in response & count is increased
   CREATE ROLE foo;
-  RETURN NEXT is(jsonb_array_length(msar.get_roles()), initial_role_count + 1);
-  SELECT jsonb_path_query(msar.get_roles(), '$[*] ? (@.name == "foo")') INTO foo_role;
+  RETURN NEXT is(jsonb_array_length(msar.list_roles()), initial_role_count + 1);
+  SELECT jsonb_path_query(msar.list_roles(), '$[*] ? (@.name == "foo")') INTO foo_role;
 
   -- Check if role has expected properties
   RETURN NEXT is(jsonb_typeof(foo_role), 'object');
@@ -2785,7 +2785,7 @@ BEGIN
 
   -- Modify properties and check role again
   ALTER ROLE foo WITH CREATEDB CREATEROLE LOGIN NOINHERIT;
-  SELECT jsonb_path_query(msar.get_roles(), '$[*] ? (@.name == "foo")') INTO foo_role;
+  SELECT jsonb_path_query(msar.list_roles(), '$[*] ? (@.name == "foo")') INTO foo_role;
   RETURN NEXT is((foo_role->>'super')::boolean, false);
   RETURN NEXT is((foo_role->>'inherits')::boolean, false);
   RETURN NEXT is((foo_role->>'create_role')::boolean, true);
@@ -2794,15 +2794,15 @@ BEGIN
 
   -- Add comment and check if comment is present
   COMMENT ON ROLE foo IS 'A test role';
-  SELECT jsonb_path_query(msar.get_roles(), '$[*] ? (@.name == "foo")') INTO foo_role;
+  SELECT jsonb_path_query(msar.list_roles(), '$[*] ? (@.name == "foo")') INTO foo_role;
   RETURN NEXT is(foo_role->'description'#>>'{}', 'A test role');
 
   -- Add members and check result
   CREATE ROLE bar;
   GRANT foo TO bar;
-  RETURN NEXT is(jsonb_array_length(msar.get_roles()), initial_role_count + 2);
-  SELECT jsonb_path_query(msar.get_roles(), '$[*] ? (@.name == "foo")') INTO foo_role;
-  SELECT jsonb_path_query(msar.get_roles(), '$[*] ? (@.name == "bar")') INTO bar_role;
+  RETURN NEXT is(jsonb_array_length(msar.list_roles()), initial_role_count + 2);
+  SELECT jsonb_path_query(msar.list_roles(), '$[*] ? (@.name == "foo")') INTO foo_role;
+  SELECT jsonb_path_query(msar.list_roles(), '$[*] ? (@.name == "bar")') INTO bar_role;
   RETURN NEXT is(jsonb_typeof(foo_role->'members'), 'array');
   RETURN NEXT is(
     foo_role->'members'->0->>'oid', bar_role->>'oid'
@@ -2811,7 +2811,7 @@ BEGIN
 
   -- Drop role and ensure role is not present in response
   DROP ROLE foo;
-  RETURN NEXT ok(NOT jsonb_path_exists(msar.get_roles(), '$[*] ? (@.name == "foo")'));
+  RETURN NEXT ok(NOT jsonb_path_exists(msar.list_roles(), '$[*] ? (@.name == "foo")'));
 END;
 $$ LANGUAGE plpgsql;
 
diff --git a/db/tests/roles/operations/test_select.py b/db/tests/roles/operations/test_select.py
index 40579e99ac..81536d6967 100644
--- a/db/tests/roles/operations/test_select.py
+++ b/db/tests/roles/operations/test_select.py
@@ -2,9 +2,9 @@
 from db.roles.operations import select as ma_sel
 
 
-def test_get_roles():
+def test_list_roles():
     with patch.object(ma_sel, 'exec_msar_func') as mock_exec:
         mock_exec.return_value.fetchone = lambda: ('a', 'b')
-        result = ma_sel.get_roles('conn')
-    mock_exec.assert_called_once_with('conn', 'get_roles')
+        result = ma_sel.list_roles('conn')
+    mock_exec.assert_called_once_with('conn', 'list_roles')
     assert result == 'a'
diff --git a/mathesar/rpc/roles.py b/mathesar/rpc/roles.py
index 1c940e3e7f..f88a90ffc2 100644
--- a/mathesar/rpc/roles.py
+++ b/mathesar/rpc/roles.py
@@ -8,7 +8,7 @@
 
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
-from db.roles.operations.select import get_roles
+from db.roles.operations.select import list_roles
 from db.roles.operations.create import create_role
 
 
@@ -56,7 +56,17 @@ class RoleInfo(TypedDict):
 
     @classmethod
     def from_dict(cls, d):
-        return cls
+        return cls(
+            oid=d["oid"],
+            name=d["name"],
+            super=d["super"],
+            inherits=d["inherits"],
+            create_role=d["create_role"],
+            create_db=d["create_db"],
+            login=d["login"],
+            description=d["description"],
+            members=d["members"]
+        )
 
 
 @rpc_method(name="roles.list")
@@ -75,7 +85,7 @@ def list_(*, database_id: int, **kwargs) -> list[RoleInfo]:
     """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
-        roles = get_roles(conn)
+        roles = list_roles(conn)
     return [RoleInfo.from_dict(role) for role in roles]
 
 

From ad3d5fbc223b36075e0930b7c8f9105751e2b8fb Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 22 Aug 2024 19:22:28 +0530
Subject: [PATCH 0706/1141] Make request for adding roles

---
 mathesar_ui/src/i18n/languages/en/dict.json   |  3 +-
 mathesar_ui/src/models/Database.ts            | 33 +++++++++++++++++++
 .../settings/databaseSettingsUtils.ts         | 17 ++++++++++
 .../settings/roles/CreateRoleModal.svelte     | 21 ++++++++++--
 4 files changed, 71 insertions(+), 3 deletions(-)

diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index ecf6615823..4f6eab083f 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -465,7 +465,8 @@
   "role_configured_all_databases_in_server": "This role will be configured for all databases on DB Server ''{server}''",
   "role_configured_successfully": "Role configured successfully",
   "role_configured_successfully_new_password": "Role configured successfully with new password",
-  "role_dropped_successfully": "The role has been dropped successfully",
+  "role_created_successfully": "The Role has been created successfully",
+  "role_dropped_successfully": "The Role has been dropped successfully",
   "role_has_no_child_roles": "The Role does not have any Child Roles",
   "role_name": "Role Name",
   "roles": "Roles",
diff --git a/mathesar_ui/src/models/Database.ts b/mathesar_ui/src/models/Database.ts
index b39c443b6d..fe856c478a 100644
--- a/mathesar_ui/src/models/Database.ts
+++ b/mathesar_ui/src/models/Database.ts
@@ -93,4 +93,37 @@ export class Database {
       () => promise.cancel(),
     );
   }
+
+  addRole(
+    roleName: string,
+    login: boolean,
+    password?: string,
+  ): CancellablePromise<Role> {
+    const promise = api.roles
+      .add({
+        database_id: this.id,
+        rolename: roleName,
+        login,
+        password,
+      })
+      .run();
+
+    return new CancellablePromise(
+      (resolve, reject) => {
+        promise
+          .then(
+            (rawRole) =>
+              resolve(
+                new Role({
+                  database: this,
+                  rawRole,
+                }),
+              ),
+            reject,
+          )
+          .catch(reject);
+      },
+      () => promise.cancel(),
+    );
+  }
 }
diff --git a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
index 8699581c6f..9a86a04984 100644
--- a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
+++ b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
@@ -145,6 +145,23 @@ class DatabaseSettingsContext {
     this.collaborators.updateResolvedValue((c) => c.without(collaborator.id));
   }
 
+  async addRole(
+    props:
+      | {
+          roleName: Role['name'];
+          login: false;
+          password?: never;
+        }
+      | { roleName: Role['name']; login: true; password: string },
+  ) {
+    const newRole = await this.database.addRole(
+      props.roleName,
+      props.login,
+      props.password,
+    );
+    this.roles.updateResolvedValue((r) => r.with(newRole.oid, newRole));
+  }
+
   async deleteRole(role: Role) {
     await role.delete();
     this.roles.updateResolvedValue((r) => r.without(role.oid));
diff --git a/mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte b/mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte
index e715031b29..ccc193b4f1 100644
--- a/mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte
+++ b/mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte
@@ -9,6 +9,7 @@
     makeForm,
     requiredField,
   } from '@mathesar/components/form';
+  import { toast } from '@mathesar/stores/toast';
   import {
     Checkbox,
     ControlledModal,
@@ -18,6 +19,10 @@
     portalToWindowFooter,
   } from '@mathesar-component-library';
 
+  import { getDatabaseSettingsContext } from '../databaseSettingsUtils';
+
+  const databaseContext = getDatabaseSettingsContext();
+
   export let controller: ModalController;
 
   const roleName = requiredField('');
@@ -43,8 +48,20 @@
   ]);
   $: login, password.reset(), confirmPassword.reset();
 
-  function createRole() {
-    //
+  async function createRole() {
+    if (login) {
+      await $databaseContext.addRole({
+        roleName: $roleName,
+        login: true,
+        password: $password,
+      });
+    } else {
+      await $databaseContext.addRole({
+        roleName: $roleName,
+        login: false,
+      });
+    }
+    toast.success('role_created_successfully');
   }
 </script>
 

From 551b5f798be6ae922bb27e17a9fb0ae9845f6b37 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 22 Aug 2024 19:45:07 +0530
Subject: [PATCH 0707/1141] Use a store for configured_role_id property in
 Collaborator model

---
 mathesar_ui/src/models/Collaborator.ts        | 27 ++++++++++---------
 .../collaborators/CollaboratorRow.svelte      |  7 +++--
 .../EditRoleForCollaboratorModal.svelte       | 14 +++-------
 .../settings/databaseSettingsUtils.ts         | 11 --------
 4 files changed, 20 insertions(+), 39 deletions(-)

diff --git a/mathesar_ui/src/models/Collaborator.ts b/mathesar_ui/src/models/Collaborator.ts
index 4ba7dae50e..2fcbefac21 100644
--- a/mathesar_ui/src/models/Collaborator.ts
+++ b/mathesar_ui/src/models/Collaborator.ts
@@ -1,3 +1,5 @@
+import { type Readable, type Writable, writable } from 'svelte/store';
+
 import { api } from '@mathesar/api/rpc';
 import type { RawCollaborator } from '@mathesar/api/rpc/collaborators';
 import { CancellablePromise } from '@mathesar/component-library';
@@ -10,15 +12,20 @@ export class Collaborator {
 
   readonly user_id;
 
-  // TODO: Use a store for configured_role_id
-  readonly configured_role_id;
+  readonly _configured_role_id: Writable<ConfiguredRole['id']>;
+
+  get configured_role_id(): Readable<ConfiguredRole['id']> {
+    return this._configured_role_id;
+  }
 
   readonly database;
 
   constructor(props: { database: Database; rawCollaborator: RawCollaborator }) {
     this.id = props.rawCollaborator.id;
     this.user_id = props.rawCollaborator.user_id;
-    this.configured_role_id = props.rawCollaborator.configured_role_id;
+    this._configured_role_id = writable(
+      props.rawCollaborator.configured_role_id,
+    );
     this.database = props.database;
   }
 
@@ -35,16 +42,10 @@ export class Collaborator {
     return new CancellablePromise(
       (resolve, reject) => {
         promise
-          .then(
-            (rawCollaborator) =>
-              resolve(
-                new Collaborator({
-                  database: this.database,
-                  rawCollaborator,
-                }),
-              ),
-            reject,
-          )
+          .then((rawCollaborator) => {
+            this._configured_role_id.set(rawCollaborator.configured_role_id);
+            return resolve(this);
+          }, reject)
           .catch(reject);
       },
       () => promise.cancel(),
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
index 3bce77a219..7a1c494d23 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
@@ -17,9 +17,8 @@
   $: ({ configuredRoles, users } = $databaseContext);
 
   $: user = $users.resolvedValue?.get(collaborator.user_id);
-  $: configuredRole = $configuredRoles.resolvedValue?.get(
-    collaborator.configured_role_id,
-  );
+  $: configuredRoleId = collaborator.configured_role_id;
+  $: configuredRole = $configuredRoles.resolvedValue?.get($configuredRoleId);
   $: userName = user ? user.full_name || user.username : '';
 </script>
 
@@ -39,7 +38,7 @@
       {#if configuredRole}
         {configuredRole.name}
       {:else}
-        {collaborator.configured_role_id}
+        {$configuredRoleId}
       {/if}
     </div>
     <div class="actions">
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte b/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte
index 9d6ca95e6c..8fe7fe0c8f 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte
@@ -17,18 +17,15 @@
     portalToWindowFooter,
   } from '@mathesar-component-library';
 
-  import { getDatabaseSettingsContext } from '../databaseSettingsUtils';
-
   import SelectConfiguredRoleField from './SelectConfiguredRoleField.svelte';
 
-  const databaseContext = getDatabaseSettingsContext();
-
   export let controller: ModalController;
   export let collaborator: Collaborator;
   export let configuredRolesMap: ImmutableMap<number, ConfiguredRole>;
   export let usersMap: ImmutableMap<number, User>;
 
-  $: configuredRoleId = requiredField<number>(collaborator.configured_role_id);
+  $: savedConfiguredRoleId = collaborator.configured_role_id;
+  $: configuredRoleId = requiredField<number>($savedConfiguredRoleId);
   $: form = makeForm({ configuredRoleId });
 
   $: userName =
@@ -36,13 +33,9 @@
     String(collaborator.user_id);
 
   async function updateRoleForCollaborator() {
-    await $databaseContext.updateRoleForCollaborator(
-      collaborator,
-      $configuredRoleId,
-    );
+    await collaborator.setConfiguredRole($configuredRoleId);
     controller.close();
     toast.success($_('collaborator_role_updated_successfully'));
-    form.reset();
   }
 </script>
 
@@ -62,7 +55,6 @@
       {form}
       catchErrors
       onCancel={() => {
-        form.reset();
         controller.close();
       }}
       onProceed={updateRoleForCollaborator}
diff --git a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
index 9a86a04984..91f5221fbd 100644
--- a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
+++ b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
@@ -129,17 +129,6 @@ class DatabaseSettingsContext {
     );
   }
 
-  async updateRoleForCollaborator(
-    collaborator: Collaborator,
-    configuredRoleId: ConfiguredRole['id'],
-  ) {
-    const updatedCollaborator =
-      await collaborator.setConfiguredRole(configuredRoleId);
-    this.collaborators.updateResolvedValue((collaborators) =>
-      collaborators.with(updatedCollaborator.id, updatedCollaborator),
-    );
-  }
-
   async deleteCollaborator(collaborator: Collaborator) {
     await collaborator.delete();
     this.collaborators.updateResolvedValue((c) => c.without(collaborator.id));

From 4c32dc9a7612973be3df9d222d1369c2070ec259 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 22 Aug 2024 19:52:09 +0530
Subject: [PATCH 0708/1141] Improve names of model methods

---
 mathesar_ui/src/models/Database.ts                        | 6 +++---
 .../src/pages/database/settings/databaseSettingsUtils.ts  | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mathesar_ui/src/models/Database.ts b/mathesar_ui/src/models/Database.ts
index fe856c478a..be35d9b2e9 100644
--- a/mathesar_ui/src/models/Database.ts
+++ b/mathesar_ui/src/models/Database.ts
@@ -25,7 +25,7 @@ export class Database {
     this.server = props.server;
   }
 
-  fetchConfiguredRoles() {
+  constructConfiguredRolesStore() {
     return new AsyncRpcApiStore(api.configured_roles.list, {
       postProcess: (rawConfiguredRoles) =>
         new SortedImmutableMap(
@@ -38,7 +38,7 @@ export class Database {
     });
   }
 
-  fetchRoles() {
+  constructRolesStore() {
     return new AsyncRpcApiStore(api.roles.list, {
       postProcess: (rawRoles) =>
         new SortedImmutableMap(
@@ -51,7 +51,7 @@ export class Database {
     });
   }
 
-  fetchCollaborators() {
+  constructCollaboratorsStore() {
     return new AsyncRpcApiStore(api.collaborators.list, {
       postProcess: (rawCollaborators) =>
         new ImmutableMap(
diff --git a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
index 91f5221fbd..8edce0b131 100644
--- a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
+++ b/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
@@ -51,8 +51,8 @@ class DatabaseSettingsContext {
 
   constructor(database: Database) {
     this.database = database;
-    this.configuredRoles = database.fetchConfiguredRoles();
-    this.roles = database.fetchRoles();
+    this.configuredRoles = database.constructConfiguredRolesStore();
+    this.roles = database.constructRolesStore();
     this.combinedLoginRoles = derived(
       [this.roles, this.configuredRoles],
       ([$roles, $configuredRoles]) => {
@@ -75,7 +75,7 @@ class DatabaseSettingsContext {
           }));
         }
         if ($configuredRoles.isStable && configuredRoles) {
-          [...configuredRoles.values()].map((configuredRole) => ({
+          return [...configuredRoles.values()].map((configuredRole) => ({
             name: configuredRole.name,
             configuredRole,
           }));
@@ -83,7 +83,7 @@ class DatabaseSettingsContext {
         return [];
       },
     );
-    this.collaborators = database.fetchCollaborators();
+    this.collaborators = database.constructCollaboratorsStore();
     this.users = new AsyncStore(getUsersPromise);
   }
 

From e7603767e788a5bd1b45703bc89ada6cebac763e Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 22 Aug 2024 20:06:48 +0530
Subject: [PATCH 0709/1141] Temporarily hide Database permissions button and db
 actions

---
 mathesar_ui/src/pages/database/DatabasePageWrapper.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
index df871fcf34..40e33c1342 100644
--- a/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
+++ b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
@@ -67,7 +67,7 @@
     }}
   >
     <div slot="action">
-      <Button appearance="secondary">
+      <!-- <Button appearance="secondary">
         <span>{$_('database_permissions')}</span>
       </Button>
 
@@ -84,7 +84,7 @@
         <ButtonMenuItem icon={iconDeleteMajor} danger>
           {$_('delete_database')}
         </ButtonMenuItem>
-      </DropdownMenu>
+      </DropdownMenu> -->
     </div>
   </AppSecondaryHeader>
 

From cd8fa38da69b9026d00bb6e88c0ee75c05f9de95 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 22 Aug 2024 23:29:50 +0530
Subject: [PATCH 0710/1141] remove create_basic_mathesar_user

---
 db/sql/00_msar.sql            | 54 +----------------------------------
 db/sql/test_00_msar.sql       |  8 +++---
 mathesar/utils/connections.py |  5 ++--
 3 files changed, 8 insertions(+), 59 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 8eadc93050..45a24dcc98 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1048,49 +1048,6 @@ $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 ----------------------------------------------------------------------------------------------------
 
 
--- Create mathesar user ----------------------------------------------------------------------------
-
-
-CREATE OR REPLACE FUNCTION
-msar.create_basic_mathesar_user(username text, password_ text) RETURNS TEXT AS $$/*
-Given the username and password_, creates a user on the database server.
-Additionally, grants CREATE, CONNECT and TEMP on the current database to the created user.
-
-Args:
-  username: The name of the user to be created, unquoted.
-  password_: The password for the user to set, unquoted.
-*/
-BEGIN
-  EXECUTE format('CREATE USER %I WITH PASSWORD %L', username, password_);
-  EXECUTE format(
-    'GRANT CREATE, CONNECT, TEMP ON DATABASE %I TO %I',
-    current_database()::text,
-    username
-  );
-  PERFORM msar.grant_usage_on_mathesar_schemas(username);
-  RETURN username;
-END;
-$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
-
-
-CREATE OR REPLACE FUNCTION
-msar.grant_usage_on_mathesar_schemas(rolename text) RETURNS void AS $$
-DECLARE
-  sch_name text;
-  mathesar_schemas text[] := ARRAY['mathesar_types', '__msar', 'msar'];
-BEGIN
-  FOREACH sch_name IN ARRAY mathesar_schemas LOOP
-    BEGIN
-      PERFORM __msar.exec_ddl('GRANT USAGE ON SCHEMA %I TO %I', sch_name, rolename);
-    EXCEPTION
-      WHEN invalid_schema_name THEN
-        RAISE NOTICE 'Schema % does not exist', sch_name;
-    END;
-  END LOOP;
-END;
-$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
-
-
 CREATE OR REPLACE FUNCTION
 msar.create_role(rolename text, password_ text, login_ boolean) RETURNS jsonb AS $$/*
 Creates a login/non-login role, depending on whether the login_ flag is set.
@@ -1116,20 +1073,11 @@ Args:
   password_: The password for the rolename to set, unquoted.
   login_: Specify whether the role to be created could login.
 */
-DECLARE
-  sch_name text;
-  mathesar_schemas text[] := ARRAY['mathesar_types', '__msar', 'msar'];
 BEGIN
   CASE WHEN login_ THEN
-    PERFORM msar.create_basic_mathesar_user(rolename, password_);
+    EXECUTE format('CREATE USER %I WITH PASSWORD %L', rolename, password_);
   ELSE
     EXECUTE format('CREATE ROLE %I', rolename);
-    EXECUTE format(
-      'GRANT CREATE, TEMP ON DATABASE %I TO %I',
-      current_database()::text,
-      rolename
-    );
-    PERFORM msar.grant_usage_on_mathesar_schemas(rolename);
   END CASE;
   RETURN msar.get_role(rolename);
 END;
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index a7f468446e..f6d969ee86 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2273,16 +2273,16 @@ END;
 $$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION test_create_basic_mathesar_user() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION test_create_role() RETURNS SETOF TEXT AS $$
 BEGIN
-  PERFORM msar.create_basic_mathesar_user('testuser', 'mypass1234');
+  PERFORM msar.create_role('testuser', 'mypass1234', true);
   RETURN NEXT database_privs_are (
     'mathesar_testing', 'testuser', ARRAY['CREATE', 'CONNECT', 'TEMPORARY']
   );
   RETURN NEXT schema_privs_are ('msar', 'testuser', ARRAY['USAGE']);
   RETURN NEXT schema_privs_are ('__msar', 'testuser', ARRAY['USAGE']);
-  PERFORM msar.create_basic_mathesar_user(
-    'Ro"\bert''); DROP SCHEMA public;', 'my''pass1234"; DROP SCHEMA public;'
+  PERFORM msar.create_role(
+    'Ro"\bert''); DROP SCHEMA public;', 'my''pass1234"; DROP SCHEMA public;', true
   );
   RETURN NEXT has_schema('public');
   RETURN NEXT has_user('Ro"\bert''); DROP SCHEMA public;');
diff --git a/mathesar/utils/connections.py b/mathesar/utils/connections.py
index 000efb7ea5..b999e87789 100644
--- a/mathesar/utils/connections.py
+++ b/mathesar/utils/connections.py
@@ -47,9 +47,10 @@ def create_connection_with_new_user(
     conn_model.save()
     dbconn.execute_msar_func_with_engine(
         engine,
-        'create_basic_mathesar_user',
+        'create_role',
         conn_model.username,
-        conn_model.password
+        conn_model.password,
+        True
     )
     _load_sample_data(conn_model._sa_engine, sample_data)
     return conn_model

From 22e8068d0df80d1afd872c49b870eaaabb934533 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 22 Aug 2024 23:44:04 +0530
Subject: [PATCH 0711/1141] fix sql test

---
 db/sql/test_00_msar.sql | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index f6d969ee86..93d247f2b4 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2277,20 +2277,16 @@ CREATE OR REPLACE FUNCTION test_create_role() RETURNS SETOF TEXT AS $$
 BEGIN
   PERFORM msar.create_role('testuser', 'mypass1234', true);
   RETURN NEXT database_privs_are (
-    'mathesar_testing', 'testuser', ARRAY['CREATE', 'CONNECT', 'TEMPORARY']
+    'mathesar_testing', 'testuser', ARRAY['CONNECT']
   );
-  RETURN NEXT schema_privs_are ('msar', 'testuser', ARRAY['USAGE']);
-  RETURN NEXT schema_privs_are ('__msar', 'testuser', ARRAY['USAGE']);
   PERFORM msar.create_role(
     'Ro"\bert''); DROP SCHEMA public;', 'my''pass1234"; DROP SCHEMA public;', true
   );
   RETURN NEXT has_schema('public');
   RETURN NEXT has_user('Ro"\bert''); DROP SCHEMA public;');
   RETURN NEXT database_privs_are (
-    'mathesar_testing', 'Ro"\bert''); DROP SCHEMA public;', ARRAY['CREATE', 'CONNECT', 'TEMPORARY']
+    'mathesar_testing', 'Ro"\bert''); DROP SCHEMA public;', ARRAY['CONNECT']
   );
-  RETURN NEXT schema_privs_are ('msar', 'Ro"\bert''); DROP SCHEMA public;', ARRAY['USAGE']);
-  RETURN NEXT schema_privs_are ('__msar', 'Ro"\bert''); DROP SCHEMA public;', ARRAY['USAGE']);
 END;
 $$ LANGUAGE plpgsql;
 

From 5730b7074983a9c7765fa216cfefd1a9578b5d7e Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 23 Aug 2024 02:02:04 +0530
Subject: [PATCH 0712/1141] fix sql test

---
 db/sql/test_00_msar.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 93d247f2b4..d7da1b9ab7 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2276,17 +2276,17 @@ $$ LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION test_create_role() RETURNS SETOF TEXT AS $$
 BEGIN
   PERFORM msar.create_role('testuser', 'mypass1234', true);
-  RETURN NEXT database_privs_are (
-    'mathesar_testing', 'testuser', ARRAY['CONNECT']
-  );
+  RETURN NEXT database_privs_are('mathesar_testing', 'testuser', ARRAY['CONNECT', 'TEMPORARY']);
   PERFORM msar.create_role(
     'Ro"\bert''); DROP SCHEMA public;', 'my''pass1234"; DROP SCHEMA public;', true
   );
   RETURN NEXT has_schema('public');
   RETURN NEXT has_user('Ro"\bert''); DROP SCHEMA public;');
   RETURN NEXT database_privs_are (
-    'mathesar_testing', 'Ro"\bert''); DROP SCHEMA public;', ARRAY['CONNECT']
+    'mathesar_testing', 'Ro"\bert''); DROP SCHEMA public;', ARRAY['CONNECT', 'TEMPORARY']
   );
+  PERFORM msar.create_role('testnopass', null, null);
+  RETURN NEXT database_privs_are('mathesar_testing', 'testnopass', ARRAY['CONNECT', 'TEMPORARY']);
 END;
 $$ LANGUAGE plpgsql;
 

From 53239e0de0791477f602516b259ef8a6707e8818 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 23 Aug 2024 03:47:31 +0530
Subject: [PATCH 0713/1141] add mocks for roles.list and roles.add

---
 mathesar/rpc/roles.py            |   4 +-
 mathesar/tests/rpc/test_roles.py | 110 +++++++++++++++++++++++++++++++
 2 files changed, 112 insertions(+), 2 deletions(-)
 create mode 100644 mathesar/tests/rpc/test_roles.py

diff --git a/mathesar/rpc/roles.py b/mathesar/rpc/roles.py
index f88a90ffc2..4f3303243d 100644
--- a/mathesar/rpc/roles.py
+++ b/mathesar/rpc/roles.py
@@ -14,7 +14,7 @@
 
 class RoleMember(TypedDict):
     """
-    Information about a member role of an inherited role.
+    Information about a member role of a directly inherited role.
 
     Attributes:
         oid: The OID of the member role.
@@ -37,7 +37,7 @@ class RoleInfo(TypedDict):
         create_db: Whether the role has CREATEDB attribute.
         login: Whether the role has LOGIN attribute.
         description: A description of the role
-        members: The member roles that inherit the role.
+        members: The member roles that directly inherit the role.
 
     Refer PostgreSQL documenation on:
         - [pg_roles table](https://www.postgresql.org/docs/current/view-pg-roles.html).
diff --git a/mathesar/tests/rpc/test_roles.py b/mathesar/tests/rpc/test_roles.py
new file mode 100644
index 0000000000..1f606c5693
--- /dev/null
+++ b/mathesar/tests/rpc/test_roles.py
@@ -0,0 +1,110 @@
+"""
+This file tests the roles RPC functions.
+
+Fixtures:
+    rf(pytest-django): Provides mocked `Request` objects.
+    monkeypatch(pytest): Lets you monkeypatch an object for testing.
+"""
+from contextlib import contextmanager
+
+from mathesar.rpc import roles
+from mathesar.models.users import User
+
+
+def test_roles_list(rf, monkeypatch):
+    _username = 'alice'
+    _password = 'pass1234'
+    _database_id = 2
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=_username, password=_password)
+
+    @contextmanager
+    def mock_connect(database_id, user):
+        if database_id == _database_id and user.username == _username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_list_roles(conn):
+        return [
+            {
+                'oid': '10',
+                'name': 'mathesar',
+                'login': True,
+                'super': True,
+                'members': [{'oid': 2573031, 'admin': False}],
+                'inherits': True,
+                'create_db': True,
+                'create_role': True,
+                'description': None
+            },
+            {
+                'oid': '2573031',
+                'name': 'inherit_msar',
+                'login': True,
+                'super': False,
+                'members': None,
+                'inherits': True,
+                'create_db': False,
+                'create_role': False,
+                'description': None
+            },
+            {
+                'oid': '2573189',
+                'name': 'nopriv',
+                'login': False,
+                'super': False,
+                'members': None,
+                'inherits': True,
+                'create_db': False,
+                'create_role': False,
+                'description': None
+            },
+        ]
+
+    monkeypatch.setattr(roles, 'connect', mock_connect)
+    monkeypatch.setattr(roles, 'list_roles', mock_list_roles)
+    roles.list_(database_id=_database_id, request=request)
+
+
+def test_roles_add(rf, monkeypatch):
+    _username = 'alice'
+    _password = 'pass1234'
+    _database_id = 2
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=_username, password=_password)
+
+    @contextmanager
+    def mock_connect(database_id, user):
+        if database_id == _database_id and user.username == _username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_create_role(rolename, password, login, conn):
+        if (
+            rolename != _username
+            or password != _password
+        ):
+            raise AssertionError('incorrect parameters passed')
+        return {
+            'oid': '2573190',
+            'name': 'alice',
+            'login': False,
+            'super': False,
+            'members': None,
+            'inherits': True,
+            'create_db': False,
+            'create_role': False,
+            'description': None
+        }
+
+    monkeypatch.setattr(roles, 'connect', mock_connect)
+    monkeypatch.setattr(roles, 'create_role', mock_create_role)
+    roles.add(rolename=_username, database_id=_database_id, password=_password, login=True, request=request)

From cb026427ab589142accd483163943561e205b86b Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 23 Aug 2024 03:50:56 +0530
Subject: [PATCH 0714/1141] add comments for role_info_table attributes

---
 db/sql/00_msar.sql | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 45a24dcc98..0558357248 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -899,15 +899,15 @@ $$ LANGUAGE SQL;
 
 CREATE OR REPLACE FUNCTION msar.role_info_table() RETURNS TABLE
 (
-  oid oid,
-  name name,
-  super boolean,
-  inherits boolean,
-  create_role boolean,
-  create_db boolean,
-  login boolean,
-  description text,
-  members jsonb
+  oid oid, -- The OID of the role.
+  name name, -- Name of the role.
+  super boolean, -- Whether the role has SUPERUSER status.
+  inherits boolean, -- Whether the role has INHERIT attribute.
+  create_role boolean, -- Whether the role has CREATEROLE attribute.
+  create_db boolean, -- Whether the role has CREATEDB attribute.
+  login boolean, -- Whether the role has LOGIN attribute.
+  description text, -- A description of the role
+  members jsonb -- The member roles that *directly* inherit the role.
 ) AS $$/*
 Returns a table describing all the roles present on the database server.
 */

From 6a7e991b54f0d7be2e79d77e16b406492feb2d8d Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 23 Aug 2024 13:29:07 +0800
Subject: [PATCH 0715/1141] extract summary building logic to separate function
 for clarity

---
 db/sql/00_msar.sql | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 8e82f6d8c0..e3afe32ef7 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3821,13 +3821,26 @@ ORDER BY conkey, target_oid, confkey;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION msar.build_summary_expr(tab_id oid) RETURNS TEXT AS $$/*
+Given a table, return an SQL expression that will build a summary for each row of the table.
+
+Args:
+  tab_id: The OID of the table being summarized.
+*/
+SELECT format(
+  'msar.format_data(%I)::text',
+  msar.get_column_name(tab_id, msar.get_default_summary_column(tab_id))
+);
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
 CREATE OR REPLACE FUNCTION msar.build_summary_cte_expr_for_table(tab_id oid) RETURNS TEXT AS $$/*
 Build an SQL text expression defining a sequence of CTEs that give summaries for linked records.
 
 This summary amounts to just the first string-like column value for that linked record.
 
 Args:
-  tab_oid: The table for whose fkey values' linked records we'll get summaries.
+  tab_id: The table for whose fkey values' linked records we'll get summaries.
 */
 WITH fkey_map_cte AS (SELECT * FROM msar.get_fkey_map_cte(tab_id))
 SELECT ', ' || string_agg(
@@ -3835,12 +3848,12 @@ SELECT ', ' || string_agg(
     $c$summary_cte_%1$s AS (
       SELECT
         msar.format_data(%2$I) AS key,
-        msar.format_data(%3$I)::text AS summary
+        %3$s AS summary
       FROM %4$I.%5$I
     )$c$,
     conkey,
     msar.get_column_name(target_oid, confkey),
-    msar.get_column_name(target_oid, msar.get_default_summary_column(target_oid)),
+    msar.build_summary_expr(target_oid),
     msar.get_relation_schema_name(target_oid),
     msar.get_relation_name(target_oid)
   ), ', '

From 13ec0191a3d98a4b54e6babb66bc5d0b54061a4f Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 23 Aug 2024 17:56:30 +0800
Subject: [PATCH 0716/1141] Add initial privilege replacer SQL function

---
 db/sql/00_msar.sql | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 0558357248..12a4ee13e6 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1084,6 +1084,50 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+CREATE OR REPLACE FUNCTION
+msar.build_database_privilege_replace_expr(rol_id regrole, privileges_ jsonb) RETURNS TEXT AS $$
+SELECT string_agg(
+  format(
+    concat(
+      CASE WHEN privileges_ ? val THEN 'GRANT' ELSE 'REVOKE' END,
+      ' %1$s ON DATABASE %2$I ',
+      CASE WHEN privileges_ ? val THEN 'TO' ELSE 'FROM' END,
+      ' %3$I'
+    ),
+    val,
+    current_database(),
+    rol_id
+  ),
+  E';\n'
+) || E';\n'
+FROM unnest(ARRAY['CONNECT', 'CREATE', 'TEMPORARY']) as x(val);
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.replace_database_privileges_for_roles(priv_spec jsonb) RETURNS jsonb AS $$/*
+Grant/Revoke privileges for a set of roles on the current database.
+
+Args:
+  priv_spec: An array defining the privileges to grant or revoke for each role.
+
+Each object in the priv_spec should have the form:
+{role_oid: <int>, privileges: SET<"CONNECT"|"CREATE"|"TEMPORARY">}
+
+Any privilege that exists in the privileges subarray will be granted. Any which is missing will be
+revoked.
+*/
+BEGIN
+EXECUTE string_agg(
+  msar.build_database_privilege_replace_expr(role_oid, privileges),
+  E';\n'
+) || ';'
+FROM jsonb_to_recordset(priv_spec) AS x(role_oid regrole, privileges jsonb);
+RETURN msar.list_db_priv(current_database());
+END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 -- ALTER SCHEMA FUNCTIONS

From 2ef8abfde9baca7daead29f526409cfd7f59f0d4 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 23 Aug 2024 19:16:23 +0800
Subject: [PATCH 0717/1141] use name getter function to handle (un)quoting

---
 db/sql/00_msar.sql      | 24 +++++++++++++++++++++++-
 db/sql/test_00_msar.sql | 28 ++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 12a4ee13e6..d2402e3780 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -497,6 +497,28 @@ END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION msar.get_role_name(rol_oid oid) RETURNS TEXT AS $$/*
+Return the UNQUOTED name of a given role.
+
+If the role does not exist, an exception will be raised.
+
+Args:
+  rol_oid: The OID of the role.
+*/
+DECLARE rol_name text;
+BEGIN
+  SELECT rolname INTO rol_name FROM pg_roles WHERE oid=rol_oid;
+
+  IF rol_name IS NULL THEN
+    RAISE EXCEPTION 'Role with OID % does not exist', rol_oid
+    USING ERRCODE = '42704'; -- undefined_object
+  END IF;
+
+  RETURN rol_name;
+END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
 CREATE OR REPLACE FUNCTION msar.get_constraint_type_api_code(contype char) RETURNS TEXT AS $$/*
 This function returns a string that represents the constraint type code used to describe
 constraints when listing them within the Mathesar API.
@@ -1096,7 +1118,7 @@ SELECT string_agg(
     ),
     val,
     current_database(),
-    rol_id
+    msar.get_role_name(rol_id)
   ),
   E';\n'
 ) || E';\n'
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index d7da1b9ab7..1c4f091239 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -4098,3 +4098,31 @@ BEGIN
   );
 END;
 $$ LANGUAGE plpgsql;
+
+
+-- msar.replace_database_privileges_for_roles ------------------------------------------------------
+
+
+CREATE OR REPLACE FUNCTION test_replace_database_privileges_for_roles() RETURNS SETOF TEXT AS $$
+DECLARE
+  alice_id oid;
+  bob_id oid;
+BEGIN
+  CREATE ROLE "Alice";
+  CREATE ROLE "Bob";
+  alice_id := '"Alice"'::regrole::oid;
+  bob_id := '"Bob"'::regrole::oid;
+
+  RETURN NEXT ok(
+    msar.replace_database_privileges_for_roles(
+      jsonb_build_array(
+        jsonb_build_object(
+          'role_oid', alice_id, 'privileges', jsonb_build_array('CONNECT', 'CREATE')
+        )
+      )
+    ) @> jsonb_build_array(
+      jsonb_build_object('direct', jsonb_build_array('CONNECT', 'CREATE'), 'role_oid', alice_id::text)
+    )
+  );
+END;
+$$ LANGUAGE plpgsql;

From 76e14a227475b0de21f28dd00e9dea6c99a55e1a Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 26 Aug 2024 13:41:36 +0800
Subject: [PATCH 0718/1141] Add SQL tests for privilege replacement

---
 db/sql/test_00_msar.sql | 122 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 109 insertions(+), 13 deletions(-)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 1c4f091239..d88a4afc69 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -4103,26 +4103,122 @@ $$ LANGUAGE plpgsql;
 -- msar.replace_database_privileges_for_roles ------------------------------------------------------
 
 
-CREATE OR REPLACE FUNCTION test_replace_database_privileges_for_roles() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION
+test_replace_database_privileges_for_roles_basic() RETURNS SETOF TEXT AS $$/*
+Happy path, smoke test.
+*/
 DECLARE
   alice_id oid;
   bob_id oid;
 BEGIN
   CREATE ROLE "Alice";
-  CREATE ROLE "Bob";
+  CREATE ROLE bob;
   alice_id := '"Alice"'::regrole::oid;
-  bob_id := '"Bob"'::regrole::oid;
+  bob_id := 'bob'::regrole::oid;
 
-  RETURN NEXT ok(
-    msar.replace_database_privileges_for_roles(
-      jsonb_build_array(
-        jsonb_build_object(
-          'role_oid', alice_id, 'privileges', jsonb_build_array('CONNECT', 'CREATE')
-        )
-      )
-    ) @> jsonb_build_array(
-      jsonb_build_object('direct', jsonb_build_array('CONNECT', 'CREATE'), 'role_oid', alice_id::text)
-    )
+  RETURN NEXT set_eq(
+    format(
+      $t1$SELECT jsonb_array_elements_text(direct) FROM jsonb_to_recordset(
+        msar.replace_database_privileges_for_roles(jsonb_build_array(jsonb_build_object(
+          'role_oid', %1$s, 'privileges', jsonb_build_array('CONNECT', 'CREATE')))))
+        AS x(direct jsonb, role_oid regrole)
+      WHERE role_oid=%1$s $t1$,
+      alice_id
+    ),
+    ARRAY['CONNECT', 'CREATE'],
+    'Response should contain updated role info in correct form'
+  );
+  RETURN NEXT set_eq(
+    concat(
+      'SELECT privilege_type FROM pg_database, LATERAL aclexplode(pg_database.datacl) acl',
+      format(' WHERE acl.grantee=%s;', alice_id)
+    ),
+    ARRAY['CONNECT', 'CREATE'],
+    'Privileges should be updated for actual database properly'
+  );
+  RETURN NEXT set_eq(
+    format(
+      $t2$SELECT jsonb_array_elements_text(direct) FROM jsonb_to_recordset(
+        msar.replace_database_privileges_for_roles(jsonb_build_array(jsonb_build_object(
+              'role_oid', %1$s, 'privileges', jsonb_build_array('CONNECT')))))
+        AS x(direct jsonb, role_oid regrole)
+      WHERE role_oid=%1$s $t2$,
+      bob_id
+    ),
+    ARRAY['CONNECT'],
+    'Response should contain updated role info in correct form'
+  );
+  RETURN NEXT set_eq(
+    concat(
+      'SELECT privilege_type FROM pg_database, LATERAL aclexplode(pg_database.datacl) acl',
+      format(' WHERE acl.grantee=%s;', alice_id)
+    ),
+    ARRAY['CONNECT', 'CREATE'],
+    'Alice''s privileges should be left alone properly'
+  );
+  RETURN NEXT set_eq(
+    concat(
+      'SELECT privilege_type FROM pg_database, LATERAL aclexplode(pg_database.datacl) acl',
+      format(' WHERE acl.grantee=%s;', bob_id)
+    ),
+    ARRAY['CONNECT'],
+    'Privileges should be updated for actual database properly'
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION __setup_alice_and_bob_preloaded() RETURNS SETOF TEXT AS $$
+BEGIN
+  CREATE ROLE "Alice";
+  GRANT CONNECT, CREATE ON DATABASE mathesar_testing TO "Alice";
+  CREATE ROLE bob;
+  GRANT CONNECT ON DATABASE mathesar_testing TO bob;
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION
+test_replace_database_privileges_for_roles_multi_ops() RETURNS SETOF TEXT AS $$/*
+Test that we can add/revoke multiple privileges to/from multiple roles simultaneously.
+*/
+DECLARE
+  alice_id oid;
+  bob_id oid;
+BEGIN
+  PERFORM __setup_alice_and_bob_preloaded();
+  alice_id := '"Alice"'::regrole::oid;
+  bob_id := 'bob'::regrole::oid;
+  RETURN NEXT set_eq(
+    -- Revoke CREATE from Alice, Grant CREATE to Bob.
+    format(
+      $t1$SELECT jsonb_array_elements_text(direct) FROM jsonb_to_recordset(
+        msar.replace_database_privileges_for_roles(jsonb_build_array(
+          jsonb_build_object('role_oid', %1$s, 'privileges', jsonb_build_array('CONNECT')),
+          jsonb_build_object('role_oid', %2$s, 'privileges', jsonb_build_array('CONNECT', 'CREATE')))))
+        AS x(direct jsonb, role_oid regrole)
+      WHERE role_oid=%1$s $t1$,
+      alice_id,
+      bob_id
+    ),
+    ARRAY['CONNECT'], -- This only checks form of Alice's info in response.
+    'Response should contain updated role info in correct form'
+  );
+  RETURN NEXT set_eq(
+    concat(
+      'SELECT privilege_type FROM pg_database, LATERAL aclexplode(pg_database.datacl) acl',
+      format(' WHERE acl.grantee=%s;', alice_id)
+    ),
+    ARRAY['CONNECT'],
+    'Alice''s privileges should be updated for actual database properly'
+  );
+  RETURN NEXT set_eq(
+    concat(
+      'SELECT privilege_type FROM pg_database, LATERAL aclexplode(pg_database.datacl) acl',
+      format(' WHERE acl.grantee=%s;', bob_id)
+    ),
+    ARRAY['CONNECT', 'CREATE'],
+    'Bob''s privileges should be updated for actual database properly'
   );
 END;
 $$ LANGUAGE plpgsql;

From 3ed5f7c8544e5af916b39759cd53f99191f44fe1 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 26 Aug 2024 14:05:31 +0800
Subject: [PATCH 0719/1141] Add python wrapper for role replacer

---
 db/roles/operations/update.py            |  7 +++++++
 db/tests/roles/operations/test_update.py | 13 +++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 db/roles/operations/update.py
 create mode 100644 db/tests/roles/operations/test_update.py

diff --git a/db/roles/operations/update.py b/db/roles/operations/update.py
new file mode 100644
index 0000000000..2ea74e25e3
--- /dev/null
+++ b/db/roles/operations/update.py
@@ -0,0 +1,7 @@
+from db.connection import exec_msar_func
+
+
+def replace_database_privileges_for_roles(conn, privilege_spec):
+    return exec_msar_func(
+        conn, 'replace_database_privileges_for_roles', privilege_spec
+    ).fetchone()[0]
diff --git a/db/tests/roles/operations/test_update.py b/db/tests/roles/operations/test_update.py
new file mode 100644
index 0000000000..a8ed646d58
--- /dev/null
+++ b/db/tests/roles/operations/test_update.py
@@ -0,0 +1,13 @@
+from unittest.mock import patch
+from db.roles.operations import update as rupdate
+
+
+def test_replace_database_privileges_for_roles():
+    priv_spec = [{"role_oid": 1234, "privileges": ["CONNECT", "CREATE"]}]
+    with patch.object(rupdate, 'exec_msar_func') as mock_exec:
+        mock_exec.return_value.fetchone = lambda: ('a', 'b')
+        result = rupdate.replace_database_privileges_for_roles('conn', priv_spec)
+    mock_exec.assert_called_once_with(
+        'conn', 'replace_database_privileges_for_roles', priv_spec
+    )
+    assert result == 'a'

From 376aa6bb63f3b6d02ee8054efb275d210f53a88f Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 26 Aug 2024 15:09:45 +0800
Subject: [PATCH 0720/1141] update param name to conform with other RPC
 functions

---
 db/roles/operations/update.py | 5 +++--
 db/sql/00_msar.sql            | 4 ++--
 db/sql/test_00_msar.sql       | 8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/db/roles/operations/update.py b/db/roles/operations/update.py
index 2ea74e25e3..a0bcccb4e3 100644
--- a/db/roles/operations/update.py
+++ b/db/roles/operations/update.py
@@ -1,7 +1,8 @@
+import json
 from db.connection import exec_msar_func
 
 
-def replace_database_privileges_for_roles(conn, privilege_spec):
+def replace_database_privileges_for_roles(conn, privileges):
     return exec_msar_func(
-        conn, 'replace_database_privileges_for_roles', privilege_spec
+        conn, 'replace_database_privileges_for_roles', json.dumps(privileges)
     ).fetchone()[0]
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index d2402e3780..a26a910d58 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1141,10 +1141,10 @@ revoked.
 */
 BEGIN
 EXECUTE string_agg(
-  msar.build_database_privilege_replace_expr(role_oid, privileges),
+  msar.build_database_privilege_replace_expr(role_oid, direct),
   E';\n'
 ) || ';'
-FROM jsonb_to_recordset(priv_spec) AS x(role_oid regrole, privileges jsonb);
+FROM jsonb_to_recordset(priv_spec) AS x(role_oid regrole, direct jsonb);
 RETURN msar.list_db_priv(current_database());
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index d88a4afc69..14099400ba 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -4120,7 +4120,7 @@ BEGIN
     format(
       $t1$SELECT jsonb_array_elements_text(direct) FROM jsonb_to_recordset(
         msar.replace_database_privileges_for_roles(jsonb_build_array(jsonb_build_object(
-          'role_oid', %1$s, 'privileges', jsonb_build_array('CONNECT', 'CREATE')))))
+          'role_oid', %1$s, 'direct', jsonb_build_array('CONNECT', 'CREATE')))))
         AS x(direct jsonb, role_oid regrole)
       WHERE role_oid=%1$s $t1$,
       alice_id
@@ -4140,7 +4140,7 @@ BEGIN
     format(
       $t2$SELECT jsonb_array_elements_text(direct) FROM jsonb_to_recordset(
         msar.replace_database_privileges_for_roles(jsonb_build_array(jsonb_build_object(
-              'role_oid', %1$s, 'privileges', jsonb_build_array('CONNECT')))))
+              'role_oid', %1$s, 'direct', jsonb_build_array('CONNECT')))))
         AS x(direct jsonb, role_oid regrole)
       WHERE role_oid=%1$s $t2$,
       bob_id
@@ -4194,8 +4194,8 @@ BEGIN
     format(
       $t1$SELECT jsonb_array_elements_text(direct) FROM jsonb_to_recordset(
         msar.replace_database_privileges_for_roles(jsonb_build_array(
-          jsonb_build_object('role_oid', %1$s, 'privileges', jsonb_build_array('CONNECT')),
-          jsonb_build_object('role_oid', %2$s, 'privileges', jsonb_build_array('CONNECT', 'CREATE')))))
+          jsonb_build_object('role_oid', %1$s, 'direct', jsonb_build_array('CONNECT')),
+          jsonb_build_object('role_oid', %2$s, 'direct', jsonb_build_array('CONNECT', 'CREATE')))))
         AS x(direct jsonb, role_oid regrole)
       WHERE role_oid=%1$s $t1$,
       alice_id,

From 931c065e4fd0f18284fdf0e8783298c5f9460ace Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 26 Aug 2024 15:11:24 +0800
Subject: [PATCH 0721/1141] wire up db privilege replacer to RPC endpoint

---
 mathesar/rpc/database_privileges.py  | 24 ++++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py |  5 +++++
 2 files changed, 29 insertions(+)

diff --git a/mathesar/rpc/database_privileges.py b/mathesar/rpc/database_privileges.py
index 16d8971677..372bc157c9 100644
--- a/mathesar/rpc/database_privileges.py
+++ b/mathesar/rpc/database_privileges.py
@@ -4,6 +4,7 @@
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from db.roles.operations.select import list_db_priv, get_curr_role_db_priv
+from db.roles.operations.update import replace_database_privileges_for_roles
 from mathesar.rpc.utils import connect
 from mathesar.models.base import Database
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
@@ -86,3 +87,26 @@ def get_owner_oid_and_curr_role_db_priv(*, database_id: int, **kwargs) -> Curren
         db_name = Database.objects.get(id=database_id).name
         curr_role_db_priv = get_curr_role_db_priv(db_name, conn)
     return CurrentDBPrivileges.from_dict(curr_role_db_priv)
+
+
+@rpc_method(name="database_privileges.replace_for_roles")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def replace_for_roles(
+        *, privileges: list[DBPrivileges], database_id: int, **kwargs
+) -> list[DBPrivileges]:
+    """
+    List database privileges for non-inherited roles.
+
+    Args:
+        database_id: The Django id of the database.
+
+    Returns:
+        A list of database privileges.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        raw_db_priv = replace_database_privileges_for_roles(
+            conn, [DBPrivileges.from_dict(i) for i in privileges]
+        )
+    return [DBPrivileges.from_dict(i) for i in raw_db_priv]
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 1c97ef27f5..f6d3f27228 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -156,6 +156,11 @@
         "database_privileges.get_owner_oid_and_curr_role_db_priv",
         [user_is_authenticated]
     ),
+    (
+        database_privileges.replace_for_roles,
+        "database_privileges.replace_for_roles",
+        [user_is_authenticated]
+    ),
     (
         database_setup.create_new,
         "database_setup.create_new",

From d8e8a181256a5d931b758768d32ceed43ff5fd68 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 26 Aug 2024 15:26:21 +0800
Subject: [PATCH 0722/1141] add wiring test for database privilege replacer

---
 .../tests/rpc/test_database_privileges.py     | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 mathesar/tests/rpc/test_database_privileges.py

diff --git a/mathesar/tests/rpc/test_database_privileges.py b/mathesar/tests/rpc/test_database_privileges.py
new file mode 100644
index 0000000000..688a254990
--- /dev/null
+++ b/mathesar/tests/rpc/test_database_privileges.py
@@ -0,0 +1,53 @@
+"""
+This file tests the database_privileges RPC functions.
+
+Fixtures:
+    rf(pytest-django): Provides mocked `Request` objects.
+    monkeypatch(pytest): Lets you monkeypatch an object for testing.
+"""
+from contextlib import contextmanager
+
+from mathesar.rpc import database_privileges
+from mathesar.models.users import User
+
+
+def test_database_privileges_set_for_roles(rf, monkeypatch):
+    _username = 'alice'
+    _password = 'pass1234'
+    _database_id = 2
+    _privileges = [{"role_oid": 12345, "direct": ["CONNECT"]}]
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=_username, password=_password)
+
+    @contextmanager
+    def mock_connect(database_id, user):
+        if database_id == _database_id and user.username == _username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_replace_privileges(
+            conn,
+            privileges,
+    ):
+        if privileges != _privileges:
+            raise AssertionError('incorrect parameters passed')
+        return _privileges + [{"role_oid": 67890, "direct": ["CONNECT", "TEMPORARY"]}]
+
+    monkeypatch.setattr(database_privileges, 'connect', mock_connect)
+    monkeypatch.setattr(
+        database_privileges,
+        'replace_database_privileges_for_roles',
+        mock_replace_privileges
+    )
+    expect_response = [
+        {"role_oid": 12345, "direct": ["CONNECT"]},
+        {"role_oid": 67890, "direct": ["CONNECT", "TEMPORARY"]}
+    ]
+    actual_response = database_privileges.replace_for_roles(
+        privileges=_privileges, database_id=_database_id, request=request
+    )
+    assert actual_response == expect_response

From 86530e508be6de8d7db44bbb1d3f51ae0118a65e Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 26 Aug 2024 15:36:06 +0800
Subject: [PATCH 0723/1141] improve/add docs for role privilege replacer

---
 docs/docs/api/rpc.md                |  1 +
 mathesar/rpc/database_privileges.py | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index c075e334f8..022026b026 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -84,6 +84,7 @@ To use an RPC function:
       members:
       - list_direct
       - get_owner_oid_and_curr_role_db_priv
+      - replace_for_roles
       - DBPrivileges
       - CurrentDBPrivileges
 
diff --git a/mathesar/rpc/database_privileges.py b/mathesar/rpc/database_privileges.py
index 372bc157c9..7db82c93f6 100644
--- a/mathesar/rpc/database_privileges.py
+++ b/mathesar/rpc/database_privileges.py
@@ -1,4 +1,4 @@
-from typing import TypedDict
+from typing import Literal, TypedDict
 
 from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
@@ -19,7 +19,7 @@ class DBPrivileges(TypedDict):
         direct: A list of database privileges for the afforementioned role_oid.
     """
     role_oid: int
-    direct: list[str]
+    direct: list[Literal['CONNECT' | 'CREATE' | 'TEMPORARY']]
 
     @classmethod
     def from_dict(cls, d):
@@ -96,13 +96,23 @@ def replace_for_roles(
         *, privileges: list[DBPrivileges], database_id: int, **kwargs
 ) -> list[DBPrivileges]:
     """
-    List database privileges for non-inherited roles.
+    Replace direct database privileges for roles.
+
+    Possible privileges are `CONNECT`, `CREATE`, and `TEMPORARY`.
+
+    Only roles which are included in a passed `DBPrivileges` object are
+    affected.
+
+    WARNING: Any privilege included in the `direct` list for a role
+    is GRANTed, and any privilege not included is REVOKEd.
 
     Args:
+        privileges: The new privilege sets for roles.
         database_id: The Django id of the database.
 
     Returns:
-        A list of database privileges.
+        A list of all non-default privileges on the database after the
+        operation.
     """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:

From a60bf26104632f50b3a496973da1aee3d9b7a5c1 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 26 Aug 2024 15:53:04 +0800
Subject: [PATCH 0724/1141] Fix typing literal/union syntax

---
 mathesar/rpc/database_privileges.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/rpc/database_privileges.py b/mathesar/rpc/database_privileges.py
index 7db82c93f6..f45908da3c 100644
--- a/mathesar/rpc/database_privileges.py
+++ b/mathesar/rpc/database_privileges.py
@@ -19,7 +19,7 @@ class DBPrivileges(TypedDict):
         direct: A list of database privileges for the afforementioned role_oid.
     """
     role_oid: int
-    direct: list[Literal['CONNECT' | 'CREATE' | 'TEMPORARY']]
+    direct: list[Literal['CONNECT', 'CREATE', 'TEMPORARY']]
 
     @classmethod
     def from_dict(cls, d):

From 89cc77d1f6129b12ce69e11a9f831e726b46d2bc Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 26 Aug 2024 16:13:53 +0800
Subject: [PATCH 0725/1141] update test to conform to actual function call

---
 db/tests/roles/operations/test_update.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/db/tests/roles/operations/test_update.py b/db/tests/roles/operations/test_update.py
index a8ed646d58..3393d3c3c7 100644
--- a/db/tests/roles/operations/test_update.py
+++ b/db/tests/roles/operations/test_update.py
@@ -1,3 +1,4 @@
+import json
 from unittest.mock import patch
 from db.roles.operations import update as rupdate
 
@@ -8,6 +9,6 @@ def test_replace_database_privileges_for_roles():
         mock_exec.return_value.fetchone = lambda: ('a', 'b')
         result = rupdate.replace_database_privileges_for_roles('conn', priv_spec)
     mock_exec.assert_called_once_with(
-        'conn', 'replace_database_privileges_for_roles', priv_spec
+        'conn', 'replace_database_privileges_for_roles', json.dumps(priv_spec)
     )
     assert result == 'a'

From 413d231e51f004ba623ee78e225469be5dacc607 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 26 Aug 2024 17:33:07 +0800
Subject: [PATCH 0726/1141] add schema privilege listing SQL function and tests

---
 db/sql/00_msar.sql      | 26 ++++++++++++++++++++++++++
 db/sql/test_00_msar.sql | 28 ++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 040340dfa4..458944afb4 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -897,6 +897,32 @@ FROM (
 $$ LANGUAGE SQL;
 
 
+CREATE OR REPLACE FUNCTION msar.list_schema_privileges(sch_id regnamespace) RETURNS jsonb AS $$/*
+Given a schema, returns a json array of objects with direct, non-default schema privileges
+
+Each returned JSON object in the array has the form:
+  {
+    "role_oid": <int>,
+    "direct" [<str>]
+  }
+*/
+WITH priv_cte AS (
+  SELECT
+    jsonb_build_object(
+      'role_oid', pgr.oid::bigint,
+      'direct',  jsonb_agg(acl.privilege_type)
+    ) AS p
+  FROM
+    pg_catalog.pg_roles AS pgr,
+    pg_catalog.pg_namespace AS pgn,
+    aclexplode(COALESCE(pgn.nspacl, acldefault('n', pgn.nspowner))) AS acl
+  WHERE pgn.oid = sch_id AND pgr.oid = acl.grantee AND pgr.rolname NOT LIKE 'pg_'
+  GROUP BY pgr.oid, pgn.oid
+)
+SELECT COALESCE(jsonb_agg(priv_cte.p), '[]'::jsonb) FROM priv_cte;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
 CREATE OR REPLACE FUNCTION msar.role_info_table() RETURNS TABLE
 (
   oid oid, -- The OID of the role.
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 07024b2667..63ce625755 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2802,6 +2802,34 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+CREATE OR REPLACE FUNCTION test_list_schema_privileges_basic() RETURNS SETOF TEXT AS $$
+BEGIN
+CREATE SCHEMA restricted;
+RETURN NEXT is(
+  msar.list_schema_privileges('restricted'::regnamespace),
+  format('[{"direct": ["USAGE", "CREATE"], "role_oid": %s}]', 'mathesar'::regrole::oid)::jsonb,
+  'Initially, only privileges for creator'
+);
+CREATE USER "Alice";
+RETURN NEXT is(
+  msar.list_schema_privileges('restricted'::regnamespace),
+  format('[{"direct": ["USAGE", "CREATE"], "role_oid": %s}]', 'mathesar'::regrole::oid)::jsonb,
+  'Alice should not have any privileges'
+);
+GRANT USAGE ON SCHEMA restricted TO "Alice";
+RETURN NEXT is(
+  msar.list_schema_privileges('restricted'::regnamespace),
+  format(
+    '[{"direct": ["USAGE", "CREATE"], "role_oid": %1$s}, {"direct": ["USAGE"], "role_oid": %2$s}]',
+    'mathesar'::regrole::oid,
+    '"Alice"'::regrole::oid
+  )::jsonb,
+  'Alice should have her schema new privileges'
+);
+END;
+$$ LANGUAGE plpgsql;
+
+
 CREATE OR REPLACE FUNCTION test_list_roles() RETURNS SETOF TEXT AS $$
 DECLARE
   initial_role_count int;

From 6a7bc0b14103fa8519841ee73762524cccb9da8c Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 26 Aug 2024 17:45:00 +0800
Subject: [PATCH 0727/1141] add python wrapper for schema privilege lister

---
 db/roles/operations/select.py            | 4 ++++
 db/tests/roles/operations/test_select.py | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/db/roles/operations/select.py b/db/roles/operations/select.py
index 9ad7131f21..a0d4b38a70 100644
--- a/db/roles/operations/select.py
+++ b/db/roles/operations/select.py
@@ -9,5 +9,9 @@ def list_db_priv(db_name, conn):
     return exec_msar_func(conn, 'list_db_priv', db_name).fetchone()[0]
 
 
+def list_schema_privileges(schema_oid, conn):
+    return exec_msar_func(conn, 'list_schema_privileges', schema_oid).fetchone()[0]
+
+
 def get_curr_role_db_priv(db_name, conn):
     return exec_msar_func(conn, 'get_owner_oid_and_curr_role_db_priv', db_name).fetchone()[0]
diff --git a/db/tests/roles/operations/test_select.py b/db/tests/roles/operations/test_select.py
index 81536d6967..5f9e42f641 100644
--- a/db/tests/roles/operations/test_select.py
+++ b/db/tests/roles/operations/test_select.py
@@ -8,3 +8,11 @@ def test_list_roles():
         result = ma_sel.list_roles('conn')
     mock_exec.assert_called_once_with('conn', 'list_roles')
     assert result == 'a'
+
+
+def test_list_schema_privileges():
+    with patch.object(ma_sel, 'exec_msar_func') as mock_exec:
+        mock_exec.return_value.fetchone = lambda: ('a', 'b')
+        result = ma_sel.list_schema_privileges(123456, 'conn')
+    mock_exec.assert_called_once_with('conn', 'list_schema_privileges', 123456)
+    assert result == 'a'

From 199c0d20c9f1f09f1c3a22dd8533c62762b3b398 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 26 Aug 2024 17:48:50 +0800
Subject: [PATCH 0728/1141] cast the role OID to bigint as per our guidelines

---
 db/sql/00_msar.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 913cf8f5f9..bbce057a54 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1022,7 +1022,7 @@ Each returned JSON object in the array has the form:
 WITH priv_cte AS (
   SELECT
     jsonb_build_object(
-      'role_oid', pgr.oid,
+      'role_oid', pgr.oid::bigint,
       'direct',  jsonb_agg(acl.privilege_type)
     ) AS p
   FROM

From 083e2c0e214812381715d600425f2744cb7480d1 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 26 Aug 2024 18:01:36 +0800
Subject: [PATCH 0729/1141] wire schema privilege listing up to RPC endpoint

---
 config/settings/common_settings.py   |  1 +
 mathesar/rpc/schema_privileges.py    | 49 ++++++++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py |  5 +++
 3 files changed, 55 insertions(+)
 create mode 100644 mathesar/rpc/schema_privileges.py

diff --git a/config/settings/common_settings.py b/config/settings/common_settings.py
index a736588e1d..cea1d7eff1 100644
--- a/config/settings/common_settings.py
+++ b/config/settings/common_settings.py
@@ -78,6 +78,7 @@ def pipe_delim(pipe_string):
     'mathesar.rpc.records',
     'mathesar.rpc.roles',
     'mathesar.rpc.schemas',
+    'mathesar.rpc.schema_privileges',
     'mathesar.rpc.servers',
     'mathesar.rpc.tables',
     'mathesar.rpc.tables.metadata',
diff --git a/mathesar/rpc/schema_privileges.py b/mathesar/rpc/schema_privileges.py
new file mode 100644
index 0000000000..9d77764b4f
--- /dev/null
+++ b/mathesar/rpc/schema_privileges.py
@@ -0,0 +1,49 @@
+from typing import Literal, TypedDict
+
+from modernrpc.core import rpc_method, REQUEST_KEY
+from modernrpc.auth.basic import http_basic_auth_login_required
+
+from db.roles.operations.select import list_schema_privileges
+from mathesar.rpc.utils import connect
+from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+
+
+class SchemaPrivileges(TypedDict):
+    """
+    Information about schema privileges for a role.
+
+    Attributes:
+        role_oid: The `oid` of the role.
+        direct: A list of schema privileges for the afforementioned role_oid.
+    """
+    role_oid: int
+    direct: list[Literal['USAGE', 'CREATE']]
+
+    @classmethod
+    def from_dict(cls, d):
+        return cls(
+            role_oid=d["role_oid"],
+            direct=d["direct"]
+        )
+
+
+@rpc_method(name="schema_privileges.list_direct")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def list_direct(
+        *, schema_oid: int, database_id: int, **kwargs
+) -> list[SchemaPrivileges]:
+    """
+    List direct schema privileges for roles.
+
+    Args:
+        schema_oid: The OID of the schema whose privileges we'll list.
+        database_id: The Django id of the database containing the schema.
+
+    Returns:
+        A list of schema privileges.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        raw_priv = list_schema_privileges(schema_oid, conn)
+    return [SchemaPrivileges.from_dict(i) for i in raw_priv]
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 1c97ef27f5..b0b805a4f0 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -266,6 +266,11 @@
         "schemas.patch",
         [user_is_authenticated]
     ),
+    (
+        schema_privileges.list_direct,
+        "schema_privileges.list_direct",
+        [user_is_authenticated]
+    ),
     (
         servers.list_,
         "servers.list",

From 1ce3112dfc9fbabaf265cbf2d60cac687a922ec9 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 26 Aug 2024 18:03:42 +0800
Subject: [PATCH 0730/1141] add docs for new schema privilege lister

---
 docs/docs/api/rpc.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 560a277d73..5504a2885b 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -108,6 +108,14 @@ To use an RPC function:
       - SchemaInfo
       - SchemaPatch
 
+## Schema Privileges
+
+::: schema_privileges
+    options:
+      members:
+      - list_direct
+      - SchemaPrivileges
+
 ## Tables
 
 ::: tables

From af449d8fd6f4f12444e3d840ee3abfc56f650dd2 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 26 Aug 2024 18:12:58 +0800
Subject: [PATCH 0731/1141] Add wiring test for schema priv listing RPC
 function

---
 mathesar/tests/rpc/test_endpoints.py         |  1 +
 mathesar/tests/rpc/test_schema_privileges.py | 51 ++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 mathesar/tests/rpc/test_schema_privileges.py

diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index b0b805a4f0..54c14ac3cd 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -21,6 +21,7 @@
 from mathesar.rpc import records
 from mathesar.rpc import roles
 from mathesar.rpc import schemas
+from mathesar.rpc import schema_privileges
 from mathesar.rpc import servers
 from mathesar.rpc import tables
 from mathesar.rpc import types
diff --git a/mathesar/tests/rpc/test_schema_privileges.py b/mathesar/tests/rpc/test_schema_privileges.py
new file mode 100644
index 0000000000..6079fcbeeb
--- /dev/null
+++ b/mathesar/tests/rpc/test_schema_privileges.py
@@ -0,0 +1,51 @@
+"""
+This file tests the schema_privileges RPC functions.
+
+Fixtures:
+    rf(pytest-django): Provides mocked `Request` objects.
+    monkeypatch(pytest): Lets you monkeypatch an object for testing.
+"""
+from contextlib import contextmanager
+
+from mathesar.rpc import schema_privileges
+from mathesar.models.users import User
+
+
+def test_schema_privileges_list_direct(rf, monkeypatch):
+    _username = 'alice'
+    _password = 'pass1234'
+    _database_id = 2
+    _schema_oid = 123456
+    _privileges = [{"role_oid": 12345, "direct": ["USAGE", "CREATE"]}]
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=_username, password=_password)
+
+    @contextmanager
+    def mock_connect(database_id, user):
+        if database_id == _database_id and user.username == _username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_list_privileges(
+            schema_oid,
+            conn,
+    ):
+        if schema_oid != _schema_oid:
+            raise AssertionError('incorrect parameters passed')
+        return _privileges
+
+    monkeypatch.setattr(schema_privileges, 'connect', mock_connect)
+    monkeypatch.setattr(
+        schema_privileges,
+        'list_schema_privileges',
+        mock_list_privileges
+    )
+    expect_response = _privileges
+    actual_response = schema_privileges.list_direct(
+        schema_oid=_schema_oid, database_id=_database_id, request=request
+    )
+    assert actual_response == expect_response

From bc0ba3f66ca0f6a7adde433124acb080a81b1d75 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Mon, 26 Aug 2024 15:52:57 +0530
Subject: [PATCH 0732/1141] cast stringified oids to bigint for 'role' related
 functions

---
 db/sql/00_msar.sql | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index bbce057a54..735fe630bc 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -919,9 +919,10 @@ FROM (
 $$ LANGUAGE SQL;
 
 
+DROP FUNCTION IF EXISTS msar.role_info_table();
 CREATE OR REPLACE FUNCTION msar.role_info_table() RETURNS TABLE
 (
-  oid oid, -- The OID of the role.
+  oid bigint, -- The OID of the role.
   name name, -- Name of the role.
   super boolean, -- Whether the role has SUPERUSER status.
   inherits boolean, -- Whether the role has INHERIT attribute.
@@ -1047,7 +1048,7 @@ The returned JSON object has the form:
   }
 */
 SELECT jsonb_build_object(
-  'owner_oid', pgd.datdba,
+  'owner_oid', pgd.datdba::bigint,
   'current_role_db_priv', array_remove(
     ARRAY[
       CASE WHEN has_database_privilege(pgd.oid, 'CREATE') THEN 'CREATE' END,

From d488c28d84ffc67cc33978a6ba0f27f04e468906 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Mon, 26 Aug 2024 17:39:59 +0530
Subject: [PATCH 0733/1141] add SQL functions for listing direct table
 privileges

---
 db/sql/00_msar.sql      | 30 ++++++++++++++++++++++++++++--
 db/sql/test_00_msar.sql | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 458944afb4..f36c7b232f 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -916,7 +916,7 @@ WITH priv_cte AS (
     pg_catalog.pg_roles AS pgr,
     pg_catalog.pg_namespace AS pgn,
     aclexplode(COALESCE(pgn.nspacl, acldefault('n', pgn.nspowner))) AS acl
-  WHERE pgn.oid = sch_id AND pgr.oid = acl.grantee AND pgr.rolname NOT LIKE 'pg_'
+  WHERE pgn.oid = sch_id AND pgr.oid = acl.grantee AND pgr.rolname NOT LIKE 'pg_%'
   GROUP BY pgr.oid, pgn.oid
 )
 SELECT COALESCE(jsonb_agg(priv_cte.p), '[]'::jsonb) FROM priv_cte;
@@ -1033,7 +1033,7 @@ WITH priv_cte AS (
     pg_catalog.pg_roles AS pgr,
     pg_catalog.pg_database AS pgd,
     aclexplode(COALESCE(pgd.datacl, acldefault('d', pgd.datdba))) AS acl
-  WHERE pgd.datname = db_name AND pgr.oid = acl.grantee AND pgr.rolname NOT LIKE 'pg_'
+  WHERE pgd.datname = db_name AND pgr.oid = acl.grantee AND pgr.rolname NOT LIKE 'pg_%'
   GROUP BY pgr.oid, pgd.oid
 )
 SELECT COALESCE(jsonb_agg(priv_cte.p), '[]'::jsonb) FROM priv_cte;
@@ -1064,6 +1064,32 @@ WHERE pgd.datname = db_name;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION msar.list_table_privileges(tab_id regclass) RETURNS jsonb AS $$/*
+Given a table, returns a json array of objects with direct, non-default table privileges.
+
+Each returned JSON object in the array has the form:
+  {
+    "role_oid": <int>,
+    "direct" [<str>]
+  }
+*/
+WITH priv_cte AS (
+  SELECT
+    jsonb_build_object(
+      'role_oid', pgr.oid::bigint,
+      'direct',  jsonb_agg(acl.privilege_type)
+    ) AS p
+  FROM
+    pg_catalog.pg_roles AS pgr,
+    pg_catalog.pg_class AS pgc,
+    aclexplode(COALESCE(pgc.relacl, acldefault('r', pgc.relowner))) AS acl
+  WHERE pgc.oid = tab_id AND pgr.oid = acl.grantee AND pgr.rolname NOT LIKE 'pg_%'
+  GROUP BY pgr.oid, pgc.oid
+)
+SELECT COALESCE(jsonb_agg(priv_cte.p), '[]'::jsonb) FROM priv_cte;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 -- ROLE MANIPULATION FUNCTIONS
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 63ce625755..67839dc1b3 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2830,6 +2830,41 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+CREATE OR REPLACE FUNCTION test_list_table_privileges_basic() RETURNS SETOF TEXT AS $$
+BEGIN
+CREATE TABLE restricted_table();
+RETURN NEXT is(
+  msar.list_table_privileges('restricted_table'::regclass),
+  format(
+    '[{"direct": ["INSERT", "SELECT", "UPDATE", "DELETE", "TRUNCATE", "REFERENCES", "TRIGGER"], "role_oid": %s}]',
+    'mathesar'::regrole::oid
+  )::jsonb,
+  'Initially, only privileges for creator'
+);
+CREATE USER "Alice";
+RETURN NEXT is(
+  msar.list_table_privileges('restricted_table'::regclass),
+  format(
+    '[{"direct": ["INSERT", "SELECT", "UPDATE", "DELETE", "TRUNCATE", "REFERENCES", "TRIGGER"], "role_oid": %s}]',
+    'mathesar'::regrole::oid
+  )::jsonb,
+  'Alice should not have any privileges on restricted_table'
+);
+GRANT SELECT, DELETE ON TABLE restricted_table TO "Alice";
+RETURN NEXT is(
+  msar.list_table_privileges('restricted_table'::regclass),
+  format(
+    '[{"direct": ["INSERT", "SELECT", "UPDATE", "DELETE", "TRUNCATE", "REFERENCES", "TRIGGER"], "role_oid": %1$s},
+    {"direct": ["SELECT", "DELETE"], "role_oid": %2$s}]',
+    'mathesar'::regrole::oid,
+    '"Alice"'::regrole::oid
+  )::jsonb,
+  'Alice should have SELECT & DELETE privileges on restricted_table'
+);
+END;
+$$ LANGUAGE plpgsql;
+
+
 CREATE OR REPLACE FUNCTION test_list_roles() RETURNS SETOF TEXT AS $$
 DECLARE
   initial_role_count int;

From 8372aace0b3cd1cf1a8dd53ab933f543462fb63b Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Mon, 26 Aug 2024 17:40:57 +0530
Subject: [PATCH 0734/1141] wire python function to sql function

---
 db/roles/operations/select.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/db/roles/operations/select.py b/db/roles/operations/select.py
index a0d4b38a70..a6c7119ca9 100644
--- a/db/roles/operations/select.py
+++ b/db/roles/operations/select.py
@@ -13,5 +13,9 @@ def list_schema_privileges(schema_oid, conn):
     return exec_msar_func(conn, 'list_schema_privileges', schema_oid).fetchone()[0]
 
 
+def list_table_privileges(table_oid, conn):
+    return exec_msar_func(conn, 'list_table_privileges', table_oid).fetchone()[0]
+
+
 def get_curr_role_db_priv(db_name, conn):
     return exec_msar_func(conn, 'get_owner_oid_and_curr_role_db_priv', db_name).fetchone()[0]

From 1bd032d23c8157e4ba8b5338db4513098106c38d Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Mon, 26 Aug 2024 17:41:53 +0530
Subject: [PATCH 0735/1141] add list_direct rpc endpoint for table_privileges

---
 config/settings/common_settings.py |  1 +
 docs/docs/api/rpc.md               |  8 ++++++
 mathesar/rpc/table_privileges.py   | 46 ++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 mathesar/rpc/table_privileges.py

diff --git a/config/settings/common_settings.py b/config/settings/common_settings.py
index cea1d7eff1..387ff5edc5 100644
--- a/config/settings/common_settings.py
+++ b/config/settings/common_settings.py
@@ -81,6 +81,7 @@ def pipe_delim(pipe_string):
     'mathesar.rpc.schema_privileges',
     'mathesar.rpc.servers',
     'mathesar.rpc.tables',
+    'mathesar.rpc.table_privileges',
     'mathesar.rpc.tables.metadata',
     'mathesar.rpc.types',
     'mathesar.rpc.explorations'
diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 5504a2885b..90dd95d31d 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -134,6 +134,14 @@ To use an RPC function:
       - JoinableTableRecord
       - JoinableTableInfo
 
+## Table Privileges
+
+::: table_privileges
+    options:
+      members:
+      - list_direct
+      - TablePrivileges
+
 ## Table Metadata
 
 ::: tables.metadata
diff --git a/mathesar/rpc/table_privileges.py b/mathesar/rpc/table_privileges.py
new file mode 100644
index 0000000000..4a9f4b1d7a
--- /dev/null
+++ b/mathesar/rpc/table_privileges.py
@@ -0,0 +1,46 @@
+from typing import Literal, TypedDict
+
+from modernrpc.core import rpc_method, REQUEST_KEY
+from modernrpc.auth.basic import http_basic_auth_login_required
+
+from db.roles.operations.select import list_table_privileges
+from mathesar.rpc.utils import connect
+from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+
+
+class TablePrivileges(TypedDict):
+    """
+    Information about table privileges for a role.
+    Attributes:
+        role_oid: The `oid` of the role.
+        direct: A list of table privileges for the afforementioned role_oid.
+    """
+    role_oid: int
+    direct: list[Literal['INSERT', 'SELECT', 'UPDATE', 'DELETE', 'TRUNCATE', 'REFERENCES', 'TRIGGER']]
+
+    @classmethod
+    def from_dict(cls, d):
+        return cls(
+            role_oid=d["role_oid"],
+            direct=d["direct"]
+        )
+
+
+@rpc_method(name="table_privileges.list_direct")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def list_direct(
+        *, table_oid: int, database_id: int, **kwargs
+) -> list[TablePrivileges]:
+    """
+    List direct table privileges for roles.
+    Args:
+        table_oid: The OID of the table whose privileges we'll list.
+        database_id: The Django id of the database containing the table.
+    Returns:
+        A list of table privileges.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        raw_priv = list_table_privileges(table_oid, conn)
+    return [TablePrivileges.from_dict(i) for i in raw_priv]

From 2a0e2684a0bc02fa53f66e9adf2769791c530160 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Mon, 26 Aug 2024 17:43:14 +0530
Subject: [PATCH 0736/1141] add endpoint & mock tests for list_direct

---
 mathesar/tests/rpc/test_endpoints.py        |  6 ++
 mathesar/tests/rpc/test_table_privileges.py | 63 +++++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 mathesar/tests/rpc/test_table_privileges.py

diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 54c14ac3cd..2b28179bd6 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -24,6 +24,7 @@
 from mathesar.rpc import schema_privileges
 from mathesar.rpc import servers
 from mathesar.rpc import tables
+from mathesar.rpc import table_privileges
 from mathesar.rpc import types
 
 METHODS = [
@@ -328,6 +329,11 @@
         "tables.list_joinable",
         [user_is_authenticated]
     ),
+    (
+        table_privileges.list_direct,
+        "table_privileges.list_direct",
+        [user_is_authenticated]
+    ),
     (
         tables.metadata.list_,
         "tables.metadata.list",
diff --git a/mathesar/tests/rpc/test_table_privileges.py b/mathesar/tests/rpc/test_table_privileges.py
new file mode 100644
index 0000000000..dbaddcf766
--- /dev/null
+++ b/mathesar/tests/rpc/test_table_privileges.py
@@ -0,0 +1,63 @@
+"""
+This file tests the table_privileges RPC functions.
+
+Fixtures:
+    rf(pytest-django): Provides mocked `Request` objects.
+    monkeypatch(pytest): Lets you monkeypatch an object for testing.
+"""
+from contextlib import contextmanager
+
+from mathesar.rpc import table_privileges
+from mathesar.models.users import User
+
+
+def test_table_privileges_list_direct(rf, monkeypatch):
+    _username = 'alice'
+    _password = 'pass1234'
+    _database_id = 2
+    _table_oid = 123456
+    _privileges = [
+        {
+            "role_oid": 12345,
+            "direct": [
+                "INSERT",
+                "SELECT",
+                "UPDATE",
+                "DELETE",
+                "TRUNCATE",
+                "REFERENCES",
+                "TRIGGER"]
+        }
+    ]
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=_username, password=_password)
+
+    @contextmanager
+    def mock_connect(database_id, user):
+        if database_id == _database_id and user.username == _username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_list_privileges(
+            table_oid,
+            conn,
+    ):
+        if table_oid != _table_oid:
+            raise AssertionError('incorrect parameters passed')
+        return _privileges
+
+    monkeypatch.setattr(table_privileges, 'connect', mock_connect)
+    monkeypatch.setattr(
+        table_privileges,
+        'list_table_privileges',
+        mock_list_privileges
+    )
+    expect_response = _privileges
+    actual_response = table_privileges.list_direct(
+        table_oid=_table_oid, database_id=_database_id, request=request
+    )
+    assert actual_response == expect_response

From 6b528df2f822992f6171ada1804f577f6cf8f8ab Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 26 Aug 2024 19:31:45 +0530
Subject: [PATCH 0737/1141] Move user actions and route level stores to
 contexts

---
 .../src/contexts/DatabaseRouteContext.ts      | 55 ++++++++++++++
 .../DatabaseSettingsRouteContext.ts}          | 75 ++++++-------------
 mathesar_ui/src/contexts/utils.ts             | 24 ++++++
 .../database/settings/SettingsWrapper.svelte  |  8 +-
 .../collaborators/AddCollaboratorModal.svelte |  7 +-
 .../collaborators/CollaboratorRow.svelte      |  9 +--
 .../collaborators/Collaborators.svelte        |  6 +-
 .../ConfigureRoleModal.svelte                 | 11 ++-
 .../RoleConfiguration.svelte                  | 17 +++--
 .../settings/roles/CreateRoleModal.svelte     |  9 +--
 .../database/settings/roles/RoleRow.svelte    |  7 +-
 .../database/settings/roles/Roles.svelte      |  6 +-
 mathesar_ui/src/routes/DatabaseRoute.svelte   | 35 ++-------
 .../src/routes/DatabaseSettingsRoute.svelte   | 34 +++++++++
 14 files changed, 181 insertions(+), 122 deletions(-)
 create mode 100644 mathesar_ui/src/contexts/DatabaseRouteContext.ts
 rename mathesar_ui/src/{pages/database/settings/databaseSettingsUtils.ts => contexts/DatabaseSettingsRouteContext.ts} (69%)
 create mode 100644 mathesar_ui/src/contexts/utils.ts
 create mode 100644 mathesar_ui/src/routes/DatabaseSettingsRoute.svelte

diff --git a/mathesar_ui/src/contexts/DatabaseRouteContext.ts b/mathesar_ui/src/contexts/DatabaseRouteContext.ts
new file mode 100644
index 0000000000..56bda620ab
--- /dev/null
+++ b/mathesar_ui/src/contexts/DatabaseRouteContext.ts
@@ -0,0 +1,55 @@
+import type { Database } from '@mathesar/models/Database';
+import type { Role } from '@mathesar/models/Role';
+
+import { getRouteContext, setRouteContext } from './utils';
+
+const contextKey = Symbol('database route store');
+
+export class DatabaseRouteContext {
+  database;
+
+  roles;
+
+  constructor(database: Database) {
+    this.database = database;
+    this.roles = database.constructRolesStore();
+  }
+
+  /**
+   * TODO: Discuss if actions need to be on the contexts which belong
+   * to the routes where the user performs the actions, or if they should
+   * be on the context where the store is present.
+   *
+   * i.e. should we have `addRole` and `deleteRole` here or in
+   * DatabaseSettingsRouteContext?
+   */
+  async addRole(
+    props:
+      | {
+          roleName: Role['name'];
+          login: false;
+          password?: never;
+        }
+      | { roleName: Role['name']; login: true; password: string },
+  ) {
+    const newRole = await this.database.addRole(
+      props.roleName,
+      props.login,
+      props.password,
+    );
+    this.roles.updateResolvedValue((r) => r.with(newRole.oid, newRole));
+  }
+
+  async deleteRole(role: Role) {
+    await role.delete();
+    this.roles.updateResolvedValue((r) => r.without(role.oid));
+  }
+
+  static construct(database: Database) {
+    return setRouteContext(contextKey, new DatabaseRouteContext(database));
+  }
+
+  static get() {
+    return getRouteContext<DatabaseRouteContext>(contextKey);
+  }
+}
diff --git a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts b/mathesar_ui/src/contexts/DatabaseSettingsRouteContext.ts
similarity index 69%
rename from mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
rename to mathesar_ui/src/contexts/DatabaseSettingsRouteContext.ts
index 8edce0b131..fd2a9bda62 100644
--- a/mathesar_ui/src/pages/database/settings/databaseSettingsUtils.ts
+++ b/mathesar_ui/src/contexts/DatabaseSettingsRouteContext.ts
@@ -1,5 +1,4 @@
-import { getContext, setContext } from 'svelte';
-import { type Readable, type Writable, derived, writable } from 'svelte/store';
+import { type Readable, derived } from 'svelte/store';
 
 import userApi, { type User } from '@mathesar/api/rest/users';
 import type { Collaborator } from '@mathesar/models/Collaborator';
@@ -9,7 +8,10 @@ import type { Role } from '@mathesar/models/Role';
 import AsyncStore from '@mathesar/stores/AsyncStore';
 import { CancellablePromise, ImmutableMap } from '@mathesar-component-library';
 
-const contextKey = Symbol('database settings store');
+import type { DatabaseRouteContext } from './DatabaseRouteContext';
+import { getRouteContext, setRouteContext } from './utils';
+
+const contextKey = Symbol('database settings route store');
 
 export type CombinedLoginRole = {
   name: string;
@@ -36,25 +38,25 @@ const getUsersPromise = () => {
   );
 };
 
-class DatabaseSettingsContext {
+export class DatabaseSettingsRouteContext {
+  databaseRouteContext: DatabaseRouteContext;
+
   database: Database;
 
   configuredRoles;
 
-  roles;
-
   combinedLoginRoles: Readable<CombinedLoginRole[]>;
 
   collaborators;
 
   users: AsyncStore<void, ImmutableMap<User['id'], User>>;
 
-  constructor(database: Database) {
-    this.database = database;
-    this.configuredRoles = database.constructConfiguredRolesStore();
-    this.roles = database.constructRolesStore();
+  constructor(databaseRouteContext: DatabaseRouteContext) {
+    this.databaseRouteContext = databaseRouteContext;
+    this.database = this.databaseRouteContext.database;
+    this.configuredRoles = this.database.constructConfiguredRolesStore();
     this.combinedLoginRoles = derived(
-      [this.roles, this.configuredRoles],
+      [this.databaseRouteContext.roles, this.configuredRoles],
       ([$roles, $configuredRoles]) => {
         const isLoading = $configuredRoles.isLoading || $roles.isLoading;
         if (isLoading) {
@@ -83,7 +85,7 @@ class DatabaseSettingsContext {
         return [];
       },
     );
-    this.collaborators = database.constructCollaboratorsStore();
+    this.collaborators = this.database.constructCollaboratorsStore();
     this.users = new AsyncStore(getUsersPromise);
   }
 
@@ -134,50 +136,21 @@ class DatabaseSettingsContext {
     this.collaborators.updateResolvedValue((c) => c.without(collaborator.id));
   }
 
-  async addRole(
-    props:
-      | {
-          roleName: Role['name'];
-          login: false;
-          password?: never;
-        }
-      | { roleName: Role['name']; login: true; password: string },
-  ) {
-    const newRole = await this.database.addRole(
-      props.roleName,
-      props.login,
-      props.password,
-    );
-    this.roles.updateResolvedValue((r) => r.with(newRole.oid, newRole));
-  }
-
-  async deleteRole(role: Role) {
-    await role.delete();
-    this.roles.updateResolvedValue((r) => r.without(role.oid));
-    // When a role is deleted, both Collaborators & ConfiguredRoles needs to be reset
+  async deleteRoleAndResetDependents(role: Role) {
+    await this.databaseRouteContext.deleteRole(role);
+    // When a role is deleted, both Collaborators & ConfiguredRoles need to be reset
     this.configuredRoles.reset();
     this.collaborators.reset();
   }
-}
 
-export function getDatabaseSettingsContext(): Readable<DatabaseSettingsContext> {
-  const store = getContext<Writable<DatabaseSettingsContext>>(contextKey);
-  if (store === undefined) {
-    throw Error('Database settings context has not been set');
+  static construct(databaseRouteContext: DatabaseRouteContext) {
+    return setRouteContext(
+      contextKey,
+      new DatabaseSettingsRouteContext(databaseRouteContext),
+    );
   }
-  return store;
-}
 
-export function setDatabaseSettingsContext(
-  database: Database,
-): Readable<DatabaseSettingsContext> {
-  let store = getContext<Writable<DatabaseSettingsContext>>(contextKey);
-  const databaseSettingsContext = new DatabaseSettingsContext(database);
-  if (store !== undefined) {
-    store.set(databaseSettingsContext);
-    return store;
+  static get() {
+    return getRouteContext<DatabaseSettingsRouteContext>(contextKey);
   }
-  store = writable(databaseSettingsContext);
-  setContext(contextKey, store);
-  return store;
 }
diff --git a/mathesar_ui/src/contexts/utils.ts b/mathesar_ui/src/contexts/utils.ts
new file mode 100644
index 0000000000..85f9e735c5
--- /dev/null
+++ b/mathesar_ui/src/contexts/utils.ts
@@ -0,0 +1,24 @@
+import { getContext, setContext } from 'svelte';
+import { type Readable, type Writable, writable } from 'svelte/store';
+
+export function setRouteContext<T>(
+  contextKey: unknown,
+  object: T,
+): Readable<T> {
+  let store = getContext<Writable<T>>(contextKey);
+  if (store !== undefined) {
+    store.set(object);
+    return store;
+  }
+  store = writable(object);
+  setContext(contextKey, store);
+  return store;
+}
+
+export function getRouteContext<T>(contextKey: unknown): Readable<T> {
+  const store = getContext<Writable<T>>(contextKey);
+  if (store === undefined) {
+    throw new Error('Route context has not been set');
+  }
+  return store;
+}
diff --git a/mathesar_ui/src/pages/database/settings/SettingsWrapper.svelte b/mathesar_ui/src/pages/database/settings/SettingsWrapper.svelte
index 1831c267a2..84d5de1c69 100644
--- a/mathesar_ui/src/pages/database/settings/SettingsWrapper.svelte
+++ b/mathesar_ui/src/pages/database/settings/SettingsWrapper.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
+  import { DatabaseSettingsRouteContext } from '@mathesar/contexts/DatabaseSettingsRouteContext';
   import PageLayoutWithSidebar from '@mathesar/layouts/PageLayoutWithSidebar.svelte';
-  import type { Database } from '@mathesar/models/Database';
   import {
     getDatabaseCollaboratorsUrl,
     getDatabaseRoleConfigurationUrl,
@@ -10,10 +10,8 @@
   } from '@mathesar/routes/urls';
   import { LinkMenuItem, Menu, MenuHeading } from '@mathesar-component-library';
 
-  import { setDatabaseSettingsContext } from './databaseSettingsUtils';
-
-  export let database: Database;
-  $: setDatabaseSettingsContext(database);
+  const databaseSettingsContext = DatabaseSettingsRouteContext.get();
+  $: ({ database } = $databaseSettingsContext);
 
   type Section = 'roleConfiguration' | 'collaborators' | 'roles';
   let section = 'roleConfiguration';
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte b/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte
index 79b4825a90..27b960add1 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte
@@ -8,6 +8,7 @@
     requiredField,
   } from '@mathesar/components/form';
   import Field from '@mathesar/components/form/Field.svelte';
+  import { DatabaseSettingsRouteContext } from '@mathesar/contexts/DatabaseSettingsRouteContext';
   import type { Collaborator } from '@mathesar/models/Collaborator';
   import type { ConfiguredRole } from '@mathesar/models/ConfiguredRole';
   import { toast } from '@mathesar/stores/toast';
@@ -19,11 +20,9 @@
     portalToWindowFooter,
   } from '@mathesar-component-library';
 
-  import { getDatabaseSettingsContext } from '../databaseSettingsUtils';
-
   import SelectConfiguredRoleField from './SelectConfiguredRoleField.svelte';
 
-  const databaseContext = getDatabaseSettingsContext();
+  const routeContext = DatabaseSettingsRouteContext.get();
 
   export let controller: ModalController;
   export let configuredRolesMap: ImmutableMap<number, ConfiguredRole>;
@@ -45,7 +44,7 @@
 
   async function addCollaborator() {
     if ($userId && $configuredRoleId) {
-      await $databaseContext.addCollaborator($userId, $configuredRoleId);
+      await $routeContext.addCollaborator($userId, $configuredRoleId);
       controller.close();
       toast.success($_('collaborator_added_successfully'));
       form.reset();
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
index 7a1c494d23..0098c5d999 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
@@ -3,18 +3,17 @@
 
   import Icon from '@mathesar/component-library/icon/Icon.svelte';
   import GridTableCell from '@mathesar/components/grid-table/GridTableCell.svelte';
+  import { DatabaseSettingsRouteContext } from '@mathesar/contexts/DatabaseSettingsRouteContext';
   import { iconDeleteMajor, iconEdit } from '@mathesar/icons';
   import type { Collaborator } from '@mathesar/models/Collaborator';
   import { confirmDelete } from '@mathesar/stores/confirmation';
   import { Button, SpinnerButton } from '@mathesar-component-library';
 
-  import { getDatabaseSettingsContext } from '../databaseSettingsUtils';
-
   export let collaborator: Collaborator;
   export let editRoleForCollaborator: (collaborator: Collaborator) => void;
 
-  const databaseContext = getDatabaseSettingsContext();
-  $: ({ configuredRoles, users } = $databaseContext);
+  const routeContext = DatabaseSettingsRouteContext.get();
+  $: ({ configuredRoles, users } = $routeContext);
 
   $: user = $users.resolvedValue?.get(collaborator.user_id);
   $: configuredRoleId = collaborator.configured_role_id;
@@ -58,7 +57,7 @@
         identifierName: userName,
         identifierType: $_('collaborator'),
       })}
-    onClick={() => $databaseContext.deleteCollaborator(collaborator)}
+    onClick={() => $routeContext.deleteCollaborator(collaborator)}
     icon={{ ...iconDeleteMajor, size: '0.8em' }}
     label=""
     appearance="secondary"
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
index f74c581d0e..3fb806ca60 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
@@ -5,6 +5,7 @@
   import Errors from '@mathesar/components/Errors.svelte';
   import GridTable from '@mathesar/components/grid-table/GridTable.svelte';
   import GridTableCell from '@mathesar/components/grid-table/GridTableCell.svelte';
+  import { DatabaseSettingsRouteContext } from '@mathesar/contexts/DatabaseSettingsRouteContext';
   import { iconAddNew } from '@mathesar/icons';
   import type { Collaborator } from '@mathesar/models/Collaborator';
   import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
@@ -12,18 +13,17 @@
   import { isDefined } from '@mathesar/utils/language';
   import { Button, Spinner } from '@mathesar-component-library';
 
-  import { getDatabaseSettingsContext } from '../databaseSettingsUtils';
   import SettingsContentLayout from '../SettingsContentLayout.svelte';
 
   import AddCollaboratorModel from './AddCollaboratorModal.svelte';
   import CollaboratorRow from './CollaboratorRow.svelte';
   import EditRoleForCollaboratorModal from './EditRoleForCollaboratorModal.svelte';
 
-  const databaseContext = getDatabaseSettingsContext();
+  const routeContext = DatabaseSettingsRouteContext.get();
   const addCollaboratorModal = modal.spawnModalController();
   const editCollaboratorRoleModal = modal.spawnModalController();
 
-  $: ({ database, configuredRoles, collaborators, users } = $databaseContext);
+  $: ({ database, configuredRoles, collaborators, users } = $routeContext);
 
   $: void AsyncRpcApiStore.runBatched(
     [
diff --git a/mathesar_ui/src/pages/database/settings/role-configuration/ConfigureRoleModal.svelte b/mathesar_ui/src/pages/database/settings/role-configuration/ConfigureRoleModal.svelte
index c7f2eab7a5..10d0b3b77a 100644
--- a/mathesar_ui/src/pages/database/settings/role-configuration/ConfigureRoleModal.svelte
+++ b/mathesar_ui/src/pages/database/settings/role-configuration/ConfigureRoleModal.svelte
@@ -9,6 +9,10 @@
   } from '@mathesar/components/form';
   import Field from '@mathesar/components/form/Field.svelte';
   import WarningBox from '@mathesar/components/message-boxes/WarningBox.svelte';
+  import {
+    type CombinedLoginRole,
+    DatabaseSettingsRouteContext,
+  } from '@mathesar/contexts/DatabaseSettingsRouteContext';
   import { toast } from '@mathesar/stores/toast';
   import {
     ControlledModal,
@@ -17,12 +21,7 @@
     portalToWindowFooter,
   } from '@mathesar-component-library';
 
-  import {
-    type CombinedLoginRole,
-    getDatabaseSettingsContext,
-  } from '../databaseSettingsUtils';
-
-  const databaseContext = getDatabaseSettingsContext();
+  const databaseContext = DatabaseSettingsRouteContext.get();
   $: ({ database } = $databaseContext);
 
   export let controller: ModalController;
diff --git a/mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte b/mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte
index 1aca99fedc..785b9507a1 100644
--- a/mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte
+++ b/mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte
@@ -5,6 +5,10 @@
   import GridTableCell from '@mathesar/components/grid-table/GridTableCell.svelte';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import PhraseContainingIdentifier from '@mathesar/components/PhraseContainingIdentifier.svelte';
+  import {
+    type CombinedLoginRole,
+    DatabaseSettingsRouteContext,
+  } from '@mathesar/contexts/DatabaseSettingsRouteContext';
   import {
     iconConfigurePassword,
     iconDeleteMajor,
@@ -22,19 +26,16 @@
     SpinnerButton,
   } from '@mathesar-component-library';
 
-  import {
-    type CombinedLoginRole,
-    getDatabaseSettingsContext,
-  } from '../databaseSettingsUtils';
   import SettingsContentLayout from '../SettingsContentLayout.svelte';
 
   import ConfigureRoleModal from './ConfigureRoleModal.svelte';
 
-  const databaseContext = getDatabaseSettingsContext();
+  const routeContext = DatabaseSettingsRouteContext.get();
   const configureRoleModalController = modal.spawnModalController();
 
-  $: ({ database, configuredRoles, roles, combinedLoginRoles } =
-    $databaseContext);
+  $: ({ database, databaseRouteContext, configuredRoles, combinedLoginRoles } =
+    $routeContext);
+  $: ({ roles } = databaseRouteContext);
   $: void AsyncRpcApiStore.runBatched(
     [
       configuredRoles.batchRunner({ server_id: database.server.id }),
@@ -54,7 +55,7 @@
   async function removeConfiguredRole(combinedLoginRole: CombinedLoginRole) {
     if (combinedLoginRole.configuredRole) {
       try {
-        await $databaseContext.removeConfiguredRole(
+        await $routeContext.removeConfiguredRole(
           combinedLoginRole.configuredRole,
         );
         toast.success($_('role_configuration_removed'));
diff --git a/mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte b/mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte
index ccc193b4f1..0953b7b769 100644
--- a/mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte
+++ b/mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte
@@ -9,6 +9,7 @@
     makeForm,
     requiredField,
   } from '@mathesar/components/form';
+  import { DatabaseSettingsRouteContext } from '@mathesar/contexts/DatabaseSettingsRouteContext';
   import { toast } from '@mathesar/stores/toast';
   import {
     Checkbox,
@@ -19,9 +20,7 @@
     portalToWindowFooter,
   } from '@mathesar-component-library';
 
-  import { getDatabaseSettingsContext } from '../databaseSettingsUtils';
-
-  const databaseContext = getDatabaseSettingsContext();
+  const routeContext = DatabaseSettingsRouteContext.get();
 
   export let controller: ModalController;
 
@@ -50,13 +49,13 @@
 
   async function createRole() {
     if (login) {
-      await $databaseContext.addRole({
+      await $routeContext.databaseRouteContext.addRole({
         roleName: $roleName,
         login: true,
         password: $password,
       });
     } else {
-      await $databaseContext.addRole({
+      await $routeContext.databaseRouteContext.addRole({
         roleName: $roleName,
         login: false,
       });
diff --git a/mathesar_ui/src/pages/database/settings/roles/RoleRow.svelte b/mathesar_ui/src/pages/database/settings/roles/RoleRow.svelte
index 88ead522d6..a0f8b33953 100644
--- a/mathesar_ui/src/pages/database/settings/roles/RoleRow.svelte
+++ b/mathesar_ui/src/pages/database/settings/roles/RoleRow.svelte
@@ -3,6 +3,7 @@
 
   import GridTableCell from '@mathesar/components/grid-table/GridTableCell.svelte';
   import PhraseContainingIdentifier from '@mathesar/components/PhraseContainingIdentifier.svelte';
+  import { DatabaseSettingsRouteContext } from '@mathesar/contexts/DatabaseSettingsRouteContext';
   import { iconDeleteMajor, iconEdit } from '@mathesar/icons';
   import type { Role } from '@mathesar/models/Role';
   import { confirm } from '@mathesar/stores/confirmation';
@@ -15,9 +16,7 @@
     SpinnerButton,
   } from '@mathesar-component-library';
 
-  import { getDatabaseSettingsContext } from '../databaseSettingsUtils';
-
-  const databaseContext = getDatabaseSettingsContext();
+  const routeContext = DatabaseSettingsRouteContext.get();
 
   export let role: Role;
   export let rolesMap: ImmutableMap<number, Role>;
@@ -27,7 +26,7 @@
 
   async function dropRole() {
     try {
-      await $databaseContext.deleteRole(role);
+      await $routeContext.deleteRoleAndResetDependents(role);
       toast.success($_('role_dropped_successfully'));
     } catch (err) {
       toast.error(getErrorMessage(err));
diff --git a/mathesar_ui/src/pages/database/settings/roles/Roles.svelte b/mathesar_ui/src/pages/database/settings/roles/Roles.svelte
index 6739b68f8b..7f7777a5aa 100644
--- a/mathesar_ui/src/pages/database/settings/roles/Roles.svelte
+++ b/mathesar_ui/src/pages/database/settings/roles/Roles.svelte
@@ -4,23 +4,23 @@
   import GridTable from '@mathesar/components/grid-table/GridTable.svelte';
   import GridTableCell from '@mathesar/components/grid-table/GridTableCell.svelte';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
+  import { DatabaseSettingsRouteContext } from '@mathesar/contexts/DatabaseSettingsRouteContext';
   import { iconAddNew } from '@mathesar/icons';
   import type { Role } from '@mathesar/models/Role';
   import { modal } from '@mathesar/stores/modal';
   import { Button, Icon, Spinner } from '@mathesar-component-library';
 
-  import { getDatabaseSettingsContext } from '../databaseSettingsUtils';
   import SettingsContentLayout from '../SettingsContentLayout.svelte';
 
   import CreateRoleModal from './CreateRoleModal.svelte';
   import ModifyRoleMembers from './ModifyRoleMembers.svelte';
   import RoleRow from './RoleRow.svelte';
 
-  const databaseContext = getDatabaseSettingsContext();
+  const routeContext = DatabaseSettingsRouteContext.get();
   const createRoleModalController = modal.spawnModalController();
   const modifyRoleMembersModalController = modal.spawnModalController();
 
-  $: ({ database, roles } = $databaseContext);
+  $: ({ database, roles } = $routeContext.databaseRouteContext);
 
   $: void roles.runIfNotInitialized({ database_id: database.id });
   $: roleList = [...($roles.resolvedValue?.values() ?? [])];
diff --git a/mathesar_ui/src/routes/DatabaseRoute.svelte b/mathesar_ui/src/routes/DatabaseRoute.svelte
index bc2f3c465a..4fc55478fe 100644
--- a/mathesar_ui/src/routes/DatabaseRoute.svelte
+++ b/mathesar_ui/src/routes/DatabaseRoute.svelte
@@ -7,16 +7,14 @@
   import Identifier from '@mathesar/components/Identifier.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import EventfulRoute from '@mathesar/components/routing/EventfulRoute.svelte';
+  import { DatabaseRouteContext } from '@mathesar/contexts/DatabaseRouteContext';
   import type { Database } from '@mathesar/models/Database';
   import DatabasePageWrapper from '@mathesar/pages/database/DatabasePageWrapper.svelte';
   import DatabasePageSchemasSection from '@mathesar/pages/database/schemas/SchemasSection.svelte';
-  import DatabaseCollaborators from '@mathesar/pages/database/settings/collaborators/Collaborators.svelte';
-  import DatabaseRoleConfiguration from '@mathesar/pages/database/settings/role-configuration/RoleConfiguration.svelte';
-  import DatabaseRoles from '@mathesar/pages/database/settings/roles/Roles.svelte';
-  import DatabasePageSettingsWrapper from '@mathesar/pages/database/settings/SettingsWrapper.svelte';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import { databasesStore } from '@mathesar/stores/databases';
 
+  import DatabaseSettingsRoute from './DatabaseSettingsRoute.svelte';
   import SchemaRoute from './SchemaRoute.svelte';
 
   export let databaseId: Database['id'];
@@ -24,6 +22,10 @@
   $: databasesStore.setCurrentDatabaseId(databaseId);
   const { currentDatabase } = databasesStore;
 
+  $: if ($currentDatabase) {
+    DatabaseRouteContext.construct($currentDatabase);
+  }
+
   function handleUnmount() {
     databasesStore.clearCurrentDatabaseId();
   }
@@ -53,30 +55,7 @@
         onLoad={() => setSection('settings')}
         firstmatch
       >
-        <DatabasePageSettingsWrapper
-          database={$currentDatabase}
-          let:setSection={setSettingsSection}
-        >
-          <Route path="/" redirect="role-configuration/" />
-          <EventfulRoute
-            path="/role-configuration"
-            onLoad={() => setSettingsSection('roleConfiguration')}
-          >
-            <DatabaseRoleConfiguration />
-          </EventfulRoute>
-          <EventfulRoute
-            path="/collaborators"
-            onLoad={() => setSettingsSection('collaborators')}
-          >
-            <DatabaseCollaborators />
-          </EventfulRoute>
-          <EventfulRoute
-            path="/roles"
-            onLoad={() => setSettingsSection('roles')}
-          >
-            <DatabaseRoles />
-          </EventfulRoute>
-        </DatabasePageSettingsWrapper>
+        <DatabaseSettingsRoute />
       </EventfulRoute>
     </DatabasePageWrapper>
   </Route>
diff --git a/mathesar_ui/src/routes/DatabaseSettingsRoute.svelte b/mathesar_ui/src/routes/DatabaseSettingsRoute.svelte
new file mode 100644
index 0000000000..b298209d51
--- /dev/null
+++ b/mathesar_ui/src/routes/DatabaseSettingsRoute.svelte
@@ -0,0 +1,34 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+  import { Route } from 'tinro';
+
+  import EventfulRoute from '@mathesar/components/routing/EventfulRoute.svelte';
+  import { DatabaseRouteContext } from '@mathesar/contexts/DatabaseRouteContext';
+  import { DatabaseSettingsRouteContext } from '@mathesar/contexts/DatabaseSettingsRouteContext';
+  import DatabaseCollaborators from '@mathesar/pages/database/settings/collaborators/Collaborators.svelte';
+  import DatabaseRoleConfiguration from '@mathesar/pages/database/settings/role-configuration/RoleConfiguration.svelte';
+  import DatabaseRoles from '@mathesar/pages/database/settings/roles/Roles.svelte';
+  import DatabasePageSettingsWrapper from '@mathesar/pages/database/settings/SettingsWrapper.svelte';
+
+  const databaseContext = DatabaseRouteContext.get();
+  $: DatabaseSettingsRouteContext.construct($databaseContext);
+</script>
+
+<DatabasePageSettingsWrapper let:setSection>
+  <Route path="/" redirect="role-configuration/" />
+  <EventfulRoute
+    path="/role-configuration"
+    onLoad={() => setSection('roleConfiguration')}
+  >
+    <DatabaseRoleConfiguration />
+  </EventfulRoute>
+  <EventfulRoute
+    path="/collaborators"
+    onLoad={() => setSection('collaborators')}
+  >
+    <DatabaseCollaborators />
+  </EventfulRoute>
+  <EventfulRoute path="/roles" onLoad={() => setSection('roles')}>
+    <DatabaseRoles />
+  </EventfulRoute>
+</DatabasePageSettingsWrapper>

From f91ca8adca07d91a2a8be75e5aad77e5f0263d99 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 26 Aug 2024 22:53:34 +0530
Subject: [PATCH 0738/1141] Close modal after creating a role

---
 .../src/pages/database/settings/roles/CreateRoleModal.svelte     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte b/mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte
index 0953b7b769..a2637b057b 100644
--- a/mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte
+++ b/mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte
@@ -61,6 +61,7 @@
       });
     }
     toast.success('role_created_successfully');
+    controller.close();
   }
 </script>
 

From 5698cf8194178d22642395e4a19cd9f093a46eab Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 27 Aug 2024 15:30:23 +0800
Subject: [PATCH 0739/1141] add schema privilege replacer SQL function

---
 db/sql/00_msar.sql | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 6049b07a9d..4d9a9cd527 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1203,6 +1203,52 @@ END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION
+msar.build_schema_privilege_replace_expr(sch_id regnamespace, rol_id regrole, privileges_ jsonb)
+  RETURNS TEXT AS $$
+SELECT string_agg(
+  format(
+    concat(
+      CASE WHEN privileges_ ? val THEN 'GRANT' ELSE 'REVOKE' END,
+      ' %1$s ON SCHEMA %2$I ',
+      CASE WHEN privileges_ ? val THEN 'TO' ELSE 'FROM' END,
+      ' %3$I'
+    ),
+    val,
+    msar.get_schema_name(sch_id),
+    msar.get_role_name(rol_id)
+  ),
+  E';\n'
+) || E';\n'
+FROM unnest(ARRAY['USAGE', 'CREATE']) as x(val);
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.replace_schema_privileges_for_roles(sch_id regnamespace, priv_spec jsonb) RETURNS jsonb AS $$/*
+Grant/Revoke privileges for a set of roles on the given schema.
+
+Args:
+  sch_id The OID of the schema for which we're setting privileges for roles.
+  priv_spec: An array defining the privileges to grant or revoke for each role.
+
+Each object in the priv_spec should have the form:
+{role_oid: <int>, privileges: SET<"USAGE"|"CREATE">}
+
+Any privilege that exists in the privileges subarray will be granted. Any which is missing will be
+revoked.
+*/
+BEGIN
+EXECUTE string_agg(
+  msar.build_schema_privilege_replace_expr(sch_id, role_oid, direct),
+  E';\n'
+) || ';'
+FROM jsonb_to_recordset(priv_spec) AS x(role_oid regrole, direct jsonb);
+RETURN msar.list_schema_privileges(sch_id);
+END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 -- ALTER SCHEMA FUNCTIONS

From d940177efef47e5fd0e930323e252e513f3f21d6 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Tue, 27 Aug 2024 13:15:28 +0530
Subject: [PATCH 0740/1141] Make model class property names consistent

---
 mathesar_ui/src/models/Collaborator.ts           | 16 +++++++---------
 .../collaborators/AddCollaboratorModal.svelte    |  2 +-
 .../collaborators/CollaboratorRow.svelte         |  6 +++---
 .../EditRoleForCollaboratorModal.svelte          |  5 ++---
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/mathesar_ui/src/models/Collaborator.ts b/mathesar_ui/src/models/Collaborator.ts
index 2fcbefac21..3e0c2ed108 100644
--- a/mathesar_ui/src/models/Collaborator.ts
+++ b/mathesar_ui/src/models/Collaborator.ts
@@ -10,22 +10,20 @@ import type { Database } from './Database';
 export class Collaborator {
   readonly id;
 
-  readonly user_id;
+  readonly userId;
 
-  readonly _configured_role_id: Writable<ConfiguredRole['id']>;
+  readonly _configuredRoleId: Writable<ConfiguredRole['id']>;
 
-  get configured_role_id(): Readable<ConfiguredRole['id']> {
-    return this._configured_role_id;
+  get configuredRoleId(): Readable<ConfiguredRole['id']> {
+    return this._configuredRoleId;
   }
 
   readonly database;
 
   constructor(props: { database: Database; rawCollaborator: RawCollaborator }) {
     this.id = props.rawCollaborator.id;
-    this.user_id = props.rawCollaborator.user_id;
-    this._configured_role_id = writable(
-      props.rawCollaborator.configured_role_id,
-    );
+    this.userId = props.rawCollaborator.user_id;
+    this._configuredRoleId = writable(props.rawCollaborator.configured_role_id);
     this.database = props.database;
   }
 
@@ -43,7 +41,7 @@ export class Collaborator {
       (resolve, reject) => {
         promise
           .then((rawCollaborator) => {
-            this._configured_role_id.set(rawCollaborator.configured_role_id);
+            this._configuredRoleId.set(rawCollaborator.configured_role_id);
             return resolve(this);
           }, reject)
           .catch(reject);
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte b/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte
index 27b960add1..64460036f8 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte
@@ -36,7 +36,7 @@
   const SelectUser = Select<User['id']>;
 
   $: addedUsers = new Set(
-    [...collaboratorsMap.values()].map((cbr) => cbr.user_id),
+    [...collaboratorsMap.values()].map((cbr) => cbr.userId),
   );
   $: usersNotAdded = [...usersMap.values()].filter(
     (user) => !addedUsers.has(user.id),
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
index 0098c5d999..80f27be6e3 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
@@ -15,8 +15,8 @@
   const routeContext = DatabaseSettingsRouteContext.get();
   $: ({ configuredRoles, users } = $routeContext);
 
-  $: user = $users.resolvedValue?.get(collaborator.user_id);
-  $: configuredRoleId = collaborator.configured_role_id;
+  $: user = $users.resolvedValue?.get(collaborator.userId);
+  $: configuredRoleId = collaborator.configuredRoleId;
   $: configuredRole = $configuredRoles.resolvedValue?.get($configuredRoleId);
   $: userName = user ? user.full_name || user.username : '';
 </script>
@@ -27,7 +27,7 @@
       <div>{userName}</div>
       <div>{user.email}</div>
     {:else}
-      {collaborator.user_id}
+      {collaborator.userId}
     {/if}
   </div>
 </GridTableCell>
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte b/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte
index 8fe7fe0c8f..77f1eb1155 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte
@@ -24,13 +24,12 @@
   export let configuredRolesMap: ImmutableMap<number, ConfiguredRole>;
   export let usersMap: ImmutableMap<number, User>;
 
-  $: savedConfiguredRoleId = collaborator.configured_role_id;
+  $: savedConfiguredRoleId = collaborator.configuredRoleId;
   $: configuredRoleId = requiredField<number>($savedConfiguredRoleId);
   $: form = makeForm({ configuredRoleId });
 
   $: userName =
-    usersMap.get(collaborator.user_id)?.username ??
-    String(collaborator.user_id);
+    usersMap.get(collaborator.userId)?.username ?? String(collaborator.userId);
 
   async function updateRoleForCollaborator() {
     await collaborator.setConfiguredRole($configuredRoleId);

From d2cc831996c217a27043ed84ba0ab14dbe0c06a3 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 27 Aug 2024 15:54:47 +0800
Subject: [PATCH 0741/1141] Add SQL tests for schema priv replacer

---
 db/sql/test_00_msar.sql | 128 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 7648e7ba1f..4cc3e2dcd3 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -4545,3 +4545,131 @@ BEGIN
   );
 END;
 $$ LANGUAGE plpgsql;
+
+
+-- msar.replace_schema_privileges_for_roles --------------------------------------------------------
+
+CREATE OR REPLACE FUNCTION
+test_replace_schema_privileges_for_roles_basic() RETURNS SETOF TEXT AS $$/*
+Happy path, smoke test.
+*/
+DECLARE
+  schema_id oid;
+  alice_id oid;
+  bob_id oid;
+BEGIN
+  CREATE SCHEMA restricted_test;
+  schema_id := 'restricted_test'::regnamespace::oid;
+  CREATE ROLE "Alice";
+  CREATE ROLE bob;
+  alice_id := '"Alice"'::regrole::oid;
+  bob_id := 'bob'::regrole::oid;
+
+  RETURN NEXT set_eq(
+    format(
+      $t1$SELECT jsonb_array_elements_text(direct) FROM jsonb_to_recordset(
+        msar.replace_schema_privileges_for_roles(%2$s, jsonb_build_array(jsonb_build_object(
+          'role_oid', %1$s, 'direct', jsonb_build_array('USAGE', 'CREATE')))))
+        AS x(direct jsonb, role_oid regrole)
+      WHERE role_oid=%1$s $t1$,
+      alice_id,
+      schema_id
+    ),
+    ARRAY['USAGE', 'CREATE'],
+    'Response should contain updated role info in correct form'
+  );
+  RETURN NEXT set_eq(
+    concat(
+      'SELECT privilege_type FROM pg_namespace, LATERAL aclexplode(pg_namespace.nspacl) acl',
+      format(' WHERE acl.grantee=%s;', alice_id)
+    ),
+    ARRAY['USAGE', 'CREATE'],
+    'Privileges should be updated for actual schema properly'
+  );
+  RETURN NEXT set_eq(
+    format(
+      $t2$SELECT jsonb_array_elements_text(direct) FROM jsonb_to_recordset(
+        msar.replace_schema_privileges_for_roles(%2$s, jsonb_build_array(jsonb_build_object(
+              'role_oid', %1$s, 'direct', jsonb_build_array('USAGE')))))
+        AS x(direct jsonb, role_oid regrole)
+      WHERE role_oid=%1$s $t2$,
+      bob_id,
+      schema_id
+    ),
+    ARRAY['USAGE'],
+    'Response should contain updated role info in correct form'
+  );
+  RETURN NEXT set_eq(
+    concat(
+      'SELECT privilege_type FROM pg_namespace, LATERAL aclexplode(pg_namespace.nspacl) acl',
+      format(' WHERE acl.grantee=%s;', alice_id)
+    ),
+    ARRAY['USAGE', 'CREATE'],
+    'Alice''s privileges should be left alone properly'
+  );
+  RETURN NEXT set_eq(
+    concat(
+      'SELECT privilege_type FROM pg_namespace, LATERAL aclexplode(pg_namespace.nspacl) acl',
+      format(' WHERE acl.grantee=%s;', bob_id)
+    ),
+    ARRAY['USAGE'],
+    'Privileges should be updated for actual schema properly'
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION
+test_replace_schema_privileges_for_roles_multi_ops() RETURNS SETOF TEXT AS $$/*
+Test that we can add/revoke multiple privileges to/from multiple roles simultaneously.
+*/
+DECLARE
+  schema_id oid;
+  alice_id oid;
+  bob_id oid;
+BEGIN
+  CREATE SCHEMA "test Multiops";
+  schema_id := '"test Multiops"'::regnamespace::oid;
+
+  CREATE ROLE "Alice";
+  CREATE ROLE bob;
+  alice_id := '"Alice"'::regrole::oid;
+  bob_id := 'bob'::regrole::oid;
+
+  GRANT USAGE, CREATE ON SCHEMA "test Multiops" TO "Alice";
+  GRANT USAGE ON SCHEMA "test Multiops" TO bob;
+
+  RETURN NEXT set_eq(
+    -- Revoke CREATE from Alice, Grant CREATE to Bob.
+    format(
+      $t1$SELECT jsonb_array_elements_text(direct) FROM jsonb_to_recordset(
+        msar.replace_schema_privileges_for_roles(%3$s, jsonb_build_array(
+          jsonb_build_object('role_oid', %1$s, 'direct', jsonb_build_array('USAGE')),
+          jsonb_build_object('role_oid', %2$s, 'direct', jsonb_build_array('USAGE', 'CREATE')))))
+        AS x(direct jsonb, role_oid regrole)
+      WHERE role_oid=%1$s $t1$,
+      alice_id,
+      bob_id,
+      schema_id
+    ),
+    ARRAY['USAGE'], -- This only checks form of Alice's info in response.
+    'Response should contain updated role info in correct form'
+  );
+  RETURN NEXT set_eq(
+    concat(
+      'SELECT privilege_type FROM pg_namespace, LATERAL aclexplode(pg_namespace.nspacl) acl',
+      format(' WHERE acl.grantee=%s;', alice_id)
+    ),
+    ARRAY['USAGE'],
+    'Alice''s privileges should be updated for actual schema properly'
+  );
+  RETURN NEXT set_eq(
+    concat(
+      'SELECT privilege_type FROM pg_namespace, LATERAL aclexplode(pg_namespace.nspacl) acl',
+      format(' WHERE acl.grantee=%s;', bob_id)
+    ),
+    ARRAY['USAGE', 'CREATE'],
+    'Bob''s privileges should be updated for actual schema properly'
+  );
+END;
+$$ LANGUAGE plpgsql;

From a935442ad8bb84946d837110858665d4d9289266 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 27 Aug 2024 16:04:03 +0800
Subject: [PATCH 0742/1141] add python wrapper for role replacer

---
 db/roles/operations/update.py            |  7 +++++++
 db/tests/roles/operations/test_update.py | 15 +++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/db/roles/operations/update.py b/db/roles/operations/update.py
index a0bcccb4e3..fa2fbe6d8a 100644
--- a/db/roles/operations/update.py
+++ b/db/roles/operations/update.py
@@ -6,3 +6,10 @@ def replace_database_privileges_for_roles(conn, privileges):
     return exec_msar_func(
         conn, 'replace_database_privileges_for_roles', json.dumps(privileges)
     ).fetchone()[0]
+
+
+def replace_schema_privileges_for_roles(conn, schema_oid, privileges):
+    return exec_msar_func(
+        conn, 'replace_schema_privileges_for_roles',
+        schema_oid, json.dumps(privileges)
+    ).fetchone()[0]
diff --git a/db/tests/roles/operations/test_update.py b/db/tests/roles/operations/test_update.py
index 3393d3c3c7..c98e456684 100644
--- a/db/tests/roles/operations/test_update.py
+++ b/db/tests/roles/operations/test_update.py
@@ -12,3 +12,18 @@ def test_replace_database_privileges_for_roles():
         'conn', 'replace_database_privileges_for_roles', json.dumps(priv_spec)
     )
     assert result == 'a'
+
+
+def test_replace_schema_privileges_for_roles():
+    schema_oid = 12345
+    priv_spec = [{"role_oid": 1234, "privileges": ["UPDATE", "CREATE"]}]
+    with patch.object(rupdate, 'exec_msar_func') as mock_exec:
+        mock_exec.return_value.fetchone = lambda: ('a', 'b')
+        result = rupdate.replace_schema_privileges_for_roles(
+            'conn', schema_oid, priv_spec
+        )
+    mock_exec.assert_called_once_with(
+        'conn', 'replace_schema_privileges_for_roles',
+        schema_oid, json.dumps(priv_spec)
+    )
+    assert result == 'a'

From 1bcabc64b4ca7ec0fb025411d3b6d2a425f7c09f Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 27 Aug 2024 16:32:25 +0800
Subject: [PATCH 0743/1141] wire up privilege replacer to RPC endpoint

---
 mathesar/rpc/schema_privileges.py    | 37 ++++++++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py |  5 ++++
 2 files changed, 42 insertions(+)

diff --git a/mathesar/rpc/schema_privileges.py b/mathesar/rpc/schema_privileges.py
index 9d77764b4f..3257e514e0 100644
--- a/mathesar/rpc/schema_privileges.py
+++ b/mathesar/rpc/schema_privileges.py
@@ -4,6 +4,7 @@
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from db.roles.operations.select import list_schema_privileges
+from db.roles.operations.update import replace_schema_privileges_for_roles
 from mathesar.rpc.utils import connect
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 
@@ -47,3 +48,39 @@ def list_direct(
     with connect(database_id, user) as conn:
         raw_priv = list_schema_privileges(schema_oid, conn)
     return [SchemaPrivileges.from_dict(i) for i in raw_priv]
+
+
+@rpc_method(name="schema_privileges.replace_for_roles")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def replace_for_roles(
+        *,
+        privileges: list[SchemaPrivileges], schema_oid: int, database_id: int,
+        **kwargs
+) -> list[SchemaPrivileges]:
+    """
+    Replace direct schema privileges for roles.
+
+    Possible privileges are `USAGE` and `CREATE`.
+
+    Only roles which are included in a passed `SchemaPrivileges` object
+    are affected.
+
+    WARNING: Any privilege included in the `direct` list for a role
+    is GRANTed, and any privilege not included is REVOKEd.
+
+    Args:
+        privileges: The new privilege sets for roles.
+        schema_oid: The OID of the affected schema.
+        database_id: The Django id of the database containing the schema.
+
+    Returns:
+        A list of all non-default privileges on the schema after the
+        operation.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        raw_priv = replace_schema_privileges_for_roles(
+            conn, schema_oid, [SchemaPrivileges.from_dict(i) for i in privileges]
+        )
+    return [SchemaPrivileges.from_dict(i) for i in raw_priv]
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index c26ea473f4..58f025d5fa 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -278,6 +278,11 @@
         "schema_privileges.list_direct",
         [user_is_authenticated]
     ),
+    (
+        schema_privileges.replace_for_roles,
+        "schema_privileges.replace_for_roles",
+        [user_is_authenticated]
+    ),
     (
         servers.list_,
         "servers.list",

From 38bfb72cce540c0ed69de7f007e1386b4150e1a8 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 27 Aug 2024 16:33:10 +0800
Subject: [PATCH 0744/1141] add wiring test for privilege replacer RPC func

---
 mathesar/tests/rpc/test_schema_privileges.py | 45 ++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/mathesar/tests/rpc/test_schema_privileges.py b/mathesar/tests/rpc/test_schema_privileges.py
index 6079fcbeeb..23b2ff9f48 100644
--- a/mathesar/tests/rpc/test_schema_privileges.py
+++ b/mathesar/tests/rpc/test_schema_privileges.py
@@ -49,3 +49,48 @@ def mock_list_privileges(
         schema_oid=_schema_oid, database_id=_database_id, request=request
     )
     assert actual_response == expect_response
+
+
+def test_schema_privileges_replace_for_roles(rf, monkeypatch):
+    _username = 'alice'
+    _password = 'pass1234'
+    _schema_oid = 654321
+    _database_id = 2
+    _privileges = [{"role_oid": 12345, "direct": ["USAGE"]}]
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=_username, password=_password)
+
+    @contextmanager
+    def mock_connect(database_id, user):
+        if database_id == _database_id and user.username == _username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_replace_privileges(
+            conn,
+            schema_oid,
+            privileges,
+    ):
+        if privileges != _privileges or schema_oid != _schema_oid:
+            raise AssertionError('incorrect parameters passed')
+        return _privileges + [{"role_oid": 67890, "direct": ["USAGE", "CREATE"]}]
+
+    monkeypatch.setattr(schema_privileges, 'connect', mock_connect)
+    monkeypatch.setattr(
+        schema_privileges,
+        'replace_schema_privileges_for_roles',
+        mock_replace_privileges
+    )
+    expect_response = [
+        {"role_oid": 12345, "direct": ["USAGE"]},
+        {"role_oid": 67890, "direct": ["USAGE", "CREATE"]}
+    ]
+    actual_response = schema_privileges.replace_for_roles(
+        privileges=_privileges, schema_oid=_schema_oid, database_id=_database_id,
+        request=request
+    )
+    assert actual_response == expect_response

From dbd366bb484bff2eb15450202e8e117e7280d7a3 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 27 Aug 2024 16:35:37 +0800
Subject: [PATCH 0745/1141] wire up documentation for privilege replacer

---
 docs/docs/api/rpc.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 7e4c439e21..85b6de8725 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -115,6 +115,7 @@ To use an RPC function:
     options:
       members:
       - list_direct
+      - replace_for_roles
       - SchemaPrivileges
 
 ## Tables

From b983b22691a7e613dcd51e58f6e4c244861b1dcf Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 27 Aug 2024 19:01:31 +0530
Subject: [PATCH 0746/1141] add SQL function for replacing table privs with
 tests

---
 db/sql/00_msar.sql      |  47 +++++++++++++++
 db/sql/test_00_msar.sql | 128 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 175 insertions(+)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 4d9a9cd527..6d845cd573 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1249,6 +1249,53 @@ END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION
+msar.build_table_privilege_replace_expr(tab_id regclass, rol_id regrole, privileges_ jsonb)
+  RETURNS TEXT AS $$
+SELECT string_agg(
+  format(
+    concat(
+      CASE WHEN privileges_ ? val THEN 'GRANT' ELSE 'REVOKE' END,
+      ' %1$s ON TABLE %2$I.%3$I ',
+      CASE WHEN privileges_ ? val THEN 'TO' ELSE 'FROM' END,
+      ' %4$I'
+    ),
+    val,
+    msar.get_relation_schema_name(tab_id),
+    msar.get_relation_name(tab_id),
+    msar.get_role_name(rol_id)
+  ),
+  E';\n'
+) || E';\n'
+FROM unnest(ARRAY['INSERT', 'SELECT', 'UPDATE', 'DELETE', 'TRUNCATE', 'REFERENCES', 'TRIGGER']) as x(val);
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.replace_table_privileges_for_roles(tab_id regclass, priv_spec jsonb) RETURNS jsonb AS $$/*
+Grant/Revoke privileges for a set of roles on the given table.
+
+Args:
+  tab_id The OID of the table for which we're setting privileges for roles.
+  priv_spec: An array defining the privileges to grant or revoke for each role.
+
+Each object in the priv_spec should have the form:
+{role_oid: <int>, privileges: SET<"INSERT"|"SELECT"|"UPDATE"|"DELETE"|"TRUNCATE"|"REFERENCES"|"TRIGGER">}
+
+Any privilege that exists in the privileges subarray will be granted. Any which is missing will be
+revoked.
+*/
+BEGIN
+EXECUTE string_agg(
+  msar.build_table_privilege_replace_expr(tab_id, role_oid, direct),
+  E';\n'
+) || ';'
+FROM jsonb_to_recordset(priv_spec) AS x(role_oid regrole, direct jsonb);
+RETURN msar.list_table_privileges(tab_id);
+END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 -- ALTER SCHEMA FUNCTIONS
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 4cc3e2dcd3..a43a21a275 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -4673,3 +4673,131 @@ BEGIN
   );
 END;
 $$ LANGUAGE plpgsql;
+
+
+-- msar.replace_table_privileges_for_roles --------------------------------------------------------
+
+CREATE OR REPLACE FUNCTION
+test_replace_table_privileges_for_roles_basic() RETURNS SETOF TEXT AS $$/*
+Happy path, smoke test.
+*/
+DECLARE
+  table_id oid;
+  alice_id oid;
+  bob_id oid;
+BEGIN
+  CREATE TABLE restricted_table();
+  table_id := 'restricted_table'::regclass::oid;
+  CREATE ROLE "Alice";
+  CREATE ROLE bob;
+  alice_id := '"Alice"'::regrole::oid;
+  bob_id := 'bob'::regrole::oid;
+
+  RETURN NEXT set_eq(
+    format(
+      $t1$SELECT jsonb_array_elements_text(direct) FROM jsonb_to_recordset(
+        msar.replace_table_privileges_for_roles(%2$s, jsonb_build_array(jsonb_build_object(
+          'role_oid', %1$s, 'direct', jsonb_build_array('SELECT', 'UPDATE')))))
+        AS x(direct jsonb, role_oid regrole)
+      WHERE role_oid=%1$s $t1$,
+      alice_id,
+      table_id
+    ),
+    ARRAY['SELECT', 'UPDATE'],
+    'Response should contain updated role info in correct form'
+  );
+  RETURN NEXT set_eq(
+    concat(
+      'SELECT privilege_type FROM pg_class, LATERAL aclexplode(pg_class.relacl) acl',
+      format(' WHERE acl.grantee=%s;', alice_id)
+    ),
+    ARRAY['SELECT', 'UPDATE'],
+    'Privileges should be updated for actual table properly'
+  );
+  RETURN NEXT set_eq(
+    format(
+      $t2$SELECT jsonb_array_elements_text(direct) FROM jsonb_to_recordset(
+        msar.replace_table_privileges_for_roles(%2$s, jsonb_build_array(jsonb_build_object(
+              'role_oid', %1$s, 'direct', jsonb_build_array('INSERT', 'SELECT', 'DELETE')))))
+        AS x(direct jsonb, role_oid regrole)
+      WHERE role_oid=%1$s $t2$,
+      bob_id,
+      table_id
+    ),
+    ARRAY['INSERT', 'SELECT', 'DELETE'],
+    'Response should contain updated role info in correct form'
+  );
+  RETURN NEXT set_eq(
+    concat(
+      'SELECT privilege_type FROM pg_class, LATERAL aclexplode(pg_class.relacl) acl',
+      format(' WHERE acl.grantee=%s;', alice_id)
+    ),
+    ARRAY['SELECT', 'UPDATE'],
+    'Alice''s privileges should be left alone properly'
+  );
+  RETURN NEXT set_eq(
+    concat(
+      'SELECT privilege_type FROM pg_class, LATERAL aclexplode(pg_class.relacl) acl',
+      format(' WHERE acl.grantee=%s;', bob_id)
+    ),
+    ARRAY['INSERT', 'SELECT', 'DELETE'],
+    'Privileges should be updated for actual table properly'
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION
+test_replace_table_privileges_for_roles_multi_ops() RETURNS SETOF TEXT AS $$/*
+Test that we can add/revoke multiple privileges to/from multiple roles simultaneously.
+*/
+DECLARE
+  table_id oid;
+  alice_id oid;
+  bob_id oid;
+BEGIN
+  CREATE TABLE "test Multiops table"();
+  table_id := '"test Multiops table"'::regclass::oid;
+
+  CREATE ROLE "Alice";
+  CREATE ROLE bob;
+  alice_id := '"Alice"'::regrole::oid;
+  bob_id := 'bob'::regrole::oid;
+
+  GRANT SELECT, DELETE ON TABLE "test Multiops table" TO "Alice";
+  GRANT INSERT, UPDATE ON TABLE "test Multiops table" TO bob;
+
+  RETURN NEXT set_eq(
+    -- Revoke CREATE from Alice, Grant CREATE to Bob.
+    format(
+      $t1$SELECT jsonb_array_elements_text(direct) FROM jsonb_to_recordset(
+        msar.replace_table_privileges_for_roles(%3$s, jsonb_build_array(
+          jsonb_build_object('role_oid', %1$s, 'direct', jsonb_build_array('INSERT', 'SELECT', 'UPDATE')),
+          jsonb_build_object('role_oid', %2$s, 'direct', jsonb_build_array('SELECT', 'DELETE')))))
+        AS x(direct jsonb, role_oid regrole)
+      WHERE role_oid=%1$s $t1$,
+      alice_id,
+      bob_id,
+      table_id
+    ),
+    ARRAY['INSERT', 'SELECT', 'UPDATE'], -- This only checks form of Alice's info in response.
+    'Response should contain updated role info in correct form'
+  );
+  RETURN NEXT set_eq(
+    concat(
+      'SELECT privilege_type FROM pg_class, LATERAL aclexplode(pg_class.relacl) acl',
+      format(' WHERE acl.grantee=%s;', alice_id)
+    ),
+    ARRAY['INSERT', 'SELECT', 'UPDATE'],
+    'Alice''s privileges should be updated for actual table properly'
+  );
+  RETURN NEXT set_eq(
+    concat(
+      'SELECT privilege_type FROM pg_class, LATERAL aclexplode(pg_class.relacl) acl',
+      format(' WHERE acl.grantee=%s;', bob_id)
+    ),
+    ARRAY['SELECT', 'DELETE'],
+    'Bob''s privileges should be updated for actual table properly'
+  );
+END;
+$$ LANGUAGE plpgsql;

From 7662bb4629ce99bbb4da6e2e0d2e4c90990fb2be Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 27 Aug 2024 19:05:42 +0530
Subject: [PATCH 0747/1141] wire up sql function to python

---
 db/roles/operations/update.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/db/roles/operations/update.py b/db/roles/operations/update.py
index fa2fbe6d8a..900d1aca97 100644
--- a/db/roles/operations/update.py
+++ b/db/roles/operations/update.py
@@ -13,3 +13,10 @@ def replace_schema_privileges_for_roles(conn, schema_oid, privileges):
         conn, 'replace_schema_privileges_for_roles',
         schema_oid, json.dumps(privileges)
     ).fetchone()[0]
+
+
+def replace_table_privileges_for_roles(conn, table_oid, privileges):
+    return exec_msar_func(
+        conn, 'replace_table_privileges_for_roles',
+        table_oid, json.dumps(privileges)
+    ).fetchone()[0]

From 206f707a395c7ac9dd9cf54a0b75bf91b2e82834 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 27 Aug 2024 19:07:54 +0530
Subject: [PATCH 0748/1141] add replace_for_roles endpoint

---
 mathesar/rpc/table_privileges.py | 37 ++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/mathesar/rpc/table_privileges.py b/mathesar/rpc/table_privileges.py
index 4a9f4b1d7a..801ac0a5e9 100644
--- a/mathesar/rpc/table_privileges.py
+++ b/mathesar/rpc/table_privileges.py
@@ -4,6 +4,7 @@
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from db.roles.operations.select import list_table_privileges
+from db.roles.operations.update import replace_table_privileges_for_roles
 from mathesar.rpc.utils import connect
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 
@@ -44,3 +45,39 @@ def list_direct(
     with connect(database_id, user) as conn:
         raw_priv = list_table_privileges(table_oid, conn)
     return [TablePrivileges.from_dict(i) for i in raw_priv]
+
+
+@rpc_method(name="table_privileges.replace_for_roles")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def replace_for_roles(
+    *,
+    privileges: list[TablePrivileges], table_oid: int, database_id: int,
+    **kwargs
+) -> list[TablePrivileges]:
+    """
+    Replace direct table privileges for roles.
+
+    Possible privileges are `INSERT`, `SELECT`, `UPDATE`, `DELETE`, `TRUNCATE`, `REFERENCES` and `TRIGGER`.
+
+    Only roles which are included in a passed `TablePrivileges` object
+    are affected.
+
+    WARNING: Any privilege included in the `direct` list for a role
+    is GRANTed, and any privilege not included is REVOKEd.
+
+    Args:
+        privileges: The new privilege sets for roles.
+        table_oid: The OID of the affected table.
+        database_id: The Django id of the database containing the table.
+
+    Returns:
+        A list of all non-default privileges on the table after the
+        operation.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        raw_priv = replace_table_privileges_for_roles(
+            conn, table_oid, [TablePrivileges.from_dict(i) for i in privileges]
+        )
+    return [TablePrivileges.from_dict(i) for i in raw_priv]

From e336206a0e9eca6db8f81c0a234d8629ee5c3128 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 27 Aug 2024 19:08:51 +0530
Subject: [PATCH 0749/1141] add docs, endpoint & mock tests for
 replace_for_roles

---
 docs/docs/api/rpc.md                        |  1 +
 mathesar/tests/rpc/test_endpoints.py        |  5 ++
 mathesar/tests/rpc/test_table_privileges.py | 55 +++++++++++++++++++++
 3 files changed, 61 insertions(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 85b6de8725..f64484bcba 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -142,6 +142,7 @@ To use an RPC function:
     options:
       members:
       - list_direct
+      - replace_for_roles
       - TablePrivileges
 
 ## Table Metadata
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 58f025d5fa..e98b1cc3c9 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -344,6 +344,11 @@
         "table_privileges.list_direct",
         [user_is_authenticated]
     ),
+    (
+        table_privileges.replace_for_roles,
+        "table_privileges.replace_for_roles",
+        [user_is_authenticated]
+    ),
     (
         tables.metadata.list_,
         "tables.metadata.list",
diff --git a/mathesar/tests/rpc/test_table_privileges.py b/mathesar/tests/rpc/test_table_privileges.py
index dbaddcf766..29f784902a 100644
--- a/mathesar/tests/rpc/test_table_privileges.py
+++ b/mathesar/tests/rpc/test_table_privileges.py
@@ -61,3 +61,58 @@ def mock_list_privileges(
         table_oid=_table_oid, database_id=_database_id, request=request
     )
     assert actual_response == expect_response
+
+
+def test_table_privileges_replace_for_roles(rf, monkeypatch):
+    _username = 'alice'
+    _password = 'pass1234'
+    _table_oid = 654321
+    _database_id = 2
+    _privileges = [{"role_oid": 12345, "direct": ["SELECT", "UPDATE", "DELETE"]}]
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=_username, password=_password)
+
+    @contextmanager
+    def mock_connect(database_id, user):
+        if database_id == _database_id and user.username == _username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_replace_privileges(
+            conn,
+            table_oid,
+            privileges,
+    ):
+        if privileges != _privileges or table_oid != _table_oid:
+            raise AssertionError('incorrect parameters passed')
+        return _privileges + [{
+            "role_oid": 67890,
+            "direct": [
+                "INSERT",
+                "SELECT",
+                "UPDATE",
+                "DELETE",
+                "TRUNCATE",
+                "REFERENCES",
+                "TRIGGER"
+            ]}]
+
+    monkeypatch.setattr(table_privileges, 'connect', mock_connect)
+    monkeypatch.setattr(
+        table_privileges,
+        'replace_table_privileges_for_roles',
+        mock_replace_privileges
+    )
+    expect_response = [
+        {"role_oid": 12345, "direct": ["SELECT", "UPDATE", "DELETE"]},
+        {"role_oid": 67890, "direct": ["INSERT", "SELECT", "UPDATE", "DELETE", "TRUNCATE", "REFERENCES", "TRIGGER"]}
+    ]
+    actual_response = table_privileges.replace_for_roles(
+        privileges=_privileges, table_oid=_table_oid, database_id=_database_id,
+        request=request
+    )
+    assert actual_response == expect_response

From cdc5c7e52e03b27ab89c3bd4d3719ed5d2e7f69f Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 27 Aug 2024 19:17:17 +0530
Subject: [PATCH 0750/1141] fix sql test docstring

---
 db/sql/test_00_msar.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index a43a21a275..aa891db25c 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -4768,7 +4768,8 @@ BEGIN
   GRANT INSERT, UPDATE ON TABLE "test Multiops table" TO bob;
 
   RETURN NEXT set_eq(
-    -- Revoke CREATE from Alice, Grant CREATE to Bob.
+    -- Grant INSERT, SELECT and UPDATE to Alice, Revoke DELETE.
+    -- Grant SELECT and DELETE to Bob, Revoke INSERT and UPDATE.
     format(
       $t1$SELECT jsonb_array_elements_text(direct) FROM jsonb_to_recordset(
         msar.replace_table_privileges_for_roles(%3$s, jsonb_build_array(

From 19c4f2adf710f6cf1d915600bd6ad3b54b6014b7 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Tue, 27 Aug 2024 19:25:04 +0530
Subject: [PATCH 0751/1141] Remove unused utility file

---
 .../collaborators/Collaborators.svelte        |  9 +++++---
 mathesar_ui/src/utils/language.ts             | 23 -------------------
 2 files changed, 6 insertions(+), 26 deletions(-)
 delete mode 100644 mathesar_ui/src/utils/language.ts

diff --git a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
index 3fb806ca60..c038375006 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
@@ -10,8 +10,11 @@
   import type { Collaborator } from '@mathesar/models/Collaborator';
   import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
   import { modal } from '@mathesar/stores/modal';
-  import { isDefined } from '@mathesar/utils/language';
-  import { Button, Spinner } from '@mathesar-component-library';
+  import {
+    Button,
+    Spinner,
+    isDefinedNonNullable,
+  } from '@mathesar-component-library';
 
   import SettingsContentLayout from '../SettingsContentLayout.svelte';
 
@@ -40,7 +43,7 @@
     $collaborators.error,
     $configuredRoles.error,
     $users.error,
-  ].filter((entry): entry is string => isDefined(entry));
+  ].filter((entry): entry is string => isDefinedNonNullable(entry));
 
   let targetCollaborator: Collaborator | undefined;
 
diff --git a/mathesar_ui/src/utils/language.ts b/mathesar_ui/src/utils/language.ts
deleted file mode 100644
index 7b1792595f..0000000000
--- a/mathesar_ui/src/utils/language.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-export const isEmpty = <T>(arr: T[]): boolean => arr.length === 0;
-
-export const notEmpty = <T>(arr: T[]): boolean => !isEmpty(arr);
-
-export function intersection<T>(a: Set<T>, b: Set<T>): Array<T> {
-  const elsThatBothSetsHave = Array.from(a).filter((el) => b.has(el));
-  return elsThatBothSetsHave;
-}
-
-/**
- * Devised for easy type declaration when constructing a two-element tuple (a pair). Useful when
- * using the Map constructor to turn an array of pairs into a Map.
- *
- * Javascript doesn't distinguish arrays and tuples, but Typescript does and requires a verbose
- * type declaration to make the distinction (see return value). This function solves that.
- *
- * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map/Map
- */
-export function pair<A, B>(a: A, b: B): [A, B] {
-  return [a, b] as [A, B];
-}
-
-export const isDefined = <T>(x: T): boolean => typeof x !== 'undefined';

From 4078e106d2eff3182b6d04827cd55832eb9cb48a Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 27 Aug 2024 23:43:11 +0800
Subject: [PATCH 0752/1141] add property for self ownership to db priv response

---
 db/roles/operations/select.py        |  4 ++--
 db/sql/00_msar.sql                   |  7 ++++---
 mathesar/rpc/database_privileges.py  | 14 ++++++++------
 mathesar/tests/rpc/test_endpoints.py |  4 ++--
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/db/roles/operations/select.py b/db/roles/operations/select.py
index a6c7119ca9..f35f2c1a70 100644
--- a/db/roles/operations/select.py
+++ b/db/roles/operations/select.py
@@ -17,5 +17,5 @@ def list_table_privileges(table_oid, conn):
     return exec_msar_func(conn, 'list_table_privileges', table_oid).fetchone()[0]
 
 
-def get_curr_role_db_priv(db_name, conn):
-    return exec_msar_func(conn, 'get_owner_oid_and_curr_role_db_priv', db_name).fetchone()[0]
+def get_curr_role_db_priv(conn):
+    return exec_msar_func(conn, 'get_self_database_privileges').fetchone()[0]
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 6049b07a9d..1080f368ac 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1063,7 +1063,7 @@ SELECT COALESCE(jsonb_agg(priv_cte.p), '[]'::jsonb) FROM priv_cte;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
-CREATE OR REPLACE FUNCTION msar.get_owner_oid_and_curr_role_db_priv(db_name text) RETURNS jsonb AS $$/*
+CREATE OR REPLACE FUNCTION msar.get_self_database_privileges() RETURNS jsonb AS $$/*
 Given a database name, returns a json object with database owner oid and database privileges
 for the role executing the function.
 
@@ -1081,9 +1081,10 @@ SELECT jsonb_build_object(
       CASE WHEN has_database_privilege(pgd.oid, 'TEMPORARY') THEN 'TEMPORARY' END,
       CASE WHEN has_database_privilege(pgd.oid, 'CONNECT') THEN 'CONNECT' END
     ], NULL
-  )
+  ),
+  'current_role_owner', pg_catalog.pg_has_role(pgd.datdba, 'USAGE')
 ) FROM pg_catalog.pg_database AS pgd
-WHERE pgd.datname = db_name;
+WHERE pgd.datname = current_database();
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
diff --git a/mathesar/rpc/database_privileges.py b/mathesar/rpc/database_privileges.py
index f45908da3c..f5bd3b62c3 100644
--- a/mathesar/rpc/database_privileges.py
+++ b/mathesar/rpc/database_privileges.py
@@ -36,15 +36,18 @@ class CurrentDBPrivileges(TypedDict):
     Attributes:
         owner_oid: The `oid` of the owner of the database.
         current_role_db_priv: A list of database privileges for the current user.
+        current_role_owner: Whether the current role is an owner of the database.
     """
     owner_oid: int
-    current_role_db_priv: list[str]
+    current_role_db_priv: list[Literal['CONNECT', 'CREATE', 'TEMPORARY']]
+    current_role_owner: bool
 
     @classmethod
     def from_dict(cls, d):
         return cls(
             owner_oid=d["owner_oid"],
-            current_role_db_priv=d["current_role_db_priv"]
+            current_role_db_priv=d["current_role_db_priv"],
+            current_role_owner=d["current_role_owner"]
         )
 
 
@@ -69,10 +72,10 @@ def list_direct(*, database_id: int, **kwargs) -> list[DBPrivileges]:
 
 
 # TODO: Think of something concise for the endpoint name.
-@rpc_method(name="database_privileges.get_owner_oid_and_curr_role_db_priv")
+@rpc_method(name="database_privileges.get_self")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def get_owner_oid_and_curr_role_db_priv(*, database_id: int, **kwargs) -> CurrentDBPrivileges:
+def get_self(*, database_id: int, **kwargs) -> CurrentDBPrivileges:
     """
     Get database privileges for the current user.
 
@@ -84,8 +87,7 @@ def get_owner_oid_and_curr_role_db_priv(*, database_id: int, **kwargs) -> Curren
     """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
-        db_name = Database.objects.get(id=database_id).name
-        curr_role_db_priv = get_curr_role_db_priv(db_name, conn)
+        curr_role_db_priv = get_curr_role_db_priv(conn)
     return CurrentDBPrivileges.from_dict(curr_role_db_priv)
 
 
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index c26ea473f4..dd3ff756ea 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -154,8 +154,8 @@
         [user_is_authenticated]
     ),
     (
-        database_privileges.get_owner_oid_and_curr_role_db_priv,
-        "database_privileges.get_owner_oid_and_curr_role_db_priv",
+        database_privileges.get_self,
+        "database_privileges.get_self",
         [user_is_authenticated]
     ),
     (

From 7e1e6dbf9ecfe56a5cffb849cd1774402ba60b73 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 28 Aug 2024 00:11:54 +0800
Subject: [PATCH 0753/1141] add privilege info to schemas getter return object

---
 db/sql/00_msar.sql | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 1080f368ac..b0c685b874 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -893,6 +893,9 @@ Each returned JSON object in the array will have the form:
     "oid": <int>
     "name": <str>
     "description": <str|null>
+    "owner_oid": <int>,
+    "current_role_priv": [<str>],
+    "current_role_owns": <bool>,
     "table_count": <int>
   }
 */
@@ -902,6 +905,15 @@ FROM (
     s.oid::bigint AS oid,
     s.nspname AS name,
     pg_catalog.obj_description(s.oid) AS description,
+    s.nspowner::bigint AS owner_oid,
+    array_remove(
+      ARRAY[
+        CASE WHEN pg_catalog.has_schema_privilege(s.oid, 'USAGE') THEN 'USAGE' END,
+        CASE WHEN pg_catalog.has_schema_privilege(s.oid, 'CREATE') THEN 'CREATE' END
+      ],
+      NULL
+    ) AS current_role_priv,
+    pg_catalog.pg_has_role(s.nspowner, 'USAGE') AS current_role_owns,
     COALESCE(count(c.oid), 0) AS table_count
   FROM pg_catalog.pg_namespace s
   LEFT JOIN pg_catalog.pg_class c ON
@@ -914,7 +926,8 @@ FROM (
     s.nspname NOT LIKE 'pg_%'
   GROUP BY
     s.oid,
-    s.nspname
+    s.nspname,
+    s.nspowner
 ) AS schema_data;
 $$ LANGUAGE SQL;
 
@@ -1063,26 +1076,27 @@ SELECT COALESCE(jsonb_agg(priv_cte.p), '[]'::jsonb) FROM priv_cte;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
-CREATE OR REPLACE FUNCTION msar.get_self_database_privileges() RETURNS jsonb AS $$/*
+CREATE OR REPLACE FUNCTION msar.get_current_role_database_privileges() RETURNS jsonb AS $$/*
 Given a database name, returns a json object with database owner oid and database privileges
 for the role executing the function.
 
 The returned JSON object has the form:
   {
     "owner_oid": <int>,
-    "current_role_db_priv" [<str>]
+    "current_role_priv": [<str>],
+    "current_role_owner": <bool>
   }
 */
 SELECT jsonb_build_object(
   'owner_oid', pgd.datdba::bigint,
-  'current_role_db_priv', array_remove(
+  'current_role_priv', array_remove(
     ARRAY[
       CASE WHEN has_database_privilege(pgd.oid, 'CREATE') THEN 'CREATE' END,
       CASE WHEN has_database_privilege(pgd.oid, 'TEMPORARY') THEN 'TEMPORARY' END,
       CASE WHEN has_database_privilege(pgd.oid, 'CONNECT') THEN 'CONNECT' END
     ], NULL
   ),
-  'current_role_owner', pg_catalog.pg_has_role(pgd.datdba, 'USAGE')
+  'current_role_owns', pg_catalog.pg_has_role(pgd.datdba, 'USAGE')
 ) FROM pg_catalog.pg_database AS pgd
 WHERE pgd.datname = current_database();
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;

From 8d133924465209044d35003bdd6bb9078539dff9 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 28 Aug 2024 00:13:47 +0800
Subject: [PATCH 0754/1141] add new schema privilege info to RPC lister

---
 mathesar/rpc/schemas.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/mathesar/rpc/schemas.py b/mathesar/rpc/schemas.py
index a372f3b8e0..733f908ac3 100644
--- a/mathesar/rpc/schemas.py
+++ b/mathesar/rpc/schemas.py
@@ -1,7 +1,7 @@
 """
 Classes and functions exposed to the RPC endpoint for managing schemas.
 """
-from typing import Optional, TypedDict
+from typing import Literal, Optional, TypedDict
 
 from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
@@ -23,11 +23,19 @@ class SchemaInfo(TypedDict):
         oid: The OID of the schema
         name: The name of the schema
         description: A description of the schema
+        owner_oid: The OID of the owner of the schema
+        current_role_priv: All privileges available to the calling role
+            on the schema.
+        current_role_owns: Whether the current role is the owner of the
+            schema (even indirectly).
         table_count: The number of tables in the schema
     """
     oid: int
     name: str
     description: Optional[str]
+    owner_oid: int
+    current_role_priv: list[Literal['USAGE', 'CREATE']]
+    current_role_owns: bool
     table_count: int
 
 

From 9de56a18914163b1c70aa368c3b8385dba155671 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 28 Aug 2024 00:32:29 +0800
Subject: [PATCH 0755/1141] Add table privilege info to SQL lister and getter

---
 db/sql/00_msar.sql | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index b0c685b874..60c74f20a5 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -844,6 +844,20 @@ SELECT jsonb_build_object(
   'name', relname,
   'schema', relnamespace::bigint,
   'description', msar.obj_description(oid, 'pg_class')
+  'owner_oid', relowner,
+  'current_role_priv', array_remove(
+    ARRAY[
+      CASE WHEN pg_catalog.has_table_privilege(oid, 'SELECT') THEN 'SELECT' END,
+      CASE WHEN pg_catalog.has_table_privilege(oid, 'INSERT') THEN 'INSERT' END,
+      CASE WHEN pg_catalog.has_table_privilege(oid, 'UPDATE') THEN 'UPDATE' END,
+      CASE WHEN pg_catalog.has_table_privilege(oid, 'DELETE') THEN 'DELETE' END,
+      CASE WHEN pg_catalog.has_table_privilege(oid, 'TRUNCATE') THEN 'TRUNCATE' END,
+      CASE WHEN pg_catalog.has_table_privilege(oid, 'REFERENCES') THEN 'REFERENCES' END,
+      CASE WHEN pg_catalog.has_table_privilege(oid, 'TRIGGER') THEN 'TRIGGER' END
+    ],
+    NULL
+  ),
+  'current_role_owns', pg_catalog.pg_has_role(relowner, 'USAGE')
 ) FROM pg_catalog.pg_class WHERE oid = tab_id;
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
@@ -856,7 +870,10 @@ Each returned JSON object in the array will have the form:
     "oid": <int>,
     "name": <str>,
     "schema": <int>,
-    "description": <str>
+    "description": <str>,
+    "owner_oid": <int>,
+    "current_role_priv": [<str>],
+    "current_role_owns": <bool>
   }
 
 Args:
@@ -868,7 +885,21 @@ SELECT coalesce(
       'oid', pgc.oid::bigint,
       'name', pgc.relname,
       'schema', pgc.relnamespace::bigint,
-      'description', msar.obj_description(pgc.oid, 'pg_class')
+      'description', msar.obj_description(pgc.oid, 'pg_class'),
+      'owner_oid', pgc.relowner,
+      'current_role_priv', array_remove(
+        ARRAY[
+          CASE WHEN pg_catalog.has_table_privilege(pgc.oid, 'SELECT') THEN 'SELECT' END,
+          CASE WHEN pg_catalog.has_table_privilege(pgc.oid, 'INSERT') THEN 'INSERT' END,
+          CASE WHEN pg_catalog.has_table_privilege(pgc.oid, 'UPDATE') THEN 'UPDATE' END,
+          CASE WHEN pg_catalog.has_table_privilege(pgc.oid, 'DELETE') THEN 'DELETE' END,
+          CASE WHEN pg_catalog.has_table_privilege(pgc.oid, 'TRUNCATE') THEN 'TRUNCATE' END,
+          CASE WHEN pg_catalog.has_table_privilege(pgc.oid, 'REFERENCES') THEN 'REFERENCES' END,
+          CASE WHEN pg_catalog.has_table_privilege(pgc.oid, 'TRIGGER') THEN 'TRIGGER' END
+        ],
+        NULL
+      ),
+      'current_role_owns', pg_catalog.pg_has_role(pgc.relowner, 'USAGE')
     )
   ),
   '[]'::jsonb

From 9d562d9d3ac59eb4cf6f79e92ef38a3af48391b2 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 28 Aug 2024 00:34:05 +0800
Subject: [PATCH 0756/1141] remove extraneous and out-of-date docstring
 snippets

---
 db/tables/operations/select.py | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/db/tables/operations/select.py b/db/tables/operations/select.py
index a25fca1d43..fea5b168b4 100644
--- a/db/tables/operations/select.py
+++ b/db/tables/operations/select.py
@@ -22,15 +22,6 @@ def get_table(table, conn):
     The `table` can be given as either a "qualified name", or an OID.
     The OID is the preferred identifier, since it's much more robust.
 
-    The returned dictionary is of the following form:
-
-        {
-            "oid": <int>,
-            "name": <str>,
-            "schema": <int>,
-            "description": <str>
-        }
-
     Args:
         table: The table for which we want table info.
     """
@@ -44,15 +35,6 @@ def get_table_info(schema, conn):
     The `schema` can be given as either a "qualified name", or an OID.
     The OID is the preferred identifier, since it's much more robust.
 
-    The returned list contains dictionaries of the following form:
-
-        {
-            "oid": <int>,
-            "name": <str>,
-            "schema": <int>,
-            "description": <str>
-        }
-
     Args:
         schema: The schema for which we want table info.
     """

From 12a6b63ac38b5b4ed159da5d224023b71ae56e27 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 28 Aug 2024 00:39:42 +0800
Subject: [PATCH 0757/1141] wire up table privilege info to RPC function

---
 db/sql/00_msar.sql          |  5 ++++-
 mathesar/rpc/tables/base.py | 18 +++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 60c74f20a5..55c12b80c8 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -833,7 +833,10 @@ Each returned JSON object will have the form:
     "oid": <int>,
     "name": <str>,
     "schema": <int>,
-    "description": <str>
+    "description": <str>,
+    "owner_oid": <int>,
+    "current_role_priv": [<str>],
+    "current_role_owns": <bool>
   }
 
 Args:
diff --git a/mathesar/rpc/tables/base.py b/mathesar/rpc/tables/base.py
index 9ee9b4e73e..b0132e480f 100644
--- a/mathesar/rpc/tables/base.py
+++ b/mathesar/rpc/tables/base.py
@@ -1,7 +1,7 @@
 """
 Classes and functions exposed to the RPC endpoint for managing tables in a database.
 """
-from typing import Optional, TypedDict
+from typing import Literal, Optional, TypedDict
 
 from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
@@ -28,11 +28,27 @@ class TableInfo(TypedDict):
         name: The name of the table.
         schema: The `oid` of the schema where the table lives.
         description: The description of the table.
+        owner_oid: The OID of the direct owner of the table.
+        current_role_priv: The privileges held by the user on the table.
+        current_role_owns: Whether the current role owns the table.
     """
     oid: int
     name: str
     schema: int
     description: Optional[str]
+    owner_oid: int
+    current_role_priv: list[
+        Literal[
+            'SELECT',
+            'INSERT',
+            'UPDATE',
+            'DELETE',
+            'TRUNCATE',
+            'REFERENCES',
+            'TRIGGER'
+        ]
+    ]
+    current_role_owns: bool
 
 
 class SettableTableInfo(TypedDict):

From 3ae677a4eb0937e53941735be26253b9bc82977b Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 28 Aug 2024 00:50:26 +0800
Subject: [PATCH 0758/1141] add privilege info to column response object

---
 db/columns/operations/select.py |  1 +
 db/sql/00_msar.sql              | 10 ++++++++++
 mathesar/rpc/columns/base.py    |  1 +
 3 files changed, 12 insertions(+)

diff --git a/db/columns/operations/select.py b/db/columns/operations/select.py
index a79e63e1c8..5ef5f1f508 100644
--- a/db/columns/operations/select.py
+++ b/db/columns/operations/select.py
@@ -33,6 +33,7 @@ def get_column_info_for_table(table, conn):
             "valid_target_types": [<str>, <str>, ..., <str>]
             "default": {"value": <str>, "is_dynamic": <bool>},
             "has_dependents": <bool>,
+            "current_role_priv": [<str>, <str>, ...],
             "description": <str>
         }
 
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 55c12b80c8..f603cd0d5e 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -776,6 +776,7 @@ Each returned JSON object in the array will have the form:
     "default": {"value": <str>, "is_dynamic": <bool>},
     "has_dependents": <bool>,
     "description": <str>,
+    "current_role_priv": [<str>, <str>, ...],
     "valid_target_types": [<str>, <str>, ...]
   }
 
@@ -808,6 +809,15 @@ SELECT jsonb_agg(
     ),
     'has_dependents', msar.has_dependents(tab_id, attnum),
     'description', msar.col_description(tab_id, attnum),
+    'current_role_priv', array_remove(
+      ARRAY[
+        CASE WHEN pg_catalog.has_column_privilege(tab_id, attnum, 'SELECT') THEN 'SELECT' END,
+        CASE WHEN pg_catalog.has_column_privilege(tab_id, attnum, 'INSERT') THEN 'INSERT' END,
+        CASE WHEN pg_catalog.has_column_privilege(tab_id, attnum, 'UPDATE') THEN 'UPDATE' END,
+        CASE WHEN pg_catalog.has_column_privilege(tab_id, attnum, 'REFERENCES') THEN 'REFERENCES' END
+      ],
+      NULL
+    ),
     'valid_target_types', msar.get_valid_target_type_strings(atttypid)
   )
 )
diff --git a/mathesar/rpc/columns/base.py b/mathesar/rpc/columns/base.py
index 1b0f5e954d..cb1ef972d2 100644
--- a/mathesar/rpc/columns/base.py
+++ b/mathesar/rpc/columns/base.py
@@ -186,6 +186,7 @@ def from_dict(cls, col_info):
             default=ColumnDefault.from_dict(col_info.get("default")),
             has_dependents=col_info["has_dependents"],
             description=col_info.get("description"),
+            current_role_priv=col_info["current_role_priv"],
             valid_target_types=col_info.get("valid_target_types")
         )
 

From 7723c4261a0d61b66cd570e3c9f99beff0f16a28 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 28 Aug 2024 01:05:02 +0800
Subject: [PATCH 0759/1141] Modify test for new column lister response

---
 db/sql/00_msar.sql                        |  2 +-
 mathesar/rpc/columns/base.py              |  4 +++-
 mathesar/tests/rpc/columns/test_c_base.py | 10 ++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index f603cd0d5e..df3d765222 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -856,7 +856,7 @@ SELECT jsonb_build_object(
   'oid', oid::bigint,
   'name', relname,
   'schema', relnamespace::bigint,
-  'description', msar.obj_description(oid, 'pg_class')
+  'description', msar.obj_description(oid, 'pg_class'),
   'owner_oid', relowner,
   'current_role_priv', array_remove(
     ARRAY[
diff --git a/mathesar/rpc/columns/base.py b/mathesar/rpc/columns/base.py
index cb1ef972d2..82251e1b9e 100644
--- a/mathesar/rpc/columns/base.py
+++ b/mathesar/rpc/columns/base.py
@@ -1,7 +1,7 @@
 """
 Classes and functions exposed to the RPC endpoint for managing table columns.
 """
-from typing import Optional, TypedDict
+from typing import Literal, Optional, TypedDict
 
 from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
@@ -160,6 +160,7 @@ class ColumnInfo(TypedDict):
         default: The default value and whether it's dynamic.
         has_dependents: Whether the column has dependent objects.
         description: The description of the column.
+        current_role_priv: The privileges of the user for the column.
         valid_target_types: A list of all types to which the column can
             be cast.
     """
@@ -172,6 +173,7 @@ class ColumnInfo(TypedDict):
     default: ColumnDefault
     has_dependents: bool
     description: str
+    current_role_priv: list[Literal['SELECT', 'INSERT', 'UPDATE', 'REFERENCES']]
     valid_target_types: list[str]
 
     @classmethod
diff --git a/mathesar/tests/rpc/columns/test_c_base.py b/mathesar/tests/rpc/columns/test_c_base.py
index 88f7db64f5..69d7bc767c 100644
--- a/mathesar/tests/rpc/columns/test_c_base.py
+++ b/mathesar/tests/rpc/columns/test_c_base.py
@@ -37,6 +37,7 @@ def mock_column_info(_table_oid, conn):
                 'nullable': False, 'description': None, 'primary_key': True,
                 'type_options': None,
                 'has_dependents': True,
+                'current_role_priv': ['SELECT', 'INSERT', 'UPDATE'],
                 'valid_target_types': ['text']
             }, {
                 'id': 2, 'name': 'numcol', 'type': 'numeric',
@@ -46,6 +47,7 @@ def mock_column_info(_table_oid, conn):
                 'primary_key': False,
                 'type_options': {'scale': None, 'precision': None},
                 'has_dependents': False,
+                'current_role_priv': ['SELECT', 'INSERT', 'UPDATE'],
                 'valid_target_types': ['text']
             }, {
                 'id': 4, 'name': 'numcolmod', 'type': 'numeric',
@@ -53,6 +55,7 @@ def mock_column_info(_table_oid, conn):
                 'nullable': True, 'description': None, 'primary_key': False,
                 'type_options': {'scale': 3, 'precision': 5},
                 'has_dependents': False,
+                'current_role_priv': ['SELECT', 'INSERT', 'UPDATE'],
                 'valid_target_types': ['text']
             }, {
                 'id': 8, 'name': 'ivlcolmod', 'type': 'interval',
@@ -60,6 +63,7 @@ def mock_column_info(_table_oid, conn):
                 'nullable': True, 'description': None, 'primary_key': False,
                 'type_options': {'fields': 'day to second'},
                 'has_dependents': False,
+                'current_role_priv': ['SELECT', 'INSERT', 'UPDATE'],
                 'valid_target_types': ['text']
             }, {
                 'id': 10, 'name': 'arrcol', 'type': '_array',
@@ -67,6 +71,7 @@ def mock_column_info(_table_oid, conn):
                 'nullable': True, 'description': None, 'primary_key': False,
                 'type_options': {'item_type': 'character varying', 'length': 3},
                 'has_dependents': False,
+                'current_role_priv': ['SELECT', 'INSERT', 'UPDATE'],
                 'valid_target_types': None
             },
         ]
@@ -80,6 +85,7 @@ def mock_column_info(_table_oid, conn):
             'nullable': False, 'description': None, 'primary_key': True,
             'type_options': None,
             'has_dependents': True,
+            'current_role_priv': ['SELECT', 'INSERT', 'UPDATE'],
             'valid_target_types': ['text']
         }, {
             'id': 2, 'name': 'numcol', 'type': 'numeric',
@@ -89,6 +95,7 @@ def mock_column_info(_table_oid, conn):
             'primary_key': False,
             'type_options': None,
             'has_dependents': False,
+            'current_role_priv': ['SELECT', 'INSERT', 'UPDATE'],
             'valid_target_types': ['text']
         }, {
             'id': 4, 'name': 'numcolmod', 'type': 'numeric',
@@ -96,6 +103,7 @@ def mock_column_info(_table_oid, conn):
             'nullable': True, 'description': None, 'primary_key': False,
             'type_options': {'scale': 3, 'precision': 5},
             'has_dependents': False,
+            'current_role_priv': ['SELECT', 'INSERT', 'UPDATE'],
             'valid_target_types': ['text']
         }, {
             'id': 8, 'name': 'ivlcolmod', 'type': 'interval',
@@ -103,6 +111,7 @@ def mock_column_info(_table_oid, conn):
             'nullable': True, 'description': None, 'primary_key': False,
             'type_options': {'fields': 'day to second'},
             'has_dependents': False,
+            'current_role_priv': ['SELECT', 'INSERT', 'UPDATE'],
             'valid_target_types': ['text']
         }, {
             'id': 10, 'name': 'arrcol', 'type': '_array',
@@ -110,6 +119,7 @@ def mock_column_info(_table_oid, conn):
             'nullable': True, 'description': None, 'primary_key': False,
             'type_options': {'item_type': 'character varying', 'length': 3},
             'has_dependents': False,
+            'current_role_priv': ['SELECT', 'INSERT', 'UPDATE'],
             'valid_target_types': None
         }
     ]

From 22ff7fb12291fd06695b0f40d0d048d9c31443da Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 28 Aug 2024 01:12:24 +0800
Subject: [PATCH 0760/1141] update test for new column info response type

---
 db/sql/test_00_msar.sql | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 7648e7ba1f..2b802e65d1 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2597,6 +2597,7 @@ BEGIN
         "primary_key": true,
         "type_options": null,
         "has_dependents": true,
+        "current_role_priv": ["SELECT", "INSERT", "UPDATE", "REFERENCES"],
         "valid_target_types": null
       },
       {
@@ -2612,6 +2613,7 @@ BEGIN
           "precision": null
         },
         "has_dependents": false,
+        "current_role_priv": ["SELECT", "INSERT", "UPDATE", "REFERENCES"],
         "valid_target_types": null
       },
       {
@@ -2626,6 +2628,7 @@ BEGIN
           "length": 128
         },
         "has_dependents": false,
+        "current_role_priv": ["SELECT", "INSERT", "UPDATE", "REFERENCES"],
         "valid_target_types": null
       },
       {
@@ -2641,6 +2644,7 @@ BEGIN
         "primary_key": false,
         "type_options": null,
         "has_dependents": false,
+        "current_role_priv": ["SELECT", "INSERT", "UPDATE", "REFERENCES"],
         "valid_target_types": ["numeric", "text"]
       },
       {
@@ -2658,6 +2662,7 @@ BEGIN
           "precision": null
         },
         "has_dependents": false,
+        "current_role_priv": ["SELECT", "INSERT", "UPDATE", "REFERENCES"],
         "valid_target_types": null
       },
       {
@@ -2672,6 +2677,7 @@ BEGIN
           "item_type": "integer"
         },
         "has_dependents": false,
+        "current_role_priv": ["SELECT", "INSERT", "UPDATE", "REFERENCES"],
         "valid_target_types": null
       },
       {
@@ -2688,6 +2694,7 @@ BEGIN
           "precision": 15
         },
         "has_dependents": false,
+        "current_role_priv": ["SELECT", "INSERT", "UPDATE", "REFERENCES"],
         "valid_target_types": null
       }
     ]$j$::jsonb

From 09742176882240e18a2480c042256e2f8507177d Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 28 Aug 2024 01:31:30 +0530
Subject: [PATCH 0761/1141] add SQL func for getting info for current_role

---
 db/sql/00_msar.sql | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 6049b07a9d..09d7b46cda 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -919,7 +919,6 @@ FROM (
 $$ LANGUAGE SQL;
 
 
-DROP FUNCTION IF EXISTS msar.role_info_table();
 CREATE OR REPLACE FUNCTION msar.list_schema_privileges(sch_id regnamespace) RETURNS jsonb AS $$/*
 Given a schema, returns a json array of objects with direct, non-default schema privileges
 
@@ -946,6 +945,7 @@ SELECT COALESCE(jsonb_agg(priv_cte.p), '[]'::jsonb) FROM priv_cte;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
+DROP FUNCTION IF EXISTS msar.role_info_table();
 CREATE OR REPLACE FUNCTION msar.role_info_table() RETURNS TABLE
 (
   oid bigint, -- The OID of the role.
@@ -1037,6 +1037,25 @@ WHERE role_data.name = rolename;
 $$ LANGUAGE SQL STABLE;
 
 
+CREATE OR REPLACE FUNCTION
+msar.get_current_role() RETURNS TEXT AS $$/*
+Returns a JSON object describing the current_role and the parent role(s) it inherits from.
+*/
+SELECT jsonb_build_object(
+  'current_role', msar.get_role(current_role),
+  'parent_roles', array_remove(
+    array_agg(
+      CASE WHEN pg_has_role(role_data.name, current_role, 'MEMBER')
+      THEN msar.get_role(role_data.name) END
+    ), NULL
+  )
+)
+FROM msar.role_info_table() AS role_data
+WHERE role_data.name NOT LIKE 'pg_%'
+AND role_data.name != current_role;
+$$ LANGUAGE SQL STABLE;
+
+
 CREATE OR REPLACE FUNCTION msar.list_db_priv(db_name text) RETURNS jsonb AS $$/*
 Given a database name, returns a json array of objects with database privileges for non-inherited roles.
 

From 20d3e61f144a28d39bf8e1bab09b64ad0b9f72bf Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 28 Aug 2024 01:31:52 +0530
Subject: [PATCH 0762/1141] wire up sql func to python

---
 db/roles/operations/select.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/db/roles/operations/select.py b/db/roles/operations/select.py
index a6c7119ca9..2186039b45 100644
--- a/db/roles/operations/select.py
+++ b/db/roles/operations/select.py
@@ -5,6 +5,10 @@ def list_roles(conn):
     return exec_msar_func(conn, 'list_roles').fetchone()[0]
 
 
+def get_current_role_from_db(conn):
+    return exec_msar_func(conn, 'get_current_role').fetchone()[0]
+
+
 def list_db_priv(db_name, conn):
     return exec_msar_func(conn, 'list_db_priv', db_name).fetchone()[0]
 

From d55dea568b56b479df3940d51b84055d93aa9ba3 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 28 Aug 2024 01:32:50 +0530
Subject: [PATCH 0763/1141] add get_current_role rpc endpoint

---
 mathesar/rpc/roles.py | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/mathesar/rpc/roles.py b/mathesar/rpc/roles.py
index 4f3303243d..c6fb4ccc3a 100644
--- a/mathesar/rpc/roles.py
+++ b/mathesar/rpc/roles.py
@@ -8,7 +8,7 @@
 
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
-from db.roles.operations.select import list_roles
+from db.roles.operations.select import list_roles, get_current_role_from_db
 from db.roles.operations.create import create_role
 
 
@@ -116,3 +116,26 @@ def add(
     with connect(database_id, user) as conn:
         role = create_role(rolename, password, login, conn)
     return RoleInfo.from_dict(role)
+
+
+@rpc_method(name="roles.get_current_role")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def get_current_role(*, database_id: int, **kwargs) -> dict:
+    """
+    Get information about the current role and all the parent role(s) it inherits from.
+    Requires a database id inorder to connect to the server.
+
+    Args:
+        database_id: The Django id of the database.
+
+    Returns:
+        A dict describing the current role.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        current_role = get_current_role_from_db(conn)
+    return {
+        "current_role": RoleInfo.from_dict(current_role["current_role"]),
+        "parent_roles": [RoleInfo.from_dict(role) for role in current_role["parent_roles"]]
+    }

From eb0b89f3db49211bb764a85212e21ceb99a3c336 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 28 Aug 2024 01:33:48 +0530
Subject: [PATCH 0764/1141] add docs along with endpoint & mock tests

---
 docs/docs/api/rpc.md                 |  1 +
 mathesar/tests/rpc/test_endpoints.py |  5 +++
 mathesar/tests/rpc/test_roles.py     | 49 ++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 7e4c439e21..9ebf7d7645 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -249,6 +249,7 @@ To use an RPC function:
       members:
       - list_
       - add
+      - get_current_role
       - RoleInfo
       - RoleMember
 
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index c26ea473f4..722246f9b9 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -253,6 +253,11 @@
         "roles.add",
         [user_is_authenticated]
     ),
+    (
+        roles.get_current_role,
+        "roles.get_current_role",
+        [user_is_authenticated]
+    ),
     (
         schemas.add,
         "schemas.add",
diff --git a/mathesar/tests/rpc/test_roles.py b/mathesar/tests/rpc/test_roles.py
index 1f606c5693..b5af4f5d06 100644
--- a/mathesar/tests/rpc/test_roles.py
+++ b/mathesar/tests/rpc/test_roles.py
@@ -108,3 +108,52 @@ def mock_create_role(rolename, password, login, conn):
     monkeypatch.setattr(roles, 'connect', mock_connect)
     monkeypatch.setattr(roles, 'create_role', mock_create_role)
     roles.add(rolename=_username, database_id=_database_id, password=_password, login=True, request=request)
+
+
+def test_get_current_role(rf, monkeypatch):
+    _username = 'alice'
+    _password = 'pass1234'
+    _database_id = 2
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=_username, password=_password)
+
+    @contextmanager
+    def mock_connect(database_id, user):
+        if database_id == _database_id and user.username == _username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_get_current_role(conn):
+        return {
+            "current_role": {
+                'oid': '2573031',
+                'name': 'inherit_msar',
+                'login': True,
+                'super': False,
+                'members': None,
+                'inherits': True,
+                'create_db': False,
+                'create_role': False,
+                'description': None
+            },
+            "parent_roles": [
+                {
+                    'oid': '10',
+                    'name': 'mathesar',
+                    'login': True,
+                    'super': True,
+                    'members': [{'oid': 2573031, 'admin': False}],
+                    'inherits': True,
+                    'create_db': True,
+                    'create_role': True,
+                    'description': None
+                }
+            ]
+        }
+    monkeypatch.setattr(roles, 'connect', mock_connect)
+    monkeypatch.setattr(roles, 'get_current_role_from_db', mock_get_current_role)
+    roles.get_current_role(database_id=_database_id, request=request)

From 402baeb13cc390e4aab3edc28c005ca2ca608b4f Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 28 Aug 2024 13:32:51 +0800
Subject: [PATCH 0765/1141] tidy and extract privilege listing logic

---
 db/sql/00_msar.sql | 40 ++++++++++++++++------------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index df3d765222..5b06361222 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -835,6 +835,20 @@ SELECT EXISTS (SELECT 1 FROM pg_attribute WHERE attrelid=tab_id AND attname=col_
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION
+msar.list_table_privileges_for_current_role(tab_id regclass) RETURNS jsonb AS $$/*
+Return a JSONB array of all privileges current_user holds on the passed table.
+*/
+SELECT coalesce(jsonb_agg(privilege), '[]'::jsonb)
+FROM
+  unnest(
+    ARRAY['SELECT', 'INSERT', 'UPDATE', 'DELETE', 'TRUNCATE', 'REFERENCES', 'TRIGGER']
+  ) AS x(privilege),
+  has_table_privilege(tab_id, privilege) as has_privilege
+WHERE has_privilege;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
 CREATE OR REPLACE FUNCTION msar.get_table(tab_id regclass) RETURNS jsonb AS $$/*
 Given a table identifier, return a JSON object describing the table.
 
@@ -858,18 +872,7 @@ SELECT jsonb_build_object(
   'schema', relnamespace::bigint,
   'description', msar.obj_description(oid, 'pg_class'),
   'owner_oid', relowner,
-  'current_role_priv', array_remove(
-    ARRAY[
-      CASE WHEN pg_catalog.has_table_privilege(oid, 'SELECT') THEN 'SELECT' END,
-      CASE WHEN pg_catalog.has_table_privilege(oid, 'INSERT') THEN 'INSERT' END,
-      CASE WHEN pg_catalog.has_table_privilege(oid, 'UPDATE') THEN 'UPDATE' END,
-      CASE WHEN pg_catalog.has_table_privilege(oid, 'DELETE') THEN 'DELETE' END,
-      CASE WHEN pg_catalog.has_table_privilege(oid, 'TRUNCATE') THEN 'TRUNCATE' END,
-      CASE WHEN pg_catalog.has_table_privilege(oid, 'REFERENCES') THEN 'REFERENCES' END,
-      CASE WHEN pg_catalog.has_table_privilege(oid, 'TRIGGER') THEN 'TRIGGER' END
-    ],
-    NULL
-  ),
+  'current_role_priv', msar.list_table_privileges_for_current_role(tab_id),
   'current_role_owns', pg_catalog.pg_has_role(relowner, 'USAGE')
 ) FROM pg_catalog.pg_class WHERE oid = tab_id;
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
@@ -900,18 +903,7 @@ SELECT coalesce(
       'schema', pgc.relnamespace::bigint,
       'description', msar.obj_description(pgc.oid, 'pg_class'),
       'owner_oid', pgc.relowner,
-      'current_role_priv', array_remove(
-        ARRAY[
-          CASE WHEN pg_catalog.has_table_privilege(pgc.oid, 'SELECT') THEN 'SELECT' END,
-          CASE WHEN pg_catalog.has_table_privilege(pgc.oid, 'INSERT') THEN 'INSERT' END,
-          CASE WHEN pg_catalog.has_table_privilege(pgc.oid, 'UPDATE') THEN 'UPDATE' END,
-          CASE WHEN pg_catalog.has_table_privilege(pgc.oid, 'DELETE') THEN 'DELETE' END,
-          CASE WHEN pg_catalog.has_table_privilege(pgc.oid, 'TRUNCATE') THEN 'TRUNCATE' END,
-          CASE WHEN pg_catalog.has_table_privilege(pgc.oid, 'REFERENCES') THEN 'REFERENCES' END,
-          CASE WHEN pg_catalog.has_table_privilege(pgc.oid, 'TRIGGER') THEN 'TRIGGER' END
-        ],
-        NULL
-      ),
+      'current_role_priv', msar.list_table_privileges_for_current_role(pgc.oid),
       'current_role_owns', pg_catalog.pg_has_role(pgc.relowner, 'USAGE')
     )
   ),

From 8fb3975bbbe6afc67c0ab7843127e822b88b6899 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 28 Aug 2024 14:53:26 +0800
Subject: [PATCH 0766/1141] extract privilege listing for databases, tidy up
 naming

---
 db/roles/operations/select.py       |  7 +++-
 db/sql/00_msar.sql                  | 59 +++++++++++++++++++----------
 mathesar/rpc/database_privileges.py |  4 +-
 3 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/db/roles/operations/select.py b/db/roles/operations/select.py
index f35f2c1a70..4b182ad31f 100644
--- a/db/roles/operations/select.py
+++ b/db/roles/operations/select.py
@@ -18,4 +18,9 @@ def list_table_privileges(table_oid, conn):
 
 
 def get_curr_role_db_priv(conn):
-    return exec_msar_func(conn, 'get_self_database_privileges').fetchone()[0]
+    db_info = exec_msar_func(conn, 'get_current_database_info').fetchone()[0]
+    return {
+        "owner_oid": db_info["owner_oid"],
+        "current_role_priv": db_info["current_role_priv"],
+        "current_role_owns": db_info["current_role_owns"],
+    }
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 5b06361222..0466af6767 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -844,7 +844,7 @@ FROM
   unnest(
     ARRAY['SELECT', 'INSERT', 'UPDATE', 'DELETE', 'TRUNCATE', 'REFERENCES', 'TRIGGER']
   ) AS x(privilege),
-  has_table_privilege(tab_id, privilege) as has_privilege
+  pg_catalog.has_table_privilege(tab_id, privilege) as has_privilege
 WHERE has_privilege;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
@@ -915,6 +915,20 @@ WHERE pgc.relnamespace = sch_id AND pgc.relkind = 'r';
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION
+msar.list_schema_privileges_for_current_role(sch_id regnamespace) RETURNS jsonb AS $$/*
+Return a JSONB array of all privileges current_user holds on the passed schema.
+*/
+SELECT coalesce(jsonb_agg(privilege), '[]'::jsonb)
+FROM
+  unnest(
+    ARRAY['USAGE', 'CREATE']
+  ) AS x(privilege),
+  pg_catalog.has_schema_privilege(sch_id, privilege) as has_privilege
+WHERE has_privilege;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
 CREATE OR REPLACE FUNCTION msar.get_schemas() RETURNS jsonb AS $$/*
 Return a json array of objects describing the user-defined schemas in the database.
 
@@ -942,13 +956,7 @@ FROM (
     s.nspname AS name,
     pg_catalog.obj_description(s.oid) AS description,
     s.nspowner::bigint AS owner_oid,
-    array_remove(
-      ARRAY[
-        CASE WHEN pg_catalog.has_schema_privilege(s.oid, 'USAGE') THEN 'USAGE' END,
-        CASE WHEN pg_catalog.has_schema_privilege(s.oid, 'CREATE') THEN 'CREATE' END
-      ],
-      NULL
-    ) AS current_role_priv,
+    msar.list_schema_privileges_for_current_role(s.oid) AS current_role_priv,
     pg_catalog.pg_has_role(s.nspowner, 'USAGE') AS current_role_owns,
     COALESCE(count(c.oid), 0) AS table_count
   FROM pg_catalog.pg_namespace s
@@ -968,7 +976,6 @@ FROM (
 $$ LANGUAGE SQL;
 
 
-DROP FUNCTION IF EXISTS msar.role_info_table();
 CREATE OR REPLACE FUNCTION msar.list_schema_privileges(sch_id regnamespace) RETURNS jsonb AS $$/*
 Given a schema, returns a json array of objects with direct, non-default schema privileges
 
@@ -995,6 +1002,7 @@ SELECT COALESCE(jsonb_agg(priv_cte.p), '[]'::jsonb) FROM priv_cte;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
+DROP FUNCTION IF EXISTS msar.role_info_table();
 CREATE OR REPLACE FUNCTION msar.role_info_table() RETURNS TABLE
 (
   oid bigint, -- The OID of the role.
@@ -1112,26 +1120,37 @@ SELECT COALESCE(jsonb_agg(priv_cte.p), '[]'::jsonb) FROM priv_cte;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
-CREATE OR REPLACE FUNCTION msar.get_current_role_database_privileges() RETURNS jsonb AS $$/*
-Given a database name, returns a json object with database owner oid and database privileges
-for the role executing the function.
+CREATE OR REPLACE FUNCTION
+msar.list_database_privileges_for_current_role(dat_id oid) RETURNS jsonb AS $$/*
+Return a JSONB array of all privileges current_user holds on the passed database.
+*/
+SELECT coalesce(jsonb_agg(privilege), '[]'::jsonb)
+FROM
+  unnest(
+    ARRAY['CONNECT', 'CREATE', 'TEMPORARY']
+  ) AS x(privilege),
+  pg_catalog.has_database_privilege(dat_id, privilege) as has_privilege
+WHERE has_privilege;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION msar.get_current_database_info() RETURNS jsonb AS $$/*
+Return information about the current database.
 
 The returned JSON object has the form:
   {
-    "owner_oid": <int>,
+    "oid": <bigint>,
+    "name": <str>,
+    "owner_oid": <bigint>,
     "current_role_priv": [<str>],
     "current_role_owner": <bool>
   }
 */
 SELECT jsonb_build_object(
+  'oid', pgd.oid::bigint,
+  'name', pgd.datname,
   'owner_oid', pgd.datdba::bigint,
-  'current_role_priv', array_remove(
-    ARRAY[
-      CASE WHEN has_database_privilege(pgd.oid, 'CREATE') THEN 'CREATE' END,
-      CASE WHEN has_database_privilege(pgd.oid, 'TEMPORARY') THEN 'TEMPORARY' END,
-      CASE WHEN has_database_privilege(pgd.oid, 'CONNECT') THEN 'CONNECT' END
-    ], NULL
-  ),
+  'current_role_priv', msar.list_database_privileges_for_current_role(pgd.oid),
   'current_role_owns', pg_catalog.pg_has_role(pgd.datdba, 'USAGE')
 ) FROM pg_catalog.pg_database AS pgd
 WHERE pgd.datname = current_database();
diff --git a/mathesar/rpc/database_privileges.py b/mathesar/rpc/database_privileges.py
index f5bd3b62c3..13d1d09076 100644
--- a/mathesar/rpc/database_privileges.py
+++ b/mathesar/rpc/database_privileges.py
@@ -46,8 +46,8 @@ class CurrentDBPrivileges(TypedDict):
     def from_dict(cls, d):
         return cls(
             owner_oid=d["owner_oid"],
-            current_role_db_priv=d["current_role_db_priv"],
-            current_role_owner=d["current_role_owner"]
+            current_role_priv=d["current_role_priv"],
+            current_role_owns=d["current_role_owns"]
         )
 
 

From ad91464a6c06ee10dd5aa909ec8a059cd25777a9 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 28 Aug 2024 15:48:58 +0800
Subject: [PATCH 0767/1141] extract column privileges getter function

---
 db/sql/00_msar.sql | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 0466af6767..452662efd2 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -762,6 +762,18 @@ SELECT EXISTS (
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION
+msar.list_column_privileges_for_current_role(tab_id regclass, attnum smallint) RETURNS jsonb AS $$/*
+Return a JSONB array of all privileges current_user holds on the passed table.
+*/
+SELECT coalesce(jsonb_agg(privilege), '[]'::jsonb)
+FROM
+  unnest(ARRAY['SELECT', 'INSERT', 'UPDATE', 'REFERENCES']) AS x(privilege),
+  pg_catalog.has_column_privilege(tab_id, attnum, privilege) as has_privilege
+WHERE has_privilege;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
 CREATE OR REPLACE FUNCTION msar.get_column_info(tab_id regclass) RETURNS jsonb AS $$/*
 Given a table identifier, return an array of objects describing the columns of the table.
 
@@ -809,15 +821,7 @@ SELECT jsonb_agg(
     ),
     'has_dependents', msar.has_dependents(tab_id, attnum),
     'description', msar.col_description(tab_id, attnum),
-    'current_role_priv', array_remove(
-      ARRAY[
-        CASE WHEN pg_catalog.has_column_privilege(tab_id, attnum, 'SELECT') THEN 'SELECT' END,
-        CASE WHEN pg_catalog.has_column_privilege(tab_id, attnum, 'INSERT') THEN 'INSERT' END,
-        CASE WHEN pg_catalog.has_column_privilege(tab_id, attnum, 'UPDATE') THEN 'UPDATE' END,
-        CASE WHEN pg_catalog.has_column_privilege(tab_id, attnum, 'REFERENCES') THEN 'REFERENCES' END
-      ],
-      NULL
-    ),
+    'current_role_priv', msar.list_column_privileges_for_current_role(tab_id, attnum),
     'valid_target_types', msar.get_valid_target_type_strings(atttypid)
   )
 )

From 9b4fea82f32835e421ca55dd2134504f41c5532c Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Wed, 28 Aug 2024 09:59:36 +0200
Subject: [PATCH 0768/1141] modal and forms consistency and visual updates

---
 mathesar_ui/src/App.svelte                    | 12 ++++++++--
 .../checkbox-group/CheckboxGroup.svelte       |  2 ++
 .../collapsible/Collapsible.scss              |  3 ++-
 .../fieldset-group/FieldsetGroup.scss         |  2 ++
 .../labeled-input/LabeledInput.scss           |  1 +
 .../src/component-library/window/Window.scss  |  7 ++++--
 .../NameAndDescInputModalForm.svelte          |  9 +++++---
 .../src/components/NameWithIcon.svelte        |  4 ++--
 .../components/message-boxes/ErrorBox.svelte  |  2 +-
 .../components/message-boxes/InfoBox.svelte   |  2 +-
 .../message-boxes/MessageBox.svelte           |  2 +-
 .../message-boxes/OutcomeBox.svelte           |  2 +-
 .../message-boxes/WarningBox.svelte           |  2 +-
 mathesar_ui/src/i18n/languages/en/dict.json   | 14 ++++++------
 .../InstallationSchemaSelector.svelte         | 13 +++--------
 .../systems/schemas/AddEditSchemaModal.svelte | 15 ++++++++++---
 .../ConstraintCollapseHeader.svelte           |  2 +-
 .../constraints/ConstraintTypeSection.svelte  |  8 +++----
 .../ForeignKeyConstraintDetails.svelte        |  1 +
 .../constraints/NewFkConstraint.svelte        | 17 ++++++++++----
 .../constraints/NewUniqueConstraint.svelte    |  9 +++++---
 .../constraints/TableConstraintsModal.svelte  |  1 -
 .../link-table/LinkTableForm.svelte           |  7 ++++++
 .../link-table/LinkTableModal.svelte          |  2 +-
 .../link-table/LinkTablePill.svelte           |  5 +++--
 .../table-view/link-table/NewColumn.svelte    |  2 +-
 .../link-table/SelectLinkType.svelte          |  1 +
 .../ExtractColumnsModal.svelte                | 22 ++++++++++---------
 28 files changed, 107 insertions(+), 62 deletions(-)

diff --git a/mathesar_ui/src/App.svelte b/mathesar_ui/src/App.svelte
index d4317163e0..3a14e90ebf 100644
--- a/mathesar_ui/src/App.svelte
+++ b/mathesar_ui/src/App.svelte
@@ -53,7 +53,7 @@
     --color-contrast-light: var(--color-blue-light);
     --color-link: var(--color-blue-dark);
     --color-text: #171717;
-    --color-text-muted: #6b7280;
+    --color-text-muted: #5e6471;
     --color-substring-match: rgb(254, 221, 72);
     --color-substring-match-light: rgba(254, 221, 72, 0.2);
     --text-size-xx-small: var(--size-xx-small);
@@ -65,7 +65,10 @@
     --text-size-xx-large: var(--size-xx-large);
     --text-size-ultra-large: var(--size-ultra-large);
     --text-size-super-ultra-large: var(--size-super-ultra-large);
-
+    --font-weight-light: 300;
+    --font-weight-normal: 400;
+    --font-weight-medium: 500;
+    --font-weight-bold: 600;
     --modal-z-index: 50;
     --modal-record-selector-z-index: 50;
 
@@ -141,6 +144,10 @@
     height: 100vh;
   }
 
+  p {
+    line-height: 1.5;
+  }
+
   h1 {
     margin: 0 0 1rem 0;
     font-size: var(--size-xx-large);
@@ -221,4 +228,5 @@
     justify-content: center;
     display: flex;
   }
+  
 </style>
diff --git a/mathesar_ui/src/component-library/checkbox-group/CheckboxGroup.svelte b/mathesar_ui/src/component-library/checkbox-group/CheckboxGroup.svelte
index 9ed775b439..743d13e50c 100644
--- a/mathesar_ui/src/component-library/checkbox-group/CheckboxGroup.svelte
+++ b/mathesar_ui/src/component-library/checkbox-group/CheckboxGroup.svelte
@@ -21,6 +21,7 @@
   ) => string | ComponentWithProps<C> | undefined = () => undefined;
   export let getCheckboxDisabled: (value: Option | undefined) => boolean = () =>
     false;
+  export let boxed = false;
   /**
    * By default, options will be compared by equality. If you're using objects as
    * options, you can supply a custom function here to compare them.
@@ -53,6 +54,7 @@
   {label}
   {ariaLabel}
   {disabled}
+  {boxed}
   let:option
   let:disabled={innerDisabled}
   on:change
diff --git a/mathesar_ui/src/component-library/collapsible/Collapsible.scss b/mathesar_ui/src/component-library/collapsible/Collapsible.scss
index 9a3a827c74..59e00806a9 100644
--- a/mathesar_ui/src/component-library/collapsible/Collapsible.scss
+++ b/mathesar_ui/src/component-library/collapsible/Collapsible.scss
@@ -14,7 +14,8 @@
       .collapsible-header-title {
         flex-grow: 1;
         overflow: hidden;
-        font-weight: 600;
+        font-weight: var(--font-weight-bold);
+        padding-left: 0.25em;
       }
       svg {
         flex-shrink: 0;
diff --git a/mathesar_ui/src/component-library/fieldset-group/FieldsetGroup.scss b/mathesar_ui/src/component-library/fieldset-group/FieldsetGroup.scss
index 75baec4fce..65b687afda 100644
--- a/mathesar_ui/src/component-library/fieldset-group/FieldsetGroup.scss
+++ b/mathesar_ui/src/component-library/fieldset-group/FieldsetGroup.scss
@@ -6,6 +6,8 @@
 
   legend {
     padding: 0;
+    font-weight: var(--font-weight-medium);
+    margin-bottom: 0.5rem;
   }
   .options {
     padding-left: 0;
diff --git a/mathesar_ui/src/component-library/labeled-input/LabeledInput.scss b/mathesar_ui/src/component-library/labeled-input/LabeledInput.scss
index 0a433abab8..ced2535658 100644
--- a/mathesar_ui/src/component-library/labeled-input/LabeledInput.scss
+++ b/mathesar_ui/src/component-library/labeled-input/LabeledInput.scss
@@ -5,6 +5,7 @@
   .label {
     display: inline-block;
     color: var(--slate-800);
+    font-weight: var(--font-weight-medium);
   }
   .input {
     display: block;
diff --git a/mathesar_ui/src/component-library/window/Window.scss b/mathesar_ui/src/component-library/window/Window.scss
index dffb8641f0..f5a0a506b6 100644
--- a/mathesar_ui/src/component-library/window/Window.scss
+++ b/mathesar_ui/src/component-library/window/Window.scss
@@ -3,6 +3,7 @@
   border-radius: 0.4em;
   min-height: var(--window-min-height, 7em);
   width: var(--window-width, 100%);
+  min-width: var(--window-min-width, 40em);
   overflow: hidden;
   display: grid;
   grid-template: auto 1fr auto / auto;
@@ -15,14 +16,16 @@
     display: flex;
     justify-content: flex-end;
     align-items: flex-start;
+    padding: 1rem;
+    border-bottom: 1px solid var(--slate-200);
     .title {
       &:empty {
         display: none;
       }
       flex: 1 1 100%;
-      padding: 1rem 1rem 0.5rem 1rem;
+      margin: auto;
       font-weight: 500;
-      font-size: var(--text-size-large);
+      font-size: var(--text-size-x-large);
     }
   }
 
diff --git a/mathesar_ui/src/components/NameAndDescInputModalForm.svelte b/mathesar_ui/src/components/NameAndDescInputModalForm.svelte
index 300e8be269..7e752b17ed 100644
--- a/mathesar_ui/src/components/NameAndDescInputModalForm.svelte
+++ b/mathesar_ui/src/components/NameAndDescInputModalForm.svelte
@@ -29,6 +29,9 @@
   export let getInitialName: () => string = () => '';
   export let getInitialDescription: () => string = () => '';
   export let save: (name: string, description: string) => Promise<void>;
+  //export name and description placeholders
+  export let namePlaceholder = $_('name');
+  export let descriptionPlaceholder = $_('description');
 
   /**
    * NOTE: This is NOT a feature
@@ -100,7 +103,7 @@
             nameHasChanged = true;
           }}
           disabled={isSubmitting}
-          placeholder={$_('name')}
+          placeholder={namePlaceholder}
           id="name"
         />
         {#if nameHasChanged && nameValidationErrors.length}
@@ -118,7 +121,7 @@
             bind:value={description}
             aria-label={$_('description')}
             disabled={isSubmitting}
-            placeholder={$_('description')}
+            placeholder={descriptionPlaceholder}
           />
         </LabeledInput>
       </div>
@@ -146,7 +149,7 @@
     flex-direction: column;
 
     > :global(* + *) {
-      margin-top: 1rem;
+      margin-top: 0.25rem;
     }
   }
 
diff --git a/mathesar_ui/src/components/NameWithIcon.svelte b/mathesar_ui/src/components/NameWithIcon.svelte
index 9817367802..fc2c54e170 100644
--- a/mathesar_ui/src/components/NameWithIcon.svelte
+++ b/mathesar_ui/src/components/NameWithIcon.svelte
@@ -44,7 +44,7 @@
   .icon {
     color: var(--icon-color, currentcolor);
     opacity: var(--NameWithIcon__icon-opacity, 0.75);
-    vertical-align: middle;
+    vertical-align: bottom;
   }
   .icon > :global(.fa-icon + .fa-icon) {
     margin-left: 0.2em;
@@ -61,6 +61,6 @@
   }
   .name {
     color: var(--name-color, currentcolor);
-    vertical-align: middle;
+    vertical-align: bottom;
   }
 </style>
diff --git a/mathesar_ui/src/components/message-boxes/ErrorBox.svelte b/mathesar_ui/src/components/message-boxes/ErrorBox.svelte
index d07c970419..5f8a3226e2 100644
--- a/mathesar_ui/src/components/message-boxes/ErrorBox.svelte
+++ b/mathesar_ui/src/components/message-boxes/ErrorBox.svelte
@@ -15,7 +15,7 @@
 <style>
   .error-box {
     --MessageBox__background: var(--danger-background-color);
-    --MessageBox__border: solid 1px var(--danger-color);
+    --MessageBox__border: solid 4px var(--danger-color);
     --MessageBox__icon-color: var(--danger-color);
     font-size: var(--ErrorBox__font-size, var(--text-size-small));
   }
diff --git a/mathesar_ui/src/components/message-boxes/InfoBox.svelte b/mathesar_ui/src/components/message-boxes/InfoBox.svelte
index 31382656e5..2fcffa1303 100644
--- a/mathesar_ui/src/components/message-boxes/InfoBox.svelte
+++ b/mathesar_ui/src/components/message-boxes/InfoBox.svelte
@@ -15,7 +15,7 @@
 <style>
   .info-box {
     --MessageBox__background: var(--sky-200);
-    --MessageBox__border: solid 1px var(--sky-300);
+    --MessageBox__border: solid 4px var(--sky-300);
     --MessageBox__icon-color: var(--sky-800);
   }
 </style>
diff --git a/mathesar_ui/src/components/message-boxes/MessageBox.svelte b/mathesar_ui/src/components/message-boxes/MessageBox.svelte
index 16757983da..4cab9e64e2 100644
--- a/mathesar_ui/src/components/message-boxes/MessageBox.svelte
+++ b/mathesar_ui/src/components/message-boxes/MessageBox.svelte
@@ -31,7 +31,7 @@
     border-radius: var(--border-radius-m);
     margin: var(--MessageBox__margin);
     background: var(--MessageBox__background);
-    border: var(--MessageBox__border);
+    border-left: var(--MessageBox__border);
   }
   .message-box:not(.full-width) {
     max-width: max-content;
diff --git a/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte b/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte
index 15993406cc..0d9e9c03df 100644
--- a/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte
+++ b/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte
@@ -17,7 +17,7 @@
 <style>
   .outcome-box {
     --MessageBox__background: var(--purple-100);
-    --MessageBox__border: solid 1px var(--purple-300);
+    --MessageBox__border: solid 4px var(--purple-300);
     --MessageBox__icon-color: var(--purple-400);
   }
 </style>
diff --git a/mathesar_ui/src/components/message-boxes/WarningBox.svelte b/mathesar_ui/src/components/message-boxes/WarningBox.svelte
index 1fbae58ef2..6c6d9e8b98 100644
--- a/mathesar_ui/src/components/message-boxes/WarningBox.svelte
+++ b/mathesar_ui/src/components/message-boxes/WarningBox.svelte
@@ -15,7 +15,7 @@
 <style>
   .warning-box {
     --MessageBox__background: var(--yellow-100);
-    --MessageBox__border: solid 1px var(--yellow-200);
+    --MessageBox__border: solid 4px var(--yellow-200);
     --MessageBox__icon-color: var(--yellow-300);
   }
 </style>
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 4f6eab083f..84049bfd43 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -74,15 +74,15 @@
   "column_name_cannot_be_empty": "Column name cannot be empty.",
   "column_names": "Column Names",
   "column_number_name": "Column {number} Name",
-  "column_references_target_table": "Column in this table which references the target table",
+  "column_references_target_table": "The column in this table which references the target table.",
   "column_will_allow_duplicates": "Column {columnName} will allow duplicates.",
   "column_will_allow_null": "Column {columnName} will allow NULL",
   "column_will_not_allow_duplicates": "Column {columnName} will no longer allow duplicates.",
   "column_will_not_allow_null": "Column {columnName} will no longer allow NULL",
   "columns": "Columns",
   "columns_moved_to_table": "Columns {columnNames} have been moved to table {tableName}",
-  "columns_removed_from_table_added_to_new_table": "{count, plural, one {The column above will be removed from [tableName] and added to the new table} other {The columns above will be removed from [tableName] and added to the new table}}",
-  "columns_removed_from_table_added_to_target": "{count, plural, one {The column above will be removed from [tableName] and added to [targetTableName]} other {The columns above will be removed from [tableName] and added to [targetTableName]}}",
+  "columns_removed_from_table_added_to_new_table": "{count, plural, one {The selected column will be moved from [tableName] to the new table} other {The selected columns will be moved from [tableName] to the new table}}.",
+  "columns_removed_from_table_added_to_target": "{count, plural, one {The selected column will be moved from [tableName] to [targetTableName]} other {The selected columns will be moved from [tableName] to [targetTableName]}}.",
   "columns_to_extract": "Columns to Extract",
   "columns_to_move": "Columns to Move",
   "configure_in_mathesar": "Configure in Mathesar",
@@ -106,7 +106,7 @@
   "constraint_name_unique_help": "At the database level, each constraint must have a unique name across all the constraints, tables, views, and indexes within the schema.",
   "constraint_name_unique_mathesar_relevance_help": "In Mathesar however, the name of the constraint will likely never be relevant, &mdash; so we recommend allowing Mathesar to automatically generate constraint names when adding new constraints.",
   "constraints": "Constraints",
-  "constraints_info_help": "Constraints are used to define relationships between records in different tables or to ensure that records in a column are unique. Constraints can be applied to a single column or a combination of columns.",
+  "constraints_info_help": "Use constraints to define relationships between records in different tables or ensure uniqueness within a column.",
   "constraints_info_help_mini": "Constraints are rules that apply to the data in a column to ensure that it is valid.",
   "content": "Content",
   "continue": "Continue",
@@ -290,7 +290,7 @@
   "learn_implications_deleting_mathesar_schemas": "Learn more about the implications of deleting Mathesar schemas.",
   "link_copied": "Link copied",
   "link_successfully_regenerated": "The link has been successfully regenerated",
-  "link_table_to": "Link [tablePill] to",
+  "link_table_to": "Create link between [tablePill] and",
   "linked_from_base_table": "Linked from Base Table",
   "linked_record_summary": "Linked Record Summary",
   "linked_table": "Linked Table",
@@ -300,7 +300,7 @@
   "linked_via_foreign_key_column": "It is linked via a foreign key column",
   "linking_table": "Linking Table",
   "links": "Links",
-  "links_info": "Links are stored in the database as foreign key constraints, which you may add to existing columns via the \"Advanced\" section of the table inspector.",
+  "links_info": "Existing columns can be turned into links by adding foreign key constraints through the \"Advanced\" section of the table inspector.",
   "loading": "Loading",
   "loading_release_data": "Loading release data",
   "loading_spinner_no_progress_bar": "You will see a loading spinner but no progress bar.",
@@ -337,7 +337,7 @@
   "navigate_to_table_record": "Navigate to a {tableName} record",
   "needs_import_confirmation": "Needs Import Confirmation",
   "new_column": "New Column",
-  "new_column_added_to_table": "A new column will be added to [tableName]",
+  "new_column_added_to_table": "The new column that will be added to [tableName]",
   "new_foreign_key_constraint": "New Foreign Key Constraint",
   "new_link_wont_work_once_regenerated": "Once you regenerate a new link, the old link will no longer work.",
   "new_password": "New Password",
diff --git a/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte b/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte
index 276a3cf05c..28a2c88245 100644
--- a/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte
@@ -29,8 +29,9 @@
   export let installationSchemas: RequiredField<InstallationSchema[]>;
 </script>
 
-<div class="schemas-cbgroup">
+<div>
   <CheckboxGroup
+    boxed
     label={$_('schemas_to_install')}
     ariaLabel={$_('schemas_to_install')}
     bind:values={$installationSchemas}
@@ -41,12 +42,4 @@
   />
 </div>
 
-<style>
-  .schemas-cbgroup :global(ul.options) {
-    background: var(--white);
-    padding: 1rem;
-    border: 1px solid var(--slate-200);
-    border-radius: var(--border-radius-m);
-    margin-top: var(--size-ultra-small);
-  }
-</style>
+
diff --git a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
index 140593c671..7e2434ee45 100644
--- a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
+++ b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
@@ -60,12 +60,14 @@
   getInitialName={() => schema?.name ?? ''}
   getInitialDescription={() => schema?.description ?? ''}
   saveButtonLabel={schema ? $_('save') : $_('create_new_schema')}
+  namePlaceholder='Eg. Personal Finances, Movies'
 >
   <svelte:fragment slot="helpText">
+    
     {#if !schema}
-      <InfoBox>
-        {$_('name_your_schema_help')}
-      </InfoBox>
+      <span class="description">
+        Use schemas to organize related tables into logical groups within your database.
+      </span>
     {/if}
   </svelte:fragment>
 
@@ -81,3 +83,10 @@
     {/if}
   </span>
 </NameAndDescInputModalForm>
+
+<style>
+  .description {
+    display: inline-block;
+    margin-bottom: 1rem;
+  }
+</style>
diff --git a/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte b/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte
index 3e60be951a..9246057343 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte
@@ -45,7 +45,7 @@
     font-size: var(--text-size-small);
     background-color: var(--slate-200);
     border-radius: var(--border-radius-xl);
-    padding: 0.285rem 0.428rem;
+    padding: 0.25rem 0.75rem;
     margin-bottom: var(--size-super-ultra-small);
   }
 </style>
diff --git a/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte b/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
index 52c7b02da1..2794f9920f 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
@@ -137,7 +137,7 @@
     }
 
     :global(.collapsible-content) {
-      padding-left: 1rem;
+      padding-left: 2rem;
     }
 
     .null {
@@ -150,14 +150,14 @@
     justify-content: space-between;
     align-items: center;
     font-size: var(--text-size-large);
-
+    font-weight: var(--font-weight-medium);
     border-bottom: 1px solid var(--slate-200);
-    padding: 0.25rem;
+    min-height: 2.5rem;
     margin-bottom: 0.5rem;
   }
 
   .add-constraint {
-    padding: 0.5rem;
+    padding: 1rem;
     border: 1px solid var(--slate-300);
     border-radius: var(--border-radius-m);
   }
diff --git a/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte b/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
index 86d35a139d..96fa900b45 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
@@ -89,6 +89,7 @@
 
   .target-details {
     display: flex;
+    align-items: center;
 
     > :global(* + *) {
       margin-left: 0.25rem;
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
index 9f478ce067..2ceb2b56da 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
@@ -121,7 +121,6 @@
 </script>
 
 <div class="add-new-fk-constraint">
-  <span class="title">{$_('new_foreign_key_constraint')}</span>
 
   <Field
     field={baseColumn}
@@ -130,8 +129,13 @@
       props: { columns: baseTableColumns },
     }}
     layout="stacked"
-    label={$_('column_references_target_table')}
-  />
+    label="Referencing Column"
+
+  >
+    <span slot="help">
+      {$_('column_references_target_table')}
+    </span>
+  </Field>
 
   <Field
     field={targetTable}
@@ -190,7 +194,7 @@
     onProceed={handleSave}
     onCancel={onClose}
     size="small"
-    proceedButton={{ label: $_('add') }}
+    proceedButton={{ label: $_('Add Foreign Key Constraint') }}
   />
 </div>
 
@@ -202,5 +206,10 @@
     > :global(* + *) {
       margin-top: 1rem;
     }
+
+    .title {
+      font-weight: var(--font-weight-medium);
+      font-size: var(--text-size-large);
+    }
   }
 </style>
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
index 7f6769f498..8748583c88 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
@@ -123,10 +123,13 @@
 </script>
 
 <div class="add-new-unique-constraint">
-  <span>{$_('new_unique_constraint')}</span>
   <Form>
     <FormField>
-      <LabeledInput label={$_('columns')} layout="stacked">
+      <LabeledInput label="Columns" layout="stacked">
+        <span slot="help">
+          The columns in this table that should contain unique values.
+
+        </span>
         <MultiSelect
           bind:values={constraintColumns}
           options={columnsInTable}
@@ -174,7 +177,7 @@
   <CancelOrProceedButtonPair
     onProceed={handleSave}
     onCancel={handleCancel}
-    proceedButton={{ label: $_('add') }}
+    proceedButton={{ label: $_('Add Unique Constraint') }}
     {canProceed}
     size="small"
   />
diff --git a/mathesar_ui/src/systems/table-view/constraints/TableConstraintsModal.svelte b/mathesar_ui/src/systems/table-view/constraints/TableConstraintsModal.svelte
index df84f81fa2..67b8befe9c 100644
--- a/mathesar_ui/src/systems/table-view/constraints/TableConstraintsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/TableConstraintsModal.svelte
@@ -22,7 +22,6 @@
 <style lang="scss">
   .description {
     display: inline-block;
-    font-size: var(--text-size-small);
     margin-bottom: 1rem;
   }
 </style>
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index d288943939..8d8dcaa4a8 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -219,6 +219,10 @@
   }
 </script>
 
+<div class="description">
+  Use Links to connect related tables in your database together.
+</div>
+
 <div class="form" class:self-referential={isSelfReferential}>
   <FieldLayout>
     <InfoBox>
@@ -340,4 +344,7 @@
     --target-fill: var(--base-fill);
     --target-stroke: var(--base-stroke);
   }
+  .description {
+    margin-bottom: 1rem;
+  }
 </style>
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableModal.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableModal.svelte
index 865d9a169c..a27b68f0b0 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableModal.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableModal.svelte
@@ -13,7 +13,7 @@
 </script>
 
 {#if $currentTable}
-  <ControlledModal {controller} size="large" title={$_('create_link')}>
+  <ControlledModal {controller} size="large" title={$_('create_link')}>  
     <LinkTableForm base={$currentTable} close={() => controller.close()} />
   </ControlledModal>
 {/if}
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTablePill.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTablePill.svelte
index f6fb64885c..a51cc4060a 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTablePill.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTablePill.svelte
@@ -19,10 +19,11 @@
   .table-pill {
     border-radius: 500px;
     padding: 0 0.5em;
+    margin: 0 0.1em;
     max-width: 100%;
     display: inline-block;
-    vertical-align: -17%;
-    line-height: 1.3em;
+    vertical-align: -20%;
+    line-height: 1.2em;
   }
   .base {
     background: var(--base-fill);
diff --git a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
index b503c8b8c5..962b28254a 100644
--- a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
@@ -9,7 +9,7 @@
 
   import Pill from './LinkTablePill.svelte';
 
-  const label = 'Column Name';
+  const label = 'Name of New Column';
 
   type Which = ComponentProps<Pill>['which'];
 
diff --git a/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte b/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
index 16289909fc..51fc4f1470 100644
--- a/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
@@ -48,6 +48,7 @@
   }
   legend {
     margin-bottom: 0.5rem;
+    font-weight: var(--font-weight-medium);
   }
   .options {
     display: grid;
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
index b522b7ec87..05e61bb4ea 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
@@ -300,10 +300,10 @@
           text={targetTableName
             ? $_('columns_removed_from_table_added_to_target', {
                 values: { count: $columns.length },
-              })
+              }) + ' A link column will be created to maintain the relationship between records.'
             : $_('columns_removed_from_table_added_to_new_table', {
                 values: { count: $columns.length },
-              })}
+              }) + ' A link column will be created to maintain the relationship between records.'}
           let:slotName
         >
           {#if slotName === 'tableName'}
@@ -318,14 +318,16 @@
         </RichText>
       </p>
       {#if $targetType === 'newTable'}
-        <p>
-          <RichText text={$_('new_column_added_to_table')} let:slotName>
-            {#if slotName === 'tableName'}
-              <TableName table={currentTable} truncate={false} bold />
-            {/if}
-          </RichText>
-        </p>
-        <Field field={newFkColumnName} label={$_('column_name')} />
+        
+        <Field layout="stacked" field={newFkColumnName} label='Name of Link Column'>
+          <span slot="help">
+            <RichText text={$_('new_column_added_to_table')} let:slotName>
+              {#if slotName === 'tableName'}
+                <TableName table={currentTable} truncate={false} bold />
+              {/if}
+            </RichText>
+          </span>
+          </Field>
       {/if}
     </OutcomeBox>
   </FieldLayout>

From 332b27fbdf0ee7375bdca7f021c9ca4c4be0967d Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 28 Aug 2024 15:59:38 +0800
Subject: [PATCH 0769/1141] fix naming in db privilege class

---
 mathesar/rpc/database_privileges.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mathesar/rpc/database_privileges.py b/mathesar/rpc/database_privileges.py
index 13d1d09076..dfc661b3d4 100644
--- a/mathesar/rpc/database_privileges.py
+++ b/mathesar/rpc/database_privileges.py
@@ -39,8 +39,8 @@ class CurrentDBPrivileges(TypedDict):
         current_role_owner: Whether the current role is an owner of the database.
     """
     owner_oid: int
-    current_role_db_priv: list[Literal['CONNECT', 'CREATE', 'TEMPORARY']]
-    current_role_owner: bool
+    current_role_priv: list[Literal['CONNECT', 'CREATE', 'TEMPORARY']]
+    current_role_owns: bool
 
     @classmethod
     def from_dict(cls, d):

From b6852f3cf2b6353f3dffd036a5289e675feb5253 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 28 Aug 2024 16:35:52 +0800
Subject: [PATCH 0770/1141] add tests for new SQL privilege lister functions

---
 db/sql/test_00_msar.sql | 134 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 134 insertions(+)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 2b802e65d1..c3d914ce76 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -4552,3 +4552,137 @@ BEGIN
   );
 END;
 $$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_list_column_privileges_for_current_role() RETURNS SETOF TEXT AS $$
+DECLARE
+  tab_id oid;
+BEGIN
+CREATE TABLE mytab (col1 varchar, col2 varchar);
+tab_id := 'mytab'::regclass::oid;
+CREATE ROLE test_intern1;
+CREATE ROLE test_intern2;
+GRANT USAGE ON SCHEMA msar, __msar TO test_intern1, test_intern2;
+GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA msar, __msar TO test_intern1, test_intern2;
+GRANT SELECT, INSERT (col1) ON TABLE mytab TO test_intern1;
+GRANT SELECT (col2) ON TABLE mytab TO test_intern1;
+GRANT UPDATE (col1) ON TABLE mytab TO test_intern2;
+GRANT UPDATE, REFERENCES (col2) ON TABLE mytab TO test_intern2;
+
+RETURN NEXT is(
+  msar.list_column_privileges_for_current_role(tab_id, 1::smallint),
+  '["SELECT", "INSERT", "UPDATE", "REFERENCES"]'
+);
+RETURN NEXT is(
+  msar.list_column_privileges_for_current_role(tab_id, 2::smallint),
+  '["SELECT", "INSERT", "UPDATE", "REFERENCES"]'
+);
+
+SET ROLE test_intern1;
+RETURN NEXT is(
+  msar.list_column_privileges_for_current_role(tab_id, 1::smallint),
+  '["SELECT", "INSERT"]'
+);
+RETURN NEXT is(
+  msar.list_column_privileges_for_current_role(tab_id, 2::smallint),
+  '["SELECT"]'
+);
+
+SET ROLE test_intern2;
+RETURN NEXT is(
+  msar.list_column_privileges_for_current_role(tab_id, 1::smallint),
+  '["UPDATE"]'
+);
+RETURN NEXT is(
+  msar.list_column_privileges_for_current_role(tab_id, 2::smallint),
+  '["UPDATE", "REFERENCES"]'
+);
+
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_list_schema_privileges_for_current_role() RETURNS SETOF TEXT AS $$
+DECLARE
+  sch_id oid;
+BEGIN
+CREATE SCHEMA restricted;
+sch_id := 'restricted'::regnamespace::oid;
+CREATE ROLE test_intern1;
+CREATE ROLE test_intern2;
+GRANT USAGE ON SCHEMA msar, __msar TO test_intern1, test_intern2;
+GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA msar, __msar TO test_intern1, test_intern2;
+GRANT USAGE ON SCHEMA restricted TO test_intern1;
+GRANT USAGE, CREATE ON SCHEMA restricted TO test_intern2;
+
+RETURN NEXT is(msar.list_schema_privileges_for_current_role(sch_id), '["USAGE", "CREATE"]');
+
+SET ROLE test_intern1;
+RETURN NEXT is(msar.list_schema_privileges_for_current_role(sch_id), '["USAGE"]');
+
+SET ROLE test_intern2;
+RETURN NEXT is(msar.list_schema_privileges_for_current_role(sch_id), '["USAGE", "CREATE"]');
+
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_list_table_privileges_for_current_role() RETURNS SETOF TEXT AS $$
+DECLARE
+  tab_id oid;
+BEGIN
+CREATE TABLE mytab (col1 varchar);
+tab_id := 'mytab'::regclass::oid;
+CREATE ROLE test_intern1;
+CREATE ROLE test_intern2;
+GRANT USAGE ON SCHEMA msar, __msar TO test_intern1, test_intern2;
+GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA msar, __msar TO test_intern1, test_intern2;
+
+GRANT SELECT, INSERT, UPDATE ON TABLE mytab TO test_intern1;
+GRANT DELETE, TRUNCATE, REFERENCES, TRIGGER ON TABLE mytab TO test_intern2;
+
+RETURN NEXT is(
+  msar.list_table_privileges_for_current_role(tab_id),
+  '["SELECT", "INSERT", "UPDATE", "DELETE", "TRUNCATE", "REFERENCES", "TRIGGER"]'
+);
+
+SET ROLE test_intern1;
+RETURN NEXT is(
+  msar.list_table_privileges_for_current_role(tab_id),
+  '["SELECT", "INSERT", "UPDATE"]'
+);
+
+SET ROLE test_intern2;
+RETURN NEXT is(
+  msar.list_table_privileges_for_current_role(tab_id),
+  '["DELETE", "TRUNCATE", "REFERENCES", "TRIGGER"]'
+);
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_list_database_privileges_for_current_role() RETURNS SETOF TEXT AS $$
+DECLARE
+  dat_id oid := oid FROM pg_database WHERE datname=current_database();
+BEGIN
+CREATE ROLE test_intern1;
+CREATE ROLE test_intern2;
+GRANT USAGE ON SCHEMA msar, __msar TO test_intern1, test_intern2;
+GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA msar, __msar TO test_intern1, test_intern2;
+
+REVOKE ALL ON DATABASE mathesar_testing FROM PUBLIC;
+GRANT CONNECT, CREATE ON DATABASE mathesar_testing TO test_intern1;
+GRANT CONNECT, TEMPORARY ON DATABASE mathesar_testing TO test_intern2;
+
+RETURN NEXT is(
+  msar.list_database_privileges_for_current_role(dat_id),
+  '["CONNECT", "CREATE", "TEMPORARY"]'
+);
+
+SET ROLE test_intern1;
+RETURN NEXT is(msar.list_database_privileges_for_current_role(dat_id), '["CONNECT", "CREATE"]');
+
+SET ROLE test_intern2;
+RETURN NEXT is(msar.list_database_privileges_for_current_role(dat_id), '["CONNECT", "TEMPORARY"]');
+END;
+$$ LANGUAGE plpgsql;

From dfc50145af9d25d3442e77f72ee34cd863d4ee12 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 28 Aug 2024 16:39:44 +0800
Subject: [PATCH 0771/1141] update documentation to be more precise w.r.t.
 privileges

---
 mathesar/rpc/columns/base.py        | 2 +-
 mathesar/rpc/database_privileges.py | 4 ++--
 mathesar/rpc/tables/base.py         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mathesar/rpc/columns/base.py b/mathesar/rpc/columns/base.py
index 82251e1b9e..16a7641e39 100644
--- a/mathesar/rpc/columns/base.py
+++ b/mathesar/rpc/columns/base.py
@@ -160,7 +160,7 @@ class ColumnInfo(TypedDict):
         default: The default value and whether it's dynamic.
         has_dependents: Whether the column has dependent objects.
         description: The description of the column.
-        current_role_priv: The privileges of the user for the column.
+        current_role_priv: The privileges available to the user for the column.
         valid_target_types: A list of all types to which the column can
             be cast.
     """
diff --git a/mathesar/rpc/database_privileges.py b/mathesar/rpc/database_privileges.py
index dfc661b3d4..eb41e04a0c 100644
--- a/mathesar/rpc/database_privileges.py
+++ b/mathesar/rpc/database_privileges.py
@@ -35,8 +35,8 @@ class CurrentDBPrivileges(TypedDict):
 
     Attributes:
         owner_oid: The `oid` of the owner of the database.
-        current_role_db_priv: A list of database privileges for the current user.
-        current_role_owner: Whether the current role is an owner of the database.
+        current_role_priv: A list of privileges available to the user.
+        current_role_owns: Whether the user is an owner of the database.
     """
     owner_oid: int
     current_role_priv: list[Literal['CONNECT', 'CREATE', 'TEMPORARY']]
diff --git a/mathesar/rpc/tables/base.py b/mathesar/rpc/tables/base.py
index b0132e480f..8b971ca9a3 100644
--- a/mathesar/rpc/tables/base.py
+++ b/mathesar/rpc/tables/base.py
@@ -29,7 +29,7 @@ class TableInfo(TypedDict):
         schema: The `oid` of the schema where the table lives.
         description: The description of the table.
         owner_oid: The OID of the direct owner of the table.
-        current_role_priv: The privileges held by the user on the table.
+        current_role_priv: The privileges available to the user on the table.
         current_role_owns: Whether the current role owns the table.
     """
     oid: int

From 706cb67668db5ab0cac667864df2edaf60cc65a3 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 28 Aug 2024 18:54:32 +0530
Subject: [PATCH 0772/1141] change logic from 'MEMBER'->'USAGE' and reflect in
 docstrings

---
 db/sql/00_msar.sql    | 7 ++++---
 mathesar/rpc/roles.py | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index c84a53cc23..2fb08a9fe8 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1038,14 +1038,15 @@ $$ LANGUAGE SQL STABLE;
 
 
 CREATE OR REPLACE FUNCTION
-msar.get_current_role() RETURNS TEXT AS $$/*
-Returns a JSON object describing the current_role and the parent role(s) it inherits from.
+msar.get_current_role() RETURNS jsonb AS $$/*
+Returns a JSON object describing the current_role and the parent role(s) whose
+privileges are immediately available to current_role without doing SET ROLE.
 */
 SELECT jsonb_build_object(
   'current_role', msar.get_role(current_role),
   'parent_roles', array_remove(
     array_agg(
-      CASE WHEN pg_has_role(role_data.name, current_role, 'MEMBER')
+      CASE WHEN pg_has_role(role_data.name, current_role, 'USAGE')
       THEN msar.get_role(role_data.name) END
     ), NULL
   )
diff --git a/mathesar/rpc/roles.py b/mathesar/rpc/roles.py
index c6fb4ccc3a..9eb0de8402 100644
--- a/mathesar/rpc/roles.py
+++ b/mathesar/rpc/roles.py
@@ -123,8 +123,8 @@ def add(
 @handle_rpc_exceptions
 def get_current_role(*, database_id: int, **kwargs) -> dict:
     """
-    Get information about the current role and all the parent role(s) it inherits from.
-    Requires a database id inorder to connect to the server.
+    Get information about the current role and all the parent role(s) whose
+    privileges are immediately available to current role without doing SET ROLE.
 
     Args:
         database_id: The Django id of the database.

From 23a6751041009edf75dd8bc919fcf23dc9aae390 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 29 Aug 2024 14:38:45 +0800
Subject: [PATCH 0773/1141] make initial move of files

---
 config/settings/common_settings.py            | 19 +++----
 mathesar/rpc/databases/base.py                | 53 +++++++++----------
 mathesar/rpc/databases/configured.py          | 52 ++++++++++++++++++
 .../privileges.py}                            | 48 ++---------------
 .../{database_setup.py => databases/setup.py} | 10 ++--
 mathesar/rpc/roles/__init__.py                |  1 +
 mathesar/rpc/{roles.py => roles/base.py}      |  0
 .../configured.py}                            |  8 +--
 mathesar/rpc/schemas/__init__.py              |  1 +
 mathesar/rpc/{schemas.py => schemas/base.py}  |  0
 .../privileges.py}                            |  4 +-
 mathesar/rpc/servers/__init__.py              |  0
 .../rpc/{servers.py => servers/configured.py} |  2 +-
 .../privileges.py}                            |  4 +-
 mathesar/views.py                             |  4 +-
 15 files changed, 108 insertions(+), 98 deletions(-)
 create mode 100644 mathesar/rpc/databases/configured.py
 rename mathesar/rpc/{database_privileges.py => databases/privileges.py} (62%)
 rename mathesar/rpc/{database_setup.py => databases/setup.py} (92%)
 create mode 100644 mathesar/rpc/roles/__init__.py
 rename mathesar/rpc/{roles.py => roles/base.py} (100%)
 rename mathesar/rpc/{configured_roles.py => roles/configured.py} (94%)
 create mode 100644 mathesar/rpc/schemas/__init__.py
 rename mathesar/rpc/{schemas.py => schemas/base.py} (100%)
 rename mathesar/rpc/{schema_privileges.py => schemas/privileges.py} (96%)
 create mode 100644 mathesar/rpc/servers/__init__.py
 rename mathesar/rpc/{servers.py => servers/configured.py} (95%)
 rename mathesar/rpc/{table_privileges.py => tables/privileges.py} (96%)

diff --git a/config/settings/common_settings.py b/config/settings/common_settings.py
index 387ff5edc5..0aeab18afc 100644
--- a/config/settings/common_settings.py
+++ b/config/settings/common_settings.py
@@ -66,25 +66,26 @@ def pipe_delim(pipe_string):
 
 MODERNRPC_METHODS_MODULES = [
     'mathesar.rpc.collaborators',
-    'mathesar.rpc.configured_roles',
-    'mathesar.rpc.connections',
-    'mathesar.rpc.constraints',
     'mathesar.rpc.columns',
     'mathesar.rpc.columns.metadata',
+    'mathesar.rpc.connections',
+    'mathesar.rpc.constraints',
     'mathesar.rpc.data_modeling',
-    'mathesar.rpc.database_privileges',
-    'mathesar.rpc.database_setup',
     'mathesar.rpc.databases',
+    'mathesar.rpc.databases.configured',
+    'mathesar.rpc.databases.privileges',
+    'mathesar.rpc.databases.setup',
+    'mathesar.rpc.explorations',
     'mathesar.rpc.records',
     'mathesar.rpc.roles',
+    'mathesar.rpc.roles.configured',
     'mathesar.rpc.schemas',
-    'mathesar.rpc.schema_privileges',
-    'mathesar.rpc.servers',
+    'mathesar.rpc.schemas.privileges',
+    'mathesar.rpc.servers.configured',
     'mathesar.rpc.tables',
-    'mathesar.rpc.table_privileges',
     'mathesar.rpc.tables.metadata',
+    'mathesar.rpc.tables.privileges',
     'mathesar.rpc.types',
-    'mathesar.rpc.explorations'
 ]
 
 TEMPLATES = [
diff --git a/mathesar/rpc/databases/base.py b/mathesar/rpc/databases/base.py
index abc9d43b89..42c8415559 100644
--- a/mathesar/rpc/databases/base.py
+++ b/mathesar/rpc/databases/base.py
@@ -1,52 +1,49 @@
-from typing import TypedDict
+from typing import Literal, TypedDict
 
-from modernrpc.core import rpc_method
+from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
 
-from mathesar.models.base import Database
+from mathesar.rpc.utils import connect
+from db.roles.operations.select import get_curr_role_db_priv
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 
 
-class DatabaseInfo(TypedDict):
+class CurrentDBPrivileges(TypedDict):
     """
-    Information about a database.
+    Information about database privileges for current user.
 
     Attributes:
-        id: the Django ID of the database model instance.
-        name: The name of the database on the server.
-        server_id: the Django ID of the server model instance for the database.
+        owner_oid: The `oid` of the owner of the database.
+        current_role_priv: A list of privileges available to the user.
+        current_role_owns: Whether the user is an owner of the database.
     """
-    id: int
-    name: str
-    server_id: int
+    owner_oid: int
+    current_role_priv: list[Literal['CONNECT', 'CREATE', 'TEMPORARY']]
+    current_role_owns: bool
 
     @classmethod
-    def from_model(cls, model):
+    def from_dict(cls, d):
         return cls(
-            id=model.id,
-            name=model.name,
-            server_id=model.server.id
+            owner_oid=d["owner_oid"],
+            current_role_priv=d["current_role_priv"],
+            current_role_owns=d["current_role_owns"]
         )
 
 
-@rpc_method(name="databases.list")
+@rpc_method(name="databases.get")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def list_(*, server_id: int = None, **kwargs) -> list[DatabaseInfo]:
+def get(*, database_id: int, **kwargs) -> CurrentDBPrivileges:
     """
-    List information about databases for a server. Exposed as `list`.
-
-    If called with no `server_id`, all databases for all servers are listed.
+    Get database privileges for the current user.
 
     Args:
-        server_id: The Django id of the server containing the databases.
+        database_id: The Django id of the database.
 
     Returns:
-        A list of database details.
+        A dict describing current user's database privilege.
     """
-    if server_id is not None:
-        database_qs = Database.objects.filter(server__id=server_id)
-    else:
-        database_qs = Database.objects.all()
-
-    return [DatabaseInfo.from_model(db_model) for db_model in database_qs]
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        curr_role_db_priv = get_curr_role_db_priv(conn)
+    return CurrentDBPrivileges.from_dict(curr_role_db_priv)
diff --git a/mathesar/rpc/databases/configured.py b/mathesar/rpc/databases/configured.py
new file mode 100644
index 0000000000..d37e2cd732
--- /dev/null
+++ b/mathesar/rpc/databases/configured.py
@@ -0,0 +1,52 @@
+from typing import TypedDict
+
+from modernrpc.core import rpc_method
+from modernrpc.auth.basic import http_basic_auth_login_required
+
+from mathesar.models.base import Database
+from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+
+
+class DatabaseInfo(TypedDict):
+    """
+    Information about a database.
+
+    Attributes:
+        id: the Django ID of the database model instance.
+        name: The name of the database on the server.
+        server_id: the Django ID of the server model instance for the database.
+    """
+    id: int
+    name: str
+    server_id: int
+
+    @classmethod
+    def from_model(cls, model):
+        return cls(
+            id=model.id,
+            name=model.name,
+            server_id=model.server.id
+        )
+
+
+@rpc_method(name="databases.configured.list")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def list_(*, server_id: int = None, **kwargs) -> list[DatabaseInfo]:
+    """
+    List information about databases for a server. Exposed as `list`.
+
+    If called with no `server_id`, all databases for all servers are listed.
+
+    Args:
+        server_id: The Django id of the server containing the databases.
+
+    Returns:
+        A list of database details.
+    """
+    if server_id is not None:
+        database_qs = Database.objects.filter(server__id=server_id)
+    else:
+        database_qs = Database.objects.all()
+
+    return [DatabaseInfo.from_model(db_model) for db_model in database_qs]
diff --git a/mathesar/rpc/database_privileges.py b/mathesar/rpc/databases/privileges.py
similarity index 62%
rename from mathesar/rpc/database_privileges.py
rename to mathesar/rpc/databases/privileges.py
index eb41e04a0c..265284e345 100644
--- a/mathesar/rpc/database_privileges.py
+++ b/mathesar/rpc/databases/privileges.py
@@ -3,7 +3,7 @@
 from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
 
-from db.roles.operations.select import list_db_priv, get_curr_role_db_priv
+from db.roles.operations.select import list_db_priv
 from db.roles.operations.update import replace_database_privileges_for_roles
 from mathesar.rpc.utils import connect
 from mathesar.models.base import Database
@@ -29,29 +29,7 @@ def from_dict(cls, d):
         )
 
 
-class CurrentDBPrivileges(TypedDict):
-    """
-    Information about database privileges for current user.
-
-    Attributes:
-        owner_oid: The `oid` of the owner of the database.
-        current_role_priv: A list of privileges available to the user.
-        current_role_owns: Whether the user is an owner of the database.
-    """
-    owner_oid: int
-    current_role_priv: list[Literal['CONNECT', 'CREATE', 'TEMPORARY']]
-    current_role_owns: bool
-
-    @classmethod
-    def from_dict(cls, d):
-        return cls(
-            owner_oid=d["owner_oid"],
-            current_role_priv=d["current_role_priv"],
-            current_role_owns=d["current_role_owns"]
-        )
-
-
-@rpc_method(name="database_privileges.list_direct")
+@rpc_method(name="databases.privileges.list_direct")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
 def list_direct(*, database_id: int, **kwargs) -> list[DBPrivileges]:
@@ -71,27 +49,7 @@ def list_direct(*, database_id: int, **kwargs) -> list[DBPrivileges]:
     return [DBPrivileges.from_dict(i) for i in raw_db_priv]
 
 
-# TODO: Think of something concise for the endpoint name.
-@rpc_method(name="database_privileges.get_self")
-@http_basic_auth_login_required
-@handle_rpc_exceptions
-def get_self(*, database_id: int, **kwargs) -> CurrentDBPrivileges:
-    """
-    Get database privileges for the current user.
-
-    Args:
-        database_id: The Django id of the database.
-
-    Returns:
-        A dict describing current user's database privilege.
-    """
-    user = kwargs.get(REQUEST_KEY).user
-    with connect(database_id, user) as conn:
-        curr_role_db_priv = get_curr_role_db_priv(conn)
-    return CurrentDBPrivileges.from_dict(curr_role_db_priv)
-
-
-@rpc_method(name="database_privileges.replace_for_roles")
+@rpc_method(name="databases.privileges.replace_for_roles")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
 def replace_for_roles(
diff --git a/mathesar/rpc/database_setup.py b/mathesar/rpc/databases/setup.py
similarity index 92%
rename from mathesar/rpc/database_setup.py
rename to mathesar/rpc/databases/setup.py
index d81b936d41..92f61dfa66 100644
--- a/mathesar/rpc/database_setup.py
+++ b/mathesar/rpc/databases/setup.py
@@ -8,9 +8,9 @@
 
 from mathesar.utils import permissions
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
-from mathesar.rpc.servers import ServerInfo
-from mathesar.rpc.databases import DatabaseInfo
-from mathesar.rpc.configured_roles import ConfiguredRoleInfo
+from mathesar.rpc.servers.configured import ServerInfo
+from mathesar.rpc.databases.configured import DatabaseInfo
+from mathesar.rpc.roles.configured import ConfiguredRoleInfo
 
 
 class DatabaseConnectionResult(TypedDict):
@@ -38,7 +38,7 @@ def from_model(cls, model):
         )
 
 
-@rpc_method(name='database_setup.create_new')
+@rpc_method(name='databases.setup.create_new')
 @http_basic_auth_superuser_required
 @handle_rpc_exceptions
 def create_new(
@@ -66,7 +66,7 @@ def create_new(
     return DatabaseConnectionResult.from_model(result)
 
 
-@rpc_method(name='database_setup.connect_existing')
+@rpc_method(name='databases.setup.connect_existing')
 @http_basic_auth_superuser_required
 @handle_rpc_exceptions
 def connect_existing(
diff --git a/mathesar/rpc/roles/__init__.py b/mathesar/rpc/roles/__init__.py
new file mode 100644
index 0000000000..44c8b96840
--- /dev/null
+++ b/mathesar/rpc/roles/__init__.py
@@ -0,0 +1 @@
+from .base import * # noqa
diff --git a/mathesar/rpc/roles.py b/mathesar/rpc/roles/base.py
similarity index 100%
rename from mathesar/rpc/roles.py
rename to mathesar/rpc/roles/base.py
diff --git a/mathesar/rpc/configured_roles.py b/mathesar/rpc/roles/configured.py
similarity index 94%
rename from mathesar/rpc/configured_roles.py
rename to mathesar/rpc/roles/configured.py
index 6c587b4905..8c92444127 100644
--- a/mathesar/rpc/configured_roles.py
+++ b/mathesar/rpc/roles/configured.py
@@ -29,7 +29,7 @@ def from_model(cls, model):
         )
 
 
-@rpc_method(name="configured_roles.list")
+@rpc_method(name="roles.configured.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
 def list_(*, server_id: int, **kwargs) -> list[ConfiguredRoleInfo]:
@@ -47,7 +47,7 @@ def list_(*, server_id: int, **kwargs) -> list[ConfiguredRoleInfo]:
     return [ConfiguredRoleInfo.from_model(db_model) for db_model in configured_role_qs]
 
 
-@rpc_method(name='configured_roles.add')
+@rpc_method(name='roles.configured.add')
 @http_basic_auth_superuser_required
 @handle_rpc_exceptions
 def add(
@@ -77,7 +77,7 @@ def add(
     return ConfiguredRoleInfo.from_model(configured_role)
 
 
-@rpc_method(name='configured_roles.delete')
+@rpc_method(name='roles.configured.delete')
 @http_basic_auth_superuser_required
 @handle_rpc_exceptions
 def delete(*, configured_role_id: int, **kwargs):
@@ -91,7 +91,7 @@ def delete(*, configured_role_id: int, **kwargs):
     configured_role.delete()
 
 
-@rpc_method(name='configured_roles.set_password')
+@rpc_method(name='roles.configured.set_password')
 @http_basic_auth_superuser_required
 @handle_rpc_exceptions
 def set_password(
diff --git a/mathesar/rpc/schemas/__init__.py b/mathesar/rpc/schemas/__init__.py
new file mode 100644
index 0000000000..44c8b96840
--- /dev/null
+++ b/mathesar/rpc/schemas/__init__.py
@@ -0,0 +1 @@
+from .base import * # noqa
diff --git a/mathesar/rpc/schemas.py b/mathesar/rpc/schemas/base.py
similarity index 100%
rename from mathesar/rpc/schemas.py
rename to mathesar/rpc/schemas/base.py
diff --git a/mathesar/rpc/schema_privileges.py b/mathesar/rpc/schemas/privileges.py
similarity index 96%
rename from mathesar/rpc/schema_privileges.py
rename to mathesar/rpc/schemas/privileges.py
index 3257e514e0..d96893d4d8 100644
--- a/mathesar/rpc/schema_privileges.py
+++ b/mathesar/rpc/schemas/privileges.py
@@ -28,7 +28,7 @@ def from_dict(cls, d):
         )
 
 
-@rpc_method(name="schema_privileges.list_direct")
+@rpc_method(name="schemas.privileges.list_direct")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
 def list_direct(
@@ -50,7 +50,7 @@ def list_direct(
     return [SchemaPrivileges.from_dict(i) for i in raw_priv]
 
 
-@rpc_method(name="schema_privileges.replace_for_roles")
+@rpc_method(name="schemas.privileges.replace_for_roles")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
 def replace_for_roles(
diff --git a/mathesar/rpc/servers/__init__.py b/mathesar/rpc/servers/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/mathesar/rpc/servers.py b/mathesar/rpc/servers/configured.py
similarity index 95%
rename from mathesar/rpc/servers.py
rename to mathesar/rpc/servers/configured.py
index 71602e9a39..a85845a15e 100644
--- a/mathesar/rpc/servers.py
+++ b/mathesar/rpc/servers/configured.py
@@ -29,7 +29,7 @@ def from_model(cls, model):
         )
 
 
-@rpc_method(name="servers.list")
+@rpc_method(name="servers.configured.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
 def list_() -> list[ServerInfo]:
diff --git a/mathesar/rpc/table_privileges.py b/mathesar/rpc/tables/privileges.py
similarity index 96%
rename from mathesar/rpc/table_privileges.py
rename to mathesar/rpc/tables/privileges.py
index 801ac0a5e9..64ae9ec7dd 100644
--- a/mathesar/rpc/table_privileges.py
+++ b/mathesar/rpc/tables/privileges.py
@@ -27,7 +27,7 @@ def from_dict(cls, d):
         )
 
 
-@rpc_method(name="table_privileges.list_direct")
+@rpc_method(name="tables.privileges.list_direct")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
 def list_direct(
@@ -47,7 +47,7 @@ def list_direct(
     return [TablePrivileges.from_dict(i) for i in raw_priv]
 
 
-@rpc_method(name="table_privileges.replace_for_roles")
+@rpc_method(name="tables.privileges.replace_for_roles")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
 def replace_for_roles(
diff --git a/mathesar/views.py b/mathesar/views.py
index 0db30e56b1..1f4080aeb9 100644
--- a/mathesar/views.py
+++ b/mathesar/views.py
@@ -7,9 +7,9 @@
 from rest_framework.decorators import api_view
 from rest_framework.response import Response
 
-from mathesar.rpc.databases import list_ as databases_list
+from mathesar.rpc.databases.configured import list_ as databases_list
 from mathesar.rpc.schemas import list_ as schemas_list
-from mathesar.rpc.servers import list_ as get_servers_list
+from mathesar.rpc.servers.configured import list_ as get_servers_list
 from mathesar.api.serializers.databases import TypeSerializer
 from mathesar.api.serializers.tables import TableSerializer
 from mathesar.api.serializers.queries import QuerySerializer

From 7b47adc93a2c4c7c2e985d229fcb7712ca7214a5 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 29 Aug 2024 15:04:55 +0800
Subject: [PATCH 0774/1141] fix endpoints and roles tests

---
 mathesar/tests/rpc/test_endpoints.py | 223 ++++++++++++++-------------
 mathesar/tests/rpc/test_roles.py     |  12 +-
 2 files changed, 125 insertions(+), 110 deletions(-)

diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 979277f76a..cede022e5c 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -10,21 +10,16 @@
 
 from mathesar.rpc import collaborators
 from mathesar.rpc import columns
-from mathesar.rpc import configured_roles
 from mathesar.rpc import connections
 from mathesar.rpc import constraints
 from mathesar.rpc import data_modeling
-from mathesar.rpc import database_privileges
-from mathesar.rpc import database_setup
 from mathesar.rpc import databases
 from mathesar.rpc import explorations
 from mathesar.rpc import records
 from mathesar.rpc import roles
 from mathesar.rpc import schemas
-from mathesar.rpc import schema_privileges
 from mathesar.rpc import servers
 from mathesar.rpc import tables
-from mathesar.rpc import table_privileges
 from mathesar.rpc import types
 
 METHODS = [
@@ -48,6 +43,12 @@
         "collaborators.set_role",
         [user_is_superuser]
     ),
+
+    (
+        columns.add,
+        "columns.add",
+        [user_is_authenticated]
+    ),
     (
         columns.delete,
         "columns.delete",
@@ -59,20 +60,16 @@
         [user_is_authenticated]
     ),
     (
-        columns.patch,
-        "columns.patch",
-        [user_is_authenticated]
-    ),
-    (
-        columns.add,
-        "columns.add",
+        columns.list_with_metadata,
+        "columns.list_with_metadata",
         [user_is_authenticated]
     ),
     (
-        columns.list_with_metadata,
-        "columns.list_with_metadata",
+        columns.patch,
+        "columns.patch",
         [user_is_authenticated]
     ),
+
     (
         columns.metadata.list_,
         "columns.metadata.list",
@@ -83,26 +80,7 @@
         "columns.metadata.set",
         [user_is_authenticated]
     ),
-    (
-        configured_roles.add,
-        "configured_roles.add",
-        [user_is_superuser]
-    ),
-    (
-        configured_roles.list_,
-        "configured_roles.list",
-        [user_is_authenticated]
-    ),
-    (
-        configured_roles.delete,
-        "configured_roles.delete",
-        [user_is_superuser]
-    ),
-    (
-        configured_roles.set_password,
-        "configured_roles.set_password",
-        [user_is_superuser]
-    ),
+
     (
         connections.add_from_known_connection,
         "connections.add_from_known_connection",
@@ -118,6 +96,7 @@
         "connections.grant_access_to_user",
         [user_is_superuser]
     ),
+
     (
         constraints.list_,
         "constraints.list",
@@ -133,6 +112,7 @@
         "constraints.delete",
         [user_is_authenticated]
     ),
+
     (
         data_modeling.add_foreign_key_column,
         "data_modeling.add_foreign_key_column",
@@ -148,101 +128,108 @@
         "data_modeling.suggest_types",
         [user_is_authenticated]
     ),
+
     (
-        database_privileges.list_direct,
-        "database_privileges.list_direct",
+        databases.get,
+        "databases.get",
         [user_is_authenticated]
     ),
+
     (
-        database_privileges.get_self,
-        "database_privileges.get_self",
+        databases.configured.list_,
+        "databases.configured.list",
         [user_is_authenticated]
     ),
+
     (
-        database_privileges.replace_for_roles,
-        "database_privileges.replace_for_roles",
+        databases.privileges.list_direct,
+        "databases.privileges.list_direct",
         [user_is_authenticated]
     ),
     (
-        database_setup.create_new,
-        "database_setup.create_new",
-        [user_is_superuser]
+        databases.privileges.replace_for_roles,
+        "databases.privileges.replace_for_roles",
+        [user_is_authenticated]
     ),
+
     (
-        database_setup.connect_existing,
-        "database_setup.connect_existing",
+        databases.setup.create_new,
+        "databases.setup.create_new",
         [user_is_superuser]
     ),
     (
-        databases.list_,
-        "databases.list",
-        [user_is_authenticated]
+        databases.setup.connect_existing,
+        "databases.setup.connect_existing",
+        [user_is_superuser]
     ),
+
     (
-        records.list_,
-        "records.list",
+        explorations.add,
+        "explorations.add",
         [user_is_authenticated]
     ),
     (
-        records.get,
-        "records.get",
+        explorations.delete,
+        "explorations.delete",
         [user_is_authenticated]
     ),
     (
-        records.add,
-        "records.add",
+        explorations.get,
+        "explorations.get",
         [user_is_authenticated]
     ),
     (
-        records.patch,
-        "records.patch",
+        explorations.list_,
+        "explorations.list",
         [user_is_authenticated]
     ),
     (
-        records.delete,
-        "records.delete",
+        explorations.replace,
+        "explorations.replace",
         [user_is_authenticated]
     ),
     (
-        records.search,
-        "records.search",
+        explorations.run,
+        "explorations.run",
         [user_is_authenticated]
     ),
     (
-        explorations.list_,
-        "explorations.list",
+        explorations.run_saved,
+        "explorations.run_saved",
         [user_is_authenticated]
     ),
+
     (
-        explorations.get,
-        "explorations.get",
+        records.add,
+        "records.add",
         [user_is_authenticated]
     ),
     (
-        explorations.add,
-        "explorations.add",
+        records.delete,
+        "records.delete",
         [user_is_authenticated]
     ),
     (
-        explorations.delete,
-        "explorations.delete",
+        records.get,
+        "records.get",
         [user_is_authenticated]
     ),
     (
-        explorations.replace,
-        "explorations.replace",
+        records.list_,
+        "records.list",
         [user_is_authenticated]
     ),
     (
-        explorations.run,
-        "explorations.run",
+        records.patch,
+        "records.patch",
         [user_is_authenticated]
     ),
     (
-        explorations.run_saved,
-        "explorations.run_saved",
+        records.search,
+        "records.search",
         [user_is_authenticated]
     ),
+
     (
         roles.list_,
         "roles.list",
@@ -258,14 +245,31 @@
         "roles.get_current_role",
         [user_is_authenticated]
     ),
+
+    (
+        roles.configured.add,
+        "roles.configured.add",
+        [user_is_superuser]
+    ),
     (
-        schemas.add,
-        "schemas.add",
+        roles.configured.delete,
+        "roles.configured.delete",
+        [user_is_superuser]
+    ),
+    (
+        roles.configured.list_,
+        "roles.configured.list",
         [user_is_authenticated]
     ),
     (
-        schemas.list_,
-        "schemas.list",
+        roles.configured.set_password,
+        "roles.configured.set_password",
+        [user_is_superuser]
+    ),
+
+    (
+        schemas.add,
+        "schemas.add",
         [user_is_authenticated]
     ),
     (
@@ -273,40 +277,49 @@
         "schemas.delete",
         [user_is_authenticated]
     ),
+    (
+        schemas.list_,
+        "schemas.list",
+        [user_is_authenticated]
+    ),
     (
         schemas.patch,
         "schemas.patch",
         [user_is_authenticated]
     ),
+
     (
-        schema_privileges.list_direct,
-        "schema_privileges.list_direct",
+        schemas.privileges.list_direct,
+        "schemas.privileges.list_direct",
         [user_is_authenticated]
     ),
     (
-        schema_privileges.replace_for_roles,
-        "schema_privileges.replace_for_roles",
+        schemas.privileges.replace_for_roles,
+        "schemas.privileges.replace_for_roles",
         [user_is_authenticated]
     ),
+
     (
-        servers.list_,
-        "servers.list",
+        servers.configured.list_,
+        "servers.configured.list",
         [user_is_authenticated]
     ),
+
     (
 
         types.list_,
         "types.list",
         [user_is_authenticated]
     ),
+
     (
-        tables.list_,
-        "tables.list",
+        tables.add,
+        "tables.add",
         [user_is_authenticated]
     ),
     (
-        tables.list_with_metadata,
-        "tables.list_with_metadata",
+        tables.delete,
+        "tables.delete",
         [user_is_authenticated]
     ),
     (
@@ -315,45 +328,47 @@
         [user_is_authenticated]
     ),
     (
-        tables.add,
-        "tables.add",
+        tables.get_import_preview,
+        "tables.get_import_preview",
         [user_is_authenticated]
     ),
     (
-        tables.delete,
-        "tables.delete",
+        tables.import_,
+        "tables.import",
         [user_is_authenticated]
     ),
     (
-        tables.patch,
-        "tables.patch",
+        tables.list_,
+        "tables.list",
         [user_is_authenticated]
     ),
     (
-        tables.import_,
-        "tables.import",
+        tables.list_joinable,
+        "tables.list_joinable",
         [user_is_authenticated]
     ),
     (
-        tables.get_import_preview,
-        "tables.get_import_preview",
+        tables.list_with_metadata,
+        "tables.list_with_metadata",
         [user_is_authenticated]
     ),
     (
-        tables.list_joinable,
-        "tables.list_joinable",
+        tables.patch,
+        "tables.patch",
         [user_is_authenticated]
     ),
+
     (
-        table_privileges.list_direct,
-        "table_privileges.list_direct",
+        tables.privileges.list_direct,
+        "tables.privileges.list_direct",
         [user_is_authenticated]
     ),
     (
-        table_privileges.replace_for_roles,
-        "table_privileges.replace_for_roles",
+        tables.privileges.replace_for_roles,
+        "tables.privileges.replace_for_roles",
         [user_is_authenticated]
     ),
+
     (
         tables.metadata.list_,
         "tables.metadata.list",
diff --git a/mathesar/tests/rpc/test_roles.py b/mathesar/tests/rpc/test_roles.py
index b5af4f5d06..7d9cbe539f 100644
--- a/mathesar/tests/rpc/test_roles.py
+++ b/mathesar/tests/rpc/test_roles.py
@@ -65,8 +65,8 @@ def mock_list_roles(conn):
             },
         ]
 
-    monkeypatch.setattr(roles, 'connect', mock_connect)
-    monkeypatch.setattr(roles, 'list_roles', mock_list_roles)
+    monkeypatch.setattr(roles.base, 'connect', mock_connect)
+    monkeypatch.setattr(roles.base, 'list_roles', mock_list_roles)
     roles.list_(database_id=_database_id, request=request)
 
 
@@ -105,8 +105,8 @@ def mock_create_role(rolename, password, login, conn):
             'description': None
         }
 
-    monkeypatch.setattr(roles, 'connect', mock_connect)
-    monkeypatch.setattr(roles, 'create_role', mock_create_role)
+    monkeypatch.setattr(roles.base, 'connect', mock_connect)
+    monkeypatch.setattr(roles.base, 'create_role', mock_create_role)
     roles.add(rolename=_username, database_id=_database_id, password=_password, login=True, request=request)
 
 
@@ -154,6 +154,6 @@ def mock_get_current_role(conn):
                 }
             ]
         }
-    monkeypatch.setattr(roles, 'connect', mock_connect)
-    monkeypatch.setattr(roles, 'get_current_role_from_db', mock_get_current_role)
+    monkeypatch.setattr(roles.base, 'connect', mock_connect)
+    monkeypatch.setattr(roles.base, 'get_current_role_from_db', mock_get_current_role)
     roles.get_current_role(database_id=_database_id, request=request)

From e8003dc03a525e5ba562af22c5452ed18c147729 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 29 Aug 2024 15:11:17 +0800
Subject: [PATCH 0775/1141] fix namespaced db module tests

---
 mathesar/tests/rpc/test_database_privileges.py |  8 ++++----
 mathesar/tests/rpc/test_database_setup.py      | 13 ++++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/mathesar/tests/rpc/test_database_privileges.py b/mathesar/tests/rpc/test_database_privileges.py
index 688a254990..3e904f5513 100644
--- a/mathesar/tests/rpc/test_database_privileges.py
+++ b/mathesar/tests/rpc/test_database_privileges.py
@@ -7,7 +7,7 @@
 """
 from contextlib import contextmanager
 
-from mathesar.rpc import database_privileges
+from mathesar.rpc.databases import privileges
 from mathesar.models.users import User
 
 
@@ -37,9 +37,9 @@ def mock_replace_privileges(
             raise AssertionError('incorrect parameters passed')
         return _privileges + [{"role_oid": 67890, "direct": ["CONNECT", "TEMPORARY"]}]
 
-    monkeypatch.setattr(database_privileges, 'connect', mock_connect)
+    monkeypatch.setattr(privileges, 'connect', mock_connect)
     monkeypatch.setattr(
-        database_privileges,
+        privileges,
         'replace_database_privileges_for_roles',
         mock_replace_privileges
     )
@@ -47,7 +47,7 @@ def mock_replace_privileges(
         {"role_oid": 12345, "direct": ["CONNECT"]},
         {"role_oid": 67890, "direct": ["CONNECT", "TEMPORARY"]}
     ]
-    actual_response = database_privileges.replace_for_roles(
+    actual_response = privileges.replace_for_roles(
         privileges=_privileges, database_id=_database_id, request=request
     )
     assert actual_response == expect_response
diff --git a/mathesar/tests/rpc/test_database_setup.py b/mathesar/tests/rpc/test_database_setup.py
index be7c6ac15d..c1a20f1a24 100644
--- a/mathesar/tests/rpc/test_database_setup.py
+++ b/mathesar/tests/rpc/test_database_setup.py
@@ -7,7 +7,10 @@
 """
 from mathesar.models.users import User
 from mathesar.models.base import Database, ConfiguredRole, Server, UserDatabaseRoleMap
-from mathesar.rpc import database_setup, servers, configured_roles, databases
+from mathesar.rpc.databases import configured as configured_databases
+from mathesar.rpc.databases import setup as database_setup
+from mathesar.rpc.roles import configured as configured_roles
+from mathesar.rpc.servers import configured as configured_servers
 
 
 def test_create_new(monkeypatch, rf):
@@ -36,8 +39,8 @@ def mock_set_up_new_for_user(database, user, sample_data=[]):
         mock_set_up_new_for_user,
     )
     expect_response = database_setup.DatabaseConnectionResult(
-        server=servers.ServerInfo.from_model(server_model),
-        database=databases.DatabaseInfo.from_model(db_model),
+        server=configured_servers.ServerInfo.from_model(server_model),
+        database=configured_databases.DatabaseInfo.from_model(db_model),
         configured_role=configured_roles.ConfiguredRoleInfo.from_model(role_model)
     )
 
@@ -83,8 +86,8 @@ def mock_set_up_preexisting_database_for_user(
         mock_set_up_preexisting_database_for_user,
     )
     expect_response = database_setup.DatabaseConnectionResult(
-        server=servers.ServerInfo.from_model(server_model),
-        database=databases.DatabaseInfo.from_model(db_model),
+        server=configured_servers.ServerInfo.from_model(server_model),
+        database=configured_databases.DatabaseInfo.from_model(db_model),
         configured_role=configured_roles.ConfiguredRoleInfo.from_model(role_model)
     )
 

From 2feae908f88a8066feac261224f6faa574511b8d Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 29 Aug 2024 15:15:12 +0800
Subject: [PATCH 0776/1141] fix schema and table submodule tests

---
 mathesar/tests/rpc/test_schema_privileges.py | 2 +-
 mathesar/tests/rpc/test_table_privileges.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mathesar/tests/rpc/test_schema_privileges.py b/mathesar/tests/rpc/test_schema_privileges.py
index 23b2ff9f48..8a934afc00 100644
--- a/mathesar/tests/rpc/test_schema_privileges.py
+++ b/mathesar/tests/rpc/test_schema_privileges.py
@@ -7,7 +7,7 @@
 """
 from contextlib import contextmanager
 
-from mathesar.rpc import schema_privileges
+from mathesar.rpc.schemas import privileges as schema_privileges
 from mathesar.models.users import User
 
 
diff --git a/mathesar/tests/rpc/test_table_privileges.py b/mathesar/tests/rpc/test_table_privileges.py
index 29f784902a..bbd190b83b 100644
--- a/mathesar/tests/rpc/test_table_privileges.py
+++ b/mathesar/tests/rpc/test_table_privileges.py
@@ -7,7 +7,7 @@
 """
 from contextlib import contextmanager
 
-from mathesar.rpc import table_privileges
+from mathesar.rpc.tables import privileges as table_privileges
 from mathesar.models.users import User
 
 

From 1ac4b60157cd311c1b4052f706d4a4ccac438667 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 29 Aug 2024 15:32:50 +0800
Subject: [PATCH 0777/1141] update docs to match new namespacing

---
 docs/docs/api/rpc.md | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 63ccc9150d..7938546c3c 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -48,17 +48,6 @@ To use an RPC function:
       - set_role
       - CollaboratorInfo
 
-## ConfiguredRoles
-
-::: configured_roles
-    options:
-      members:
-      - list_
-      - add
-      - delete
-      - set_password
-      - ConfiguredRoleInfo
-
 ## Connections
 
 ::: connections
@@ -72,6 +61,14 @@ To use an RPC function:
 ## Databases
 
 ::: databases
+    options:
+      members:
+      - get
+      - CurrentDBPrivileges
+
+## Configured Databases
+
+::: databases.configured
     options:
       members:
       - list_
@@ -79,18 +76,16 @@ To use an RPC function:
 
 ## Database Privileges
 
-::: database_privileges
+::: databases.privileges
     options:
       members:
       - list_direct
-      - get_owner_oid_and_curr_role_db_priv
       - replace_for_roles
       - DBPrivileges
-      - CurrentDBPrivileges
 
 ## Database Setup
 
-::: database_setup
+::: databases.setup
     options:
       members:
       - create_new
@@ -111,7 +106,7 @@ To use an RPC function:
 
 ## Schema Privileges
 
-::: schema_privileges
+::: schemas.privileges
     options:
       members:
       - list_direct
@@ -138,7 +133,7 @@ To use an RPC function:
 
 ## Table Privileges
 
-::: table_privileges
+::: tables.privileges
     options:
       members:
       - list_direct
@@ -255,6 +250,17 @@ To use an RPC function:
       - RoleInfo
       - RoleMember
 
+## Configured Roles
+
+::: roles.configured
+    options:
+      members:
+      - list_
+      - add
+      - delete
+      - set_password
+      - ConfiguredRoleInfo
+
 ## Servers
 
 ::: servers

From 9aa29e7d4988ae6ee7f17541d774eec08f9bded6 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 29 Aug 2024 15:45:02 +0800
Subject: [PATCH 0778/1141] change DatabaseInfo to ConfiguredDatabaseInfo

---
 docs/docs/api/rpc.md                      | 2 +-
 mathesar/rpc/databases/configured.py      | 6 +++---
 mathesar/rpc/databases/setup.py           | 6 +++---
 mathesar/tests/rpc/test_database_setup.py | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 7938546c3c..4a0af96f10 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -72,7 +72,7 @@ To use an RPC function:
     options:
       members:
       - list_
-      - DatabaseInfo
+      - ConfiguredDatabaseInfo
 
 ## Database Privileges
 
diff --git a/mathesar/rpc/databases/configured.py b/mathesar/rpc/databases/configured.py
index d37e2cd732..f22ca281e3 100644
--- a/mathesar/rpc/databases/configured.py
+++ b/mathesar/rpc/databases/configured.py
@@ -7,7 +7,7 @@
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 
 
-class DatabaseInfo(TypedDict):
+class ConfiguredDatabaseInfo(TypedDict):
     """
     Information about a database.
 
@@ -32,7 +32,7 @@ def from_model(cls, model):
 @rpc_method(name="databases.configured.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def list_(*, server_id: int = None, **kwargs) -> list[DatabaseInfo]:
+def list_(*, server_id: int = None, **kwargs) -> list[ConfiguredDatabaseInfo]:
     """
     List information about databases for a server. Exposed as `list`.
 
@@ -49,4 +49,4 @@ def list_(*, server_id: int = None, **kwargs) -> list[DatabaseInfo]:
     else:
         database_qs = Database.objects.all()
 
-    return [DatabaseInfo.from_model(db_model) for db_model in database_qs]
+    return [ConfiguredDatabaseInfo.from_model(db_model) for db_model in database_qs]
diff --git a/mathesar/rpc/databases/setup.py b/mathesar/rpc/databases/setup.py
index 92f61dfa66..52b9a296ab 100644
--- a/mathesar/rpc/databases/setup.py
+++ b/mathesar/rpc/databases/setup.py
@@ -9,7 +9,7 @@
 from mathesar.utils import permissions
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.servers.configured import ServerInfo
-from mathesar.rpc.databases.configured import DatabaseInfo
+from mathesar.rpc.databases.configured import ConfiguredDatabaseInfo
 from mathesar.rpc.roles.configured import ConfiguredRoleInfo
 
 
@@ -26,14 +26,14 @@ class DatabaseConnectionResult(TypedDict):
         configured_role: Information on the ConfiguredRole model instance.
     """
     server: ServerInfo
-    database: DatabaseInfo
+    database: ConfiguredDatabaseInfo
     configured_role: ConfiguredRoleInfo
 
     @classmethod
     def from_model(cls, model):
         return cls(
             server=ServerInfo.from_model(model.server),
-            database=DatabaseInfo.from_model(model.database),
+            database=ConfiguredDatabaseInfo.from_model(model.database),
             configured_role=ConfiguredRoleInfo.from_model(model.configured_role),
         )
 
diff --git a/mathesar/tests/rpc/test_database_setup.py b/mathesar/tests/rpc/test_database_setup.py
index c1a20f1a24..68a6c9c7b5 100644
--- a/mathesar/tests/rpc/test_database_setup.py
+++ b/mathesar/tests/rpc/test_database_setup.py
@@ -40,7 +40,7 @@ def mock_set_up_new_for_user(database, user, sample_data=[]):
     )
     expect_response = database_setup.DatabaseConnectionResult(
         server=configured_servers.ServerInfo.from_model(server_model),
-        database=configured_databases.DatabaseInfo.from_model(db_model),
+        database=configured_databases.ConfiguredDatabaseInfo.from_model(db_model),
         configured_role=configured_roles.ConfiguredRoleInfo.from_model(role_model)
     )
 
@@ -87,7 +87,7 @@ def mock_set_up_preexisting_database_for_user(
     )
     expect_response = database_setup.DatabaseConnectionResult(
         server=configured_servers.ServerInfo.from_model(server_model),
-        database=configured_databases.DatabaseInfo.from_model(db_model),
+        database=configured_databases.ConfiguredDatabaseInfo.from_model(db_model),
         configured_role=configured_roles.ConfiguredRoleInfo.from_model(role_model)
     )
 

From 46aa8c5504b97c9bcf678219b5cec366230e9888 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 29 Aug 2024 15:51:11 +0800
Subject: [PATCH 0779/1141] change ServerInfo to ConfiguredServerInfo

---
 docs/docs/api/rpc.md                      | 2 +-
 mathesar/rpc/databases/setup.py           | 6 +++---
 mathesar/rpc/servers/configured.py        | 6 +++---
 mathesar/tests/rpc/test_database_setup.py | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 4a0af96f10..f585a0fb99 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -267,7 +267,7 @@ To use an RPC function:
     options:
       members:
       - list_
-      - ServerInfo
+      - ConfiguredServerInfo
 
 ## Data Modeling
 
diff --git a/mathesar/rpc/databases/setup.py b/mathesar/rpc/databases/setup.py
index 52b9a296ab..d423d3438e 100644
--- a/mathesar/rpc/databases/setup.py
+++ b/mathesar/rpc/databases/setup.py
@@ -8,7 +8,7 @@
 
 from mathesar.utils import permissions
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
-from mathesar.rpc.servers.configured import ServerInfo
+from mathesar.rpc.servers.configured import ConfiguredServerInfo
 from mathesar.rpc.databases.configured import ConfiguredDatabaseInfo
 from mathesar.rpc.roles.configured import ConfiguredRoleInfo
 
@@ -25,14 +25,14 @@ class DatabaseConnectionResult(TypedDict):
         database: Information on the Database model instance.
         configured_role: Information on the ConfiguredRole model instance.
     """
-    server: ServerInfo
+    server: ConfiguredServerInfo
     database: ConfiguredDatabaseInfo
     configured_role: ConfiguredRoleInfo
 
     @classmethod
     def from_model(cls, model):
         return cls(
-            server=ServerInfo.from_model(model.server),
+            server=ConfiguredServerInfo.from_model(model.server),
             database=ConfiguredDatabaseInfo.from_model(model.database),
             configured_role=ConfiguredRoleInfo.from_model(model.configured_role),
         )
diff --git a/mathesar/rpc/servers/configured.py b/mathesar/rpc/servers/configured.py
index a85845a15e..0d488966d6 100644
--- a/mathesar/rpc/servers/configured.py
+++ b/mathesar/rpc/servers/configured.py
@@ -7,7 +7,7 @@
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 
 
-class ServerInfo(TypedDict):
+class ConfiguredServerInfo(TypedDict):
     """
     Information about a database server.
 
@@ -32,7 +32,7 @@ def from_model(cls, model):
 @rpc_method(name="servers.configured.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def list_() -> list[ServerInfo]:
+def list_() -> list[ConfiguredServerInfo]:
     """
     List information about servers. Exposed as `list`.
 
@@ -41,4 +41,4 @@ def list_() -> list[ServerInfo]:
     """
     server_qs = Server.objects.all()
 
-    return [ServerInfo.from_model(db_model) for db_model in server_qs]
+    return [ConfiguredServerInfo.from_model(db_model) for db_model in server_qs]
diff --git a/mathesar/tests/rpc/test_database_setup.py b/mathesar/tests/rpc/test_database_setup.py
index 68a6c9c7b5..83263fe237 100644
--- a/mathesar/tests/rpc/test_database_setup.py
+++ b/mathesar/tests/rpc/test_database_setup.py
@@ -39,7 +39,7 @@ def mock_set_up_new_for_user(database, user, sample_data=[]):
         mock_set_up_new_for_user,
     )
     expect_response = database_setup.DatabaseConnectionResult(
-        server=configured_servers.ServerInfo.from_model(server_model),
+        server=configured_servers.ConfiguredServerInfo.from_model(server_model),
         database=configured_databases.ConfiguredDatabaseInfo.from_model(db_model),
         configured_role=configured_roles.ConfiguredRoleInfo.from_model(role_model)
     )
@@ -86,7 +86,7 @@ def mock_set_up_preexisting_database_for_user(
         mock_set_up_preexisting_database_for_user,
     )
     expect_response = database_setup.DatabaseConnectionResult(
-        server=configured_servers.ServerInfo.from_model(server_model),
+        server=configured_servers.ConfiguredServerInfo.from_model(server_model),
         database=configured_databases.ConfiguredDatabaseInfo.from_model(db_model),
         configured_role=configured_roles.ConfiguredRoleInfo.from_model(role_model)
     )

From f821adc44562dbb6eba3a1ae55afac9403ae37b0 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 29 Aug 2024 16:20:35 +0800
Subject: [PATCH 0780/1141] remove unneeded param from list_db_priv

---
 db/roles/operations/select.py        | 4 ++--
 db/sql/00_msar.sql                   | 7 ++++---
 mathesar/rpc/databases/privileges.py | 3 +--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/db/roles/operations/select.py b/db/roles/operations/select.py
index 49e05e5eeb..6e5ab208e2 100644
--- a/db/roles/operations/select.py
+++ b/db/roles/operations/select.py
@@ -9,8 +9,8 @@ def get_current_role_from_db(conn):
     return exec_msar_func(conn, 'get_current_role').fetchone()[0]
 
 
-def list_db_priv(db_name, conn):
-    return exec_msar_func(conn, 'list_db_priv', db_name).fetchone()[0]
+def list_db_priv(conn):
+    return exec_msar_func(conn, 'list_db_priv').fetchone()[0]
 
 
 def list_schema_privileges(schema_oid, conn):
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 5f7d33f653..52c67e6011 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1118,7 +1118,7 @@ AND role_data.name != current_role;
 $$ LANGUAGE SQL STABLE;
 
 
-CREATE OR REPLACE FUNCTION msar.list_db_priv(db_name text) RETURNS jsonb AS $$/*
+CREATE OR REPLACE FUNCTION msar.list_db_priv() RETURNS jsonb AS $$/*
 Given a database name, returns a json array of objects with database privileges for non-inherited roles.
 
 Each returned JSON object in the array has the form:
@@ -1137,7 +1137,8 @@ WITH priv_cte AS (
     pg_catalog.pg_roles AS pgr,
     pg_catalog.pg_database AS pgd,
     aclexplode(COALESCE(pgd.datacl, acldefault('d', pgd.datdba))) AS acl
-  WHERE pgd.datname = db_name AND pgr.oid = acl.grantee AND pgr.rolname NOT LIKE 'pg_%'
+  WHERE pgd.datname = pg_catalog.current_database()
+    AND pgr.oid = acl.grantee AND pgr.rolname NOT LIKE 'pg_%'
   GROUP BY pgr.oid, pgd.oid
 )
 SELECT COALESCE(jsonb_agg(priv_cte.p), '[]'::jsonb) FROM priv_cte;
@@ -1292,7 +1293,7 @@ EXECUTE string_agg(
   E';\n'
 ) || ';'
 FROM jsonb_to_recordset(priv_spec) AS x(role_oid regrole, direct jsonb);
-RETURN msar.list_db_priv(current_database());
+RETURN msar.list_db_priv();
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
diff --git a/mathesar/rpc/databases/privileges.py b/mathesar/rpc/databases/privileges.py
index 265284e345..ae5993bf7e 100644
--- a/mathesar/rpc/databases/privileges.py
+++ b/mathesar/rpc/databases/privileges.py
@@ -44,8 +44,7 @@ def list_direct(*, database_id: int, **kwargs) -> list[DBPrivileges]:
     """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
-        db_name = Database.objects.get(id=database_id).name
-        raw_db_priv = list_db_priv(db_name, conn)
+        raw_db_priv = list_db_priv(conn)
     return [DBPrivileges.from_dict(i) for i in raw_db_priv]
 
 

From ec6274843d199e89150d018a0487473d6128063d Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 29 Aug 2024 16:36:03 +0800
Subject: [PATCH 0781/1141] modify database getter to conform with other
 functions

---
 db/databases/__init__.py            |  0
 db/databases/operations/__init__.py |  0
 db/databases/operations/select.py   |  5 +++++
 db/roles/operations/select.py       |  9 ---------
 mathesar/rpc/databases/base.py      | 22 ++++++++++++++--------
 5 files changed, 19 insertions(+), 17 deletions(-)
 create mode 100644 db/databases/__init__.py
 create mode 100644 db/databases/operations/__init__.py
 create mode 100644 db/databases/operations/select.py

diff --git a/db/databases/__init__.py b/db/databases/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/db/databases/operations/__init__.py b/db/databases/operations/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/db/databases/operations/select.py b/db/databases/operations/select.py
new file mode 100644
index 0000000000..d95b1e8f75
--- /dev/null
+++ b/db/databases/operations/select.py
@@ -0,0 +1,5 @@
+from db.connection import exec_msar_func
+
+
+def get_database(conn):
+    return exec_msar_func(conn, 'get_current_database_info').fetchone()[0]
diff --git a/db/roles/operations/select.py b/db/roles/operations/select.py
index 6e5ab208e2..daffc31550 100644
--- a/db/roles/operations/select.py
+++ b/db/roles/operations/select.py
@@ -19,12 +19,3 @@ def list_schema_privileges(schema_oid, conn):
 
 def list_table_privileges(table_oid, conn):
     return exec_msar_func(conn, 'list_table_privileges', table_oid).fetchone()[0]
-
-
-def get_curr_role_db_priv(conn):
-    db_info = exec_msar_func(conn, 'get_current_database_info').fetchone()[0]
-    return {
-        "owner_oid": db_info["owner_oid"],
-        "current_role_priv": db_info["current_role_priv"],
-        "current_role_owns": db_info["current_role_owns"],
-    }
diff --git a/mathesar/rpc/databases/base.py b/mathesar/rpc/databases/base.py
index 42c8415559..da2968a447 100644
--- a/mathesar/rpc/databases/base.py
+++ b/mathesar/rpc/databases/base.py
@@ -4,19 +4,23 @@
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from mathesar.rpc.utils import connect
-from db.roles.operations.select import get_curr_role_db_priv
+from db.databases.operations.select import get_database
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 
 
-class CurrentDBPrivileges(TypedDict):
+class DatabaseInfo(TypedDict):
     """
-    Information about database privileges for current user.
+    Information about a database current user privileges on it.
 
     Attributes:
+        oid: The `oid` of the database on the server.
+        name: The name of the database on the server.
         owner_oid: The `oid` of the owner of the database.
         current_role_priv: A list of privileges available to the user.
         current_role_owns: Whether the user is an owner of the database.
     """
+    oid: int
+    name: str
     owner_oid: int
     current_role_priv: list[Literal['CONNECT', 'CREATE', 'TEMPORARY']]
     current_role_owns: bool
@@ -24,6 +28,8 @@ class CurrentDBPrivileges(TypedDict):
     @classmethod
     def from_dict(cls, d):
         return cls(
+            oid=d["oid"],
+            name=d["name"],
             owner_oid=d["owner_oid"],
             current_role_priv=d["current_role_priv"],
             current_role_owns=d["current_role_owns"]
@@ -33,17 +39,17 @@ def from_dict(cls, d):
 @rpc_method(name="databases.get")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def get(*, database_id: int, **kwargs) -> CurrentDBPrivileges:
+def get(*, database_id: int, **kwargs) -> DatabaseInfo:
     """
-    Get database privileges for the current user.
+    Get information about a database.
 
     Args:
         database_id: The Django id of the database.
 
     Returns:
-        A dict describing current user's database privilege.
+        Information about the database, and the current user privileges.
     """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
-        curr_role_db_priv = get_curr_role_db_priv(conn)
-    return CurrentDBPrivileges.from_dict(curr_role_db_priv)
+        db_info = get_database(conn)
+    return DatabaseInfo.from_dict(db_info)

From d0f1340bf52e8b87091dbc2415e26746429c31cc Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 29 Aug 2024 16:45:14 +0800
Subject: [PATCH 0782/1141] update docs with new class name

---
 docs/docs/api/rpc.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index f585a0fb99..2a9567210a 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -64,7 +64,7 @@ To use an RPC function:
     options:
       members:
       - get
-      - CurrentDBPrivileges
+      - DatabaseInfo
 
 ## Configured Databases
 

From f35c62b1df683ebf91f9d06884e8759ab8368361 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 29 Aug 2024 16:47:37 +0800
Subject: [PATCH 0783/1141] satisfy the linter

---
 mathesar/rpc/databases/privileges.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mathesar/rpc/databases/privileges.py b/mathesar/rpc/databases/privileges.py
index ae5993bf7e..98d1aada2f 100644
--- a/mathesar/rpc/databases/privileges.py
+++ b/mathesar/rpc/databases/privileges.py
@@ -6,7 +6,6 @@
 from db.roles.operations.select import list_db_priv
 from db.roles.operations.update import replace_database_privileges_for_roles
 from mathesar.rpc.utils import connect
-from mathesar.models.base import Database
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 
 

From 01f7b4e229630061111078bf7f87a1577d79d3c8 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 29 Aug 2024 18:20:44 +0530
Subject: [PATCH 0784/1141] Move configured_roles to roles.configured

---
 mathesar_ui/src/api/rpc/collaborators.ts    |  2 +-
 mathesar_ui/src/api/rpc/configured_roles.ts | 43 ---------------------
 mathesar_ui/src/api/rpc/database_setup.ts   |  2 +-
 mathesar_ui/src/api/rpc/index.ts            |  2 -
 mathesar_ui/src/api/rpc/roles.ts            | 40 +++++++++++++++++++
 mathesar_ui/src/models/ConfiguredRole.ts    |  6 +--
 mathesar_ui/src/models/Database.ts          |  2 +-
 mathesar_ui/src/models/Role.ts              |  2 +-
 8 files changed, 47 insertions(+), 52 deletions(-)
 delete mode 100644 mathesar_ui/src/api/rpc/configured_roles.ts

diff --git a/mathesar_ui/src/api/rpc/collaborators.ts b/mathesar_ui/src/api/rpc/collaborators.ts
index 5c89d2829f..d9b07786ba 100644
--- a/mathesar_ui/src/api/rpc/collaborators.ts
+++ b/mathesar_ui/src/api/rpc/collaborators.ts
@@ -1,7 +1,7 @@
 import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
 
-import type { RawConfiguredRole } from './configured_roles';
 import type { RawDatabase } from './databases';
+import type { RawConfiguredRole } from './roles';
 
 export interface RawCollaborator {
   id: number;
diff --git a/mathesar_ui/src/api/rpc/configured_roles.ts b/mathesar_ui/src/api/rpc/configured_roles.ts
deleted file mode 100644
index bb30bae9ec..0000000000
--- a/mathesar_ui/src/api/rpc/configured_roles.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
-
-import type { RawServer } from './servers';
-
-export interface RawConfiguredRole {
-  id: number;
-  server_id: RawServer['id'];
-  name: string;
-}
-
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export const configured_roles = {
-  list: rpcMethodTypeContainer<
-    {
-      server_id: RawConfiguredRole['server_id'];
-    },
-    Array<RawConfiguredRole>
-  >(),
-
-  add: rpcMethodTypeContainer<
-    {
-      server_id: RawConfiguredRole['server_id'];
-      name: RawConfiguredRole['name'];
-      password: string;
-    },
-    RawConfiguredRole
-  >(),
-
-  delete: rpcMethodTypeContainer<
-    {
-      configured_role_id: RawConfiguredRole['id'];
-    },
-    void
-  >(),
-
-  set_password: rpcMethodTypeContainer<
-    {
-      configured_role_id: RawConfiguredRole['id'];
-      password: string;
-    },
-    void
-  >(),
-};
diff --git a/mathesar_ui/src/api/rpc/database_setup.ts b/mathesar_ui/src/api/rpc/database_setup.ts
index 81c5a0f93b..97524c477a 100644
--- a/mathesar_ui/src/api/rpc/database_setup.ts
+++ b/mathesar_ui/src/api/rpc/database_setup.ts
@@ -1,7 +1,7 @@
 import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
 
-import type { RawConfiguredRole } from './configured_roles';
 import type { RawDatabase } from './databases';
+import type { RawConfiguredRole } from './roles';
 import type { RawServer } from './servers';
 
 export const sampleDataOptions = [
diff --git a/mathesar_ui/src/api/rpc/index.ts b/mathesar_ui/src/api/rpc/index.ts
index a48b958e06..628207f507 100644
--- a/mathesar_ui/src/api/rpc/index.ts
+++ b/mathesar_ui/src/api/rpc/index.ts
@@ -4,7 +4,6 @@ import { buildRpcApi } from '@mathesar/packages/json-rpc-client-builder';
 
 import { collaborators } from './collaborators';
 import { columns } from './columns';
-import { configured_roles } from './configured_roles';
 import { constraints } from './constraints';
 import { database_setup } from './database_setup';
 import { databases } from './databases';
@@ -20,7 +19,6 @@ export const api = buildRpcApi({
   getHeaders: () => ({ 'X-CSRFToken': Cookies.get('csrftoken') }),
   methodTree: {
     collaborators,
-    configured_roles,
     database_setup,
     databases,
     records,
diff --git a/mathesar_ui/src/api/rpc/roles.ts b/mathesar_ui/src/api/rpc/roles.ts
index 82bbb2366c..4db5252a03 100644
--- a/mathesar_ui/src/api/rpc/roles.ts
+++ b/mathesar_ui/src/api/rpc/roles.ts
@@ -1,6 +1,7 @@
 import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
 
 import type { RawDatabase } from './databases';
+import type { RawServer } from './servers';
 
 export interface RawRoleMember {
   oid: number;
@@ -19,6 +20,12 @@ export interface RawRole {
   members?: RawRoleMember[];
 }
 
+export interface RawConfiguredRole {
+  id: number;
+  server_id: RawServer['id'];
+  name: string;
+}
+
 export const roles = {
   list: rpcMethodTypeContainer<
     {
@@ -53,4 +60,37 @@ export const roles = {
     },
     void
   >(),
+
+  configured: {
+    list: rpcMethodTypeContainer<
+      {
+        server_id: RawConfiguredRole['server_id'];
+      },
+      Array<RawConfiguredRole>
+    >(),
+
+    add: rpcMethodTypeContainer<
+      {
+        server_id: RawConfiguredRole['server_id'];
+        name: RawConfiguredRole['name'];
+        password: string;
+      },
+      RawConfiguredRole
+    >(),
+
+    delete: rpcMethodTypeContainer<
+      {
+        configured_role_id: RawConfiguredRole['id'];
+      },
+      void
+    >(),
+
+    set_password: rpcMethodTypeContainer<
+      {
+        configured_role_id: RawConfiguredRole['id'];
+        password: string;
+      },
+      void
+    >(),
+  },
 };
diff --git a/mathesar_ui/src/models/ConfiguredRole.ts b/mathesar_ui/src/models/ConfiguredRole.ts
index 3ebfaf5a46..b581dde208 100644
--- a/mathesar_ui/src/models/ConfiguredRole.ts
+++ b/mathesar_ui/src/models/ConfiguredRole.ts
@@ -1,5 +1,5 @@
 import { api } from '@mathesar/api/rpc';
-import type { RawConfiguredRole } from '@mathesar/api/rpc/configured_roles';
+import type { RawConfiguredRole } from '@mathesar/api/rpc/roles';
 
 import type { Database } from './Database';
 
@@ -20,7 +20,7 @@ export class ConfiguredRole {
   }
 
   setPassword(password: string) {
-    return api.configured_roles
+    return api.roles.configured
       .set_password({
         configured_role_id: this.id,
         password,
@@ -29,6 +29,6 @@ export class ConfiguredRole {
   }
 
   delete() {
-    return api.configured_roles.delete({ configured_role_id: this.id }).run();
+    return api.roles.configured.delete({ configured_role_id: this.id }).run();
   }
 }
diff --git a/mathesar_ui/src/models/Database.ts b/mathesar_ui/src/models/Database.ts
index be35d9b2e9..ccc0dbe1e1 100644
--- a/mathesar_ui/src/models/Database.ts
+++ b/mathesar_ui/src/models/Database.ts
@@ -26,7 +26,7 @@ export class Database {
   }
 
   constructConfiguredRolesStore() {
-    return new AsyncRpcApiStore(api.configured_roles.list, {
+    return new AsyncRpcApiStore(api.roles.configured.list, {
       postProcess: (rawConfiguredRoles) =>
         new SortedImmutableMap(
           (v) => [...v].sort(([, a], [, b]) => a.name.localeCompare(b.name)),
diff --git a/mathesar_ui/src/models/Role.ts b/mathesar_ui/src/models/Role.ts
index 97ebbe432f..80397c58a3 100644
--- a/mathesar_ui/src/models/Role.ts
+++ b/mathesar_ui/src/models/Role.ts
@@ -54,7 +54,7 @@ export class Role {
   }
 
   configure(password: string): CancellablePromise<ConfiguredRole> {
-    const promise = api.configured_roles
+    const promise = api.roles.configured
       .add({
         server_id: this.database.server.id,
         name: this.name,

From ebfce9ae135b515cc79dbcf508fe810dbf9bfada Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 29 Aug 2024 18:26:51 +0530
Subject: [PATCH 0785/1141] Update namespaces for servers,
 databases.configured, and databases.setup

---
 mathesar_ui/src/api/rpc/database_setup.ts     | 41 ----------------
 mathesar_ui/src/api/rpc/databases.ts          | 48 ++++++++++++++++---
 mathesar_ui/src/api/rpc/index.ts              |  2 -
 mathesar_ui/src/api/rpc/servers.ts            |  4 +-
 mathesar_ui/src/stores/databases.ts           |  8 ++--
 .../InstallationSchemaSelector.svelte         |  2 +-
 .../create-database/createDatabaseUtils.ts    |  2 +-
 7 files changed, 51 insertions(+), 56 deletions(-)
 delete mode 100644 mathesar_ui/src/api/rpc/database_setup.ts

diff --git a/mathesar_ui/src/api/rpc/database_setup.ts b/mathesar_ui/src/api/rpc/database_setup.ts
deleted file mode 100644
index 97524c477a..0000000000
--- a/mathesar_ui/src/api/rpc/database_setup.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
-
-import type { RawDatabase } from './databases';
-import type { RawConfiguredRole } from './roles';
-import type { RawServer } from './servers';
-
-export const sampleDataOptions = [
-  'library_management',
-  'movie_collection',
-] as const;
-
-export type SampleDataSchemaIdentifier = (typeof sampleDataOptions)[number];
-
-export interface DatabaseConnectionResult {
-  server: RawServer;
-  database: RawDatabase;
-  configured_role: RawConfiguredRole;
-}
-
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export const database_setup = {
-  create_new: rpcMethodTypeContainer<
-    {
-      database: RawDatabase['name'];
-      sample_data?: SampleDataSchemaIdentifier[];
-    },
-    DatabaseConnectionResult
-  >(),
-
-  connect_existing: rpcMethodTypeContainer<
-    {
-      host: RawServer['host'];
-      port: RawServer['port'];
-      database: RawDatabase['name'];
-      role: RawConfiguredRole['name'];
-      password: string;
-      sample_data?: SampleDataSchemaIdentifier[];
-    },
-    DatabaseConnectionResult
-  >(),
-};
diff --git a/mathesar_ui/src/api/rpc/databases.ts b/mathesar_ui/src/api/rpc/databases.ts
index 10e9a11628..488e335d93 100644
--- a/mathesar_ui/src/api/rpc/databases.ts
+++ b/mathesar_ui/src/api/rpc/databases.ts
@@ -1,5 +1,6 @@
 import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
 
+import type { RawConfiguredRole } from './roles';
 import type { RawServer } from './servers';
 
 export interface RawDatabase {
@@ -8,11 +9,46 @@ export interface RawDatabase {
   server_id: RawServer['id'];
 }
 
+export const sampleDataOptions = [
+  'library_management',
+  'movie_collection',
+] as const;
+
+export type SampleDataSchemaIdentifier = (typeof sampleDataOptions)[number];
+
+export interface DatabaseConnectionResult {
+  server: RawServer;
+  database: RawDatabase;
+  configured_role: RawConfiguredRole;
+}
+
 export const databases = {
-  list: rpcMethodTypeContainer<
-    {
-      server_id?: RawDatabase['server_id'];
-    },
-    Array<RawDatabase>
-  >(),
+  configured: {
+    list: rpcMethodTypeContainer<
+      {
+        server_id?: RawDatabase['server_id'];
+      },
+      Array<RawDatabase>
+    >(),
+  },
+  setup: {
+    create_new: rpcMethodTypeContainer<
+      {
+        database: RawDatabase['name'];
+        sample_data?: SampleDataSchemaIdentifier[];
+      },
+      DatabaseConnectionResult
+    >(),
+    connect_existing: rpcMethodTypeContainer<
+      {
+        host: RawServer['host'];
+        port: RawServer['port'];
+        database: RawDatabase['name'];
+        role: RawConfiguredRole['name'];
+        password: string;
+        sample_data?: SampleDataSchemaIdentifier[];
+      },
+      DatabaseConnectionResult
+    >(),
+  },
 };
diff --git a/mathesar_ui/src/api/rpc/index.ts b/mathesar_ui/src/api/rpc/index.ts
index 628207f507..f1dd6a8533 100644
--- a/mathesar_ui/src/api/rpc/index.ts
+++ b/mathesar_ui/src/api/rpc/index.ts
@@ -5,7 +5,6 @@ import { buildRpcApi } from '@mathesar/packages/json-rpc-client-builder';
 import { collaborators } from './collaborators';
 import { columns } from './columns';
 import { constraints } from './constraints';
-import { database_setup } from './database_setup';
 import { databases } from './databases';
 import { records } from './records';
 import { roles } from './roles';
@@ -19,7 +18,6 @@ export const api = buildRpcApi({
   getHeaders: () => ({ 'X-CSRFToken': Cookies.get('csrftoken') }),
   methodTree: {
     collaborators,
-    database_setup,
     databases,
     records,
     roles,
diff --git a/mathesar_ui/src/api/rpc/servers.ts b/mathesar_ui/src/api/rpc/servers.ts
index f92a29bebb..1a1253def4 100644
--- a/mathesar_ui/src/api/rpc/servers.ts
+++ b/mathesar_ui/src/api/rpc/servers.ts
@@ -7,5 +7,7 @@ export interface RawServer {
 }
 
 export const servers = {
-  list: rpcMethodTypeContainer<void, Array<RawServer>>(),
+  configured: {
+    list: rpcMethodTypeContainer<void, Array<RawServer>>(),
+  },
 };
diff --git a/mathesar_ui/src/stores/databases.ts b/mathesar_ui/src/stores/databases.ts
index 574262215a..bcd58a8434 100644
--- a/mathesar_ui/src/stores/databases.ts
+++ b/mathesar_ui/src/stores/databases.ts
@@ -74,9 +74,9 @@ class DatabasesStore {
   }
 
   async connectExistingDatabase(
-    props: Parameters<typeof api.database_setup.connect_existing>[0],
+    props: Parameters<typeof api.databases.setup.connect_existing>[0],
   ) {
-    const { database, server } = await api.database_setup
+    const { database, server } = await api.databases.setup
       .connect_existing(props)
       .run();
     const connectedDatabase = new Database({
@@ -88,9 +88,9 @@ class DatabasesStore {
   }
 
   async createNewDatabase(
-    props: Parameters<typeof api.database_setup.create_new>[0],
+    props: Parameters<typeof api.databases.setup.create_new>[0],
   ) {
-    const { database, server } = await api.database_setup
+    const { database, server } = await api.databases.setup
       .create_new(props)
       .run();
     const connectedDatabase = new Database({
diff --git a/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte b/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte
index 276a3cf05c..618a66d1a0 100644
--- a/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte
@@ -4,7 +4,7 @@
   import {
     type SampleDataSchemaIdentifier,
     sampleDataOptions,
-  } from '@mathesar/api/rpc/database_setup';
+  } from '@mathesar/api/rpc/databases';
   import type { RequiredField } from '@mathesar/components/form/field';
   import { CheckboxGroup } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/systems/databases/create-database/createDatabaseUtils.ts b/mathesar_ui/src/systems/databases/create-database/createDatabaseUtils.ts
index 8e38255a37..94be6c5774 100644
--- a/mathesar_ui/src/systems/databases/create-database/createDatabaseUtils.ts
+++ b/mathesar_ui/src/systems/databases/create-database/createDatabaseUtils.ts
@@ -1,7 +1,7 @@
 import {
   type SampleDataSchemaIdentifier,
   sampleDataOptions,
-} from '@mathesar/api/rpc/database_setup';
+} from '@mathesar/api/rpc/databases';
 
 export type InstallationSchema = SampleDataSchemaIdentifier | 'internal';
 

From 83413ce6c282607615030127631026f5487e675a Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 29 Aug 2024 14:46:51 -0400
Subject: [PATCH 0786/1141] Hard-code abstract types response in client

---
 mathesar_ui/src/AppTypes.ts                   |   7 -
 .../AbstractTypeSelector.svelte               |   4 +-
 .../cell-fabric/data-types/utils.ts           |   6 +-
 .../pages/exploration/ExplorationPage.svelte  |   4 +-
 .../preview/ImportPreviewContent.svelte       |   4 +-
 .../src/pages/record/RecordPage.svelte        |   4 +-
 .../src/pages/record/TableWidget.svelte       |   3 +-
 mathesar_ui/src/pages/table/TablePage.svelte  |   3 +-
 .../src/routes/DataExplorerRoute.svelte       |   4 +-
 .../abstract-types/abstractTypeCategories.ts  |  10 --
 .../stores/abstract-types/abstractTypesMap.ts |  89 ++++++++++++
 .../src/stores/abstract-types/index.ts        |   2 +-
 .../src/stores/abstract-types/store.ts        | 127 ------------------
 .../src/stores/abstract-types/types.ts        |   6 -
 .../RecordSelectorWindow.svelte               |   4 +-
 .../constraints/NewFkConstraint.svelte        |   4 +-
 .../new-column-cell/ColumnTypeSelector.svelte |  12 +-
 .../FkRecordSummaryConfig.svelte              |   3 +-
 mathesar_ui/src/utils/columnUtils.ts          |   9 +-
 mathesar_ui/src/utils/preloadData.ts          |   2 -
 20 files changed, 114 insertions(+), 193 deletions(-)
 create mode 100644 mathesar_ui/src/stores/abstract-types/abstractTypesMap.ts
 delete mode 100644 mathesar_ui/src/stores/abstract-types/store.ts

diff --git a/mathesar_ui/src/AppTypes.ts b/mathesar_ui/src/AppTypes.ts
index 5a12d255e0..5fdce9a6d8 100644
--- a/mathesar_ui/src/AppTypes.ts
+++ b/mathesar_ui/src/AppTypes.ts
@@ -15,10 +15,3 @@ export interface FilterConfiguration {
     };
   }[];
 }
-
-export interface AbstractTypeResponse {
-  name: string;
-  identifier: string;
-  db_types: DbType[];
-  filters?: FilterConfiguration;
-}
diff --git a/mathesar_ui/src/components/abstract-type-control/AbstractTypeSelector.svelte b/mathesar_ui/src/components/abstract-type-control/AbstractTypeSelector.svelte
index 1bd153be53..a71c0932d8 100644
--- a/mathesar_ui/src/components/abstract-type-control/AbstractTypeSelector.svelte
+++ b/mathesar_ui/src/components/abstract-type-control/AbstractTypeSelector.svelte
@@ -4,7 +4,7 @@
 
   import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
   import {
-    currentDbAbstractTypes,
+    abstractTypesMap,
     getAllowedAbstractTypesForDbTypeAndItsTargetTypes,
   } from '@mathesar/stores/abstract-types';
   import type { AbstractType } from '@mathesar/stores/abstract-types/types';
@@ -35,7 +35,7 @@
     // column.valid_target_types ?? [],
     [],
 
-    $currentDbAbstractTypes.data,
+    abstractTypesMap,
   ).filter((item) => !['jsonlist', 'map'].includes(item.identifier));
 
   function selectAbstractType(
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/utils.ts b/mathesar_ui/src/components/cell-fabric/data-types/utils.ts
index 0266834589..944edc35cc 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/utils.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/utils.ts
@@ -1,8 +1,6 @@
-import { get } from 'svelte/store';
-
 import type { DbType } from '@mathesar/AppTypes';
 import {
-  currentDbAbstractTypes,
+  abstractTypesMap,
   getAbstractTypeForDbType,
 } from '@mathesar/stores/abstract-types';
 import type { CellInfo } from '@mathesar/stores/abstract-types/types';
@@ -10,7 +8,7 @@ import type { CellInfo } from '@mathesar/stores/abstract-types/types';
 export function getCellInfo(dbType: DbType): CellInfo | undefined {
   const abstractTypeOfColumn = getAbstractTypeForDbType(
     dbType,
-    get(currentDbAbstractTypes)?.data,
+    abstractTypesMap,
   );
   return abstractTypeOfColumn?.cellInfo;
 }
diff --git a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
index fd103a1cee..501472fdd4 100644
--- a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
+++ b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
@@ -7,7 +7,7 @@
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import type { Database } from '@mathesar/models/Database';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
-  import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
+  import { abstractTypesMap } from '@mathesar/stores/abstract-types';
   import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
   import {
     ExplorationResult,
@@ -42,7 +42,7 @@
 
   let context: 'shared-consumer-page' | 'page' = 'page';
   $: context = shareConsumer ? 'shared-consumer-page' : 'page';
-  $: createQueryRunner(query, $currentDbAbstractTypes.data);
+  $: createQueryRunner(query, abstractTypesMap);
 
   function gotoSchemaPage() {
     router.goto(getSchemaPageUrl(database.id, schema.oid));
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index cab3b75235..4b3ea04dd5 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -24,7 +24,7 @@
     getSchemaPageUrl,
     getTablePageUrl,
   } from '@mathesar/routes/urls';
-  import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
+  import { abstractTypesMap } from '@mathesar/stores/abstract-types';
   import AsyncStore from '@mathesar/stores/AsyncStore';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { currentTables } from '@mathesar/stores/tables';
@@ -103,7 +103,7 @@
   $: records = $previewRequest.resolvedValue?.records ?? getSkeletonRecords();
   $: formInputsAreDisabled = !$previewRequest.isOk;
   $: canProceed = $previewRequest.isOk && $form.canSubmit;
-  $: processedColumns = processColumns(columns, $currentDbAbstractTypes.data);
+  $: processedColumns = processColumns(columns, abstractTypesMap);
 
   async function init() {
     const columnsResponse = await columnsFetch.run({
diff --git a/mathesar_ui/src/pages/record/RecordPage.svelte b/mathesar_ui/src/pages/record/RecordPage.svelte
index 073447100a..8770fc0244 100644
--- a/mathesar_ui/src/pages/record/RecordPage.svelte
+++ b/mathesar_ui/src/pages/record/RecordPage.svelte
@@ -2,7 +2,7 @@
   import type { Table } from '@mathesar/api/rpc/tables';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
-  import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
+  import { abstractTypesMap } from '@mathesar/stores/abstract-types';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { TableStructure } from '@mathesar/stores/table-data';
   import { displayRecordSummaryAsPlainText } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
@@ -18,7 +18,7 @@
   $: tableStructure = new TableStructure({
     database: $currentDatabase,
     table,
-    abstractTypesMap: $currentDbAbstractTypes.data,
+    abstractTypesMap,
   });
   $: tableStructureIsLoading = tableStructure.isLoading;
   $: recordStoreFetchRequest = record.fetchRequest;
diff --git a/mathesar_ui/src/pages/record/TableWidget.svelte b/mathesar_ui/src/pages/record/TableWidget.svelte
index 9388c362ab..664732dcbd 100644
--- a/mathesar_ui/src/pages/record/TableWidget.svelte
+++ b/mathesar_ui/src/pages/record/TableWidget.svelte
@@ -2,7 +2,7 @@
   import type { Column } from '@mathesar/api/rpc/columns';
   import type { Table } from '@mathesar/api/rpc/tables';
   import TableName from '@mathesar/components/TableName.svelte';
-  import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
+  import { abstractTypesMap } from '@mathesar/stores/abstract-types';
   import { currentDatabase } from '@mathesar/stores/databases';
   import {
     Meta,
@@ -26,7 +26,6 @@
   export let table: Table;
   export let fkColumn: Pick<Column, 'id' | 'name'>;
 
-  $: abstractTypesMap = $currentDbAbstractTypes.data;
   $: tabularData = new TabularData({
     database: $currentDatabase,
     table,
diff --git a/mathesar_ui/src/pages/table/TablePage.svelte b/mathesar_ui/src/pages/table/TablePage.svelte
index 865735b000..a5502a0b6f 100644
--- a/mathesar_ui/src/pages/table/TablePage.svelte
+++ b/mathesar_ui/src/pages/table/TablePage.svelte
@@ -6,7 +6,7 @@
   import { focusActiveCell } from '@mathesar/components/sheet/utils';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
-  import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
+  import { abstractTypesMap } from '@mathesar/stores/abstract-types';
   import { currentDatabase } from '@mathesar/stores/databases';
   import {
     Meta,
@@ -33,7 +33,6 @@
 
   let sheetElement: HTMLElement;
 
-  $: abstractTypesMap = $currentDbAbstractTypes.data;
   $: ({ query } = $router);
   $: meta = Meta.fromSerialization(query[metaSerializationQueryKey] ?? '');
   $: tabularData = new TabularData({
diff --git a/mathesar_ui/src/routes/DataExplorerRoute.svelte b/mathesar_ui/src/routes/DataExplorerRoute.svelte
index d1bc8bcc33..bdbcf4c53c 100644
--- a/mathesar_ui/src/routes/DataExplorerRoute.svelte
+++ b/mathesar_ui/src/routes/DataExplorerRoute.svelte
@@ -15,7 +15,7 @@
     getDataExplorerPageUrl,
     getExplorationEditorPageUrl,
   } from '@mathesar/routes/urls';
-  import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
+  import { abstractTypesMap } from '@mathesar/stores/abstract-types';
   import type { UnsavedQueryInstance } from '@mathesar/stores/queries';
   import { getQuery } from '@mathesar/stores/queries';
   import {
@@ -38,7 +38,7 @@
     queryManager?.destroy();
     queryManager = new QueryManager({
       query: new QueryModel(queryInstance),
-      abstractTypeMap: $currentDbAbstractTypes.data,
+      abstractTypeMap: abstractTypesMap,
       onSave: async (instance) => {
         try {
           const url = getExplorationEditorPageUrl(
diff --git a/mathesar_ui/src/stores/abstract-types/abstractTypeCategories.ts b/mathesar_ui/src/stores/abstract-types/abstractTypeCategories.ts
index 04f492de3b..68817bf3c3 100644
--- a/mathesar_ui/src/stores/abstract-types/abstractTypeCategories.ts
+++ b/mathesar_ui/src/stores/abstract-types/abstractTypeCategories.ts
@@ -63,16 +63,6 @@ export function constructAbstractTypeMapFromResponse(
   > & { factory: AbstractTypeConfigurationFactory })[] = [];
 
   abstractTypesResponse.forEach((entry) => {
-    if (entry.identifier === 'other') {
-      /**
-       * Ignore "Other" type sent in response.
-       * This is a failsafe to ensure that the frontend does not
-       * break when the "Other" type does not contain db_types which
-       * are either the type or valid_target_type for any column.
-       */
-      return;
-    }
-
     const partialAbstractType = {
       identifier: entry.identifier,
       name: entry.name,
diff --git a/mathesar_ui/src/stores/abstract-types/abstractTypesMap.ts b/mathesar_ui/src/stores/abstract-types/abstractTypesMap.ts
new file mode 100644
index 0000000000..a38f74810d
--- /dev/null
+++ b/mathesar_ui/src/stores/abstract-types/abstractTypesMap.ts
@@ -0,0 +1,89 @@
+import { constructAbstractTypeMapFromResponse } from './abstractTypeCategories';
+import type { AbstractTypeResponse } from './types';
+
+/**
+ * This is called "Response" because we originally designed the types
+ * architecture to be client-server oriented. But later we decided to hard-code
+ * this data in the front end.
+ */
+const typesResponse: AbstractTypeResponse[] = [
+  {
+    identifier: 'boolean',
+    name: 'Boolean',
+    db_types: ['boolean'],
+  },
+  {
+    identifier: 'date',
+    name: 'Date',
+    db_types: ['date'],
+  },
+  {
+    identifier: 'time',
+    name: 'Time',
+    db_types: ['time with time zone', 'time without time zone'],
+  },
+  {
+    identifier: 'datetime',
+    name: 'Date & Time',
+    db_types: ['timestamp with time zone', 'timestamp without time zone'],
+  },
+  {
+    identifier: 'duration',
+    name: 'Duration',
+    db_types: ['interval'],
+  },
+  {
+    identifier: 'email',
+    name: 'Email',
+    db_types: ['mathesar_types.email'],
+  },
+  {
+    identifier: 'money',
+    name: 'Money',
+    db_types: [
+      'mathesar_types.multicurrency_money',
+      'mathesar_types.mathesar_money',
+      'money',
+    ],
+  },
+  {
+    identifier: 'number',
+    name: 'Number',
+    db_types: [
+      'double precision',
+      'real',
+      'smallint',
+      'bigint',
+      'integer',
+      'numeric',
+    ],
+  },
+  {
+    identifier: 'text',
+    name: 'Text',
+    db_types: ['text', 'character', '"char"', 'name', 'character varying'],
+  },
+  {
+    identifier: 'uri',
+    name: 'URI',
+    db_types: ['mathesar_types.uri'],
+  },
+  {
+    identifier: 'jsonlist',
+    name: 'JSON List',
+    db_types: ['mathesar_types.mathesar_json_array'],
+  },
+  {
+    identifier: 'map',
+    name: 'Map',
+    db_types: ['mathesar_types.mathesar_json_object'],
+  },
+  {
+    identifier: 'array',
+    name: 'Array',
+    db_types: ['_array'],
+  },
+];
+
+export const abstractTypesMap =
+  constructAbstractTypeMapFromResponse(typesResponse);
diff --git a/mathesar_ui/src/stores/abstract-types/index.ts b/mathesar_ui/src/stores/abstract-types/index.ts
index 36478a84f1..4cc26e1b2b 100644
--- a/mathesar_ui/src/stores/abstract-types/index.ts
+++ b/mathesar_ui/src/stores/abstract-types/index.ts
@@ -5,7 +5,7 @@ export {
   getDefaultDbTypeOfAbstractType,
 } from './abstractTypeCategories';
 export { getAbstractTypeForDbType } from './utils';
-export { currentDbAbstractTypes, refetchTypesForDb } from './store';
+export { abstractTypesMap } from './abstractTypesMap';
 export {
   filterDefinitionMap,
   getEqualityFiltersForAbstractType,
diff --git a/mathesar_ui/src/stores/abstract-types/store.ts b/mathesar_ui/src/stores/abstract-types/store.ts
deleted file mode 100644
index 3a58807aa8..0000000000
--- a/mathesar_ui/src/stores/abstract-types/store.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import type { Readable, Unsubscriber, Writable } from 'svelte/store';
-import { derived, get, writable } from 'svelte/store';
-
-import { States, getAPI } from '@mathesar/api/rest/utils/requestUtils';
-import type { Database } from '@mathesar/models/Database';
-import { databasesStore } from '@mathesar/stores/databases';
-import { preloadCommonData } from '@mathesar/utils/preloadData';
-import type { CancellablePromise } from '@mathesar-component-library';
-
-import { constructAbstractTypeMapFromResponse } from './abstractTypeCategories';
-import type {
-  AbstractTypeResponse,
-  AbstractTypesMap,
-  AbstractTypesSubstance,
-} from './types';
-
-const commonData = preloadCommonData();
-const { currentDatabase } = databasesStore;
-
-const databasesToAbstractTypesStoreMap: Map<
-  Database['id'],
-  Writable<AbstractTypesSubstance>
-> = new Map();
-const abstractTypesRequestMap: Map<
-  Database['id'],
-  CancellablePromise<AbstractTypeResponse[]>
-> = new Map();
-
-export async function refetchTypesForDb(
-  databaseId: Database['id'],
-): Promise<AbstractTypesMap | undefined> {
-  const store = databasesToAbstractTypesStoreMap.get(databaseId);
-  if (!store) {
-    console.error(`DB Types store for db: ${databaseId} not found.`);
-    return undefined;
-  }
-
-  try {
-    store.update((currentData) => ({
-      ...currentData,
-      state: States.Loading,
-    }));
-
-    abstractTypesRequestMap.get(databaseId)?.cancel();
-
-    const typesRequest = getAPI<AbstractTypeResponse[]>(
-      `/api/ui/v0/connections/${databaseId}/types/`,
-    );
-    abstractTypesRequestMap.set(databaseId, typesRequest);
-    const response = await typesRequest;
-
-    const abstractTypesMap = constructAbstractTypeMapFromResponse(response);
-
-    store.update((currentData) => ({
-      ...currentData,
-      state: States.Done,
-      data: abstractTypesMap,
-    }));
-
-    return abstractTypesMap;
-  } catch (err) {
-    store.update((currentData) => ({
-      ...currentData,
-      state: States.Error,
-      error: err instanceof Error ? err.message : 'Error in fetching schemas',
-    }));
-    return undefined;
-  }
-}
-
-/**
- * TODO: Find a better way to preload data instead of using this variable.
- * Each store needs to be able to use the common data and preloading is
- * specific to each of them and not common.
- */
-let preload = true;
-
-function getTypesForDatabase(
-  database: Database,
-): Writable<AbstractTypesSubstance> {
-  let store = databasesToAbstractTypesStoreMap.get(database.id);
-  if (!store) {
-    store = writable({
-      state: States.Loading,
-      data: new Map(),
-    });
-    databasesToAbstractTypesStoreMap.set(database.id, store);
-
-    if (preload && commonData.current_database === database.id) {
-      store.update((currentData) => ({
-        ...currentData,
-        state: States.Done,
-        // @ts-ignore: https://github.com/centerofci/mathesar/issues/1055
-        data: constructAbstractTypeMapFromResponse(commonData.abstract_types),
-      }));
-    } else {
-      void refetchTypesForDb(database.id);
-    }
-    preload = false;
-  } else if (get(store).error) {
-    void refetchTypesForDb(database.id);
-  }
-  return store;
-}
-
-export const currentDbAbstractTypes: Readable<AbstractTypesSubstance> = derived(
-  currentDatabase,
-  ($currentDatabase, set) => {
-    let unsubscribe: Unsubscriber;
-
-    if (!$currentDatabase) {
-      set({
-        state: States.Done,
-        data: new Map(),
-      });
-    } else {
-      const store = getTypesForDatabase($currentDatabase);
-      unsubscribe = store.subscribe((typesData) => {
-        set(typesData);
-      });
-    }
-
-    return () => {
-      unsubscribe?.();
-    };
-  },
-);
diff --git a/mathesar_ui/src/stores/abstract-types/types.ts b/mathesar_ui/src/stores/abstract-types/types.ts
index 0d96333b22..3c00223dff 100644
--- a/mathesar_ui/src/stores/abstract-types/types.ts
+++ b/mathesar_ui/src/stores/abstract-types/types.ts
@@ -92,12 +92,6 @@ export type AbstractTypeConfigurationFactory = (
   map: AbstractTypesMap,
 ) => AbstractTypeConfiguration;
 
-export interface AbstractTypesSubstance {
-  state: States;
-  data: AbstractTypesMap;
-  error?: string;
-}
-
 /**
  * These filter ids represent the filter functions used for the _old_ filtering
  * system (circa 2023). The UI is still designed around these filter functions
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
index cd98a1e086..ca84d00e6c 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
@@ -3,7 +3,7 @@
 
   import { RichText } from '@mathesar/components/rich-text';
   import TableName from '@mathesar/components/TableName.svelte';
-  import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
+  import { abstractTypesMap } from '@mathesar/stores/abstract-types';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { Meta, TabularData } from '@mathesar/stores/table-data';
   import { currentTablesMap } from '@mathesar/stores/tables';
@@ -36,7 +36,7 @@
     $tableId && table
       ? new TabularData({
           database: $currentDatabase,
-          abstractTypesMap: $currentDbAbstractTypes.data,
+          abstractTypesMap,
           meta: new Meta({ pagination: new Pagination({ size: 10 }) }),
           hasEnhancedPrimaryKeyCell: false,
           table,
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
index 9f478ce067..3e00bd9762 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
@@ -15,7 +15,7 @@
   import SelectProcessedColumn from '@mathesar/components/SelectProcessedColumn.svelte';
   import SelectTable from '@mathesar/components/SelectTable.svelte';
   import TableName from '@mathesar/components/TableName.svelte';
-  import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
+  import { abstractTypesMap } from '@mathesar/stores/abstract-types';
   import { currentDatabase } from '@mathesar/stores/databases';
   import {
     type ProcessedColumn,
@@ -81,7 +81,7 @@
     ? new TableStructure({
         database: $currentDatabase,
         table: $targetTable,
-        abstractTypesMap: $currentDbAbstractTypes.data,
+        abstractTypesMap,
       })
     : undefined;
   $: targetTableStructureIsLoading = ensureReadable(
diff --git a/mathesar_ui/src/systems/table-view/header/new-column-cell/ColumnTypeSelector.svelte b/mathesar_ui/src/systems/table-view/header/new-column-cell/ColumnTypeSelector.svelte
index 5fb14722fe..c99c0cc021 100644
--- a/mathesar_ui/src/systems/table-view/header/new-column-cell/ColumnTypeSelector.svelte
+++ b/mathesar_ui/src/systems/table-view/header/new-column-cell/ColumnTypeSelector.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
   import {
-    currentDbAbstractTypes,
+    abstractTypesMap,
     defaultDbType,
     getAbstractTypeForDbType,
     getAllowedAbstractTypesForNewColumn,
@@ -12,14 +12,8 @@
   export let value = defaultDbType;
   export let disabled = false;
 
-  $: abstractType = getAbstractTypeForDbType(
-    value,
-    $currentDbAbstractTypes.data,
-  );
-
-  $: options = getAllowedAbstractTypesForNewColumn(
-    $currentDbAbstractTypes.data,
-  );
+  $: abstractType = getAbstractTypeForDbType(value, abstractTypesMap);
+  $: options = getAllowedAbstractTypesForNewColumn(abstractTypesMap);
 </script>
 
 <SelectionList
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
index 3b9a85190f..dcf0dd5ee4 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import type { Table } from '@mathesar/api/rpc/tables';
-  import { currentDbAbstractTypes } from '@mathesar/stores/abstract-types';
+  import { abstractTypesMap } from '@mathesar/stores/abstract-types';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { Meta, TabularData } from '@mathesar/stores/table-data';
   import RecordSummaryConfig from '@mathesar/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte';
@@ -8,7 +8,6 @@
 
   export let table: Table;
 
-  $: abstractTypesMap = $currentDbAbstractTypes.data;
   $: tabularData = new TabularData({
     database: $currentDatabase,
     table,
diff --git a/mathesar_ui/src/utils/columnUtils.ts b/mathesar_ui/src/utils/columnUtils.ts
index 00fd0eb8df..f51843ee21 100644
--- a/mathesar_ui/src/utils/columnUtils.ts
+++ b/mathesar_ui/src/utils/columnUtils.ts
@@ -1,11 +1,9 @@
-import { get } from 'svelte/store';
-
 import type { Table } from '@mathesar/api/rpc/tables';
 import type { DisplayColumn } from '@mathesar/components/column/types';
 import { type ValidationFn, uniqueWith } from '@mathesar/components/form';
 import { iconConstraint, iconTableLink } from '@mathesar/icons';
 import {
-  currentDbAbstractTypes,
+  abstractTypesMap,
   getAbstractTypeForDbType,
 } from '@mathesar/stores/abstract-types';
 import type { ProcessedColumn } from '@mathesar/stores/table-data';
@@ -25,10 +23,7 @@ export function getColumnIconProps(
     return iconTableLink;
   }
 
-  return getAbstractTypeForDbType(
-    _column.type,
-    get(currentDbAbstractTypes)?.data,
-  ).getIcon({
+  return getAbstractTypeForDbType(_column.type, abstractTypesMap).getIcon({
     dbType: _column.type,
     typeOptions: _column.type_options,
   });
diff --git a/mathesar_ui/src/utils/preloadData.ts b/mathesar_ui/src/utils/preloadData.ts
index 167c0d8bd0..e9373c091a 100644
--- a/mathesar_ui/src/utils/preloadData.ts
+++ b/mathesar_ui/src/utils/preloadData.ts
@@ -4,7 +4,6 @@ import type { RawDatabase } from '@mathesar/api/rpc/databases';
 import type { Schema } from '@mathesar/api/rpc/schemas';
 import type { RawServer } from '@mathesar/api/rpc/servers';
 import type { Table } from '@mathesar/api/rpc/tables';
-import type { AbstractTypeResponse } from '@mathesar/AppTypes';
 
 export interface CommonData {
   databases: RawDatabase[];
@@ -21,7 +20,6 @@ export interface CommonData {
     user: string;
   };
   current_schema: number | null;
-  abstract_types: AbstractTypeResponse[];
   user: User;
   current_release_tag_name: string;
   supported_languages: Record<string, string>;

From f64f23b6226f11f07a62b83ed7ee7b6332642a5f Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 30 Aug 2024 17:08:29 +0530
Subject: [PATCH 0787/1141] change response structure for record summary

---
 db/sql/00_msar.sql      |  6 +++---
 db/sql/test_00_msar.sql | 36 ++++++++++++++++++------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 2fb08a9fe8..c3f953750f 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -4126,7 +4126,7 @@ SELECT ', ' || string_agg(
   format(
     $c$summary_cte_%1$s AS (
       SELECT
-        msar.format_data(%2$I) AS key,
+        msar.format_data(%2$I) AS fkey,
         %3$s AS summary
       FROM %4$I.%5$I
     )$c$,
@@ -4153,7 +4153,7 @@ WITH fkey_map_cte AS (SELECT * FROM msar.get_fkey_map_cte(tab_id))
 SELECT string_agg(
   format(
     $j$
-    LEFT JOIN summary_cte_%1$s ON %2$I.%1$I = summary_cte_%1$s.key$j$,
+    LEFT JOIN summary_cte_%1$s ON %2$I.%1$I = summary_cte_%1$s.fkey$j$,
     conkey,
     cte_name
   ), ' '
@@ -4174,7 +4174,7 @@ SELECT 'jsonb_build_object(' || string_agg(
   format(
     $j$
     %1$L, jsonb_agg(
-      DISTINCT jsonb_build_object('key', summary_cte_%1$s.key, 'summary', summary_cte_%1$s.summary)
+      DISTINCT jsonb_build_object(summary_cte_%1$s.fkey, summary_cte_%1$s.summary)
     )
     $j$,
     conkey
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index aa891db25c..53b65c84bf 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -4265,13 +4265,13 @@ BEGIN
       "grouping": null,
       "preview_data": {
         "2": [
-          {"key": 1.234, "summary": "Alice Alison"},
-          {"key": 2.345, "summary": "Bob Bobinson"}
+          {"1.234": "Alice Alison"},
+          {"2.345": "Bob Bobinson"}
         ],
         "3": [
-          {"key": 1, "summary": "Carol Carlson"},
-          {"key": 2, "summary": "Dave Davidson"},
-          {"key": 3, "summary": "Eve Evilson"}
+          {"1": "Carol Carlson"},
+          {"2": "Dave Davidson"},
+          {"3": "Eve Evilson"}
         ]
       }
     }$j$ || jsonb_build_object(
@@ -4302,12 +4302,12 @@ BEGIN
       "grouping": null,
       "preview_data": {
         "2": [
-          {"key": 1.234, "summary": "Alice Alison"},
-          {"key": 2.345, "summary": "Bob Bobinson"}
+          {"1.234": "Alice Alison"},
+          {"2.345": "Bob Bobinson"}
         ],
         "3": [
-          {"key": 1, "summary": "Carol Carlson"},
-          {"key": 2, "summary": "Dave Davidson"}
+          {"1": "Carol Carlson"},
+          {"2": "Dave Davidson"}
         ]
       }
     }$j$ || jsonb_build_object(
@@ -4341,11 +4341,11 @@ BEGIN
       },
       "preview_data": {
         "2": [
-          {"key": 1.234, "summary": "Alice Alison"}
+          {"1.234": "Alice Alison"}
         ],
         "3": [
-          {"key": 1, "summary": "Carol Carlson"},
-          {"key": 2, "summary": "Dave Davidson"}
+          {"1": "Carol Carlson"},
+          {"2": "Dave Davidson"}
         ]
       }
     }$j$ || jsonb_build_object(
@@ -4374,8 +4374,8 @@ BEGIN
         {"1": 7, "2": 2.345, "3": 1, "4": "Larry Laurelson", "5": 70, "6": "llaurelson@example.edu"}
       ],
       "preview_data": {
-        "2": [{"key": 2.345, "summary": "Bob Bobinson"}],
-        "3": [{"key": 1, "summary": "Carol Carlson"}]
+        "2": [{"2.345": "Bob Bobinson"}],
+        "3": [{"1": "Carol Carlson"}]
       }
     }$a$
   );
@@ -4397,8 +4397,8 @@ BEGIN
         {"1": 2, "2": 2.345, "3": 2, "4": "Gabby Gabberson", "5": 85, "6": "ggabberson@example.edu"}
       ],
       "preview_data": {
-        "2": [{"key": 2.345, "summary": "Bob Bobinson"}],
-        "3": [{"key": 2, "summary": "Dave Davidson"}]
+        "2": [{"2.345": "Bob Bobinson"}],
+        "3": [{"2": "Dave Davidson"}]
       }
     }$a$
   );
@@ -4416,8 +4416,8 @@ BEGIN
       2
     ) -> 'preview_data',
     $a${
-      "2": [{"key": 1.234, "summary": "Alice Alison"}, {"key": 2.345, "summary": "Bob Bobinson"}],
-      "3": [{"key": 3, "summary": "Eve Evilson"}]
+      "2": [{"1.234": "Alice Alison"}, {"2.345": "Bob Bobinson"}],
+      "3": [{"3": "Eve Evilson"}]
     }$a$
   );
 END;

From b214094a7b45185196e72b7ce044340eddf0aec8 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 30 Aug 2024 23:43:49 +0530
Subject: [PATCH 0788/1141] concat multiple json objects

---
 db/sql/00_msar.sql      |  4 +--
 db/sql/test_00_msar.sql | 60 ++++++++++++++++++++---------------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index c3f953750f..4c00e785d8 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -4173,8 +4173,8 @@ WITH fkey_map_cte AS (SELECT * FROM msar.get_fkey_map_cte(tab_id))
 SELECT 'jsonb_build_object(' || string_agg(
   format(
     $j$
-    %1$L, jsonb_agg(
-      DISTINCT jsonb_build_object(summary_cte_%1$s.fkey, summary_cte_%1$s.summary)
+    %1$L, jsonb_object_agg(
+      summary_cte_%1$s.fkey, summary_cte_%1$s.summary
     )
     $j$,
     conkey
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 53b65c84bf..864bf1df08 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -4264,15 +4264,15 @@ BEGIN
       ],
       "grouping": null,
       "preview_data": {
-        "2": [
-          {"1.234": "Alice Alison"},
-          {"2.345": "Bob Bobinson"}
-        ],
-        "3": [
-          {"1": "Carol Carlson"},
-          {"2": "Dave Davidson"},
-          {"3": "Eve Evilson"}
-        ]
+        "2": {
+          "1.234": "Alice Alison",
+          "2.345": "Bob Bobinson"
+        },
+        "3": {
+          "1": "Carol Carlson",
+          "2": "Dave Davidson",
+          "3": "Eve Evilson"
+        }
       }
     }$j$ || jsonb_build_object(
       'query', concat(
@@ -4301,14 +4301,14 @@ BEGIN
       ],
       "grouping": null,
       "preview_data": {
-        "2": [
-          {"1.234": "Alice Alison"},
-          {"2.345": "Bob Bobinson"}
-        ],
-        "3": [
-          {"1": "Carol Carlson"},
-          {"2": "Dave Davidson"}
-        ]
+        "2": {
+          "1.234": "Alice Alison",
+          "2.345": "Bob Bobinson"
+        },
+        "3": {
+          "1": "Carol Carlson",
+          "2": "Dave Davidson"
+        }
       }
     }$j$ || jsonb_build_object(
       'query', concat(
@@ -4340,13 +4340,13 @@ BEGIN
         "groups": [{"id": 1, "count": 3, "results_eq": {"2": 1.234}, "result_indices": [0, 1]}]
       },
       "preview_data": {
-        "2": [
-          {"1.234": "Alice Alison"}
-        ],
-        "3": [
-          {"1": "Carol Carlson"},
-          {"2": "Dave Davidson"}
-        ]
+        "2": {
+          "1.234": "Alice Alison"
+        },
+        "3": {
+          "1": "Carol Carlson",
+          "2": "Dave Davidson"
+        }
       }
     }$j$ || jsonb_build_object(
       'query', concat(
@@ -4374,8 +4374,8 @@ BEGIN
         {"1": 7, "2": 2.345, "3": 1, "4": "Larry Laurelson", "5": 70, "6": "llaurelson@example.edu"}
       ],
       "preview_data": {
-        "2": [{"2.345": "Bob Bobinson"}],
-        "3": [{"1": "Carol Carlson"}]
+        "2": {"2.345": "Bob Bobinson"},
+        "3": {"1": "Carol Carlson"}
       }
     }$a$
   );
@@ -4397,8 +4397,8 @@ BEGIN
         {"1": 2, "2": 2.345, "3": 2, "4": "Gabby Gabberson", "5": 85, "6": "ggabberson@example.edu"}
       ],
       "preview_data": {
-        "2": [{"2.345": "Bob Bobinson"}],
-        "3": [{"2": "Dave Davidson"}]
+        "2": {"2.345": "Bob Bobinson"},
+        "3": {"2": "Dave Davidson"}
       }
     }$a$
   );
@@ -4416,8 +4416,8 @@ BEGIN
       2
     ) -> 'preview_data',
     $a${
-      "2": [{"1.234": "Alice Alison"}, {"2.345": "Bob Bobinson"}],
-      "3": [{"3": "Eve Evilson"}]
+      "2": {"1.234": "Alice Alison", "2.345": "Bob Bobinson"},
+      "3": {"3": "Eve Evilson"}
     }$a$
   );
 END;

From ddf5c33a67cdef3df4d072707b16d5827d30ab43 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Sat, 31 Aug 2024 00:19:53 +0530
Subject: [PATCH 0789/1141] change python mock tests to conform to new record
 summary response

---
 docs/docs/api/rpc.md               |  1 -
 mathesar/rpc/records.py            | 22 ++++++----------------
 mathesar/tests/rpc/test_records.py | 20 ++++++++++----------
 3 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 2a9567210a..fb6ec1742a 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -217,7 +217,6 @@ To use an RPC function:
       - Filter
       - FilterAttnum
       - FilterLiteral
-      - PreviewEntry
       - Grouping
       - Group
       - GroupingResponse
diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index 2239b0aab3..4c62ea48d6 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -127,18 +127,6 @@ class GroupingResponse(TypedDict):
     groups: list[Group]
 
 
-class PreviewEntry(TypedDict):
-    """
-    Preview entry object. Maps a foreign key to a text summary.
-
-    Attributes:
-        key: The foreign key value.
-        summary: The summary of the referenced record.
-    """
-    key: Any
-    summary: str
-
-
 class RecordList(TypedDict):
     """
     Records from a table, along with some meta data
@@ -152,12 +140,13 @@ class RecordList(TypedDict):
         count: The total number of records in the table.
         results: An array of record objects.
         grouping: Information for displaying grouped records.
-        preview_data: Information for previewing foreign key values.
+        preview_data: Information for previewing foreign key values,
+            provides a map of foreign key to a text summary.
     """
     count: int
     results: list[dict]
     grouping: GroupingResponse
-    preview_data: dict[str, list[PreviewEntry]]
+    preview_data: dict[str, dict[Any, str]]
 
     @classmethod
     def from_dict(cls, d):
@@ -181,10 +170,11 @@ class RecordAdded(TypedDict):
 
     Attributes:
         results: An array of a single record objects (the one added).
-        preview_data: Information for previewing foreign key values.
+        preview_data: Information for previewing foreign key values,
+            provides a map of foreign key to a text summary.
     """
     results: list[dict]
-    preview_data: dict[str, list[PreviewEntry]]
+    preview_data: dict[str, dict[Any, str]]
 
     @classmethod
     def from_dict(cls, d):
diff --git a/mathesar/tests/rpc/test_records.py b/mathesar/tests/rpc/test_records.py
index 7a9099a4df..1b90c7366e 100644
--- a/mathesar/tests/rpc/test_records.py
+++ b/mathesar/tests/rpc/test_records.py
@@ -50,7 +50,7 @@ def mock_list_records(
                     {"id": 3, "count": 8, "results_eq": {"1": "lsfj", "2": 3422}}
                 ]
             },
-            "preview_data": {"2": [{"key": 12345, "summary": "blkjdfslkj"}]},
+            "preview_data": {"2": {"12345": "blkjdfslkj"}}
         }
 
     monkeypatch.setattr(records, 'connect', mock_connect)
@@ -64,7 +64,7 @@ def mock_list_records(
                 {"id": 3, "count": 8, "results_eq": {"1": "lsfj", "2": 3422}}
             ]
         },
-        "preview_data": {"2": [{"key": 12345, "summary": "blkjdfslkj"}]},
+        "preview_data": {"2": {"12345": "blkjdfslkj"}},
         "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
     }
     actual_records_list = records.list_(
@@ -104,7 +104,7 @@ def mock_get_record(
             "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],
             "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
             "grouping": None,
-            "preview_data": {"2": [{"key": 12345, "summary": "blkjdfslkj"}]},
+            "preview_data": {"2": {"12345": "blkjdfslkj"}},
         }
 
     monkeypatch.setattr(records, 'connect', mock_connect)
@@ -113,7 +113,7 @@ def mock_get_record(
         "count": 1,
         "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],
         "grouping": None,
-        "preview_data": {"2": [{"key": 12345, "summary": "blkjdfslkj"}]},
+        "preview_data": {"2": {"12345": "blkjdfslkj"}},
         "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
     }
     actual_record = records.get(
@@ -150,14 +150,14 @@ def mock_add_record(
             raise AssertionError('incorrect parameters passed')
         return {
             "results": [_record_def],
-            "preview_data": {"2": [{"key": 12345, "summary": "blkjdfslkj"}]},
+            "preview_data": {"2": {"12345": "blkjdfslkj"}},
         }
 
     monkeypatch.setattr(records, 'connect', mock_connect)
     monkeypatch.setattr(records.record_insert, 'add_record_to_table', mock_add_record)
     expect_record = {
         "results": [record_def],
-        "preview_data": {"2": [{"key": 12345, "summary": "blkjdfslkj"}]},
+        "preview_data": {"2": {"12345": "blkjdfslkj"}},
     }
     actual_record = records.add(
         record_def=record_def, table_oid=table_oid, database_id=database_id, request=request
@@ -195,14 +195,14 @@ def mock_patch_record(
             raise AssertionError('incorrect parameters passed')
         return {
             "results": [_record_def | {"3": "another"}],
-            "preview_data": {"2": [{"key": 12345, "summary": "blkjdfslkj"}]},
+            "preview_data": {"2": {"12345": "blkjdfslkj"}},
         }
 
     monkeypatch.setattr(records, 'connect', mock_connect)
     monkeypatch.setattr(records.record_update, 'patch_record_in_table', mock_patch_record)
     expect_record = {
         "results": [record_def | {"3": "another"}],
-        "preview_data": {"2": [{"key": 12345, "summary": "blkjdfslkj"}]},
+        "preview_data": {"2": {"12345": "blkjdfslkj"}},
     }
     actual_record = records.patch(
         record_def=record_def,
@@ -280,7 +280,7 @@ def mock_search_records(
         return {
             "count": 50123,
             "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],
-            "preview_data": {"2": [{"key": 12345, "summary": "blkjdfslkj"}]},
+            "preview_data": {"2": {"12345": "blkjdfslkj"}},
             "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
         }
 
@@ -290,7 +290,7 @@ def mock_search_records(
         "count": 50123,
         "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],
         "grouping": None,
-        "preview_data": {"2": [{"key": 12345, "summary": "blkjdfslkj"}]},
+        "preview_data": {"2": {"12345": "blkjdfslkj"}},
         "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
     }
     actual_records_list = records.search(

From 977f1965eedbfc8829cb46276a4fb3a16cc4d235 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Mon, 2 Sep 2024 09:53:53 +0200
Subject: [PATCH 0790/1141] Update Create Link Modal

---
 .../labeled-input/LabeledInput.scss           |  2 +-
 .../components/message-boxes/InfoBox.svelte   |  3 +-
 mathesar_ui/src/i18n/languages/en/dict.json   |  4 +-
 .../link-table/LinkTableForm.svelte           | 79 +++++++++++++++----
 .../table-view/link-table/NewColumn.svelte    |  9 ++-
 5 files changed, 76 insertions(+), 21 deletions(-)

diff --git a/mathesar_ui/src/component-library/labeled-input/LabeledInput.scss b/mathesar_ui/src/component-library/labeled-input/LabeledInput.scss
index ced2535658..93d42c92ab 100644
--- a/mathesar_ui/src/component-library/labeled-input/LabeledInput.scss
+++ b/mathesar_ui/src/component-library/labeled-input/LabeledInput.scss
@@ -1,5 +1,5 @@
 .labeled-input {
-  --spacing-y-default: 0.4em;
+  --spacing-y-default: 0.25em;
   --spacing-x-default: 0.4em;
 
   .label {
diff --git a/mathesar_ui/src/components/message-boxes/InfoBox.svelte b/mathesar_ui/src/components/message-boxes/InfoBox.svelte
index 2fcffa1303..c5d5500d3b 100644
--- a/mathesar_ui/src/components/message-boxes/InfoBox.svelte
+++ b/mathesar_ui/src/components/message-boxes/InfoBox.svelte
@@ -6,10 +6,11 @@
   import MessageBox from './MessageBox.svelte';
 
   type $$Props = ComponentProps<MessageBox>;
+  export let fullWidth = true;
 </script>
 
 <div class="info-box">
-  <MessageBox icon={iconInfo} {...$$restProps}><slot /></MessageBox>
+  <MessageBox icon={iconInfo} {...$$restProps} fullWidth><slot /></MessageBox>
 </div>
 
 <style>
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 84049bfd43..2b5b6ef413 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -300,7 +300,7 @@
   "linked_via_foreign_key_column": "It is linked via a foreign key column",
   "linking_table": "Linking Table",
   "links": "Links",
-  "links_info": "Existing columns can be turned into links by adding foreign key constraints through the \"Advanced\" section of the table inspector.",
+  "links_info": "For existing columns, add foreign key constraints in the \"Advanced\" section to turn them into links",
   "loading": "Loading",
   "loading_release_data": "Loading release data",
   "loading_spinner_no_progress_bar": "You will see a loading spinner but no progress bar.",
@@ -627,7 +627,7 @@
   "via_column_component": "via [columnComponent]",
   "viewer": "Viewer",
   "we_can_install_new_version": "We can install this new version for you",
-  "we_will_add_a_column_in_x_to_y": "We'll add a column in [baseTable] which links to [targetTable].",
+  "we_will_add_a_column_in_x_to_y": "We'll add a column in [baseTable].",
   "we_will_add_two_columns_in_x_to_y": "We'll add two columns in [mappingTable] each linking to [targetTable].",
   "we_will_create_a_new_table": "We'll create a new table.",
   "welcome_to_mathesar_user": "Welcome to Mathesar, {user}!",
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index 8d8dcaa4a8..9fe24152cc 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -220,12 +220,13 @@
 </script>
 
 <div class="description">
-  Use Links to connect related tables in your database together.
+  Use links to connect related tables in your database, automatically setting up the necessary foreign key columns.
 </div>
 
 <div class="form" class:self-referential={isSelfReferential}>
+
   <FieldLayout>
-    <InfoBox>
+    <InfoBox fullWidth={true}>
       {$_('links_info')}
     </InfoBox>
   </FieldLayout>
@@ -258,43 +259,89 @@
     <FieldLayout>
       <OutcomeBox>
         {#if $linkType === 'oneToMany'}
+        
           <NewColumn
             base={target}
             target={base}
             field={columnNameInTarget}
             {targetColumnsAreLoading}
+
           />
         {:else if $linkType === 'manyToOne'}
+        
           <NewColumn {base} {target} field={columnNameInBase} />
         {:else if $linkType === 'manyToMany'}
           {#if isSelfReferential}
-            <p>{$_('we_will_create_a_new_table')}</p>
-            <Field field={mappingTableName} label={$_('table_name')} />
+          <p>
+            <RichText
+              text={'We will create a new table [mappingTable].'}
+              let:slotName
+            >
+              {#if slotName === 'mappingTable'}
+                <Pill table={{ name: $mappingTableName }} which="mapping" />
+              {:else if slotName === 'targetTable'}
+                <Pill table={target} which="target" />
+              {:else if slotName === 'baseTable'}
+                <Pill table={base} which="base" />
+              {/if}
+            </RichText>
+          </p>
+            <Field
+              field={mappingTableName}
+              label={'Name of New Table'}
+              layout="stacked"
+            >
+              <span slot="help">
+                The table that will store the many-to-many relationship between records of this table.
+              </span>
+            </Field>
+            {#if $mappingTableName}
+          
+              <Field
+                field={columnNameMappingToBase}
+                label={$_('Name of New Column {number}', { values: { number: 1 } })}
+                layout="stacked"
+              >
+                <span slot="help">
+                  The column in <Pill table={{ name: $mappingTableName }} which="mapping" /> that will link to <Pill table={base} which="base" />.
+                </span>
+              </Field>
+              <Field
+                field={columnNameMappingToTarget}
+                label={$_('Name of New Column {number}', { values: { number: 2 } })}
+                layout="stacked"
+              >
+                <span slot="help">
+                  The column in <Pill table={{ name: $mappingTableName }} which="mapping" /> that will link to <Pill table={target} which="target" />.
+                </span>
+              </Field>
+            {/if}
+          {:else}
             {#if $mappingTableName}
               <p>
                 <RichText
-                  text={$_('we_will_add_two_columns_in_x_to_y')}
+                  text={'We will create a new table [mappingTable].'}
                   let:slotName
                 >
                   {#if slotName === 'mappingTable'}
                     <Pill table={{ name: $mappingTableName }} which="mapping" />
                   {:else if slotName === 'targetTable'}
                     <Pill table={target} which="target" />
+                  {:else if slotName === 'baseTable'}
+                    <Pill table={base} which="base" />
                   {/if}
                 </RichText>
               </p>
-              <Field
-                field={columnNameMappingToBase}
-                label={$_('column_number_name', { values: { number: 1 } })}
-              />
-              <Field
-                field={columnNameMappingToTarget}
-                label={$_('column_number_name', { values: { number: 2 } })}
-              />
             {/if}
-          {:else}
-            <p>{$_('we_will_create_a_new_table')}</p>
-            <Field field={mappingTableName} label={$_('table_name')} />
+            <Field
+              field={mappingTableName}
+              label={'Name of New Table'}
+              layout="stacked"
+            >
+              <span slot="help">
+                The table that will store the many-to-many relationship between records of the two tables.
+              </span>
+            </Field>
             {#if $mappingTableName}
               <NewColumn
                 base={{ name: $mappingTableName }}
diff --git a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
index 962b28254a..7f390409ce 100644
--- a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
@@ -21,6 +21,7 @@
   export let targetColumnsAreLoading = false;
 </script>
 
+{#if baseWhich !== 'mapping'}
 <p>
   <RichText text={$_('we_will_add_a_column_in_x_to_y')} let:slotName>
     {#if slotName === 'baseTable'}
@@ -30,6 +31,8 @@
     {/if}
   </RichText>
 </p>
+{/if}
+
 {#if targetColumnsAreLoading}
   <!--
     We need to wait for the columns to load because we can't suggest a valid
@@ -38,5 +41,9 @@
   {label}
   <Spinner />
 {:else}
-  <Field {field} {label} />
+  <Field {field} {label} layout="stacked" >
+    <span slot="help">
+      The column in <Pill table={base} which={baseWhich} /> that will link to the <Pill table={target} which={targetWhich} /> table.
+    </span>
+  </Field>
 {/if}

From 256f1d6b3061cac597bed0a58457da6684e324a1 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 2 Sep 2024 18:48:05 +0800
Subject: [PATCH 0791/1141] Add initial column moving logic

---
 db/sql/00_msar.sql | 176 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 176 insertions(+)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 5f7d33f653..dffbf8dd8c 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3748,6 +3748,182 @@ END;
 $f$ LANGUAGE plpgsql;
 
 
+----------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------------------------------------
+-- COLUMN MOVING FUNCTIONS
+--
+-- Functions to move columns between linked tables
+----------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------------------------------------
+
+CREATE OR REPLACE FUNCTION
+msar.build_all_columns_expr(tab_id regclass) RETURNS text AS $$/*
+*/
+SELECT string_agg(
+  format(
+    '%1$I.%2$I.%3$I AS %3$I',
+    msar.get_relation_schema_name(tab_id),
+    msar.get_relation_name(tab_id),
+    attname
+  ), ', '
+)
+FROM pg_catalog.pg_attribute
+WHERE
+  attrelid = tab_id
+  AND attnum > 0
+  AND NOT attisdropped;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.build_columns_expr(tab_id regclass, col_ids smallint[]) RETURNS text AS $$/*
+*/
+SELECT string_agg(
+  format(
+    '%1$I.%2$I.%3$I AS %3$I',
+    msar.get_relation_schema_name(tab_id),
+    msar.get_relation_name(tab_id),
+    attname
+  ), ', '
+)
+FROM pg_catalog.pg_attribute JOIN unnest(col_ids) x(a) ON attnum = x.a
+WHERE
+  attrelid = tab_id;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.build_unqualified_columns_expr(tab_id regclass, col_ids smallint[]) RETURNS text AS $$/*
+*/
+SELECT string_agg(format('%I', attname), ', ')
+FROM pg_catalog.pg_attribute JOIN unnest(col_ids) x(a) ON attnum = x.a
+WHERE
+  attrelid = tab_id;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.get_other_column_ids(tab_id regclass, col_ids smallint[]) RETURNS smallint[] AS $$
+SELECT array_agg(attnum)
+FROM pg_catalog.pg_attribute
+WHERE
+  attrelid = tab_id
+  AND attnum > 0
+  AND NOT attisdropped
+  AND attnum <> all(col_ids);
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION msar.build_source_update_move_cols_equal_expr(
+  source_tab_id regclass,
+  move_col_ids smallint[],
+  cte_name text
+) RETURNS text AS $$
+SELECT string_agg(
+  format(
+    '%1$I.%2$I.%3$I = %4$I.%3$I',
+    msar.get_relation_schema_name(source_tab_id),
+    msar.get_relation_name(source_tab_id),
+    attname,
+    cte_name
+  ), ' AND '
+)
+FROM pg_catalog.pg_attribute JOIN unnest(move_col_ids) x(a) ON attnum = x.a
+WHERE
+  attrelid = source_tab_id;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION msar.build_source_update_cte_join_condition_expr(
+  target_tab_id regclass,
+  target_join_col_id smallint,
+  added_col_ids smallint[],
+  update_target_cte_name text,
+  insert_cte_name text
+) RETURNS text AS $$
+SELECT 'ON ' || string_agg(
+  format(
+    '%1$I.%3$I IS NOT DISTINCT FROM %2$I.%3$I',
+    update_target_cte_name,
+    insert_cte_name,
+    attname
+  ), ' AND '
+)
+FROM
+  pg_catalog.pg_attribute
+  JOIN unnest(msar.get_other_column_ids(target_tab_id, added_col_ids || target_join_col_id)) x(a)
+  ON attnum = x.a
+WHERE
+  attrelid = target_tab_id;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.move_columns_between_tables(
+  source_tab_id regclass,
+  target_tab_id regclass,
+  move_col_ids smallint[],
+  source_join_col_id smallint,
+  target_join_col_id smallint
+) RETURNS void AS $$
+DECLARE
+  preexisting_col_expr CONSTANT text := msar.build_all_columns_expr(target_tab_id);
+  move_col_expr CONSTANT text := msar.build_columns_expr(source_tab_id, move_col_ids);
+  move_col_defs CONSTANT jsonb := msar.get_extracted_col_def_jsonb(source_tab_id, move_col_ids);
+  move_con_defs CONSTANT jsonb := msar.get_extracted_con_def_jsonb(source_tab_id, move_col_ids);
+  added_col_ids smallint[];
+BEGIN
+  IF move_col_ids @> ARRAY[source_join_col_id] THEN
+    RAISE EXCEPTION 'The joining column cannot be moved.';
+  END IF;
+  added_col_ids := msar.add_columns(target_tab_id, move_col_defs, true);
+  EXECUTE format(
+    $q$WITH merged_cte AS (
+      SELECT DISTINCT %1$s, %2$s
+      FROM %3$I.%4$I JOIN %6$I.%7$I ON %3$I.%4$I.%5$I = %6$I.%7$I.%8$I
+    ), row_numbered_cte AS (
+      SELECT *, row_number() OVER (PARTITION BY %8$I ORDER BY %9$s) AS __msar_row_number
+      FROM merged_cte
+    ), update_target_cte AS (
+      UPDATE %6$I.%7$I SET (%9$s) = (
+        SELECT %9$s
+        FROM row_numbered_cte
+        WHERE row_numbered_cte.%8$s=%6$I.%7$I.%8$I
+        AND __msar_row_number = 1
+      )
+      RETURNING *
+    ), insert_cte AS (
+      INSERT INTO %6$I.%7$I (%10$s)
+      SELECT %10$s FROM row_numbered_cte
+      WHERE __msar_row_number <> 1
+      RETURNING *
+    )
+    UPDATE %3$I.%4$I SET %5$I = insert_cte.%8$I
+    FROM update_target_cte JOIN insert_cte %11$s
+    WHERE %3$I.%4$I.%5$I = update_target_cte.%8$I AND %12$s
+    $q$,
+    preexisting_col_expr,
+    move_col_expr,
+    msar.get_relation_schema_name(source_tab_id),
+    msar.get_relation_name(source_tab_id),
+    msar.get_column_name(source_tab_id, source_join_col_id),
+    msar.get_relation_schema_name(target_tab_id),
+    msar.get_relation_name(target_tab_id),
+    msar.get_column_name(target_tab_id, target_join_col_id),
+    msar.build_unqualified_columns_expr(source_tab_id, move_col_ids),
+    msar.build_unqualified_columns_expr(
+      target_tab_id, msar.get_other_column_ids(target_tab_id, ARRAY[target_join_col_id])
+    ),
+    msar.build_source_update_cte_join_condition_expr(
+      target_tab_id, target_join_col_id, added_col_ids, 'update_target_cte', 'insert_cte'
+    ),
+    msar.build_source_update_move_cols_equal_expr(source_tab_id, move_col_ids, 'insert_cte')
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+-- mathesar=# with join_cte AS (SELECT DISTINCT "Books"."Favorite Number" AS L1, "Authors".*  FROM "Books" JOIN "Authors" ON "Books"."Author"="Authors".id) SELECT *, row_number() OVER (PARTITION BY id ORDER BY l1) FROM join_cte;
+
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 -- DQL FUNCTIONS

From df2809d3d816ff383e27d10522f87563616281a1 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 2 Sep 2024 17:47:39 +0530
Subject: [PATCH 0792/1141] Implement permissions modal with basic 'granted
 access' section

---
 mathesar_ui/src/api/rpc/databases.ts          |  40 +++++-
 .../collapsible/Collapsible.scss              |   1 +
 .../common/utils/ImmutableSet.ts              |   4 +
 .../src/contexts/DatabaseRouteContext.ts      |   3 +
 mathesar_ui/src/i18n/languages/en/dict.json   |   4 +
 mathesar_ui/src/models/Database.ts            |  16 +++
 .../pages/database/DatabasePageWrapper.svelte |  11 +-
 .../DatabasePermissionsModal.svelte           |  57 ++++++++
 .../permissions/DirectPrivilegeRow.svelte     | 127 ++++++++++++++++++
 .../permissions/PrivilegesSection.svelte      | 126 +++++++++++++++++
 .../TransferOwnershipSection.svelte           |  29 ++++
 mathesar_ui/src/stores/AsyncRpcApiStore.ts    |   4 +-
 mathesar_ui/src/utils/typeUtils.ts            |   2 +-
 13 files changed, 418 insertions(+), 6 deletions(-)
 create mode 100644 mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
 create mode 100644 mathesar_ui/src/pages/database/permissions/DirectPrivilegeRow.svelte
 create mode 100644 mathesar_ui/src/pages/database/permissions/PrivilegesSection.svelte
 create mode 100644 mathesar_ui/src/pages/database/permissions/TransferOwnershipSection.svelte

diff --git a/mathesar_ui/src/api/rpc/databases.ts b/mathesar_ui/src/api/rpc/databases.ts
index 488e335d93..38855fe6bd 100644
--- a/mathesar_ui/src/api/rpc/databases.ts
+++ b/mathesar_ui/src/api/rpc/databases.ts
@@ -1,6 +1,7 @@
 import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
+import { ImmutableSet } from '@mathesar-component-library';
 
-import type { RawConfiguredRole } from './roles';
+import type { RawConfiguredRole, RawRole } from './roles';
 import type { RawServer } from './servers';
 
 export interface RawDatabase {
@@ -9,6 +10,17 @@ export interface RawDatabase {
   server_id: RawServer['id'];
 }
 
+export const databasePrivileges = ['CREATE', 'CONNECT', 'TEMPORARY'] as const;
+export type DatabasePrivilege = (typeof databasePrivileges)[number];
+
+export interface RawUnderlyingDatabase {
+  oid: number;
+  name: string;
+  owner_oid: RawRole['oid'];
+  current_role_priv: DatabasePrivilege[];
+  current_role_owns: boolean;
+}
+
 export const sampleDataOptions = [
   'library_management',
   'movie_collection',
@@ -22,7 +34,18 @@ export interface DatabaseConnectionResult {
   configured_role: RawConfiguredRole;
 }
 
+export interface RawDatabasePrivilegesForRole {
+  role_oid: RawRole['oid'];
+  direct: DatabasePrivilege[];
+}
+
 export const databases = {
+  get: rpcMethodTypeContainer<
+    {
+      database_id: RawDatabase['id'];
+    },
+    RawUnderlyingDatabase
+  >(),
   configured: {
     list: rpcMethodTypeContainer<
       {
@@ -51,4 +74,19 @@ export const databases = {
       DatabaseConnectionResult
     >(),
   },
+  privileges: {
+    list_direct: rpcMethodTypeContainer<
+      {
+        database_id: RawDatabase['id'];
+      },
+      Array<RawDatabasePrivilegesForRole>
+    >(),
+    replace_for_roles: rpcMethodTypeContainer<
+      {
+        database_id: RawDatabase['id'];
+        privileges: Array<RawDatabasePrivilegesForRole>;
+      },
+      Array<RawDatabasePrivilegesForRole>
+    >(),
+  },
 };
diff --git a/mathesar_ui/src/component-library/collapsible/Collapsible.scss b/mathesar_ui/src/component-library/collapsible/Collapsible.scss
index 9a3a827c74..84064edf4d 100644
--- a/mathesar_ui/src/component-library/collapsible/Collapsible.scss
+++ b/mathesar_ui/src/component-library/collapsible/Collapsible.scss
@@ -11,6 +11,7 @@
       text-align: left;
       cursor: pointer;
       font-weight: inherit;
+      padding: var(--Collapsible_trigger-padding, 0.5em);
       .collapsible-header-title {
         flex-grow: 1;
         overflow: hidden;
diff --git a/mathesar_ui/src/component-library/common/utils/ImmutableSet.ts b/mathesar_ui/src/component-library/common/utils/ImmutableSet.ts
index d442984ad0..1c1f036979 100644
--- a/mathesar_ui/src/component-library/common/utils/ImmutableSet.ts
+++ b/mathesar_ui/src/component-library/common/utils/ImmutableSet.ts
@@ -54,6 +54,10 @@ export default class ImmutableSet<T> {
     return this.set.has(item);
   }
 
+  equals(other: Iterable<T> & { size: number }): boolean {
+    return this.size === other.size && this.union(other).size === this.size;
+  }
+
   get size(): number {
     return this.set.size;
   }
diff --git a/mathesar_ui/src/contexts/DatabaseRouteContext.ts b/mathesar_ui/src/contexts/DatabaseRouteContext.ts
index 56bda620ab..ae4dd52f78 100644
--- a/mathesar_ui/src/contexts/DatabaseRouteContext.ts
+++ b/mathesar_ui/src/contexts/DatabaseRouteContext.ts
@@ -10,9 +10,12 @@ export class DatabaseRouteContext {
 
   roles;
 
+  underlyingDatabase;
+
   constructor(database: Database) {
     this.database = database;
     this.roles = database.constructRolesStore();
+    this.underlyingDatabase = database.constructUnderlyingDatabaseStore();
   }
 
   /**
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 4f6eab083f..34a0d40b6b 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -258,6 +258,7 @@
   "go_to_record": "Go To Record",
   "go_to_record_page": "Go to Record Page",
   "go_to_record_with_value": "Go To Record {value}",
+  "granted_access": "Granted Access",
   "group": "Group",
   "group_by_column": "Group by Column",
   "group_records_by": "Group records by",
@@ -397,6 +398,7 @@
   "or": "or",
   "overridden": "Overridden",
   "overview": "Overview",
+  "owner": "Owner",
   "page_automatic_reload_update": "This page will automatically reload, showing the software update status again.",
   "page_doesnt_exist": "The page you're looking for doesn't exist.",
   "password": "Password",
@@ -469,6 +471,7 @@
   "role_dropped_successfully": "The Role has been dropped successfully",
   "role_has_no_child_roles": "The Role does not have any Child Roles",
   "role_name": "Role Name",
+  "role_permissions": "Role Permissions",
   "roles": "Roles",
   "row": "Row",
   "running_latest_version": "You are running the latest version",
@@ -569,6 +572,7 @@
   "this_will_remove_following_transformations": "This will remove the following transformation(s):",
   "time_to_create_exploration": "It's time to use your tables. Create your first exploration.",
   "today": "Today",
+  "transfer_ownership": "Transfer Ownership",
   "transform_results": "Transform Results",
   "transform_results_help": "Transformations can be used to summarize data, filter data, and more. Note that transformations are applied in the order they are listed.",
   "two_columns_cannot_have_same_name": "The two columns cannot have the same name.",
diff --git a/mathesar_ui/src/models/Database.ts b/mathesar_ui/src/models/Database.ts
index ccc0dbe1e1..d867e06320 100644
--- a/mathesar_ui/src/models/Database.ts
+++ b/mathesar_ui/src/models/Database.ts
@@ -63,6 +63,22 @@ export class Database {
     });
   }
 
+  constructDatabasePrivilegesStore() {
+    return new AsyncRpcApiStore(api.databases.privileges.list_direct, {
+      postProcess: (rawDbPrivilegesForRoles) =>
+        new ImmutableMap(
+          rawDbPrivilegesForRoles.map((rawDatabasePrivilegesForRole) => [
+            rawDatabasePrivilegesForRole.role_oid,
+            rawDatabasePrivilegesForRole,
+          ]),
+        ),
+    });
+  }
+
+  constructUnderlyingDatabaseStore() {
+    return new AsyncRpcApiStore(api.databases.get);
+  }
+
   addCollaborator(
     userId: number,
     configuredRoleId: ConfiguredRole['id'],
diff --git a/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
index 40e33c1342..af4ac86fdf 100644
--- a/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
+++ b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
@@ -14,6 +14,7 @@
     getDatabasePageSchemasSectionUrl,
     getDatabasePageSettingsSectionUrl,
   } from '@mathesar/routes/urls';
+  import { modal } from '@mathesar/stores/modal';
   import {
     Button,
     ButtonMenuItem,
@@ -21,6 +22,10 @@
     TabContainer,
   } from '@mathesar-component-library';
 
+  import DatabasePermissionsModal from './permissions/DatabasePermissionsModal.svelte';
+
+  const permissionsModal = modal.spawnModalController();
+
   export let database: Database;
 
   type Section = 'schemas' | 'settings';
@@ -67,7 +72,7 @@
     }}
   >
     <div slot="action">
-      <!-- <Button appearance="secondary">
+      <Button appearance="secondary" on:click={() => permissionsModal.open()}>
         <span>{$_('database_permissions')}</span>
       </Button>
 
@@ -84,7 +89,7 @@
         <ButtonMenuItem icon={iconDeleteMajor} danger>
           {$_('delete_database')}
         </ButtonMenuItem>
-      </DropdownMenu> -->
+      </DropdownMenu>
     </div>
   </AppSecondaryHeader>
 
@@ -95,6 +100,8 @@
   </TabContainer>
 </LayoutWithHeader>
 
+<DatabasePermissionsModal controller={permissionsModal} />
+
 <style>
   .tab-content {
     padding: 1rem 0;
diff --git a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
new file mode 100644
index 0000000000..b4b5c9cdf6
--- /dev/null
+++ b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
@@ -0,0 +1,57 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import { DatabaseRouteContext } from '@mathesar/contexts/DatabaseRouteContext';
+  import {
+    ControlledModal,
+    type ModalController,
+    TabContainer,
+  } from '@mathesar-component-library';
+
+  import PrivilegesSection from './PrivilegesSection.svelte';
+  import TransferOwnershipSection from './TransferOwnershipSection.svelte';
+
+  export let controller: ModalController;
+
+  const databaseContext = DatabaseRouteContext.get();
+  $: ({ database } = $databaseContext);
+  $: databasePrivileges = database.constructDatabasePrivilegesStore();
+
+  const tabs = [
+    {
+      id: 'share',
+      label: $_('share'),
+    },
+    {
+      id: 'transfer_ownership',
+      label: $_('transfer_ownership'),
+    },
+  ];
+  let activeTab = tabs[0];
+
+  function onModalClose() {
+    [activeTab] = tabs;
+  }
+</script>
+
+<ControlledModal {controller} on:close={onModalClose}>
+  <span slot="title">
+    {$_('database_permissions')}
+  </span>
+  <div>
+    <TabContainer
+      bind:activeTab
+      {tabs}
+      uniformTabWidth={false}
+      tabStyle="compact"
+    >
+      <div class="tab-content">
+        {#if activeTab.id === 'share'}
+          <PrivilegesSection {controller} {databasePrivileges} />
+        {:else}
+          <TransferOwnershipSection {controller} />
+        {/if}
+      </div>
+    </TabContainer>
+  </div>
+</ControlledModal>
diff --git a/mathesar_ui/src/pages/database/permissions/DirectPrivilegeRow.svelte b/mathesar_ui/src/pages/database/permissions/DirectPrivilegeRow.svelte
new file mode 100644
index 0000000000..738314cce4
--- /dev/null
+++ b/mathesar_ui/src/pages/database/permissions/DirectPrivilegeRow.svelte
@@ -0,0 +1,127 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import { type RawDatabasePrivilegesForRole } from '@mathesar/api/rpc/databases';
+  import { iconDeleteMinor } from '@mathesar/icons';
+  import type { Role } from '@mathesar/models/Role';
+  import {
+    Button,
+    CheckboxGroup,
+    Collapsible,
+    Icon,
+    type ImmutableMap,
+    ImmutableSet,
+    Select,
+  } from '@mathesar-component-library';
+
+  export let rolesMap: ImmutableMap<Role['oid'], Role>;
+  export let dbPrivilegeForRole: RawDatabasePrivilegesForRole;
+
+  let isRolePermissionsOpen = false;
+
+  const accessLevels = ['connect', 'connect_and_create', 'custom'] as const;
+  type AccessLevel = (typeof accessLevels)[number];
+  let access: AccessLevel;
+
+  $: directAccessLevelSet = new ImmutableSet(dbPrivilegeForRole.direct);
+  $: access = (() => {
+    if (directAccessLevelSet.equals(new Set(['CONNECT', 'CREATE']))) {
+      return 'connect_and_create';
+    }
+    if (directAccessLevelSet.equals(new Set(['CONNECT']))) {
+      return 'connect';
+    }
+    return 'custom';
+  })();
+
+  $: role = rolesMap.get(dbPrivilegeForRole.role_oid);
+  $: members = role?.members;
+
+  function changeAccess(option?: AccessLevel) {
+    if (option) {
+      if (option === 'custom') {
+        isRolePermissionsOpen = true;
+      }
+    }
+  }
+
+  function permissionChange(e: unknown) {
+    console.log(e);
+  }
+</script>
+
+<div class="access-selection-section">
+  <div class="name-and-members">
+    {#if role}
+      <div class="name">
+        <span>{role.name}</span>
+      </div>
+      <div>
+        {#if $members?.size}
+          + {$members.size}
+        {/if}
+      </div>
+    {/if}
+  </div>
+  <div>
+    <Select
+      options={accessLevels}
+      bind:value={access}
+      on:change={(e) => changeAccess(e.detail)}
+    />
+  </div>
+  <div>
+    <Button appearance="secondary">
+      <Icon {...iconDeleteMinor} />
+    </Button>
+  </div>
+</div>
+{#if access === 'custom'}
+  <div class="role-permissions-section">
+    <Collapsible bind:isOpen={isRolePermissionsOpen} triggerAppearance="plain">
+      <div slot="header">
+        {$_('role_permissions')}
+      </div>
+      <div class="content" slot="content">
+        <CheckboxGroup
+          values={dbPrivilegeForRole.direct}
+          on:change={(e) => permissionChange(e)}
+          options={['CONNECT', 'CREATE']}
+          getCheckboxLabel={(o) => o}
+          getCheckboxHelp={(o) => o}
+        />
+      </div>
+    </Collapsible>
+  </div>
+{/if}
+
+<style lang="scss">
+  .access-selection-section {
+    display: grid;
+    grid-template-columns: 2fr 1fr auto;
+    gap: var(--size-ultra-small);
+
+    .name-and-members {
+      .name {
+        span {
+          padding: var(--size-extreme-small) var(--size-xx-small);
+          background: var(--slate-100);
+          border-radius: var(--border-radius-xl);
+          font-weight: 500;
+        }
+      }
+    }
+  }
+  .role-permissions-section {
+    margin-top: var(--size-super-ultra-small);
+    --Collapsible_trigger-padding: var(--size-extreme-small) 0;
+
+    .content {
+      margin-top: var(--size-super-ultra-small);
+      padding: var(--size-x-small);
+      border: 1px solid var(--slate-200);
+      border-radius: var(--border-radius-l);
+      background: var(--white);
+    }
+  }
+</style>
diff --git a/mathesar_ui/src/pages/database/permissions/PrivilegesSection.svelte b/mathesar_ui/src/pages/database/permissions/PrivilegesSection.svelte
new file mode 100644
index 0000000000..1996ff45fa
--- /dev/null
+++ b/mathesar_ui/src/pages/database/permissions/PrivilegesSection.svelte
@@ -0,0 +1,126 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import type { RawDatabasePrivilegesForRole } from '@mathesar/api/rpc/databases';
+  import Errors from '@mathesar/components/Errors.svelte';
+  import {
+    FormSubmit,
+    makeForm,
+    requiredField,
+  } from '@mathesar/components/form';
+  import { DatabaseRouteContext } from '@mathesar/contexts/DatabaseRouteContext';
+  import type { Database } from '@mathesar/models/Database';
+  import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
+  import {
+    ImmutableMap,
+    type ModalController,
+    Spinner,
+    isDefinedNonNullable,
+    portalToWindowFooter,
+  } from '@mathesar-component-library';
+
+  import DirectPrivilegeRow from './DirectPrivilegeRow.svelte';
+
+  export let controller: ModalController;
+  export let databasePrivileges: ReturnType<
+    Database['constructDatabasePrivilegesStore']
+  >;
+
+  const databaseContext = DatabaseRouteContext.get();
+  $: ({ database, roles, underlyingDatabase } = $databaseContext);
+  $: void AsyncRpcApiStore.runBatched(
+    [
+      roles.batchRunner({ database_id: database.id }),
+      databasePrivileges.batchRunner({ database_id: database.id }),
+      underlyingDatabase.batchRunner({ database_id: database.id }),
+    ],
+    { onlyRunIfNotInitialized: true },
+  );
+
+  $: isLoading =
+    $roles.isLoading ||
+    $databasePrivileges.isLoading ||
+    $underlyingDatabase.isLoading;
+  $: isSuccess =
+    $roles.isOk && $databasePrivileges.isOk && $underlyingDatabase.isOk;
+  $: errors = [
+    $roles.error,
+    $databasePrivileges.error,
+    $underlyingDatabase.error,
+  ].filter((entry): entry is string => isDefinedNonNullable(entry));
+
+  $: dbPrivilegesMap =
+    $databasePrivileges.resolvedValue ??
+    new ImmutableMap<
+      RawDatabasePrivilegesForRole['role_oid'],
+      RawDatabasePrivilegesForRole
+    >();
+  $: dbPrivilegesLocalMap = new ImmutableMap(dbPrivilegesMap);
+  $: dbPrivileges = requiredField(dbPrivilegesLocalMap);
+  $: form = makeForm({ dbPrivileges });
+
+  function savePermissions() {}
+</script>
+
+<div class="privileges">
+  {#if isLoading}
+    <Spinner />
+  {:else if isSuccess && $roles.resolvedValue}
+    <div class="section owner-section">
+      <div class="title">{$_('owner')}</div>
+      <div class="content"></div>
+    </div>
+    <div class="section granted-access-section">
+      <div class="title">{$_('granted_access')}</div>
+      <div class="content">
+        {#each [...dbPrivilegesMap.values()] as dbPrivilegeForRole (dbPrivilegeForRole)}
+          <div class="privilege-row">
+            <DirectPrivilegeRow
+              rolesMap={$roles.resolvedValue}
+              {dbPrivilegeForRole}
+            />
+          </div>
+        {/each}
+      </div>
+    </div>
+  {:else}
+    <Errors {errors} fullWidth />
+  {/if}
+</div>
+
+<div use:portalToWindowFooter class="footer">
+  <FormSubmit
+    {form}
+    canProceed={$form.hasChanges}
+    catchErrors
+    onCancel={() => {
+      controller.close();
+    }}
+    onProceed={savePermissions}
+    proceedButton={{ label: $_('save') }}
+    cancelButton={{ label: $_('cancel') }}
+  />
+</div>
+
+<style lang="scss">
+  .privileges {
+    .section {
+      padding: var(--size-base) 0;
+
+      .title {
+        font-weight: 600;
+        border-bottom: 1px solid var(--slate-200);
+        padding: var(--size-extreme-small) 0;
+      }
+    }
+    .granted-access-section {
+      .privilege-row {
+        padding: var(--size-base) 0;
+
+        & + .privilege-row {
+          border-top: 1px solid var(--slate-100);
+        }
+      }
+    }
+  }
+</style>
diff --git a/mathesar_ui/src/pages/database/permissions/TransferOwnershipSection.svelte b/mathesar_ui/src/pages/database/permissions/TransferOwnershipSection.svelte
new file mode 100644
index 0000000000..8bf8a565a0
--- /dev/null
+++ b/mathesar_ui/src/pages/database/permissions/TransferOwnershipSection.svelte
@@ -0,0 +1,29 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import { FormSubmit, makeForm } from '@mathesar/components/form';
+  import {
+    type ModalController,
+    portalToWindowFooter,
+  } from '@mathesar-component-library';
+
+  export let controller: ModalController;
+
+  const form = makeForm({});
+
+  function transferOwnership() {}
+</script>
+
+<div use:portalToWindowFooter class="footer">
+  <FormSubmit
+    {form}
+    canProceed={$form.hasChanges}
+    catchErrors
+    onCancel={() => {
+      controller.close();
+    }}
+    onProceed={transferOwnership}
+    proceedButton={{ label: $_('transfer_ownership') }}
+    cancelButton={{ label: $_('cancel') }}
+  />
+</div>
diff --git a/mathesar_ui/src/stores/AsyncRpcApiStore.ts b/mathesar_ui/src/stores/AsyncRpcApiStore.ts
index 741e6ac803..6375e0b7c8 100644
--- a/mathesar_ui/src/stores/AsyncRpcApiStore.ts
+++ b/mathesar_ui/src/stores/AsyncRpcApiStore.ts
@@ -7,7 +7,7 @@ import {
   batchSend,
 } from '@mathesar/packages/json-rpc-client-builder';
 
-import AsyncStore, { AsyncStoreValue } from './AsyncStore';
+import AsyncStore, { type AsyncStoreValue } from './AsyncStore';
 
 type BatchRunner<T = any, U = any> = {
   send: RpcRequest<T>;
@@ -16,7 +16,7 @@ type BatchRunner<T = any, U = any> = {
   getValue: () => AsyncStoreValue<U, string>;
 };
 
-export default class AsyncRpcApiStore<Props, T, U> extends AsyncStore<
+export default class AsyncRpcApiStore<Props, T, U = T> extends AsyncStore<
   Props,
   U
 > {
diff --git a/mathesar_ui/src/utils/typeUtils.ts b/mathesar_ui/src/utils/typeUtils.ts
index 5bf3df7aae..88e459d4c9 100644
--- a/mathesar_ui/src/utils/typeUtils.ts
+++ b/mathesar_ui/src/utils/typeUtils.ts
@@ -1,6 +1,6 @@
 import type { Readable, Writable } from 'svelte/store';
 
-type ChangeWritableToReadable<T> = T extends Writable<infer U>
+export type ChangeWritableToReadable<T> = T extends Writable<infer U>
   ? Readable<U>
   : T;
 

From dea235b43851bb6db4c6803a36bf4b27166a49e1 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Mon, 2 Sep 2024 19:12:41 +0530
Subject: [PATCH 0793/1141] fix return type for fkey from Any->str

---
 mathesar/rpc/records.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index 4c62ea48d6..95ea27b861 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -146,7 +146,7 @@ class RecordList(TypedDict):
     count: int
     results: list[dict]
     grouping: GroupingResponse
-    preview_data: dict[str, dict[Any, str]]
+    preview_data: dict[str, dict[str, str]]
 
     @classmethod
     def from_dict(cls, d):
@@ -174,7 +174,7 @@ class RecordAdded(TypedDict):
             provides a map of foreign key to a text summary.
     """
     results: list[dict]
-    preview_data: dict[str, dict[Any, str]]
+    preview_data: dict[str, dict[str, str]]
 
     @classmethod
     def from_dict(cls, d):

From c6c2057428e8f8952b82d9993621468b35cb7149 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Mon, 2 Sep 2024 19:24:21 +0530
Subject: [PATCH 0794/1141] remove playwright dependency

---
 requirements-dev.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 1c69cf20dc..0716dcc75b 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -6,7 +6,5 @@ pytest-django==4.2.0
 pytest-env==0.6.2
 pytest-cov==3.0.0
 pytest-xdist[psutil]==2.5.0
-playwright==1.18.1
-pytest-playwright==0.2.3
 mkdocs-material==8.5.11
 mkdocs-redirects==1.2.0

From 138d62bf0a077a9d4424d282b66e57e4e6eeaf05 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 2 Sep 2024 23:15:34 +0800
Subject: [PATCH 0795/1141] use fkey map, hide column choosing inside function

---
 db/sql/00_msar.sql | 69 ++++++++++++++++++++++++----------------------
 1 file changed, 36 insertions(+), 33 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index dffbf8dd8c..a75265cca4 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -762,6 +762,30 @@ SELECT EXISTS (
 $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION msar.get_fkey_map_table(tab_id oid)
+  RETURNS TABLE (target_oid oid, conkey smallint, confkey smallint)
+AS $$/*
+Generate a table mapping foreign key values from refererrer to referant tables.
+
+Given an input table (identified by OID), we return a table with each row representing a foreign key
+constraint on that table. We return only single-column foreign keys, and only one per foreign key
+column.
+
+Args:
+  tab_id: The OID of the table containing the foreign key columns to map.
+*/
+SELECT DISTINCT ON (conkey) pgc.confrelid AS target_oid, x.conkey AS conkey, y.confkey AS confkey
+FROM pg_constraint pgc, LATERAL unnest(conkey) x(conkey), LATERAL unnest(confkey) y(confkey)
+WHERE
+  pgc.conrelid = tab_id
+  AND pgc.contype='f'
+  AND cardinality(pgc.confkey) = 1
+  AND has_column_privilege(tab_id, x.conkey, 'SELECT')
+  AND has_column_privilege(pgc.confrelid, y.confkey, 'SELECT')
+ORDER BY conkey, target_oid, confkey;
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
 CREATE OR REPLACE FUNCTION
 msar.list_column_privileges_for_current_role(tab_id regclass, attnum smallint) RETURNS jsonb AS $$/*
 Return a JSONB array of all privileges current_user holds on the passed table.
@@ -3859,20 +3883,23 @@ $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-msar.move_columns_between_tables(
+msar.move_columns_to_referenced_table(
   source_tab_id regclass,
   target_tab_id regclass,
-  move_col_ids smallint[],
-  source_join_col_id smallint,
-  target_join_col_id smallint
+  move_col_ids smallint[]
 ) RETURNS void AS $$
 DECLARE
+  source_join_col_id smallint;
+  target_join_col_id smallint;
   preexisting_col_expr CONSTANT text := msar.build_all_columns_expr(target_tab_id);
   move_col_expr CONSTANT text := msar.build_columns_expr(source_tab_id, move_col_ids);
   move_col_defs CONSTANT jsonb := msar.get_extracted_col_def_jsonb(source_tab_id, move_col_ids);
   move_con_defs CONSTANT jsonb := msar.get_extracted_con_def_jsonb(source_tab_id, move_col_ids);
   added_col_ids smallint[];
 BEGIN
+  SELECT conkey, confkey INTO source_join_col_id, target_join_col_id
+    FROM msar.get_fkey_map_table(source_tab_id)
+    WHERE target_oid = target_tab_id;
   IF move_col_ids @> ARRAY[source_join_col_id] THEN
     RAISE EXCEPTION 'The joining column cannot be moved.';
   END IF;
@@ -3888,7 +3915,7 @@ BEGIN
       UPDATE %6$I.%7$I SET (%9$s) = (
         SELECT %9$s
         FROM row_numbered_cte
-        WHERE row_numbered_cte.%8$s=%6$I.%7$I.%8$I
+        WHERE row_numbered_cte.%8$I=%6$I.%7$I.%8$I
         AND __msar_row_number = 1
       )
       RETURNING *
@@ -3919,10 +3946,10 @@ BEGIN
     ),
     msar.build_source_update_move_cols_equal_expr(source_tab_id, move_col_ids, 'insert_cte')
   );
+  PERFORM msar.drop_columns(source_tab_id, variadic move_col_ids);
 END;
 $$ LANGUAGE plpgsql;
 
--- mathesar=# with join_cte AS (SELECT DISTINCT "Books"."Favorite Number" AS L1, "Authors".*  FROM "Books" JOIN "Authors" ON "Books"."Author"="Authors".id) SELECT *, row_number() OVER (PARTITION BY id ORDER BY l1) FROM join_cte;
 
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
@@ -4326,30 +4353,6 @@ LIMIT 1;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
-CREATE OR REPLACE FUNCTION msar.get_fkey_map_cte(tab_id oid)
-  RETURNS TABLE (target_oid oid, conkey smallint, confkey smallint)
-AS $$/*
-Generate a table mapping foreign key values from refererrer to referant tables.
-
-Given an input table (identified by OID), we return a table with each row representing a foreign key
-constraint on that table. We return only single-column foreign keys, and only one per foreign key
-column.
-
-Args:
-  tab_id: The OID of the table containing the foreign key columns to map.
-*/
-SELECT DISTINCT ON (conkey) pgc.confrelid AS target_oid, x.conkey AS conkey, y.confkey AS confkey
-FROM pg_constraint pgc, LATERAL unnest(conkey) x(conkey), LATERAL unnest(confkey) y(confkey)
-WHERE
-  pgc.conrelid = tab_id
-  AND pgc.contype='f'
-  AND cardinality(pgc.confkey) = 1
-  AND has_column_privilege(tab_id, x.conkey, 'SELECT')
-  AND has_column_privilege(pgc.confrelid, y.confkey, 'SELECT')
-ORDER BY conkey, target_oid, confkey;
-$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
-
-
 CREATE OR REPLACE FUNCTION msar.build_summary_expr(tab_id oid) RETURNS TEXT AS $$/*
 Given a table, return an SQL expression that will build a summary for each row of the table.
 
@@ -4371,7 +4374,7 @@ This summary amounts to just the first string-like column value for that linked
 Args:
   tab_id: The table for whose fkey values' linked records we'll get summaries.
 */
-WITH fkey_map_cte AS (SELECT * FROM msar.get_fkey_map_cte(tab_id))
+WITH fkey_map_cte AS (SELECT * FROM msar.get_fkey_map_table(tab_id))
 SELECT ', ' || string_agg(
   format(
     $c$summary_cte_%1$s AS (
@@ -4399,7 +4402,7 @@ Args:
   tab_oid: The table defining the columns of the main CTE.
   cte_name: The name of the main CTE we'll join the summary CTEs to.
 */
-WITH fkey_map_cte AS (SELECT * FROM msar.get_fkey_map_cte(tab_id))
+WITH fkey_map_cte AS (SELECT * FROM msar.get_fkey_map_table(tab_id))
 SELECT string_agg(
   format(
     $j$
@@ -4419,7 +4422,7 @@ Build a JSON object with the results of summarizing linked records.
 Args:
   tab_oid: The OID of the table for which we're getting linked record summaries.
 */
-WITH fkey_map_cte AS (SELECT * FROM msar.get_fkey_map_cte(tab_id))
+WITH fkey_map_cte AS (SELECT * FROM msar.get_fkey_map_table(tab_id))
 SELECT 'jsonb_build_object(' || string_agg(
   format(
     $j$

From e1d76b795d40e75352dc0b6f3f7bb12a5dacd683 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 3 Sep 2024 00:59:56 +0530
Subject: [PATCH 0796/1141] wire up column extraction to python

---
 db/tables/operations/split.py | 19 ++++++++++++++++++-
 mathesar/rpc/data_modeling.py | 34 +++++++++++++++++++++++++++++++++-
 2 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/db/tables/operations/split.py b/db/tables/operations/split.py
index c9260eacc0..6ae2b274cb 100644
--- a/db/tables/operations/split.py
+++ b/db/tables/operations/split.py
@@ -1,4 +1,4 @@
-from db.connection import execute_msar_func_with_engine
+from db.connection import execute_msar_func_with_engine, exec_msar_func
 
 
 def extract_columns_from_table(
@@ -14,3 +14,20 @@ def extract_columns_from_table(
     )
     extracted_table_oid, new_fkey_attnum = curr.fetchone()[0]
     return extracted_table_oid, old_table_oid, new_fkey_attnum
+
+
+def split_table(
+    conn,
+    old_table_oid,
+    extracted_column_attnums,
+    extracted_table_name,
+    relationship_fk_column_name
+):
+    exec_msar_func(
+        conn,
+        'extract_columns_from_table',
+        old_table_oid,
+        extracted_column_attnums,
+        extracted_table_name,
+        relationship_fk_column_name
+    )
diff --git a/mathesar/rpc/data_modeling.py b/mathesar/rpc/data_modeling.py
index 30c385b4ff..76f8b3bcfa 100644
--- a/mathesar/rpc/data_modeling.py
+++ b/mathesar/rpc/data_modeling.py
@@ -7,7 +7,7 @@
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from db.links.operations import create as links_create
-from db.tables.operations import infer_types
+from db.tables.operations import infer_types, split
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
 
@@ -104,3 +104,35 @@ def suggest_types(*, table_oid: int, database_id: int, **kwargs) -> dict:
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
         return infer_types.infer_table_column_data_types(conn, table_oid)
+
+
+@rpc_method(name="data_modeling.split_table")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def split_table(
+    *,
+    table_oid: int,
+    column_attnums: list,
+    extracted_table_name: str,
+    relationship_fk_column_name: str,
+    database_id: int,
+    **kwargs
+) -> None:
+    """
+    Extract columns from a table to create a new table, linked by a foreign key.
+
+    Args:
+        table_oid: The OID of the table whose columns we'll extract.
+        column_attnums: A list of the attnums of the columns to extract.
+        extracted_table_name: The name of the new table to be made from the extracted columns.
+        relationship_fk_column_name: The name to give the new foreign key column in the remainder table (optional)
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        split.split_table(
+            conn,
+            table_oid,
+            column_attnums,
+            extracted_table_name,
+            relationship_fk_column_name
+        )

From aa9f9a502557bda6468588d4edb8ec3b84267c81 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 3 Sep 2024 01:02:16 +0530
Subject: [PATCH 0797/1141] add docs and tests for column extraction

---
 docs/docs/api/rpc.md                     |  1 +
 mathesar/tests/rpc/test_data_modeling.py | 48 ++++++++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py     |  5 +++
 3 files changed, 54 insertions(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index fb6ec1742a..0c63655df4 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -276,6 +276,7 @@ To use an RPC function:
       - add_foreign_key_column
       - add_mapping_table
       - suggest_types
+      - split_table
       - MappingColumn
 
 ## Responses
diff --git a/mathesar/tests/rpc/test_data_modeling.py b/mathesar/tests/rpc/test_data_modeling.py
index 963acf055b..a0099f83ef 100644
--- a/mathesar/tests/rpc/test_data_modeling.py
+++ b/mathesar/tests/rpc/test_data_modeling.py
@@ -132,3 +132,51 @@ def mock_suggest_types(conn, table_oid):
         database_id=_database_id,
         request=request,
     )
+
+
+def test_data_modeling_split_table(rf, monkeypatch):
+    _username = 'alice'
+    _password = 'pass1234'
+    _table_oid = 12345
+    _database_id = 2
+    _column_attnums = [2, 3, 4]
+    _extracted_table_name = 'extracted_table'
+    _relationship_fk_column_name = 'fk_col'
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=_username, password=_password)
+
+    @contextmanager
+    def mock_connect(database_id, user):
+        if database_id == _database_id and user.username == _username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_split_table(
+        conn,
+        table_oid,
+        column_attnums,
+        extracted_table_name,
+        relationship_fk_column_name
+    ):
+        if (
+            table_oid != _table_oid
+            and column_attnums != _column_attnums
+            and extracted_table_name != _extracted_table_name
+            and relationship_fk_column_name != _relationship_fk_column_name
+        ):
+            raise AssertionError('incorrect parameters passed')
+
+    monkeypatch.setattr(data_modeling, 'connect', mock_connect)
+    monkeypatch.setattr(data_modeling.split, 'split_table', mock_split_table)
+    data_modeling.split_table(
+        table_oid=_table_oid,
+        column_attnums=_column_attnums,
+        extracted_table_name=_extracted_table_name,
+        relationship_fk_column_name=_relationship_fk_column_name,
+        database_id=_database_id,
+        request=request
+    )
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index cede022e5c..7dc0e2cfbb 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -128,6 +128,11 @@
         "data_modeling.suggest_types",
         [user_is_authenticated]
     ),
+    (
+        data_modeling.split_table,
+        "data_modeling.split_table",
+        [user_is_authenticated]
+    ),
 
     (
         databases.get,

From 80d2b87d5d9b42d966b1bbbcb079aa71ee0d36f0 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 3 Sep 2024 09:07:49 +0800
Subject: [PATCH 0798/1141] add constraint copying into column mover

---
 db/sql/00_msar.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index a75265cca4..d4f1f47e15 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3946,6 +3946,7 @@ BEGIN
     ),
     msar.build_source_update_move_cols_equal_expr(source_tab_id, move_col_ids, 'insert_cte')
   );
+  PERFORM msar.add_constraints(target_tab_id, move_con_defs);
   PERFORM msar.drop_columns(source_tab_id, variadic move_col_ids);
 END;
 $$ LANGUAGE plpgsql;

From 2a065e342140ac66632085a05090f4484962fdf2 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 3 Sep 2024 15:41:59 +0530
Subject: [PATCH 0799/1141] make fk_column_name optional

---
 db/tables/operations/split.py | 2 +-
 mathesar/rpc/data_modeling.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/tables/operations/split.py b/db/tables/operations/split.py
index 6ae2b274cb..aa2869073b 100644
--- a/db/tables/operations/split.py
+++ b/db/tables/operations/split.py
@@ -21,7 +21,7 @@ def split_table(
     old_table_oid,
     extracted_column_attnums,
     extracted_table_name,
-    relationship_fk_column_name
+    relationship_fk_column_name=None
 ):
     exec_msar_func(
         conn,
diff --git a/mathesar/rpc/data_modeling.py b/mathesar/rpc/data_modeling.py
index 76f8b3bcfa..06843e3f27 100644
--- a/mathesar/rpc/data_modeling.py
+++ b/mathesar/rpc/data_modeling.py
@@ -114,8 +114,8 @@ def split_table(
     table_oid: int,
     column_attnums: list,
     extracted_table_name: str,
-    relationship_fk_column_name: str,
     database_id: int,
+    relationship_fk_column_name: str = None,
     **kwargs
 ) -> None:
     """

From a2c8360f8b0e0bb56853555fa8224aaba360d915 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 4 Sep 2024 15:09:37 +0800
Subject: [PATCH 0800/1141] add some todos for edge cases

---
 db/sql/00_msar.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index d4f1f47e15..52465972e4 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3845,6 +3845,7 @@ CREATE OR REPLACE FUNCTION msar.build_source_update_move_cols_equal_expr(
 ) RETURNS text AS $$
 SELECT string_agg(
   format(
+    -- TODO should be IS NOT DISTINCT FROM
     '%1$I.%2$I.%3$I = %4$I.%3$I',
     msar.get_relation_schema_name(source_tab_id),
     msar.get_relation_name(source_tab_id),
@@ -3947,6 +3948,8 @@ BEGIN
     msar.build_source_update_move_cols_equal_expr(source_tab_id, move_col_ids, 'insert_cte')
   );
   PERFORM msar.add_constraints(target_tab_id, move_con_defs);
+  -- TODO make sure no multi-col fkeys reference the moved columns
+  -- TODO just throw error if _any_ multicol constraint references the moved columns.
   PERFORM msar.drop_columns(source_tab_id, variadic move_col_ids);
 END;
 $$ LANGUAGE plpgsql;

From 546fa0e4407cf5736ead77886348ba4b5b1b8e2d Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 4 Sep 2024 18:10:28 +0800
Subject: [PATCH 0801/1141] modify pkey finder to return false when no pkey

---
 db/sql/00_msar.sql      |  9 +++++----
 db/sql/test_00_msar.sql | 26 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 9c69e9ffbe..472d1945d0 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -408,10 +408,11 @@ Args:
   rel_id:  The OID of the relation.
   col_id:  The attnum of the column in the relation.
 */
-BEGIN
-  RETURN ARRAY[col_id::smallint] <@ conkey FROM pg_constraint WHERE conrelid=rel_id and contype='p';
-END;
-$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+SELECT EXISTS (
+  SELECT 1 FROM pg_constraint WHERE
+    ARRAY[col_id::smallint] <@ conkey AND conrelid=rel_id AND contype='p'
+);
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index c16c1c33f2..ade5855591 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2273,6 +2273,32 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+CREATE OR REPLACE FUNCTION __setup_is_pkey_col_tests() RETURNS SETOF TEXT AS $$
+BEGIN
+  CREATE TABLE simple_pkey (col1 text, col2 text PRIMARY KEY, col3 integer);
+  CREATE TABLE multi_pkey (col1 text, col2 text, col3 integer);
+  ALTER TABLE multi_pkey ADD PRIMARY KEY (col1, col2);
+  CREATE TABLE no_pkey (col1 text, col2 text, col3 integer);
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_is_pkey_col() RETURNS SETOF TEXT AS $$
+BEGIN
+  PERFORM __setup_is_pkey_col_tests();
+  RETURN NEXT is(msar.is_pkey_col('simple_pkey'::regclass::oid, 1), false);
+  RETURN NEXT is(msar.is_pkey_col('simple_pkey'::regclass::oid, 2), true);
+  RETURN NEXT is(msar.is_pkey_col('simple_pkey'::regclass::oid, 3), false);
+  RETURN NEXT is(msar.is_pkey_col('multi_pkey'::regclass::oid, 1), true);
+  RETURN NEXT is(msar.is_pkey_col('multi_pkey'::regclass::oid, 2), true);
+  RETURN NEXT is(msar.is_pkey_col('multi_pkey'::regclass::oid, 3), false);
+  RETURN NEXT is(msar.is_pkey_col('no_pkey'::regclass::oid, 1), false);
+  RETURN NEXT is(msar.is_pkey_col('no_pkey'::regclass::oid, 2), false);
+  RETURN NEXT is(msar.is_pkey_col('no_pkey'::regclass::oid, 3), false);
+END;
+$$ LANGUAGE plpgsql;
+
+
 CREATE OR REPLACE FUNCTION test_create_role() RETURNS SETOF TEXT AS $$
 BEGIN
   PERFORM msar.create_role('testuser', 'mypass1234', true);

From 16f746eeba00a3d883697489b9b5201a2d022a2c Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 4 Sep 2024 18:27:43 +0800
Subject: [PATCH 0802/1141] fix small bug preventing copying unique constraints

---
 db/sql/00_msar.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 3664a6295c..399d77f563 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2695,7 +2695,7 @@ SELECT jsonb_agg(
     'columns', ARRAY[attname],
     'deferrable', condeferrable,
     'fkey_relation_id', confrelid::bigint,
-    'fkey_columns', confkey,
+    'fkey_columns', coalesce(confkey, ARRAY[]::smallint[]),
     'fkey_update_action', confupdtype,
     'fkey_delete_action', confdeltype,
     'fkey_match_type', confmatchtype

From addd30c8a4daa66189b741f63d39dcbd38542c42 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 4 Sep 2024 21:31:26 +0800
Subject: [PATCH 0803/1141] add initial tests for column moving

---
 db/sql/test_00_msar.sql | 151 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 151 insertions(+)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index c16c1c33f2..e86e6c012e 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -4941,3 +4941,154 @@ SET ROLE test_intern2;
 RETURN NEXT is(msar.list_database_privileges_for_current_role(dat_id), '["CONNECT", "TEMPORARY"]');
 END;
 $$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION __setup_move_columns() RETURNS SETOF TEXT AS $$
+BEGIN
+-- Authors -----------------------------------------------------------------------------------------
+CREATE TABLE "Authors" (
+    id integer PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
+    "First Name" text,
+    "Last Name" text,
+    "Website" text
+);
+INSERT INTO "Authors" OVERRIDING SYSTEM VALUE VALUES
+  (1, 'Edwin A.', 'Abbott', NULL),
+  (2, 'M.A.S.', 'Abdel Haleem', NULL),
+  (3, 'Joe', 'Abercrombie', 'https://joeabercrombie.com/'),
+  (4, 'Daniel', 'Abraham', 'https://www.danielabraham.com/'),
+  (5, NULL, 'Abu''l-Fazl', NULL);
+PERFORM setval(pg_get_serial_sequence('"Authors"', 'id'), (SELECT max(id) FROM "Authors"));
+-- colors ------------------------------------------------------------------------------------------
+CREATE TABLE colors (id integer PRIMARY KEY GENERATED ALWAYS AS IDENTITY, name text);
+INSERT INTO colors (name) VALUES ('red'), ('blue');
+-- fav_combos --------------------------------------------------------------------------------------
+CREATE TABLE fav_combos (number integer, color integer);
+ALTER TABLE fav_combos ADD UNIQUE (number, color);
+INSERT INTO fav_combos VALUES (5, 1), (5, 2), (10, 1), (10, 2);
+-- Books -------------------------------------------------------------------------------------------
+CREATE TABLE "Books" (
+    id integer PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
+    "Title" text,
+    "Publication Year" date,
+    "ISBN" text,
+    "Dewey Decimal" text,
+    "Author" integer REFERENCES "Authors"(id),
+    "Publisher" integer,
+    "Favorite Number" integer,
+    "Favorite Color" integer REFERENCES colors(id)
+);
+ALTER TABLE "Books" DROP COLUMN "Publication Year";
+INSERT INTO "Books" OVERRIDING SYSTEM VALUE VALUES
+  (1059, 'The History of Akbar, Volume 7', '06-742-4416-8', NULL, 5, 116, 5, 1),
+  (960, 'The Dragon''s Path', '978-68173-11-59-3', '813.6', 4, 167, 5, 1),
+  (419, 'Half a King', '0007-55-020-0', '823.92', 3, 113, 5, 1),
+  (1047, 'The Heroes', '0-3-1604498-9', '823.92', 3, 167, 5, 1),
+  (103, 'Best Served Cold', '031604-49-5-4', '823.92', 3, 167, 5, 1),
+  (1302, 'The Widow''s House', '0-31-620398-X', '813.6', 4, 167, 5, NULL),
+  (99, 'Before They Are Hanged', '1-5910-2641-5', '823.92', 3, 195, 5, 2),
+  (530, 'Last Argument of Kings', '1591-02-690-3', '823.92', 3, 195, NULL, 1),
+  (104, 'Best Served Cold', '978-9552-8856-8-1', '823.92', 3, 167, 5, 1),
+  (1185, 'The Qur''an', '0-19-957071-X', '297.122521', 2, 171, 5, 1),
+  (1053, 'The History of Akbar, Volume 1', '0-674-42775-0', '954.02', 5, 116, 5, 1),
+  (959, 'The Dragon''s Path', '978-0-316080-68-2', '813.6', 4, 167, 5, 1),
+  (1056, 'The History of Akbar, Volume 4', '0-67497-503-0', NULL, 5, 116, 5, 1),
+  (69, 'A Shadow in Summer', '07-6-531340-5', '813.6', 4, 243, 5, 2),
+  (907, 'The Blade Itself', '978-1984-1-1636-1', '823.92', 3, 195, 5, 1),
+  (1086, 'The King''s Blood', '978-03-1608-077-4', '813.6', 4, 167, 5, 1),
+  (1060, 'The History of Akbar, Volume 8', '0-674-24417-6', NULL, 5, 116, 5, 1),
+  (70, 'A Shadow in Summer', '978-9-5-7802049-0', '813.6', 4, 243, 5, 2),
+  (1278, 'The Tyrant''s Law', '0-316-08070-5', '813.6', 4, 167, 5, 1),
+  (1054, 'The History of Akbar, Volume 2', '0-67-450494-1', NULL, 5, 116, 10, 1),
+  (1057, 'The History of Akbar, Volume 5', '0-6-7498395-5', NULL, 5, 116, 5, 1),
+  (351, 'Flatland: A Romance of Many Dimensions', '0-486-27263-X', '530.11', 1, 71, 5, 1),
+  (729, 'Red Country', '03161-87-20-8', '823.92', 3, 167, 5, 1),
+  (906, 'The Blade Itself', '1-591-02594-X', '823.92', 3, 195, 5, 1),
+  (1058, 'The History of Akbar, Volume 6', '067-4-98613-X', NULL, 5, 116, 10, 1),
+  (1055, 'The History of Akbar, Volume 3', '0-6-7465982-1', NULL, 5, 116, 5, 1);
+PERFORM setval(pg_get_serial_sequence('"Books"', 'id'), (SELECT max(id) FROM "Books"));
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION __setup_move_columns_nodata() RETURNS SETOF TEXT AS $$
+BEGIN
+-- Authors -----------------------------------------------------------------------------------------
+CREATE TABLE "Authors" (
+    id integer PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
+    "First Name" text,
+    "Last Name" text,
+    "Website" text
+);
+-- colors ------------------------------------------------------------------------------------------
+CREATE TABLE colors (id integer PRIMARY KEY GENERATED ALWAYS AS IDENTITY, name text);
+-- fav_combos --------------------------------------------------------------------------------------
+CREATE TABLE fav_combos (number integer, color integer);
+ALTER TABLE fav_combos ADD UNIQUE (number, color);
+-- Books -------------------------------------------------------------------------------------------
+CREATE TABLE "Books" (
+    id integer PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
+    "Title" text,
+    "Publication Year" date,
+    "ISBN" text,
+    "Dewey Decimal" text,
+    "Author" integer REFERENCES "Authors"(id),
+    "Publisher" integer,
+    "Favorite Number" integer UNIQUE,
+    "Favorite Color" integer REFERENCES colors(id)
+);
+ALTER TABLE "Books" DROP COLUMN "Publication Year";
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_move_columns_to_referenced_table_nodata() RETURNS SETOF TEXT AS $$
+BEGIN
+  PERFORM __setup_move_columns_nodata();
+  PERFORM msar.move_columns_to_referenced_table(
+    '"Books"'::regclass, '"Authors"'::regclass, ARRAY[8, 9]::smallint[]
+  );
+  RETURN NEXT columns_are(
+    'Authors',
+    ARRAY['id', 'First Name', 'Last Name', 'Website', 'Favorite Number', 'Favorite Color']
+  );
+  RETURN NEXT columns_are(
+    'Books',
+    ARRAY['id', 'Title', 'ISBN', 'Dewey Decimal', 'Author', 'Publisher']
+  );
+  RETURN NEXT col_is_unique('Authors', 'Favorite Number');
+  RETURN NEXT fk_ok('Authors', 'Favorite Color', 'colors', 'id');
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_move_columns_to_referenced_table() RETURNS SETOF TEXT AS $$
+BEGIN
+  PERFORM __setup_move_columns();
+  PERFORM msar.move_columns_to_referenced_table(
+    '"Books"'::regclass, '"Authors"'::regclass, ARRAY[8, 9]::smallint[]
+  );
+  RETURN NEXT columns_are(
+    'Authors',
+    ARRAY['id', 'First Name', 'Last Name', 'Website', 'Favorite Number', 'Favorite Color']
+  );
+  RETURN NEXT columns_are(
+    'Books',
+    ARRAY['id', 'Title', 'ISBN', 'Dewey Decimal', 'Author', 'Publisher']
+  );
+  RETURN NEXT fk_ok('Authors', 'Favorite Color', 'colors', 'id');
+  RETURN NEXT results_eq(
+    $h$SELECT * FROM "Authors" ORDER BY id;$h$,
+    $w$VALUES
+      (1, 'Edwin A.', 'Abbott', NULL, 5, 1),
+      (2, 'M.A.S.', 'Abdel Haleem', NULL, 5, 1),
+      (3, 'Joe', 'Abercrombie', 'https://joeabercrombie.com/', 5, 1),
+      (4, 'Daniel', 'Abraham', 'https://www.danielabraham.com/', 5, 1),
+      (5, NULL, 'Abu''l-Fazl', NULL, 5, 1),
+      (6, 'Joe', 'Abercrombie', 'https://joeabercrombie.com/', 5, 2),
+      (7, 'Joe', 'Abercrombie', 'https://joeabercrombie.com/',NULL,1),
+      (8, 'Daniel', 'Abraham', 'https://www.danielabraham.com/', 5, 2);
+    $w$
+  );
+END;
+$$ LANGUAGE plpgsql;

From 9bbf2a4a9cfbe41a9f30456a3e291e2df3005080 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 4 Sep 2024 21:49:29 +0800
Subject: [PATCH 0804/1141] upgrade python-decouple in an attempt to get
 pipeline passing

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index e290467dd7..bb80b496a2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,7 +18,7 @@ drf-nested-routers==0.93.3
 psycopg==3.1.18
 psycopg-binary==3.1.18
 psycopg2-binary==2.9.7
-python-decouple==3.4
+python-decouple==3.8
 requests==2.32.0
 SQLAlchemy==1.4.26
 responses==0.22.0

From 2a7786acb7ea7d03e37cfcd4f31ee7bfb17ad835 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 4 Sep 2024 21:59:43 +0800
Subject: [PATCH 0805/1141] upgrade another package to satisfy pipeline

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index bb80b496a2..22a99ee461 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ Django==4.2.11
 dj-database-url==0.5.0
 django-filter==23.5
 django-modern-rpc==1.0.3
-django-property-filter==1.1.0
+django-property-filter==1.2.0
 django-request-cache==1.3.0
 djangorestframework==3.14.0
 django-fernet-encrypted-fields==0.1.3

From 19503945dd0bc9083bf392a09d7f67bf70b693af Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Wed, 4 Sep 2024 22:06:21 +0800
Subject: [PATCH 0806/1141] upgrade another package to satisfy pipeline
 :hankey:

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 22a99ee461..6f3d5caeb8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ alembic==1.6.5
 bidict==0.21.4
 frozendict==2.1.3
 charset-normalizer==2.0.7
-clevercsv==0.6.8
+clevercsv==0.8.2
 Django==4.2.11
 dj-database-url==0.5.0
 django-filter==23.5

From 2031651e0dcf9e4eaf1236b6f1538a2fa57c9dc2 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 5 Sep 2024 15:12:20 +0800
Subject: [PATCH 0807/1141] add record self summary for lister

---
 db/sql/00_msar.sql      | 45 ++++++++++++++++++++++++++++++++++----
 db/sql/test_00_msar.sql | 48 ++++++++++++++++++++++++++---------------
 2 files changed, 72 insertions(+), 21 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 472d1945d0..36569f2c13 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -415,6 +415,18 @@ SELECT EXISTS (
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION
+msar.get_pkey_attnum(rel_id regclass) RETURNS smallint AS $$/*
+Get the attnum of the single-column primary key for a relation if it has one. If not, return null.
+
+Args:
+  rel_id:  The OID of the relation.
+*/
+SELECT conkey[1] FROM pg_constraint
+WHERE cardinality(conkey) = 1 AND conrelid=rel_id AND contype='p';
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
 CREATE OR REPLACE FUNCTION
 msar.is_default_possibly_dynamic(tab_id oid, col_id integer) RETURNS boolean AS $$/*
 Determine whether the default value for the given column is an expression or constant.
@@ -4260,6 +4272,21 @@ FROM fkey_map_cte;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION msar.build_self_summary_expr(tab_id oid) RETURNS TEXT AS $$/*
+*/
+SELECT CONCAT(msar.build_summary_expr(tab_id), ' AS __mathesar_summary');
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.build_self_summary_json_expr(tab_id oid, cte_name text) RETURNS TEXT AS $$/*
+*/
+SELECT format('jsonb_object_agg(%1$I.', cte_name)
+  || quote_ident(msar.get_pkey_attnum(tab_id)::text)
+  || ', __mathesar_summary)'
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
 CREATE OR REPLACE FUNCTION
 msar.list_records_from_table(
   tab_id oid,
@@ -4267,7 +4294,8 @@ msar.list_records_from_table(
   offset_ integer,
   order_ jsonb,
   filter_ jsonb,
-  group_ jsonb
+  group_ jsonb,
+  return_record_summaries boolean DEFAULT false
 ) RETURNS jsonb AS $$/*
 Get records from a table. Only columns to which the user has access are returned.
 
@@ -4278,6 +4306,7 @@ Args:
   order_: An array of ordering definition objects.
   filter_: An array of filter definition objects.
   group_: An array of group definition objects.
+  return_record_summaries : Whether to return a summary for each record listed.
 
 The order definition objects should have the form
   {"attnum": <int>, "direction": <text>}
@@ -4290,7 +4319,7 @@ BEGIN
     WITH count_cte AS (
       SELECT count(1) AS count FROM %2$I.%3$I %7$s
     ), enriched_results_cte AS (
-      SELECT %1$s, %8$s FROM %2$I.%3$I %7$s %6$s LIMIT %4$L OFFSET %5$L
+      SELECT %1$s, %8$s, %15$s FROM %2$I.%3$I %7$s %6$s LIMIT %4$L OFFSET %5$L
     ), results_ranked_cte AS (
       SELECT *, row_number() OVER (%6$s) - 1 AS __mathesar_result_idx FROM enriched_results_cte
     ), groups_cte AS (
@@ -4300,7 +4329,8 @@ BEGIN
       'results', %9$s,
       'count', coalesce(max(count_cte.count), 0),
       'grouping', %10$s,
-      'preview_data', %14$s,
+      'linked_record_summaries', %14$s,
+      'record_summaries', %16$s,
       'query', $iq$SELECT %1$s FROM %2$I.%3$I %7$s %6$s LIMIT %4$L OFFSET %5$L$iq$
     )
     FROM enriched_results_cte
@@ -4320,7 +4350,14 @@ BEGIN
     COALESCE(msar.build_groups_cte_expr(tab_id, 'results_ranked_cte', group_), 'NULL AS id'),
     msar.build_summary_cte_expr_for_table(tab_id),
     msar.build_summary_join_expr_for_table(tab_id, 'enriched_results_cte'),
-    COALESCE(msar.build_summary_json_expr_for_table(tab_id), 'NULL')
+    COALESCE(msar.build_summary_json_expr_for_table(tab_id), 'NULL'),
+    msar.build_self_summary_expr(tab_id),
+    COALESCE(
+      CASE WHEN return_record_summaries THEN
+        msar.build_self_summary_json_expr(tab_id, 'enriched_results_cte')
+      END,
+      'NULL'
+    )
   ) INTO records;
   RETURN records;
 END;
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index ade5855591..c654dcae5d 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -3087,7 +3087,8 @@ BEGIN
         {"1": 3, "2": 2, "3": "abcde", "4": {"k": 3242348}, "5": true}
       ],
       "grouping": null,
-      "preview_data": null
+      "linked_record_summaries": null,
+      "record_summaries": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data(col1) AS "2",'
@@ -3113,7 +3114,8 @@ BEGIN
         {"1": 1, "2": 5, "3": "sdflkj", "4": "s", "5": {"a": "val"}}
       ],
       "grouping": null,
-      "preview_data": null
+      "linked_record_summaries": null,
+      "record_summaries": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data(col1) AS "2",'
@@ -3139,7 +3141,8 @@ BEGIN
         {"1": 1, "2": 5, "3": "sdflkj", "4": "s", "5": {"a": "val"}}
       ],
       "grouping": null,
-      "preview_data": null
+      "linked_record_summaries": null,
+      "record_summaries": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data(col1) AS "2",',
@@ -3171,7 +3174,8 @@ BEGIN
         {"2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]}
       ],
       "grouping": null,
-      "preview_data": null
+      "linked_record_summaries": null,
+      "record_summaries": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(col1) AS "2", msar.format_data(col2) AS "3",',
@@ -3197,7 +3201,8 @@ BEGIN
         {"2": 2, "3": "abcde", "4": {"k": 3242348}, "5": true}
       ],
       "grouping": null,
-      "preview_data": null
+      "linked_record_summaries": null,
+      "record_summaries": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(col1) AS "2", msar.format_data(col2) AS "3",',
@@ -3275,7 +3280,8 @@ BEGIN
           }
         ]
       },
-      "preview_data": null
+      "linked_record_summaries": null,
+      "record_summaries": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data("First Name") AS "2",'
@@ -3312,7 +3318,8 @@ BEGIN
           }
         ]
       },
-      "preview_data": null
+      "linked_record_summaries": null,
+      "record_summaries": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data("First Name") AS "2",'
@@ -3345,7 +3352,8 @@ BEGIN
           {"id": 2, "count": 2, "results_eq": {"4": "2020-04 AD"}, "result_indices": [1, 2]}
         ]
       },
-      "preview_data": null
+      "linked_record_summaries": null,
+      "record_summaries": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data("First Name") AS "2",'
@@ -3379,7 +3387,8 @@ BEGIN
           {"id": 1, "count": 8, "results_eq": {"4": "2020 AD"}, "result_indices": [0, 1, 2, 3, 4]}
         ]
       },
-      "preview_data": null
+      "linked_record_summaries": null,
+      "record_summaries": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data("First Name") AS "2",'
@@ -3891,7 +3900,8 @@ BEGIN
         {"1": 2, "2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]}
       ],
       "grouping": null,
-      "preview_data": null
+      "linked_record_summaries": null,
+      "record_summaries": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data(col1) AS "2",',
@@ -3907,7 +3917,8 @@ BEGIN
       "count": 0,
       "results": [],
       "grouping": null,
-      "preview_data": null
+      "linked_record_summaries": null,
+      "record_summaries": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data(col1) AS "2",',
@@ -4296,7 +4307,7 @@ BEGIN
         {"1": 6, "2": 1.234, "3": 3, "4": "Kelly Kellison", "5": 80, "6": "kkellison@example.edu"}
       ],
       "grouping": null,
-      "preview_data": {
+      "linked_record_summaries": {
         "2": {
           "1.234": "Alice Alison",
           "2.345": "Bob Bobinson"
@@ -4306,7 +4317,8 @@ BEGIN
           "2": "Dave Davidson",
           "3": "Eve Evilson"
         }
-      }
+      },
+      "record_summaries": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data("Counselor") AS "2",',
@@ -4333,7 +4345,7 @@ BEGIN
         {"1": 4, "2": 2.345, "3": 1, "4": "Ida Idalia", "5": 90, "6": "iidalia@example.edu"}
       ],
       "grouping": null,
-      "preview_data": {
+      "linked_record_summaries": {
         "2": {
           "1.234": "Alice Alison",
           "2.345": "Bob Bobinson"
@@ -4342,7 +4354,8 @@ BEGIN
           "1": "Carol Carlson",
           "2": "Dave Davidson"
         }
-      }
+      },
+      "record_summaries": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data("Counselor") AS "2",',
@@ -4372,7 +4385,7 @@ BEGIN
         "preproc": null,
         "groups": [{"id": 1, "count": 3, "results_eq": {"2": 1.234}, "result_indices": [0, 1]}]
       },
-      "preview_data": {
+      "linked_record_summaries": {
         "2": {
           "1.234": "Alice Alison"
         },
@@ -4380,7 +4393,8 @@ BEGIN
           "1": "Carol Carlson",
           "2": "Dave Davidson"
         }
-      }
+      },
+      "record_summaries": null
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data("Counselor") AS "2",',

From e3218e4eb179fe6be079f208d12b33e2b902ab77 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 5 Sep 2024 16:49:01 +0800
Subject: [PATCH 0808/1141] simplify record self summaries

---
 db/sql/00_msar.sql | 86 ++++++++++++++++++++++++++--------------------
 1 file changed, 48 insertions(+), 38 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 36569f2c13..e577686efb 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -4210,21 +4210,35 @@ Args:
   tab_id: The table for whose fkey values' linked records we'll get summaries.
 */
 WITH fkey_map_cte AS (SELECT * FROM msar.get_fkey_map_cte(tab_id))
-SELECT ', ' || string_agg(
-  format(
-    $c$summary_cte_%1$s AS (
-      SELECT
-        msar.format_data(%2$I) AS fkey,
-        %3$s AS summary
-      FROM %4$I.%5$I
-    )$c$,
-    conkey,
-    msar.get_column_name(target_oid, confkey),
-    msar.build_summary_expr(target_oid),
-    msar.get_relation_schema_name(target_oid),
-    msar.get_relation_name(target_oid)
-  ), ', '
-)
+SELECT ', '
+  || NULLIF(
+    concat_ws(', ',
+      'summary_cte_self AS (SELECT msar.format_data('
+        || quote_ident(msar.get_column_name(tab_id, msar.get_pkey_attnum(tab_id)))
+        || format(
+          ') AS key, %1$s AS summary FROM %2$I.%3$I)',
+          msar.build_summary_expr(tab_id),
+          msar.get_relation_schema_name(tab_id),
+          msar.get_relation_name(tab_id)
+        ),
+      string_agg(
+        format(
+          $c$summary_cte_%1$s AS (
+            SELECT
+              msar.format_data(%2$I) AS fkey,
+              %3$s AS summary
+            FROM %4$I.%5$I
+          )$c$,
+          conkey,
+          msar.get_column_name(target_oid, confkey),
+          msar.build_summary_expr(target_oid),
+          msar.get_relation_schema_name(target_oid),
+          msar.get_relation_name(target_oid)
+        ), ', '
+      )
+    ),
+    ''
+  )
 FROM fkey_map_cte;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
@@ -4238,13 +4252,18 @@ Args:
   cte_name: The name of the main CTE we'll join the summary CTEs to.
 */
 WITH fkey_map_cte AS (SELECT * FROM msar.get_fkey_map_cte(tab_id))
-SELECT string_agg(
-  format(
-    $j$
-    LEFT JOIN summary_cte_%1$s ON %2$I.%1$I = summary_cte_%1$s.fkey$j$,
-    conkey,
-    cte_name
-  ), ' '
+SELECT concat(
+  format(E'\nLEFT JOIN summary_cte_self ON %1$I.', cte_name)
+  || quote_ident(msar.get_pkey_attnum(tab_id)::text)
+  || ' = summary_cte_self.key' ,
+  string_agg(
+    format(
+      $j$
+      LEFT JOIN summary_cte_%1$s ON %2$I.%1$I = summary_cte_%1$s.fkey$j$,
+      conkey,
+      cte_name
+    ), ' '
+  )
 )
 FROM fkey_map_cte;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
@@ -4272,18 +4291,12 @@ FROM fkey_map_cte;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
-CREATE OR REPLACE FUNCTION msar.build_self_summary_expr(tab_id oid) RETURNS TEXT AS $$/*
-*/
-SELECT CONCAT(msar.build_summary_expr(tab_id), ' AS __mathesar_summary');
-$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
-
-
 CREATE OR REPLACE FUNCTION
-msar.build_self_summary_json_expr(tab_id oid, cte_name text) RETURNS TEXT AS $$/*
+msar.build_self_summary_json_expr(tab_id oid) RETURNS TEXT AS $$/*
 */
-SELECT format('jsonb_object_agg(%1$I.', cte_name)
-  || quote_ident(msar.get_pkey_attnum(tab_id)::text)
-  || ', __mathesar_summary)'
+SELECT CASE WHEN quote_ident(msar.get_pkey_attnum(tab_id)::text) IS NOT NULL THEN
+  'jsonb_object_agg(summary_cte_self.key, summary_cte_self.summary)'
+END;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
@@ -4319,7 +4332,7 @@ BEGIN
     WITH count_cte AS (
       SELECT count(1) AS count FROM %2$I.%3$I %7$s
     ), enriched_results_cte AS (
-      SELECT %1$s, %8$s, %15$s FROM %2$I.%3$I %7$s %6$s LIMIT %4$L OFFSET %5$L
+      SELECT %1$s, %8$s FROM %2$I.%3$I %7$s %6$s LIMIT %4$L OFFSET %5$L
     ), results_ranked_cte AS (
       SELECT *, row_number() OVER (%6$s) - 1 AS __mathesar_result_idx FROM enriched_results_cte
     ), groups_cte AS (
@@ -4330,7 +4343,7 @@ BEGIN
       'count', coalesce(max(count_cte.count), 0),
       'grouping', %10$s,
       'linked_record_summaries', %14$s,
-      'record_summaries', %16$s,
+      'record_summaries', %15$s,
       'query', $iq$SELECT %1$s FROM %2$I.%3$I %7$s %6$s LIMIT %4$L OFFSET %5$L$iq$
     )
     FROM enriched_results_cte
@@ -4351,11 +4364,8 @@ BEGIN
     msar.build_summary_cte_expr_for_table(tab_id),
     msar.build_summary_join_expr_for_table(tab_id, 'enriched_results_cte'),
     COALESCE(msar.build_summary_json_expr_for_table(tab_id), 'NULL'),
-    msar.build_self_summary_expr(tab_id),
     COALESCE(
-      CASE WHEN return_record_summaries THEN
-        msar.build_self_summary_json_expr(tab_id, 'enriched_results_cte')
-      END,
+      CASE WHEN return_record_summaries THEN msar.build_self_summary_json_expr(tab_id) END,
       'NULL'
     )
   ) INTO records;

From 616303aa0190b22575a4e9ae173a6e985bde6a03 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 5 Sep 2024 18:05:16 +0800
Subject: [PATCH 0809/1141] set up some todos for while I'm gone

---
 db/sql/00_msar.sql | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 399d77f563..70a3c5abd1 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3899,6 +3899,9 @@ DECLARE
   move_con_defs CONSTANT jsonb := msar.get_extracted_con_def_jsonb(source_tab_id, move_col_ids);
   added_col_ids smallint[];
 BEGIN
+  -- TODO test to make sure no multi-col fkeys reference the moved columns
+  -- TODO just throw error if _any_ multicol constraint references the moved columns.
+  -- TODO check behavior if one of the moving columns is referenced by another table (should raise)
   SELECT conkey, confkey INTO source_join_col_id, target_join_col_id
     FROM msar.get_fkey_map_table(source_tab_id)
     WHERE target_oid = target_tab_id;
@@ -3949,8 +3952,6 @@ BEGIN
     msar.build_source_update_move_cols_equal_expr(source_tab_id, move_col_ids, 'insert_cte')
   );
   PERFORM msar.add_constraints(target_tab_id, move_con_defs);
-  -- TODO make sure no multi-col fkeys reference the moved columns
-  -- TODO just throw error if _any_ multicol constraint references the moved columns.
   PERFORM msar.drop_columns(source_tab_id, variadic move_col_ids);
 END;
 $$ LANGUAGE plpgsql;

From 6046b5b8f5013b61f2b047867cd4d3a355ef87a0 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 5 Sep 2024 18:23:12 +0800
Subject: [PATCH 0810/1141] add summaries to record search and get

---
 db/sql/00_msar.sql      | 37 +++++++++++++++++++++++++++----------
 db/sql/test_00_msar.sql |  2 +-
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index e577686efb..e3d9cf10b7 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -416,14 +416,20 @@ $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-msar.get_pkey_attnum(rel_id regclass) RETURNS smallint AS $$/*
+msar.get_selectable_pkey_attnum(rel_id regclass) RETURNS smallint AS $$/*
 Get the attnum of the single-column primary key for a relation if it has one. If not, return null.
 
+The attnum will only be returned if the current user has SELECT on that column.
+
 Args:
   rel_id:  The OID of the relation.
 */
 SELECT conkey[1] FROM pg_constraint
-WHERE cardinality(conkey) = 1 AND conrelid=rel_id AND contype='p';
+WHERE
+  conrelid = rel_id
+  AND cardinality(conkey) = 1
+  AND contype='p'
+  AND has_column_privilege(rel_id, conkey[1], 'SELECT');
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
@@ -4214,7 +4220,7 @@ SELECT ', '
   || NULLIF(
     concat_ws(', ',
       'summary_cte_self AS (SELECT msar.format_data('
-        || quote_ident(msar.get_column_name(tab_id, msar.get_pkey_attnum(tab_id)))
+        || quote_ident(msar.get_column_name(tab_id, msar.get_selectable_pkey_attnum(tab_id)))
         || format(
           ') AS key, %1$s AS summary FROM %2$I.%3$I)',
           msar.build_summary_expr(tab_id),
@@ -4254,7 +4260,7 @@ Args:
 WITH fkey_map_cte AS (SELECT * FROM msar.get_fkey_map_cte(tab_id))
 SELECT concat(
   format(E'\nLEFT JOIN summary_cte_self ON %1$I.', cte_name)
-  || quote_ident(msar.get_pkey_attnum(tab_id)::text)
+  || quote_ident(msar.get_selectable_pkey_attnum(tab_id)::text)
   || ' = summary_cte_self.key' ,
   string_agg(
     format(
@@ -4294,7 +4300,7 @@ $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 CREATE OR REPLACE FUNCTION
 msar.build_self_summary_json_expr(tab_id oid) RETURNS TEXT AS $$/*
 */
-SELECT CASE WHEN quote_ident(msar.get_pkey_attnum(tab_id)::text) IS NOT NULL THEN
+SELECT CASE WHEN quote_ident(msar.get_selectable_pkey_attnum(tab_id)::text) IS NOT NULL THEN
   'jsonb_object_agg(summary_cte_self.key, summary_cte_self.summary)'
 END;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
@@ -4407,7 +4413,8 @@ CREATE OR REPLACE FUNCTION
 msar.search_records_from_table(
   tab_id oid,
   search_ jsonb,
-  limit_ integer
+  limit_ integer,
+  return_record_summaries boolean DEFAULT false
 ) RETURNS jsonb AS $$/*
 Get records from a table, filtering and sorting according to a search specification.
 
@@ -4434,7 +4441,8 @@ BEGIN
     SELECT jsonb_build_object(
       'results', coalesce(jsonb_agg(row_to_json(results_cte.*)), jsonb_build_array()),
       'count', coalesce(max(count_cte.count), 0),
-      'preview_data', %9$s,
+      'linked_record_summaries', %9$s,
+      'record_summaries', %10$s,
       'query', $iq$SELECT %1$s FROM %2$I.%3$I %4$s ORDER BY %6$s LIMIT %5$L$iq$
     )
     FROM results_cte %8$s
@@ -4451,7 +4459,11 @@ BEGIN
     ),
     msar.build_summary_cte_expr_for_table(tab_id),
     msar.build_summary_join_expr_for_table(tab_id, 'results_cte'),
-    COALESCE(msar.build_summary_json_expr_for_table(tab_id), 'NULL')
+    COALESCE(msar.build_summary_json_expr_for_table(tab_id), 'NULL'),
+    COALESCE(
+      CASE WHEN return_record_summaries THEN msar.build_self_summary_json_expr(tab_id) END,
+      'NULL'
+    )
   ) INTO records;
   RETURN records;
 END;
@@ -4459,7 +4471,11 @@ $$ LANGUAGE plpgsql;
 
 
 CREATE OR REPLACE FUNCTION
-msar.get_record_from_table(tab_id oid, rec_id anyelement) RETURNS jsonb AS $$/*
+msar.get_record_from_table(
+  tab_id oid,
+  rec_id anyelement,
+  return_record_summaries boolean DEFAULT false
+) RETURNS jsonb AS $$/*
 Get single record from a table. Only columns to which the user has access are returned.
 
 Args:
@@ -4476,7 +4492,8 @@ SELECT msar.list_records_from_table(
       jsonb_build_object('type', 'literal', 'value', rec_id)
     )
   ),
-  null
+  null,
+  return_record_summaries
 )
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index c654dcae5d..96dc7b4de1 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -4461,7 +4461,7 @@ BEGIN
       '"Students"'::regclass::oid,
       '[{"attnum": 4, "literal": "k"}]',
       2
-    ) -> 'preview_data',
+    ) -> 'linked_record_summaries',
     $a${
       "2": {"1.234": "Alice Alison", "2.345": "Bob Bobinson"},
       "3": {"3": "Eve Evilson"}

From 58b8b96b82e5230e5b27861773fc932f330b8f90 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 5 Sep 2024 18:30:06 +0800
Subject: [PATCH 0811/1141] add record self summaries to record adder

---
 db/sql/00_msar.sql      | 15 ++++++++++++---
 db/sql/test_00_msar.sql | 20 +++++++++++++-------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index e3d9cf10b7..3d84166ce1 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -4551,7 +4551,11 @@ $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-msar.add_record_to_table(tab_id oid, rec_def jsonb) RETURNS jsonb AS $$/*
+msar.add_record_to_table(
+  tab_id oid,
+  rec_def jsonb,
+  return_record_summaries boolean DEFAULT false
+) RETURNS jsonb AS $$/*
 Add a record to a table.
 
 Args:
@@ -4571,7 +4575,8 @@ BEGIN
     WITH insert_cte AS (%1$s RETURNING %2$s)%4$s
     SELECT jsonb_build_object(
       'results', %3$s,
-      'preview_data', %6$s
+      'linked_record_summaries', %6$s,
+      'record_summaries', %7$s
     )
     FROM insert_cte %5$s
     $i$,
@@ -4580,7 +4585,11 @@ BEGIN
     msar.build_results_jsonb_expr(tab_id, 'insert_cte', null),
     msar.build_summary_cte_expr_for_table(tab_id),
     msar.build_summary_join_expr_for_table(tab_id, 'insert_cte'),
-    COALESCE(msar.build_summary_json_expr_for_table(tab_id), 'NULL')
+    COALESCE(msar.build_summary_json_expr_for_table(tab_id), 'NULL'),
+    COALESCE(
+      CASE WHEN return_record_summaries THEN msar.build_self_summary_json_expr(tab_id) END,
+      'NULL'
+    )
   ) INTO rec_created;
   RETURN rec_created;
 END;
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 96dc7b4de1..27e38a1479 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -4102,7 +4102,8 @@ BEGIN
     ),
     $a${
       "results": [{"1": 4, "2": 234, "3": "ab234", "4": {"key": "val"}, "5": {"key2": "val2"}}],
-      "preview_data": null
+      "linked_record_summaries": null,
+      "record_summaries": null
     }$a$
   );
 END;
@@ -4122,7 +4123,8 @@ BEGIN
     ),
     $a${
       "results": [{"1": 4, "2": 234, "3": "ab234", "4": {"key": "val"}, "5": {"key2": "val2"}}],
-      "preview_data": null
+      "linked_record_summaries": null,
+      "record_summaries": null
     }$a$
   );
 END;
@@ -4142,7 +4144,8 @@ BEGIN
     ),
     $a${
       "results": [{"1": 4, "2": 200, "3": "ab234", "4": {"key": "val"}, "5": {"key2": "val2"}}],
-      "preview_data": null
+      "linked_record_summaries": null,
+      "record_summaries": null
     }$a$
   );
 END;
@@ -4162,7 +4165,8 @@ BEGIN
     ),
     $a${
       "results": [{"1": 4, "2": null, "3": "ab234", "4": {"key": "val"}, "5": {"key2": "val2"}}],
-      "preview_data": null
+      "linked_record_summaries": null,
+      "record_summaries": null
     }$a$
   );
 END;
@@ -4182,7 +4186,8 @@ BEGIN
     ),
     $a${
       "results": [{"1": 4, "2": null, "3": "ab234", "4": 3, "5": "234"}],
-      "preview_data": null
+      "linked_record_summaries": null,
+      "record_summaries": null
     }$a$
   );
 END;
@@ -4420,10 +4425,11 @@ BEGIN
       "results": [
         {"1": 7, "2": 2.345, "3": 1, "4": "Larry Laurelson", "5": 70, "6": "llaurelson@example.edu"}
       ],
-      "preview_data": {
+      "linked_record_summaries": {
         "2": {"2.345": "Bob Bobinson"},
         "3": {"1": "Carol Carlson"}
-      }
+      },
+      "record_summaries": null
     }$a$
   );
 END;

From dfa07b87f3f1212518e9960081082ce94c708e0c Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Thu, 5 Sep 2024 18:34:34 +0800
Subject: [PATCH 0812/1141] add record self summaries to record patch

---
 db/sql/00_msar.sql      | 16 +++++++++++++---
 db/sql/test_00_msar.sql | 11 +++++++----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 3d84166ce1..0f47594e89 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -4611,7 +4611,12 @@ $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-msar.patch_record_in_table(tab_id oid, rec_id anyelement, rec_def jsonb) RETURNS jsonb AS $$/*
+msar.patch_record_in_table(
+  tab_id oid,
+  rec_id anyelement,
+  rec_def jsonb,
+  return_record_summaries boolean DEFAULT false
+) RETURNS jsonb AS $$/*
 Modify (update/patch) a record in a table.
 
 Args:
@@ -4632,7 +4637,8 @@ BEGIN
     WITH update_cte AS (%1$s %2$s RETURNING %3$s)%5$s
     SELECT jsonb_build_object(
       'results', %4$s,
-      'preview_data', %7$s
+      'linked_record_summaries', %7$s,
+      'record_summaries', %8$s
     )
     FROM update_cte %6$s
     $i$,
@@ -4649,7 +4655,11 @@ BEGIN
     msar.build_results_jsonb_expr(tab_id, 'update_cte', null),
     msar.build_summary_cte_expr_for_table(tab_id),
     msar.build_summary_join_expr_for_table(tab_id, 'update_cte'),
-    COALESCE(msar.build_summary_json_expr_for_table(tab_id), 'NULL')
+    COALESCE(msar.build_summary_json_expr_for_table(tab_id), 'NULL'),
+    COALESCE(
+      CASE WHEN return_record_summaries THEN msar.build_self_summary_json_expr(tab_id) END,
+      'NULL'
+    )
   ) INTO rec_modified;
   RETURN rec_modified;
 END;
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 27e38a1479..d535d21beb 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -4204,7 +4204,8 @@ BEGIN
     msar.patch_record_in_table( rel_id, 2, '{"2": 10}'),
     $p${
       "results": [{"1": 2, "2": 10, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]}],
-      "preview_data": null
+      "linked_record_summaries": null,
+      "record_summaries": null
     }$p$
   );
 END;
@@ -4221,7 +4222,8 @@ BEGIN
     msar.patch_record_in_table( rel_id, 2, '{"2": 10, "4": {"a": "json"}}'),
     $p${
       "results": [{"1": 2, "2": 10, "3": "sdflfflsk", "4": {"a": "json"}, "5": [1, 2, 3, 4]}],
-      "preview_data": null
+      "linked_record_summaries": null,
+      "record_summaries": null
     }$p$
   );
 END;
@@ -4449,10 +4451,11 @@ BEGIN
       "results": [
         {"1": 2, "2": 2.345, "3": 2, "4": "Gabby Gabberson", "5": 85, "6": "ggabberson@example.edu"}
       ],
-      "preview_data": {
+      "linked_record_summaries": {
         "2": {"2.345": "Bob Bobinson"},
         "3": {"2": "Dave Davidson"}
-      }
+      },
+      "record_summaries": null
     }$a$
   );
 END;

From a12e90d61052e27ae54af3a1edc03deedb530d7c Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 6 Sep 2024 00:05:08 +0800
Subject: [PATCH 0813/1141] simplify response getting for insert/update

---
 db/sql/00_msar.sql      | 61 ++++++++++++++++-------------------------
 db/sql/test_00_msar.sql | 17 +++++++++---
 2 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 0f47594e89..510ab0538f 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -4568,30 +4568,21 @@ insert.
 
 */
 DECLARE
+  rec_created_id text;
   rec_created jsonb;
 BEGIN
   EXECUTE format(
-    $i$
-    WITH insert_cte AS (%1$s RETURNING %2$s)%4$s
-    SELECT jsonb_build_object(
-      'results', %3$s,
-      'linked_record_summaries', %6$s,
-      'record_summaries', %7$s
-    )
-    FROM insert_cte %5$s
-    $i$,
+    'WITH insert_cte AS (%1$s RETURNING %2$s) SELECT msar.format_data(%3$I)::text FROM insert_cte',
     msar.build_single_insert_expr(tab_id, rec_def),
     msar.build_selectable_column_expr(tab_id),
-    msar.build_results_jsonb_expr(tab_id, 'insert_cte', null),
-    msar.build_summary_cte_expr_for_table(tab_id),
-    msar.build_summary_join_expr_for_table(tab_id, 'insert_cte'),
-    COALESCE(msar.build_summary_json_expr_for_table(tab_id), 'NULL'),
-    COALESCE(
-      CASE WHEN return_record_summaries THEN msar.build_self_summary_json_expr(tab_id) END,
-      'NULL'
-    )
-  ) INTO rec_created;
-  RETURN rec_created;
+    msar.get_pk_column(tab_id)
+  ) INTO rec_created_id;
+  rec_created := msar.get_record_from_table(tab_id, rec_created_id, return_record_summaries);
+  RETURN jsonb_build_object(
+    'results', rec_created -> 'results',
+    'record_summaries', rec_created -> 'record_summaries',
+    'linked_record_summaries', rec_created -> 'linked_record_summaries'
+  );
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
@@ -4630,18 +4621,14 @@ The `rec_def` object's form is defined by the record being updated.  It should h
 corresponding to the attnums of desired columns and values corresponding to values we should set.
 */
 DECLARE
+  rec_modified_id integer;
   rec_modified jsonb;
 BEGIN
   EXECUTE format(
-    $i$
-    WITH update_cte AS (%1$s %2$s RETURNING %3$s)%5$s
-    SELECT jsonb_build_object(
-      'results', %4$s,
-      'linked_record_summaries', %7$s,
-      'record_summaries', %8$s
-    )
-    FROM update_cte %6$s
-    $i$,
+    $p$
+    WITH update_cte AS (%1$s %2$s RETURNING %3$s)
+    SELECT msar.format_data(%4$I)::text FROM update_cte
+    $p$,
     msar.build_update_expr(tab_id, rec_def),
     msar.build_where_clause(
       tab_id, jsonb_build_object(
@@ -4652,15 +4639,13 @@ BEGIN
       )
     ),
     msar.build_selectable_column_expr(tab_id),
-    msar.build_results_jsonb_expr(tab_id, 'update_cte', null),
-    msar.build_summary_cte_expr_for_table(tab_id),
-    msar.build_summary_join_expr_for_table(tab_id, 'update_cte'),
-    COALESCE(msar.build_summary_json_expr_for_table(tab_id), 'NULL'),
-    COALESCE(
-      CASE WHEN return_record_summaries THEN msar.build_self_summary_json_expr(tab_id) END,
-      'NULL'
-    )
-  ) INTO rec_modified;
-  RETURN rec_modified;
+    msar.get_pk_column(tab_id)
+  ) INTO rec_modified_id;
+  rec_modified := msar.get_record_from_table(tab_id, rec_modified_id, return_record_summaries);
+  RETURN jsonb_build_object(
+    'results', rec_modified -> 'results',
+    'record_summaries', rec_modified -> 'record_summaries',
+    'linked_record_summaries', rec_modified -> 'linked_record_summaries'
+  );
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index d535d21beb..8b0bf6cbca 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -4301,7 +4301,8 @@ BEGIN
       offset_ => null,
       order_ => null,
       filter_ => null,
-      group_ => null
+      group_ => null,
+      return_record_summaries => true
     ),
     $j${
       "count": 6,
@@ -4325,7 +4326,14 @@ BEGIN
           "3": "Eve Evilson"
         }
       },
-      "record_summaries": null
+      "record_summaries":  {
+        "1": "Fred Fredrickson",
+        "2": "Gabby Gabberson",
+        "3": "Hank Hankson",
+        "4": "Ida Idalia",
+        "5": "James Jameson",
+        "6": "Kelly Kellison"
+      }
     }$j$ || jsonb_build_object(
       'query', concat(
         'SELECT msar.format_data(id) AS "1", msar.format_data("Counselor") AS "2",',
@@ -4421,7 +4429,8 @@ BEGIN
   RETURN NEXT is(
     msar.add_record_to_table(
       '"Students"'::regclass::oid,
-      '{"2": 2.345, "3": 1, "4": "Larry Laurelson", "5": 70, "6": "llaurelson@example.edu"}'
+      '{"2": 2.345, "3": 1, "4": "Larry Laurelson", "5": 70, "6": "llaurelson@example.edu"}',
+      true
     ),
     $a${
       "results": [
@@ -4431,7 +4440,7 @@ BEGIN
         "2": {"2.345": "Bob Bobinson"},
         "3": {"1": "Carol Carlson"}
       },
-      "record_summaries": null
+      "record_summaries": {"7": "Larry Laurelson"}
     }$a$
   );
 END;

From 14ae5e374a112e1b7914bfbf413a00c5d8e0c88c Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 6 Sep 2024 00:10:22 +0800
Subject: [PATCH 0814/1141] add record self-summary to python wrappers for
 select

---
 db/records/operations/select.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/db/records/operations/select.py b/db/records/operations/select.py
index b93418626c..9ef568d79e 100644
--- a/db/records/operations/select.py
+++ b/db/records/operations/select.py
@@ -19,6 +19,7 @@ def list_records_from_table(
         order=None,
         filter=None,
         group=None,
+        return_record_summaries=False
 ):
     """
     Get records from a table.
@@ -46,6 +47,7 @@ def list_records_from_table(
         json.dumps(order) if order is not None else None,
         json.dumps(filter) if filter is not None else None,
         json.dumps(group) if group is not None else None,
+        return_record_summaries
     ).fetchone()[0]
     return result
 
@@ -54,6 +56,7 @@ def get_record_from_table(
         conn,
         record_id,
         table_oid,
+        return_record_summaries=False
 ):
     """
     Get single record from a table by its primary key
@@ -69,6 +72,7 @@ def get_record_from_table(
         'get_record_from_table',
         table_oid,
         record_id,
+        return_record_summaries,
     ).fetchone()[0]
     return result
 
@@ -78,6 +82,7 @@ def search_records_from_table(
         table_oid,
         search=[],
         limit=10,
+        return_record_summaries=False,
 ):
     """
     Get records from a table, according to a search specification
@@ -94,7 +99,8 @@ def search_records_from_table(
     """
     search = search or []
     result = db_conn.exec_msar_func(
-        conn, 'search_records_from_table', table_oid, json.dumps(search), limit
+        conn, 'search_records_from_table',
+        table_oid, json.dumps(search), limit, return_record_summaries
     ).fetchone()[0]
     return result
 

From 177bfd81ae7af87ccc53f037c0f811bb53b8dd77 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 6 Sep 2024 00:13:08 +0800
Subject: [PATCH 0815/1141] wire record summary getting to update/insert python

---
 db/records/operations/insert.py | 5 +++--
 db/records/operations/update.py | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/db/records/operations/insert.py b/db/records/operations/insert.py
index 26def03bb0..bec20df1e8 100644
--- a/db/records/operations/insert.py
+++ b/db/records/operations/insert.py
@@ -16,13 +16,14 @@
 READ_SIZE = 20000
 
 
-def add_record_to_table(conn, record_def, table_oid):
+def add_record_to_table(conn, record_def, table_oid, return_record_summaries=False):
     """Add a record to a table."""
     result = db_conn.exec_msar_func(
         conn,
         'add_record_to_table',
         table_oid,
-        json.dumps(record_def)
+        json.dumps(record_def),
+        return_record_summaries
     ).fetchone()[0]
     return result
 
diff --git a/db/records/operations/update.py b/db/records/operations/update.py
index 0d06bd2bb6..1535251966 100644
--- a/db/records/operations/update.py
+++ b/db/records/operations/update.py
@@ -7,14 +7,15 @@
 from db.records.exceptions import InvalidDate, InvalidDateFormat
 
 
-def patch_record_in_table(conn, record_def, record_id, table_oid):
+def patch_record_in_table(conn, record_def, record_id, table_oid, return_record_summaries=False):
     """Update a record in a table."""
     result = db_conn.exec_msar_func(
         conn,
         'patch_record_in_table',
         table_oid,
         record_id,
-        json.dumps(record_def)
+        json.dumps(record_def),
+        return_record_summaries
     ).fetchone()[0]
     return result
 

From 4e3217cb50734b1e0b138594254d5aba0e6458cb Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 5 Sep 2024 23:06:48 +0530
Subject: [PATCH 0816/1141] add sql changes for retuning oid with name for
 add_mathesar_table and prepare_table_for_import

---
 db/sql/00_msar.sql | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 472d1945d0..2edd7cb4d8 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2838,8 +2838,8 @@ DROP FUNCTION IF EXISTS msar.add_mathesar_table(oid, text, jsonb, jsonb, text);
 
 CREATE OR REPLACE FUNCTION
 msar.add_mathesar_table(sch_id oid, tab_name text, col_defs jsonb, con_defs jsonb, comment_ text)
-  RETURNS oid AS $$/*
-Add a table, with a default id column, returning the OID of the created table.
+  RETURNS jsonb AS $$/*
+Add a table, with a default id column, returning the OID & name of the created table.
 
 Args:
   sch_id: The OID of the schema where the table will be created.
@@ -2886,7 +2886,10 @@ BEGIN
   PERFORM __msar.add_table(fq_table_name, column_defs, constraint_defs);
   created_table_id := fq_table_name::regclass::oid;
   PERFORM msar.comment_on_table(created_table_id, comment_);
-  RETURN created_table_id;
+  RETURN jsonb_build_object(
+    'oid', created_table_id,
+    'name', created_table_id::regclass::text
+  );
 END;
 $$ LANGUAGE plpgsql;
 
@@ -2932,7 +2935,7 @@ DECLARE
   copy_sql text;
 BEGIN
   -- Create string table
-  rel_id := msar.add_mathesar_table(sch_id, tab_name, col_defs, NULL, comment_);
+  rel_id := msar.add_mathesar_table(sch_id, tab_name, col_defs, NULL, comment_) ->> 'oid';
   -- Get unquoted schema and table name for the created table
   SELECT nspname, relname INTO sch_name, rel_name
   FROM pg_catalog.pg_class AS pgc
@@ -2956,7 +2959,8 @@ BEGIN
   copy_sql := format('COPY %I.%I (%s) FROM STDIN CSV %s', sch_name, rel_name, col_names_sql, options_sql);
   RETURN jsonb_build_object(
     'copy_sql', copy_sql,
-    'table_oid', rel_id
+    'table_oid', rel_id,
+    'table_name', rel_id::regclass::text
   );
 END;
 $$ LANGUAGE plpgsql;
@@ -3660,7 +3664,7 @@ The elements of the mapping_columns array must have the form
 DECLARE
   added_table_id oid;
 BEGIN
-  added_table_id := msar.add_mathesar_table(sch_id, tab_name, NULL, NULL, NULL);
+  added_table_id := msar.add_mathesar_table(sch_id, tab_name, NULL, NULL, NULL) ->> 'oid';
   PERFORM msar.add_foreign_key_column(column_name, added_table_id, referent_table_oid)
   FROM jsonb_to_recordset(mapping_columns) AS x(column_name text, referent_table_oid oid);
   RETURN added_table_id;
@@ -3708,7 +3712,7 @@ BEGIN
     extracted_col_defs,
     extracted_con_defs,
     format('Extracted from %s', __msar.get_qualified_relation_name(tab_id))
-  );
+  ) ->> 'oid';
   -- Create a new fkey column and foreign key linking the original table to the extracted one.
   fkey_attnum := msar.add_foreign_key_column(fkey_name, tab_id, extracted_table_id);
   -- Insert the data from the original table's columns into the extracted columns, and add

From fd12f00142cc6eaedc4a8df88b059e7f821c2040 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 5 Sep 2024 23:08:52 +0530
Subject: [PATCH 0817/1141] make response changes for db functions

---
 db/tables/operations/create.py  | 3 ++-
 db/tables/operations/import_.py | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/db/tables/operations/create.py b/db/tables/operations/create.py
index d2c486cbe5..c5840dee89 100644
--- a/db/tables/operations/create.py
+++ b/db/tables/operations/create.py
@@ -122,7 +122,8 @@ def prepare_table_for_import(
     ).fetchone()[0]
     return (
         import_info['copy_sql'],
-        import_info['table_oid']
+        import_info['table_oid'],
+        import_info['table_name']
     )
 
 
diff --git a/db/tables/operations/import_.py b/db/tables/operations/import_.py
index 7929bff2e3..5ece633728 100644
--- a/db/tables/operations/import_.py
+++ b/db/tables/operations/import_.py
@@ -25,7 +25,7 @@ def import_csv(data_file_id, table_name, schema_oid, conn, comment=None):
     with open(file_path, 'rb') as csv_file:
         csv_reader = get_sv_reader(csv_file, header, dialect)
         column_names = process_column_names(csv_reader.fieldnames)
-    copy_sql, table_oid = prepare_table_for_import(
+    copy_sql, table_oid, table_name = prepare_table_for_import(
         table_name,
         schema_oid,
         column_names,
@@ -44,7 +44,7 @@ def import_csv(data_file_id, table_name, schema_oid, conn, comment=None):
         conversion_encoding,
         conn
     )
-    return table_oid
+    return {"oid": table_oid, "name": table_name}
 
 
 def insert_csv_records(

From 8da3167f33e391e40f8f37846581323c55e8fb63 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 5 Sep 2024 23:11:13 +0530
Subject: [PATCH 0818/1141] add documentation and wire up RPC endpoints

---
 db/sql/00_msar.sql                       |  5 +++--
 docs/docs/api/rpc.md                     |  1 +
 mathesar/rpc/tables/base.py              | 24 ++++++++++++++++++------
 mathesar/tests/rpc/tables/test_t_base.py | 12 ++++++------
 4 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 2edd7cb4d8..c47ea237b7 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2907,12 +2907,13 @@ msar.prepare_table_for_import(
   comment_ text
 ) RETURNS jsonb AS $$/*
 Add a table, with a default id column, returning a JSON object containing
-a properly formatted SQL statement to carry out `COPY FROM` and also contains table_oid of the created table.
+a properly formatted SQL statement to carry out `COPY FROM`, table_oid & table_name of the created table.
 
 Each returned JSON object will have the form:
   {
     "copy_sql": <str>,
-    "table_oid": <int>
+    "table_oid": <int>,
+    "table_name": <str>
   }
 
 Args:
diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 0c63655df4..4610abae4a 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -127,6 +127,7 @@ To use an RPC function:
       - get_import_preview
       - list_joinable
       - TableInfo
+      - AddedTableInfo
       - SettableTableInfo
       - JoinableTableRecord
       - JoinableTableInfo
diff --git a/mathesar/rpc/tables/base.py b/mathesar/rpc/tables/base.py
index 8b971ca9a3..ffc05fc4c5 100644
--- a/mathesar/rpc/tables/base.py
+++ b/mathesar/rpc/tables/base.py
@@ -51,6 +51,18 @@ class TableInfo(TypedDict):
     current_role_owns: bool
 
 
+class AddedTableInfo(TypedDict):
+    """
+    Information about a newly created table.
+
+    Attributes:
+        oid: The `oid` of the table in the schema.
+        name: The name of the table.
+    """
+    oid: int
+    name: str
+
+
 class SettableTableInfo(TypedDict):
     """
     Information about a table, restricted to settable fields.
@@ -191,7 +203,7 @@ def add(
     constraint_data_list: list[CreatableConstraintInfo] = [],
     comment: str = None,
     **kwargs
-) -> int:
+) -> AddedTableInfo:
     """
     Add a table with a default id column.
 
@@ -204,7 +216,7 @@ def add(
         comment: The comment for the new table.
 
     Returns:
-        The `oid` of the created table.
+        The `oid` & `name` of the created table.
     """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
@@ -264,24 +276,24 @@ def patch(
 def import_(
     *,
     data_file_id: int,
-    table_name: str,
     schema_oid: int,
     database_id: int,
+    table_name: str = None,
     comment: str = None,
     **kwargs
-) -> int:
+) -> AddedTableInfo:
     """
     Import a CSV/TSV into a table.
 
     Args:
         data_file_id: The Django id of the DataFile containing desired CSV/TSV.
-        table_name: Name of the table to be imported.
         schema_oid: Identity of the schema in the user's database.
         database_id: The Django id of the database containing the table.
+        table_name: Name of the table to be imported.
         comment: The comment for the new table.
 
     Returns:
-        The `oid` of the created table.
+        The `oid` and `name` of the created table.
     """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
diff --git a/mathesar/tests/rpc/tables/test_t_base.py b/mathesar/tests/rpc/tables/test_t_base.py
index 714c1e4af3..2997c8b7e2 100644
--- a/mathesar/tests/rpc/tables/test_t_base.py
+++ b/mathesar/tests/rpc/tables/test_t_base.py
@@ -148,11 +148,11 @@ def mock_connect(_database_id, user):
     def mock_table_add(table_name, _schema_oid, conn, column_data_list, constraint_data_list, comment):
         if _schema_oid != schema_oid:
             raise AssertionError('incorrect parameters passed')
-        return 1964474
+        return {"oid": 1964474, "name": "newtable"}
     monkeypatch.setattr(tables.base, 'connect', mock_connect)
     monkeypatch.setattr(tables.base, 'create_table_on_database', mock_table_add)
-    actual_table_oid = tables.add(table_name='newtable', schema_oid=2200, database_id=11, request=request)
-    assert actual_table_oid == 1964474
+    actual_table_info = tables.add(table_name='newtable', schema_oid=2200, database_id=11, request=request)
+    assert actual_table_info == {"oid": 1964474, "name": "newtable"}
 
 
 def test_tables_patch(rf, monkeypatch):
@@ -215,17 +215,17 @@ def mock_connect(_database_id, user):
     def mock_table_import(_data_file_id, table_name, _schema_oid, conn, comment):
         if _schema_oid != schema_oid and _data_file_id != data_file_id:
             raise AssertionError('incorrect parameters passed')
-        return 1964474
+        return {"oid": 1964474, "name": "imported_table"}
     monkeypatch.setattr(tables.base, 'connect', mock_connect)
     monkeypatch.setattr(tables.base, 'import_csv', mock_table_import)
-    imported_table_oid = tables.import_(
+    imported_table_info = tables.import_(
         data_file_id=10,
         table_name='imported_table',
         schema_oid=2200,
         database_id=11,
         request=request
     )
-    assert imported_table_oid == 1964474
+    assert imported_table_info == {"oid": 1964474, "name": "imported_table"}
 
 
 def test_tables_preview(rf, monkeypatch):

From e51e08e8b71c4d72ea5925a6914049c6433329c9 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 5 Sep 2024 23:30:35 +0530
Subject: [PATCH 0819/1141] fix tests and return non stringified oids

---
 db/sql/00_msar.sql             | 4 ++--
 db/tables/operations/create.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index c47ea237b7..429f7d5a03 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2887,7 +2887,7 @@ BEGIN
   created_table_id := fq_table_name::regclass::oid;
   PERFORM msar.comment_on_table(created_table_id, comment_);
   RETURN jsonb_build_object(
-    'oid', created_table_id,
+    'oid', created_table_id::bigint,
     'name', created_table_id::regclass::text
   );
 END;
@@ -2960,7 +2960,7 @@ BEGIN
   copy_sql := format('COPY %I.%I (%s) FROM STDIN CSV %s', sch_name, rel_name, col_names_sql, options_sql);
   RETURN jsonb_build_object(
     'copy_sql', copy_sql,
-    'table_oid', rel_id,
+    'table_oid', rel_id::bigint,
     'table_name', rel_id::regclass::text
   );
 END;
diff --git a/db/tables/operations/create.py b/db/tables/operations/create.py
index c5840dee89..699ac9aaad 100644
--- a/db/tables/operations/create.py
+++ b/db/tables/operations/create.py
@@ -30,7 +30,7 @@ def create_mathesar_table(engine, table_name, schema_oid, columns=[], constraint
         json.dumps(columns),
         json.dumps(constraints),
         comment
-    ).fetchone()[0]
+    ).fetchone()[0]["oid"]
 
 
 def create_table_on_database(
@@ -52,7 +52,7 @@ def create_table_on_database(
         comment: The comment for the new table. (optional)
 
     Returns:
-        Returns the OID of the created table.
+        Returns the OID and name of the created table.
     """
     return exec_msar_func(
         conn,

From ecf5a425f39fa24a2e6425a70baf4a89779b4ce6 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 5 Sep 2024 23:40:01 +0530
Subject: [PATCH 0820/1141] add optional tag for the table_name

---
 db/sql/00_msar.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 429f7d5a03..3a19c2e34a 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2918,7 +2918,7 @@ Each returned JSON object will have the form:
 
 Args:
   sch_id: The OID of the schema where the table will be created.
-  tab_name: The unquoted name for the new table.
+  tab_name (optional): The unquoted name for the new table.
   col_defs: The columns for the new table, in order.
   header: Whether or not the file contains a header line with the names of each column in the file.
   delimiter: The character that separates columns within each row (line) of the file.

From ab4f7b6b846a5b27137bb18735d8a04c2bdb655d Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 6 Sep 2024 02:11:10 +0530
Subject: [PATCH 0821/1141] fix twice quoting of name in response

---
 db/sql/00_msar.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 3a19c2e34a..bb80ff2ae4 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2888,8 +2888,8 @@ BEGIN
   PERFORM msar.comment_on_table(created_table_id, comment_);
   RETURN jsonb_build_object(
     'oid', created_table_id::bigint,
-    'name', created_table_id::regclass::text
-  );
+    'name', relname
+  ) FROM pg_catalog.pg_class WHERE oid = created_table_id;
 END;
 $$ LANGUAGE plpgsql;
 
@@ -2961,8 +2961,8 @@ BEGIN
   RETURN jsonb_build_object(
     'copy_sql', copy_sql,
     'table_oid', rel_id::bigint,
-    'table_name', rel_id::regclass::text
-  );
+    'table_name', relname
+  ) FROM pg_catalog.pg_class WHERE oid = rel_id;
 END;
 $$ LANGUAGE plpgsql;
 

From 72bc62ba98ce10818c0b9f2fc7dfa54321067699 Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Fri, 6 Sep 2024 11:05:23 +0800
Subject: [PATCH 0822/1141] wire up new record summaries param to RPC endpoint

---
 mathesar/rpc/records.py            | 52 +++++++++++++++------
 mathesar/tests/rpc/test_records.py | 73 ++++++++++++++++++++++--------
 2 files changed, 93 insertions(+), 32 deletions(-)

diff --git a/mathesar/rpc/records.py b/mathesar/rpc/records.py
index 95ea27b861..8558b67b6c 100644
--- a/mathesar/rpc/records.py
+++ b/mathesar/rpc/records.py
@@ -140,13 +140,16 @@ class RecordList(TypedDict):
         count: The total number of records in the table.
         results: An array of record objects.
         grouping: Information for displaying grouped records.
-        preview_data: Information for previewing foreign key values,
-            provides a map of foreign key to a text summary.
+        linked_record_smmaries: Information for previewing foreign key
+            values, provides a map of foreign key to a text summary.
+        record_summaries: Information for previewing returned records.
     """
     count: int
     results: list[dict]
     grouping: GroupingResponse
-    preview_data: dict[str, dict[str, str]]
+    linked_record_summaries: dict[str, dict[str, str]]
+    record_summaries: dict[str, str]
+    query: str
 
     @classmethod
     def from_dict(cls, d):
@@ -154,7 +157,8 @@ def from_dict(cls, d):
             count=d["count"],
             results=d["results"],
             grouping=d.get("grouping"),
-            preview_data=d.get("preview_data"),
+            linked_record_summaries=d.get("linked_record_summaries"),
+            record_summaries=d.get("record_summaries"),
             query=d["query"],
         )
 
@@ -170,17 +174,20 @@ class RecordAdded(TypedDict):
 
     Attributes:
         results: An array of a single record objects (the one added).
-        preview_data: Information for previewing foreign key values,
-            provides a map of foreign key to a text summary.
+        linked_record_summaries: Information for previewing foreign key
+            values, provides a map of foreign key to a text summary.
+        record_summaries: Information for previewing an added record.
     """
     results: list[dict]
-    preview_data: dict[str, dict[str, str]]
+    linked_record_summaries: dict[str, dict[str, str]]
+    record_summaries: dict[str, str]
 
     @classmethod
     def from_dict(cls, d):
         return cls(
             results=d["results"],
-            preview_data=d.get("preview_data"),
+            linked_record_summaries=d.get("linked_record_summaries"),
+            record_summaries=d.get("record_summaries"),
         )
 
 
@@ -196,6 +203,7 @@ def list_(
         order: list[OrderBy] = None,
         filter: Filter = None,
         grouping: Grouping = None,
+        return_record_summaries: bool = False,
         **kwargs
 ) -> RecordList:
     """
@@ -206,10 +214,12 @@ def list_(
         database_id: The Django id of the database containing the table.
         limit: The maximum number of rows we'll return.
         offset: The number of rows to skip before returning records from
-                 following rows.
+            following rows.
         order: An array of ordering definition objects.
         filter: An array of filter definition objects.
         grouping: An array of group definition objects.
+        return_record_summaries: Whether to return summaries of retrieved
+            records.
 
     Returns:
         The requested records, along with some metadata.
@@ -224,6 +234,7 @@ def list_(
             order=order,
             filter=filter,
             group=grouping,
+            return_record_summaries=return_record_summaries,
         )
     return RecordList.from_dict(record_info)
 
@@ -236,6 +247,7 @@ def get(
         record_id: Any,
         table_oid: int,
         database_id: int,
+        return_record_summaries: bool = False,
         **kwargs
 ) -> RecordList:
     """
@@ -245,6 +257,8 @@ def get(
         record_id: The primary key value of the record to be gotten.
         table_oid: Identity of the table in the user's database.
         database_id: The Django id of the database containing the table.
+        return_record_summaries: Whether to return summaries of the
+            retrieved record.
 
     Returns:
         The requested record, along with some metadata.
@@ -255,6 +269,7 @@ def get(
             conn,
             record_id,
             table_oid,
+            return_record_summaries=return_record_summaries
         )
     return RecordList.from_dict(record_info)
 
@@ -267,6 +282,7 @@ def add(
         record_def: dict,
         table_oid: int,
         database_id: int,
+        return_record_summaries: bool = False,
         **kwargs
 ) -> RecordAdded:
     """
@@ -283,6 +299,8 @@ def add(
         record_def: An object representing the record to be added.
         table_oid: Identity of the table in the user's database.
         database_id: The Django id of the database containing the table.
+        return_record_summaries: Whether to return summaries of the added
+            record.
 
     Returns:
         The created record, along with some metadata.
@@ -293,6 +311,7 @@ def add(
             conn,
             record_def,
             table_oid,
+            return_record_summaries=return_record_summaries,
         )
     return RecordAdded.from_dict(record_info)
 
@@ -306,21 +325,25 @@ def patch(
         record_id: Any,
         table_oid: int,
         database_id: int,
+        return_record_summaries: bool = False,
         **kwargs
 ) -> RecordAdded:
     """
     Modify a record in a table.
 
-    The form of the `record_def` is determined by the underlying table.  Keys
-    should be attnums, and values should be the desired value for that column in
-    the modified record. Explicit `null` values will set null for that value
-    (with obvious exceptions where that would violate some constraint).
+    The form of the `record_def` is determined by the underlying table.
+    Keys should be attnums, and values should be the desired value for
+    that column in the modified record. Explicit `null` values will set
+    null for that value (with obvious exceptions where that would violate
+    some constraint).
 
     Args:
         record_def: An object representing the record to be added.
         record_id: The primary key value of the record to modify.
         table_oid: Identity of the table in the user's database.
         database_id: The Django id of the database containing the table.
+        return_record_summaries: Whether to return summaries of the
+            modified record.
 
     Returns:
         The modified record, along with some metadata.
@@ -332,6 +355,7 @@ def patch(
             record_def,
             record_id,
             table_oid,
+            return_record_summaries=return_record_summaries,
         )
     return RecordAdded.from_dict(record_info)
 
@@ -376,6 +400,7 @@ def search(
         database_id: int,
         search_params: list[SearchParam] = [],
         limit: int = 10,
+        return_record_summaries: bool = False,
         **kwargs
 ) -> RecordList:
     """
@@ -405,5 +430,6 @@ def search(
             table_oid,
             search=search_params,
             limit=limit,
+            return_record_summaries=return_record_summaries,
         )
     return RecordList.from_dict(record_info)
diff --git a/mathesar/tests/rpc/test_records.py b/mathesar/tests/rpc/test_records.py
index 1b90c7366e..a2dde6b6ba 100644
--- a/mathesar/tests/rpc/test_records.py
+++ b/mathesar/tests/rpc/test_records.py
@@ -37,8 +37,9 @@ def mock_list_records(
             order=None,
             filter=None,
             group=None,
+            return_record_summaries=False,
     ):
-        if _table_oid != table_oid:
+        if _table_oid != table_oid or return_record_summaries is False:
             raise AssertionError('incorrect parameters passed')
         return {
             "count": 50123,
@@ -50,7 +51,8 @@ def mock_list_records(
                     {"id": 3, "count": 8, "results_eq": {"1": "lsfj", "2": 3422}}
                 ]
             },
-            "preview_data": {"2": {"12345": "blkjdfslkj"}}
+            "linked_record_summaries": {"2": {"12345": "blkjdfslkj"}},
+            "record_summaries": {"3": "abcde"}
         }
 
     monkeypatch.setattr(records, 'connect', mock_connect)
@@ -64,11 +66,15 @@ def mock_list_records(
                 {"id": 3, "count": 8, "results_eq": {"1": "lsfj", "2": 3422}}
             ]
         },
-        "preview_data": {"2": {"12345": "blkjdfslkj"}},
+        "linked_record_summaries": {"2": {"12345": "blkjdfslkj"}},
+        "record_summaries": {"3": "abcde"},
         "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
     }
     actual_records_list = records.list_(
-        table_oid=table_oid, database_id=database_id, request=request
+        table_oid=table_oid,
+        database_id=database_id,
+        return_record_summaries=True,
+        request=request
     )
     assert actual_records_list == expect_records_list
 
@@ -96,15 +102,17 @@ def mock_get_record(
             conn,
             _record_id,
             _table_oid,
+            return_record_summaries=False,
     ):
-        if _table_oid != table_oid or _record_id != record_id:
+        if _table_oid != table_oid or _record_id != record_id or return_record_summaries is False:
             raise AssertionError('incorrect parameters passed')
         return {
             "count": 1,
             "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],
             "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
             "grouping": None,
-            "preview_data": {"2": {"12345": "blkjdfslkj"}},
+            "linked_record_summaries": {"2": {"12345": "blkjdfslkj"}},
+            "record_summaries": {"3": "abcde"},
         }
 
     monkeypatch.setattr(records, 'connect', mock_connect)
@@ -113,11 +121,16 @@ def mock_get_record(
         "count": 1,
         "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],
         "grouping": None,
-        "preview_data": {"2": {"12345": "blkjdfslkj"}},
+        "linked_record_summaries": {"2": {"12345": "blkjdfslkj"}},
+        "record_summaries": {"3": "abcde"},
         "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
     }
     actual_record = records.get(
-        record_id=record_id, table_oid=table_oid, database_id=database_id, request=request
+        record_id=record_id,
+        table_oid=table_oid,
+        database_id=database_id,
+        return_record_summaries=True,
+        request=request
     )
     assert actual_record == expect_record
 
@@ -145,22 +158,29 @@ def mock_add_record(
             conn,
             _record_def,
             _table_oid,
+            return_record_summaries=False,
     ):
-        if _table_oid != table_oid or _record_def != record_def:
+        if _table_oid != table_oid or _record_def != record_def or return_record_summaries is False:
             raise AssertionError('incorrect parameters passed')
         return {
             "results": [_record_def],
-            "preview_data": {"2": {"12345": "blkjdfslkj"}},
+            "linked_record_summaries": {"2": {"12345": "blkjdfslkj"}},
+            "record_summaries": {"3": "abcde"},
         }
 
     monkeypatch.setattr(records, 'connect', mock_connect)
     monkeypatch.setattr(records.record_insert, 'add_record_to_table', mock_add_record)
     expect_record = {
         "results": [record_def],
-        "preview_data": {"2": {"12345": "blkjdfslkj"}},
+        "linked_record_summaries": {"2": {"12345": "blkjdfslkj"}},
+        "record_summaries": {"3": "abcde"},
     }
     actual_record = records.add(
-        record_def=record_def, table_oid=table_oid, database_id=database_id, request=request
+        record_def=record_def,
+        table_oid=table_oid,
+        database_id=database_id,
+        return_record_summaries=True,
+        request=request
     )
     assert actual_record == expect_record
 
@@ -190,25 +210,34 @@ def mock_patch_record(
             _record_def,
             _record_id,
             _table_oid,
+            return_record_summaries=False,
     ):
-        if _table_oid != table_oid or _record_def != record_def or _record_id != record_id:
+        if (
+                _table_oid != table_oid
+                or _record_def != record_def
+                or _record_id != record_id
+                or return_record_summaries is False
+        ):
             raise AssertionError('incorrect parameters passed')
         return {
             "results": [_record_def | {"3": "another"}],
-            "preview_data": {"2": {"12345": "blkjdfslkj"}},
+            "linked_record_summaries": {"2": {"12345": "blkjdfslkj"}},
+            "record_summaries": {"3": "abcde"},
         }
 
     monkeypatch.setattr(records, 'connect', mock_connect)
     monkeypatch.setattr(records.record_update, 'patch_record_in_table', mock_patch_record)
     expect_record = {
         "results": [record_def | {"3": "another"}],
-        "preview_data": {"2": {"12345": "blkjdfslkj"}},
+        "linked_record_summaries": {"2": {"12345": "blkjdfslkj"}},
+        "record_summaries": {"3": "abcde"},
     }
     actual_record = records.patch(
         record_def=record_def,
         record_id=record_id,
         table_oid=table_oid,
         database_id=database_id,
+        return_record_summaries=True,
         request=request
     )
     assert actual_record == expect_record
@@ -274,13 +303,15 @@ def mock_search_records(
             _table_oid,
             search=[],
             limit=10,
+            return_record_summaries=False,
     ):
-        if _table_oid != table_oid:
+        if _table_oid != table_oid or return_record_summaries is False:
             raise AssertionError('incorrect parameters passed')
         return {
             "count": 50123,
             "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],
-            "preview_data": {"2": {"12345": "blkjdfslkj"}},
+            "linked_record_summaries": {"2": {"12345": "blkjdfslkj"}},
+            "record_summaries": {"3": "abcde"},
             "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
         }
 
@@ -290,10 +321,14 @@ def mock_search_records(
         "count": 50123,
         "results": [{"1": "abcde", "2": 12345}, {"1": "fghij", "2": 67890}],
         "grouping": None,
-        "preview_data": {"2": {"12345": "blkjdfslkj"}},
+        "linked_record_summaries": {"2": {"12345": "blkjdfslkj"}},
+        "record_summaries": {"3": "abcde"},
         "query": 'SELECT mycol AS "1", anothercol AS "2" FROM mytable LIMIT 2',
     }
     actual_records_list = records.search(
-        table_oid=table_oid, database_id=database_id, request=request
+        table_oid=table_oid,
+        database_id=database_id,
+        return_record_summaries=True,
+        request=request
     )
     assert actual_records_list == expect_records_list

From 930c81e16d706ad406be0caa7d760b474b9e904f Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 6 Sep 2024 19:09:33 +0530
Subject: [PATCH 0823/1141] test moving columns when having a single or
 multicol fk reference

---
 db/sql/00_msar.sql      |   7 +--
 db/sql/test_00_msar.sql | 115 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 118 insertions(+), 4 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 70a3c5abd1..bfd181ccb3 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -3899,9 +3899,10 @@ DECLARE
   move_con_defs CONSTANT jsonb := msar.get_extracted_con_def_jsonb(source_tab_id, move_col_ids);
   added_col_ids smallint[];
 BEGIN
-  -- TODO test to make sure no multi-col fkeys reference the moved columns
-  -- TODO just throw error if _any_ multicol constraint references the moved columns.
-  -- TODO check behavior if one of the moving columns is referenced by another table (should raise)
+  -- TODO Add a custom validator that throws pretty errors in these scenario:
+    -- test to make sure no multi-col fkeys reference the moved columns
+    -- just throw error if _any_ multicol constraint references the moved columns.
+    -- check behavior if one of the moving columns is referenced by another table (should raise)
   SELECT conkey, confkey INTO source_join_col_id, target_join_col_id
     FROM msar.get_fkey_map_table(source_tab_id)
     WHERE target_oid = target_tab_id;
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index e86e6c012e..67a4849895 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -5087,8 +5087,121 @@ BEGIN
       (5, NULL, 'Abu''l-Fazl', NULL, 5, 1),
       (6, 'Joe', 'Abercrombie', 'https://joeabercrombie.com/', 5, 2),
       (7, 'Joe', 'Abercrombie', 'https://joeabercrombie.com/',NULL,1),
-      (8, 'Daniel', 'Abraham', 'https://www.danielabraham.com/', 5, 2);
+      (8, 'Daniel', 'Abraham', 'https://www.danielabraham.com/', 5, 2),
+      (9, 'Daniel', 'Abraham', 'https://www.danielabraham.com/', 5, NULL),
+      (10, NULL, 'Abu''l-Fazl', NULL, 10, 1);
     $w$
   );
 END;
 $$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION __setup_move_columns_multicol_fk() RETURNS SETOF TEXT AS $$
+BEGIN
+CREATE TABLE target_table(
+  id integer PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
+  x text,
+  y integer
+);
+CREATE TABLE source_table(
+  id integer PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
+  c1 integer,
+  c2 integer,
+  c3 integer,
+  c4 integer REFERENCES target_table(id),
+  UNIQUE (c1, c2)
+);
+CREATE TABLE t1 (
+  id integer PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
+  a integer,
+  b integer,
+  c integer,
+  FOREIGN KEY (b, c) REFERENCES source_table (c1, c2)
+);
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_move_columns_not_referenced_by_multicol_fk() RETURNS SETOF TEXT AS $$
+BEGIN
+  PERFORM __setup_move_columns_multicol_fk();
+  PERFORM msar.move_columns_to_referenced_table(
+    'source_table'::regclass, 'target_table'::regclass, ARRAY[4]::smallint[]
+  );
+  RETURN NEXT columns_are(
+    'source_table',
+    ARRAY['id', 'c1', 'c2', 'c4']
+  );
+  RETURN NEXT columns_are(
+    'target_table',
+    ARRAY['id', 'x', 'y', 'c3']
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_move_columns_referenced_by_multicol_fk() RETURNS SETOF TEXT AS $$
+BEGIN
+  PERFORM __setup_move_columns_multicol_fk();
+  RETURN NEXT throws_ok(
+    $w$SELECT msar.move_columns_to_referenced_table(
+      'source_table'::regclass, 'target_table'::regclass, ARRAY[2, 3, 4]::smallint[]
+    );$w$,
+    '2BP01',
+    'cannot drop column c1 of table source_table because other objects depend on it'
+  );
+  RETURN NEXT columns_are(
+    'source_table',
+    ARRAY['id', 'c1', 'c2', 'c3', 'c4']
+  );
+  RETURN NEXT columns_are(
+    'target_table',
+    ARRAY['id', 'x', 'y']
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION __setup_move_columns_singlecol_fk() RETURNS SETOF TEXT AS $$
+BEGIN
+CREATE TABLE target_table(
+  id integer PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
+  x text,
+  y integer
+);
+CREATE TABLE source_table(
+  id integer PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
+  c1 integer,
+  c2 integer REFERENCES target_table(id),
+  UNIQUE (c1)
+);
+CREATE TABLE t1 (
+  id integer PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
+  a integer,
+  b integer,
+  FOREIGN KEY (b) REFERENCES source_table (c1)
+);
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_move_columns_referenced_by_singlecol_fk() RETURNS SETOF TEXT AS $$
+BEGIN
+  PERFORM __setup_move_columns_singlecol_fk();
+  RETURN NEXT throws_ok(
+    $w$SELECT msar.move_columns_to_referenced_table(
+      'source_table'::regclass, 'target_table'::regclass, ARRAY[2]::smallint[]
+    );$w$,
+    '2BP01',
+    'cannot drop column c1 of table source_table because other objects depend on it'
+  );
+  RETURN NEXT columns_are(
+    'source_table',
+    ARRAY['id', 'c1', 'c2']
+  );
+  RETURN NEXT columns_are(
+    'target_table',
+    ARRAY['id', 'x', 'y']
+  );
+END;
+$$ LANGUAGE plpgsql;

From 664c57690db3bf849af32a8fe2fd04353c46d59f Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 9 Sep 2024 19:47:11 +0530
Subject: [PATCH 0824/1141] Allow setting custom privileges without modifying
 access level and retain data when privileges are removed

---
 mathesar_ui/src/api/rpc/databases.ts          |   9 +-
 .../checkbox-group/CheckboxGroup.svelte       |   7 +-
 .../collapsible/Collapsible.scss              |   2 +-
 .../component-library/tabs/TabContainer.scss  |   4 +-
 .../DatabasePermissionsModal.svelte           |   8 +-
 .../permissions/DirectPrivilegeRow.svelte     |  91 +++++++-----
 .../permissions/PrivilegesSection.svelte      |  47 ++++--
 .../src/pages/database/permissions/utils.ts   | 135 ++++++++++++++++++
 8 files changed, 249 insertions(+), 54 deletions(-)
 create mode 100644 mathesar_ui/src/pages/database/permissions/utils.ts

diff --git a/mathesar_ui/src/api/rpc/databases.ts b/mathesar_ui/src/api/rpc/databases.ts
index 38855fe6bd..6b4e567ca5 100644
--- a/mathesar_ui/src/api/rpc/databases.ts
+++ b/mathesar_ui/src/api/rpc/databases.ts
@@ -1,5 +1,4 @@
 import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
-import { ImmutableSet } from '@mathesar-component-library';
 
 import type { RawConfiguredRole, RawRole } from './roles';
 import type { RawServer } from './servers';
@@ -10,8 +9,12 @@ export interface RawDatabase {
   server_id: RawServer['id'];
 }
 
-export const databasePrivileges = ['CREATE', 'CONNECT', 'TEMPORARY'] as const;
-export type DatabasePrivilege = (typeof databasePrivileges)[number];
+export const allDatabasePrivileges = [
+  'CREATE',
+  'CONNECT',
+  'TEMPORARY',
+] as const;
+export type DatabasePrivilege = (typeof allDatabasePrivileges)[number];
 
 export interface RawUnderlyingDatabase {
   oid: number;
diff --git a/mathesar_ui/src/component-library/checkbox-group/CheckboxGroup.svelte b/mathesar_ui/src/component-library/checkbox-group/CheckboxGroup.svelte
index 9ed775b439..77a37add71 100644
--- a/mathesar_ui/src/component-library/checkbox-group/CheckboxGroup.svelte
+++ b/mathesar_ui/src/component-library/checkbox-group/CheckboxGroup.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { SvelteComponent } from 'svelte';
+  import { type SvelteComponent, createEventDispatcher } from 'svelte';
 
   import Checkbox from '@mathesar-component-library-dir/checkbox/Checkbox.svelte';
   import type { LabelGetter } from '@mathesar-component-library-dir/common/utils/formatUtils';
@@ -9,6 +9,10 @@
 
   type Option = $$Generic;
 
+  const dispatch = createEventDispatcher<{
+    artificialChange: Option[];
+  }>();
+
   export let values: Option[] = [];
   export let isInline = false;
   export let options: readonly Option[] = [];
@@ -44,6 +48,7 @@
     } else {
       values = values.filter((value) => !valuesAreEqual(value, option));
     }
+    dispatch('artificialChange', values);
   }
 </script>
 
diff --git a/mathesar_ui/src/component-library/collapsible/Collapsible.scss b/mathesar_ui/src/component-library/collapsible/Collapsible.scss
index 84064edf4d..2a5208b418 100644
--- a/mathesar_ui/src/component-library/collapsible/Collapsible.scss
+++ b/mathesar_ui/src/component-library/collapsible/Collapsible.scss
@@ -15,7 +15,7 @@
       .collapsible-header-title {
         flex-grow: 1;
         overflow: hidden;
-        font-weight: 600;
+        font-weight: var(--Collapsible_header-font-weight, 600);
       }
       svg {
         flex-shrink: 0;
diff --git a/mathesar_ui/src/component-library/tabs/TabContainer.scss b/mathesar_ui/src/component-library/tabs/TabContainer.scss
index 3f8f2900af..7ad38e1266 100644
--- a/mathesar_ui/src/component-library/tabs/TabContainer.scss
+++ b/mathesar_ui/src/component-library/tabs/TabContainer.scss
@@ -25,7 +25,7 @@
       border-radius: 2px 2px 0px 0px;
       border-bottom: 2px solid transparent;
       margin-bottom: -1px;
-      margin-right: 2rem;
+      margin-right: var(--Tab_margin-right, 2rem);
       font-size: var(--text-size-large);
 
       > div,
@@ -113,7 +113,7 @@
       > li.tab {
         font-size: var(--text-size-base);
         text-align: center;
-        margin-right: 0;
+        margin-right: var(--Tab_margin-right, 0);
         > div {
           padding: 0.5rem 0;
         }
diff --git a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
index b4b5c9cdf6..b7f3572d36 100644
--- a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
+++ b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
@@ -38,7 +38,7 @@
   <span slot="title">
     {$_('database_permissions')}
   </span>
-  <div>
+  <div class="tabs">
     <TabContainer
       bind:activeTab
       {tabs}
@@ -55,3 +55,9 @@
     </TabContainer>
   </div>
 </ControlledModal>
+
+<style lang="scss">
+  .tabs {
+    --Tab_margin-right: var(--size-small);
+  }
+</style>
diff --git a/mathesar_ui/src/pages/database/permissions/DirectPrivilegeRow.svelte b/mathesar_ui/src/pages/database/permissions/DirectPrivilegeRow.svelte
index 738314cce4..a58691e944 100644
--- a/mathesar_ui/src/pages/database/permissions/DirectPrivilegeRow.svelte
+++ b/mathesar_ui/src/pages/database/permissions/DirectPrivilegeRow.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import { type RawDatabasePrivilegesForRole } from '@mathesar/api/rpc/databases';
   import { iconDeleteMinor } from '@mathesar/icons';
   import type { Role } from '@mathesar/models/Role';
   import {
@@ -10,44 +9,65 @@
     Collapsible,
     Icon,
     type ImmutableMap,
-    ImmutableSet,
     Select,
   } from '@mathesar-component-library';
 
+  import { type RoleAccessLevelAndPrivileges, customAccess } from './utils';
+
+  type AccessLevel = $$Generic;
+  type Privilege = $$Generic;
+
   export let rolesMap: ImmutableMap<Role['oid'], Role>;
-  export let dbPrivilegeForRole: RawDatabasePrivilegesForRole;
+  export let privileges: Privilege[];
+  export let accessLevels: { id: AccessLevel; privileges: Set<Privilege> }[];
+
+  export let roleAccessLevelAndPrivileges: RoleAccessLevelAndPrivileges<
+    AccessLevel,
+    Privilege
+  >;
+  export let setRoleAccessLevelAndPrivileges: (
+    roleOid: Role['oid'],
+    accessLevelPrivileges: RoleAccessLevelAndPrivileges<AccessLevel, Privilege>,
+  ) => void;
 
   let isRolePermissionsOpen = false;
 
-  const accessLevels = ['connect', 'connect_and_create', 'custom'] as const;
-  type AccessLevel = (typeof accessLevels)[number];
-  let access: AccessLevel;
+  $: role = rolesMap.get(roleAccessLevelAndPrivileges.roleOid);
+  $: members = role?.members;
 
-  $: directAccessLevelSet = new ImmutableSet(dbPrivilegeForRole.direct);
-  $: access = (() => {
-    if (directAccessLevelSet.equals(new Set(['CONNECT', 'CREATE']))) {
-      return 'connect_and_create';
-    }
-    if (directAccessLevelSet.equals(new Set(['CONNECT']))) {
-      return 'connect';
-    }
-    return 'custom';
-  })();
+  function removeAccess() {
+    setRoleAccessLevelAndPrivileges(
+      roleAccessLevelAndPrivileges.roleOid,
+      roleAccessLevelAndPrivileges.withAccessRemoved(),
+    );
+  }
 
-  $: role = rolesMap.get(dbPrivilegeForRole.role_oid);
-  $: members = role?.members;
+  function setCustomPrivileges(pr: Privilege[]) {
+    setRoleAccessLevelAndPrivileges(
+      roleAccessLevelAndPrivileges.roleOid,
+      roleAccessLevelAndPrivileges.withCustomAccess(pr),
+    );
+  }
 
-  function changeAccess(option?: AccessLevel) {
-    if (option) {
-      if (option === 'custom') {
+  function changeAccess(option?: AccessLevel | typeof customAccess) {
+    switch (option) {
+      case customAccess:
+        setRoleAccessLevelAndPrivileges(
+          roleAccessLevelAndPrivileges.roleOid,
+          roleAccessLevelAndPrivileges.withCustomAccess(),
+        );
         isRolePermissionsOpen = true;
-      }
+        break;
+      case undefined:
+        removeAccess();
+        break;
+      default:
+        setRoleAccessLevelAndPrivileges(
+          roleAccessLevelAndPrivileges.roleOid,
+          roleAccessLevelAndPrivileges.withAccess(option),
+        );
     }
   }
-
-  function permissionChange(e: unknown) {
-    console.log(e);
-  }
 </script>
 
 <div class="access-selection-section">
@@ -65,18 +85,18 @@
   </div>
   <div>
     <Select
-      options={accessLevels}
-      bind:value={access}
+      options={[...accessLevels.map((entry) => entry.id), customAccess]}
+      value={roleAccessLevelAndPrivileges.accessLevel}
       on:change={(e) => changeAccess(e.detail)}
     />
   </div>
   <div>
-    <Button appearance="secondary">
+    <Button appearance="secondary" on:click={removeAccess}>
       <Icon {...iconDeleteMinor} />
     </Button>
   </div>
 </div>
-{#if access === 'custom'}
+{#if roleAccessLevelAndPrivileges.accessLevel === customAccess}
   <div class="role-permissions-section">
     <Collapsible bind:isOpen={isRolePermissionsOpen} triggerAppearance="plain">
       <div slot="header">
@@ -84,11 +104,11 @@
       </div>
       <div class="content" slot="content">
         <CheckboxGroup
-          values={dbPrivilegeForRole.direct}
-          on:change={(e) => permissionChange(e)}
-          options={['CONNECT', 'CREATE']}
-          getCheckboxLabel={(o) => o}
-          getCheckboxHelp={(o) => o}
+          values={roleAccessLevelAndPrivileges.privileges.valuesArray()}
+          on:artificialChange={(e) => setCustomPrivileges(e.detail)}
+          options={privileges}
+          getCheckboxLabel={(o) => String(o)}
+          getCheckboxHelp={(o) => String(o)}
         />
       </div>
     </Collapsible>
@@ -115,6 +135,7 @@
   .role-permissions-section {
     margin-top: var(--size-super-ultra-small);
     --Collapsible_trigger-padding: var(--size-extreme-small) 0;
+    --Collapsible_header-font-weight: 400;
 
     .content {
       margin-top: var(--size-super-ultra-small);
diff --git a/mathesar_ui/src/pages/database/permissions/PrivilegesSection.svelte b/mathesar_ui/src/pages/database/permissions/PrivilegesSection.svelte
index 1996ff45fa..21c520dec8 100644
--- a/mathesar_ui/src/pages/database/permissions/PrivilegesSection.svelte
+++ b/mathesar_ui/src/pages/database/permissions/PrivilegesSection.svelte
@@ -1,7 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { RawDatabasePrivilegesForRole } from '@mathesar/api/rpc/databases';
+  import {
+    type DatabasePrivilege,
+    allDatabasePrivileges,
+  } from '@mathesar/api/rpc/databases';
   import Errors from '@mathesar/components/Errors.svelte';
   import {
     FormSubmit,
@@ -10,6 +13,7 @@
   } from '@mathesar/components/form';
   import { DatabaseRouteContext } from '@mathesar/contexts/DatabaseRouteContext';
   import type { Database } from '@mathesar/models/Database';
+  import type { Role } from '@mathesar/models/Role';
   import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
   import {
     ImmutableMap,
@@ -20,6 +24,11 @@
   } from '@mathesar-component-library';
 
   import DirectPrivilegeRow from './DirectPrivilegeRow.svelte';
+  import {
+    type RoleAccessLevelAndPrivileges,
+    dbAccessLevelConfigs,
+    getDbAccessPrivilegeMap,
+  } from './utils';
 
   export let controller: ModalController;
   export let databasePrivileges: ReturnType<
@@ -49,15 +58,28 @@
     $underlyingDatabase.error,
   ].filter((entry): entry is string => isDefinedNonNullable(entry));
 
-  $: dbPrivilegesMap =
-    $databasePrivileges.resolvedValue ??
-    new ImmutableMap<
-      RawDatabasePrivilegesForRole['role_oid'],
-      RawDatabasePrivilegesForRole
-    >();
-  $: dbPrivilegesLocalMap = new ImmutableMap(dbPrivilegesMap);
-  $: dbPrivileges = requiredField(dbPrivilegesLocalMap);
+  $: dbPrivileges = requiredField(
+    getDbAccessPrivilegeMap(
+      $databasePrivileges.resolvedValue ?? new ImmutableMap(),
+    ),
+  );
   $: form = makeForm({ dbPrivileges });
+  $: dbPrivilegesWithAccess = [...$dbPrivileges.values()].filter((entry) =>
+    isDefinedNonNullable(entry.accessLevel),
+  );
+
+  function setRoleAccessLevelAndPrivileges(
+    roleOid: Role['oid'],
+    accessLevelPrivileges: RoleAccessLevelAndPrivileges<
+      string,
+      DatabasePrivilege
+    >,
+  ) {
+    console.log(accessLevelPrivileges);
+    dbPrivileges.update((dbPrivMap) =>
+      dbPrivMap.with(roleOid, accessLevelPrivileges),
+    );
+  }
 
   function savePermissions() {}
 </script>
@@ -73,11 +95,14 @@
     <div class="section granted-access-section">
       <div class="title">{$_('granted_access')}</div>
       <div class="content">
-        {#each [...dbPrivilegesMap.values()] as dbPrivilegeForRole (dbPrivilegeForRole)}
+        {#each dbPrivilegesWithAccess as roleAccessLevelAndPrivileges (roleAccessLevelAndPrivileges.roleOid)}
           <div class="privilege-row">
             <DirectPrivilegeRow
               rolesMap={$roles.resolvedValue}
-              {dbPrivilegeForRole}
+              privileges={[...allDatabasePrivileges]}
+              accessLevels={dbAccessLevelConfigs}
+              {roleAccessLevelAndPrivileges}
+              {setRoleAccessLevelAndPrivileges}
             />
           </div>
         {/each}
diff --git a/mathesar_ui/src/pages/database/permissions/utils.ts b/mathesar_ui/src/pages/database/permissions/utils.ts
new file mode 100644
index 0000000000..0f9c0c589a
--- /dev/null
+++ b/mathesar_ui/src/pages/database/permissions/utils.ts
@@ -0,0 +1,135 @@
+import type {
+  DatabasePrivilege,
+  RawDatabasePrivilegesForRole,
+} from '@mathesar/api/rpc/databases';
+import type { Role } from '@mathesar/models/Role';
+import { type ImmutableMap, ImmutableSet } from '@mathesar-component-library';
+
+type AccessLevelConfig<A, P> = { id: A; privileges: Set<P> };
+
+export const customAccess = 'custom' as const;
+
+function getAccessLevelBasedOnPrivileges<A, P>(
+  accessLevelConfigs: AccessLevelConfig<A, P>[],
+  privileges: ImmutableSet<P>,
+): A | typeof customAccess {
+  const accessLevelObject = accessLevelConfigs.find((entry) =>
+    privileges.equals(entry.privileges),
+  );
+  return accessLevelObject ? accessLevelObject.id : customAccess;
+}
+
+type Props<A, P> = {
+  roleOid: Role['oid'];
+  accessLevelConfigs: AccessLevelConfig<A, P>[];
+  isAccessRemoved?: boolean;
+  savedPrivileges: P[];
+} & (
+  | {
+      privileges: P[];
+    }
+  | {
+      accessLevel: A;
+    }
+  | {
+      privileges: P[];
+      accessLevel: typeof customAccess;
+    }
+  | {
+      accessLevel: undefined;
+      privileges: [];
+    }
+);
+
+export class RoleAccessLevelAndPrivileges<A, P> {
+  readonly roleOid;
+
+  readonly accessLevelConfigs;
+
+  readonly accessLevel: A | typeof customAccess | undefined;
+
+  readonly privileges: ImmutableSet<P>;
+
+  readonly savedPrivileges: P[];
+
+  constructor(props: Props<A, P>) {
+    this.accessLevelConfigs = props.accessLevelConfigs;
+    this.roleOid = props.roleOid;
+    this.savedPrivileges = props.savedPrivileges;
+    if ('privileges' in props && 'accessLevel' in props) {
+      this.accessLevel = props.accessLevel;
+      this.privileges = new ImmutableSet(props.privileges);
+    } else if ('privileges' in props) {
+      this.privileges = new ImmutableSet(props.privileges);
+      this.accessLevel = getAccessLevelBasedOnPrivileges(
+        this.accessLevelConfigs,
+        this.privileges,
+      );
+    } else {
+      this.accessLevel = props.accessLevel;
+      const aL = this.accessLevelConfigs.find(
+        (entry) => entry.id === this.accessLevel,
+      );
+      if (!aL) {
+        throw new Error(
+          'Access level not found in configuration. This should never occur.',
+        );
+      }
+      this.privileges = new ImmutableSet(aL.privileges);
+    }
+  }
+
+  private getCommonProps() {
+    return {
+      roleOid: this.roleOid,
+      accessLevelConfigs: this.accessLevelConfigs,
+      savedPrivileges: this.savedPrivileges,
+    };
+  }
+
+  withAccess(accessLevel: A) {
+    return new RoleAccessLevelAndPrivileges<A, P>({
+      ...this.getCommonProps(),
+      accessLevel,
+    });
+  }
+
+  withCustomAccess(privileges?: P[]) {
+    const customPrivileges = privileges ?? this.savedPrivileges;
+    return new RoleAccessLevelAndPrivileges<A, P>({
+      ...this.getCommonProps(),
+      accessLevel: customAccess,
+      privileges: customPrivileges,
+    });
+  }
+
+  withAccessRemoved() {
+    return new RoleAccessLevelAndPrivileges<A, P>({
+      ...this.getCommonProps(),
+      accessLevel: undefined,
+      privileges: [],
+    });
+  }
+}
+
+export const dbAccessLevelConfigs: {
+  id: string;
+  privileges: Set<DatabasePrivilege>;
+}[] = [
+  { id: 'connect', privileges: new Set(['CONNECT']) },
+  { id: 'connect_and_create', privileges: new Set(['CONNECT', 'CREATE']) },
+];
+
+export function getDbAccessPrivilegeMap(
+  dbPrivileges: ImmutableMap<Role['oid'], RawDatabasePrivilegesForRole>,
+) {
+  return dbPrivileges.mapValues(
+    (entry) =>
+      new RoleAccessLevelAndPrivileges({
+        roleOid: entry.role_oid,
+        accessLevelConfigs: dbAccessLevelConfigs,
+        privileges: entry.direct,
+        savedPrivileges: entry.direct,
+      }),
+  );
+}

From 790c61cae90541df7cdc4d2236985d658aa9cba7 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Mon, 9 Sep 2024 23:34:47 +0200
Subject: [PATCH 0825/1141] fix labeled input

---
 .../src/component-library/button/Button.scss  |  1 +
 .../common/styles/variables.scss              |  2 +-
 .../fieldset-group/FieldsetGroup.scss         |  3 ++-
 .../labeled-input/LabeledInput.scss           | 17 +++++++------
 mathesar_ui/src/components/form/Field.svelte  | 25 +++++++++++++------
 mathesar_ui/src/i18n/languages/en/dict.json   |  5 ++--
 .../systems/schemas/AddEditSchemaModal.svelte |  3 +--
 .../constraints/ConstraintTypeSection.svelte  |  6 ++---
 .../constraints/NewFkConstraint.svelte        |  2 +-
 .../new-column-cell/NewColumnCell.svelte      |  1 -
 .../link-table/LinkTableForm.svelte           | 13 +++++++---
 .../table-view/link-table/NewColumn.svelte    |  2 +-
 .../ExtractColumnsModal.svelte                | 12 +++++++--
 13 files changed, 58 insertions(+), 34 deletions(-)

diff --git a/mathesar_ui/src/component-library/button/Button.scss b/mathesar_ui/src/component-library/button/Button.scss
index a1cf656ed8..f863e9b5c4 100644
--- a/mathesar_ui/src/component-library/button/Button.scss
+++ b/mathesar_ui/src/component-library/button/Button.scss
@@ -16,6 +16,7 @@
   font-weight: inherit;
   position: relative;
   padding: var(--input-padding);
+  box-sizing: border-box;
 
   > * + * {
     margin-left: 0.25em;
diff --git a/mathesar_ui/src/component-library/common/styles/variables.scss b/mathesar_ui/src/component-library/common/styles/variables.scss
index 48e55adc2d..52460358af 100644
--- a/mathesar_ui/src/component-library/common/styles/variables.scss
+++ b/mathesar_ui/src/component-library/common/styles/variables.scss
@@ -90,5 +90,5 @@
   --border-radius-l: 0.571rem; //8px
   --border-radius-xl: 1.142rem; //16px
 
-  --input-padding: 0.5em;
+  --input-padding: var(--size-ultra-small);
 }
diff --git a/mathesar_ui/src/component-library/fieldset-group/FieldsetGroup.scss b/mathesar_ui/src/component-library/fieldset-group/FieldsetGroup.scss
index 65b687afda..1e909b82a5 100644
--- a/mathesar_ui/src/component-library/fieldset-group/FieldsetGroup.scss
+++ b/mathesar_ui/src/component-library/fieldset-group/FieldsetGroup.scss
@@ -12,7 +12,8 @@
   .options {
     padding-left: 0;
     list-style-type: none;
-    margin: 0;
+    margin-top: 0.25em;
+    margin-bottom: 0;
   }
   &.has-label .options {
     margin-top: 1em;
diff --git a/mathesar_ui/src/component-library/labeled-input/LabeledInput.scss b/mathesar_ui/src/component-library/labeled-input/LabeledInput.scss
index 93d42c92ab..3294caec66 100644
--- a/mathesar_ui/src/component-library/labeled-input/LabeledInput.scss
+++ b/mathesar_ui/src/component-library/labeled-input/LabeledInput.scss
@@ -33,17 +33,18 @@
     }
   }
 
-  // TODO: add support for help text with an inline layout.
   &.layout-inline .label-content {
-    display: inline-flex;
+    display: flex;
     flex-direction: row;
-    align-items: center; // To support a text input that's taller than the label
-    .label {
-      flex: 1 1 auto;
-    }
-    .input {
+    align-items: center;
+    > .label {
       flex: 0 0 auto;
-      margin-left: var(--spacing-x, var(--spacing-x-default));
+      margin-right: 1rem;
+      padding-top: calc(var(--input-padding-y, 0.5em));
+      padding-bottom: calc(var(--input-padding-y, 0.5em));
+    }
+    .field-help {
+      margin-top: 0.25em;
     }
   }
 
diff --git a/mathesar_ui/src/components/form/Field.svelte b/mathesar_ui/src/components/form/Field.svelte
index 9406aff42f..6a789dc30d 100644
--- a/mathesar_ui/src/components/form/Field.svelte
+++ b/mathesar_ui/src/components/form/Field.svelte
@@ -23,13 +23,15 @@
   $: inputComponent = input?.component ?? (TextInput as typeof SvelteComponent);
   $: inputComponentProps = input?.props ?? {};
   $: ({ showsError, disabled } = field);
+  $: isStacked = layout === 'stacked';
 </script>
 
 <FieldLayout>
   {#if label || $$slots.label}
-    <LabeledInput {label} {layout} {help}>
-      <slot name="label" slot="label" />
-      <slot name="help" slot="help" />
+    <LabeledInput {layout} {label}>
+      <svelte:fragment slot="label">
+        <slot name="label" />
+      </svelte:fragment>
       <svelte:component
         this={inputComponent}
         bind:value={$field}
@@ -37,6 +39,11 @@
         disabled={$disabled}
         {...inputComponentProps}
       />
+      {#if !isStacked && (help || $$slots.help)}
+      <FieldHelp>
+        <slot name="help">{help}</slot>
+      </FieldHelp>
+    {/if}
     </LabeledInput>
   {:else}
     <svelte:component
@@ -48,11 +55,13 @@
     >
       <slot />
     </svelte:component>
-    {#if help || $$slots.help}
-      <FieldHelp>
-        <slot name="help">{help}</slot>
-      </FieldHelp>
-    {/if}
   {/if}
+  
+  {#if isStacked && (help || $$slots.help)}
+    <FieldHelp>
+      <slot name="help">{help}</slot>
+    </FieldHelp>
+  {/if}
+  
   <FieldErrors {field} />
 </FieldLayout>
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 2b5b6ef413..9fd0910b4f 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -290,6 +290,7 @@
   "learn_implications_deleting_mathesar_schemas": "Learn more about the implications of deleting Mathesar schemas.",
   "link_copied": "Link copied",
   "link_successfully_regenerated": "The link has been successfully regenerated",
+  "link_table_description": "Use links to connect related tables in your database, automatically setting up the necessary foreign key columns.",
   "link_table_to": "Create link between [tablePill] and",
   "linked_from_base_table": "Linked from Base Table",
   "linked_record_summary": "Linked Record Summary",
@@ -501,7 +502,6 @@
   "select_columns_cells_view_properties": "Select one or more columns or cells to view the associated column properties and actions.",
   "select_columns_extract": "Select the columns you want to extract",
   "select_columns_extract_into_table": "Select the columns you want to extract into [targetTableName]",
-  "select_columns_for_exploration_help": "Select the columns that will be used for the exploration. Columns are limited to those from the base table and its linked tables.",
   "select_columns_move": "Select the columns you want to move",
   "select_columns_move_into_table": "Select the columns you want to move into [targetTableName]",
   "select_columns_to_hide": "Select Columns to Hide",
@@ -640,5 +640,6 @@
   "window_remains_open_mathesar_unusable": "This window will remain open but all features within Mathesar will be unusable.",
   "yes": "Yes",
   "yes_summarize_as_list": "Yes, summarize as a list",
-  "yesterday": "Yesterday"
+  "yesterday": "Yesterday",
+  "schema_description": "Use schemas to organize related tables into logical groups within your database."
 }
diff --git a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
index 7e2434ee45..22d61f92bb 100644
--- a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
+++ b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
@@ -63,10 +63,9 @@
   namePlaceholder='Eg. Personal Finances, Movies'
 >
   <svelte:fragment slot="helpText">
-    
     {#if !schema}
       <span class="description">
-        Use schemas to organize related tables into logical groups within your database.
+        {$_('schema_description')}
       </span>
     {/if}
   </svelte:fragment>
diff --git a/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte b/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
index 2794f9920f..a96ff82242 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
@@ -137,7 +137,7 @@
     }
 
     :global(.collapsible-content) {
-      padding-left: 2rem;
+      padding-left: var(--size-x-large);
     }
 
     .null {
@@ -153,11 +153,11 @@
     font-weight: var(--font-weight-medium);
     border-bottom: 1px solid var(--slate-200);
     min-height: 2.5rem;
-    margin-bottom: 0.5rem;
+    margin-bottom: var(--size-xx-small);
   }
 
   .add-constraint {
-    padding: 1rem;
+    padding: var(--size-base);
     border: 1px solid var(--slate-300);
     border-radius: var(--border-radius-m);
   }
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
index 2ceb2b56da..451e364832 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
@@ -201,7 +201,7 @@
 <style lang="scss">
   .add-new-fk-constraint {
     display: flex;
-    flex-direction: column;
+    flex-direction: column;   
 
     > :global(* + *) {
       margin-top: 1rem;
diff --git a/mathesar_ui/src/systems/table-view/header/new-column-cell/NewColumnCell.svelte b/mathesar_ui/src/systems/table-view/header/new-column-cell/NewColumnCell.svelte
index 2b0907ba64..520d6abb85 100644
--- a/mathesar_ui/src/systems/table-view/header/new-column-cell/NewColumnCell.svelte
+++ b/mathesar_ui/src/systems/table-view/header/new-column-cell/NewColumnCell.svelte
@@ -53,7 +53,6 @@
       field={columnType}
       input={{ component: ColumnTypeSelector }}
       label={$_('select_type')}
-      layout="stacked"
     />
     <div class="submit">
       <FormSubmit
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index 9fe24152cc..db3bda70ed 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -289,7 +289,6 @@
             <Field
               field={mappingTableName}
               label={'Name of New Table'}
-              layout="stacked"
             >
               <span slot="help">
                 The table that will store the many-to-many relationship between records of this table.
@@ -300,7 +299,6 @@
               <Field
                 field={columnNameMappingToBase}
                 label={$_('Name of New Column {number}', { values: { number: 1 } })}
-                layout="stacked"
               >
                 <span slot="help">
                   The column in <Pill table={{ name: $mappingTableName }} which="mapping" /> that will link to <Pill table={base} which="base" />.
@@ -309,7 +307,6 @@
               <Field
                 field={columnNameMappingToTarget}
                 label={$_('Name of New Column {number}', { values: { number: 2 } })}
-                layout="stacked"
               >
                 <span slot="help">
                   The column in <Pill table={{ name: $mappingTableName }} which="mapping" /> that will link to <Pill table={target} which="target" />.
@@ -336,7 +333,6 @@
             <Field
               field={mappingTableName}
               label={'Name of New Table'}
-              layout="stacked"
             >
               <span slot="help">
                 The table that will store the many-to-many relationship between records of the two tables.
@@ -394,4 +390,13 @@
   .description {
     margin-bottom: 1rem;
   }
+  :global(.form .outcome-box .labeled-input.layout-inline .label-content) {
+    align-items: flex-start;
+  }
+  :global(.form .outcome-box .label) {
+    width: 12rem;
+  }
+  :global(.form .outcome-box .label-content .input) {
+    flex-grow: 1; 
+  }
 </style>
diff --git a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
index 7f390409ce..56501bee33 100644
--- a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
@@ -41,7 +41,7 @@
   {label}
   <Spinner />
 {:else}
-  <Field {field} {label} layout="stacked" >
+  <Field {field} {label}>
     <span slot="help">
       The column in <Pill table={base} which={baseWhich} /> that will link to the <Pill table={target} which={targetWhich} /> table.
     </span>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
index 05e61bb4ea..63ae98ba04 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
@@ -269,7 +269,6 @@
       field={linkedTable}
       input={{ component: SelectLinkedTable, props: { linkedTables } }}
       label={$_('linked_table')}
-      layout="stacked"
     />
   {/if}
 
@@ -319,7 +318,7 @@
       </p>
       {#if $targetType === 'newTable'}
         
-        <Field layout="stacked" field={newFkColumnName} label='Name of Link Column'>
+        <Field field={newFkColumnName} label='Name of Link Column'>
           <span slot="help">
             <RichText text={$_('new_column_added_to_table')} let:slotName>
               {#if slotName === 'tableName'}
@@ -340,3 +339,12 @@
     onCancel={() => controller.close()}
   />
 </ControlledModal>
+
+<style>
+  :global(.outcome-box .labeled-input.layout-inline .label-content) {
+    align-items: flex-start;
+  }
+  :global(.outcome-box .label-content .input) {
+    flex-grow: 1; 
+  }
+</style>

From 9729b53d5d174c5aff2c22db6f86e11443a4916a Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 9 Sep 2024 23:03:28 -0400
Subject: [PATCH 0826/1141] Propagate RPC record summary changes to front end

---
 mathesar_ui/src/api/rpc/records.ts            |  70 +++-----
 .../src/components/LinkedRecord.svelte        |   8 +-
 .../src/components/RecordSummary.svelte       |   8 -
 .../breadcrumb/BreadcrumbItem.svelte          |   6 +-
 .../src/pages/record/RecordPage.svelte        |   5 +-
 .../src/pages/record/RecordPageContent.svelte |   5 +-
 mathesar_ui/src/pages/record/RecordStore.ts   |  81 ++++-----
 mathesar_ui/src/routes/RecordPageRoute.svelte |   2 +-
 .../record-summaries/RecordSummaryStore.ts    |   2 +-
 .../__tests__/recordSummaryUtils.test.ts      |  75 --------
 .../record-summaries/recordSummaryUtils.ts    | 165 ++----------------
 mathesar_ui/src/stores/table-data/records.ts  |  22 ++-
 .../src/stores/table-data/tabularData.ts      |  12 ++
 .../RecordSelectorContent.svelte              |  41 ++---
 .../RecordSelectorDataCell.svelte             |   4 +-
 .../RecordSelectorTable.svelte                |  35 ++--
 .../RecordSelectorWindow.svelte               |   1 +
 .../record-selector/recordSelectorUtils.ts    |  45 -----
 .../src/systems/table-view/TableView.svelte   |   2 +-
 .../filter/FilterDropdown.svelte              |   2 +-
 .../src/systems/table-view/row/Row.svelte     |   4 +-
 .../src/systems/table-view/row/RowCell.svelte |   6 +-
 .../table-inspector/cell/CellMode.svelte      |   4 +-
 .../table-inspector/cell/cellModeUtils.ts     |   4 +-
 .../table-inspector/column/ColumnMode.svelte  |   5 +-
 .../column/SetDefaultValue.svelte             |   8 +-
 .../record-summary/RecordSummaryConfig.svelte |  19 +-
 .../table-inspector/table/TableMode.svelte    |   5 +-
 mathesar_ui/src/utils/stringUtils.ts          |  19 --
 29 files changed, 185 insertions(+), 480 deletions(-)
 delete mode 100644 mathesar_ui/src/components/RecordSummary.svelte
 delete mode 100644 mathesar_ui/src/stores/table-data/record-summaries/__tests__/recordSummaryUtils.test.ts
 delete mode 100644 mathesar_ui/src/utils/stringUtils.ts

diff --git a/mathesar_ui/src/api/rpc/records.ts b/mathesar_ui/src/api/rpc/records.ts
index 90db6ae218..1179834df3 100644
--- a/mathesar_ui/src/api/rpc/records.ts
+++ b/mathesar_ui/src/api/rpc/records.ts
@@ -75,54 +75,22 @@ export interface RecordsListParams {
   grouping?: Grouping;
   filter?: SqlExpr;
   search_fuzzy?: Record<string, unknown>[];
+  return_record_summaries?: boolean;
 }
 
 /** keys are stringified column ids */
 export type Result = Record<string, ResultValue>;
 
-/**
- * Provides the data necessary to render one Record Summary, given a summary
- * template. The template will contain column aliases enclosed in curly braces
- * as in the following example template which contains only one column alias.
- *
- * ```
- * {65__66__col__67}
- * ```
- *
- * The column alias, "65__66__col__67" is a unique serialization of the full
- * path traversed through foreign keys to find the column which contains the
- * value to be rendered within the template. Because record summaries can be
- * transitive, the value may lie within a column several tables away. The alias
- * needs to represent the full path so that we avoid collisions between two FK
- * columns whitttch point to the same table. The front end does not need to parse
- * the column alias -- it just needs to match aliases within templates to
- * aliases within sets of input data.
- *
- * The keys in this type below are column aliases. The values are the data to be
- * rendered for that column.
- */
-export type ApiRecordSummaryInputData = Record<string, ResultValue>;
-
-export interface ApiDataForRecordSummariesInFkColumn {
-  column: number;
-  template: string;
-  /**
-   * Keys represent the record ids. Values represent the data necessary to
-   * render the record summary for the record having that PK value. All key
-   * values are string. If the PK values as stored in the database is a number,
-   * then it will be stringified for transmission through the API.
-   */
-  data: Record<string, ApiRecordSummaryInputData>;
-}
+/** Keys are stringified FK cell values. Values are record summaries. */
+export type RecordSummaryColumnData = Record<string, string>;
 
 export interface RecordsResponse {
   count: number;
   grouping: GroupingResponse | null;
   results: Result[];
-  /**
-   * Each item in this array can be matched to each FK column in the table.
-   */
-  preview_data: ApiDataForRecordSummariesInFkColumn[] | null;
+  /** Keys are attnums. */
+  linked_record_summaries: Record<string, RecordSummaryColumnData> | null;
+  record_summaries: Record<string, string> | null;
 }
 
 export const records = {
@@ -131,9 +99,10 @@ export const records = {
       database_id: number;
       table_oid: number;
       /** Keys are stringified attnums */
-      record_def: Record<string, ResultValue>;
+      record_def: Record<string, unknown>;
+      return_record_summaries?: boolean;
     },
-    Pick<RecordsResponse, 'results' | 'preview_data'>
+    RecordsResponse
   >(),
 
   patch: rpcMethodTypeContainer<
@@ -142,15 +111,30 @@ export const records = {
       table_oid: number;
       record_id: ResultValue;
       /** Keys are stringified attnums */
-      record_def: Record<string, ResultValue>;
+      record_def: Record<string, unknown>;
+      return_record_summaries?: boolean;
     },
-    Pick<RecordsResponse, 'results' | 'preview_data'>
+    RecordsResponse
+  >(),
+
+  get: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      table_oid: number;
+      record_id: ResultValue;
+      return_record_summaries?: boolean;
+    },
+    RecordsResponse
   >(),
 
   list: rpcMethodTypeContainer<RecordsListParams, RecordsResponse>(),
 
   delete: rpcMethodTypeContainer<
-    { database_id: number; table_oid: number; record_ids: ResultValue[] },
+    {
+      database_id: number;
+      table_oid: number;
+      record_ids: ResultValue[];
+    },
     void
   >(),
 };
diff --git a/mathesar_ui/src/components/LinkedRecord.svelte b/mathesar_ui/src/components/LinkedRecord.svelte
index c673bcf423..e6559cc120 100644
--- a/mathesar_ui/src/components/LinkedRecord.svelte
+++ b/mathesar_ui/src/components/LinkedRecord.svelte
@@ -6,8 +6,6 @@
   import { Icon } from '@mathesar-component-library';
   import type { ValueComparisonOutcome } from '@mathesar-component-library/types';
 
-  import RecordSummary from './RecordSummary.svelte';
-
   const dispatch = createEventDispatcher();
 
   export let recordId: unknown | undefined = undefined;
@@ -59,12 +57,10 @@
       }}
       on:click={(e) => e.stopPropagation()}
     >
-      <RecordSummary recordSummary={label} />
+      {label}
     </a>
   {:else}
-    <span class="record-summary">
-      <RecordSummary recordSummary={label} />
-    </span>
+    <span class="record-summary">{label}</span>
   {/if}
   {#if hasDeleteButton}
     <!--
diff --git a/mathesar_ui/src/components/RecordSummary.svelte b/mathesar_ui/src/components/RecordSummary.svelte
deleted file mode 100644
index a6bc90d4b3..0000000000
--- a/mathesar_ui/src/components/RecordSummary.svelte
+++ /dev/null
@@ -1,8 +0,0 @@
-<script lang="ts">
-  import { displayRecordSummaryAsHtml } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
-
-  export let recordSummary: string;
-</script>
-
-<!-- eslint-disable-next-line svelte/no-at-html-tags -->
-{@html displayRecordSummaryAsHtml(recordSummary)}
diff --git a/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte b/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
index 33004b4a3e..543a9c383d 100644
--- a/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
+++ b/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
@@ -20,8 +20,6 @@
   } from '@mathesar/routes/urls';
   import { getLinkForTableItem } from '@mathesar/utils/tables';
 
-  import RecordSummary from '../RecordSummary.svelte';
-
   import BreadcrumbLink from './BreadcrumbLink.svelte';
   import BreadcrumbPageSeparator from './BreadcrumbPageSeparator.svelte';
   import BreadcrumbRecordSelector from './BreadcrumbRecordSelector.svelte';
@@ -76,9 +74,7 @@
         item.record.pk,
       )}
     >
-      <NameWithIcon icon={iconRecord}>
-        <RecordSummary recordSummary={item.record.summary} />
-      </NameWithIcon>
+      <NameWithIcon icon={iconRecord}>{item.record.summary}</NameWithIcon>
     </BreadcrumbLink>
   </div>
 {:else if item.type === 'exploration'}
diff --git a/mathesar_ui/src/pages/record/RecordPage.svelte b/mathesar_ui/src/pages/record/RecordPage.svelte
index 8770fc0244..ff6faa0c9c 100644
--- a/mathesar_ui/src/pages/record/RecordPage.svelte
+++ b/mathesar_ui/src/pages/record/RecordPage.svelte
@@ -5,7 +5,6 @@
   import { abstractTypesMap } from '@mathesar/stores/abstract-types';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { TableStructure } from '@mathesar/stores/table-data';
-  import { displayRecordSummaryAsPlainText } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
   import { currentTable } from '@mathesar/stores/tables';
 
   import RecordPageContent from './RecordPageContent.svelte';
@@ -25,9 +24,7 @@
   $: ({ summary } = record);
   $: recordStoreIsLoading = $recordStoreFetchRequest?.state === 'processing';
   $: isLoading = $tableStructureIsLoading || recordStoreIsLoading;
-  $: title = recordStoreIsLoading
-    ? ''
-    : displayRecordSummaryAsPlainText($summary);
+  $: title = recordStoreIsLoading ? '' : $summary;
 </script>
 
 <svelte:head><title>{makeSimplePageTitle(title)}</title></svelte:head>
diff --git a/mathesar_ui/src/pages/record/RecordPageContent.svelte b/mathesar_ui/src/pages/record/RecordPageContent.svelte
index e442d051a2..6657ed200e 100644
--- a/mathesar_ui/src/pages/record/RecordPageContent.svelte
+++ b/mathesar_ui/src/pages/record/RecordPageContent.svelte
@@ -11,7 +11,6 @@
   } from '@mathesar/components/form';
   import FormStatus from '@mathesar/components/form/FormStatus.svelte';
   import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
-  import RecordSummary from '@mathesar/components/RecordSummary.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import TableName from '@mathesar/components/TableName.svelte';
   import { iconRecord, iconSave, iconUndo } from '@mathesar/icons';
@@ -55,9 +54,7 @@
   <InsetPageLayout>
     <div slot="header" class="header">
       <h1 class="title">
-        <NameWithIcon icon={iconRecord}>
-          <RecordSummary recordSummary={$summary} />
-        </NameWithIcon>
+        <NameWithIcon icon={iconRecord}>{$summary}</NameWithIcon>
       </h1>
       <div class="table-name">
         <RichText text={$_('record_in_table')} let:slotName>
diff --git a/mathesar_ui/src/pages/record/RecordStore.ts b/mathesar_ui/src/pages/record/RecordStore.ts
index c420c38647..b7cab9d766 100644
--- a/mathesar_ui/src/pages/record/RecordStore.ts
+++ b/mathesar_ui/src/pages/record/RecordStore.ts
@@ -1,22 +1,18 @@
-import { type Readable, derived, writable } from 'svelte/store';
+import { type Writable, writable } from 'svelte/store';
 
-import {
-  type RequestStatus,
-  getAPI,
-  patchAPI,
-} from '@mathesar/api/rest/utils/requestUtils';
+import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+import { api } from '@mathesar/api/rpc';
 import type { RecordsResponse } from '@mathesar/api/rpc/records';
 import type { Table } from '@mathesar/api/rpc/tables';
 import { WritableMap } from '@mathesar/component-library';
+import type { Database } from '@mathesar/models/Database';
 import RecordSummaryStore from '@mathesar/stores/table-data/record-summaries/RecordSummaryStore';
-import {
-  buildRecordSummariesForSheet,
-  prepareFieldsAsRecordSummaryInputData,
-  renderTransitiveRecordSummary,
-} from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
+import { buildRecordSummariesForSheet } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
 import { getErrorMessage } from '@mathesar/utils/errors';
 
 export default class RecordStore {
+  database: Pick<Database, 'id'>;
+
   fetchRequest = writable<RequestStatus | undefined>(undefined);
 
   /** Keys are column ids */
@@ -24,38 +20,25 @@ export default class RecordStore {
 
   recordSummaries = new RecordSummaryStore();
 
-  summary: Readable<string>;
+  summary: Writable<string>;
 
   table: Table;
 
   recordPk: string;
 
-  private url: string;
-
-  constructor({ table, recordPk }: { table: Table; recordPk: string }) {
+  constructor({
+    database,
+    table,
+    recordPk,
+  }: {
+    database: Pick<Database, 'id'>;
+    table: Table;
+    recordPk: string;
+  }) {
+    this.database = database;
     this.table = table;
     this.recordPk = recordPk;
-    this.url = `/api/db/v0/tables/${this.table.oid}/records/${this.recordPk}/`;
-    // TODO_RS_TEMPLATE
-    //
-    // We need to handle the case where no record summary template is set.
-    // Previously it was the responsibility of the service layer to _always_
-    // return a record summary template, even by deriving one on the fly to send
-    // if necessary. With the changes for beta, it will be the responsibility of
-    // the client to handle the case where no template is set. We need to wait
-    // until after the service layer changes are made before we can implement
-    // this here.
-    const template =
-      this.table.metadata?.record_summary_template ?? 'TODO_RS_TEMPLATE';
-    this.summary = derived(
-      [this.fieldValues, this.recordSummaries],
-      ([fields, fkSummaryData]) =>
-        renderTransitiveRecordSummary({
-          template,
-          inputData: prepareFieldsAsRecordSummaryInputData(fields),
-          transitiveData: fkSummaryData,
-        }),
-    );
+    this.summary = writable('');
     void this.fetch();
   }
 
@@ -64,9 +47,10 @@ export default class RecordStore {
     this.fieldValues.reconstruct(
       Object.entries(result).map(([k, v]) => [parseInt(k, 10), v]),
     );
-    if (response.preview_data) {
+    this.summary.set(response.record_summaries?.[this.recordPk] ?? '');
+    if (response.linked_record_summaries) {
       this.recordSummaries.setFetchedSummaries(
-        buildRecordSummariesForSheet(response.preview_data),
+        buildRecordSummariesForSheet(response.linked_record_summaries),
       );
     }
   }
@@ -74,7 +58,15 @@ export default class RecordStore {
   async fetch(): Promise<void> {
     this.fetchRequest.set({ state: 'processing' });
     try {
-      this.updateSelfWithApiResponseData(await getAPI(this.url));
+      const response = await api.records
+        .get({
+          database_id: this.database.id,
+          table_oid: this.table.oid,
+          record_id: this.recordPk,
+          return_record_summaries: true,
+        })
+        .run();
+      this.updateSelfWithApiResponseData(response);
       this.fetchRequest.set({ state: 'success' });
     } catch (error) {
       this.fetchRequest.set({
@@ -85,6 +77,15 @@ export default class RecordStore {
   }
 
   async patch(payload: Record<string, unknown>) {
-    this.updateSelfWithApiResponseData(await patchAPI(this.url, payload));
+    const response = await api.records
+      .patch({
+        database_id: this.database.id,
+        table_oid: this.table.oid,
+        record_id: this.recordPk,
+        record_def: payload,
+        return_record_summaries: true,
+      })
+      .run();
+    this.updateSelfWithApiResponseData(response);
   }
 }
diff --git a/mathesar_ui/src/routes/RecordPageRoute.svelte b/mathesar_ui/src/routes/RecordPageRoute.svelte
index 10d1c49023..99d46b27b0 100644
--- a/mathesar_ui/src/routes/RecordPageRoute.svelte
+++ b/mathesar_ui/src/routes/RecordPageRoute.svelte
@@ -11,7 +11,7 @@
   export let table: Table;
   export let recordPk: string;
 
-  $: record = new RecordStore({ table, recordPk });
+  $: record = new RecordStore({ database, table, recordPk });
   $: ({ summary, fetchRequest } = record);
 </script>
 
diff --git a/mathesar_ui/src/stores/table-data/record-summaries/RecordSummaryStore.ts b/mathesar_ui/src/stores/table-data/record-summaries/RecordSummaryStore.ts
index 08e7a539a5..02de1822ff 100644
--- a/mathesar_ui/src/stores/table-data/record-summaries/RecordSummaryStore.ts
+++ b/mathesar_ui/src/stores/table-data/record-summaries/RecordSummaryStore.ts
@@ -8,7 +8,7 @@ import {
 } from './recordSummaryUtils';
 
 /**
- * Stores the record summaries needed for one sheet.
+ * Stores the linked record summaries needed for one sheet.
  *
  * - Writing to this store is done via the imperative methods. You can either
  *   write a whole set of record summary data, as fetched from the records API;
diff --git a/mathesar_ui/src/stores/table-data/record-summaries/__tests__/recordSummaryUtils.test.ts b/mathesar_ui/src/stores/table-data/record-summaries/__tests__/recordSummaryUtils.test.ts
deleted file mode 100644
index 064881cccc..0000000000
--- a/mathesar_ui/src/stores/table-data/record-summaries/__tests__/recordSummaryUtils.test.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import { ImmutableMap } from '@mathesar-component-library';
-
-import {
-  type RecordSummariesForSheet,
-  nullPlaceholder,
-  prepareFieldsAsRecordSummaryInputData,
-  renderTransitiveRecordSummary,
-} from '../recordSummaryUtils';
-
-describe('Record Summary', () => {
-  // prettier-ignore
-  const fields = new ImmutableMap<number, string | number | null>([ /*
-      | Column ids | cell values | */
-      [  11        , 'one'       ],
-      [  12        , 'two'       ],
-      [  13        , null        ],
-      [  14        , 1401        ], // an FK column with transitive data
-      [  15        , 1501        ], // an FK column with incomplete transitive data
-      [  16        , 1601        ], // an FK column with no transitive data
-  ]);
-  const inputData = prepareFieldsAsRecordSummaryInputData(fields);
-  const transitiveData: RecordSummariesForSheet = new ImmutableMap([
-    [
-      '14', // <- The id of the FK column
-      new ImmutableMap([
-        [
-          '1401', // <- The id of the record in the FK column
-          'Apple-Banana', // <- The record summary for that record
-        ],
-      ]),
-    ],
-    [
-      '15', // <- The id of the FK column
-      // We have some input data here, but we don't have an entry with a
-      // record id of 1501. We don't expect this to happen in practice, but we
-      // need to handle it anyway.
-      new ImmutableMap([
-        [
-          '9999', // <- The id of the record in the FK column
-          'NOPE',
-        ],
-      ]),
-      // Note that, for the sake of testing different scenarios, we _don't_ have
-      // an entry here for FK column 16.
-    ],
-  ]);
-  // prettier-ignore
-  const testCases =
-  [
-  //  template         | result
-    [ ''               , '' ],
-    [ '{11} {12}'      , 'one two' ],
-    [ '{{11} {12}}'    , '{one two}' ],
-    [ '{{11}}'         , '{one}' ],
-    [ '{ 11}'          , '{ 11}' ],
-    [ '{11 }'          , '{11 }' ],
-    [ '{99}'           , '{99}' ], // column id 99 doesn't exist
-    [ '{13}'           , nullPlaceholder ],
-    [ '{14}'           , 'Apple-Banana' ],
-    [ '{11} {14}'      , 'one Apple-Banana' ],
-    [ '{15}'           , '1501' ],
-    [ '{16}'           , '1601' ],
-  ];
-  test.each(testCases)(
-    'renderTransitiveRecordSummary %#',
-    (template, result) => {
-      const recordSummary = renderTransitiveRecordSummary({
-        template,
-        inputData,
-        transitiveData,
-      });
-      expect(recordSummary).toBe(result);
-    },
-  );
-});
diff --git a/mathesar_ui/src/stores/table-data/record-summaries/recordSummaryUtils.ts b/mathesar_ui/src/stores/table-data/record-summaries/recordSummaryUtils.ts
index fb8745ea6d..e98a068f9b 100644
--- a/mathesar_ui/src/stores/table-data/record-summaries/recordSummaryUtils.ts
+++ b/mathesar_ui/src/stores/table-data/record-summaries/recordSummaryUtils.ts
@@ -1,86 +1,18 @@
+import { map } from 'iter-tools';
+
 import type {
-  ApiDataForRecordSummariesInFkColumn,
-  ApiRecordSummaryInputData,
+  RecordSummaryColumnData,
+  RecordsResponse,
 } from '@mathesar/api/rpc/records';
-import { escapeHtml } from '@mathesar/utils/stringUtils';
 import { ImmutableMap } from '@mathesar-component-library';
 
-/** A generalized type that can be used for Map or ImmutableMap or others. */
-interface LookerUpper<Key, Value> {
-  get: (key: Key) => Value | undefined;
-}
-
-/**
- * - Sometimes tokens contain only a column id, like "{1}".
- * - Other times, tokens contain a full join path to the column, like
- *   "{2__9___10__21__col__22}"
- * - Tokens will only ever contain numbers, underscores, and lower case letters.
- */
-const tokenPattern = /\{[0-9_a-z]+\}/g;
-
-/**
- * This is an arbitrary character within the Unicode Private Use Area. We don't
- * render it directly. Rather, we use this to signify a `NULL` value that should
- * be rendered as a stylized `NULL` when rendering the record summary.
- */
-export const nullPlaceholder = '\uF000';
-const nullPlaceholderPattern = new RegExp(nullPlaceholder, 'g');
-
-function stringifyFieldValue(v: unknown): string {
-  if (v === undefined) {
-    return '';
-  }
-  if (v === null) {
-    return nullPlaceholder;
-  }
-  if (typeof v === 'string') {
-    return v;
-  }
-  return JSON.stringify(v);
-}
-
-export function renderRecordSummary(
-  template: string,
-  inputData: LookerUpper<string, string>,
-): string {
-  function getReplacementValueForToken(token: string): string {
-    return inputData.get(token.slice(1, -1)) ?? token;
-  }
-  return template.replace(tokenPattern, getReplacementValueForToken);
-}
-
-/**
- * Maps column aliases (as used in the template) to cell values (as should be
- * rendered in the template). This is the front end analog of
- * `ApiRecordSummaryInputData` from the API.
- */
-type InputData = ImmutableMap<string, string>;
-
-export function buildInputData(apiData: ApiRecordSummaryInputData): InputData {
-  const entries = Object.entries(apiData);
-  return new ImmutableMap(entries.map(([k, v]) => [k, stringifyFieldValue(v)]));
-}
-
 /** Keys are stringifed record ids */
 export type RecordSummariesForColumn = ImmutableMap<string, string>;
 
 function buildRecordSummariesForColumn(
-  apiData: Pick<ApiDataForRecordSummariesInFkColumn, 'data' | 'template'>,
-): RecordSummariesForColumn {
-  const entries = Object.entries(apiData.data);
-  return new ImmutableMap(
-    entries.map(([recordId, apiInputData]) => [
-      recordId,
-      renderRecordSummary(apiData.template, buildInputData(apiInputData)),
-    ]),
-  );
-}
-
-function mergeRecordSummariesForColumn(
-  a: RecordSummariesForColumn,
-  b: RecordSummariesForColumn,
+  d: RecordSummaryColumnData,
 ): RecordSummariesForColumn {
-  return a.withEntries(b);
+  return new ImmutableMap(Object.entries(d));
 }
 
 /** Keys are stringified column ids */
@@ -90,87 +22,26 @@ export type RecordSummariesForSheet = ImmutableMap<
 >;
 
 export function buildRecordSummariesForSheet(
-  a: ApiDataForRecordSummariesInFkColumn[],
+  d: RecordsResponse['linked_record_summaries'],
 ): RecordSummariesForSheet {
   return new ImmutableMap(
-    a.map((apiData) => [
-      String(apiData.column),
-      buildRecordSummariesForColumn(apiData),
-    ]),
+    map(
+      ([k, v]) => [k, buildRecordSummariesForColumn(v)],
+      Object.entries(d ?? {}),
+    ),
   );
 }
 
+function mergeRecordSummariesForColumn(
+  a: RecordSummariesForColumn,
+  b: RecordSummariesForColumn,
+): RecordSummariesForColumn {
+  return a.withEntries(b);
+}
+
 export function mergeRecordSummariesForSheet(
   a: RecordSummariesForSheet,
   b: RecordSummariesForSheet,
 ): RecordSummariesForSheet {
   return a.withEntries(b, mergeRecordSummariesForColumn);
 }
-
-export function prepareFieldsAsRecordSummaryInputData(
-  fields: Iterable<[number, unknown]>,
-  _stringifyFieldValue = stringifyFieldValue,
-): InputData {
-  return new ImmutableMap(
-    [...fields].map(([k, v]) => [String(k), _stringifyFieldValue(v)]),
-  );
-}
-
-export function renderTransitiveRecordSummary({
-  template,
-  inputData,
-  transitiveData,
-}: {
-  template: string;
-  inputData: InputData;
-  /**
-   * Extra data we have to render transitive summaries in the case that the
-   * summary for this record depends on the summary of a record linked via an FK
-   * column on this record.
-   */
-  transitiveData: RecordSummariesForSheet;
-}): string {
-  /**
-   * Finds the value to use in place of one column alias, using transitive
-   * summary data when available.
-   */
-  function getValueTransitively(columnAlias: string): string | undefined {
-    const cellValue = inputData.get(columnAlias);
-    if (cellValue === undefined) {
-      return undefined;
-    }
-    const recordSummariesForColumn = transitiveData.get(columnAlias);
-    if (recordSummariesForColumn === undefined) {
-      return cellValue;
-    }
-    return recordSummariesForColumn.get(cellValue) ?? cellValue;
-  }
-
-  return renderRecordSummary(template, { get: getValueTransitively });
-}
-
-export function renderRecordSummaryForRow({
-  template,
-  record,
-  transitiveData,
-}: {
-  template: string;
-  record: Record<string | number, unknown>;
-  transitiveData: RecordSummariesForSheet;
-}) {
-  const entries = Object.entries(record);
-  const fields: [number, unknown][] = entries.map(([k, v]) => [Number(k), v]);
-  const inputData = prepareFieldsAsRecordSummaryInputData(fields);
-  return renderTransitiveRecordSummary({ template, inputData, transitiveData });
-}
-
-const plainTextNull = 'NULL';
-const stylizedNull = '<span class="postgres-keyword">NULL</span>';
-
-export function displayRecordSummaryAsPlainText(str: string): string {
-  return str.replace(nullPlaceholderPattern, plainTextNull);
-}
-
-export function displayRecordSummaryAsHtml(str: string): string {
-  return escapeHtml(str).replace(nullPlaceholderPattern, stylizedNull);
-}
diff --git a/mathesar_ui/src/stores/table-data/records.ts b/mathesar_ui/src/stores/table-data/records.ts
index 146dcfa20e..279a329a03 100644
--- a/mathesar_ui/src/stores/table-data/records.ts
+++ b/mathesar_ui/src/stores/table-data/records.ts
@@ -25,6 +25,7 @@ import type Pagination from '@mathesar/utils/Pagination';
 import type { ShareConsumer } from '@mathesar/utils/shares';
 import {
   CancellablePromise,
+  WritableMap,
   getGloballyUniqueId,
   isDefinedNonNullable,
 } from '@mathesar-component-library';
@@ -265,7 +266,9 @@ export class RecordsData {
 
   newRecords: Writable<NewRecordRow[]>;
 
-  recordSummaries = new RecordSummaryStore();
+  recordSummaries = new WritableMap<string, string>();
+
+  linkedRecordSummaries = new RecordSummaryStore();
 
   grouping: Writable<RecordGrouping | undefined>;
 
@@ -296,6 +299,8 @@ export class RecordsData {
 
   readonly shareConsumer?: ShareConsumer;
 
+  private loadIntrinsicRecordSummaries?: boolean;
+
   constructor({
     database,
     table,
@@ -303,6 +308,7 @@ export class RecordsData {
     columnsDataStore,
     contextualFilters,
     shareConsumer,
+    loadIntrinsicRecordSummaries,
   }: {
     database: Pick<Database, 'id'>;
     table: Pick<Table, 'oid'>;
@@ -310,6 +316,7 @@ export class RecordsData {
     columnsDataStore: ColumnsDataStore;
     contextualFilters: Map<number, number | string>;
     shareConsumer?: ShareConsumer;
+    loadIntrinsicRecordSummaries?: boolean;
   }) {
     this.apiContext = { database_id: database.id, table_oid: table.oid };
     this.shareConsumer = shareConsumer;
@@ -330,6 +337,7 @@ export class RecordsData {
     this.meta = meta;
     this.columnsDataStore = columnsDataStore;
     this.contextualFilters = contextualFilters;
+    this.loadIntrinsicRecordSummaries = loadIntrinsicRecordSummaries;
     void this.fetch();
 
     this.selectableRowsMap = derived(
@@ -393,6 +401,7 @@ export class RecordsData {
           .withEntries(contextualFilterEntries)
           .recordsRequestParams(),
         ...params.searchFuzzy.recordsRequestParams(),
+        return_record_summaries: this.loadIntrinsicRecordSummaries,
         // TODO_BETA Do we need shareConsumer here? Previously we had been
         // passing `...this.shareConsumer?.getQueryParams()`
       };
@@ -404,9 +413,14 @@ export class RecordsData {
       const grouping = response.grouping
         ? buildGrouping(response.grouping)
         : undefined;
-      if (response.preview_data) {
-        this.recordSummaries.setFetchedSummaries(
-          buildRecordSummariesForSheet(response.preview_data),
+      if (response.linked_record_summaries) {
+        this.linkedRecordSummaries.setFetchedSummaries(
+          buildRecordSummariesForSheet(response.linked_record_summaries),
+        );
+      }
+      if (response.record_summaries) {
+        this.recordSummaries.reconstruct(
+          Object.entries(response.record_summaries),
         );
       }
       const records = preprocessRecords({
diff --git a/mathesar_ui/src/stores/table-data/tabularData.ts b/mathesar_ui/src/stores/table-data/tabularData.ts
index f7debf7ec9..faabd9a9e9 100644
--- a/mathesar_ui/src/stores/table-data/tabularData.ts
+++ b/mathesar_ui/src/stores/table-data/tabularData.ts
@@ -39,9 +39,19 @@ export interface TabularDataProps {
   hasEnhancedPrimaryKeyCell?: Parameters<
     typeof processColumn
   >[0]['hasEnhancedPrimaryKeyCell'];
+  /**
+   * When true, load the record summaries associated directly with each record
+   * in the table. These are *not* the record summaries associated with linked
+   * records. Instead they are the summaries of the records themselves. By
+   * default, we don't load these summaries because it's a performance hit. But
+   * we need them for the records within the record selector.
+   */
+  loadIntrinsicRecordSummaries?: boolean;
 }
 
 export class TabularData {
+  database: Pick<Database, 'id'>;
+
   table: Table;
 
   meta: Meta;
@@ -63,6 +73,7 @@ export class TabularData {
   shareConsumer?: ShareConsumer;
 
   constructor(props: TabularDataProps) {
+    this.database = props.database;
     const contextualFilters =
       props.contextualFilters ?? new Map<number, string | number>();
     this.table = props.table;
@@ -86,6 +97,7 @@ export class TabularData {
       columnsDataStore: this.columnsDataStore,
       contextualFilters,
       shareConsumer: this.shareConsumer,
+      loadIntrinsicRecordSummaries: props.loadIntrinsicRecordSummaries,
     });
     this.display = new Display(
       this.meta,
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
index 12e15c77bc..4bbb19e423 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
@@ -2,16 +2,11 @@
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
 
-  import { States, postAPI } from '@mathesar/api/rest/utils/requestUtils';
-  import type { RecordsResponse } from '@mathesar/api/rpc/records';
+  import { States } from '@mathesar/api/rest/utils/requestUtils';
+  import { api } from '@mathesar/api/rpc';
   import { iconAddNew } from '@mathesar/icons';
   import { storeToGetRecordPageUrl } from '@mathesar/stores/storeBasedUrls';
   import type { TabularData } from '@mathesar/stores/table-data';
-  import {
-    buildInputData,
-    buildRecordSummariesForSheet,
-    renderTransitiveRecordSummary,
-  } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
   import { getPkValueInRecord } from '@mathesar/stores/table-data/records';
   import { toast } from '@mathesar/stores/toast';
   import { getErrorMessage } from '@mathesar/utils/errors';
@@ -33,6 +28,7 @@
   let isHoveringCreate = false;
 
   $: ({
+    database,
     constraintsDataStore,
     meta,
     isLoading,
@@ -66,34 +62,27 @@
     }
   }
 
-  function getDataForNewRecord(): Record<number, unknown> {
+  function getDataForNewRecord(): Record<string, unknown> {
     const pkColumnIds = $columns.filter((c) => c.primary_key).map((c) => c.id);
     return Object.fromEntries($searchFuzzy.without(pkColumnIds));
   }
 
   async function submitNewRecord() {
-    const url = `/api/db/v0/tables/${table.oid}/records/`;
-    const body = getDataForNewRecord();
     try {
       isSubmittingNewRecord = true;
-      const response = await postAPI<RecordsResponse>(url, body);
+      const response = await api.records
+        .add({
+          database_id: database.id,
+          table_oid: table.oid,
+          record_def: getDataForNewRecord(),
+          return_record_summaries: true,
+        })
+        .run();
       const record = response.results[0];
       const recordId = getPkValueInRecord(record, $columns);
-      const previewData = response.preview_data ?? [];
-      const template = table.metadata?.record_summary_template;
-      // TODO_RS_TEMPLATE
-      //
-      // We need to change the logic here to account for the fact that sometimes
-      // the record summary template actually _will_ be missing. We need to
-      // handle this on the client.
-      if (!template) {
-        throw new Error('TODO_RS_TEMPLATE');
-      }
-      const recordSummary = renderTransitiveRecordSummary({
-        inputData: buildInputData(record),
-        template,
-        transitiveData: buildRecordSummariesForSheet(previewData),
-      });
+
+      const recordSummary = response.record_summaries?.[recordId] ?? '';
+
       submitResult({ recordId, recordSummary, record });
     } catch (err) {
       toast.error(getErrorMessage(err));
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorDataCell.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorDataCell.svelte
index 10cd26f110..54c2860564 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorDataCell.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorDataCell.svelte
@@ -14,14 +14,14 @@
 
   export let row: RecordRow;
   export let processedColumn: ProcessedColumn;
-  export let recordSummaries: RecordSummaryStore;
+  export let linkedRecordSummaries: RecordSummaryStore;
   export let searchFuzzy: Writable<SearchFuzzy>;
   export let isLoading = false;
 
   $: ({ column } = processedColumn);
   $: searchValue = $searchFuzzy.get(column.id);
   $: value = row?.record?.[column.id];
-  $: recordSummary = $recordSummaries
+  $: recordSummary = $linkedRecordSummaries
     .get(String(column.id))
     ?.get(String(value));
 </script>
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
index 299d786088..f558f61344 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
@@ -10,12 +10,7 @@
     constraintIsFk,
     setTabularDataStoreInContext,
   } from '@mathesar/stores/table-data';
-  import {
-    buildInputData,
-    renderTransitiveRecordSummary,
-  } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
   import { getPkValueInRecord } from '@mathesar/stores/table-data/records';
-  import { currentTablesData } from '@mathesar/stores/tables';
   import overflowObserver, {
     makeOverflowDetails,
   } from '@mathesar/utils/overflowObserver';
@@ -31,7 +26,6 @@
   import RecordSelectorDataCell from './RecordSelectorDataCell.svelte';
   import RecordSelectorDataRow from './RecordSelectorDataRow.svelte';
   import RecordSelectorSubmitButton from './RecordSelectorSubmitButton.svelte';
-  import { getColumnIdToFocusInitially } from './recordSelectorUtils';
 
   export let controller: RecordSelectorController;
   export let tabularData: TabularData;
@@ -56,7 +50,11 @@
     recordsData,
     processedColumns,
   } = tabularData);
-  $: ({ recordSummaries, state: recordsDataState } = recordsData);
+  $: ({
+    recordSummaries,
+    linkedRecordSummaries,
+    state: recordsDataState,
+  } = recordsData);
   $: recordsDataIsLoading = $recordsDataState === States.Loading;
   $: ({ constraints } = $constraintsDataStore);
   $: nestedSelectorIsOpen = nestedController.isOpen;
@@ -136,20 +134,9 @@
     if (!record || recordId === undefined) {
       return;
     }
-    const template = table.metadata?.record_summary_template;
-    if (!template) {
-      throw new Error('TODO_RS_TEMPLATE');
-      // TODO_RS_TEMPLATE
-      //
-      // We need to change the logic here to account for the fact that sometimes
-      // the record summary template actually _will_ be missing. We need to
-      // handle this on the client.
-    }
-    const recordSummary = renderTransitiveRecordSummary({
-      template,
-      inputData: buildInputData(record),
-      transitiveData: $recordSummaries,
-    });
+
+    const recordSummary = $recordSummaries.get(String(recordId)) ?? '';
+
     submitResult({ recordId, recordSummary, record });
   }
 
@@ -202,7 +189,7 @@
   });
 
   onMount(async () => {
-    const columnId = getColumnIdToFocusInitially({ table, columns: $columns });
+    const columnId = $columns.find((c) => !c.primary_key)?.id;
     if (columnId === undefined) {
       return;
     }
@@ -246,7 +233,7 @@
               {overflowDetails}
               {processedColumn}
               {searchFuzzy}
-              recordSummaryStore={recordSummaries}
+              recordSummaryStore={linkedRecordSummaries}
               on:focus={() => handleInputFocus(column)}
               on:blur={() => handleInputBlur()}
               on:recordSelectorOpen={() => {
@@ -294,7 +281,7 @@
               <RecordSelectorDataCell
                 {row}
                 {processedColumn}
-                {recordSummaries}
+                {linkedRecordSummaries}
                 {searchFuzzy}
                 isLoading={recordsDataIsLoading}
               />
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
index ca84d00e6c..fdd5546c17 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
@@ -40,6 +40,7 @@
           meta: new Meta({ pagination: new Pagination({ size: 10 }) }),
           hasEnhancedPrimaryKeyCell: false,
           table,
+          loadIntrinsicRecordSummaries: true,
         })
       : undefined;
   $: nestedSelectorIsOpen = nestedController.isOpen;
diff --git a/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts b/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts
index a78f39f697..d310a3db7d 100644
--- a/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts
+++ b/mathesar_ui/src/systems/record-selector/recordSelectorUtils.ts
@@ -1,6 +1,3 @@
-import type { Column } from '@mathesar/api/rpc/columns';
-import type { Table } from '@mathesar/api/rpc/tables';
-
 /**
  * - 'dataEntry' - each row is a button that submits the recordId via a Promise.
  * - 'navigation' - each row is a hyperlink to a Record Page.
@@ -13,45 +10,3 @@ export type CellLayoutRowType = 'columnHeaderRow' | 'dataRow';
 export type CellLayoutColumnType = 'dataColumn' | 'rowHeaderColumn';
 
 export type CellState = 'focused' | 'acquiringFkValue';
-
-export function getColumnIdToFocusInitially({
-  table,
-  columns,
-}: {
-  table: Table | undefined;
-  columns: Column[];
-}): number | undefined {
-  function getFromRecordSummaryTemplate() {
-    if (!table) {
-      return undefined;
-    }
-    const template = table?.metadata?.record_summary_template;
-    if (!template) {
-      throw new Error('TODO_RS_TEMPLATE');
-      // TODO_RS_TEMPLATE
-      //
-      // We need to change the logic here to account for the fact that sometimes
-      // the record summary template actually _will_ be missing. We need to
-      // handle this on the client.
-    }
-    const match = template.match(/\{\d+\}/)?.[0] ?? undefined;
-    if (!match) {
-      return undefined;
-    }
-    const id = parseInt(match.slice(1, -1), 10);
-    if (Number.isNaN(id)) {
-      return undefined;
-    }
-    return id;
-  }
-
-  function getFromColumns() {
-    const column = columns.find((c) => !c.primary_key);
-    if (!column) {
-      return undefined;
-    }
-    return column.id;
-  }
-
-  return getFromRecordSummaryTemplate() ?? getFromColumns();
-}
diff --git a/mathesar_ui/src/systems/table-view/TableView.svelte b/mathesar_ui/src/systems/table-view/TableView.svelte
index d0665c5ddb..0a1db2cd5d 100644
--- a/mathesar_ui/src/systems/table-view/TableView.svelte
+++ b/mathesar_ui/src/systems/table-view/TableView.svelte
@@ -43,7 +43,7 @@
         map(([k, r]) => [k, r.record], get(recordsData.selectableRowsMap)),
       ),
       columnsMap: stringifyMapKeys(get(processedColumns)),
-      recordSummaries: get(recordsData.recordSummaries),
+      recordSummaries: get(recordsData.linkedRecordSummaries),
       selectedRowIds: get(selection).rowIds,
       selectedColumnIds: get(selection).columnIds,
     }),
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterDropdown.svelte b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterDropdown.svelte
index 30a65c9083..e829310579 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterDropdown.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/filter/FilterDropdown.svelte
@@ -57,6 +57,6 @@
     slot="content"
     {filtering}
     processedColumns={processedColumnsToShow}
-    recordSummaries={recordsData.recordSummaries}
+    recordSummaries={recordsData.linkedRecordSummaries}
   />
 </Dropdown>
diff --git a/mathesar_ui/src/systems/table-view/row/Row.svelte b/mathesar_ui/src/systems/table-view/row/Row.svelte
index 3d1ef87d78..fad853668c 100644
--- a/mathesar_ui/src/systems/table-view/row/Row.svelte
+++ b/mathesar_ui/src/systems/table-view/row/Row.svelte
@@ -35,7 +35,7 @@
     cellModificationStatus,
     cellClientSideErrors,
   } = meta);
-  $: ({ grouping, recordSummaries } = recordsData);
+  $: ({ grouping, linkedRecordSummaries } = recordsData);
 
   $: ({ pkColumn } = columnsDataStore);
   $: primaryKeyColumnId = $pkColumn?.id;
@@ -98,7 +98,7 @@
         grouping={$grouping}
         group={row.group}
         processedColumnsMap={$processedColumns}
-        recordSummariesForSheet={$recordSummaries}
+        recordSummariesForSheet={$linkedRecordSummaries}
       />
     {:else if rowHasRecord(row)}
       {#each [...$processedColumns] as [columnId, processedColumn] (columnId)}
diff --git a/mathesar_ui/src/systems/table-view/row/RowCell.svelte b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
index 641618cb48..f5e3233ee6 100644
--- a/mathesar_ui/src/systems/table-view/row/RowCell.svelte
+++ b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
@@ -52,7 +52,7 @@
   $: cellId = makeCellId(getRowSelectionId(row), String(processedColumn.id));
   const canViewLinkedEntities = true;
   $: recordsDataState = recordsData.state;
-  $: ({ recordSummaries } = recordsData);
+  $: ({ linkedRecordSummaries } = recordsData);
   $: ({ column, linkFk } = processedColumn);
   $: columnId = column.id;
   $: modificationStatus = $modificationStatusMap.get(key);
@@ -69,7 +69,7 @@
     ? getRecordPageUrl({ tableId: linkFk.referent_table_oid, recordId: value })
     : undefined;
   $: showLinkedRecordHyperLink = linkedRecordHref && canViewLinkedEntities;
-  $: recordSummary = $recordSummaries
+  $: recordSummary = $linkedRecordSummaries
     .get(String(column.id))
     ?.get(String(value));
 
@@ -114,7 +114,7 @@
     {canViewLinkedEntities}
     {recordSummary}
     setRecordSummary={(recordId, rs) =>
-      recordSummaries.addBespokeRecordSummary({
+      linkedRecordSummaries.addBespokeRecordSummary({
         columnId: String(columnId),
         recordId,
         recordSummary: rs,
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/cell/CellMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/cell/CellMode.svelte
index 5372e7c4b9..6fb8d37495 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/cell/CellMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/cell/CellMode.svelte
@@ -7,12 +7,12 @@
   const tabularData = getTabularDataStoreFromContext();
 
   $: ({ selection, recordsData, processedColumns } = $tabularData);
-  $: ({ recordSummaries, selectableRowsMap } = recordsData);
+  $: ({ linkedRecordSummaries, selectableRowsMap } = recordsData);
   $: selectedCellData = getSelectedCellData(
     $selection,
     $selectableRowsMap,
     $processedColumns,
-    $recordSummaries,
+    $linkedRecordSummaries,
   );
 </script>
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/cell/cellModeUtils.ts b/mathesar_ui/src/systems/table-view/table-inspector/cell/cellModeUtils.ts
index fe3d5cb4ea..ab2dc77173 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/cell/cellModeUtils.ts
+++ b/mathesar_ui/src/systems/table-view/table-inspector/cell/cellModeUtils.ts
@@ -12,7 +12,7 @@ export function getSelectedCellData(
   selection: SheetSelection,
   selectableRowsMap: Map<string, RecordRow>,
   processedColumns: ProcessedColumns,
-  recordSummaries: RecordSummariesForSheet,
+  linkedRecordSummaries: RecordSummariesForSheet,
 ): SelectedCellData {
   const { activeCellId } = selection;
   const selectionData = {
@@ -27,7 +27,7 @@ export function getSelectedCellData(
   const column = processedColumns.get(Number(columnId));
   const recordSummary = defined(
     value,
-    (v) => recordSummaries.get(columnId)?.get(String(v)),
+    (v) => linkedRecordSummaries.get(columnId)?.get(String(v)),
   );
   return {
     activeCellData: column && {
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
index 7b4684b7cc..80bfaeb363 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
@@ -123,7 +123,8 @@
       </Collapsible>
     {/if}
 
-    {#if column}
+    <!-- TODO_BETA: Re-enable this once we make the record summary configurable -->
+    <!-- {#if column}
       {@const referentTableId = column.linkFk?.referent_table_oid}
       {@const referentTable =
         referentTableId === undefined
@@ -140,7 +141,7 @@
           </div>
         </Collapsible>
       {/if}
-    {/if}
+    {/if} -->
 
     <Collapsible isOpen triggerAppearance="plain">
       <CollapsibleHeader slot="header" title={$_('actions')} />
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte
index caa91703da..fc0bc82ae9 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte
@@ -18,7 +18,7 @@
 
   const tabularData = getTabularDataStoreFromContext();
   $: ({ columnsDataStore, recordsData } = $tabularData);
-  $: ({ recordSummaries } = recordsData);
+  $: ({ linkedRecordSummaries } = recordsData);
 
   $: initialValue = column.column.default?.value ?? column.initialInputValue;
   $: value = initialValue;
@@ -33,7 +33,7 @@
     return String(value) !== String(initialValue);
   })();
 
-  $: recordSummary = $recordSummaries
+  $: recordSummary = $linkedRecordSummaries
     .get(String(column.id))
     ?.get(String(value));
 
@@ -77,8 +77,8 @@
   }
 
   function setRecordSummary(recordId: string, _recordSummary: string) {
-    if (recordSummaries) {
-      recordSummaries.addBespokeRecordSummary({
+    if (linkedRecordSummaries) {
+      linkedRecordSummaries.addBespokeRecordSummary({
         columnId: String(column.id),
         recordId,
         recordSummary: _recordSummary,
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
index c6efe29989..1dc99c656d 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
@@ -15,7 +15,6 @@
   import { RichText } from '@mathesar/components/rich-text';
   import { currentDatabase } from '@mathesar/stores/databases';
   import type { RecordRow, TabularData } from '@mathesar/stores/table-data';
-  import { renderRecordSummaryForRow } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
   import { updateTable } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
   import { getErrorMessage } from '@mathesar/utils/errors';
@@ -33,7 +32,7 @@
 
   $: ({ recordsData, columnsDataStore, isLoading } = tabularData);
   $: ({ columns } = columnsDataStore);
-  $: ({ savedRecords, recordSummaries } = recordsData);
+  $: ({ savedRecords, linkedRecordSummaries: recordSummaries } = recordsData);
   $: firstRow = $savedRecords[0] as RecordRow | undefined;
   $: initialCustomized = table.metadata?.record_summary_customized ?? false;
   $: initialTemplate = table.metadata?.record_summary_template ?? '';
@@ -50,11 +49,17 @@
       return undefined;
     }
     const { record } = firstRow;
-    return renderRecordSummaryForRow({
-      template: $template,
-      record,
-      transitiveData: $recordSummaries,
-    });
+
+    // TODO: Fully re-implement record summary previews across the stack, now
+    // with a new backend-centric approach since we're no longer rendering the
+    // record summary on the front end.
+
+    // return renderRecordSummaryForRow({
+    //   template: $template,
+    //   record,
+    //   transitiveData: $recordSummaries,
+    // });
+    return '';
   })();
 
   async function save() {
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
index 1bd8fe7f25..e2fea8a19a 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
@@ -41,12 +41,13 @@
     </div>
   </Collapsible>
 
-  <Collapsible triggerAppearance="plain">
+  <!-- TODO_BETA: re-enable this once we make the record summary template configurable -->
+  <!-- <Collapsible triggerAppearance="plain">
     <CollapsibleHeader slot="header" title={$_('record_summary')} />
     <div slot="content" class="content-container">
       <RecordSummaryConfig table={$currentTable} tabularData={$tabularData} />
     </div>
-  </Collapsible>
+  </Collapsible> -->
 
   <Collapsible isOpen triggerAppearance="plain">
     <CollapsibleHeader slot="header" title={$_('actions')} />
diff --git a/mathesar_ui/src/utils/stringUtils.ts b/mathesar_ui/src/utils/stringUtils.ts
deleted file mode 100644
index 6f7b557d71..0000000000
--- a/mathesar_ui/src/utils/stringUtils.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-const htmlTokenReplacementMap = new Map([
-  ['&', '&amp;'],
-  ['<', '&lt;'],
-  ['>', '&gt;'],
-  ["'", '&#39;'],
-  ['"', '&quot;'],
-]);
-const htmlTokens = new RegExp(
-  `[${[...htmlTokenReplacementMap.keys()].join('')}]`,
-  'g',
-);
-
-function replaceHtmlToken(char: string) {
-  return htmlTokenReplacementMap.get(char) ?? '';
-}
-
-export function escapeHtml(str: string) {
-  return str.replace(htmlTokens, replaceHtmlToken);
-}

From 4af2d3cd533aae52036a2037d037403e498b676e Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Tue, 10 Sep 2024 10:30:51 +0200
Subject: [PATCH 0827/1141] fix new column fields

---
 .../common/styles/variables.scss              |   1 +
 .../labeled-input/LabeledInput.scss           |   2 +-
 mathesar_ui/src/i18n/languages/en/dict.json   |   5 +-
 .../link-table/LinkTableForm.svelte           | 102 +++++-------------
 .../table-view/link-table/NewColumn.svelte    |  22 +++-
 5 files changed, 53 insertions(+), 79 deletions(-)

diff --git a/mathesar_ui/src/component-library/common/styles/variables.scss b/mathesar_ui/src/component-library/common/styles/variables.scss
index 52460358af..159385f4ac 100644
--- a/mathesar_ui/src/component-library/common/styles/variables.scss
+++ b/mathesar_ui/src/component-library/common/styles/variables.scss
@@ -14,6 +14,7 @@
   --green-100: #e5fde6;
 
   --purple-100: #ebe5fd;
+  --purple-200: #d7cbfb;
   --purple-300: #a586ff;
   --purple-400: #6b45dd;
   --purple-500: #4b2c9d;
diff --git a/mathesar_ui/src/component-library/labeled-input/LabeledInput.scss b/mathesar_ui/src/component-library/labeled-input/LabeledInput.scss
index 3294caec66..9d5c482eb2 100644
--- a/mathesar_ui/src/component-library/labeled-input/LabeledInput.scss
+++ b/mathesar_ui/src/component-library/labeled-input/LabeledInput.scss
@@ -39,7 +39,7 @@
     align-items: center;
     > .label {
       flex: 0 0 auto;
-      margin-right: 1rem;
+      margin-right: 0.5rem;
       padding-top: calc(var(--input-padding-y, 0.5em));
       padding-bottom: calc(var(--input-padding-y, 0.5em));
     }
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 9fd0910b4f..3c6036b2d7 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -641,5 +641,8 @@
   "yes": "Yes",
   "yes_summarize_as_list": "Yes, summarize as a list",
   "yesterday": "Yesterday",
-  "schema_description": "Use schemas to organize related tables into logical groups within your database."
+  "schema_description": "Use schemas to organize related tables into logical groups within your database.",
+  "many_to_many_link_base_help": "The column in [mappingTable] that will link to [baseTable].",
+  "many_to_many_link_target_help": "The column in [mappingTable] that will link to [targetTable].",
+  "new_column_link_help": "The column in [baseTable] that will link to the [targetTable] table."
 }
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index db3bda70ed..eda80530b1 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -220,7 +220,7 @@
 </script>
 
 <div class="description">
-  Use links to connect related tables in your database, automatically setting up the necessary foreign key columns.
+  {$_('link_table_description')}
 </div>
 
 <div class="form" class:self-referential={isSelfReferential}>
@@ -258,20 +258,16 @@
 
     <FieldLayout>
       <OutcomeBox>
-        {#if $linkType === 'oneToMany'}
-        
+        {#if $linkType === 'oneToMany'}  
           <NewColumn
             base={target}
             target={base}
             field={columnNameInTarget}
             {targetColumnsAreLoading}
-
           />
-        {:else if $linkType === 'manyToOne'}
-        
+        {:else if $linkType === 'manyToOne'}  
           <NewColumn {base} {target} field={columnNameInBase} />
         {:else if $linkType === 'manyToMany'}
-          {#if isSelfReferential}
           <p>
             <RichText
               text={'We will create a new table [mappingTable].'}
@@ -286,73 +282,31 @@
               {/if}
             </RichText>
           </p>
-            <Field
-              field={mappingTableName}
-              label={'Name of New Table'}
-            >
-              <span slot="help">
-                The table that will store the many-to-many relationship between records of this table.
-              </span>
-            </Field>
-            {#if $mappingTableName}
-          
-              <Field
-                field={columnNameMappingToBase}
-                label={$_('Name of New Column {number}', { values: { number: 1 } })}
-              >
-                <span slot="help">
-                  The column in <Pill table={{ name: $mappingTableName }} which="mapping" /> that will link to <Pill table={base} which="base" />.
-                </span>
-              </Field>
-              <Field
-                field={columnNameMappingToTarget}
-                label={$_('Name of New Column {number}', { values: { number: 2 } })}
-              >
-                <span slot="help">
-                  The column in <Pill table={{ name: $mappingTableName }} which="mapping" /> that will link to <Pill table={target} which="target" />.
-                </span>
-              </Field>
-            {/if}
-          {:else}
-            {#if $mappingTableName}
-              <p>
-                <RichText
-                  text={'We will create a new table [mappingTable].'}
-                  let:slotName
-                >
-                  {#if slotName === 'mappingTable'}
-                    <Pill table={{ name: $mappingTableName }} which="mapping" />
-                  {:else if slotName === 'targetTable'}
-                    <Pill table={target} which="target" />
-                  {:else if slotName === 'baseTable'}
-                    <Pill table={base} which="base" />
-                  {/if}
-                </RichText>
-              </p>
-            {/if}
-            <Field
-              field={mappingTableName}
-              label={'Name of New Table'}
-            >
-              <span slot="help">
-                The table that will store the many-to-many relationship between records of the two tables.
-              </span>
-            </Field>
-            {#if $mappingTableName}
-              <NewColumn
-                base={{ name: $mappingTableName }}
-                baseWhich="mapping"
-                target={base}
-                targetWhich="base"
-                field={columnNameMappingToBase}
-              />
-              <NewColumn
-                base={{ name: $mappingTableName }}
-                baseWhich="mapping"
-                {target}
-                field={columnNameMappingToTarget}
-              />
-            {/if}
+          <Field
+            field={mappingTableName}
+            label={'Name of New Table'}
+          >
+            <span slot="help">
+              The table that will store the many-to-many relationship between records of {isSelfReferential ? 'this table' : 'the two tables'}.
+            </span>
+          </Field>
+          {#if $mappingTableName}
+            <NewColumn
+              base={{ name: $mappingTableName }}
+              baseWhich="mapping"
+              target={base}
+              targetWhich="base"
+              field={columnNameMappingToBase}
+              label={$_('Name of New Column {number}', { values: { number: 1 } })}
+            />
+            <NewColumn
+              base={{ name: $mappingTableName }}
+              baseWhich="mapping"
+              target={isSelfReferential ? base : target}
+              targetWhich={isSelfReferential ? "base" : "target"}
+              field={columnNameMappingToTarget}
+              label={$_('Name of New Column {number}', { values: { number: 2 } })}
+            />
           {/if}
         {:else}
           {assertExhaustive($linkType)}
diff --git a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
index 56501bee33..b916bb46ba 100644
--- a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
@@ -9,7 +9,7 @@
 
   import Pill from './LinkTablePill.svelte';
 
-  const label = 'Name of New Column';
+  export let label = 'Name of New Column';
 
   type Which = ComponentProps<Pill>['which'];
 
@@ -19,15 +19,25 @@
   export let targetWhich: Which = 'target';
   export let field: FieldStore;
   export let targetColumnsAreLoading = false;
+
+  // The formattedHelpText reactive statement has been removed
 </script>
 
 {#if baseWhich !== 'mapping'}
 <p>
-  <RichText text={$_('we_will_add_a_column_in_x_to_y')} let:slotName>
+  <RichText
+    text={$_('we_will_add_a_column_in_x_to_y', {
+      baseTable: base.name,
+      targetTable: target.name
+    })}
+    let:slotName
+  >
     {#if slotName === 'baseTable'}
       <Pill table={base} which={baseWhich} />
     {:else if slotName === 'targetTable'}
       <Pill table={target} which={targetWhich} />
+    {:else if slotName === 'mappingTable'}
+      <Pill table={base} which={baseWhich} />
     {/if}
   </RichText>
 </p>
@@ -43,7 +53,13 @@
 {:else}
   <Field {field} {label}>
     <span slot="help">
-      The column in <Pill table={base} which={baseWhich} /> that will link to the <Pill table={target} which={targetWhich} /> table.
+      <RichText text={$_('new_column_link_help')} let:slotName>
+        {#if slotName === 'baseTable'}
+          <Pill table={base} which={baseWhich} />
+        {:else if slotName === 'targetTable'}
+          <Pill table={target} which={targetWhich} />
+        {/if}
+      </RichText>
     </span>
   </Field>
 {/if}

From dae805a2112b381953eb84c67043c795b625c75f Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Tue, 10 Sep 2024 11:09:28 +0200
Subject: [PATCH 0828/1141] replace string

---
 mathesar_ui/src/i18n/languages/en/dict.json                     | 1 +
 .../src/systems/table-view/constraints/NewFkConstraint.svelte   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 3c6036b2d7..fa9ba08d61 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -18,6 +18,7 @@
   "add_new_sort_condition": "Add new sort condition",
   "add_tables_to_new_schema": "You've created a new schema, now add tables to it.",
   "add_transformation_step": "Add transformation step",
+  "add_foreign_key_constraint": "Add Foreign Key Constraint",
   "add_user": "Add User",
   "admin": "Admin",
   "admin_access": "Admin Access",
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
index 451e364832..bb1108dff7 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
@@ -194,7 +194,7 @@
     onProceed={handleSave}
     onCancel={onClose}
     size="small"
-    proceedButton={{ label: $_('Add Foreign Key Constraint') }}
+    proceedButton={{ label: $_('add_foreign_key_constraint') }}
   />
 </div>
 

From e144a22c5ca8f0e88ad495f4e2b86f2b0dff421a Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Tue, 10 Sep 2024 11:48:32 +0200
Subject: [PATCH 0829/1141] remove text and line height css

---
 mathesar_ui/src/App.svelte                         |  6 +-----
 mathesar_ui/src/i18n/languages/en/dict.json        |  2 +-
 .../column-extraction/ExtractColumnsModal.svelte   | 14 +++-----------
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/mathesar_ui/src/App.svelte b/mathesar_ui/src/App.svelte
index 3a14e90ebf..0fd02d9519 100644
--- a/mathesar_ui/src/App.svelte
+++ b/mathesar_ui/src/App.svelte
@@ -143,11 +143,7 @@
     overflow: hidden;
     height: 100vh;
   }
-
-  p {
-    line-height: 1.5;
-  }
-
+  
   h1 {
     margin: 0 0 1rem 0;
     font-size: var(--size-xx-large);
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index fa9ba08d61..bb2ce9984e 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -339,7 +339,7 @@
   "navigate_to_table_record": "Navigate to a {tableName} record",
   "needs_import_confirmation": "Needs Import Confirmation",
   "new_column": "New Column",
-  "new_column_added_to_table": "The new column that will be added to [tableName]",
+  "new_column_added_to_table": "The new column that will be added to [tableName].",
   "new_foreign_key_constraint": "New Foreign Key Constraint",
   "new_link_wont_work_once_regenerated": "Once you regenerate a new link, the old link will no longer work.",
   "new_password": "New Password",
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
index 63ae98ba04..83668eff23 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
@@ -299,10 +299,10 @@
           text={targetTableName
             ? $_('columns_removed_from_table_added_to_target', {
                 values: { count: $columns.length },
-              }) + ' A link column will be created to maintain the relationship between records.'
+              })
             : $_('columns_removed_from_table_added_to_new_table', {
                 values: { count: $columns.length },
-              }) + ' A link column will be created to maintain the relationship between records.'}
+              })}
           let:slotName
         >
           {#if slotName === 'tableName'}
@@ -318,7 +318,7 @@
       </p>
       {#if $targetType === 'newTable'}
         
-        <Field field={newFkColumnName} label='Name of Link Column'>
+        <Field field={newFkColumnName} label='Name of Link Column' layout="stacked">
           <span slot="help">
             <RichText text={$_('new_column_added_to_table')} let:slotName>
               {#if slotName === 'tableName'}
@@ -340,11 +340,3 @@
   />
 </ControlledModal>
 
-<style>
-  :global(.outcome-box .labeled-input.layout-inline .label-content) {
-    align-items: flex-start;
-  }
-  :global(.outcome-box .label-content .input) {
-    flex-grow: 1; 
-  }
-</style>

From 39989fdcbae3bd176cc7d939f1f7d19e3c3bd647 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Tue, 10 Sep 2024 11:52:50 +0200
Subject: [PATCH 0830/1141] fix type error

---
 .../src/systems/table-view/link-table/NewColumn.svelte   | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
index b916bb46ba..8b8ba42ad2 100644
--- a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
@@ -20,18 +20,11 @@
   export let field: FieldStore;
   export let targetColumnsAreLoading = false;
 
-  // The formattedHelpText reactive statement has been removed
 </script>
 
 {#if baseWhich !== 'mapping'}
 <p>
-  <RichText
-    text={$_('we_will_add_a_column_in_x_to_y', {
-      baseTable: base.name,
-      targetTable: target.name
-    })}
-    let:slotName
-  >
+  <RichText text={$_('we_will_add_a_column_in_x_to_y')} let:slotName>
     {#if slotName === 'baseTable'}
       <Pill table={base} which={baseWhich} />
     {:else if slotName === 'targetTable'}

From b4d5c334e1dacdd5d051ea8df08ee76d8023534e Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Tue, 10 Sep 2024 12:45:27 +0200
Subject: [PATCH 0831/1141] run-format

---
 mathesar_ui/src/App.svelte                    |  3 +--
 mathesar_ui/src/components/form/Field.svelte  | 12 ++++-----
 mathesar_ui/src/i18n/languages/en/dict.json   | 12 ++++-----
 .../InstallationSchemaSelector.svelte         |  2 --
 .../systems/schemas/AddEditSchemaModal.svelte |  2 +-
 .../constraints/NewFkConstraint.svelte        |  4 +--
 .../constraints/NewUniqueConstraint.svelte    |  1 -
 .../link-table/LinkTableForm.svelte           | 25 ++++++++++---------
 .../link-table/LinkTableModal.svelte          |  2 +-
 .../table-view/link-table/NewColumn.svelte    | 23 ++++++++---------
 .../ExtractColumnsModal.svelte                | 10 +++++---
 11 files changed, 46 insertions(+), 50 deletions(-)

diff --git a/mathesar_ui/src/App.svelte b/mathesar_ui/src/App.svelte
index 0fd02d9519..6c91c2cdba 100644
--- a/mathesar_ui/src/App.svelte
+++ b/mathesar_ui/src/App.svelte
@@ -143,7 +143,7 @@
     overflow: hidden;
     height: 100vh;
   }
-  
+
   h1 {
     margin: 0 0 1rem 0;
     font-size: var(--size-xx-large);
@@ -224,5 +224,4 @@
     justify-content: center;
     display: flex;
   }
-  
 </style>
diff --git a/mathesar_ui/src/components/form/Field.svelte b/mathesar_ui/src/components/form/Field.svelte
index 6a789dc30d..736c8e860b 100644
--- a/mathesar_ui/src/components/form/Field.svelte
+++ b/mathesar_ui/src/components/form/Field.svelte
@@ -40,10 +40,10 @@
         {...inputComponentProps}
       />
       {#if !isStacked && (help || $$slots.help)}
-      <FieldHelp>
-        <slot name="help">{help}</slot>
-      </FieldHelp>
-    {/if}
+        <FieldHelp>
+          <slot name="help">{help}</slot>
+        </FieldHelp>
+      {/if}
     </LabeledInput>
   {:else}
     <svelte:component
@@ -56,12 +56,12 @@
       <slot />
     </svelte:component>
   {/if}
-  
+
   {#if isStacked && (help || $$slots.help)}
     <FieldHelp>
       <slot name="help">{help}</slot>
     </FieldHelp>
   {/if}
-  
+
   <FieldErrors {field} />
 </FieldLayout>
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index bb2ce9984e..68f34d1fc7 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -13,12 +13,12 @@
   "add_collaborator": "Add Collaborator",
   "add_columns_to_exploration_empty_message": "This exploration does not contain any columns. Edit the exploration to add columns to it.",
   "add_filter": "Add Filter",
+  "add_foreign_key_constraint": "Add Foreign Key Constraint",
   "add_new_filter": "Add New Filter",
   "add_new_grouping": "Add New Grouping",
   "add_new_sort_condition": "Add new sort condition",
   "add_tables_to_new_schema": "You've created a new schema, now add tables to it.",
   "add_transformation_step": "Add transformation step",
-  "add_foreign_key_constraint": "Add Foreign Key Constraint",
   "add_user": "Add User",
   "admin": "Admin",
   "admin_access": "Admin Access",
@@ -315,7 +315,9 @@
   "manager_access": "Manager Access",
   "manually": "Manually",
   "many_to_many": "Many to Many",
+  "many_to_many_link_base_help": "The column in [mappingTable] that will link to [baseTable].",
   "many_to_many_link_description": "Multiple [baseTable] and [targetTable] records can link to each other through a new [mappingTable]",
+  "many_to_many_link_target_help": "The column in [mappingTable] that will link to [targetTable].",
   "many_to_many_self_referential_link_description": "Multiple [baseTable] records can link to each other through a new [mapping]",
   "many_to_one": "Many to One",
   "many_to_one_link_description": "Multiple [baseTable] records can link to the same [targetTable] record.",
@@ -340,6 +342,7 @@
   "needs_import_confirmation": "Needs Import Confirmation",
   "new_column": "New Column",
   "new_column_added_to_table": "The new column that will be added to [tableName].",
+  "new_column_link_help": "The column in [baseTable] that will link to the [targetTable] table.",
   "new_foreign_key_constraint": "New Foreign Key Constraint",
   "new_link_wont_work_once_regenerated": "Once you regenerate a new link, the old link will no longer work.",
   "new_password": "New Password",
@@ -484,6 +487,7 @@
   "saving_changes": "Saving Changes",
   "schema": "Schema",
   "schema_delete_warning": "All objects in this schema will be deleted permanently, including (but not limited to) tables and views. Some of these objects may not be visible in the Mathesar UI.",
+  "schema_description": "Use schemas to organize related tables into logical groups within your database.",
   "schema_name_already_exists": "A schema with that name already exists.",
   "schema_name_cannot_be_empty": "Schema name cannot be empty",
   "schema_not_found": "Schema not found.",
@@ -641,9 +645,5 @@
   "window_remains_open_mathesar_unusable": "This window will remain open but all features within Mathesar will be unusable.",
   "yes": "Yes",
   "yes_summarize_as_list": "Yes, summarize as a list",
-  "yesterday": "Yesterday",
-  "schema_description": "Use schemas to organize related tables into logical groups within your database.",
-  "many_to_many_link_base_help": "The column in [mappingTable] that will link to [baseTable].",
-  "many_to_many_link_target_help": "The column in [mappingTable] that will link to [targetTable].",
-  "new_column_link_help": "The column in [baseTable] that will link to the [targetTable] table."
+  "yesterday": "Yesterday"
 }
diff --git a/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte b/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte
index 28a2c88245..d03efd1fc8 100644
--- a/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte
@@ -41,5 +41,3 @@
     getCheckboxDisabled={(o) => o === 'internal'}
   />
 </div>
-
-
diff --git a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
index 22d61f92bb..bb9dc92459 100644
--- a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
+++ b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
@@ -60,7 +60,7 @@
   getInitialName={() => schema?.name ?? ''}
   getInitialDescription={() => schema?.description ?? ''}
   saveButtonLabel={schema ? $_('save') : $_('create_new_schema')}
-  namePlaceholder='Eg. Personal Finances, Movies'
+  namePlaceholder="Eg. Personal Finances, Movies"
 >
   <svelte:fragment slot="helpText">
     {#if !schema}
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
index bb1108dff7..743fc9d1fc 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
@@ -121,7 +121,6 @@
 </script>
 
 <div class="add-new-fk-constraint">
-
   <Field
     field={baseColumn}
     input={{
@@ -130,7 +129,6 @@
     }}
     layout="stacked"
     label="Referencing Column"
-
   >
     <span slot="help">
       {$_('column_references_target_table')}
@@ -201,7 +199,7 @@
 <style lang="scss">
   .add-new-fk-constraint {
     display: flex;
-    flex-direction: column;   
+    flex-direction: column;
 
     > :global(* + *) {
       margin-top: 1rem;
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
index 8748583c88..cae9bf2dfe 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
@@ -128,7 +128,6 @@
       <LabeledInput label="Columns" layout="stacked">
         <span slot="help">
           The columns in this table that should contain unique values.
-
         </span>
         <MultiSelect
           bind:values={constraintColumns}
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index eda80530b1..5c6a66deda 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -224,7 +224,6 @@
 </div>
 
 <div class="form" class:self-referential={isSelfReferential}>
-
   <FieldLayout>
     <InfoBox fullWidth={true}>
       {$_('links_info')}
@@ -258,14 +257,14 @@
 
     <FieldLayout>
       <OutcomeBox>
-        {#if $linkType === 'oneToMany'}  
+        {#if $linkType === 'oneToMany'}
           <NewColumn
             base={target}
             target={base}
             field={columnNameInTarget}
             {targetColumnsAreLoading}
           />
-        {:else if $linkType === 'manyToOne'}  
+        {:else if $linkType === 'manyToOne'}
           <NewColumn {base} {target} field={columnNameInBase} />
         {:else if $linkType === 'manyToMany'}
           <p>
@@ -282,12 +281,10 @@
               {/if}
             </RichText>
           </p>
-          <Field
-            field={mappingTableName}
-            label={'Name of New Table'}
-          >
+          <Field field={mappingTableName} label={'Name of New Table'}>
             <span slot="help">
-              The table that will store the many-to-many relationship between records of {isSelfReferential ? 'this table' : 'the two tables'}.
+              The table that will store the many-to-many relationship between
+              records of {isSelfReferential ? 'this table' : 'the two tables'}.
             </span>
           </Field>
           {#if $mappingTableName}
@@ -297,15 +294,19 @@
               target={base}
               targetWhich="base"
               field={columnNameMappingToBase}
-              label={$_('Name of New Column {number}', { values: { number: 1 } })}
+              label={$_('Name of New Column {number}', {
+                values: { number: 1 },
+              })}
             />
             <NewColumn
               base={{ name: $mappingTableName }}
               baseWhich="mapping"
               target={isSelfReferential ? base : target}
-              targetWhich={isSelfReferential ? "base" : "target"}
+              targetWhich={isSelfReferential ? 'base' : 'target'}
               field={columnNameMappingToTarget}
-              label={$_('Name of New Column {number}', { values: { number: 2 } })}
+              label={$_('Name of New Column {number}', {
+                values: { number: 2 },
+              })}
             />
           {/if}
         {:else}
@@ -351,6 +352,6 @@
     width: 12rem;
   }
   :global(.form .outcome-box .label-content .input) {
-    flex-grow: 1; 
+    flex-grow: 1;
   }
 </style>
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableModal.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableModal.svelte
index a27b68f0b0..865d9a169c 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableModal.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableModal.svelte
@@ -13,7 +13,7 @@
 </script>
 
 {#if $currentTable}
-  <ControlledModal {controller} size="large" title={$_('create_link')}>  
+  <ControlledModal {controller} size="large" title={$_('create_link')}>
     <LinkTableForm base={$currentTable} close={() => controller.close()} />
   </ControlledModal>
 {/if}
diff --git a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
index 8b8ba42ad2..bc998d02bb 100644
--- a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
@@ -19,21 +19,20 @@
   export let targetWhich: Which = 'target';
   export let field: FieldStore;
   export let targetColumnsAreLoading = false;
-
 </script>
 
 {#if baseWhich !== 'mapping'}
-<p>
-  <RichText text={$_('we_will_add_a_column_in_x_to_y')} let:slotName>
-    {#if slotName === 'baseTable'}
-      <Pill table={base} which={baseWhich} />
-    {:else if slotName === 'targetTable'}
-      <Pill table={target} which={targetWhich} />
-    {:else if slotName === 'mappingTable'}
-      <Pill table={base} which={baseWhich} />
-    {/if}
-  </RichText>
-</p>
+  <p>
+    <RichText text={$_('we_will_add_a_column_in_x_to_y')} let:slotName>
+      {#if slotName === 'baseTable'}
+        <Pill table={base} which={baseWhich} />
+      {:else if slotName === 'targetTable'}
+        <Pill table={target} which={targetWhich} />
+      {:else if slotName === 'mappingTable'}
+        <Pill table={base} which={baseWhich} />
+      {/if}
+    </RichText>
+  </p>
 {/if}
 
 {#if targetColumnsAreLoading}
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
index 83668eff23..6e02f11644 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
@@ -317,8 +317,11 @@
         </RichText>
       </p>
       {#if $targetType === 'newTable'}
-        
-        <Field field={newFkColumnName} label='Name of Link Column' layout="stacked">
+        <Field
+          field={newFkColumnName}
+          label="Name of Link Column"
+          layout="stacked"
+        >
           <span slot="help">
             <RichText text={$_('new_column_added_to_table')} let:slotName>
               {#if slotName === 'tableName'}
@@ -326,7 +329,7 @@
               {/if}
             </RichText>
           </span>
-          </Field>
+        </Field>
       {/if}
     </OutcomeBox>
   </FieldLayout>
@@ -339,4 +342,3 @@
     onCancel={() => controller.close()}
   />
 </ControlledModal>
-

From f5fc7400e4b62039121ba5acb41b0e43398f6993 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Tue, 10 Sep 2024 13:06:58 +0200
Subject: [PATCH 0832/1141] fix errors

---
 mathesar_ui/src/components/NameAndDescInputModalForm.svelte   | 1 -
 mathesar_ui/src/components/message-boxes/InfoBox.svelte       | 1 -
 mathesar_ui/src/i18n/languages/en/dict.json                   | 2 ++
 .../src/systems/table-view/constraints/NewFkConstraint.svelte | 2 +-
 .../systems/table-view/constraints/NewUniqueConstraint.svelte | 4 ++--
 .../column/column-extraction/ExtractColumnsModal.svelte       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mathesar_ui/src/components/NameAndDescInputModalForm.svelte b/mathesar_ui/src/components/NameAndDescInputModalForm.svelte
index 7e752b17ed..ecb35ad75d 100644
--- a/mathesar_ui/src/components/NameAndDescInputModalForm.svelte
+++ b/mathesar_ui/src/components/NameAndDescInputModalForm.svelte
@@ -29,7 +29,6 @@
   export let getInitialName: () => string = () => '';
   export let getInitialDescription: () => string = () => '';
   export let save: (name: string, description: string) => Promise<void>;
-  //export name and description placeholders
   export let namePlaceholder = $_('name');
   export let descriptionPlaceholder = $_('description');
 
diff --git a/mathesar_ui/src/components/message-boxes/InfoBox.svelte b/mathesar_ui/src/components/message-boxes/InfoBox.svelte
index c5d5500d3b..d430a298d9 100644
--- a/mathesar_ui/src/components/message-boxes/InfoBox.svelte
+++ b/mathesar_ui/src/components/message-boxes/InfoBox.svelte
@@ -6,7 +6,6 @@
   import MessageBox from './MessageBox.svelte';
 
   type $$Props = ComponentProps<MessageBox>;
-  export let fullWidth = true;
 </script>
 
 <div class="info-box">
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 68f34d1fc7..6951e5be71 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -109,6 +109,7 @@
   "constraints": "Constraints",
   "constraints_info_help": "Use constraints to define relationships between records in different tables or ensure uniqueness within a column.",
   "constraints_info_help_mini": "Constraints are rules that apply to the data in a column to ensure that it is valid.",
+  "columns_unique_values_help": "The columns in this table that should contain unique values.",
   "content": "Content",
   "continue": "Continue",
   "copy_and_paste_text": "Copy and Paste Text",
@@ -336,6 +337,7 @@
   "multiple_records_selected": "{count, plural, one {{count} record selected} other {{count} records selected}}",
   "name": "Name",
   "name_of_new_table": "Name of New Table",
+  "name_of_link_column": "Name of Link Column",
   "name_your_schema_help": "Name your schema to reflect its purpose. For example, your personal financial schema may be called \"Personal Finances\" and your movie collection \"Movies.\" Add a description to your schema to remember what it's for.",
   "navigate_to_record": "Navigate to a record",
   "navigate_to_table_record": "Navigate to a {tableName} record",
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
index 743fc9d1fc..7b6dbceef3 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
@@ -128,7 +128,7 @@
       props: { columns: baseTableColumns },
     }}
     layout="stacked"
-    label="Referencing Column"
+    label={$_('referencing_column')}
   >
     <span slot="help">
       {$_('column_references_target_table')}
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
index cae9bf2dfe..f8573d14aa 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
@@ -125,9 +125,9 @@
 <div class="add-new-unique-constraint">
   <Form>
     <FormField>
-      <LabeledInput label="Columns" layout="stacked">
+      <LabeledInput label={$_('columns')} layout="stacked">
         <span slot="help">
-          The columns in this table that should contain unique values.
+          {$_('columns_unique_values_help')}
         </span>
         <MultiSelect
           bind:values={constraintColumns}
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
index 6e02f11644..4c97cb30b5 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
@@ -319,7 +319,7 @@
       {#if $targetType === 'newTable'}
         <Field
           field={newFkColumnName}
-          label="Name of Link Column"
+          label={$_('name_of_link_column')}
           layout="stacked"
         >
           <span slot="help">

From 8d60d533501d5919e1335d52ac532f3bb52146e1 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Tue, 10 Sep 2024 13:15:52 +0200
Subject: [PATCH 0833/1141] run format

---
 mathesar_ui/src/i18n/languages/en/dict.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 6951e5be71..b6efd6d109 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -86,6 +86,7 @@
   "columns_removed_from_table_added_to_target": "{count, plural, one {The selected column will be moved from [tableName] to [targetTableName]} other {The selected columns will be moved from [tableName] to [targetTableName]}}.",
   "columns_to_extract": "Columns to Extract",
   "columns_to_move": "Columns to Move",
+  "columns_unique_values_help": "The columns in this table that should contain unique values.",
   "configure_in_mathesar": "Configure in Mathesar",
   "configure_password": "Configure Password",
   "configure_value": "Configure ''{value}''",
@@ -109,7 +110,6 @@
   "constraints": "Constraints",
   "constraints_info_help": "Use constraints to define relationships between records in different tables or ensure uniqueness within a column.",
   "constraints_info_help_mini": "Constraints are rules that apply to the data in a column to ensure that it is valid.",
-  "columns_unique_values_help": "The columns in this table that should contain unique values.",
   "content": "Content",
   "continue": "Continue",
   "copy_and_paste_text": "Copy and Paste Text",
@@ -336,8 +336,8 @@
   "multiple_records": "{count, plural, one {{count} Record} other {{count} Records}}",
   "multiple_records_selected": "{count, plural, one {{count} record selected} other {{count} records selected}}",
   "name": "Name",
-  "name_of_new_table": "Name of New Table",
   "name_of_link_column": "Name of Link Column",
+  "name_of_new_table": "Name of New Table",
   "name_your_schema_help": "Name your schema to reflect its purpose. For example, your personal financial schema may be called \"Personal Finances\" and your movie collection \"Movies.\" Add a description to your schema to remember what it's for.",
   "navigate_to_record": "Navigate to a record",
   "navigate_to_table_record": "Navigate to a {tableName} record",

From cf5234829af046cb337427d1441dbf3cc725929d Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Tue, 10 Sep 2024 13:19:23 +0200
Subject: [PATCH 0834/1141] remove unused css

---
 .../systems/table-view/constraints/NewFkConstraint.svelte    | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
index 7b6dbceef3..1ff6110a38 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
@@ -204,10 +204,5 @@
     > :global(* + *) {
       margin-top: 1rem;
     }
-
-    .title {
-      font-weight: var(--font-weight-medium);
-      font-size: var(--text-size-large);
-    }
   }
 </style>

From 83ca0e882a52cb2d9128d2d9991502d85c99b83d Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Tue, 10 Sep 2024 13:33:24 +0200
Subject: [PATCH 0835/1141] fix lint errors

---
 mathesar_ui/src/i18n/languages/en/dict.json              | 1 +
 .../systems/table-view/link-table/LinkTableForm.svelte   | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index b6efd6d109..095a5316dd 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -322,6 +322,7 @@
   "many_to_many_self_referential_link_description": "Multiple [baseTable] records can link to each other through a new [mapping]",
   "many_to_one": "Many to One",
   "many_to_one_link_description": "Multiple [baseTable] records can link to the same [targetTable] record.",
+  "mapping_table_description": "The table that will store the many-to-many relationship between records of {count, plural, one {this table} other {the two tables}}.",
   "mathesar": "Mathesar",
   "mathesar_user": "Mathesar User",
   "max_time_unit": "Max Time Unit",
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index 5c6a66deda..254b37a839 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -281,10 +281,13 @@
               {/if}
             </RichText>
           </p>
-          <Field field={mappingTableName} label={'Name of New Table'}>
+          <Field field={mappingTableName} label={$_('Name of New Table')}>
             <span slot="help">
-              The table that will store the many-to-many relationship between
-              records of {isSelfReferential ? 'this table' : 'the two tables'}.
+              {$_('mapping_table_description', {
+                values: {
+                  count: isSelfReferential ? 1 : 2,
+                },
+              })}
             </span>
           </Field>
           {#if $mappingTableName}

From 7485840c6bc18c398ef73adf7fd99ed248703193 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Tue, 10 Sep 2024 17:56:01 +0530
Subject: [PATCH 0836/1141] Display child roles in permissions modal, make
 components common to use for other objects

---
 mathesar_ui/src/i18n/languages/en/dict.json   |   1 +
 mathesar_ui/src/icons/customIcons.ts          |  12 ++
 mathesar_ui/src/icons/index.ts                |   4 +
 .../DatabasePermissionsModal.svelte           |  81 ++++------
 .../collaborators/Collaborators.svelte        |  11 +-
 .../RoleConfiguration.svelte                  |  11 +-
 mathesar_ui/src/stores/AsyncRpcApiStore.ts    |  31 +++-
 .../permissions/DirectPrivilegeRow.svelte     |  38 ++---
 .../permissions/PermissionsModal.svelte       |  55 +++++++
 .../permissions/PrivilegesSection.svelte      |  97 +++++------
 .../permissions/RoleWithChildren.svelte       |  61 +++++++
 .../TransferOwnershipSection.svelte           |   0
 mathesar_ui/src/systems/permissions/utils.ts  | 150 ++++++++++++++++++
 13 files changed, 412 insertions(+), 140 deletions(-)
 rename mathesar_ui/src/{pages/database => systems}/permissions/DirectPrivilegeRow.svelte (80%)
 create mode 100644 mathesar_ui/src/systems/permissions/PermissionsModal.svelte
 rename mathesar_ui/src/{pages/database => systems}/permissions/PrivilegesSection.svelte (53%)
 create mode 100644 mathesar_ui/src/systems/permissions/RoleWithChildren.svelte
 rename mathesar_ui/src/{pages/database => systems}/permissions/TransferOwnershipSection.svelte (100%)
 create mode 100644 mathesar_ui/src/systems/permissions/utils.ts

diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 34a0d40b6b..dbad05661d 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -49,6 +49,7 @@
   "change_password": "Change Password",
   "check_for_updates": "Check for Updates",
   "child_roles": "Child Roles",
+  "child_roles_count": "{count, plural, one {{count} child role} other {{count} child roles}}",
   "child_roles_saved_successfully": "The Child Roles have been successfully saved.",
   "choose_database": "Choose a Database",
   "choose_schema": "Choose a Schema",
diff --git a/mathesar_ui/src/icons/customIcons.ts b/mathesar_ui/src/icons/customIcons.ts
index 393a5a244c..08297ce32d 100644
--- a/mathesar_ui/src/icons/customIcons.ts
+++ b/mathesar_ui/src/icons/customIcons.ts
@@ -121,3 +121,15 @@ export const connectDatabaseIcon: IconProps['data'] = {
     ],
   ],
 };
+
+export const treeChildNodeArrowIcon: IconProps['data'] = {
+  icon: [
+    9,
+    10,
+    [],
+    '',
+    [
+      'M0.5 5V0H1.5V5C1.5 6.933 3.067 8.5 5 8.5H9V9.5H5C2.51472 9.5 0.5 7.48528 0.5 5Z',
+    ],
+  ],
+};
diff --git a/mathesar_ui/src/icons/index.ts b/mathesar_ui/src/icons/index.ts
index 9048599c0f..5b9d710a8d 100644
--- a/mathesar_ui/src/icons/index.ts
+++ b/mathesar_ui/src/icons/index.ts
@@ -83,6 +83,7 @@ import {
   explorationIcon,
   outcomeIcon,
   tableIcon,
+  treeChildNodeArrowIcon,
 } from './customIcons';
 
 /**
@@ -178,6 +179,9 @@ export const iconTable: IconProps = { data: tableIcon };
 export const iconInspector: IconProps = { data: faInfo };
 export const iconTableLink: IconProps = { data: faLink };
 export const iconTechnicalExplanation: IconProps = { data: faHammer };
+export const iconTreeChildNodeArrow: IconProps = {
+  data: treeChildNodeArrowIcon,
+};
 export const iconUpgradeAvailable: IconProps = { data: faCircleInfo };
 export const iconCurrentlyInstalledVersion: IconProps = { data: faCheck };
 export const iconUser: IconProps = { data: faUser };
diff --git a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
index b7f3572d36..70201774cd 100644
--- a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
+++ b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
@@ -1,63 +1,50 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
+  import { allDatabasePrivileges } from '@mathesar/api/rpc/databases';
   import { DatabaseRouteContext } from '@mathesar/contexts/DatabaseRouteContext';
-  import {
-    ControlledModal,
-    type ModalController,
-    TabContainer,
-  } from '@mathesar-component-library';
-
-  import PrivilegesSection from './PrivilegesSection.svelte';
-  import TransferOwnershipSection from './TransferOwnershipSection.svelte';
+  import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
+  import PermissionsModal from '@mathesar/systems/permissions/PermissionsModal.svelte';
+  import PrivilegesSection from '@mathesar/systems/permissions/PrivilegesSection.svelte';
+  import TransferOwnershipSection from '@mathesar/systems/permissions/TransferOwnershipSection.svelte';
+  import type { ModalController } from '@mathesar-component-library';
 
   export let controller: ModalController;
 
   const databaseContext = DatabaseRouteContext.get();
-  $: ({ database } = $databaseContext);
+  $: ({ database, roles, underlyingDatabase } = $databaseContext);
   $: databasePrivileges = database.constructDatabasePrivilegesStore();
 
-  const tabs = [
-    {
-      id: 'share',
-      label: $_('share'),
-    },
-    {
-      id: 'transfer_ownership',
-      label: $_('transfer_ownership'),
-    },
-  ];
-  let activeTab = tabs[0];
-
-  function onModalClose() {
-    [activeTab] = tabs;
+  function getAsyncStores() {
+    void AsyncRpcApiStore.runBatched([
+      databasePrivileges.batchRunner({ database_id: database.id }),
+      roles.batchRunner({ database_id: database.id }),
+      underlyingDatabase.batchRunner({ database_id: database.id }),
+    ]);
+    return {
+      roles,
+      objectPrivileges: databasePrivileges,
+      objectOwnerAndCurrentRolePrivileges: underlyingDatabase,
+    };
   }
+
+  function savePermissions() {}
 </script>
 
-<ControlledModal {controller} on:close={onModalClose}>
+<PermissionsModal {controller} onClose={() => databasePrivileges.reset()}>
   <span slot="title">
     {$_('database_permissions')}
   </span>
-  <div class="tabs">
-    <TabContainer
-      bind:activeTab
-      {tabs}
-      uniformTabWidth={false}
-      tabStyle="compact"
-    >
-      <div class="tab-content">
-        {#if activeTab.id === 'share'}
-          <PrivilegesSection {controller} {databasePrivileges} />
-        {:else}
-          <TransferOwnershipSection {controller} />
-        {/if}
-      </div>
-    </TabContainer>
-  </div>
-</ControlledModal>
-
-<style lang="scss">
-  .tabs {
-    --Tab_margin-right: var(--size-small);
-  }
-</style>
+  <PrivilegesSection
+    slot="privileges"
+    {controller}
+    accessLevelConfig={[
+      { id: 'connect', privileges: new Set(['CONNECT']) },
+      { id: 'connect_and_create', privileges: new Set(['CONNECT', 'CREATE']) },
+    ]}
+    allPrivileges={[...allDatabasePrivileges]}
+    {getAsyncStores}
+    {savePermissions}
+  />
+  <TransferOwnershipSection slot="transfer-ownership" {controller} />
+</PermissionsModal>
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
index c038375006..36837f1585 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
@@ -28,13 +28,10 @@
 
   $: ({ database, configuredRoles, collaborators, users } = $routeContext);
 
-  $: void AsyncRpcApiStore.runBatched(
-    [
-      collaborators.batchRunner({ database_id: database.id }),
-      configuredRoles.batchRunner({ server_id: database.server.id }),
-    ],
-    { onlyRunIfNotInitialized: true },
-  );
+  $: void AsyncRpcApiStore.runBatched([
+    collaborators.batchRunner({ database_id: database.id }),
+    configuredRoles.batchRunner({ server_id: database.server.id }),
+  ]);
   $: void users.runIfNotInitialized();
   $: isLoading =
     $collaborators.isLoading || $configuredRoles.isLoading || $users.isLoading;
diff --git a/mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte b/mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte
index 785b9507a1..9e1689922a 100644
--- a/mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte
+++ b/mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte
@@ -36,13 +36,10 @@
   $: ({ database, databaseRouteContext, configuredRoles, combinedLoginRoles } =
     $routeContext);
   $: ({ roles } = databaseRouteContext);
-  $: void AsyncRpcApiStore.runBatched(
-    [
-      configuredRoles.batchRunner({ server_id: database.server.id }),
-      roles.batchRunner({ database_id: database.id }),
-    ],
-    { onlyRunIfNotInitialized: true },
-  );
+  $: void AsyncRpcApiStore.runBatched([
+    configuredRoles.batchRunner({ server_id: database.server.id }),
+    roles.batchRunner({ database_id: database.id }),
+  ]);
   $: isLoading = $configuredRoles.isLoading || $roles.isLoading;
 
   let targetCombinedLoginRole: CombinedLoginRole | undefined;
diff --git a/mathesar_ui/src/stores/AsyncRpcApiStore.ts b/mathesar_ui/src/stores/AsyncRpcApiStore.ts
index 6375e0b7c8..1036db2c1b 100644
--- a/mathesar_ui/src/stores/AsyncRpcApiStore.ts
+++ b/mathesar_ui/src/stores/AsyncRpcApiStore.ts
@@ -72,12 +72,37 @@ export default class AsyncRpcApiStore<Props, T, U = T> extends AsyncStore<
   static async runBatched(
     batchRunners: BatchRunner[],
     options?: Partial<{
+      when?:
+        | 'always'
+        | 'not-initialized'
+        | ('always' | 'not-initialized')[];
       onlyRunIfNotInitialized: boolean;
     }>,
   ) {
-    const toRun = options?.onlyRunIfNotInitialized
-      ? batchRunners.filter((runner) => !runner.getValue().hasInitialized)
-      : batchRunners;
+    const toRun = (() => {
+      if (Array.isArray(options?.when)) {
+        if (options.when.length !== batchRunners.length) {
+          throw new Error(
+            'Number of run options do not match number of batchRunners',
+          );
+        }
+        return batchRunners.filter((runner, index) => {
+          switch (options.when?.[index]) {
+            case 'always':
+              return true;
+            case 'not-initialized':
+            default:
+              return !runner.getValue().hasInitialized;
+          }
+        });
+      }
+      if (options?.when === 'always') {
+        return batchRunners;
+      }
+      // default is `not-initialized`
+      return batchRunners.filter((runner) => !runner.getValue().hasInitialized);
+    })();
+
     if (toRun.length > 0) {
       toRun.forEach((runner) => {
         runner.beforeRequest();
diff --git a/mathesar_ui/src/pages/database/permissions/DirectPrivilegeRow.svelte b/mathesar_ui/src/systems/permissions/DirectPrivilegeRow.svelte
similarity index 80%
rename from mathesar_ui/src/pages/database/permissions/DirectPrivilegeRow.svelte
rename to mathesar_ui/src/systems/permissions/DirectPrivilegeRow.svelte
index a58691e944..7bf623fec9 100644
--- a/mathesar_ui/src/pages/database/permissions/DirectPrivilegeRow.svelte
+++ b/mathesar_ui/src/systems/permissions/DirectPrivilegeRow.svelte
@@ -12,14 +12,19 @@
     Select,
   } from '@mathesar-component-library';
 
-  import { type RoleAccessLevelAndPrivileges, customAccess } from './utils';
+  import RoleWithChildren from './RoleWithChildren.svelte';
+  import {
+    type AccessLevelConfig,
+    type RoleAccessLevelAndPrivileges,
+    customAccess,
+  } from './utils';
 
   type AccessLevel = $$Generic;
   type Privilege = $$Generic;
 
   export let rolesMap: ImmutableMap<Role['oid'], Role>;
   export let privileges: Privilege[];
-  export let accessLevels: { id: AccessLevel; privileges: Set<Privilege> }[];
+  export let accessLevels: AccessLevelConfig<AccessLevel, Privilege>[];
 
   export let roleAccessLevelAndPrivileges: RoleAccessLevelAndPrivileges<
     AccessLevel,
@@ -32,9 +37,6 @@
 
   let isRolePermissionsOpen = false;
 
-  $: role = rolesMap.get(roleAccessLevelAndPrivileges.roleOid);
-  $: members = role?.members;
-
   function removeAccess() {
     setRoleAccessLevelAndPrivileges(
       roleAccessLevelAndPrivileges.roleOid,
@@ -71,18 +73,7 @@
 </script>
 
 <div class="access-selection-section">
-  <div class="name-and-members">
-    {#if role}
-      <div class="name">
-        <span>{role.name}</span>
-      </div>
-      <div>
-        {#if $members?.size}
-          + {$members.size}
-        {/if}
-      </div>
-    {/if}
-  </div>
+  <RoleWithChildren {rolesMap} roleOid={roleAccessLevelAndPrivileges.roleOid} />
   <div>
     <Select
       options={[...accessLevels.map((entry) => entry.id), customAccess]}
@@ -120,20 +111,9 @@
     display: grid;
     grid-template-columns: 2fr 1fr auto;
     gap: var(--size-ultra-small);
-
-    .name-and-members {
-      .name {
-        span {
-          padding: var(--size-extreme-small) var(--size-xx-small);
-          background: var(--slate-100);
-          border-radius: var(--border-radius-xl);
-          font-weight: 500;
-        }
-      }
-    }
   }
   .role-permissions-section {
-    margin-top: var(--size-super-ultra-small);
+    margin-top: var(--size-xx-small);
     --Collapsible_trigger-padding: var(--size-extreme-small) 0;
     --Collapsible_header-font-weight: 400;
 
diff --git a/mathesar_ui/src/systems/permissions/PermissionsModal.svelte b/mathesar_ui/src/systems/permissions/PermissionsModal.svelte
new file mode 100644
index 0000000000..7d3cef3d1b
--- /dev/null
+++ b/mathesar_ui/src/systems/permissions/PermissionsModal.svelte
@@ -0,0 +1,55 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import {
+    ControlledModal,
+    type ModalController,
+    TabContainer,
+  } from '@mathesar-component-library';
+
+  export let controller: ModalController;
+  export let onClose: () => void = () => {};
+
+  const tabs = [
+    {
+      id: 'share',
+      label: $_('share'),
+    },
+    {
+      id: 'transfer_ownership',
+      label: $_('transfer_ownership'),
+    },
+  ];
+  let activeTab = tabs[0];
+
+  function onModalClose() {
+    [activeTab] = tabs;
+    onClose();
+  }
+</script>
+
+<ControlledModal {controller} on:close={onModalClose}>
+  <slot name="title" slot="title" />
+  <div class="tabs">
+    <TabContainer
+      bind:activeTab
+      {tabs}
+      uniformTabWidth={false}
+      tabStyle="compact"
+    >
+      <div class="tab-content">
+        {#if activeTab.id === 'share'}
+          <slot name="privileges" {controller} />
+        {:else}
+          <slot name="transfer-ownership" {controller} />
+        {/if}
+      </div>
+    </TabContainer>
+  </div>
+</ControlledModal>
+
+<style lang="scss">
+  .tabs {
+    --Tab_margin-right: var(--size-small);
+  }
+</style>
diff --git a/mathesar_ui/src/pages/database/permissions/PrivilegesSection.svelte b/mathesar_ui/src/systems/permissions/PrivilegesSection.svelte
similarity index 53%
rename from mathesar_ui/src/pages/database/permissions/PrivilegesSection.svelte
rename to mathesar_ui/src/systems/permissions/PrivilegesSection.svelte
index 21c520dec8..fc5e920326 100644
--- a/mathesar_ui/src/pages/database/permissions/PrivilegesSection.svelte
+++ b/mathesar_ui/src/systems/permissions/PrivilegesSection.svelte
@@ -1,20 +1,13 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import {
-    type DatabasePrivilege,
-    allDatabasePrivileges,
-  } from '@mathesar/api/rpc/databases';
   import Errors from '@mathesar/components/Errors.svelte';
   import {
     FormSubmit,
     makeForm,
     requiredField,
   } from '@mathesar/components/form';
-  import { DatabaseRouteContext } from '@mathesar/contexts/DatabaseRouteContext';
-  import type { Database } from '@mathesar/models/Database';
   import type { Role } from '@mathesar/models/Role';
-  import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
   import {
     ImmutableMap,
     type ModalController,
@@ -24,83 +17,83 @@
   } from '@mathesar-component-library';
 
   import DirectPrivilegeRow from './DirectPrivilegeRow.svelte';
+  import RoleWithChildren from './RoleWithChildren.svelte';
   import {
+    type AccessLevelConfig,
+    type AsyncStoresValues,
     type RoleAccessLevelAndPrivileges,
-    dbAccessLevelConfigs,
-    getDbAccessPrivilegeMap,
+    getObjectAccessPrivilegeMap,
   } from './utils';
 
+  type AccessLevel = $$Generic;
+  type Privilege = $$Generic;
+
   export let controller: ModalController;
-  export let databasePrivileges: ReturnType<
-    Database['constructDatabasePrivilegesStore']
-  >;
+  export let accessLevelConfig: AccessLevelConfig<AccessLevel, Privilege>[];
+  export let getAsyncStores: () => AsyncStoresValues<Privilege>;
+  export let allPrivileges: Privilege[];
+  export let savePermissions: () => void;
 
-  const databaseContext = DatabaseRouteContext.get();
-  $: ({ database, roles, underlyingDatabase } = $databaseContext);
-  $: void AsyncRpcApiStore.runBatched(
-    [
-      roles.batchRunner({ database_id: database.id }),
-      databasePrivileges.batchRunner({ database_id: database.id }),
-      underlyingDatabase.batchRunner({ database_id: database.id }),
-    ],
-    { onlyRunIfNotInitialized: true },
-  );
+  $: ({ roles, objectPrivileges, objectOwnerAndCurrentRolePrivileges } =
+    getAsyncStores());
 
   $: isLoading =
     $roles.isLoading ||
-    $databasePrivileges.isLoading ||
-    $underlyingDatabase.isLoading;
+    $objectPrivileges.isLoading ||
+    $objectOwnerAndCurrentRolePrivileges.isLoading;
   $: isSuccess =
-    $roles.isOk && $databasePrivileges.isOk && $underlyingDatabase.isOk;
+    $roles.isOk &&
+    $objectPrivileges.isOk &&
+    $objectOwnerAndCurrentRolePrivileges.isOk;
   $: errors = [
     $roles.error,
-    $databasePrivileges.error,
-    $underlyingDatabase.error,
+    $objectPrivileges.error,
+    $objectOwnerAndCurrentRolePrivileges.error,
   ].filter((entry): entry is string => isDefinedNonNullable(entry));
 
-  $: dbPrivileges = requiredField(
-    getDbAccessPrivilegeMap(
-      $databasePrivileges.resolvedValue ?? new ImmutableMap(),
+  $: objectPrivilegesField = requiredField(
+    getObjectAccessPrivilegeMap(
+      accessLevelConfig,
+      $objectPrivileges.resolvedValue ?? new ImmutableMap(),
     ),
   );
-  $: form = makeForm({ dbPrivileges });
-  $: dbPrivilegesWithAccess = [...$dbPrivileges.values()].filter((entry) =>
-    isDefinedNonNullable(entry.accessLevel),
+  $: form = makeForm({ objectPrivilegesField });
+  $: objectPrivilegesWithAccess = [...$objectPrivilegesField.values()].filter(
+    (entry) => isDefinedNonNullable(entry.accessLevel),
   );
 
   function setRoleAccessLevelAndPrivileges(
     roleOid: Role['oid'],
-    accessLevelPrivileges: RoleAccessLevelAndPrivileges<
-      string,
-      DatabasePrivilege
-    >,
+    accessLevelPrivileges: RoleAccessLevelAndPrivileges<AccessLevel, Privilege>,
   ) {
-    console.log(accessLevelPrivileges);
-    dbPrivileges.update((dbPrivMap) =>
+    objectPrivilegesField.update((dbPrivMap) =>
       dbPrivMap.with(roleOid, accessLevelPrivileges),
     );
   }
-
-  function savePermissions() {}
 </script>
 
 <div class="privileges">
   {#if isLoading}
     <Spinner />
-  {:else if isSuccess && $roles.resolvedValue}
+  {:else if isSuccess && $roles.resolvedValue && $objectOwnerAndCurrentRolePrivileges.resolvedValue}
     <div class="section owner-section">
       <div class="title">{$_('owner')}</div>
-      <div class="content"></div>
+      <div class="content">
+        <RoleWithChildren
+          rolesMap={$roles.resolvedValue}
+          roleOid={$objectOwnerAndCurrentRolePrivileges.resolvedValue.owner_oid}
+        />
+      </div>
     </div>
     <div class="section granted-access-section">
       <div class="title">{$_('granted_access')}</div>
       <div class="content">
-        {#each dbPrivilegesWithAccess as roleAccessLevelAndPrivileges (roleAccessLevelAndPrivileges.roleOid)}
+        {#each objectPrivilegesWithAccess as roleAccessLevelAndPrivileges (roleAccessLevelAndPrivileges.roleOid)}
           <div class="privilege-row">
             <DirectPrivilegeRow
               rolesMap={$roles.resolvedValue}
-              privileges={[...allDatabasePrivileges]}
-              accessLevels={dbAccessLevelConfigs}
+              privileges={allPrivileges}
+              accessLevels={accessLevelConfig}
               {roleAccessLevelAndPrivileges}
               {setRoleAccessLevelAndPrivileges}
             />
@@ -130,18 +123,28 @@
 <style lang="scss">
   .privileges {
     .section {
-      padding: var(--size-base) 0;
+      margin-top: var(--size-base);
 
       .title {
         font-weight: 600;
         border-bottom: 1px solid var(--slate-200);
         padding: var(--size-extreme-small) 0;
       }
+
+      &.owner-section {
+        .content {
+          padding: var(--size-base) 0 var(--size-ultra-small) 0;
+        }
+      }
     }
     .granted-access-section {
       .privilege-row {
         padding: var(--size-base) 0;
 
+        &:last-child {
+          padding-bottom: 0;
+        }
+
         & + .privilege-row {
           border-top: 1px solid var(--slate-100);
         }
diff --git a/mathesar_ui/src/systems/permissions/RoleWithChildren.svelte b/mathesar_ui/src/systems/permissions/RoleWithChildren.svelte
new file mode 100644
index 0000000000..d5d49e0eae
--- /dev/null
+++ b/mathesar_ui/src/systems/permissions/RoleWithChildren.svelte
@@ -0,0 +1,61 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import { iconTreeChildNodeArrow } from '@mathesar/icons';
+  import type { Role } from '@mathesar/models/Role';
+  import { Icon, type ImmutableMap } from '@mathesar-component-library';
+
+  export let rolesMap: ImmutableMap<Role['oid'], Role>;
+  export let roleOid: Role['oid'];
+
+  $: role = rolesMap.get(roleOid);
+  $: members = role?.members;
+  $: membersWithUsage = [...($members?.values() ?? [])].filter(
+    (member) => rolesMap.get(member.oid)?.inherits,
+  );
+</script>
+
+<div class="role-with-children">
+  <div class="name-and-size">
+    <span class="name">{role?.name ?? roleOid}</span>
+    {#if membersWithUsage.length}
+      <span class="member-count">
+        + {$_('child_roles_count', {
+          values: { count: membersWithUsage.length },
+        })}
+      </span>
+    {/if}
+  </div>
+  <div class="members">
+    {#each membersWithUsage as member (member.oid)}
+      <div class="member">
+        <Icon {...iconTreeChildNodeArrow} size="0.75em" />
+        <span>{rolesMap.get(member.oid)?.name ?? member.oid}</span>
+      </div>
+    {/each}
+  </div>
+</div>
+
+<style lang="scss">
+  .role-with-children {
+    .name {
+      padding: var(--size-extreme-small) var(--size-xx-small);
+      background: var(--slate-100);
+      border-radius: var(--border-radius-xl);
+      font-weight: 500;
+      display: inline-block;
+    }
+    .members {
+      .member {
+        margin: var(--size-xx-small) var(--size-large);
+        display: flex;
+        align-items: flex-start;
+        gap: var(--size-ultra-small);
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+      }
+    }
+  }
+</style>
diff --git a/mathesar_ui/src/pages/database/permissions/TransferOwnershipSection.svelte b/mathesar_ui/src/systems/permissions/TransferOwnershipSection.svelte
similarity index 100%
rename from mathesar_ui/src/pages/database/permissions/TransferOwnershipSection.svelte
rename to mathesar_ui/src/systems/permissions/TransferOwnershipSection.svelte
diff --git a/mathesar_ui/src/systems/permissions/utils.ts b/mathesar_ui/src/systems/permissions/utils.ts
new file mode 100644
index 0000000000..6be070a139
--- /dev/null
+++ b/mathesar_ui/src/systems/permissions/utils.ts
@@ -0,0 +1,150 @@
+import type { Readable } from 'svelte/store';
+
+import type { Role } from '@mathesar/models/Role';
+import type { AsyncStoreValue } from '@mathesar/stores/AsyncStore';
+import { type ImmutableMap, ImmutableSet } from '@mathesar-component-library';
+
+export type AccessLevelConfig<A, P> = { id: A; privileges: Set<P> };
+
+export const customAccess = 'custom' as const;
+
+function getAccessLevelBasedOnPrivileges<A, P>(
+  accessLevelConfigs: AccessLevelConfig<A, P>[],
+  privileges: ImmutableSet<P>,
+): A | typeof customAccess {
+  const accessLevelObject = accessLevelConfigs.find((entry) =>
+    privileges.equals(entry.privileges),
+  );
+  return accessLevelObject ? accessLevelObject.id : customAccess;
+}
+
+type Props<A, P> = {
+  roleOid: Role['oid'];
+  accessLevelConfigs: AccessLevelConfig<A, P>[];
+  isAccessRemoved?: boolean;
+  savedPrivileges: P[];
+} & (
+  | {
+      privileges: P[];
+    }
+  | {
+      accessLevel: A;
+    }
+  | {
+      privileges: P[];
+      accessLevel: typeof customAccess;
+    }
+  | {
+      accessLevel: undefined;
+      privileges: [];
+    }
+);
+
+export class RoleAccessLevelAndPrivileges<A, P> {
+  readonly roleOid;
+
+  readonly accessLevelConfigs;
+
+  readonly accessLevel: A | typeof customAccess | undefined;
+
+  readonly privileges: ImmutableSet<P>;
+
+  readonly savedPrivileges: P[];
+
+  constructor(props: Props<A, P>) {
+    this.accessLevelConfigs = props.accessLevelConfigs;
+    this.roleOid = props.roleOid;
+    this.savedPrivileges = props.savedPrivileges;
+    if ('privileges' in props && 'accessLevel' in props) {
+      this.accessLevel = props.accessLevel;
+      this.privileges = new ImmutableSet(props.privileges);
+    } else if ('privileges' in props) {
+      this.privileges = new ImmutableSet(props.privileges);
+      this.accessLevel = getAccessLevelBasedOnPrivileges(
+        this.accessLevelConfigs,
+        this.privileges,
+      );
+    } else {
+      this.accessLevel = props.accessLevel;
+      const aL = this.accessLevelConfigs.find(
+        (entry) => entry.id === this.accessLevel,
+      );
+      if (!aL) {
+        throw new Error(
+          'Access level not found in configuration. This should never occur.',
+        );
+      }
+      this.privileges = new ImmutableSet(aL.privileges);
+    }
+  }
+
+  private getCommonProps() {
+    return {
+      roleOid: this.roleOid,
+      accessLevelConfigs: this.accessLevelConfigs,
+      savedPrivileges: this.savedPrivileges,
+    };
+  }
+
+  withAccess(accessLevel: A) {
+    return new RoleAccessLevelAndPrivileges<A, P>({
+      ...this.getCommonProps(),
+      accessLevel,
+    });
+  }
+
+  withCustomAccess(privileges?: P[]) {
+    const customPrivileges = privileges ?? this.savedPrivileges;
+    return new RoleAccessLevelAndPrivileges<A, P>({
+      ...this.getCommonProps(),
+      accessLevel: customAccess,
+      privileges: customPrivileges,
+    });
+  }
+
+  withAccessRemoved() {
+    return new RoleAccessLevelAndPrivileges<A, P>({
+      ...this.getCommonProps(),
+      accessLevel: undefined,
+      privileges: [],
+    });
+  }
+}
+
+export interface RoleWithPrivileges<Privilege> {
+  role_oid: Role['oid'];
+  direct: Privilege[];
+}
+
+export function getObjectAccessPrivilegeMap<A, P>(
+  accessLevelConfigs: AccessLevelConfig<A, P>[],
+  dbPrivileges: ImmutableMap<Role['oid'], RoleWithPrivileges<P>>,
+) {
+  return dbPrivileges.mapValues(
+    (entry) =>
+      new RoleAccessLevelAndPrivileges({
+        roleOid: entry.role_oid,
+        accessLevelConfigs,
+        privileges: entry.direct,
+        savedPrivileges: entry.direct,
+      }),
+  );
+}
+
+export interface AsyncStoresValues<Privilege> {
+  roles: Readable<AsyncStoreValue<ImmutableMap<Role['oid'], Role>, string>>;
+  objectPrivileges: Readable<
+    AsyncStoreValue<ImmutableMap<number, RoleWithPrivileges<Privilege>>, string>
+  >;
+  objectOwnerAndCurrentRolePrivileges: Readable<
+    AsyncStoreValue<
+      {
+        oid: number;
+        owner_oid: Role['oid'];
+        current_role_priv: Privilege[];
+        current_role_owns: boolean;
+      },
+      string
+    >
+  >;
+}

From 88b91c65a4a500d90b5631c98dabbac099ac848e Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 10 Sep 2024 18:22:57 +0530
Subject: [PATCH 0837/1141] add data_file_id field to TableMetaData

---
 .../0015_tablemetadata_data_file.py           | 19 +++++++++++++++++++
 mathesar/models/base.py                       |  1 +
 mathesar/rpc/tables/metadata.py               | 14 +++++---------
 mathesar/tests/rpc/tables/test_t_metadata.py  |  9 +++++----
 mathesar/utils/tables.py                      |  5 ++++-
 5 files changed, 34 insertions(+), 14 deletions(-)
 create mode 100644 mathesar/migrations/0015_tablemetadata_data_file.py

diff --git a/mathesar/migrations/0015_tablemetadata_data_file.py b/mathesar/migrations/0015_tablemetadata_data_file.py
new file mode 100644
index 0000000000..ab9c0e7eaf
--- /dev/null
+++ b/mathesar/migrations/0015_tablemetadata_data_file.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.2.11 on 2024-09-10 12:25
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mathesar', '0014_remove_columnmetadata_duration_show_units_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='tablemetadata',
+            name='data_file',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='mathesar.datafile'),
+        ),
+    ]
diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index d4502f4414..797665102b 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -132,6 +132,7 @@ class Meta:
 class TableMetaData(BaseModel):
     database = models.ForeignKey('Database', on_delete=models.CASCADE)
     table_oid = models.PositiveBigIntegerField()
+    data_file = models.ForeignKey("DataFile", on_delete=models.SET_NULL, null=True)
     import_verified = models.BooleanField(null=True)
     column_order = models.JSONField(null=True)
     record_summary_customized = models.BooleanField(null=True)
diff --git a/mathesar/rpc/tables/metadata.py b/mathesar/rpc/tables/metadata.py
index 7a6481b81b..8cc076c49f 100644
--- a/mathesar/rpc/tables/metadata.py
+++ b/mathesar/rpc/tables/metadata.py
@@ -20,6 +20,7 @@ class TableMetaDataRecord(TypedDict):
         id: The Django id of the TableMetaData object.
         database_id: The Django id of the database containing the table.
         table_oid: The OID of the table in the database.
+        data_file_id: Specifies the DataFile model id used for the import.
         import_verified: Specifies whether a file has been successfully imported into a table.
         column_order: The order in which columns of a table are displayed.
         record_summary_customized: Specifies whether the record summary has been customized.
@@ -28,6 +29,7 @@ class TableMetaDataRecord(TypedDict):
     id: int
     database_id: int
     table_oid: int
+    data_file_id: Optional[int]
     import_verified: Optional[bool]
     column_order: Optional[list[int]]
     record_summary_customized: Optional[bool]
@@ -39,6 +41,7 @@ def from_model(cls, model):
             id=model.id,
             database_id=model.database.id,
             table_oid=model.table_oid,
+            data_file_id=model.data_file.id if model.data_file is not None else None,
             import_verified=model.import_verified,
             column_order=model.column_order,
             record_summary_customized=model.record_summary_customized,
@@ -51,25 +54,18 @@ class TableMetaDataBlob(TypedDict):
     The metadata fields which can be set on a table
 
     Attributes:
+        data_file_id: Specifies the DataFile model id used for the import.
         import_verified: Specifies whether a file has been successfully imported into a table.
         column_order: The order in which columns of a table are displayed.
         record_summary_customized: Specifies whether the record summary has been customized.
         record_summary_template: Record summary template for a referent column.
     """
+    data_file_id: Optional[int]
     import_verified: Optional[bool]
     column_order: Optional[list[int]]
     record_summary_customized: Optional[bool]
     record_summary_template: Optional[str]
 
-    @classmethod
-    def from_model(cls, model):
-        return cls(
-            import_verified=model.import_verified,
-            column_order=model.column_order,
-            record_summary_customized=model.record_summary_customized,
-            record_summary_template=model.record_summary_template,
-        )
-
 
 @rpc_method(name="tables.metadata.list")
 @http_basic_auth_login_required
diff --git a/mathesar/tests/rpc/tables/test_t_metadata.py b/mathesar/tests/rpc/tables/test_t_metadata.py
index c25753ffbc..342e8e0511 100644
--- a/mathesar/tests/rpc/tables/test_t_metadata.py
+++ b/mathesar/tests/rpc/tables/test_t_metadata.py
@@ -5,6 +5,7 @@
     monkeypatch(pytest): Lets you monkeypatch an object for testing.
 """
 from mathesar.models.base import TableMetaData, Database, Server
+from mathesar.models.deprecated import DataFile
 from mathesar.rpc.tables import metadata
 
 
@@ -16,12 +17,12 @@ def mock_get_tables_meta_data(_database_id):
         db_model = Database(id=_database_id, name='mymathesardb', server=server_model)
         return [
             TableMetaData(
-                id=1, database=db_model, table_oid=1234,
+                id=1, database=db_model, table_oid=1234, data_file=None,
                 import_verified=True, column_order=[8, 9, 10], record_summary_customized=False,
                 record_summary_template="{5555}"
             ),
             TableMetaData(
-                id=2, database=db_model, table_oid=4567,
+                id=2, database=db_model, table_oid=4567, data_file=DataFile(id=11),
                 import_verified=False, column_order=[], record_summary_customized=True,
                 record_summary_template="{5512} {1223}"
             )
@@ -30,12 +31,12 @@ def mock_get_tables_meta_data(_database_id):
 
     expect_metadata_list = [
         metadata.TableMetaDataRecord(
-            id=1, database_id=database_id, table_oid=1234,
+            id=1, database_id=database_id, table_oid=1234, data_file_id=None,
             import_verified=True, column_order=[8, 9, 10], record_summary_customized=False,
             record_summary_template="{5555}"
         ),
         metadata.TableMetaDataRecord(
-            id=2, database_id=database_id, table_oid=4567,
+            id=2, database_id=database_id, table_oid=4567, data_file_id=11,
             import_verified=False, column_order=[], record_summary_customized=True,
             record_summary_template="{5512} {1223}"
         )
diff --git a/mathesar/utils/tables.py b/mathesar/utils/tables.py
index 8c0664fa63..35d086c263 100644
--- a/mathesar/utils/tables.py
+++ b/mathesar/utils/tables.py
@@ -4,7 +4,7 @@
 from db.tables.operations.infer_types import infer_table_column_types
 from mathesar.database.base import create_mathesar_engine
 from mathesar.imports.base import create_table_from_data_file
-from mathesar.models.deprecated import Table
+from mathesar.models.deprecated import Table, DataFile
 from mathesar.models.base import Database, TableMetaData
 from mathesar.state.django import reflect_columns_from_tables
 from mathesar.state import get_cached_metadata
@@ -93,6 +93,9 @@ def get_tables_meta_data(database_id):
 def set_table_meta_data(table_oid, metadata, database_id):
     TableMetaData.objects.update_or_create(
         database=Database.objects.get(id=database_id),
+        data_file=DataFile.objects.get(
+            id=metadata.pop('data_file_id')
+        ) if metadata.get('data_file_id') is not None else None,
         table_oid=table_oid,
         defaults=metadata,
     )

From deceb10a54d6a95cf1c0b0316094a1252e255852 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Wed, 4 Sep 2024 15:57:01 +0200
Subject: [PATCH 0838/1141] Table Inspector Improvements

---
 mathesar_ui/src/App.svelte                    |  2 +-
 .../src/component-library/button/Button.scss  | 12 +--
 .../common/styles/variables.scss              | 23 +++---
 .../labeled-input/LabeledInput.scss           | 11 +++
 .../labeled-input/LabeledInput.svelte         |  5 ++
 .../src/components/LinkedRecord.svelte        |  1 +
 .../inspector/cell/CellInspector.svelte       |  2 +-
 .../message-boxes/WarningBox.svelte           |  2 +-
 mathesar_ui/src/i18n/languages/en/dict.json   | 10 ++-
 .../column/ColumnNameAndDescription.svelte    |  9 ++-
 .../column/ColumnOptions.svelte               | 12 +--
 .../record-summary/AppendColumn.svelte        |  2 +-
 .../record-summary/RecordSummaryConfig.svelte | 76 +++++++++++--------
 .../record-summary/TemplateInput.svelte       |  1 +
 .../table/TableDescription.svelte             |  5 +-
 .../table-inspector/table/TableName.svelte    |  5 +-
 .../table/links/LinksSectionContainer.svelte  |  2 +-
 17 files changed, 112 insertions(+), 68 deletions(-)

diff --git a/mathesar_ui/src/App.svelte b/mathesar_ui/src/App.svelte
index 6c91c2cdba..a546ea39a7 100644
--- a/mathesar_ui/src/App.svelte
+++ b/mathesar_ui/src/App.svelte
@@ -53,7 +53,7 @@
     --color-contrast-light: var(--color-blue-light);
     --color-link: var(--color-blue-dark);
     --color-text: #171717;
-    --color-text-muted: #5e6471;
+    --color-text-muted: #515662;
     --color-substring-match: rgb(254, 221, 72);
     --color-substring-match-light: rgba(254, 221, 72, 0.2);
     --text-size-xx-small: var(--size-xx-small);
diff --git a/mathesar_ui/src/component-library/button/Button.scss b/mathesar_ui/src/component-library/button/Button.scss
index f863e9b5c4..9cd2322834 100644
--- a/mathesar_ui/src/component-library/button/Button.scss
+++ b/mathesar_ui/src/component-library/button/Button.scss
@@ -13,7 +13,7 @@
     #000 0 0 0 0,
     #000 0 0 0 0,
     rgba(0, 0, 0, 0.05) 0 1px 2px 0;
-  font-weight: inherit;
+  font-weight: var(--font-weight-medium);
   position: relative;
   padding: var(--input-padding);
   box-sizing: border-box;
@@ -31,11 +31,11 @@
   /* Appearances */
   &.btn-default {
     background: var(--color-white);
-    border-color: var(--slate-200);
+    border-color: var(--slate-300);
 
     &:not(:disabled) {
       &:focus {
-        border-color: var(--slate-300);
+        border-color: var(--slate-400);
       }
     }
   }
@@ -68,20 +68,20 @@
 
   &.btn-secondary {
     background: var(--slate-100);
-    border-color: var(--slate-200);
+    border-color: var(--slate-300);
     color: var(--slate-800);
 
     &:not(:disabled) {
       &.focus,
       &:focus {
-        outline: 2px solid var(--slate-300);
+        outline: 2px solid var(--slate-400);
         outline-offset: 1px;
       }
 
       &:hover,
       &.hover {
         background: var(--slate-200);
-        border-color: var(--slate-300);
+        border-color: var(--slate-400);
       }
 
       &:active,
diff --git a/mathesar_ui/src/component-library/common/styles/variables.scss b/mathesar_ui/src/component-library/common/styles/variables.scss
index 159385f4ac..4495197957 100644
--- a/mathesar_ui/src/component-library/common/styles/variables.scss
+++ b/mathesar_ui/src/component-library/common/styles/variables.scss
@@ -36,26 +36,27 @@
   --slate-800: #25292e;
 
   --sand-50: #fcfbf8;
-  --sand-100: #f9f8f6;
-  --sand-200: #efece7;
-  --sand-300: #e2dcd4;
-  --sand-400: #cec5b6;
+  --sand-100: #F9F8F5;
+  --sand-200: #EBE3D1;
+  --sand-300: #d7cab2;
+  --sand-400: #c6b39c;
   --sand-800: #776850;
 
-  --sky-200: #e8f1fd;
-  --sky-300: #b0ccf0;
-  --sky-500: #bcd9f9;
-  --sky-600: #1269cf;
-  --sky-700: #145bbe;
+  --sky-200: #d5ecfc;
+  --sky-300: #91d0f8;
+  --sky-500: #7ac5f4;
+  --sky-600: #0777d2;
+  --sky-700: #0662be;
   --sky-800: #36537a;
 
   // TODO: Get this incorporated in figma
   --slate-50-tentative: #f6f9f9;
   --sky-600-tentative: #87bcf6;
 
-  --yellow-100: #fdf7ed;
+  --yellow-100: #fff4d5;
   --yellow-200: #ffedaf;
-  --yellow-300: #f8ceb0;
+  --yellow-300: #f4c67c;
+  --yellow-400: #eda849;
 
   --white: white;
 
diff --git a/mathesar_ui/src/component-library/labeled-input/LabeledInput.scss b/mathesar_ui/src/component-library/labeled-input/LabeledInput.scss
index 9d5c482eb2..7db9af8b01 100644
--- a/mathesar_ui/src/component-library/labeled-input/LabeledInput.scss
+++ b/mathesar_ui/src/component-library/labeled-input/LabeledInput.scss
@@ -27,6 +27,17 @@
     }
   }
 
+  .description {
+    display: block;
+    font-size: var(--text-size-small);
+    color: var(--color-text-muted);
+    margin-top: var(--spacing-y, var(--spacing-y-default));
+    margin-left: 1.5rem;
+    &:empty {
+      display: none;
+    }
+  }
+
   &.layout-stacked {
     .input {
       margin-top: var(--spacing-y, var(--spacing-y-default));
diff --git a/mathesar_ui/src/component-library/labeled-input/LabeledInput.svelte b/mathesar_ui/src/component-library/labeled-input/LabeledInput.svelte
index 21c8d02a88..af49c2d29a 100644
--- a/mathesar_ui/src/component-library/labeled-input/LabeledInput.svelte
+++ b/mathesar_ui/src/component-library/labeled-input/LabeledInput.svelte
@@ -6,6 +6,7 @@
   export let label: string | undefined = undefined;
   export let help: string | undefined = undefined;
   export let layout: LabeledInputLayout = 'inline';
+  export let description: string | undefined = undefined;
 </script>
 
 <div
@@ -23,7 +24,11 @@
       -->
       <span class="label">{label ?? ''}<slot name="label" /></span>
       <span class="input"><slot /></span>
+
       <span class="help">{help ?? ''}<slot name="help" /></span>
     </span>
+    <span class="description">
+      <slot name="description" />
+    </span>
   </Label>
 </div>
diff --git a/mathesar_ui/src/components/LinkedRecord.svelte b/mathesar_ui/src/components/LinkedRecord.svelte
index c673bcf423..9667b46813 100644
--- a/mathesar_ui/src/components/LinkedRecord.svelte
+++ b/mathesar_ui/src/components/LinkedRecord.svelte
@@ -145,6 +145,7 @@
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
+
   }
   .delete-button {
     position: relative;
diff --git a/mathesar_ui/src/components/inspector/cell/CellInspector.svelte b/mathesar_ui/src/components/inspector/cell/CellInspector.svelte
index 659a4859d9..082f754ec0 100644
--- a/mathesar_ui/src/components/inspector/cell/CellInspector.svelte
+++ b/mathesar_ui/src/components/inspector/cell/CellInspector.svelte
@@ -47,7 +47,7 @@
 
 <style>
   .cell-inspector {
-    padding: var(--size-x-small);
+    padding: var(--size-ultra-large);
   }
   .header {
     font-weight: 500;
diff --git a/mathesar_ui/src/components/message-boxes/WarningBox.svelte b/mathesar_ui/src/components/message-boxes/WarningBox.svelte
index 6c6d9e8b98..32742d76ee 100644
--- a/mathesar_ui/src/components/message-boxes/WarningBox.svelte
+++ b/mathesar_ui/src/components/message-boxes/WarningBox.svelte
@@ -15,7 +15,7 @@
 <style>
   .warning-box {
     --MessageBox__background: var(--yellow-100);
-    --MessageBox__border: solid 4px var(--yellow-200);
+    --MessageBox__border: solid 4px var(--yellow-300);
     --MessageBox__icon-color: var(--yellow-300);
   }
 </style>
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 095a5316dd..d715a258be 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -136,6 +136,7 @@
   "create_user_via": "Create user via",
   "currently_installed": "Currently Installed",
   "custom": "Custom",
+  "use_custom_template": "Use Custom Template",
   "custom_default": "Custom Default",
   "customize_names_types_preview": "You can customize column names and types within the preview below.",
   "data_explorer": "Data Explorer",
@@ -155,7 +156,8 @@
   "databases_matching_search": "{count, plural, one {{count} database matches [searchValue]} other {{count} databases match [searchValue]}}",
   "days": "Days",
   "db_server": "DB server",
-  "default": "Default",
+  "use_default": "Use Default",
+  "default_template": "Default Template",
   "default_value": "Default Value",
   "delete": "Delete",
   "delete_account": "Delete Account",
@@ -185,7 +187,7 @@
   "disable_link_question": "Disable Link?",
   "disabled_connection_edit_fields_help": "Mathesar does not yet support editing a connection's database name, host, and port. We [issueLink](plan) to add support for this in the future. In the meantime, you can delete this connection and create a new one if needed.",
   "disallow_null_values": "Disallow [null] Values",
-  "disallow_null_values_help": "Enable this option to prevent null values in the column. Null values are empty values that are not the same as zero or an empty string.",
+  "disallow_null_values_help": "Prevents empty values in this column.",
   "discard_changes": "Discard Changes",
   "disconnect": "Disconnect",
   "disconnect_database": "Disconnect Database",
@@ -438,7 +440,7 @@
   "record_deleted_successfully": "Record deleted successfully!",
   "record_in_table": "Record in [tableName]",
   "record_summary": "Record Summary",
-  "record_summary_help": "Shows how links to [tableName] records will appear.",
+  "record_summary_help": "The record summary shown when linking to [tableName].",
   "record_summary_non_conformant_columns_help": "Because some column names contain curly braces, the following numerical values are used in place of column names within the above template",
   "recover_query_click_button": "You can attempt to recover the query by clicking on the button below.",
   "redirected_login_page_password_change": "You'll be redirected to the login page once you change your password.",
@@ -462,7 +464,7 @@
   "rename_schema": "Rename [schemaName] Schema",
   "reset": "Reset",
   "restrict_to_unique": "Restrict to Unique",
-  "restrict_to_unique_help": "Enable this option to make sure that the column only contains unique values. Useful for columns that contain identifiers, such as a person's ID number or emails.",
+  "restrict_to_unique_help": "Ensures all values in this column are unique.",
   "result": "Result",
   "result_could_not_be_displayed": "The result could not be displayed.",
   "retry": "Retry",
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnNameAndDescription.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnNameAndDescription.svelte
index 4873d8cb04..3a2d239fc4 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnNameAndDescription.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnNameAndDescription.svelte
@@ -50,7 +50,7 @@
 </script>
 
 <div class="column-property column-name">
-  <span>{$_('name')}</span>
+  <span class="label">{$_('name')}</span>
   <EditableTextWithActions
     initialValue={column.column.name}
     onSubmit={handleColumnNameChange}
@@ -59,7 +59,7 @@
 </div>
 
 <div class="column-property column-description">
-  <span>{$_('description')}</span>
+  <span class="label">{$_('description')}</span>
   <EditableTextWithActions
     initialValue={column.column.description ?? ''}
     onSubmit={handleColumnDescriptionChange}
@@ -73,7 +73,10 @@
     flex-direction: column;
 
     > :global(* + *) {
-      margin-top: 0.5rem;
+      margin-top: 0.25rem;
     }
   }
+  .label {
+    font-weight: var(--font-weight-medium);
+  }
 </style>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnOptions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnOptions.svelte
index d4cac113b7..7b6bfaf7ca 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnOptions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnOptions.svelte
@@ -104,9 +104,9 @@
   <LabeledInput layout="inline-input-first">
     <span slot="label">
       {$_('restrict_to_unique')}
-      <Help>
-        {$_('restrict_to_unique_help')}
-      </Help>
+    </span>
+    <span slot="description">
+      {$_('restrict_to_unique_help')}
     </span>
     {#if isRequestingToggleAllowDuplicates}
       <Icon class="opt" {...iconLoading} />
@@ -126,9 +126,9 @@
           <span class="null">NULL</span>
         {/if}
       </RichText>
-      <Help>
-        {$_('disallow_null_values_help')}
-      </Help>
+    </span>
+    <span slot="description">
+      {$_('disallow_null_values_help')}
     </span>
     {#if isRequestingToggleAllowNull}
       <Icon class="opt" {...iconLoading} />
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/AppendColumn.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/AppendColumn.svelte
index 177d356ed7..9104b565cc 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/AppendColumn.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/AppendColumn.svelte
@@ -34,7 +34,7 @@
   }
 </script>
 
-<DropdownMenu label={$_('append_column')} icon={iconAddNew} {disabled}>
+<DropdownMenu label={$_('append_column')} icon={iconAddNew} {disabled} size="small" appearance="secondary">
   {#each columns as column (column.id)}
     <ButtonMenuItem
       label={column.name}
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
index c6efe29989..9bf4d62271 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
@@ -76,31 +76,32 @@
   {#if $isLoading}
     <Spinner />
   {:else}
-    {#if previewRecordSummary}
-      <div class="heading">{$_('preview')}</div>
-      <div class="content">
-        <div class="help">
-          <RichText text={$_('record_summary_help')} let:slotName>
-            {#if slotName === 'tableName'}
-              <Identifier>{table.name}</Identifier>
-            {/if}
-          </RichText>
-        </div>
-        <LinkedRecord recordSummary={previewRecordSummary} />
-      </div>
-    {/if}
-
-    <div class="heading">{$_('template')}</div>
     <div class="content">
       <RadioGroup
         options={[false, true]}
-        getRadioLabel={(v) => (v ? $_('custom') : $_('default'))}
+        getRadioLabel={(v) => (v ? $_('use_custom_template') : $_('use_default'))}
         ariaLabel={$_('template_type')}
         isInline
         bind:value={$customized}
         disabled={$customizedDisabled}
       />
 
+      {#if previewRecordSummary}
+        <div class="preview">
+          <div class="preview-record-summary">
+            <LinkedRecord recordSummary={previewRecordSummary} />
+          </div>
+          <div class="help">
+            <RichText text={$_('record_summary_help')} let:slotName>
+              {#if slotName === 'tableName'}
+                <Identifier>{table.name}</Identifier>
+              {/if}
+            </RichText>
+          </div>
+          
+        </div>
+      {/if}
+
       {#if $customized}
         <Field
           field={template}
@@ -134,33 +135,45 @@
         {/if}
       {/if}
 
-      <FormSubmit
-        {form}
-        onProceed={save}
-        onCancel={form.reset}
-        proceedButton={{ label: $_('save') }}
-        initiallyHidden
-        size="small"
-      />
+      {#if $customized !== initialCustomized || $template !== initialTemplate}
+        <FormSubmit
+          {form}
+          onProceed={save}
+          onCancel={form.reset}
+          proceedButton={{ label: $_('save') }}
+          initiallyHidden
+          size="small"
+        />
+      {/if}
+      {#if !previewRecordSummary}
+      <span class="null-text">{$_('no_record_summary_available')}</span>
+    {/if}
     </div>
-
-    <span class="null-text">{$_('no_record_summary_available')}</span>
+   
   {/if}
 </div>
 
 <style>
   .heading {
-    margin-block: 0.75rem 0.5rem;
+    margin-block: 0;
+    color: var(--color-text-muted);
+    font-size: var(--text-size-small);
   }
   .content > :global(* + *) {
-    margin-top: 0.5rem;
-  }
-  .content {
-    margin-left: 0.5rem;
+    margin-top: 1rem;
   }
   .help {
     font-size: var(--text-size-small);
     color: var(--color-text-muted);
+    margin-top: 0.5rem;
+  }
+  .preview-record-summary {
+    border: 1px solid var(--slate-200);
+    padding: 0.4rem;
+    width: 100%;
+    border-radius: 0.25rem;
+    background-color: var(--slate-50);
+    margin-top: 0.5rem;
   }
   .nonconformant-columns > :global(:first-child) {
     margin-top: 0;
@@ -173,5 +186,6 @@
   }
   .null-text {
     color: var(--color-text-muted);
+    display: block;
   }
 </style>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/TemplateInput.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/TemplateInput.svelte
index fdbef1188e..438466630d 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/TemplateInput.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/TemplateInput.svelte
@@ -32,5 +32,6 @@
   .column-insert {
     display: block;
     text-align: right;
+    margin-top: 0.5rem;
   }
 </style>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
index df2e3fba95..2fe3389cf6 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
@@ -33,7 +33,10 @@
     flex-direction: column;
 
     > :global(* + *) {
-      margin-top: 0.5rem;
+      margin-top: 0.25rem;
     }
   }
+  .label {
+    font-weight: var(--font-weight-medium);
+  }
 </style>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
index 1ffb43af18..a6f3b1fc1d 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
@@ -43,7 +43,10 @@
     flex-direction: column;
 
     > :global(* + *) {
-      margin-top: 0.5rem;
+      margin-top: 0.25rem;
     }
   }
+  .label {
+    font-weight: var(--font-weight-medium);
+  }
 </style>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinksSectionContainer.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinksSectionContainer.svelte
index 24646bbfbf..280b904a18 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinksSectionContainer.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinksSectionContainer.svelte
@@ -74,7 +74,7 @@
     <span class="null-text">{$_('table_does_not_link')}</span>
   {/if}
   <div>
-    <Button on:click={() => linkTableModal.open()} appearance="secondary">
+    <Button on:click={() => linkTableModal.open()} appearance="secondary" size="small">
       <Icon {...iconAddNew} />
       <span>{$_('create_link')}</span>
     </Button>

From 42b59cd36f6d53f7211f24052c8fde06925af0b1 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 5 Sep 2024 09:02:51 +0200
Subject: [PATCH 0839/1141] update empty state padding

---
 .../src/components/inspector/cell/CellInspector.svelte | 10 ++++++++--
 .../table-inspector/column/ColumnMode.svelte           |  2 +-
 .../table-inspector/record/RecordMode.svelte           |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/mathesar_ui/src/components/inspector/cell/CellInspector.svelte b/mathesar_ui/src/components/inspector/cell/CellInspector.svelte
index 082f754ec0..e007842471 100644
--- a/mathesar_ui/src/components/inspector/cell/CellInspector.svelte
+++ b/mathesar_ui/src/components/inspector/cell/CellInspector.svelte
@@ -41,13 +41,15 @@
       </div>
     </section>
   {:else}
-    {$_('select_cell_view_properties')}
+    <div class="no-cell-selected">
+      {$_('select_cell_view_properties')}
+    </div>
   {/if}
 </div>
 
 <style>
   .cell-inspector {
-    padding: var(--size-ultra-large);
+    padding: var(--size-small);
   }
   .header {
     font-weight: 500;
@@ -59,4 +61,8 @@
     border-radius: var(--border-radius-m);
     margin-top: var(--size-x-small);
   }
+  .no-cell-selected {
+    color: var(--slate-500);
+    padding: var(--size-large);
+  }
 </style>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
index 7b4684b7cc..53cdb1e7fc 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
@@ -159,7 +159,7 @@
   }
 
   .no-cell-selected {
-    padding: 2rem;
+    padding: var(--size-ultra-large);
   }
 
   .content-container {
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
index 8f133a18ef..eec9c58c3b 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
@@ -53,7 +53,7 @@
   }
 
   .records-selected-count {
-    padding: 1rem;
+    padding: var(--size-large);
   }
 
   .content-container {

From 341f478a992693564f96a1070282b8d564990804 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 5 Sep 2024 10:16:43 +0200
Subject: [PATCH 0840/1141] update action buttons

---
 .../src/component-library/common/styles/variables.scss        | 4 ++--
 .../table-view/table-inspector/column/ColumnActions.svelte    | 4 ++--
 .../table-view/table-inspector/record/RowActions.svelte       | 4 ++--
 .../table-view/table-inspector/table/AdvancedActions.svelte   | 2 +-
 .../table-view/table-inspector/table/TableActions.svelte      | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mathesar_ui/src/component-library/common/styles/variables.scss b/mathesar_ui/src/component-library/common/styles/variables.scss
index 4495197957..c20cd616d6 100644
--- a/mathesar_ui/src/component-library/common/styles/variables.scss
+++ b/mathesar_ui/src/component-library/common/styles/variables.scss
@@ -29,10 +29,10 @@
   --slate-100: #eff1f1;
   --slate-200: #d5d8dc;
   --slate-300: #b8bdc4;
-  --slate-400: #5e646e;
+  --slate-400: #6a707c;
   --slate-500: #4a4f58;
   --slate-600: #3a3f48;
-  --slate-700: #424952;
+  --slate-700: #373d44;
   --slate-800: #25292e;
 
   --sand-50: #fcfbf8;
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnActions.svelte
index 41957adf16..db041a5014 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnActions.svelte
@@ -55,7 +55,7 @@
 </script>
 
 <div class="actions-container">
-  <Button on:click={handleMoveColumnsToNewLinkedTable}>
+  <Button on:click={handleMoveColumnsToNewLinkedTable} appearance="secondary">
     <div class="action-item">
       <div>
         <Icon {...iconMoveColumnsToNewLinkedTable} />
@@ -69,7 +69,7 @@
     </div>
   </Button>
   {#if canMoveToLinkedTable}
-    <Button on:click={handleMoveColumnsToExistingLinkedTable}>
+    <Button on:click={handleMoveColumnsToExistingLinkedTable} appearance="secondary">
       <div class="action-item">
         <div>
           <Icon {...iconMoveColumnsToExistingLinkedTable} />
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
index 377bd933c7..4932698a4c 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
@@ -65,7 +65,7 @@
 
 <div class="actions-container">
   {#if recordPageLink}
-    <AnchorButton href={recordPageLink}>
+    <AnchorButton href={recordPageLink} appearance="secondary">
       <div class="action-item">
         <div>
           <Icon {...iconRecord} />
@@ -75,7 +75,7 @@
       </div>
     </AnchorButton>
   {/if}
-  <Button on:click={handleDeleteRecords}>
+  <Button on:click={handleDeleteRecords} appearance="secondary">
     <Icon {...iconDeleteMajor} />
     <span>
       {$_('delete_records', { values: { count: selectedRowCount } })}
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/AdvancedActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/AdvancedActions.svelte
index 557b265286..6044256246 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/AdvancedActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/AdvancedActions.svelte
@@ -16,7 +16,7 @@
 </script>
 
 <div class="actions-container">
-  <Button on:click={() => constraintsModal.open()}>
+  <Button on:click={() => constraintsModal.open()} appearance="secondary">
     <div class="action-item">
       <div>
         <Icon {...iconConstraint} /> <span>{$_('constraints')}</span>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
index 70160a48ee..f84abcd41e 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
@@ -77,7 +77,7 @@
 
 <div class="actions-container">
   {#if $currentDatabase && $currentSchema}
-    <AnchorButton href={explorationPageUrl}>
+    <AnchorButton href={explorationPageUrl} appearance="secondary">
       <div class="action-item">
         <div>
           <Icon {...iconExploration} /> <span>{$_('explore_data')}</span>
@@ -89,7 +89,7 @@
       </div>
     </AnchorButton>
     {#if summarizationUrl}
-      <AnchorButton href={summarizationUrl}>
+      <AnchorButton href={summarizationUrl} appearance="secondary">
         <div class="action-item">
           <div>
             <Icon {...iconExploration} />

From 4cfc05842f26d1ba89763ef817ed9d97c876a5ea Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 5 Sep 2024 10:42:41 +0200
Subject: [PATCH 0841/1141] revert removal of tooltips

---
 mathesar_ui/src/i18n/languages/en/dict.json         |  4 ++--
 .../table-inspector/column/ColumnOptions.svelte     | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index d715a258be..4a288832be 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -187,7 +187,7 @@
   "disable_link_question": "Disable Link?",
   "disabled_connection_edit_fields_help": "Mathesar does not yet support editing a connection's database name, host, and port. We [issueLink](plan) to add support for this in the future. In the meantime, you can delete this connection and create a new one if needed.",
   "disallow_null_values": "Disallow [null] Values",
-  "disallow_null_values_help": "Prevents empty values in this column.",
+  "disallow_null_values_help": "Prevents null values in this column. Null values are empty values that are not the same as zero or an empty string.",
   "discard_changes": "Discard Changes",
   "disconnect": "Disconnect",
   "disconnect_database": "Disconnect Database",
@@ -464,7 +464,7 @@
   "rename_schema": "Rename [schemaName] Schema",
   "reset": "Reset",
   "restrict_to_unique": "Restrict to Unique",
-  "restrict_to_unique_help": "Ensures all values in this column are unique.",
+  "restrict_to_unique_help": "Ensures all values in this column are unique. Ideal for IDs, usernames, and other unique identifiers.",
   "result": "Result",
   "result_could_not_be_displayed": "The result could not be displayed.",
   "retry": "Retry",
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnOptions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnOptions.svelte
index 7b6bfaf7ca..9ca89f022c 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnOptions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnOptions.svelte
@@ -104,10 +104,11 @@
   <LabeledInput layout="inline-input-first">
     <span slot="label">
       {$_('restrict_to_unique')}
+      <Help>
+        {$_('restrict_to_unique_help')}
+      </Help>
     </span>
-    <span slot="description">
-      {$_('restrict_to_unique_help')}
-    </span>
+    
     {#if isRequestingToggleAllowDuplicates}
       <Icon class="opt" {...iconLoading} />
     {:else}
@@ -126,9 +127,9 @@
           <span class="null">NULL</span>
         {/if}
       </RichText>
-    </span>
-    <span slot="description">
-      {$_('disallow_null_values_help')}
+      <Help>
+        {$_('disallow_null_values_help')}
+      </Help>
     </span>
     {#if isRequestingToggleAllowNull}
       <Icon class="opt" {...iconLoading} />

From d93a2b80c79f65352f34571706172b19225e449f Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Mon, 9 Sep 2024 08:15:07 +0200
Subject: [PATCH 0842/1141] Update styling in links section

---
 mathesar_ui/src/icons/index.ts                                | 4 ++--
 .../table-view/table-inspector/table/links/LinkItem.svelte    | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mathesar_ui/src/icons/index.ts b/mathesar_ui/src/icons/index.ts
index 9048599c0f..e6cebfdb0d 100644
--- a/mathesar_ui/src/icons/index.ts
+++ b/mathesar_ui/src/icons/index.ts
@@ -183,8 +183,8 @@ export const iconCurrentlyInstalledVersion: IconProps = { data: faCheck };
 export const iconUser: IconProps = { data: faUser };
 export const iconMultipleUsers: IconProps = { data: faUsers };
 export const iconAdminUser: IconProps = { data: faUserGear };
-export const iconLinksInThisTable: IconProps = { data: faCircleArrowRight };
-export const iconLinksFromOtherTables: IconProps = { data: faCircleArrowLeft };
+export const iconLinksInThisTable: IconProps = { data: faArrowRight };
+export const iconLinksFromOtherTables: IconProps = { data: faArrowLeft };
 export const iconForwardSeparator: IconProps = { data: faSlash };
 export const iconUrl: IconProps = { data: faLink };
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkItem.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkItem.svelte
index 3fb15a8c88..bb3b313383 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkItem.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkItem.svelte
@@ -30,13 +30,14 @@
 
 <style lang="scss">
   .link-item-container {
-    border: 1px solid var(--slate-300);
+    border-left: 4px solid var(--yellow-300);
     background-color: var(--white);
     padding: 0.5rem;
     border-radius: var(--border-radius-m);
     cursor: pointer;
     display: flex;
     flex-direction: column;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.06);
 
     &:hover {
       background: var(--slate-100);
@@ -48,6 +49,7 @@
 
     .sub-text {
       font-size: var(--text-size-small);
+      color: var(--color-text-muted);
     }
   }
 </style>

From 97d873c6f993abab2a267d30686e86b845c83c15 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Mon, 9 Sep 2024 08:18:11 +0200
Subject: [PATCH 0843/1141] adjust colors

---
 .../component-library/common/styles/variables.scss   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mathesar_ui/src/component-library/common/styles/variables.scss b/mathesar_ui/src/component-library/common/styles/variables.scss
index c20cd616d6..fbf94f352a 100644
--- a/mathesar_ui/src/component-library/common/styles/variables.scss
+++ b/mathesar_ui/src/component-library/common/styles/variables.scss
@@ -42,12 +42,12 @@
   --sand-400: #c6b39c;
   --sand-800: #776850;
 
-  --sky-200: #d5ecfc;
-  --sky-300: #91d0f8;
-  --sky-500: #7ac5f4;
-  --sky-600: #0777d2;
-  --sky-700: #0662be;
-  --sky-800: #36537a;
+  --sky-200: #daeefb;
+  --sky-300: #99d4f9;
+  --sky-500: #84caf5;
+  --sky-600: #127ed6;
+  --sky-700: #0f69c1;
+  --sky-800: #3e5a80;
 
   // TODO: Get this incorporated in figma
   --slate-50-tentative: #f6f9f9;

From 8c11f065f23cfa901c2557245ae79becd500143e Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Mon, 9 Sep 2024 09:35:14 +0200
Subject: [PATCH 0844/1141] update colors

---
 .../common/styles/variables.scss              | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/mathesar_ui/src/component-library/common/styles/variables.scss b/mathesar_ui/src/component-library/common/styles/variables.scss
index fbf94f352a..b455e0ade7 100644
--- a/mathesar_ui/src/component-library/common/styles/variables.scss
+++ b/mathesar_ui/src/component-library/common/styles/variables.scss
@@ -26,21 +26,26 @@
   --red-800: #c63826;
 
   --slate-50: #f6f9f9;
-  --slate-100: #eff1f1;
-  --slate-200: #d5d8dc;
-  --slate-300: #b8bdc4;
-  --slate-400: #6a707c;
-  --slate-500: #4a4f58;
-  --slate-600: #3a3f48;
-  --slate-700: #373d44;
-  --slate-800: #25292e;
+  --slate-100: #eef0f0;
+  --slate-200: #d3d6da;
+  --slate-300: #b6bbc2;
+  --slate-400: #6c727e;
+  --slate-500: #4c515a;
+  --slate-600: #3c414a;
+  --slate-700: #393f46;
+  --slate-800: #272b30;
 
-  --sand-50: #fcfbf8;
-  --sand-100: #F9F8F5;
-  --sand-200: #EBE3D1;
-  --sand-300: #d7cab2;
-  --sand-400: #c6b39c;
-  --sand-800: #776850;
+  --slate-800-rgb: 39, 43, 48;
+  
+  --sand-50: #fcfcfb;
+  --sand-100: #f8f7f3;
+  --sand-200: #eee7d8;
+  --sand-300: #e3d7bb;
+  --sand-400: #ccbcd8;
+  --sand-500: #b3a08c;
+  --sand-600: #9a8570;
+  --sand-700: #836a55;
+  --sand-800: #6b4e39;
 
   --sky-200: #daeefb;
   --sky-300: #99d4f9;
@@ -53,10 +58,10 @@
   --slate-50-tentative: #f6f9f9;
   --sky-600-tentative: #87bcf6;
 
-  --yellow-100: #fff4d5;
-  --yellow-200: #ffedaf;
-  --yellow-300: #f4c67c;
-  --yellow-400: #eda849;
+  --yellow-100: #fff6e0;
+  --yellow-200: #fff0c0;
+  --yellow-300: #f5cd8c;
+  --yellow-400: #eeb159;
 
   --white: white;
 

From fec2376f802b03c02996d60e0eedf729c347a40c Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 10 Sep 2024 18:46:59 +0530
Subject: [PATCH 0845/1141] add from_model back to TableMetaDataBlob

---
 mathesar/rpc/tables/metadata.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/mathesar/rpc/tables/metadata.py b/mathesar/rpc/tables/metadata.py
index 8cc076c49f..6a31b818de 100644
--- a/mathesar/rpc/tables/metadata.py
+++ b/mathesar/rpc/tables/metadata.py
@@ -66,6 +66,16 @@ class TableMetaDataBlob(TypedDict):
     record_summary_customized: Optional[bool]
     record_summary_template: Optional[str]
 
+    @classmethod
+    def from_model(cls, model):
+        return cls(
+            data_file_id=model.data_file.id if model.data_file is not None else None,
+            import_verified=model.import_verified,
+            column_order=model.column_order,
+            record_summary_customized=model.record_summary_customized,
+            record_summary_template=model.record_summary_template,
+        )
+
 
 @rpc_method(name="tables.metadata.list")
 @http_basic_auth_login_required

From 2d09537ad4be96c154459a107ef0357677dd0a51 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Tue, 10 Sep 2024 19:24:54 +0530
Subject: [PATCH 0846/1141] Ensure `current_database` and `current_schema` are
 integers

---
 mathesar/urls.py  | 6 +++---
 mathesar/views.py | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mathesar/urls.py b/mathesar/urls.py
index 004d216c42..c8726b347c 100644
--- a/mathesar/urls.py
+++ b/mathesar/urls.py
@@ -52,19 +52,19 @@
     path('profile/', views.profile, name='profile'),
     path('administration/', views.admin_home, name='admin_home'),
     path('administration/users/', views.admin_home, name='admin_users_home'),
-    path('administration/users/<user_id>/', views.admin_home, name='admin_users_edit'),
+    path('administration/users/<int:user_id>/', views.admin_home, name='admin_users_edit'),
     path('administration/update/', views.admin_home, name='admin_update'),
     path('shares/tables/<slug>/', views.shared_table, name='shared_table'),
     path('shares/explorations/<slug>/', views.shared_query, name='shared_query'),
     path('databases/', views.databases, name='databases'),
     path('i18n/', include('django.conf.urls.i18n')),
     re_path(
-        r'^db/(?P<database_id>\w+)/schemas/(?P<schema_id>\w+)/',
+        r'^db/(?P<database_id>\d+)/schemas/(?P<schema_id>\d+)/',
         views.schemas_home,
         name='schema_home'
     ),
     re_path(
-        r'^db/(?P<database_id>\w+)/((schemas|settings)/)?',
+        r'^db/(?P<database_id>\d+)/((schemas|settings)/)?',
         views.schemas,
         name='schemas'
     ),
diff --git a/mathesar/views.py b/mathesar/views.py
index 1f4080aeb9..4aa240cbc9 100644
--- a/mathesar/views.py
+++ b/mathesar/views.py
@@ -80,8 +80,8 @@ def _get_internal_db_meta():
 def _get_base_data_all_routes(request, database_id=None, schema_id=None):
     return {
         'abstract_types': get_ui_type_list(request, database_id),
-        'current_database': database_id,
-        'current_schema': schema_id,
+        'current_database': int(database_id) if database_id else None,
+        'current_schema': int(schema_id) if schema_id else None,
         'current_release_tag_name': __version__,
         'databases': get_database_list(request),
         'servers': get_servers_list(),

From 3348385f3f86dfdb251930c8cbd78bba2fef0a68 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Tue, 10 Sep 2024 19:34:37 +0530
Subject: [PATCH 0847/1141] Fix tables list in common_data

---
 mathesar/views.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/mathesar/views.py b/mathesar/views.py
index 4aa240cbc9..e982e9fa26 100644
--- a/mathesar/views.py
+++ b/mathesar/views.py
@@ -10,6 +10,7 @@
 from mathesar.rpc.databases.configured import list_ as databases_list
 from mathesar.rpc.schemas import list_ as schemas_list
 from mathesar.rpc.servers.configured import list_ as get_servers_list
+from mathesar.rpc.tables import list_with_metadata as tables_list
 from mathesar.api.serializers.databases import TypeSerializer
 from mathesar.api.serializers.tables import TableSerializer
 from mathesar.api.serializers.queries import QuerySerializer
@@ -33,13 +34,19 @@ def get_database_list(request):
     return databases_list(request=request)
 
 
-def get_table_list(request, schema_id):
-    # TODO: Fill this method
-    return []
+def get_table_list(request, database_id, schema_oid):
+    if database_id is not None and schema_oid is not None:
+        return tables_list(
+            request=request,
+            database_id=database_id,
+            schema_oid=schema_oid
+        )
+    else:
+        return []
 
 
 def get_queries_list(request, schema_id):
-    # TODO: Fill this method
+    # TODO_BETA: Fill this method
     return []
 
 
@@ -98,7 +105,7 @@ def _get_base_data_all_routes(request, database_id=None, schema_id=None):
 def get_common_data(request, database_id=None, schema_id=None):
     return {
         **_get_base_data_all_routes(request, database_id, schema_id),
-        'tables': get_table_list(request, schema_id),
+        'tables': get_table_list(request, database_id, schema_id),
         'queries': get_queries_list(request, schema_id),
         'routing_context': 'normal',
     }

From 5be31649f57d4d8272cd7e5cb889a99e55d4c760 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 10 Sep 2024 19:43:07 +0530
Subject: [PATCH 0848/1141] wire up python function to column moving sql

---
 db/tables/operations/move_columns.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/db/tables/operations/move_columns.py b/db/tables/operations/move_columns.py
index f4758a7c85..714b7fd9be 100644
--- a/db/tables/operations/move_columns.py
+++ b/db/tables/operations/move_columns.py
@@ -2,6 +2,7 @@
 from sqlalchemy.dialects.postgresql import insert
 
 from db import constants
+from db.connection import exec_msar_func
 from db.columns.base import MathesarColumn
 from db.columns.operations.alter import batch_alter_table_drop_columns
 from db.columns.operations.create import bulk_create_mathesar_column
@@ -10,6 +11,16 @@
 from db.metadata import get_empty_metadata
 
 
+def move_columns_to_referenced_table(conn, source_table_oid, target_table_oid, move_column_attnums):
+    exec_msar_func(
+        conn,
+        'move_columns_to_referenced_table',
+        source_table_oid,
+        target_table_oid,
+        move_column_attnums
+    )
+
+
 def move_columns_between_related_tables(
         source_table_oid,
         target_table_oid,

From 013fa2badfe9ea647a05f8f2d6ef90e38b5c31c9 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 10 Sep 2024 19:43:51 +0530
Subject: [PATCH 0849/1141] wire up move_columns endpoint to python function

---
 mathesar/rpc/data_modeling.py | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/mathesar/rpc/data_modeling.py b/mathesar/rpc/data_modeling.py
index 06843e3f27..f1482237d9 100644
--- a/mathesar/rpc/data_modeling.py
+++ b/mathesar/rpc/data_modeling.py
@@ -7,7 +7,7 @@
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from db.links.operations import create as links_create
-from db.tables.operations import infer_types, split
+from db.tables.operations import infer_types, split, move_columns as move_cols
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
 
@@ -125,6 +125,7 @@ def split_table(
         table_oid: The OID of the table whose columns we'll extract.
         column_attnums: A list of the attnums of the columns to extract.
         extracted_table_name: The name of the new table to be made from the extracted columns.
+        database_id: The Django id of the database containing the table.
         relationship_fk_column_name: The name to give the new foreign key column in the remainder table (optional)
     """
     user = kwargs.get(REQUEST_KEY).user
@@ -136,3 +137,33 @@ def split_table(
             extracted_table_name,
             relationship_fk_column_name
         )
+
+
+@rpc_method(name="data_modeling.move_columns")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def move_columns(
+    *,
+    source_table_oid: int,
+    target_table_oid: int,
+    move_column_attnums: list[int],
+    database_id: int,
+    **kwargs
+) -> None:
+    """
+    Extract columns from a table to a referent table, linked by a foreign key.
+
+    Args:
+        source_table_oid: The OID of the source table whose column(s) we'll extract.
+        target_table_oid: The OID of the target table where the extracted column(s) will be added.
+        move_column_attnums: The list of attnum(s) to move from source table to the target table.
+        database_id: The Django id of the database containing the table.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        move_cols.move_columns_to_referenced_table(
+            conn,
+            source_table_oid,
+            target_table_oid,
+            move_column_attnums
+        )

From 14196b88d6555e0259e09c57d4180dda2ac41325 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 10 Sep 2024 19:44:22 +0530
Subject: [PATCH 0850/1141] add mocks, endpoint test and docs for column moving

---
 docs/docs/api/rpc.md                     |  1 +
 mathesar/tests/rpc/test_data_modeling.py | 52 ++++++++++++++++++++++--
 mathesar/tests/rpc/test_endpoints.py     |  5 +++
 3 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 4610abae4a..deb02e0b20 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -278,6 +278,7 @@ To use an RPC function:
       - add_mapping_table
       - suggest_types
       - split_table
+      - move_columns
       - MappingColumn
 
 ## Responses
diff --git a/mathesar/tests/rpc/test_data_modeling.py b/mathesar/tests/rpc/test_data_modeling.py
index a0099f83ef..716d8ca967 100644
--- a/mathesar/tests/rpc/test_data_modeling.py
+++ b/mathesar/tests/rpc/test_data_modeling.py
@@ -11,7 +11,7 @@
 from mathesar.models.users import User
 
 
-def test_data_modeling_add_foreign_key_column(rf, monkeypatch):
+def test_add_foreign_key_column(rf, monkeypatch):
     _username = 'alice'
     _password = 'pass1234'
     _column_name = 'new_fkey_col'
@@ -56,7 +56,7 @@ def mock_add_fkey_col(
     )
 
 
-def test_data_modeling_add_mapping_table(rf, monkeypatch):
+def test_add_mapping_table(rf, monkeypatch):
     _username = 'alice'
     _password = 'pass1234'
     _schema_oid = 1234
@@ -103,7 +103,7 @@ def mock_add_mapping_table(
     )
 
 
-def test_data_modeling_suggest_types(rf, monkeypatch):
+def test_suggest_types(rf, monkeypatch):
     _username = 'alice'
     _password = 'pass1234'
     _table_oid = 12345
@@ -134,7 +134,7 @@ def mock_suggest_types(conn, table_oid):
     )
 
 
-def test_data_modeling_split_table(rf, monkeypatch):
+def test_split_table(rf, monkeypatch):
     _username = 'alice'
     _password = 'pass1234'
     _table_oid = 12345
@@ -180,3 +180,47 @@ def mock_split_table(
         database_id=_database_id,
         request=request
     )
+
+
+def test_move_columns(rf, monkeypatch):
+    _username = 'alice'
+    _password = 'pass1234'
+    _source_table_oid = 12345
+    _target_table_oid = 67891
+    _move_column_attnums = [2, 3, 4]
+    _database_id = 2
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=_username, password=_password)
+
+    @contextmanager
+    def mock_connect(database_id, user):
+        if database_id == _database_id and user.username == _username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_move_columns(
+        conn,
+        source_table_oid,
+        target_table_oid,
+        move_column_attnums
+    ):
+        if (
+            source_table_oid != _source_table_oid
+            and target_table_oid != _target_table_oid
+            and move_column_attnums != _move_column_attnums
+        ):
+            raise AssertionError('incorrect parameters passed')
+
+    monkeypatch.setattr(data_modeling, 'connect', mock_connect)
+    monkeypatch.setattr(data_modeling.move_cols, 'move_columns_to_referenced_table', mock_move_columns)
+    data_modeling.move_columns(
+        source_table_oid=_source_table_oid,
+        target_table_oid=_target_table_oid,
+        move_column_attnums=_move_column_attnums,
+        database_id=_database_id,
+        request=request
+    )
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 7dc0e2cfbb..5d9f1b185a 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -133,6 +133,11 @@
         "data_modeling.split_table",
         [user_is_authenticated]
     ),
+    (
+        data_modeling.move_columns,
+        "data_modeling.move_columns",
+        [user_is_authenticated]
+    ),
 
     (
         databases.get,

From 9dbab802570855361d588c0793e87f61ecb63d84 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 10 Sep 2024 15:59:39 -0400
Subject: [PATCH 0851/1141] Get basic CSV imports working again

---
 mathesar_ui/src/api/rpc/columns.ts            |   2 +-
 mathesar_ui/src/api/rpc/data_modeling.ts      |  16 ++
 mathesar_ui/src/api/rpc/index.ts              |   6 +-
 mathesar_ui/src/api/rpc/tables.ts             |  68 +++++++-
 mathesar_ui/src/components/AppHeader.svelte   |   4 +-
 .../preview/ImportPreviewContent.svelte       |  89 ++++------
 .../import/preview/ImportPreviewPage.svelte   |  21 +--
 .../import/preview/importPreviewPageUtils.ts  |  11 +-
 .../import/upload/ImportUploadPage.svelte     |  22 ++-
 .../schema/CreateEmptyTableButton.svelte      |   4 +-
 .../pages/schema/CreateNewTableButton.svelte  |   4 +-
 mathesar_ui/src/stores/AsyncStore.ts          |   2 +-
 mathesar_ui/src/stores/schemas.ts             |   2 +-
 mathesar_ui/src/stores/tables.ts              | 162 ++++++++++++------
 mathesar_ui/src/utils/tables.ts               |   9 +-
 15 files changed, 280 insertions(+), 142 deletions(-)
 create mode 100644 mathesar_ui/src/api/rpc/data_modeling.ts

diff --git a/mathesar_ui/src/api/rpc/columns.ts b/mathesar_ui/src/api/rpc/columns.ts
index 3cfd02c2c6..26a1751706 100644
--- a/mathesar_ui/src/api/rpc/columns.ts
+++ b/mathesar_ui/src/api/rpc/columns.ts
@@ -47,7 +47,7 @@ export type TimeFormat = '24hr' | '12hr' | '24hrLong' | '12hrLong';
  *
  * [1]: https://www.postgresql.org/docs/current/datatype-numeric.html
  */
-interface ColumnTypeOptions {
+export interface ColumnTypeOptions {
   /**
    * For numeric types, the number of significant digits. For date/time types,
    * the number of fractional digits.
diff --git a/mathesar_ui/src/api/rpc/data_modeling.ts b/mathesar_ui/src/api/rpc/data_modeling.ts
new file mode 100644
index 0000000000..d7862003cd
--- /dev/null
+++ b/mathesar_ui/src/api/rpc/data_modeling.ts
@@ -0,0 +1,16 @@
+import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
+
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const data_modeling = {
+  /**
+   * Returns a record where keys are stringified column attnums and values are
+   * postgresql types
+   */
+  suggest_types: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      table_oid: number;
+    },
+    Record<string, string>
+  >(),
+};
diff --git a/mathesar_ui/src/api/rpc/index.ts b/mathesar_ui/src/api/rpc/index.ts
index f1dd6a8533..e72a315b05 100644
--- a/mathesar_ui/src/api/rpc/index.ts
+++ b/mathesar_ui/src/api/rpc/index.ts
@@ -5,6 +5,7 @@ import { buildRpcApi } from '@mathesar/packages/json-rpc-client-builder';
 import { collaborators } from './collaborators';
 import { columns } from './columns';
 import { constraints } from './constraints';
+import { data_modeling } from './data_modeling';
 import { databases } from './databases';
 import { records } from './records';
 import { roles } from './roles';
@@ -18,13 +19,14 @@ export const api = buildRpcApi({
   getHeaders: () => ({ 'X-CSRFToken': Cookies.get('csrftoken') }),
   methodTree: {
     collaborators,
+    columns,
+    constraints,
+    data_modeling,
     databases,
     records,
     roles,
     schemas,
     servers,
     tables,
-    columns,
-    constraints,
   },
 });
diff --git a/mathesar_ui/src/api/rpc/tables.ts b/mathesar_ui/src/api/rpc/tables.ts
index db5748d334..8579bf1b6d 100644
--- a/mathesar_ui/src/api/rpc/tables.ts
+++ b/mathesar_ui/src/api/rpc/tables.ts
@@ -1,5 +1,8 @@
+import type { RecursivePartial } from '@mathesar/component-library';
 import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
 
+import type { ColumnTypeOptions } from './columns';
+
 export interface RawTable {
   oid: number;
   name: string;
@@ -9,6 +12,16 @@ export interface RawTable {
 }
 
 interface TableMetadata {
+  /** The id of the data file used during import while creating the table */
+  data_file_id: number | null;
+  /**
+   * When `true` or `null`, the table has been imported from a data file and the
+   * data has been verified to be correct, with the data types customized by the
+   * user.
+   *
+   * When false, the table still requires import verification before it can be
+   * viewed in the table page.
+   */
   import_verified: boolean | null;
   column_order: number[] | null;
   record_summary_customized: boolean | null;
@@ -62,6 +75,17 @@ export interface JoinableTablesResult {
   >;
 }
 
+/**
+ * The parameters needed for one column in order to generate an import preview.
+ */
+export interface ColumnPreviewSpec {
+  /** Column attnum */
+  id: number;
+  /** The new type to be applied to the column */
+  type?: string;
+  type_options?: ColumnTypeOptions | null;
+}
+
 export const tables = {
   list: rpcMethodTypeContainer<
     {
@@ -107,7 +131,25 @@ export const tables = {
       /** TODO */
       constraint_data_list?: unknown;
     },
-    number
+    {
+      oid: number;
+      name: string;
+    }
+  >(),
+
+  /** Returns the oid of the table created */
+  import: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      schema_oid: number;
+      table_name?: string;
+      comment?: string;
+      data_file_id: number;
+    },
+    {
+      oid: number;
+      name: string;
+    }
   >(),
 
   patch: rpcMethodTypeContainer<
@@ -139,4 +181,28 @@ export const tables = {
     },
     JoinableTablesResult
   >(),
+
+  get_import_preview: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      table_oid: number;
+      columns: ColumnPreviewSpec[];
+      /** The upper limit for the number of records to return. Defaults to 20 */
+      limit?: number;
+    },
+    Record<string, unknown>[]
+  >(),
+
+  metadata: {
+    list: rpcMethodTypeContainer<{ database_id: number }, TableMetadata[]>(),
+
+    set: rpcMethodTypeContainer<
+      {
+        database_id: number;
+        table_oid: number;
+        metadata: RecursivePartial<TableMetadata>;
+      },
+      void
+    >(),
+  },
 };
diff --git a/mathesar_ui/src/components/AppHeader.svelte b/mathesar_ui/src/components/AppHeader.svelte
index d12f8feaab..df50ad55c9 100644
--- a/mathesar_ui/src/components/AppHeader.svelte
+++ b/mathesar_ui/src/components/AppHeader.svelte
@@ -57,9 +57,9 @@
       return;
     }
     isCreatingNewEmptyTable = true;
-    const tableOid = await createTable(database, schema, {});
+    const table = await createTable({ database, schema });
     isCreatingNewEmptyTable = false;
-    router.goto(getTablePageUrl(database.id, schema.oid, tableOid), false);
+    router.goto(getTablePageUrl(database.id, schema.oid, table.oid), false);
   }
 </script>
 
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index 4b3ea04dd5..5c5908e4d8 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -3,11 +3,10 @@
   import { router } from 'tinro';
 
   import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
-  import { getAPI, postAPI } from '@mathesar/api/rest/utils/requestUtils';
   import { api } from '@mathesar/api/rpc';
   import type { Column } from '@mathesar/api/rpc/columns';
   import type { Schema } from '@mathesar/api/rpc/schemas';
-  import type { Table } from '@mathesar/api/rpc/tables';
+  import type { ColumnPreviewSpec, Table } from '@mathesar/api/rpc/tables';
   import {
     Field,
     FieldLayout,
@@ -27,11 +26,10 @@
   import { abstractTypesMap } from '@mathesar/stores/abstract-types';
   import AsyncStore from '@mathesar/stores/AsyncStore';
   import { currentDatabase } from '@mathesar/stores/databases';
-  import { currentTables } from '@mathesar/stores/tables';
+  import { currentTables, updateTable } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
   import {
     CancelOrProceedButtonPair,
-    CancellablePromise,
     Spinner,
   } from '@mathesar-component-library';
 
@@ -53,34 +51,6 @@
   /** Set via back-end */
   const TRUNCATION_LIMIT = 20;
 
-  /**
-   * Note the optimizing query parameter. It asserts that the table will not have
-   * columns with default values (probably because it is currently being imported
-   * and a table produced by importing will not have column defaults). It
-   * follows, that this function cannot be used where columns might have defaults.
-   */
-  function getTypeSuggestionsForTable(
-    id: Table['oid'],
-  ): CancellablePromise<Record<string, string>> {
-    const optimizingQueryParam = 'columns_might_have_defaults=false';
-    return getAPI(
-      `/api/db/v0/tables/${id}/type_suggestions/?${optimizingQueryParam}`,
-    );
-  }
-
-  function generateTablePreview(props: {
-    table: Pick<Table, 'oid'>;
-    columns: Column[];
-  }): CancellablePromise<{
-    records: Record<string, unknown>[];
-  }> {
-    const { columns, table } = props;
-    return postAPI(`/api/db/v0/tables/${table.oid}/previews/`, { columns });
-  }
-
-  const columnsFetch = new AsyncStore(runner(api.columns.list_with_metadata));
-  const previewRequest = new AsyncStore(generateTablePreview);
-  const typeSuggestionsRequest = new AsyncStore(getTypeSuggestionsForTable);
   const headerUpdate = makeHeaderUpdateRequest();
   const cancelationRequest = makeDeleteTableRequest();
 
@@ -100,7 +70,24 @@
     uniqueWith(otherTableNames, $_('table_name_already_exists')),
   ]);
   $: form = makeForm({ customizedTableName });
-  $: records = $previewRequest.resolvedValue?.records ?? getSkeletonRecords();
+
+  $: typeSuggestionsRequest = new AsyncStore(() =>
+    api.data_modeling
+      .suggest_types({ table_oid: table.oid, database_id: database.id })
+      .run(),
+  );
+  $: previewRequest = new AsyncStore((columns: ColumnPreviewSpec[]) =>
+    api.tables
+      .get_import_preview({
+        database_id: database.id,
+        table_oid: table.oid,
+        columns,
+      })
+      .run(),
+  );
+  $: columnsFetch = new AsyncStore(runner(api.columns.list_with_metadata));
+
+  $: records = $previewRequest.resolvedValue ?? getSkeletonRecords();
   $: formInputsAreDisabled = !$previewRequest.isOk;
   $: canProceed = $previewRequest.isOk && $form.canSubmit;
   $: processedColumns = processColumns(columns, abstractTypesMap);
@@ -117,16 +104,16 @@
     columns = fetchedColumns;
     columnPropertiesMap = buildColumnPropertiesMap(columns);
     if (useColumnTypeInference) {
-      const response = await typeSuggestionsRequest.run(table.oid);
+      const response = await typeSuggestionsRequest.run();
       if (response.settlement?.state === 'resolved') {
         const typeSuggestions = response.settlement.value;
         columns = columns.map((column) => ({
           ...column,
-          type: typeSuggestions[column.name] ?? column.type,
+          type: typeSuggestions[column.id] ?? column.type,
         }));
       }
     }
-    await previewRequest.run({ table, columns });
+    await previewRequest.run(columns);
   }
   $: table, useColumnTypeInference, void init();
 
@@ -155,7 +142,7 @@
       customizedTableName: $customizedTableName,
     });
     if (response.resolvedValue) {
-      reload({ table: { oid: response.resolvedValue } });
+      reload({ table: response.resolvedValue });
     }
   }
 
@@ -168,7 +155,7 @@
     columns = columns.map((c) =>
       c.id === updatedColumn.id ? updatedColumn : c,
     );
-    return previewRequest.run({ table, columns });
+    return previewRequest.run(columns);
   }
 
   async function cancel() {
@@ -181,19 +168,19 @@
   }
 
   async function finishImport() {
-    // TODO_BETA reimplement patching tables columns with RPC API.
-    throw new Error('Not implemented');
-
-    // try {
-    //   await patchTable(database, table.oid, {
-    //     name: $customizedTableName,
-    //     import_verified: true,
-    //     columns: finalizeColumns(columns, columnPropertiesMap),
-    //   });
-    //   router.goto(getTablePageUrl(database.id, schema.oid, table.oid), true);
-    // } catch (err) {
-    //   toast.fromError(err);
-    // }
+    try {
+      await updateTable(database, {
+        oid: table.oid,
+        name: $customizedTableName,
+        columns: finalizeColumns(columns, columnPropertiesMap),
+        metadata: {
+          import_verified: true,
+        },
+      });
+      router.goto(getTablePageUrl(database.id, schema.oid, table.oid), true);
+    } catch (err) {
+      toast.fromError(err);
+    }
   }
 </script>
 
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
index 673b356164..742a81c290 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
@@ -32,10 +32,7 @@
 
   $: void (async () => {
     const table = (
-      await tableFetch.run({
-        database: $currentDatabase,
-        tableOid: tableId,
-      })
+      await tableFetch.run({ database: $currentDatabase, tableOid: tableId })
     ).resolvedValue;
     if (!table) {
       return;
@@ -45,16 +42,12 @@
       redirectToTablePage();
       return;
     }
-
-    // TODO_BETA: re-implement fetching and storing of `table.data_files`
-    // metadata from RPC API or similar.
-    throw new Error('Not implemented');
-    // const firstDataFileId = table.data_files?.[0];
-    // if (firstDataFileId === undefined) {
-    //   redirectToTablePage();
-    //   return;
-    // }
-    // await dataFileFetch.run(firstDataFileId);
+    const dataFileId = table.metadata?.data_file_id ?? undefined;
+    if (dataFileId === undefined) {
+      redirectToTablePage();
+      return;
+    }
+    await dataFileFetch.run(dataFileId);
   })();
   $: error = $tableFetch.error ?? $dataFileFetch.error;
 </script>
diff --git a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
index 6be01a57a0..d36cb89196 100644
--- a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
+++ b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
@@ -11,7 +11,7 @@ import type {
   AbstractTypesMap,
 } from '@mathesar/stores/abstract-types/types';
 import AsyncStore from '@mathesar/stores/AsyncStore';
-import { createTable, deleteTable } from '@mathesar/stores/tables';
+import { createTableFromDataFile, deleteTable } from '@mathesar/stores/tables';
 
 /**
  * This is to improve loading experience by seeding the table with empty
@@ -48,8 +48,8 @@ export function processColumns(
 
 export function makeHeaderUpdateRequest() {
   interface Props {
-    database: Database;
-    schema: Schema;
+    database: Pick<Database, 'id'>;
+    schema: Pick<Schema, 'oid'>;
     table: Pick<Table, 'oid'>;
     dataFile: Pick<DataFile, 'id'>;
     firstRowIsHeader: boolean;
@@ -60,10 +60,7 @@ export function makeHeaderUpdateRequest() {
       deleteTable(p.database, p.schema, p.table.oid),
       dataFilesApi.update(p.dataFile.id, { header: p.firstRowIsHeader }),
     ]);
-    return createTable(p.database, p.schema, {
-      name: p.customizedTableName,
-      dataFiles: [p.dataFile.id],
-    });
+    return createTableFromDataFile(p);
   }
   return new AsyncStore(updateHeader);
 }
diff --git a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
index caf81c523b..35ee980fea 100644
--- a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
+++ b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
@@ -23,7 +23,10 @@
   import type { Database } from '@mathesar/models/Database';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { getImportPreviewPageUrl } from '@mathesar/routes/urls';
-  import { createTable } from '@mathesar/stores/tables';
+  import {
+    createTableFromDataFile,
+    updateTable,
+  } from '@mathesar/stores/tables';
   import { getErrorMessage } from '@mathesar/utils/errors';
   import {
     RadioGroup,
@@ -113,13 +116,24 @@
       if (dataFileId === undefined) {
         return;
       }
-      const tableOid = await createTable(database, schema, {
-        dataFiles: [dataFileId],
+      const table = await createTableFromDataFile({
+        database,
+        schema,
+        dataFile: { id: dataFileId },
+      });
+
+      await updateTable(database, {
+        oid: table.oid,
+        metadata: {
+          import_verified: false,
+          data_file_id: dataFileId,
+        },
       });
+
       const previewPage = getImportPreviewPageUrl(
         database.id,
         schema.oid,
-        tableOid,
+        table.oid,
         { useColumnTypeInference: $useColumnTypeInference },
       );
       router.goto(previewPage, true);
diff --git a/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte b/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
index 0a34daf1ef..3407d93a94 100644
--- a/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
+++ b/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
@@ -17,9 +17,9 @@
 
   async function handleCreateEmptyTable() {
     isCreatingNewTable = true;
-    const tableOid = await createTable(database, schema, {});
+    const table = await createTable({ database, schema });
     isCreatingNewTable = false;
-    router.goto(getTablePageUrl(database.id, schema.oid, tableOid), false);
+    router.goto(getTablePageUrl(database.id, schema.oid, table.oid), false);
   }
 </script>
 
diff --git a/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte b/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
index c4bfb13489..f60a71ecc3 100644
--- a/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
+++ b/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
@@ -22,9 +22,9 @@
 
   async function handleCreateEmptyTable() {
     isCreatingNewTable = true;
-    const tableOid = await createTable(database, schema, {});
+    const table = await createTable({ database, schema });
     isCreatingNewTable = false;
-    router.goto(getTablePageUrl(database.id, schema.oid, tableOid), false);
+    router.goto(getTablePageUrl(database.id, schema.oid, table.oid), false);
   }
 </script>
 
diff --git a/mathesar_ui/src/stores/AsyncStore.ts b/mathesar_ui/src/stores/AsyncStore.ts
index 3d382ede09..94c46640f8 100644
--- a/mathesar_ui/src/stores/AsyncStore.ts
+++ b/mathesar_ui/src/stores/AsyncStore.ts
@@ -99,7 +99,7 @@ export class AsyncStoreValue<T, E> {
   }
 }
 
-export default class AsyncStore<Props, T>
+export default class AsyncStore<Props = void, T = unknown>
   implements Readable<AsyncStoreValue<T, string>>
 {
   private runFn: (props: Props) => Promise<T> | CancellablePromise<T>;
diff --git a/mathesar_ui/src/stores/schemas.ts b/mathesar_ui/src/stores/schemas.ts
index 572c6ead38..3fbf5f7e3f 100644
--- a/mathesar_ui/src/stores/schemas.ts
+++ b/mathesar_ui/src/stores/schemas.ts
@@ -87,7 +87,7 @@ function removeSchemaInDBSchemaStore(
 
 export function addCountToSchemaNumTables(
   database: Pick<Database, 'id'>,
-  schema: Schema,
+  schema: Pick<Schema, 'oid'>,
   count: number,
 ) {
   const store = dbSchemaStoreMap.get(database.id);
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index 6cf2d71867..54a84b5158 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -14,13 +14,19 @@ import type { Readable, Writable } from 'svelte/store';
 import { derived, get, readable, writable } from 'svelte/store';
 import { _ } from 'svelte-i18n';
 
+import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
 import type { SplitTableResponse } from '@mathesar/api/rest/types/tables/split_table';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { api } from '@mathesar/api/rpc';
+import type { ColumnPatchSpec } from '@mathesar/api/rpc/columns';
 import type { Schema } from '@mathesar/api/rpc/schemas';
 import type { Table } from '@mathesar/api/rpc/tables';
 import { invalidIf } from '@mathesar/components/form';
 import type { Database } from '@mathesar/models/Database';
+import {
+  type RpcRequest,
+  batchSend,
+} from '@mathesar/packages/json-rpc-client-builder';
 import { TupleMap } from '@mathesar/packages/tuple-map';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import {
@@ -194,7 +200,7 @@ function findStoreContainingTable(
 
 export function deleteTable(
   database: Pick<Database, 'id'>,
-  schema: Schema,
+  schema: Pick<Schema, 'oid'>,
   tableOid: Table['oid'],
 ): CancellablePromise<void> {
   const promise = api.tables
@@ -226,27 +232,47 @@ export function deleteTable(
 }
 
 /**
- *
  * @throws Error if the table store is not found or if the table is not found in
  * the store.
  */
 export async function updateTable(
   database: Pick<Database, 'id'>,
-  table: RecursivePartial<Table> & { oid: Table['oid'] },
+  table: RecursivePartial<Table> & { oid: Table['oid'] } & {
+    columns?: ColumnPatchSpec[];
+  },
 ): Promise<void> {
-  await api.tables
-    .patch({
-      database_id: database.id,
-      table_oid: table.oid,
-      table_data_dict: {
-        name: table.name,
-        description: table.description,
-      },
-    })
-    .run();
-
-  // TODO_BETA: also run tables.metadata.patch to handle updates to
-  // `table.metadata`. Run both API calls as one RPC batch request.
+  const requests: RpcRequest<void>[] = [];
+  if (table.name || table.description) {
+    requests.push(
+      api.tables.patch({
+        database_id: database.id,
+        table_oid: table.oid,
+        table_data_dict: {
+          name: table.name,
+          description: table.description,
+        },
+      }),
+    );
+  }
+  if (table.columns) {
+    requests.push(
+      api.columns.patch({
+        database_id: database.id,
+        table_oid: table.oid,
+        column_data_list: table.columns,
+      }),
+    );
+  }
+  if (table.metadata) {
+    requests.push(
+      api.tables.metadata.set({
+        database_id: database.id,
+        table_oid: table.oid,
+        metadata: table.metadata,
+      }),
+    );
+  }
+  await batchSend(requests);
 
   const tableStore = findStoreContainingTable(database, table.oid);
   if (!tableStore) throw new Error('Table store not found');
@@ -263,50 +289,84 @@ export async function updateTable(
   });
 }
 
-export function createTable(
-  database: Pick<Database, 'id'>,
-  schema: Schema,
-  tableArgs: {
-    name?: string;
-    dataFiles?: [number, ...number[]];
-  },
-): CancellablePromise<Table['oid']> {
+function addTableToStore({
+  database,
+  schema,
+  table,
+}: {
+  database: Pick<Database, 'id'>;
+  schema: Pick<Schema, 'oid'>;
+  table: Partial<Table> & Pick<Table, 'oid' | 'name'>;
+}): Table {
+  addCountToSchemaNumTables(database, schema, 1);
+  const fullTable: Table = {
+    description: null,
+    metadata: null,
+    schema: schema.oid,
+    ...table,
+  };
+  const tablesStore = tablesStores.get([database.id, schema.oid]);
+  tablesStore?.update((tablesData) => {
+    const tables = sortTables([...tablesData.tablesMap.values(), fullTable]);
+    return {
+      ...tablesData,
+      tablesMap: new Map(tables.map((t) => [t.oid, t])),
+    };
+  });
+  return fullTable;
+}
+
+export function createTable({
+  database,
+  schema,
+}: {
+  database: Pick<Database, 'id'>;
+  schema: Pick<Schema, 'oid'>;
+}): CancellablePromise<Table> {
   const promise = api.tables
     .add({
       database_id: database.id,
       schema_oid: schema.oid,
-      table_name: tableArgs.name ?? '',
-      // TODO_BETA
-      //
-      // Figure out how to create a table with `data_files`. We might need a
-      // separate RPC method for that.
+    })
+    .run();
+  return new CancellablePromise(
+    (resolve, reject) => {
+      void promise.then(
+        (table) => resolve(addTableToStore({ database, schema, table })),
+        reject,
+      );
+    },
+    () => {
+      promise.cancel();
+    },
+  );
+}
 
-      // data_files: tableArgs.dataFiles,
+export function createTableFromDataFile({
+  database,
+  schema,
+  dataFile,
+  name,
+}: {
+  database: Pick<Database, 'id'>;
+  schema: Pick<Schema, 'oid'>;
+  dataFile: Pick<DataFile, 'id'>;
+  name?: string;
+}): CancellablePromise<Table> {
+  const promise = api.tables
+    .import({
+      database_id: database.id,
+      schema_oid: schema.oid,
+      table_name: name ?? '',
+      data_file_id: dataFile.id,
     })
     .run();
   return new CancellablePromise(
     (resolve, reject) => {
-      void promise.then((tableOid) => {
-        addCountToSchemaNumTables(database, schema, 1);
-        const tablesStore = tablesStores.get([database.id, schema.oid]);
-        tablesStore?.update((tablesData) => {
-          const table: Table = {
-            oid: tableOid,
-            // TODO_BETA: What happens when we create a table without passing a
-            // name. Does the RPC API support this? Should it?
-            name: tableArgs.name ?? '',
-            schema: schema.oid,
-            description: null,
-            metadata: null,
-          };
-          const tables = sortTables([...tablesData.tablesMap.values(), table]);
-          return {
-            ...tablesData,
-            tablesMap: new Map(tables.map((t) => [t.oid, t])),
-          };
-        });
-        return resolve(tableOid);
-      }, reject);
+      void promise.then(
+        (table) => resolve(addTableToStore({ database, schema, table })),
+        reject,
+      );
     },
     () => {
       promise.cancel();
diff --git a/mathesar_ui/src/utils/tables.ts b/mathesar_ui/src/utils/tables.ts
index 22675ff1d0..b3a38f58a7 100644
--- a/mathesar_ui/src/utils/tables.ts
+++ b/mathesar_ui/src/utils/tables.ts
@@ -8,6 +8,7 @@ import {
 } from '@mathesar/routes/urls';
 import type { ProcessedColumn } from '@mathesar/stores/table-data';
 
+/** If the same value exists for `a` and `b`, the value from `b` will be used */
 function mergeTableMetadata(
   a: Table['metadata'],
   b?: RecursivePartial<Table['metadata']>,
@@ -18,14 +19,16 @@ function mergeTableMetadata(
     column_order: b.column_order
       ? b.column_order.map(Number)
       : a?.column_order ?? null,
-    import_verified: a?.import_verified ?? b.import_verified ?? null,
+    data_file_id: b.data_file_id ?? a?.data_file_id ?? null,
+    import_verified: b.import_verified ?? a?.import_verified ?? null,
     record_summary_customized:
-      a?.record_summary_customized ?? b.record_summary_customized ?? null,
+      b.record_summary_customized ?? a?.record_summary_customized ?? null,
     record_summary_template:
-      a?.record_summary_template ?? b.record_summary_template ?? null,
+      b.record_summary_template ?? a?.record_summary_template ?? null,
   };
 }
 
+/** If the same value exists for `a` and `b`, the value from `b` will be used */
 export function mergeTables(a: Table, b: RecursivePartial<Table>): Table {
   // I don't love this function, but for now it works. It seems like we ought to
   // have a more generic way to do this sort of thing, perhaps with a library,

From 653dc416c31b49c37f96840319fdc3e040ca6ee2 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 10 Sep 2024 16:45:28 -0400
Subject: [PATCH 0852/1141] Don't import unchecked columns

---
 .../preview/ImportPreviewContent.svelte       | 18 +++++++----
 .../import/upload/ImportUploadPage.svelte     | 13 ++++----
 mathesar_ui/src/pages/schema/EditTable.svelte | 11 ++++---
 mathesar_ui/src/stores/tables.ts              | 30 ++++++++++++++-----
 .../systems/table-view/header/Header.svelte   |  9 ++++--
 .../record-summary/RecordSummaryConfig.svelte | 13 ++++----
 .../table/TableDescription.svelte             |  5 +++-
 .../table-inspector/table/TableName.svelte    |  9 ++++--
 8 files changed, 73 insertions(+), 35 deletions(-)

diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index 5c5908e4d8..96efe0c98b 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -169,13 +169,19 @@
 
   async function finishImport() {
     try {
-      await updateTable(database, {
-        oid: table.oid,
-        name: $customizedTableName,
-        columns: finalizeColumns(columns, columnPropertiesMap),
-        metadata: {
-          import_verified: true,
+      await updateTable({
+        database,
+        table: {
+          oid: table.oid,
+          name: $customizedTableName,
+          metadata: {
+            import_verified: true,
+          },
         },
+        columnPatchSpecs: finalizeColumns(columns, columnPropertiesMap),
+        columnsToDelete: Object.entries(columnPropertiesMap)
+          .filter(([, { selected }]) => !selected)
+          .map(([id]) => parseInt(id, 10)),
       });
       router.goto(getTablePageUrl(database.id, schema.oid, table.oid), true);
     } catch (err) {
diff --git a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
index 35ee980fea..36eb3c9818 100644
--- a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
+++ b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
@@ -122,11 +122,14 @@
         dataFile: { id: dataFileId },
       });
 
-      await updateTable(database, {
-        oid: table.oid,
-        metadata: {
-          import_verified: false,
-          data_file_id: dataFileId,
+      await updateTable({
+        database,
+        table: {
+          oid: table.oid,
+          metadata: {
+            import_verified: false,
+            data_file_id: dataFileId,
+          },
         },
       });
 
diff --git a/mathesar_ui/src/pages/schema/EditTable.svelte b/mathesar_ui/src/pages/schema/EditTable.svelte
index cbe193d4a1..10012a5678 100644
--- a/mathesar_ui/src/pages/schema/EditTable.svelte
+++ b/mathesar_ui/src/pages/schema/EditTable.svelte
@@ -21,10 +21,13 @@
   );
 
   async function handleSave(name: string, description: string) {
-    await updateTable($currentDatabase, {
-      oid: table.oid,
-      name,
-      description,
+    await updateTable({
+      database: $currentDatabase,
+      table: {
+        oid: table.oid,
+        name,
+        description,
+      },
     });
   }
 </script>
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index 54a84b5158..3bf6117170 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -235,12 +235,17 @@ export function deleteTable(
  * @throws Error if the table store is not found or if the table is not found in
  * the store.
  */
-export async function updateTable(
-  database: Pick<Database, 'id'>,
-  table: RecursivePartial<Table> & { oid: Table['oid'] } & {
-    columns?: ColumnPatchSpec[];
-  },
-): Promise<void> {
+export async function updateTable({
+  database,
+  table,
+  columnPatchSpecs,
+  columnsToDelete,
+}: {
+  database: Pick<Database, 'id'>;
+  table: RecursivePartial<Table> & { oid: Table['oid'] };
+  columnPatchSpecs?: ColumnPatchSpec[];
+  columnsToDelete?: number[];
+}): Promise<void> {
   const requests: RpcRequest<void>[] = [];
   if (table.name || table.description) {
     requests.push(
@@ -254,12 +259,12 @@ export async function updateTable(
       }),
     );
   }
-  if (table.columns) {
+  if (columnPatchSpecs) {
     requests.push(
       api.columns.patch({
         database_id: database.id,
         table_oid: table.oid,
-        column_data_list: table.columns,
+        column_data_list: columnPatchSpecs,
       }),
     );
   }
@@ -272,6 +277,15 @@ export async function updateTable(
       }),
     );
   }
+  if (columnsToDelete?.length) {
+    requests.push(
+      api.columns.delete({
+        database_id: database.id,
+        table_oid: table.oid,
+        column_attnums: columnsToDelete,
+      }),
+    );
+  }
   await batchSend(requests);
 
   const tableStore = findStoreContainingTable(database, table.oid);
diff --git a/mathesar_ui/src/systems/table-view/header/Header.svelte b/mathesar_ui/src/systems/table-view/header/Header.svelte
index bb35472102..926a7f7dd5 100644
--- a/mathesar_ui/src/systems/table-view/header/Header.svelte
+++ b/mathesar_ui/src/systems/table-view/header/Header.svelte
@@ -86,9 +86,12 @@
       newColumnOrder.splice(0, 0, ...selectedColumnIdsOrdered);
     }
 
-    void updateTable($currentDatabase, {
-      oid: table.oid,
-      metadata: { column_order: newColumnOrder },
+    void updateTable({
+      database: $currentDatabase,
+      table: {
+        oid: table.oid,
+        metadata: { column_order: newColumnOrder },
+      },
     });
 
     // Reset drag information
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
index c6efe29989..8c25a80a39 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
@@ -59,11 +59,14 @@
 
   async function save() {
     try {
-      await updateTable($currentDatabase, {
-        oid: table.oid,
-        metadata: {
-          record_summary_customized: $customized,
-          record_summary_template: $template,
+      await updateTable({
+        database: $currentDatabase,
+        table: {
+          oid: table.oid,
+          metadata: {
+            record_summary_customized: $customized,
+            record_summary_template: $template,
+          },
         },
       });
     } catch (e) {
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
index df2e3fba95..5f4b9cf776 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
@@ -13,7 +13,10 @@
   $: ({ table } = $tabularData);
 
   async function handleSave(description: string) {
-    await updateTable($currentDatabase, { oid: table.oid, description });
+    await updateTable({
+      database: $currentDatabase,
+      table: { oid: table.oid, description },
+    });
   }
 </script>
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
index 1ffb43af18..abdcdcb6c3 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
@@ -20,9 +20,12 @@
   );
 
   async function handleSubmit(name: string) {
-    await updateTable($currentDatabase, {
-      oid: table.oid,
-      name,
+    await updateTable({
+      database: $currentDatabase,
+      table: {
+        oid: table.oid,
+        name,
+      },
     });
   }
 </script>

From c4b1adb601b93ec32d7bd87892d5d9510f7f7fef Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 11 Sep 2024 15:53:03 +0530
Subject: [PATCH 0853/1141] add sql function for transferring db ownership

---
 db/roles/operations/ownership.py |  5 +++++
 db/sql/00_msar.sql               | 27 +++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 db/roles/operations/ownership.py

diff --git a/db/roles/operations/ownership.py b/db/roles/operations/ownership.py
new file mode 100644
index 0000000000..6d739e9042
--- /dev/null
+++ b/db/roles/operations/ownership.py
@@ -0,0 +1,5 @@
+from db.connection import exec_msar_func
+
+
+def transfer_database_ownership(new_owner_oid, conn):
+    exec_msar_func(conn, 'transfer_database_ownership', new_owner_oid)
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 398664bfde..3eec9b14fd 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1221,7 +1221,7 @@ SELECT jsonb_build_object(
   'current_role_priv', msar.list_database_privileges_for_current_role(pgd.oid),
   'current_role_owns', pg_catalog.pg_has_role(pgd.datdba, 'USAGE')
 ) FROM pg_catalog.pg_database AS pgd
-WHERE pgd.datname = current_database();
+WHERE pgd.datname = pg_catalog.current_database();
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
@@ -1308,7 +1308,7 @@ SELECT string_agg(
       ' %3$I'
     ),
     val,
-    current_database(),
+    pg_catalog.current_database(),
     msar.get_role_name(rol_id)
   ),
   E';\n'
@@ -1434,6 +1434,29 @@ END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION
+msar.transfer_database_ownership(new_owner_oid regrole) RETURNS void AS $$/*
+Transfers ownership of the current database to a new owner.
+
+Args:
+  new_owner_oid: The OID of the role whom we want to be the new owner of the current database.
+
+NOTE: To successfully transfer ownership of a database to a new owner the current user must:
+  - Be a Superuser/Owner of the current database.
+  - Be a `MEMBER` of the new owning role. i.e. The current role should be able to `SET ROLE`
+    to the new owning role.
+  - Have `CREATEDB` privilege.
+*/
+BEGIN
+  EXECUTE format(
+    'ALTER DATABASE %I OWNER TO %I',
+    pg_catalog.current_database(),
+    msar.get_role_name(new_owner_oid)
+  );
+END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 -- ALTER SCHEMA FUNCTIONS

From 4779521f5b6e5dc8b8368a67b0a8ff359056a62e Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 11 Sep 2024 15:54:29 +0530
Subject: [PATCH 0854/1141] add tranfer_ownership endpoint for databases

---
 mathesar/rpc/databases/privileges.py | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/mathesar/rpc/databases/privileges.py b/mathesar/rpc/databases/privileges.py
index 98d1aada2f..931692849b 100644
--- a/mathesar/rpc/databases/privileges.py
+++ b/mathesar/rpc/databases/privileges.py
@@ -5,6 +5,7 @@
 
 from db.roles.operations.select import list_db_priv
 from db.roles.operations.update import replace_database_privileges_for_roles
+from db.roles.operations.ownership import transfer_database_ownership
 from mathesar.rpc.utils import connect
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 
@@ -64,7 +65,7 @@ def replace_for_roles(
     WARNING: Any privilege included in the `direct` list for a role
     is GRANTed, and any privilege not included is REVOKEd.
 
-    Args:
+    Attributes:
         privileges: The new privilege sets for roles.
         database_id: The Django id of the database.
 
@@ -78,3 +79,25 @@ def replace_for_roles(
             conn, [DBPrivileges.from_dict(i) for i in privileges]
         )
     return [DBPrivileges.from_dict(i) for i in raw_db_priv]
+
+
+@rpc_method(name="databases.privileges.transfer_ownership")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def transfer_ownership(*, new_owner_oid: int, database_id: int, **kwargs) -> None:
+    """
+    Transfers ownership of the current database to a new owner.
+
+    Attributes:
+        new_owner_oid: The OID of the role whom we want to be the new owner of the current database.
+        database_id: The Django id of the database whose ownership is to be transferred.
+
+    Note: To successfully transfer ownership of a database to a new owner the current user must:
+        - Be a Superuser/Owner of the current database.
+        - Be a `MEMBER` of the new owning role. i.e. The current role should be able to `SET ROLE`
+          to the new owning role.
+        - Have `CREATEDB` privilege.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        transfer_database_ownership(new_owner_oid, conn)

From ce7171f585874cc2425de82e0695f8ce0ed91ed1 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 11 Sep 2024 15:55:19 +0530
Subject: [PATCH 0855/1141] add mock & endpoint tests along with docs

---
 docs/docs/api/rpc.md                          |  1 +
 .../tests/rpc/test_database_privileges.py     | 36 +++++++++++++++++++
 mathesar/tests/rpc/test_endpoints.py          |  5 +++
 3 files changed, 42 insertions(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index deb02e0b20..b1de2644ae 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -81,6 +81,7 @@ To use an RPC function:
       members:
       - list_direct
       - replace_for_roles
+      - transfer_ownership
       - DBPrivileges
 
 ## Database Setup
diff --git a/mathesar/tests/rpc/test_database_privileges.py b/mathesar/tests/rpc/test_database_privileges.py
index 3e904f5513..abb43bf274 100644
--- a/mathesar/tests/rpc/test_database_privileges.py
+++ b/mathesar/tests/rpc/test_database_privileges.py
@@ -51,3 +51,39 @@ def mock_replace_privileges(
         privileges=_privileges, database_id=_database_id, request=request
     )
     assert actual_response == expect_response
+
+
+def test_transfer_db_ownership(rf, monkeypatch):
+    _username = 'alice'
+    _password = 'pass1234'
+    _database_id = 2
+    _new_owner_oid = 443123
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=_username, password=_password)
+
+    @contextmanager
+    def mock_connect(database_id, user):
+        if database_id == _database_id and user.username == _username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_tansfer_db_ownership(
+            new_owner_oid,
+            conn
+    ):
+        if new_owner_oid != _new_owner_oid:
+            raise AssertionError('incorrect parameters passed')
+
+    monkeypatch.setattr(privileges, 'connect', mock_connect)
+    monkeypatch.setattr(
+        privileges,
+        'transfer_database_ownership',
+        mock_tansfer_db_ownership
+    )
+    privileges.transfer_ownership(
+        new_owner_oid=_new_owner_oid, database_id=_database_id, request=request
+    )
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 5d9f1b185a..817c67b356 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -161,6 +161,11 @@
         "databases.privileges.replace_for_roles",
         [user_is_authenticated]
     ),
+    (
+        databases.privileges.transfer_ownership,
+        "databases.privileges.transfer_ownership",
+        [user_is_authenticated]
+    ),
 
     (
         databases.setup.create_new,

From a5494921438d29743186a871ae435c54d2863794 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 11 Sep 2024 16:21:32 +0530
Subject: [PATCH 0856/1141] Implement granting privileges for new role,
 reorganize components

---
 .../component-library/dropdown/Dropdown.scss  |   4 +-
 mathesar_ui/src/i18n/languages/en/dict.json   |   2 +
 .../DatabasePermissionsModal.svelte           |  60 +++++--
 .../permissions/PermissionsModal.svelte       |   6 +-
 .../permissions/PrivilegesSection.svelte      | 154 -----------------
 mathesar_ui/src/systems/permissions/index.ts  |   4 +
 .../permissions/overview/AccessControl.svelte | 158 ++++++++++++++++++
 .../AccessControlRow.svelte}                  |  77 ++++-----
 .../overview/OverviewSection.svelte           |  46 +++++
 .../systems/permissions/overview/Owner.svelte |  19 +++
 .../overview/PermissionsOverview.svelte       |  66 ++++++++
 .../overview/RoleAccessLevelAndPrivileges.ts} |  92 ++++------
 .../{ => overview}/RoleWithChildren.svelte    |   3 +
 .../src/systems/permissions/overview/utils.ts |  55 ++++++
 .../TransferOwnership.svelte}                 |   0
 mathesar_ui/src/systems/permissions/utils.ts  | 150 -----------------
 16 files changed, 460 insertions(+), 436 deletions(-)
 delete mode 100644 mathesar_ui/src/systems/permissions/PrivilegesSection.svelte
 create mode 100644 mathesar_ui/src/systems/permissions/index.ts
 create mode 100644 mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
 rename mathesar_ui/src/systems/permissions/{DirectPrivilegeRow.svelte => overview/AccessControlRow.svelte} (52%)
 create mode 100644 mathesar_ui/src/systems/permissions/overview/OverviewSection.svelte
 create mode 100644 mathesar_ui/src/systems/permissions/overview/Owner.svelte
 create mode 100644 mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte
 rename mathesar_ui/src/{pages/database/permissions/utils.ts => systems/permissions/overview/RoleAccessLevelAndPrivileges.ts} (50%)
 rename mathesar_ui/src/systems/permissions/{ => overview}/RoleWithChildren.svelte (96%)
 create mode 100644 mathesar_ui/src/systems/permissions/overview/utils.ts
 rename mathesar_ui/src/systems/permissions/{TransferOwnershipSection.svelte => transfer-ownership/TransferOwnership.svelte} (100%)
 delete mode 100644 mathesar_ui/src/systems/permissions/utils.ts

diff --git a/mathesar_ui/src/component-library/dropdown/Dropdown.scss b/mathesar_ui/src/component-library/dropdown/Dropdown.scss
index 511edd5b24..33a0ec2e4b 100644
--- a/mathesar_ui/src/component-library/dropdown/Dropdown.scss
+++ b/mathesar_ui/src/component-library/dropdown/Dropdown.scss
@@ -9,8 +9,8 @@ button.dropdown.trigger {
     text-overflow: ellipsis;
     white-space: nowrap;
     box-sizing: content-box;
-    line-height: 1.2;
-    min-height: 1.2em;
+    line-height: 1;
+    min-height: 1em;
     flex-grow: 1;
     > *:not(:last-child) {
       margin-right: 0.25rem;
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index dbad05661d..3271f7455c 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -5,6 +5,7 @@
   "access_level_is_overridden_help": "This access level is overridden by the {comparedAclObject} permissions.",
   "access_level_overrides_help": "This access level overrides the {comparedAclObject} permissions.",
   "access_level_precedence_help": "If a user has different access levels on the database and the schema, the access level of schema will take precedence.",
+  "access_not_granted_for_any_role": "Access has not been granted for any role.",
   "account_details": "Account Details",
   "action_cannot_be_undone": "This action cannot be undone",
   "actions": "Actions",
@@ -16,6 +17,7 @@
   "add_new_filter": "Add New Filter",
   "add_new_grouping": "Add New Grouping",
   "add_new_sort_condition": "Add new sort condition",
+  "add_roles": "Add Role(s)",
   "add_tables_to_new_schema": "You've created a new schema, now add tables to it.",
   "add_transformation_step": "Add transformation step",
   "add_user": "Add User",
diff --git a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
index 70201774cd..876af31264 100644
--- a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
+++ b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
@@ -1,12 +1,19 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import { allDatabasePrivileges } from '@mathesar/api/rpc/databases';
+  import {
+    type DatabasePrivilege,
+    type RawDatabasePrivilegesForRole,
+    allDatabasePrivileges,
+  } from '@mathesar/api/rpc/databases';
   import { DatabaseRouteContext } from '@mathesar/contexts/DatabaseRouteContext';
   import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
-  import PermissionsModal from '@mathesar/systems/permissions/PermissionsModal.svelte';
-  import PrivilegesSection from '@mathesar/systems/permissions/PrivilegesSection.svelte';
-  import TransferOwnershipSection from '@mathesar/systems/permissions/TransferOwnershipSection.svelte';
+  import {
+    type AccessControlConfig,
+    PermissionsModal,
+    PermissionsOverview,
+    TransferOwnership,
+  } from '@mathesar/systems/permissions';
   import type { ModalController } from '@mathesar-component-library';
 
   export let controller: ModalController;
@@ -15,7 +22,24 @@
   $: ({ database, roles, underlyingDatabase } = $databaseContext);
   $: databasePrivileges = database.constructDatabasePrivilegesStore();
 
-  function getAsyncStores() {
+  const accessControlConfig: AccessControlConfig<
+    'connect' | 'connect_and_create',
+    DatabasePrivilege
+  > = {
+    allPrivileges: allDatabasePrivileges,
+    access: {
+      levels: [
+        { id: 'connect', privileges: new Set(['CONNECT']) },
+        {
+          id: 'connect_and_create',
+          privileges: new Set(['CONNECT', 'CREATE']),
+        },
+      ],
+      default: 'connect',
+    },
+  };
+
+  function getAsyncStoresForPermissions() {
     void AsyncRpcApiStore.runBatched([
       databasePrivileges.batchRunner({ database_id: database.id }),
       roles.batchRunner({ database_id: database.id }),
@@ -23,28 +47,28 @@
     ]);
     return {
       roles,
-      objectPrivileges: databasePrivileges,
-      objectOwnerAndCurrentRolePrivileges: underlyingDatabase,
+      privilegesForRoles: databasePrivileges,
+      permissionsMetaData: underlyingDatabase,
     };
   }
 
-  function savePermissions() {}
+  async function savePrivilegesForRoles(
+    privileges: RawDatabasePrivilegesForRole[],
+  ) {
+    //
+  }
 </script>
 
 <PermissionsModal {controller} onClose={() => databasePrivileges.reset()}>
   <span slot="title">
     {$_('database_permissions')}
   </span>
-  <PrivilegesSection
-    slot="privileges"
+  <PermissionsOverview
+    slot="share"
     {controller}
-    accessLevelConfig={[
-      { id: 'connect', privileges: new Set(['CONNECT']) },
-      { id: 'connect_and_create', privileges: new Set(['CONNECT', 'CREATE']) },
-    ]}
-    allPrivileges={[...allDatabasePrivileges]}
-    {getAsyncStores}
-    {savePermissions}
+    {accessControlConfig}
+    getAsyncStores={getAsyncStoresForPermissions}
+    {savePrivilegesForRoles}
   />
-  <TransferOwnershipSection slot="transfer-ownership" {controller} />
+  <TransferOwnership slot="transfer-ownership" {controller} />
 </PermissionsModal>
diff --git a/mathesar_ui/src/systems/permissions/PermissionsModal.svelte b/mathesar_ui/src/systems/permissions/PermissionsModal.svelte
index 7d3cef3d1b..8d7af9a07e 100644
--- a/mathesar_ui/src/systems/permissions/PermissionsModal.svelte
+++ b/mathesar_ui/src/systems/permissions/PermissionsModal.svelte
@@ -39,7 +39,7 @@
     >
       <div class="tab-content">
         {#if activeTab.id === 'share'}
-          <slot name="privileges" {controller} />
+          <slot name="share" {controller} />
         {:else}
           <slot name="transfer-ownership" {controller} />
         {/if}
@@ -51,5 +51,9 @@
 <style lang="scss">
   .tabs {
     --Tab_margin-right: var(--size-small);
+
+    .tab-content {
+      margin-top: var(--size-base);
+    }
   }
 </style>
diff --git a/mathesar_ui/src/systems/permissions/PrivilegesSection.svelte b/mathesar_ui/src/systems/permissions/PrivilegesSection.svelte
deleted file mode 100644
index fc5e920326..0000000000
--- a/mathesar_ui/src/systems/permissions/PrivilegesSection.svelte
+++ /dev/null
@@ -1,154 +0,0 @@
-<script lang="ts">
-  import { _ } from 'svelte-i18n';
-
-  import Errors from '@mathesar/components/Errors.svelte';
-  import {
-    FormSubmit,
-    makeForm,
-    requiredField,
-  } from '@mathesar/components/form';
-  import type { Role } from '@mathesar/models/Role';
-  import {
-    ImmutableMap,
-    type ModalController,
-    Spinner,
-    isDefinedNonNullable,
-    portalToWindowFooter,
-  } from '@mathesar-component-library';
-
-  import DirectPrivilegeRow from './DirectPrivilegeRow.svelte';
-  import RoleWithChildren from './RoleWithChildren.svelte';
-  import {
-    type AccessLevelConfig,
-    type AsyncStoresValues,
-    type RoleAccessLevelAndPrivileges,
-    getObjectAccessPrivilegeMap,
-  } from './utils';
-
-  type AccessLevel = $$Generic;
-  type Privilege = $$Generic;
-
-  export let controller: ModalController;
-  export let accessLevelConfig: AccessLevelConfig<AccessLevel, Privilege>[];
-  export let getAsyncStores: () => AsyncStoresValues<Privilege>;
-  export let allPrivileges: Privilege[];
-  export let savePermissions: () => void;
-
-  $: ({ roles, objectPrivileges, objectOwnerAndCurrentRolePrivileges } =
-    getAsyncStores());
-
-  $: isLoading =
-    $roles.isLoading ||
-    $objectPrivileges.isLoading ||
-    $objectOwnerAndCurrentRolePrivileges.isLoading;
-  $: isSuccess =
-    $roles.isOk &&
-    $objectPrivileges.isOk &&
-    $objectOwnerAndCurrentRolePrivileges.isOk;
-  $: errors = [
-    $roles.error,
-    $objectPrivileges.error,
-    $objectOwnerAndCurrentRolePrivileges.error,
-  ].filter((entry): entry is string => isDefinedNonNullable(entry));
-
-  $: objectPrivilegesField = requiredField(
-    getObjectAccessPrivilegeMap(
-      accessLevelConfig,
-      $objectPrivileges.resolvedValue ?? new ImmutableMap(),
-    ),
-  );
-  $: form = makeForm({ objectPrivilegesField });
-  $: objectPrivilegesWithAccess = [...$objectPrivilegesField.values()].filter(
-    (entry) => isDefinedNonNullable(entry.accessLevel),
-  );
-
-  function setRoleAccessLevelAndPrivileges(
-    roleOid: Role['oid'],
-    accessLevelPrivileges: RoleAccessLevelAndPrivileges<AccessLevel, Privilege>,
-  ) {
-    objectPrivilegesField.update((dbPrivMap) =>
-      dbPrivMap.with(roleOid, accessLevelPrivileges),
-    );
-  }
-</script>
-
-<div class="privileges">
-  {#if isLoading}
-    <Spinner />
-  {:else if isSuccess && $roles.resolvedValue && $objectOwnerAndCurrentRolePrivileges.resolvedValue}
-    <div class="section owner-section">
-      <div class="title">{$_('owner')}</div>
-      <div class="content">
-        <RoleWithChildren
-          rolesMap={$roles.resolvedValue}
-          roleOid={$objectOwnerAndCurrentRolePrivileges.resolvedValue.owner_oid}
-        />
-      </div>
-    </div>
-    <div class="section granted-access-section">
-      <div class="title">{$_('granted_access')}</div>
-      <div class="content">
-        {#each objectPrivilegesWithAccess as roleAccessLevelAndPrivileges (roleAccessLevelAndPrivileges.roleOid)}
-          <div class="privilege-row">
-            <DirectPrivilegeRow
-              rolesMap={$roles.resolvedValue}
-              privileges={allPrivileges}
-              accessLevels={accessLevelConfig}
-              {roleAccessLevelAndPrivileges}
-              {setRoleAccessLevelAndPrivileges}
-            />
-          </div>
-        {/each}
-      </div>
-    </div>
-  {:else}
-    <Errors {errors} fullWidth />
-  {/if}
-</div>
-
-<div use:portalToWindowFooter class="footer">
-  <FormSubmit
-    {form}
-    canProceed={$form.hasChanges}
-    catchErrors
-    onCancel={() => {
-      controller.close();
-    }}
-    onProceed={savePermissions}
-    proceedButton={{ label: $_('save') }}
-    cancelButton={{ label: $_('cancel') }}
-  />
-</div>
-
-<style lang="scss">
-  .privileges {
-    .section {
-      margin-top: var(--size-base);
-
-      .title {
-        font-weight: 600;
-        border-bottom: 1px solid var(--slate-200);
-        padding: var(--size-extreme-small) 0;
-      }
-
-      &.owner-section {
-        .content {
-          padding: var(--size-base) 0 var(--size-ultra-small) 0;
-        }
-      }
-    }
-    .granted-access-section {
-      .privilege-row {
-        padding: var(--size-base) 0;
-
-        &:last-child {
-          padding-bottom: 0;
-        }
-
-        & + .privilege-row {
-          border-top: 1px solid var(--slate-100);
-        }
-      }
-    }
-  }
-</style>
diff --git a/mathesar_ui/src/systems/permissions/index.ts b/mathesar_ui/src/systems/permissions/index.ts
new file mode 100644
index 0000000000..e7339830b8
--- /dev/null
+++ b/mathesar_ui/src/systems/permissions/index.ts
@@ -0,0 +1,4 @@
+export { default as PermissionsModal } from './PermissionsModal.svelte';
+export { default as PermissionsOverview } from './overview/PermissionsOverview.svelte';
+export { default as TransferOwnership } from './transfer-ownership/TransferOwnership.svelte';
+export { type AccessControlConfig } from './overview/utils';
diff --git a/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte b/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
new file mode 100644
index 0000000000..5ebe6db24f
--- /dev/null
+++ b/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
@@ -0,0 +1,158 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import {
+    FormSubmit,
+    makeForm,
+    requiredField,
+  } from '@mathesar/components/form';
+  import WarningBox from '@mathesar/components/message-boxes/WarningBox.svelte';
+  import { iconAddNew } from '@mathesar/icons';
+  import type { Role } from '@mathesar/models/Role';
+  import {
+    ButtonMenuItem,
+    DropdownMenu,
+    type ImmutableMap,
+    type ModalController,
+    portalToWindowFooter,
+  } from '@mathesar-component-library';
+
+  import AccessControlRow from './AccessControlRow.svelte';
+  import OverviewSection from './OverviewSection.svelte';
+  import { RoleAccessLevelAndPrivileges } from './RoleAccessLevelAndPrivileges';
+  import {
+    type AccessControlConfig,
+    type RolePrivileges,
+    getObjectAccessPrivilegeMap,
+  } from './utils';
+
+  type AccessLevel = $$Generic;
+  type Privilege = $$Generic;
+
+  export let controller: ModalController;
+  export let config: AccessControlConfig<AccessLevel, Privilege>;
+  export let roles: ImmutableMap<Role['oid'], Role>;
+  export let privilegesForRoles: ImmutableMap<
+    number,
+    RolePrivileges<Privilege>
+  >;
+  // export let permissionsMetaData: PermissionsMetaData<Privilege>;
+
+  export let savePrivilegesForRoles: (
+    rp: RolePrivileges<Privilege>[],
+  ) => Promise<void>;
+
+  $: roleAccessField = requiredField(
+    getObjectAccessPrivilegeMap(config.access.levels, privilegesForRoles),
+  );
+  $: form = makeForm({ roleAccessField });
+
+  function addAccess(roleOid: Role['oid']) {
+    const newRalp = new RoleAccessLevelAndPrivileges({
+      roleOid,
+      accessLevelConfig: config.access.levels,
+      accessLevel: config.access.default,
+    });
+    roleAccessField.update((dbPrivMap) =>
+      dbPrivMap.with(
+        roleOid,
+        newRalp,
+        (existingRalp, _newRalp) => existingRalp ?? _newRalp,
+      ),
+    );
+  }
+
+  function setAccess(
+    roleOid: Role['oid'],
+    accessLevelPrivileges: RoleAccessLevelAndPrivileges<AccessLevel, Privilege>,
+  ) {
+    roleAccessField.update((dbPrivMap) =>
+      dbPrivMap.with(roleOid, accessLevelPrivileges),
+    );
+  }
+
+  function removeAccess(roleOid: Role['oid']) {
+    roleAccessField.update((dbPrivMap) => dbPrivMap.without(roleOid));
+  }
+
+  async function save() {
+    const rolesWithAccessRemoved = [...privilegesForRoles.keys()]
+      .filter((roleOid) => !$roleAccessField.has(roleOid))
+      .map((roleOid) => ({
+        role_oid: roleOid,
+        direct: [],
+      }));
+    const newAndUpdatedAccess = [...$roleAccessField.values()].map((entry) => ({
+      role_oid: entry.roleOid,
+      direct: entry.privileges.valuesArray(),
+    }));
+    await savePrivilegesForRoles([
+      ...rolesWithAccessRemoved,
+      ...newAndUpdatedAccess,
+    ]);
+  }
+</script>
+
+<OverviewSection title={$_('granted_access')}>
+  <DropdownMenu
+    slot="actions"
+    label={$_('add_roles')}
+    icon={iconAddNew}
+    triggerAppearance="plain-primary"
+  >
+    {#each [...roles.values()] as role (role.oid)}
+      <ButtonMenuItem on:click={() => addAccess(role.oid)}>
+        {role.name}
+      </ButtonMenuItem>
+    {/each}
+  </DropdownMenu>
+  {#each [...$roleAccessField.values()] as roleAccess (roleAccess.roleOid)}
+    <div class="access-control-row">
+      <AccessControlRow
+        rolesMap={roles}
+        {config}
+        {roleAccess}
+        {setAccess}
+        {removeAccess}
+      />
+    </div>
+  {:else}
+    <div class="no-access">
+      <WarningBox>
+        {$_('access_not_granted_for_any_role')}
+      </WarningBox>
+    </div>
+  {/each}
+</OverviewSection>
+
+<div use:portalToWindowFooter class="footer">
+  <FormSubmit
+    {form}
+    canProceed={$form.hasChanges}
+    catchErrors
+    onCancel={() => {
+      controller.close();
+    }}
+    onProceed={save}
+    proceedButton={{ label: $_('save') }}
+    cancelButton={{ label: $_('cancel') }}
+  />
+</div>
+
+<style lang="scss">
+  .access-control-row {
+    padding: var(--size-base) 0;
+
+    &:first-child {
+      padding-top: 0;
+    }
+
+    &:last-child {
+      padding-bottom: 0;
+    }
+
+    & + .access-control-row {
+      border-top: 1px solid var(--slate-100);
+    }
+  }
+</style>
diff --git a/mathesar_ui/src/systems/permissions/DirectPrivilegeRow.svelte b/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
similarity index 52%
rename from mathesar_ui/src/systems/permissions/DirectPrivilegeRow.svelte
rename to mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
index 7bf623fec9..f5b5bda073 100644
--- a/mathesar_ui/src/systems/permissions/DirectPrivilegeRow.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
@@ -12,92 +12,73 @@
     Select,
   } from '@mathesar-component-library';
 
-  import RoleWithChildren from './RoleWithChildren.svelte';
   import {
-    type AccessLevelConfig,
     type RoleAccessLevelAndPrivileges,
     customAccess,
-  } from './utils';
+  } from './RoleAccessLevelAndPrivileges';
+  import RoleWithChildren from './RoleWithChildren.svelte';
+  import { type AccessControlConfig } from './utils';
 
   type AccessLevel = $$Generic;
   type Privilege = $$Generic;
 
   export let rolesMap: ImmutableMap<Role['oid'], Role>;
-  export let privileges: Privilege[];
-  export let accessLevels: AccessLevelConfig<AccessLevel, Privilege>[];
+  export let config: AccessControlConfig<AccessLevel, Privilege>;
+  export let roleAccess: RoleAccessLevelAndPrivileges<AccessLevel, Privilege>;
 
-  export let roleAccessLevelAndPrivileges: RoleAccessLevelAndPrivileges<
-    AccessLevel,
-    Privilege
-  >;
-  export let setRoleAccessLevelAndPrivileges: (
+  export let setAccess: (
     roleOid: Role['oid'],
-    accessLevelPrivileges: RoleAccessLevelAndPrivileges<AccessLevel, Privilege>,
+    access: RoleAccessLevelAndPrivileges<AccessLevel, Privilege>,
   ) => void;
+  export let removeAccess: (roleOid: Role['oid']) => void;
 
   let isRolePermissionsOpen = false;
 
-  function removeAccess() {
-    setRoleAccessLevelAndPrivileges(
-      roleAccessLevelAndPrivileges.roleOid,
-      roleAccessLevelAndPrivileges.withAccessRemoved(),
-    );
-  }
-
   function setCustomPrivileges(pr: Privilege[]) {
-    setRoleAccessLevelAndPrivileges(
-      roleAccessLevelAndPrivileges.roleOid,
-      roleAccessLevelAndPrivileges.withCustomAccess(pr),
-    );
+    setAccess(roleAccess.roleOid, roleAccess.withCustomAccess(pr));
   }
 
   function changeAccess(option?: AccessLevel | typeof customAccess) {
-    switch (option) {
-      case customAccess:
-        setRoleAccessLevelAndPrivileges(
-          roleAccessLevelAndPrivileges.roleOid,
-          roleAccessLevelAndPrivileges.withCustomAccess(),
-        );
+    if (option) {
+      if (option === customAccess) {
+        setAccess(roleAccess.roleOid, roleAccess.withCustomAccess());
         isRolePermissionsOpen = true;
-        break;
-      case undefined:
-        removeAccess();
-        break;
-      default:
-        setRoleAccessLevelAndPrivileges(
-          roleAccessLevelAndPrivileges.roleOid,
-          roleAccessLevelAndPrivileges.withAccess(option),
-        );
+      } else {
+        setAccess(roleAccess.roleOid, roleAccess.withAccess(option));
+      }
     }
   }
 </script>
 
-<div class="access-selection-section">
-  <RoleWithChildren {rolesMap} roleOid={roleAccessLevelAndPrivileges.roleOid} />
+<div class="access-selection">
+  <RoleWithChildren {rolesMap} roleOid={roleAccess.roleOid} />
   <div>
     <Select
-      options={[...accessLevels.map((entry) => entry.id), customAccess]}
-      value={roleAccessLevelAndPrivileges.accessLevel}
+      options={[...config.access.levels.map((entry) => entry.id), customAccess]}
+      value={roleAccess.accessLevel}
       on:change={(e) => changeAccess(e.detail)}
     />
   </div>
   <div>
-    <Button appearance="secondary" on:click={removeAccess}>
+    <Button
+      appearance="secondary"
+      on:click={() => removeAccess(roleAccess.roleOid)}
+    >
       <Icon {...iconDeleteMinor} />
     </Button>
   </div>
 </div>
-{#if roleAccessLevelAndPrivileges.accessLevel === customAccess}
-  <div class="role-permissions-section">
+{#if roleAccess.accessLevel === customAccess}
+  <div class="role-permissions">
     <Collapsible bind:isOpen={isRolePermissionsOpen} triggerAppearance="plain">
       <div slot="header">
         {$_('role_permissions')}
       </div>
       <div class="content" slot="content">
         <CheckboxGroup
-          values={roleAccessLevelAndPrivileges.privileges.valuesArray()}
+          values={roleAccess.privileges.valuesArray()}
           on:artificialChange={(e) => setCustomPrivileges(e.detail)}
-          options={privileges}
+          options={config.allPrivileges}
           getCheckboxLabel={(o) => String(o)}
           getCheckboxHelp={(o) => String(o)}
         />
@@ -107,12 +88,12 @@
 {/if}
 
 <style lang="scss">
-  .access-selection-section {
+  .access-selection {
     display: grid;
     grid-template-columns: 2fr 1fr auto;
     gap: var(--size-ultra-small);
   }
-  .role-permissions-section {
+  .role-permissions {
     margin-top: var(--size-xx-small);
     --Collapsible_trigger-padding: var(--size-extreme-small) 0;
     --Collapsible_header-font-weight: 400;
diff --git a/mathesar_ui/src/systems/permissions/overview/OverviewSection.svelte b/mathesar_ui/src/systems/permissions/overview/OverviewSection.svelte
new file mode 100644
index 0000000000..5799e90d75
--- /dev/null
+++ b/mathesar_ui/src/systems/permissions/overview/OverviewSection.svelte
@@ -0,0 +1,46 @@
+<script lang="ts">
+  export let title: string;
+</script>
+
+<div class="section">
+  <div class="header">
+    <span class="title">
+      {title}
+    </span>
+    {#if $$slots.actions}
+      <div class="actions">
+        <slot name="actions" />
+      </div>
+    {/if}
+  </div>
+  <div class="content">
+    <slot />
+  </div>
+</div>
+
+<style lang="scss">
+  .section {
+    .header {
+      border-bottom: 1px solid var(--slate-200);
+      padding: var(--size-extreme-small) 0;
+      display: flex;
+      align-items: center;
+
+      .title {
+        font-weight: 600;
+      }
+      .actions {
+        --input-padding: var(--size-extreme-small);
+        margin-left: auto;
+      }
+    }
+
+    .content {
+      margin-top: var(--size-base);
+    }
+
+    & + :global(.section) {
+      margin-top: var(--size-x-large);
+    }
+  }
+</style>
diff --git a/mathesar_ui/src/systems/permissions/overview/Owner.svelte b/mathesar_ui/src/systems/permissions/overview/Owner.svelte
new file mode 100644
index 0000000000..a8f323c382
--- /dev/null
+++ b/mathesar_ui/src/systems/permissions/overview/Owner.svelte
@@ -0,0 +1,19 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import type { Role } from '@mathesar/models/Role';
+  import { type ImmutableMap } from '@mathesar-component-library';
+
+  import OverviewSection from './OverviewSection.svelte';
+  import RoleWithChildren from './RoleWithChildren.svelte';
+  import type { PermissionsMetaData } from './utils';
+
+  type Privilege = $$Generic;
+
+  export let roles: ImmutableMap<Role['oid'], Role>;
+  export let permissionsMetaData: PermissionsMetaData<Privilege>;
+</script>
+
+<OverviewSection title={$_('owner')}>
+  <RoleWithChildren rolesMap={roles} roleOid={permissionsMetaData.owner_oid} />
+</OverviewSection>
diff --git a/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte b/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte
new file mode 100644
index 0000000000..a4b3f84499
--- /dev/null
+++ b/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte
@@ -0,0 +1,66 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import Errors from '@mathesar/components/Errors.svelte';
+  import {
+    ImmutableMap,
+    type ModalController,
+    Spinner,
+    isDefinedNonNullable,
+  } from '@mathesar-component-library';
+
+  import AccessControl from './AccessControl.svelte';
+  import Owner from './Owner.svelte';
+  import {
+    type AccessControlConfig,
+    type PermissionsAsyncStores,
+    type RolePrivileges,
+  } from './utils';
+
+  type AccessLevel = $$Generic;
+  type Privilege = $$Generic;
+
+  export let controller: ModalController;
+  export let accessControlConfig: AccessControlConfig<AccessLevel, Privilege>;
+  export let getAsyncStores: () => PermissionsAsyncStores<Privilege>;
+  export let savePrivilegesForRoles: (
+    privileges: RolePrivileges<Privilege>[],
+  ) => Promise<void>;
+
+  $: ({ roles, privilegesForRoles, permissionsMetaData } = getAsyncStores());
+
+  $: isLoading =
+    $roles.isLoading ||
+    $privilegesForRoles.isLoading ||
+    $permissionsMetaData.isLoading;
+  $: isSuccess =
+    $roles.isOk && $privilegesForRoles.isOk && $permissionsMetaData.isOk;
+  $: errors = [
+    $roles.error,
+    $privilegesForRoles.error,
+    $permissionsMetaData.error,
+  ].filter((entry): entry is string => isDefinedNonNullable(entry));
+
+  $: rolesValue = new ImmutableMap($roles.resolvedValue);
+  $: permissionsMetaDataValue = $permissionsMetaData.resolvedValue;
+  $: privilegesForRolesValue = new ImmutableMap(
+    $privilegesForRoles.resolvedValue,
+  );
+</script>
+
+<div class="permissions-overview">
+  {#if isLoading}
+    <Spinner />
+  {:else if isSuccess && permissionsMetaDataValue}
+    <Owner roles={rolesValue} permissionsMetaData={permissionsMetaDataValue} />
+    <AccessControl
+      {controller}
+      config={accessControlConfig}
+      roles={rolesValue}
+      privilegesForRoles={privilegesForRolesValue}
+      {savePrivilegesForRoles}
+    />
+  {:else}
+    <Errors {errors} fullWidth />
+  {/if}
+</div>
diff --git a/mathesar_ui/src/pages/database/permissions/utils.ts b/mathesar_ui/src/systems/permissions/overview/RoleAccessLevelAndPrivileges.ts
similarity index 50%
rename from mathesar_ui/src/pages/database/permissions/utils.ts
rename to mathesar_ui/src/systems/permissions/overview/RoleAccessLevelAndPrivileges.ts
index 0f9c0c589a..1b0e292471 100644
--- a/mathesar_ui/src/pages/database/permissions/utils.ts
+++ b/mathesar_ui/src/systems/permissions/overview/RoleAccessLevelAndPrivileges.ts
@@ -1,29 +1,14 @@
-import type {
-  DatabasePrivilege,
-  RawDatabasePrivilegesForRole,
-} from '@mathesar/api/rpc/databases';
 import type { Role } from '@mathesar/models/Role';
-import { type ImmutableMap, ImmutableSet } from '@mathesar-component-library';
+import { ImmutableSet } from '@mathesar-component-library';
 
-type AccessLevelConfig<A, P> = { id: A; privileges: Set<P> };
+export type AccessLevelConfig<A, P> = { id: A; privileges: Set<P> };
 
 export const customAccess = 'custom' as const;
 
-function getAccessLevelBasedOnPrivileges<A, P>(
-  accessLevelConfigs: AccessLevelConfig<A, P>[],
-  privileges: ImmutableSet<P>,
-): A | typeof customAccess {
-  const accessLevelObject = accessLevelConfigs.find((entry) =>
-    privileges.equals(entry.privileges),
-  );
-  return accessLevelObject ? accessLevelObject.id : customAccess;
-}
-
 type Props<A, P> = {
   roleOid: Role['oid'];
-  accessLevelConfigs: AccessLevelConfig<A, P>[];
-  isAccessRemoved?: boolean;
-  savedPrivileges: P[];
+  accessLevelConfig: readonly AccessLevelConfig<A, P>[];
+  savedPrivileges?: P[];
 } & (
   | {
       privileges: P[];
@@ -35,39 +20,49 @@ type Props<A, P> = {
       privileges: P[];
       accessLevel: typeof customAccess;
     }
-  | {
-      accessLevel: undefined;
-      privileges: [];
-    }
 );
 
+function getAccessLevelBasedOnPrivileges<A, P>(
+  accessLevelConfig: readonly AccessLevelConfig<A, P>[],
+  privileges: ImmutableSet<P>,
+): A | typeof customAccess {
+  const accessLevelObject = accessLevelConfig.find((entry) =>
+    privileges.equals(entry.privileges),
+  );
+  return accessLevelObject ? accessLevelObject.id : customAccess;
+}
+
 export class RoleAccessLevelAndPrivileges<A, P> {
   readonly roleOid;
 
-  readonly accessLevelConfigs;
+  readonly accessLevelConfig;
 
-  readonly accessLevel: A | typeof customAccess | undefined;
+  readonly accessLevel: A | typeof customAccess;
 
   readonly privileges: ImmutableSet<P>;
 
-  readonly savedPrivileges: P[];
+  readonly savedPrivileges;
 
   constructor(props: Props<A, P>) {
-    this.accessLevelConfigs = props.accessLevelConfigs;
+    this.accessLevelConfig = props.accessLevelConfig;
     this.roleOid = props.roleOid;
     this.savedPrivileges = props.savedPrivileges;
-    if ('privileges' in props && 'accessLevel' in props) {
-      this.accessLevel = props.accessLevel;
+    if (
+      'privileges' in props &&
+      'accessLevel' in props &&
+      props.accessLevel === customAccess
+    ) {
+      this.accessLevel = customAccess;
       this.privileges = new ImmutableSet(props.privileges);
     } else if ('privileges' in props) {
       this.privileges = new ImmutableSet(props.privileges);
       this.accessLevel = getAccessLevelBasedOnPrivileges(
-        this.accessLevelConfigs,
+        this.accessLevelConfig,
         this.privileges,
       );
     } else {
       this.accessLevel = props.accessLevel;
-      const aL = this.accessLevelConfigs.find(
+      const aL = this.accessLevelConfig.find(
         (entry) => entry.id === this.accessLevel,
       );
       if (!aL) {
@@ -82,7 +77,7 @@ export class RoleAccessLevelAndPrivileges<A, P> {
   private getCommonProps() {
     return {
       roleOid: this.roleOid,
-      accessLevelConfigs: this.accessLevelConfigs,
+      accessLevelConfig: this.accessLevelConfig,
       savedPrivileges: this.savedPrivileges,
     };
   }
@@ -95,41 +90,12 @@ export class RoleAccessLevelAndPrivileges<A, P> {
   }
 
   withCustomAccess(privileges?: P[]) {
-    const customPrivileges = privileges ?? this.savedPrivileges;
+    const customPrivileges =
+      privileges ?? this.savedPrivileges ?? this.privileges.valuesArray();
     return new RoleAccessLevelAndPrivileges<A, P>({
       ...this.getCommonProps(),
       accessLevel: customAccess,
       privileges: customPrivileges,
     });
   }
-
-  withAccessRemoved() {
-    return new RoleAccessLevelAndPrivileges<A, P>({
-      ...this.getCommonProps(),
-      accessLevel: undefined,
-      privileges: [],
-    });
-  }
-}
-
-export const dbAccessLevelConfigs: {
-  id: string;
-  privileges: Set<DatabasePrivilege>;
-}[] = [
-  { id: 'connect', privileges: new Set(['CONNECT']) },
-  { id: 'connect_and_create', privileges: new Set(['CONNECT', 'CREATE']) },
-];
-
-export function getDbAccessPrivilegeMap(
-  dbPrivileges: ImmutableMap<Role['oid'], RawDatabasePrivilegesForRole>,
-) {
-  return dbPrivileges.mapValues(
-    (entry) =>
-      new RoleAccessLevelAndPrivileges({
-        roleOid: entry.role_oid,
-        accessLevelConfigs: dbAccessLevelConfigs,
-        privileges: entry.direct,
-        savedPrivileges: entry.direct,
-      }),
-  );
 }
diff --git a/mathesar_ui/src/systems/permissions/RoleWithChildren.svelte b/mathesar_ui/src/systems/permissions/overview/RoleWithChildren.svelte
similarity index 96%
rename from mathesar_ui/src/systems/permissions/RoleWithChildren.svelte
rename to mathesar_ui/src/systems/permissions/overview/RoleWithChildren.svelte
index d5d49e0eae..3c81be4f2e 100644
--- a/mathesar_ui/src/systems/permissions/RoleWithChildren.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/RoleWithChildren.svelte
@@ -45,6 +45,9 @@
       font-weight: 500;
       display: inline-block;
     }
+    .member-count {
+      font-size: var(--text-size-small);
+    }
     .members {
       .member {
         margin: var(--size-xx-small) var(--size-large);
diff --git a/mathesar_ui/src/systems/permissions/overview/utils.ts b/mathesar_ui/src/systems/permissions/overview/utils.ts
new file mode 100644
index 0000000000..3def130d7a
--- /dev/null
+++ b/mathesar_ui/src/systems/permissions/overview/utils.ts
@@ -0,0 +1,55 @@
+import type { Readable } from 'svelte/store';
+
+import type { Role } from '@mathesar/models/Role';
+import type { AsyncStoreValue } from '@mathesar/stores/AsyncStore';
+import type { ImmutableMap } from '@mathesar-component-library';
+
+import {
+  type AccessLevelConfig,
+  RoleAccessLevelAndPrivileges,
+} from './RoleAccessLevelAndPrivileges';
+
+export interface RolePrivileges<Privilege> {
+  role_oid: Role['oid'];
+  direct: Privilege[];
+}
+
+export interface AccessControlConfig<AccessLevel, Privilege> {
+  allPrivileges: readonly Privilege[];
+  access: {
+    levels: readonly AccessLevelConfig<AccessLevel, Privilege>[];
+    default: AccessLevel;
+  };
+}
+
+export interface PermissionsMetaData<Privilege> {
+  oid: number;
+  owner_oid: Role['oid'];
+  current_role_priv: Privilege[];
+  current_role_owns: boolean;
+}
+
+export interface PermissionsAsyncStores<Privilege, E = string> {
+  roles: Readable<AsyncStoreValue<ImmutableMap<Role['oid'], Role>, E>>;
+  privilegesForRoles: Readable<
+    AsyncStoreValue<ImmutableMap<number, RolePrivileges<Privilege>>, E>
+  >;
+  permissionsMetaData: Readable<
+    AsyncStoreValue<PermissionsMetaData<Privilege>, E>
+  >;
+}
+
+export function getObjectAccessPrivilegeMap<A, P>(
+  accessLevelConfig: readonly AccessLevelConfig<A, P>[],
+  privilegesForRole: ImmutableMap<Role['oid'], RolePrivileges<P>>,
+) {
+  return privilegesForRole.mapValues(
+    (entry) =>
+      new RoleAccessLevelAndPrivileges({
+        roleOid: entry.role_oid,
+        accessLevelConfig,
+        privileges: [...entry.direct],
+        savedPrivileges: [...entry.direct],
+      }),
+  );
+}
diff --git a/mathesar_ui/src/systems/permissions/TransferOwnershipSection.svelte b/mathesar_ui/src/systems/permissions/transfer-ownership/TransferOwnership.svelte
similarity index 100%
rename from mathesar_ui/src/systems/permissions/TransferOwnershipSection.svelte
rename to mathesar_ui/src/systems/permissions/transfer-ownership/TransferOwnership.svelte
diff --git a/mathesar_ui/src/systems/permissions/utils.ts b/mathesar_ui/src/systems/permissions/utils.ts
deleted file mode 100644
index 6be070a139..0000000000
--- a/mathesar_ui/src/systems/permissions/utils.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import type { Readable } from 'svelte/store';
-
-import type { Role } from '@mathesar/models/Role';
-import type { AsyncStoreValue } from '@mathesar/stores/AsyncStore';
-import { type ImmutableMap, ImmutableSet } from '@mathesar-component-library';
-
-export type AccessLevelConfig<A, P> = { id: A; privileges: Set<P> };
-
-export const customAccess = 'custom' as const;
-
-function getAccessLevelBasedOnPrivileges<A, P>(
-  accessLevelConfigs: AccessLevelConfig<A, P>[],
-  privileges: ImmutableSet<P>,
-): A | typeof customAccess {
-  const accessLevelObject = accessLevelConfigs.find((entry) =>
-    privileges.equals(entry.privileges),
-  );
-  return accessLevelObject ? accessLevelObject.id : customAccess;
-}
-
-type Props<A, P> = {
-  roleOid: Role['oid'];
-  accessLevelConfigs: AccessLevelConfig<A, P>[];
-  isAccessRemoved?: boolean;
-  savedPrivileges: P[];
-} & (
-  | {
-      privileges: P[];
-    }
-  | {
-      accessLevel: A;
-    }
-  | {
-      privileges: P[];
-      accessLevel: typeof customAccess;
-    }
-  | {
-      accessLevel: undefined;
-      privileges: [];
-    }
-);
-
-export class RoleAccessLevelAndPrivileges<A, P> {
-  readonly roleOid;
-
-  readonly accessLevelConfigs;
-
-  readonly accessLevel: A | typeof customAccess | undefined;
-
-  readonly privileges: ImmutableSet<P>;
-
-  readonly savedPrivileges: P[];
-
-  constructor(props: Props<A, P>) {
-    this.accessLevelConfigs = props.accessLevelConfigs;
-    this.roleOid = props.roleOid;
-    this.savedPrivileges = props.savedPrivileges;
-    if ('privileges' in props && 'accessLevel' in props) {
-      this.accessLevel = props.accessLevel;
-      this.privileges = new ImmutableSet(props.privileges);
-    } else if ('privileges' in props) {
-      this.privileges = new ImmutableSet(props.privileges);
-      this.accessLevel = getAccessLevelBasedOnPrivileges(
-        this.accessLevelConfigs,
-        this.privileges,
-      );
-    } else {
-      this.accessLevel = props.accessLevel;
-      const aL = this.accessLevelConfigs.find(
-        (entry) => entry.id === this.accessLevel,
-      );
-      if (!aL) {
-        throw new Error(
-          'Access level not found in configuration. This should never occur.',
-        );
-      }
-      this.privileges = new ImmutableSet(aL.privileges);
-    }
-  }
-
-  private getCommonProps() {
-    return {
-      roleOid: this.roleOid,
-      accessLevelConfigs: this.accessLevelConfigs,
-      savedPrivileges: this.savedPrivileges,
-    };
-  }
-
-  withAccess(accessLevel: A) {
-    return new RoleAccessLevelAndPrivileges<A, P>({
-      ...this.getCommonProps(),
-      accessLevel,
-    });
-  }
-
-  withCustomAccess(privileges?: P[]) {
-    const customPrivileges = privileges ?? this.savedPrivileges;
-    return new RoleAccessLevelAndPrivileges<A, P>({
-      ...this.getCommonProps(),
-      accessLevel: customAccess,
-      privileges: customPrivileges,
-    });
-  }
-
-  withAccessRemoved() {
-    return new RoleAccessLevelAndPrivileges<A, P>({
-      ...this.getCommonProps(),
-      accessLevel: undefined,
-      privileges: [],
-    });
-  }
-}
-
-export interface RoleWithPrivileges<Privilege> {
-  role_oid: Role['oid'];
-  direct: Privilege[];
-}
-
-export function getObjectAccessPrivilegeMap<A, P>(
-  accessLevelConfigs: AccessLevelConfig<A, P>[],
-  dbPrivileges: ImmutableMap<Role['oid'], RoleWithPrivileges<P>>,
-) {
-  return dbPrivileges.mapValues(
-    (entry) =>
-      new RoleAccessLevelAndPrivileges({
-        roleOid: entry.role_oid,
-        accessLevelConfigs,
-        privileges: entry.direct,
-        savedPrivileges: entry.direct,
-      }),
-  );
-}
-
-export interface AsyncStoresValues<Privilege> {
-  roles: Readable<AsyncStoreValue<ImmutableMap<Role['oid'], Role>, string>>;
-  objectPrivileges: Readable<
-    AsyncStoreValue<ImmutableMap<number, RoleWithPrivileges<Privilege>>, string>
-  >;
-  objectOwnerAndCurrentRolePrivileges: Readable<
-    AsyncStoreValue<
-      {
-        oid: number;
-        owner_oid: Role['oid'];
-        current_role_priv: Privilege[];
-        current_role_owns: boolean;
-      },
-      string
-    >
-  >;
-}

From 8ba2635c05f2ab487978e50f49f954c1aeab1621 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 11 Sep 2024 16:27:59 +0530
Subject: [PATCH 0857/1141] Fix lint and format errors

---
 mathesar_ui/src/stores/AsyncRpcApiStore.ts                | 7 ++-----
 .../systems/permissions/overview/AccessControlRow.svelte  | 2 +-
 mathesar_ui/src/systems/permissions/overview/Owner.svelte | 2 +-
 .../permissions/overview/PermissionsOverview.svelte       | 8 ++++----
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/mathesar_ui/src/stores/AsyncRpcApiStore.ts b/mathesar_ui/src/stores/AsyncRpcApiStore.ts
index 1036db2c1b..b6d482c0c3 100644
--- a/mathesar_ui/src/stores/AsyncRpcApiStore.ts
+++ b/mathesar_ui/src/stores/AsyncRpcApiStore.ts
@@ -72,15 +72,12 @@ export default class AsyncRpcApiStore<Props, T, U = T> extends AsyncStore<
   static async runBatched(
     batchRunners: BatchRunner[],
     options?: Partial<{
-      when?:
-        | 'always'
-        | 'not-initialized'
-        | ('always' | 'not-initialized')[];
+      when?: 'always' | 'not-initialized' | ('always' | 'not-initialized')[];
       onlyRunIfNotInitialized: boolean;
     }>,
   ) {
     const toRun = (() => {
-      if (Array.isArray(options?.when)) {
+      if (options?.when && Array.isArray(options.when)) {
         if (options.when.length !== batchRunners.length) {
           throw new Error(
             'Number of run options do not match number of batchRunners',
diff --git a/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte b/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
index f5b5bda073..e327fc6e42 100644
--- a/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
@@ -17,7 +17,7 @@
     customAccess,
   } from './RoleAccessLevelAndPrivileges';
   import RoleWithChildren from './RoleWithChildren.svelte';
-  import { type AccessControlConfig } from './utils';
+  import type { AccessControlConfig } from './utils';
 
   type AccessLevel = $$Generic;
   type Privilege = $$Generic;
diff --git a/mathesar_ui/src/systems/permissions/overview/Owner.svelte b/mathesar_ui/src/systems/permissions/overview/Owner.svelte
index a8f323c382..c81ba89978 100644
--- a/mathesar_ui/src/systems/permissions/overview/Owner.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/Owner.svelte
@@ -2,7 +2,7 @@
   import { _ } from 'svelte-i18n';
 
   import type { Role } from '@mathesar/models/Role';
-  import { type ImmutableMap } from '@mathesar-component-library';
+  import type { ImmutableMap } from '@mathesar-component-library';
 
   import OverviewSection from './OverviewSection.svelte';
   import RoleWithChildren from './RoleWithChildren.svelte';
diff --git a/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte b/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte
index a4b3f84499..927b32c4aa 100644
--- a/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte
@@ -11,10 +11,10 @@
 
   import AccessControl from './AccessControl.svelte';
   import Owner from './Owner.svelte';
-  import {
-    type AccessControlConfig,
-    type PermissionsAsyncStores,
-    type RolePrivileges,
+  import type {
+    AccessControlConfig,
+    PermissionsAsyncStores,
+    RolePrivileges,
   } from './utils';
 
   type AccessLevel = $$Generic;

From 8d529fde614e2d3d5efbc88952143389ba00542e Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 11 Sep 2024 17:03:24 +0530
Subject: [PATCH 0858/1141] Send request to save privilege modifications

---
 mathesar_ui/src/i18n/languages/en/dict.json       |  1 +
 .../permissions/DatabasePermissionsModal.svelte   | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 3271f7455c..a6926798f5 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -1,4 +1,5 @@
 {
+  "access_for_roles_saved_successfully": "Access for roles have been saved successfully.",
   "access_level_cannot_remove_warning": "This access level cannot be removed.",
   "access_level_inheritance_help": "This access level is inherited from the {aclObject} permissions.",
   "access_level_inheritance_is_overridden_help": "This access level is inherited from the {aclObject} permissions and is overridden by the {comparedAclObject} permissions.",
diff --git a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
index 876af31264..d9cdef6bf3 100644
--- a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
+++ b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
+  import { api } from '@mathesar/api/rpc';
   import {
     type DatabasePrivilege,
     type RawDatabasePrivilegesForRole,
@@ -8,13 +9,17 @@
   } from '@mathesar/api/rpc/databases';
   import { DatabaseRouteContext } from '@mathesar/contexts/DatabaseRouteContext';
   import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
+  import { toast } from '@mathesar/stores/toast';
   import {
     type AccessControlConfig,
     PermissionsModal,
     PermissionsOverview,
     TransferOwnership,
   } from '@mathesar/systems/permissions';
-  import type { ModalController } from '@mathesar-component-library';
+  import {
+    ImmutableMap,
+    type ModalController,
+  } from '@mathesar-component-library';
 
   export let controller: ModalController;
 
@@ -55,7 +60,13 @@
   async function savePrivilegesForRoles(
     privileges: RawDatabasePrivilegesForRole[],
   ) {
-    //
+    const response = await api.databases.privileges
+      .replace_for_roles({ database_id: database.id, privileges })
+      .run();
+    databasePrivileges.updateResolvedValue(
+      () => new ImmutableMap(response.map((pr) => [pr.role_oid, pr])),
+    );
+    toast.success($_('access_for_roles_saved_successfully'));
   }
 </script>
 

From 461832725b63382e01c787e372198e8a2ccaf60e Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 11 Sep 2024 17:14:27 +0530
Subject: [PATCH 0859/1141] Do not display owning role in 'Granted access'
 section

---
 .../permissions/overview/AccessControl.svelte | 22 ++++++++++++-------
 .../overview/PermissionsOverview.svelte       |  1 +
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte b/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
index 5ebe6db24f..5f7be6de5b 100644
--- a/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
@@ -22,6 +22,7 @@
   import { RoleAccessLevelAndPrivileges } from './RoleAccessLevelAndPrivileges';
   import {
     type AccessControlConfig,
+    type PermissionsMetaData,
     type RolePrivileges,
     getObjectAccessPrivilegeMap,
   } from './utils';
@@ -36,14 +37,17 @@
     number,
     RolePrivileges<Privilege>
   >;
-  // export let permissionsMetaData: PermissionsMetaData<Privilege>;
+  export let permissionsMetaData: PermissionsMetaData<Privilege>;
 
   export let savePrivilegesForRoles: (
     rp: RolePrivileges<Privilege>[],
   ) => Promise<void>;
 
+  $: modifiablePrivileges = privilegesForRoles.filterValues(
+    (pr) => pr.role_oid !== permissionsMetaData.owner_oid,
+  );
   $: roleAccessField = requiredField(
-    getObjectAccessPrivilegeMap(config.access.levels, privilegesForRoles),
+    getObjectAccessPrivilegeMap(config.access.levels, modifiablePrivileges),
   );
   $: form = makeForm({ roleAccessField });
 
@@ -76,19 +80,21 @@
   }
 
   async function save() {
-    const rolesWithAccessRemoved = [...privilegesForRoles.keys()]
+    const rolesWithAccessRemoved = [...modifiablePrivileges.keys()]
       .filter((roleOid) => !$roleAccessField.has(roleOid))
       .map((roleOid) => ({
         role_oid: roleOid,
         direct: [],
       }));
-    const newAndUpdatedAccess = [...$roleAccessField.values()].map((entry) => ({
-      role_oid: entry.roleOid,
-      direct: entry.privileges.valuesArray(),
-    }));
+    const rolesWithNewOrUpdatedAccess = [...$roleAccessField.values()].map(
+      (entry) => ({
+        role_oid: entry.roleOid,
+        direct: entry.privileges.valuesArray(),
+      }),
+    );
     await savePrivilegesForRoles([
       ...rolesWithAccessRemoved,
-      ...newAndUpdatedAccess,
+      ...rolesWithNewOrUpdatedAccess,
     ]);
   }
 </script>
diff --git a/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte b/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte
index 927b32c4aa..e2b27f1397 100644
--- a/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte
@@ -58,6 +58,7 @@
       config={accessControlConfig}
       roles={rolesValue}
       privilegesForRoles={privilegesForRolesValue}
+      permissionsMetaData={permissionsMetaDataValue}
       {savePrivilegesForRoles}
     />
   {:else}

From b87f019a1c8b0f2be8e18d0acaf3f2177e5b7eb7 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 11 Sep 2024 17:42:55 +0530
Subject: [PATCH 0860/1141] implement get_with_metadata endpoint

---
 mathesar/rpc/tables/base.py | 28 +++++++++++++++++++++++++---
 mathesar/utils/tables.py    | 20 +++++++++++++++++---
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/mathesar/rpc/tables/base.py b/mathesar/rpc/tables/base.py
index ffc05fc4c5..08869a1b5c 100644
--- a/mathesar/rpc/tables/base.py
+++ b/mathesar/rpc/tables/base.py
@@ -16,7 +16,7 @@
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.tables.metadata import TableMetaDataBlob
 from mathesar.rpc.utils import connect
-from mathesar.utils.tables import get_tables_meta_data
+from mathesar.utils.tables import list_tables_meta_data, get_table_meta_data
 
 
 class TableInfo(TypedDict):
@@ -367,15 +367,37 @@ def list_with_metadata(*, schema_oid: int, database_id: int, **kwargs) -> list:
         database_id: The Django id of the database containing the table.
 
     Returns:
-        A list of table details.
+        A list of table details along with metadata.
     """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
         tables = get_table_info(schema_oid, conn)
 
-    metadata_records = get_tables_meta_data(database_id)
+    metadata_records = list_tables_meta_data(database_id)
     metadata_map = {
         r.table_oid: TableMetaDataBlob.from_model(r) for r in metadata_records
     }
 
     return [table | {"metadata": metadata_map.get(table["oid"])} for table in tables]
+
+
+@rpc_method(name="tables.get_with_metadata")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def get_with_metadata(*, table_oid: int, database_id: int, **kwargs) -> dict:
+    """
+    Get information about a table in a schema, along with the associated table metadata.
+
+    Args:
+        table_oid: The OID of the table in the user's database.
+        database_id: The Django id of the database containing the table.
+
+    Returns:
+        A dict describing table details along with its metadata.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        table = get_table(table_oid, conn)
+
+    raw_metadata = get_table_meta_data(table_oid, database_id)
+    return TableInfo(table) | {"metadata": TableMetaDataBlob.from_model(raw_metadata)}
diff --git a/mathesar/utils/tables.py b/mathesar/utils/tables.py
index 35d086c263..73acc90b26 100644
--- a/mathesar/utils/tables.py
+++ b/mathesar/utils/tables.py
@@ -86,16 +86,30 @@ def create_empty_table(name, schema, comment=None):
     return table
 
 
-def get_tables_meta_data(database_id):
+def list_tables_meta_data(database_id):
     return TableMetaData.objects.filter(database__id=database_id)
 
 
+def get_table_meta_data(table_oid, database_id):
+    try:
+        return TableMetaData.objects.get(
+            table_oid=table_oid,
+            database__id=database_id
+        )
+    except TableMetaData.DoesNotExist:
+        return set_table_meta_data(
+            table_oid=table_oid,
+            metadata={},
+            database_id=database_id
+        )
+
+
 def set_table_meta_data(table_oid, metadata, database_id):
-    TableMetaData.objects.update_or_create(
+    return TableMetaData.objects.update_or_create(
         database=Database.objects.get(id=database_id),
         data_file=DataFile.objects.get(
             id=metadata.pop('data_file_id')
         ) if metadata.get('data_file_id') is not None else None,
         table_oid=table_oid,
         defaults=metadata,
-    )
+    )[0]

From 477607ff278755bc51d97bbd251a513081f03dd6 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 11 Sep 2024 17:44:04 +0530
Subject: [PATCH 0861/1141] add docs and change
 get_tables_meta_data->list_tables_meta_data

---
 docs/docs/api/rpc.md                         | 2 ++
 mathesar/rpc/tables/metadata.py              | 4 ++--
 mathesar/tests/rpc/tables/test_t_metadata.py | 4 ++--
 mathesar/tests/rpc/test_endpoints.py         | 5 +++++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index deb02e0b20..3844b5bb9f 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -126,6 +126,8 @@ To use an RPC function:
       - import_
       - get_import_preview
       - list_joinable
+      - list_with_metadata
+      - get_with_metadata
       - TableInfo
       - AddedTableInfo
       - SettableTableInfo
diff --git a/mathesar/rpc/tables/metadata.py b/mathesar/rpc/tables/metadata.py
index 6a31b818de..5cddeaeebd 100644
--- a/mathesar/rpc/tables/metadata.py
+++ b/mathesar/rpc/tables/metadata.py
@@ -7,7 +7,7 @@
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
-from mathesar.utils.tables import get_tables_meta_data, set_table_meta_data
+from mathesar.utils.tables import list_tables_meta_data, set_table_meta_data
 
 
 class TableMetaDataRecord(TypedDict):
@@ -90,7 +90,7 @@ def list_(*, database_id: int, **kwargs) -> list[TableMetaDataRecord]:
     Returns:
         Metadata object for a given table oid.
     """
-    table_meta_data = get_tables_meta_data(database_id)
+    table_meta_data = list_tables_meta_data(database_id)
     return [
         TableMetaDataRecord.from_model(model) for model in table_meta_data
     ]
diff --git a/mathesar/tests/rpc/tables/test_t_metadata.py b/mathesar/tests/rpc/tables/test_t_metadata.py
index 342e8e0511..57a9d93448 100644
--- a/mathesar/tests/rpc/tables/test_t_metadata.py
+++ b/mathesar/tests/rpc/tables/test_t_metadata.py
@@ -12,7 +12,7 @@
 def test_tables_meta_data_list(monkeypatch):
     database_id = 2
 
-    def mock_get_tables_meta_data(_database_id):
+    def mock_list_tables_meta_data(_database_id):
         server_model = Server(id=2, host='example.com', port=5432)
         db_model = Database(id=_database_id, name='mymathesardb', server=server_model)
         return [
@@ -27,7 +27,7 @@ def mock_get_tables_meta_data(_database_id):
                 record_summary_template="{5512} {1223}"
             )
         ]
-    monkeypatch.setattr(metadata, "get_tables_meta_data", mock_get_tables_meta_data)
+    monkeypatch.setattr(metadata, "list_tables_meta_data", mock_list_tables_meta_data)
 
     expect_metadata_list = [
         metadata.TableMetaDataRecord(
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 5d9f1b185a..9c094d4bf1 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -362,6 +362,11 @@
         "tables.list_with_metadata",
         [user_is_authenticated]
     ),
+    (
+        tables.get_with_metadata,
+        "tables.get_with_metadata",
+        [user_is_authenticated]
+    ),
     (
         tables.patch,
         "tables.patch",

From 93e4aa72d81f2e4f8d33cbcb4e1a7fb682e7544d Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 11 Sep 2024 17:57:45 +0530
Subject: [PATCH 0862/1141] Display help text in access level selection
 dropdown

---
 .../component-library/select/Select.svelte    |  4 +-
 mathesar_ui/src/i18n/languages/en/dict.json   |  5 +++
 .../DatabasePermissionsModal.svelte           |  9 ++++-
 .../permissions/overview/AccessControl.svelte | 24 +++++++++++-
 .../overview/AccessControlRow.svelte          | 39 ++++++++++++++++---
 .../overview/RoleAccessLevelAndPrivileges.ts  |  7 +++-
 6 files changed, 78 insertions(+), 10 deletions(-)

diff --git a/mathesar_ui/src/component-library/select/Select.svelte b/mathesar_ui/src/component-library/select/Select.svelte
index 208c1a1528..f9e18920c4 100644
--- a/mathesar_ui/src/component-library/select/Select.svelte
+++ b/mathesar_ui/src/component-library/select/Select.svelte
@@ -163,7 +163,9 @@
     on:blur
   >
     <svelte:fragment slot="trigger">
-      {#if $$slots.default}
+      {#if $$slots.trigger}
+        <slot name="trigger" option={value} label={getLabel(value)} />
+      {:else if $$slots.default}
         <slot option={value} label={getLabel(value)} />
       {:else}
         <StringOrComponent arg={getLabel(value)} />
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index a6926798f5..2d02c17054 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -1,4 +1,5 @@
 {
+  "access_custom_help": "Custom permissions",
   "access_for_roles_saved_successfully": "Access for roles have been saved successfully.",
   "access_level_cannot_remove_warning": "This access level cannot be removed.",
   "access_level_inheritance_help": "This access level is inherited from the {aclObject} permissions.",
@@ -95,6 +96,7 @@
   "confirm_and_create_table": "Confirm & create table",
   "confirm_delete_table": "To confirm the deletion of the [tableName] table, please enter the table name into the input field below.",
   "confirm_password": "Confirm Password",
+  "connect": "Connect",
   "connect_database": "Connect Database",
   "connect_existing_database": "Connect to an Existing Database",
   "connect_with_community_help": "Connect with Mathesar users and contributors in our community chat. Share ideas, get help, and contribute to discussions.",
@@ -121,6 +123,7 @@
   "count_new_records": "{count, plural, one {{count} new record} other {{count} new records}}",
   "count_records_deleted_successfully": "{count, plural, one {{count} record deleted successfully!} other {{count} records deleted successfully!}}",
   "count_tables": "{count, plural, one {{count} table} other {{count} tables}}",
+  "create": "Create",
   "create_a_table_by_importing": "Create a table by importing your data",
   "create_database": "Create Database",
   "create_database_mathesar_internal_server": "Create a new PostgreSQL database on Mathesar's internal server",
@@ -148,6 +151,8 @@
   "data_type_linked_column_restricted": "The data type of this column must match the referenced column and cannot be changed.",
   "data_type_pk_column_restricted": "The data type of the primary key column is restricted and cannot be changed.",
   "database": "Database",
+  "database_access_connect_help": "Can access the database",
+  "database_access_create_help": "Can access the database and create new schemas",
   "database_name": "Database Name",
   "database_not_found": "Database with id [connectionId] is not found.",
   "database_permissions": "Database Permissions",
diff --git a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
index d9cdef6bf3..f215d36c59 100644
--- a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
+++ b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
@@ -34,10 +34,17 @@
     allPrivileges: allDatabasePrivileges,
     access: {
       levels: [
-        { id: 'connect', privileges: new Set(['CONNECT']) },
+        {
+          id: 'connect',
+          privileges: new Set(['CONNECT']),
+          name: $_('connect'),
+          help: $_('database_access_connect_help'),
+        },
         {
           id: 'connect_and_create',
           privileges: new Set(['CONNECT', 'CREATE']),
+          name: $_('create'),
+          help: $_('database_access_create_help'),
         },
       ],
       default: 'connect',
diff --git a/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte b/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
index 5f7be6de5b..9d01a0253a 100644
--- a/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
@@ -19,7 +19,10 @@
 
   import AccessControlRow from './AccessControlRow.svelte';
   import OverviewSection from './OverviewSection.svelte';
-  import { RoleAccessLevelAndPrivileges } from './RoleAccessLevelAndPrivileges';
+  import {
+    RoleAccessLevelAndPrivileges,
+    customAccess,
+  } from './RoleAccessLevelAndPrivileges';
   import {
     type AccessControlConfig,
     type PermissionsMetaData,
@@ -51,6 +54,22 @@
   );
   $: form = makeForm({ roleAccessField });
 
+  $: accessLevelsInfoWithCustom = [
+    ...config.access.levels.map((aL) => ({
+      id: aL.id,
+      name: aL.name,
+      help: aL.help,
+    })),
+    {
+      id: customAccess,
+      name: $_('custom'),
+      help: $_('access_custom_help'),
+    },
+  ];
+  $: accessLevelsInfoMap = new Map(
+    accessLevelsInfoWithCustom.map((e) => [e.id, e]),
+  );
+
   function addAccess(roleOid: Role['oid']) {
     const newRalp = new RoleAccessLevelAndPrivileges({
       roleOid,
@@ -116,7 +135,8 @@
     <div class="access-control-row">
       <AccessControlRow
         rolesMap={roles}
-        {config}
+        {accessLevelsInfoMap}
+        allPrivileges={config.allPrivileges}
         {roleAccess}
         {setAccess}
         {removeAccess}
diff --git a/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte b/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
index e327fc6e42..071e018cb9 100644
--- a/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
@@ -17,13 +17,20 @@
     customAccess,
   } from './RoleAccessLevelAndPrivileges';
   import RoleWithChildren from './RoleWithChildren.svelte';
-  import type { AccessControlConfig } from './utils';
 
   type AccessLevel = $$Generic;
   type Privilege = $$Generic;
 
   export let rolesMap: ImmutableMap<Role['oid'], Role>;
-  export let config: AccessControlConfig<AccessLevel, Privilege>;
+  export let accessLevelsInfoMap: Map<
+    AccessLevel | typeof customAccess,
+    {
+      id: AccessLevel | typeof customAccess;
+      name: string;
+      help: string;
+    }
+  >;
+  export let allPrivileges: readonly Privilege[];
   export let roleAccess: RoleAccessLevelAndPrivileges<AccessLevel, Privilege>;
 
   export let setAccess: (
@@ -54,10 +61,21 @@
   <RoleWithChildren {rolesMap} roleOid={roleAccess.roleOid} />
   <div>
     <Select
-      options={[...config.access.levels.map((entry) => entry.id), customAccess]}
+      options={[...accessLevelsInfoMap.keys()]}
       value={roleAccess.accessLevel}
       on:change={(e) => changeAccess(e.detail)}
-    />
+      let:option
+    >
+      <div slot="trigger">
+        {accessLevelsInfoMap.get(option)?.name ?? ''}
+      </div>
+      {#if option}
+        <div class="access-selection-option">
+          <div class="name">{accessLevelsInfoMap.get(option)?.name ?? ''}</div>
+          <div class="help">{accessLevelsInfoMap.get(option)?.help ?? ''}</div>
+        </div>
+      {/if}
+    </Select>
   </div>
   <div>
     <Button
@@ -78,7 +96,7 @@
         <CheckboxGroup
           values={roleAccess.privileges.valuesArray()}
           on:artificialChange={(e) => setCustomPrivileges(e.detail)}
-          options={config.allPrivileges}
+          options={allPrivileges}
           getCheckboxLabel={(o) => String(o)}
           getCheckboxHelp={(o) => String(o)}
         />
@@ -93,6 +111,17 @@
     grid-template-columns: 2fr 1fr auto;
     gap: var(--size-ultra-small);
   }
+  .access-selection-option {
+    .name {
+      font-weight: 500;
+    }
+    .help {
+      margin-top: var(--size-extreme-small);
+      font-size: var(--text-size-small);
+      white-space: normal;
+      max-width: 15rem;
+    }
+  }
   .role-permissions {
     margin-top: var(--size-xx-small);
     --Collapsible_trigger-padding: var(--size-extreme-small) 0;
diff --git a/mathesar_ui/src/systems/permissions/overview/RoleAccessLevelAndPrivileges.ts b/mathesar_ui/src/systems/permissions/overview/RoleAccessLevelAndPrivileges.ts
index 1b0e292471..50742d557d 100644
--- a/mathesar_ui/src/systems/permissions/overview/RoleAccessLevelAndPrivileges.ts
+++ b/mathesar_ui/src/systems/permissions/overview/RoleAccessLevelAndPrivileges.ts
@@ -1,7 +1,12 @@
 import type { Role } from '@mathesar/models/Role';
 import { ImmutableSet } from '@mathesar-component-library';
 
-export type AccessLevelConfig<A, P> = { id: A; privileges: Set<P> };
+export type AccessLevelConfig<A, P> = {
+  id: A;
+  privileges: Set<P>;
+  name: string;
+  help: string;
+};
 
 export const customAccess = 'custom' as const;
 

From eed05c687680bd388480c926dc00fcb15455a485 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 11 Sep 2024 18:14:00 +0530
Subject: [PATCH 0863/1141] Display help content for privilege selection
 checkboxes

---
 mathesar_ui/src/i18n/languages/en/dict.json      |  3 +++
 .../permissions/DatabasePermissionsModal.svelte  | 16 ++++++++++++++--
 .../permissions/overview/AccessControl.svelte    |  3 ++-
 .../permissions/overview/AccessControlRow.svelte | 12 +++++++++---
 .../src/systems/permissions/overview/utils.ts    |  5 ++++-
 5 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 2d02c17054..1477b656c3 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -156,6 +156,9 @@
   "database_name": "Database Name",
   "database_not_found": "Database with id [connectionId] is not found.",
   "database_permissions": "Database Permissions",
+  "database_privilege_connect_help": "Allow connections to the database.",
+  "database_privilege_create_help": "Allow creation of new schemas.",
+  "database_privilege_temporary_help": "Allow creation of temporary tables.",
   "database_server_credentials": "Database server credentials",
   "database_type": "Database Type",
   "databases": "Databases",
diff --git a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
index f215d36c59..00cf28d854 100644
--- a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
+++ b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
@@ -5,7 +5,6 @@
   import {
     type DatabasePrivilege,
     type RawDatabasePrivilegesForRole,
-    allDatabasePrivileges,
   } from '@mathesar/api/rpc/databases';
   import { DatabaseRouteContext } from '@mathesar/contexts/DatabaseRouteContext';
   import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
@@ -31,7 +30,20 @@
     'connect' | 'connect_and_create',
     DatabasePrivilege
   > = {
-    allPrivileges: allDatabasePrivileges,
+    allPrivileges: [
+      {
+        id: 'CONNECT',
+        help: $_('database_privilege_connect_help'),
+      },
+      {
+        id: 'CREATE',
+        help: $_('database_privilege_create_help'),
+      },
+      {
+        id: 'TEMPORARY',
+        help: $_('database_privilege_temporary_help'),
+      },
+    ],
     access: {
       levels: [
         {
diff --git a/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte b/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
index 9d01a0253a..0cc3fbcfd2 100644
--- a/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
@@ -69,6 +69,7 @@
   $: accessLevelsInfoMap = new Map(
     accessLevelsInfoWithCustom.map((e) => [e.id, e]),
   );
+  $: privilegeInfoMap = new Map(config.allPrivileges.map((pr) => [pr.id, pr]));
 
   function addAccess(roleOid: Role['oid']) {
     const newRalp = new RoleAccessLevelAndPrivileges({
@@ -136,7 +137,7 @@
       <AccessControlRow
         rolesMap={roles}
         {accessLevelsInfoMap}
-        allPrivileges={config.allPrivileges}
+        {privilegeInfoMap}
         {roleAccess}
         {setAccess}
         {removeAccess}
diff --git a/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte b/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
index 071e018cb9..587f427196 100644
--- a/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
@@ -30,7 +30,13 @@
       help: string;
     }
   >;
-  export let allPrivileges: readonly Privilege[];
+  export let privilegeInfoMap: Map<
+    Privilege,
+    {
+      id: Privilege;
+      help: string;
+    }
+  >;
   export let roleAccess: RoleAccessLevelAndPrivileges<AccessLevel, Privilege>;
 
   export let setAccess: (
@@ -96,9 +102,9 @@
         <CheckboxGroup
           values={roleAccess.privileges.valuesArray()}
           on:artificialChange={(e) => setCustomPrivileges(e.detail)}
-          options={allPrivileges}
+          options={[...privilegeInfoMap.keys()]}
           getCheckboxLabel={(o) => String(o)}
-          getCheckboxHelp={(o) => String(o)}
+          getCheckboxHelp={(o) => privilegeInfoMap.get(o)?.help ?? ''}
         />
       </div>
     </Collapsible>
diff --git a/mathesar_ui/src/systems/permissions/overview/utils.ts b/mathesar_ui/src/systems/permissions/overview/utils.ts
index 3def130d7a..66a1702cbf 100644
--- a/mathesar_ui/src/systems/permissions/overview/utils.ts
+++ b/mathesar_ui/src/systems/permissions/overview/utils.ts
@@ -15,7 +15,10 @@ export interface RolePrivileges<Privilege> {
 }
 
 export interface AccessControlConfig<AccessLevel, Privilege> {
-  allPrivileges: readonly Privilege[];
+  allPrivileges: {
+    id: Privilege;
+    help: string;
+  }[];
   access: {
     levels: readonly AccessLevelConfig<AccessLevel, Privilege>[];
     default: AccessLevel;

From 46bbf7f04478986217be0c2efdf1d49693b03f42 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 11 Sep 2024 18:18:42 +0530
Subject: [PATCH 0864/1141] use datafile name for creating a new table for
 import

---
 db/tables/operations/import_.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/db/tables/operations/import_.py b/db/tables/operations/import_.py
index 5ece633728..5c6bd31b0c 100644
--- a/db/tables/operations/import_.py
+++ b/db/tables/operations/import_.py
@@ -15,6 +15,8 @@ def import_csv(data_file_id, table_name, schema_oid, conn, comment=None):
     data_file = DataFile.objects.get(id=data_file_id)
     file_path = data_file.file.path
     header = data_file.header
+    if table_name is None or table_name == '':
+        table_name = data_file.base_name
     dialect = csv.dialect.SimpleDialect(
         data_file.delimiter,
         data_file.quotechar,
@@ -25,7 +27,7 @@ def import_csv(data_file_id, table_name, schema_oid, conn, comment=None):
     with open(file_path, 'rb') as csv_file:
         csv_reader = get_sv_reader(csv_file, header, dialect)
         column_names = process_column_names(csv_reader.fieldnames)
-    copy_sql, table_oid, table_name = prepare_table_for_import(
+    copy_sql, table_oid, db_table_name = prepare_table_for_import(
         table_name,
         schema_oid,
         column_names,
@@ -44,7 +46,7 @@ def import_csv(data_file_id, table_name, schema_oid, conn, comment=None):
         conversion_encoding,
         conn
     )
-    return {"oid": table_oid, "name": table_name}
+    return {"oid": table_oid, "name": db_table_name}
 
 
 def insert_csv_records(

From e9375fccb8a6a55d4c7714286bd5119e34b784bc Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 11 Sep 2024 18:17:08 +0530
Subject: [PATCH 0865/1141] Disable owner and roles with access in 'Add Role'
 dropdown

---
 .../database/permissions/DatabasePermissionsModal.svelte    | 6 +++---
 .../src/systems/permissions/overview/AccessControl.svelte   | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
index 00cf28d854..c38e52525b 100644
--- a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
+++ b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
@@ -2,9 +2,9 @@
   import { _ } from 'svelte-i18n';
 
   import { api } from '@mathesar/api/rpc';
-  import {
-    type DatabasePrivilege,
-    type RawDatabasePrivilegesForRole,
+  import type {
+    DatabasePrivilege,
+    RawDatabasePrivilegesForRole,
   } from '@mathesar/api/rpc/databases';
   import { DatabaseRouteContext } from '@mathesar/contexts/DatabaseRouteContext';
   import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
diff --git a/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte b/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
index 0cc3fbcfd2..293f9fbc0c 100644
--- a/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
@@ -127,7 +127,11 @@
     triggerAppearance="plain-primary"
   >
     {#each [...roles.values()] as role (role.oid)}
-      <ButtonMenuItem on:click={() => addAccess(role.oid)}>
+      <ButtonMenuItem
+        on:click={() => addAccess(role.oid)}
+        disabled={$roleAccessField.has(role.oid) ||
+          role.oid === permissionsMetaData.owner_oid}
+      >
         {role.name}
       </ButtonMenuItem>
     {/each}

From a791cb10fecd87e3458998c66c95cdf49526de2e Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 11 Sep 2024 19:29:52 +0530
Subject: [PATCH 0866/1141] fix integrity error while setting metadata

---
 mathesar/utils/tables.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mathesar/utils/tables.py b/mathesar/utils/tables.py
index 35d086c263..5baa27bfa5 100644
--- a/mathesar/utils/tables.py
+++ b/mathesar/utils/tables.py
@@ -93,9 +93,6 @@ def get_tables_meta_data(database_id):
 def set_table_meta_data(table_oid, metadata, database_id):
     TableMetaData.objects.update_or_create(
         database=Database.objects.get(id=database_id),
-        data_file=DataFile.objects.get(
-            id=metadata.pop('data_file_id')
-        ) if metadata.get('data_file_id') is not None else None,
         table_oid=table_oid,
         defaults=metadata,
     )

From b2be605062c4f9642e0c687c0f2e63853dcef13c Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 11 Sep 2024 19:34:08 +0530
Subject: [PATCH 0867/1141] remove unused DataFile import

---
 mathesar/utils/tables.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/utils/tables.py b/mathesar/utils/tables.py
index 5baa27bfa5..8c0664fa63 100644
--- a/mathesar/utils/tables.py
+++ b/mathesar/utils/tables.py
@@ -4,7 +4,7 @@
 from db.tables.operations.infer_types import infer_table_column_types
 from mathesar.database.base import create_mathesar_engine
 from mathesar.imports.base import create_table_from_data_file
-from mathesar.models.deprecated import Table, DataFile
+from mathesar.models.deprecated import Table
 from mathesar.models.base import Database, TableMetaData
 from mathesar.state.django import reflect_columns_from_tables
 from mathesar.state import get_cached_metadata

From d78eed6bccc9dd433ddae0d542120104928bcd11 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 11 Sep 2024 19:53:51 +0530
Subject: [PATCH 0868/1141] remove redundant checks for datafile while listing
 table metadata

---
 mathesar/rpc/tables/metadata.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mathesar/rpc/tables/metadata.py b/mathesar/rpc/tables/metadata.py
index 6a31b818de..1fe164b813 100644
--- a/mathesar/rpc/tables/metadata.py
+++ b/mathesar/rpc/tables/metadata.py
@@ -41,7 +41,7 @@ def from_model(cls, model):
             id=model.id,
             database_id=model.database.id,
             table_oid=model.table_oid,
-            data_file_id=model.data_file.id if model.data_file is not None else None,
+            data_file_id=model.data_file_id,
             import_verified=model.import_verified,
             column_order=model.column_order,
             record_summary_customized=model.record_summary_customized,
@@ -69,7 +69,7 @@ class TableMetaDataBlob(TypedDict):
     @classmethod
     def from_model(cls, model):
         return cls(
-            data_file_id=model.data_file.id if model.data_file is not None else None,
+            data_file_id=model.data_file_id,
             import_verified=model.import_verified,
             column_order=model.column_order,
             record_summary_customized=model.record_summary_customized,

From d9d51835dcb80b5282db39b33c393bab38c4459e Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 11 Sep 2024 20:01:53 +0530
Subject: [PATCH 0869/1141] Show readonly view when current role is not owner

---
 .../permissions/overview/AccessControl.svelte | 63 ++++++++++--------
 .../overview/AccessControlRow.svelte          | 65 ++++++++++++-------
 2 files changed, 77 insertions(+), 51 deletions(-)

diff --git a/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte b/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
index 293f9fbc0c..fbec8d0263 100644
--- a/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
@@ -120,26 +120,31 @@
 </script>
 
 <OverviewSection title={$_('granted_access')}>
-  <DropdownMenu
-    slot="actions"
-    label={$_('add_roles')}
-    icon={iconAddNew}
-    triggerAppearance="plain-primary"
-  >
-    {#each [...roles.values()] as role (role.oid)}
-      <ButtonMenuItem
-        on:click={() => addAccess(role.oid)}
-        disabled={$roleAccessField.has(role.oid) ||
-          role.oid === permissionsMetaData.owner_oid}
+  <svelte:fragment slot="actions">
+    {#if permissionsMetaData.current_role_owns}
+      <DropdownMenu
+        label={$_('add_roles')}
+        icon={iconAddNew}
+        triggerAppearance="plain-primary"
       >
-        {role.name}
-      </ButtonMenuItem>
-    {/each}
-  </DropdownMenu>
+        {#each [...roles.values()] as role (role.oid)}
+          <ButtonMenuItem
+            on:click={() => addAccess(role.oid)}
+            disabled={$roleAccessField.has(role.oid) ||
+              role.oid === permissionsMetaData.owner_oid}
+          >
+            {role.name}
+          </ButtonMenuItem>
+        {/each}
+      </DropdownMenu>
+    {/if}
+  </svelte:fragment>
+
   {#each [...$roleAccessField.values()] as roleAccess (roleAccess.roleOid)}
     <div class="access-control-row">
       <AccessControlRow
         rolesMap={roles}
+        {permissionsMetaData}
         {accessLevelsInfoMap}
         {privilegeInfoMap}
         {roleAccess}
@@ -156,19 +161,21 @@
   {/each}
 </OverviewSection>
 
-<div use:portalToWindowFooter class="footer">
-  <FormSubmit
-    {form}
-    canProceed={$form.hasChanges}
-    catchErrors
-    onCancel={() => {
-      controller.close();
-    }}
-    onProceed={save}
-    proceedButton={{ label: $_('save') }}
-    cancelButton={{ label: $_('cancel') }}
-  />
-</div>
+{#if permissionsMetaData.current_role_owns}
+  <div use:portalToWindowFooter class="footer">
+    <FormSubmit
+      {form}
+      canProceed={$form.hasChanges}
+      catchErrors
+      onCancel={() => {
+        controller.close();
+      }}
+      onProceed={save}
+      proceedButton={{ label: $_('save') }}
+      cancelButton={{ label: $_('cancel') }}
+    />
+  </div>
+{/if}
 
 <style lang="scss">
   .access-control-row {
diff --git a/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte b/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
index 587f427196..f260a433c0 100644
--- a/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
@@ -17,11 +17,14 @@
     customAccess,
   } from './RoleAccessLevelAndPrivileges';
   import RoleWithChildren from './RoleWithChildren.svelte';
+  import type { PermissionsMetaData } from './utils';
 
   type AccessLevel = $$Generic;
   type Privilege = $$Generic;
 
   export let rolesMap: ImmutableMap<Role['oid'], Role>;
+  export let permissionsMetaData: PermissionsMetaData<Privilege>;
+
   export let accessLevelsInfoMap: Map<
     AccessLevel | typeof customAccess,
     {
@@ -66,31 +69,43 @@
 <div class="access-selection">
   <RoleWithChildren {rolesMap} roleOid={roleAccess.roleOid} />
   <div>
-    <Select
-      options={[...accessLevelsInfoMap.keys()]}
-      value={roleAccess.accessLevel}
-      on:change={(e) => changeAccess(e.detail)}
-      let:option
-    >
-      <div slot="trigger">
-        {accessLevelsInfoMap.get(option)?.name ?? ''}
-      </div>
-      {#if option}
-        <div class="access-selection-option">
-          <div class="name">{accessLevelsInfoMap.get(option)?.name ?? ''}</div>
-          <div class="help">{accessLevelsInfoMap.get(option)?.help ?? ''}</div>
+    {#if permissionsMetaData.current_role_owns}
+      <Select
+        options={[...accessLevelsInfoMap.keys()]}
+        value={roleAccess.accessLevel}
+        on:change={(e) => changeAccess(e.detail)}
+        let:option
+      >
+        <div slot="trigger">
+          {accessLevelsInfoMap.get(option)?.name ?? ''}
         </div>
-      {/if}
-    </Select>
-  </div>
-  <div>
-    <Button
-      appearance="secondary"
-      on:click={() => removeAccess(roleAccess.roleOid)}
-    >
-      <Icon {...iconDeleteMinor} />
-    </Button>
+        {#if option}
+          <div class="access-selection-option">
+            <div class="name">
+              {accessLevelsInfoMap.get(option)?.name ?? ''}
+            </div>
+            <div class="help">
+              {accessLevelsInfoMap.get(option)?.help ?? ''}
+            </div>
+          </div>
+        {/if}
+      </Select>
+    {:else}
+      <div class="access-level-static">
+        {accessLevelsInfoMap.get(roleAccess.accessLevel)?.name ?? ''}
+      </div>
+    {/if}
   </div>
+  {#if permissionsMetaData.current_role_owns}
+    <div>
+      <Button
+        appearance="secondary"
+        on:click={() => removeAccess(roleAccess.roleOid)}
+      >
+        <Icon {...iconDeleteMinor} />
+      </Button>
+    </div>
+  {/if}
 </div>
 {#if roleAccess.accessLevel === customAccess}
   <div class="role-permissions">
@@ -128,6 +143,10 @@
       max-width: 15rem;
     }
   }
+  .access-level-static {
+    text-align: right;
+    font-weight: 500;
+  }
   .role-permissions {
     margin-top: var(--size-xx-small);
     --Collapsible_trigger-padding: var(--size-extreme-small) 0;

From 037f2236aaaff8c36a663bf38a964d848d060e55 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 11 Sep 2024 10:36:35 -0400
Subject: [PATCH 0870/1141] Minor code cleanup within import preview content

---
 .../preview/ImportPreviewContent.svelte       | 31 +++++++-----
 .../import/preview/importPreviewPageUtils.ts  | 48 ++++++++++---------
 2 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index 96efe0c98b..918607079d 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -26,7 +26,11 @@
   import { abstractTypesMap } from '@mathesar/stores/abstract-types';
   import AsyncStore from '@mathesar/stores/AsyncStore';
   import { currentDatabase } from '@mathesar/stores/databases';
-  import { currentTables, updateTable } from '@mathesar/stores/tables';
+  import {
+    currentTables,
+    deleteTable,
+    updateTable,
+  } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
   import {
     CancelOrProceedButtonPair,
@@ -42,7 +46,6 @@
     buildColumnPropertiesMap,
     finalizeColumns,
     getSkeletonRecords,
-    makeDeleteTableRequest,
     makeHeaderUpdateRequest,
     processColumns,
   } from './importPreviewPageUtils';
@@ -51,9 +54,6 @@
   /** Set via back-end */
   const TRUNCATION_LIMIT = 20;
 
-  const headerUpdate = makeHeaderUpdateRequest();
-  const cancelationRequest = makeDeleteTableRequest();
-
   export let database: Database;
   export let schema: Schema;
   export let table: Table;
@@ -71,6 +71,15 @@
   ]);
   $: form = makeForm({ customizedTableName });
 
+  $: headerUpdateRequest = makeHeaderUpdateRequest({
+    database,
+    schema,
+    table,
+    dataFile,
+  });
+  $: cancelationRequest = new AsyncStore(() =>
+    deleteTable(database, schema, table.oid),
+  );
   $: typeSuggestionsRequest = new AsyncStore(() =>
     api.data_modeling
       .suggest_types({ table_oid: table.oid, database_id: database.id })
@@ -133,12 +142,8 @@
 
   async function toggleHeader() {
     previewRequest.reset();
-    const response = await headerUpdate.run({
-      database,
-      dataFile,
+    const response = await headerUpdateRequest.run({
       firstRowIsHeader: !dataFile.header,
-      schema,
-      table,
       customizedTableName: $customizedTableName,
     });
     if (response.resolvedValue) {
@@ -159,7 +164,7 @@
   }
 
   async function cancel() {
-    const response = await cancelationRequest.run({ database, schema, table });
+    const response = await cancelationRequest.run();
     if (response.isOk) {
       router.goto(getSchemaPageUrl(database.id, schema.oid), true);
     } else {
@@ -231,9 +236,9 @@
           on:retry={init}
           on:delete={cancel}
         />
-      {:else if $headerUpdate.error}
+      {:else if $headerUpdateRequest.error}
         <ErrorInfo
-          error={$headerUpdate.error}
+          error={$headerUpdateRequest.error}
           on:retry={init}
           on:delete={cancel}
         />
diff --git a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
index d36cb89196..30a244dcd4 100644
--- a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
+++ b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
@@ -46,36 +46,40 @@ export function processColumns(
   });
 }
 
-export function makeHeaderUpdateRequest() {
-  interface Props {
-    database: Pick<Database, 'id'>;
-    schema: Pick<Schema, 'oid'>;
-    table: Pick<Table, 'oid'>;
-    dataFile: Pick<DataFile, 'id'>;
+export function makeHeaderUpdateRequest({
+  database,
+  schema,
+  table,
+  dataFile,
+}: {
+  database: Pick<Database, 'id'>;
+  schema: Pick<Schema, 'oid'>;
+  table: Pick<Table, 'oid'>;
+  dataFile: Pick<DataFile, 'id'>;
+}) {
+  async function updateHeader({
+    firstRowIsHeader,
+    customizedTableName,
+  }: {
     firstRowIsHeader: boolean;
     customizedTableName: string;
-  }
-  async function updateHeader(p: Props) {
+  }) {
     await Promise.all([
-      deleteTable(p.database, p.schema, p.table.oid),
-      dataFilesApi.update(p.dataFile.id, { header: p.firstRowIsHeader }),
+      deleteTable(database, schema, table.oid),
+      dataFilesApi.update(dataFile.id, {
+        header: firstRowIsHeader,
+      }),
     ]);
-    return createTableFromDataFile(p);
+    return createTableFromDataFile({
+      database,
+      schema,
+      dataFile,
+      name: customizedTableName,
+    });
   }
   return new AsyncStore(updateHeader);
 }
 
-export function makeDeleteTableRequest() {
-  interface Props {
-    database: Database;
-    schema: Schema;
-    table: Pick<Table, 'oid'>;
-  }
-  return new AsyncStore((props: Props) =>
-    deleteTable(props.database, props.schema, props.table.oid),
-  );
-}
-
 export interface ColumnProperties {
   selected: boolean;
   displayName: string;

From 9209f088f166a522bf2aae3c3a8114eaa5823224 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 11 Sep 2024 20:23:44 +0530
Subject: [PATCH 0871/1141] handle table creation conflict if a table with a
 same name already exists

---
 db/sql/00_msar.sql | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 398664bfde..45f93c376f 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -2899,6 +2899,7 @@ table will always have our default 'id' column as its first column.
 DECLARE
   schema_name text;
   table_count integer;
+  prefix text;
   uq_table_name text;
   fq_table_name text;
   created_table_id oid;
@@ -2906,20 +2907,29 @@ DECLARE
   constraint_defs __msar.con_def[];
 BEGIN
   schema_name := msar.get_schema_name(sch_id);
-  IF NULLIF(tab_name, '') IS NOT NULL THEN
+  IF NULLIF(tab_name, '') IS NOT NULL AND NOT EXISTS(
+      SELECT oid FROM pg_catalog.pg_class WHERE relname = tab_name AND relnamespace = sch_id
+    )
+  THEN
     fq_table_name := format('%I.%I', schema_name, tab_name);
   ELSE
+    -- determine what prefix to use for table name generation
+    IF NULLIF(tab_name, '') IS NOT NULL THEN
+      prefix := tab_name || ' ';
+    ELSE
+      prefix := 'Table ';
+    END IF;
     -- generate a table name if one doesn't exist
     SELECT COUNT(*) + 1 INTO table_count
     FROM pg_catalog.pg_class
     WHERE relkind = 'r' AND relnamespace = sch_id;
-    uq_table_name := 'Table ' || table_count;
+    uq_table_name := prefix || table_count;
     -- avoid name collisions
     WHILE EXISTS (
       SELECT oid FROM pg_catalog.pg_class WHERE relname = uq_table_name AND relnamespace = sch_id
     ) LOOP
       table_count := table_count + 1;
-      uq_table_name := 'Table ' || table_count;
+      uq_table_name := prefix || table_count;
     END LOOP;
     fq_table_name := format('%I.%I', schema_name, uq_table_name);
   END IF;

From 72a78380209a49bf4e8a0defbc8a56d1040591c0 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 11 Sep 2024 20:27:20 +0530
Subject: [PATCH 0872/1141] Hide functionality thats not implemented yet:
 Transfer ownership tab, and database actions - delete & disable

---
 mathesar_ui/src/pages/database/DatabasePageWrapper.svelte | 4 ++--
 .../src/systems/permissions/PermissionsModal.svelte       | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
index af4ac86fdf..65979b8fcf 100644
--- a/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
+++ b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
@@ -76,7 +76,7 @@
         <span>{$_('database_permissions')}</span>
       </Button>
 
-      <DropdownMenu
+      <!-- <DropdownMenu
         showArrow={false}
         triggerAppearance="plain"
         closeOnInnerClick={false}
@@ -89,7 +89,7 @@
         <ButtonMenuItem icon={iconDeleteMajor} danger>
           {$_('delete_database')}
         </ButtonMenuItem>
-      </DropdownMenu>
+      </DropdownMenu> -->
     </div>
   </AppSecondaryHeader>
 
diff --git a/mathesar_ui/src/systems/permissions/PermissionsModal.svelte b/mathesar_ui/src/systems/permissions/PermissionsModal.svelte
index 8d7af9a07e..e0e0322ef0 100644
--- a/mathesar_ui/src/systems/permissions/PermissionsModal.svelte
+++ b/mathesar_ui/src/systems/permissions/PermissionsModal.svelte
@@ -15,10 +15,10 @@
       id: 'share',
       label: $_('share'),
     },
-    {
-      id: 'transfer_ownership',
-      label: $_('transfer_ownership'),
-    },
+    // {
+    //   id: 'transfer_ownership',
+    //   label: $_('transfer_ownership'),
+    // },
   ];
   let activeTab = tabs[0];
 

From 772bd9cf815ebf9b1c3845e4f3553fdba0feba8a Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 11 Sep 2024 12:01:08 -0400
Subject: [PATCH 0873/1141] Fix toggling of header row import setting

---
 .../preview/ImportPreviewContent.svelte       | 19 ++++---
 .../import/upload/ImportUploadPage.svelte     | 17 +-----
 mathesar_ui/src/stores/tables.ts              | 55 +++++++++++--------
 3 files changed, 43 insertions(+), 48 deletions(-)

diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index 918607079d..48d8d727d7 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -85,14 +85,15 @@
       .suggest_types({ table_oid: table.oid, database_id: database.id })
       .run(),
   );
-  $: previewRequest = new AsyncStore((columns: ColumnPreviewSpec[]) =>
-    api.tables
-      .get_import_preview({
-        database_id: database.id,
-        table_oid: table.oid,
-        columns,
-      })
-      .run(),
+  $: previewRequest = new AsyncStore(
+    (columnPreviewSpecs: ColumnPreviewSpec[]) =>
+      api.tables
+        .get_import_preview({
+          database_id: database.id,
+          table_oid: table.oid,
+          columns: columnPreviewSpecs,
+        })
+        .run(),
   );
   $: columnsFetch = new AsyncStore(runner(api.columns.list_with_metadata));
 
@@ -147,7 +148,7 @@
       customizedTableName: $customizedTableName,
     });
     if (response.resolvedValue) {
-      reload({ table: response.resolvedValue });
+      reload({ table: response.resolvedValue, useColumnTypeInference });
     }
   }
 
diff --git a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
index 36eb3c9818..1d437a22e8 100644
--- a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
+++ b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
@@ -23,10 +23,7 @@
   import type { Database } from '@mathesar/models/Database';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { getImportPreviewPageUrl } from '@mathesar/routes/urls';
-  import {
-    createTableFromDataFile,
-    updateTable,
-  } from '@mathesar/stores/tables';
+  import { createTableFromDataFile } from '@mathesar/stores/tables';
   import { getErrorMessage } from '@mathesar/utils/errors';
   import {
     RadioGroup,
@@ -121,18 +118,6 @@
         schema,
         dataFile: { id: dataFileId },
       });
-
-      await updateTable({
-        database,
-        table: {
-          oid: table.oid,
-          metadata: {
-            import_verified: false,
-            data_file_id: dataFileId,
-          },
-        },
-      });
-
       const previewPage = getImportPreviewPageUrl(
         database.id,
         schema.oid,
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index 3bf6117170..7248448117 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -245,7 +245,7 @@ export async function updateTable({
   table: RecursivePartial<Table> & { oid: Table['oid'] };
   columnPatchSpecs?: ColumnPatchSpec[];
   columnsToDelete?: number[];
-}): Promise<void> {
+}): Promise<Table> {
   const requests: RpcRequest<void>[] = [];
   if (table.name || table.description) {
     requests.push(
@@ -288,12 +288,13 @@ export async function updateTable({
   }
   await batchSend(requests);
 
+  let newTable: Table | undefined;
   const tableStore = findStoreContainingTable(database, table.oid);
   if (!tableStore) throw new Error('Table store not found');
   tableStore.update((tablesData) => {
     const oldTable = tablesData.tablesMap.get(table.oid);
     if (!oldTable) throw new Error('Table not found within store.');
-    const newTable = mergeTables(oldTable, table);
+    newTable = mergeTables(oldTable, table);
     tablesData.tablesMap.set(table.oid, newTable);
     const tablesMap: TablesMap = new Map();
     sortTables([...tablesData.tablesMap.values()]).forEach((t) => {
@@ -301,6 +302,8 @@ export async function updateTable({
     });
     return { ...tablesData, tablesMap };
   });
+  if (!newTable) throw new Error('Table not updated.');
+  return newTable;
 }
 
 function addTableToStore({
@@ -356,36 +359,42 @@ export function createTable({
   );
 }
 
-export function createTableFromDataFile({
-  database,
-  schema,
-  dataFile,
-  name,
-}: {
+export async function createTableFromDataFile(props: {
   database: Pick<Database, 'id'>;
   schema: Pick<Schema, 'oid'>;
   dataFile: Pick<DataFile, 'id'>;
   name?: string;
-}): CancellablePromise<Table> {
-  const promise = api.tables
+}): Promise<Table> {
+  const created = await api.tables
     .import({
-      database_id: database.id,
-      schema_oid: schema.oid,
-      table_name: name ?? '',
-      data_file_id: dataFile.id,
+      database_id: props.database.id,
+      schema_oid: props.schema.oid,
+      table_name: props.name,
+      data_file_id: props.dataFile.id,
     })
     .run();
-  return new CancellablePromise(
-    (resolve, reject) => {
-      void promise.then(
-        (table) => resolve(addTableToStore({ database, schema, table })),
-        reject,
-      );
+
+  const basicTable = addTableToStore({
+    database: props.database,
+    schema: props.schema,
+    table: {
+      oid: created.oid,
+      name: created.name,
+      schema: props.schema.oid,
     },
-    () => {
-      promise.cancel();
+  });
+
+  const fullTable = await updateTable({
+    database: props.database,
+    table: {
+      ...basicTable,
+      metadata: {
+        import_verified: false,
+        data_file_id: props.dataFile.id,
+      },
     },
-  );
+  });
+  return fullTable;
 }
 
 export function splitTable({

From 1b96adfc90b2ca3e46da106aa43300a8ea415d3d Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 11 Sep 2024 13:19:21 -0400
Subject: [PATCH 0874/1141] Remove reflection API code

---
 mathesar_ui/src/api/rest/reflect.ts | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 mathesar_ui/src/api/rest/reflect.ts

diff --git a/mathesar_ui/src/api/rest/reflect.ts b/mathesar_ui/src/api/rest/reflect.ts
deleted file mode 100644
index 68dca417e5..0000000000
--- a/mathesar_ui/src/api/rest/reflect.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { postAPI } from './utils/requestUtils';
-
-export const reflectApi = {
-  reflect(): Promise<void> {
-    return postAPI('/api/ui/v0/reflect/', {});
-  },
-};

From 2269f57d701e0282833d3eab550246d1618c51eb Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 11 Sep 2024 14:50:38 -0400
Subject: [PATCH 0875/1141] Remove REST API call in constraints modal

---
 .../src/components/column/ColumnName.svelte   |  6 ++----
 .../ForeignKeyConstraintDetails.svelte        | 16 +++++++-------
 mathesar_ui/src/utils/columnUtils.ts          | 21 +++++++++++--------
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/mathesar_ui/src/components/column/ColumnName.svelte b/mathesar_ui/src/components/column/ColumnName.svelte
index cdc38e6698..36cac6d01c 100644
--- a/mathesar_ui/src/components/column/ColumnName.svelte
+++ b/mathesar_ui/src/components/column/ColumnName.svelte
@@ -4,13 +4,11 @@
   import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
   import { getColumnIconProps } from '@mathesar/utils/columnUtils';
 
-  import type { DisplayColumn } from './types';
-
   interface $$Props extends Omit<ComponentProps<NameWithIcon>, 'icon'> {
-    column: DisplayColumn;
+    column: { name: string } & Parameters<typeof getColumnIconProps>[0];
   }
 
-  export let column: DisplayColumn;
+  export let column: $$Props['column'];
 
   $: icon = getColumnIconProps(column);
 </script>
diff --git a/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte b/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
index 86d35a139d..0167c3eda9 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
@@ -1,13 +1,12 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
-  import { getAPI } from '@mathesar/api/rest/utils/requestUtils';
-  import type { Column } from '@mathesar/api/rpc/columns';
+  import { api } from '@mathesar/api/rpc';
   import type { Constraint } from '@mathesar/api/rpc/constraints';
   import { Icon, Spinner, iconError } from '@mathesar/component-library';
   import ColumnName from '@mathesar/components/column/ColumnName.svelte';
   import TableName from '@mathesar/components/TableName.svelte';
+  import { currentDatabase } from '@mathesar/stores/databases';
   import { currentTablesData } from '@mathesar/stores/tables';
 
   export let constraint: Constraint;
@@ -21,10 +20,13 @@
     if (_constraint.type !== 'foreignkey') {
       return [];
     }
-    const tableId = _constraint.referent_table_oid;
-    const url = `/api/db/v0/tables/${tableId}/columns/?limit=500`;
-    const referentTableColumns = await getAPI<PaginatedResponse<Column>>(url);
-    return referentTableColumns.results.filter((c) =>
+    const referentTableColumns = await api.columns
+      .list({
+        database_id: $currentDatabase.id,
+        table_oid: _constraint.referent_table_oid,
+      })
+      .run();
+    return referentTableColumns.filter((c) =>
       _constraint.referent_columns.includes(c.id),
     );
   }
diff --git a/mathesar_ui/src/utils/columnUtils.ts b/mathesar_ui/src/utils/columnUtils.ts
index f51843ee21..27c5d1089f 100644
--- a/mathesar_ui/src/utils/columnUtils.ts
+++ b/mathesar_ui/src/utils/columnUtils.ts
@@ -1,5 +1,6 @@
+import type { Column } from '@mathesar/api/rpc/columns';
+import type { ConstraintType } from '@mathesar/api/rpc/constraints';
 import type { Table } from '@mathesar/api/rpc/tables';
-import type { DisplayColumn } from '@mathesar/components/column/types';
 import { type ValidationFn, uniqueWith } from '@mathesar/components/form';
 import { iconConstraint, iconTableLink } from '@mathesar/icons';
 import {
@@ -12,20 +13,22 @@ import type { IconProps } from '@mathesar-component-library/types';
 
 import { makeSingular } from './languageUtils';
 
-export function getColumnIconProps(
-  _column: DisplayColumn,
-): IconProps | IconProps[] {
-  if (_column.constraintsType?.includes('primary')) {
+export function getColumnIconProps(column: {
+  type: Column['type'];
+  type_options: Column['type_options'];
+  constraintsType?: ConstraintType[];
+}): IconProps | IconProps[] {
+  if (column.constraintsType?.includes('primary')) {
     return iconConstraint;
   }
 
-  if (_column.constraintsType?.includes('foreignkey')) {
+  if (column.constraintsType?.includes('foreignkey')) {
     return iconTableLink;
   }
 
-  return getAbstractTypeForDbType(_column.type, abstractTypesMap).getIcon({
-    dbType: _column.type,
-    typeOptions: _column.type_options,
+  return getAbstractTypeForDbType(column.type, abstractTypesMap).getIcon({
+    dbType: column.type,
+    typeOptions: column.type_options,
   });
 }
 

From 27b929c31a7d28fcfd22eb6eeedde4d503d05fdf Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 11 Sep 2024 15:48:46 -0400
Subject: [PATCH 0876/1141] Fix type errors

---
 mathesar_ui/src/components/filter-entry/FilterEntry.svelte     | 1 -
 mathesar_ui/src/components/group-entry/GroupEntry.svelte       | 1 -
 mathesar_ui/src/components/sort-entry/SortEntry.svelte         | 1 -
 .../column-selection-pane/SelectableColumn.svelte              | 1 -
 .../transformations-pane/HideTransformation.svelte             | 1 -
 .../summarization/SummarizationTransformation.svelte           | 1 -
 .../actions-pane/record-operations/group/Group.svelte          | 3 ---
 7 files changed, 9 deletions(-)

diff --git a/mathesar_ui/src/components/filter-entry/FilterEntry.svelte b/mathesar_ui/src/components/filter-entry/FilterEntry.svelte
index e8cc490ff2..68b3eb2220 100644
--- a/mathesar_ui/src/components/filter-entry/FilterEntry.svelte
+++ b/mathesar_ui/src/components/filter-entry/FilterEntry.svelte
@@ -222,7 +222,6 @@
           name: getColumnName(option),
           type: columnInfo?.column.type ?? 'unknown',
           type_options: columnInfo?.column.type_options ?? null,
-          display_options: columnInfo?.column.display_options ?? null,
           constraintsType: getColumnConstraintTypeFromColumnId(option),
         }}
       />
diff --git a/mathesar_ui/src/components/group-entry/GroupEntry.svelte b/mathesar_ui/src/components/group-entry/GroupEntry.svelte
index f852cd3c9e..5be7215a9a 100644
--- a/mathesar_ui/src/components/group-entry/GroupEntry.svelte
+++ b/mathesar_ui/src/components/group-entry/GroupEntry.svelte
@@ -122,7 +122,6 @@
         name: getColumnLabel(columnInfo),
         type: columnInfo?.column.type ?? 'unknown',
         type_options: columnInfo?.column.type_options ?? null,
-        display_options: columnInfo?.column.display_options ?? null,
         constraintsType: getColumnConstraintTypeFromColumnId(option),
       }}
     />
diff --git a/mathesar_ui/src/components/sort-entry/SortEntry.svelte b/mathesar_ui/src/components/sort-entry/SortEntry.svelte
index 4f872694e0..acb82da5b8 100644
--- a/mathesar_ui/src/components/sort-entry/SortEntry.svelte
+++ b/mathesar_ui/src/components/sort-entry/SortEntry.svelte
@@ -108,7 +108,6 @@
         name: getColumnLabel(columnInfo),
         type: columnInfo?.column.type ?? 'unknown',
         type_options: columnInfo?.column.type_options ?? null,
-        display_options: columnInfo?.column.display_options ?? null,
         constraintsType: getColumnConstraintTypeByColumnId(option),
       }}
     />
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/SelectableColumn.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/SelectableColumn.svelte
index 7edfc29be2..dd3641c6a4 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/SelectableColumn.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/SelectableColumn.svelte
@@ -23,7 +23,6 @@
           type_options: column.producesMultipleResults
             ? { item_type: column.type }
             : null,
-          display_options: null,
         }}
       />
     </div>
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/HideTransformation.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/HideTransformation.svelte
index aa49a179a2..b8bb1c8bc5 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/HideTransformation.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/HideTransformation.svelte
@@ -35,7 +35,6 @@
         name: columnInfo?.display_name ?? '',
         type: columnInfo?.type ?? 'unknown',
         type_options: columnInfo?.type_options ?? null,
-        display_options: null,
       }}
     />
   </MultiSelect>
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/summarization/SummarizationTransformation.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/summarization/SummarizationTransformation.svelte
index 1ba0db7ecb..80fdfef939 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/summarization/SummarizationTransformation.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/summarization/SummarizationTransformation.svelte
@@ -112,7 +112,6 @@
               name: columnInfo?.display_name ?? '',
               type: columnInfo?.type ?? 'unknown',
               type_options: columnInfo?.type_options ?? null,
-              display_options: null,
             }}
           />
         </MultiSelect>
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/group/Group.svelte b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/group/Group.svelte
index e56a76264e..b4001c8034 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/record-operations/group/Group.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/record-operations/group/Group.svelte
@@ -82,9 +82,6 @@
               type: $processedColumns.get(column.id)?.column.type ?? '',
               type_options:
                 $processedColumns.get(column.id)?.column.type_options ?? null,
-              display_options:
-                $processedColumns.get(column.id)?.column.display_options ??
-                null,
               constraintsType: getColumnConstraintTypeByColumnId(
                 column.id,
                 $processedColumns,

From d0f93d5fa7fa71df97fb9247ed4773623c66a100 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 12 Sep 2024 18:54:17 +0530
Subject: [PATCH 0877/1141] skip tests for duplicate table creation checks

---
 mathesar/tests/api/test_table_api.py | 1 +
 mathesar/tests/imports/test_csv.py   | 1 +
 mathesar/tests/imports/test_excel.py | 1 +
 mathesar/tests/imports/test_json.py  | 1 +
 4 files changed, 4 insertions(+)

diff --git a/mathesar/tests/api/test_table_api.py b/mathesar/tests/api/test_table_api.py
index 55e7fdbc73..162b2ae796 100644
--- a/mathesar/tests/api/test_table_api.py
+++ b/mathesar/tests/api/test_table_api.py
@@ -817,6 +817,7 @@ def test_table_create_non_unicode(client, non_unicode_file_path, filename, first
     )
 
 
+@pytest.mark.skip(reason="msar.add_mathesar_table no longer raises an exception if a table with the same name already exists in the database.")
 def test_table_create_with_same_name(client, schema):
     table_name = 'test_table_duplicate'
     body = {
diff --git a/mathesar/tests/imports/test_csv.py b/mathesar/tests/imports/test_csv.py
index bdf73a39d3..0f97a6d5ba 100644
--- a/mathesar/tests/imports/test_csv.py
+++ b/mathesar/tests/imports/test_csv.py
@@ -143,6 +143,7 @@ def test_col_headers_empty_csv(col_headers_empty_data_file, schema):
     )
 
 
+@pytest.mark.skip(reason="msar.add_mathesar_table no longer raises an exception if a table with the same name already exists in the database.")
 def test_csv_upload_with_duplicate_table_name(data_file, schema):
     table_name = "NASA 2"
 
diff --git a/mathesar/tests/imports/test_excel.py b/mathesar/tests/imports/test_excel.py
index 2854c1ec6f..017ffd9c8a 100644
--- a/mathesar/tests/imports/test_excel.py
+++ b/mathesar/tests/imports/test_excel.py
@@ -57,6 +57,7 @@ def test_excel_upload(data_file, engine_with_schema):
     )
 
 
+@pytest.mark.skip(reason="msar.add_mathesar_table no longer raises an exception if a table with the same name already exists in the database.")
 def test_excel_upload_with_duplicate_table_name(data_file, engine_with_schema):
     table_name = "NASA 2"
 
diff --git a/mathesar/tests/imports/test_json.py b/mathesar/tests/imports/test_json.py
index 689a69a47b..514f1199a5 100644
--- a/mathesar/tests/imports/test_json.py
+++ b/mathesar/tests/imports/test_json.py
@@ -67,6 +67,7 @@ def test_json_upload(data_file, schema):
     )
 
 
+@pytest.mark.skip(reason="msar.add_mathesar_table no longer raises an exception if a table with the same name already exists in the database.")
 def test_json_upload_with_duplicate_table_name(data_file, schema):
     table_name = "NASA 2"
 

From f3952dcedfc5f32dde274f81961228560e20362e Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 13 Sep 2024 00:17:41 +0530
Subject: [PATCH 0878/1141] bugfix listing records from a table with
 self-refrential fk

---
 db/sql/00_msar.sql      |  4 +--
 db/sql/test_00_msar.sql | 65 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 398664bfde..56d5b0aa75 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -4478,7 +4478,7 @@ SELECT 'jsonb_build_object(' || string_agg(
     $j$
     %1$L, jsonb_object_agg(
       summary_cte_%1$s.fkey, summary_cte_%1$s.summary
-    )
+    ) FILTER (WHERE summary_cte_%1$s.fkey IS NOT NULL)
     $j$,
     conkey
   ), ', '
@@ -4491,7 +4491,7 @@ CREATE OR REPLACE FUNCTION
 msar.build_self_summary_json_expr(tab_id oid) RETURNS TEXT AS $$/*
 */
 SELECT CASE WHEN quote_ident(msar.get_selectable_pkey_attnum(tab_id)::text) IS NOT NULL THEN
-  'jsonb_object_agg(summary_cte_self.key, summary_cte_self.summary)'
+  'jsonb_object_agg(summary_cte_self.key, summary_cte_self.summary) FILTER (WHERE summary_cte_self.key IS NOT NULL)'
 END;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 1ce62ec758..7751b705c7 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -3064,6 +3064,26 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+CREATE OR REPLACE FUNCTION __setup_table_with_self_referential_fk() RETURNS SETOF TEXT AS $$
+BEGIN
+CREATE TABLE categories (
+  id serial primary key,
+  name TEXT,
+  parent INT REFERENCES categories(id)
+);
+INSERT INTO categories (id, parent, name) VALUES
+( 1,  NULL, 'Tools'),
+( 2,  1   , 'Power tools'),
+( 3,  1   , 'Hand tools'),
+( 4,  2   , 'Drills'),
+( 5,  3   , 'Screwdrivers'),
+( 6,  3   , 'Wrenches');
+-- Reset sequence:
+PERFORM setval('categories_id_seq', (SELECT max(id) FROM categories));
+END;
+$$ LANGUAGE plpgsql;
+
+
 CREATE OR REPLACE FUNCTION test_list_records_from_table() RETURNS SETOF TEXT AS $$
 DECLARE
   rel_id oid;
@@ -3401,6 +3421,51 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+CREATE OR REPLACE FUNCTION test_list_records_for_table_with_self_referential_fk() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+BEGIN
+  PERFORM __setup_table_with_self_referential_fk();
+  rel_id := 'categories'::regclass::oid;
+  RETURN NEXT is(
+    msar.list_records_from_table(
+      tab_id => rel_id,
+      limit_ => 10,
+      offset_ => null,
+      order_ => null,
+      filter_ => null,
+      group_ => null
+    ),
+    $j${
+     "count": 6,
+     "results": [
+        {"1": 1, "2": "Tools", "3": null},
+        {"1": 2, "2": "Power tools", "3": 1},
+        {"1": 3, "2": "Hand tools", "3": 1},
+        {"1": 4, "2": "Drills", "3": 2},
+        {"1": 5, "2": "Screwdrivers", "3": 3},
+        {"1": 6, "2": "Wrenches", "3": 3}
+     ],
+     "grouping": null,
+     "record_summaries": null,
+     "linked_record_summaries": {
+        "3": {
+          "1": "Tools",
+          "2": "Power tools",
+          "3": "Hand tools"
+        }
+     }
+    }$j$ || jsonb_build_object(
+      'query', concat(
+        'SELECT msar.format_data(id) AS "1", msar.format_data(name) AS "2",'
+        ' msar.format_data(parent) AS "3" FROM public.categories  ORDER BY "1" ASC LIMIT ''10'' OFFSET NULL'
+      )
+    )
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
 -- msar.build_order_by_expr ------------------------------------------------------------------------
 
 CREATE OR REPLACE FUNCTION test_build_order_by_expr() RETURNS SETOF TEXT AS $$

From 01346979c0ca9da2d85e0831b855b8032572ae27 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 13 Sep 2024 02:19:52 +0530
Subject: [PATCH 0879/1141] return DatabaseInfo if transferring ownership
 succeeds

---
 db/roles/operations/ownership.py     | 2 +-
 db/sql/00_msar.sql                   | 4 +++-
 mathesar/rpc/databases/privileges.py | 9 +++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/db/roles/operations/ownership.py b/db/roles/operations/ownership.py
index 6d739e9042..560df23dfc 100644
--- a/db/roles/operations/ownership.py
+++ b/db/roles/operations/ownership.py
@@ -2,4 +2,4 @@
 
 
 def transfer_database_ownership(new_owner_oid, conn):
-    exec_msar_func(conn, 'transfer_database_ownership', new_owner_oid)
+    return exec_msar_func(conn, 'transfer_database_ownership', new_owner_oid).fetchone()[0]
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 3eec9b14fd..e656232de1 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1434,8 +1434,9 @@ END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
+DROP FUNCTION IF EXISTS msar.transfer_database_ownership(regrole);
 CREATE OR REPLACE FUNCTION
-msar.transfer_database_ownership(new_owner_oid regrole) RETURNS void AS $$/*
+msar.transfer_database_ownership(new_owner_oid regrole) RETURNS jsonb AS $$/*
 Transfers ownership of the current database to a new owner.
 
 Args:
@@ -1453,6 +1454,7 @@ BEGIN
     pg_catalog.current_database(),
     msar.get_role_name(new_owner_oid)
   );
+  RETURN msar.get_current_database_info();
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
diff --git a/mathesar/rpc/databases/privileges.py b/mathesar/rpc/databases/privileges.py
index 931692849b..6dd5f88a5c 100644
--- a/mathesar/rpc/databases/privileges.py
+++ b/mathesar/rpc/databases/privileges.py
@@ -6,6 +6,7 @@
 from db.roles.operations.select import list_db_priv
 from db.roles.operations.update import replace_database_privileges_for_roles
 from db.roles.operations.ownership import transfer_database_ownership
+from mathesar.rpc.databases.base import DatabaseInfo
 from mathesar.rpc.utils import connect
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 
@@ -84,7 +85,7 @@ def replace_for_roles(
 @rpc_method(name="databases.privileges.transfer_ownership")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def transfer_ownership(*, new_owner_oid: int, database_id: int, **kwargs) -> None:
+def transfer_ownership(*, new_owner_oid: int, database_id: int, **kwargs) -> DatabaseInfo:
     """
     Transfers ownership of the current database to a new owner.
 
@@ -97,7 +98,11 @@ def transfer_ownership(*, new_owner_oid: int, database_id: int, **kwargs) -> Non
         - Be a `MEMBER` of the new owning role. i.e. The current role should be able to `SET ROLE`
           to the new owning role.
         - Have `CREATEDB` privilege.
+
+    Returns:
+        Information about the database, and the current user privileges.
     """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
-        transfer_database_ownership(new_owner_oid, conn)
+        db_info = transfer_database_ownership(new_owner_oid, conn)
+    return DatabaseInfo.from_dict(db_info)

From 39401b47089cfbd4524eaa90132a7886621f4d1f Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 12 Sep 2024 20:22:23 -0400
Subject: [PATCH 0880/1141] Hard-code type cast map on front end

---
 .../AbstractTypeSelector.svelte               |  11 +-
 .../abstract-types/abstractTypeCategories.ts  |   5 +-
 .../stores/abstract-types/abstractTypesMap.ts |  47 +-
 .../src/stores/abstract-types/dbTypes.ts      |  47 ++
 .../abstract-types/type-configs/datetime.ts   |   6 +-
 .../abstract-types/type-configs/email.ts      |   3 +-
 .../abstract-types/type-configs/money.ts      |   8 +-
 .../abstract-types/type-configs/number.ts     |  11 +-
 .../abstract-types/type-configs/text.ts       |  23 +-
 .../abstract-types/type-configs/time.ts       |   6 +-
 .../stores/abstract-types/type-configs/uri.ts |   7 +-
 .../src/stores/abstract-types/typeCastMap.ts  | 430 ++++++++++++++++++
 12 files changed, 528 insertions(+), 76 deletions(-)
 create mode 100644 mathesar_ui/src/stores/abstract-types/dbTypes.ts
 create mode 100644 mathesar_ui/src/stores/abstract-types/typeCastMap.ts

diff --git a/mathesar_ui/src/components/abstract-type-control/AbstractTypeSelector.svelte b/mathesar_ui/src/components/abstract-type-control/AbstractTypeSelector.svelte
index a71c0932d8..6657d47669 100644
--- a/mathesar_ui/src/components/abstract-type-control/AbstractTypeSelector.svelte
+++ b/mathesar_ui/src/components/abstract-type-control/AbstractTypeSelector.svelte
@@ -7,6 +7,7 @@
     abstractTypesMap,
     getAllowedAbstractTypesForDbTypeAndItsTargetTypes,
   } from '@mathesar/stores/abstract-types';
+  import { typeCastMap } from '@mathesar/stores/abstract-types/typeCastMap';
   import type { AbstractType } from '@mathesar/stores/abstract-types/types';
   import { LabeledInput, Select } from '@mathesar-component-library';
 
@@ -26,15 +27,7 @@
 
   $: allowedTypeConversions = getAllowedAbstractTypesForDbTypeAndItsTargetTypes(
     column.type,
-
-    // TODO_BETA
-    //
-    // We need to find another way to get the valid target types for a column
-    // since the RPC API no longer returns this.
-
-    // column.valid_target_types ?? [],
-    [],
-
+    typeCastMap[column.type] ?? [],
     abstractTypesMap,
   ).filter((item) => !['jsonlist', 'map'].includes(item.identifier));
 
diff --git a/mathesar_ui/src/stores/abstract-types/abstractTypeCategories.ts b/mathesar_ui/src/stores/abstract-types/abstractTypeCategories.ts
index 68817bf3c3..a1d7c4d0e6 100644
--- a/mathesar_ui/src/stores/abstract-types/abstractTypeCategories.ts
+++ b/mathesar_ui/src/stores/abstract-types/abstractTypeCategories.ts
@@ -1,6 +1,7 @@
 import type { DbType } from '@mathesar/AppTypes';
 
 import { abstractTypeCategory } from './constants';
+import { DB_TYPES } from './dbTypes';
 import Boolean from './type-configs/boolean';
 import arrayFactory from './type-configs/comboTypes/arrayFactory';
 import jsonArrayFactory from './type-configs/comboTypes/jsonArrayFactory';
@@ -12,7 +13,7 @@ import Email from './type-configs/email';
 import Fallback from './type-configs/fallback';
 import Money from './type-configs/money';
 import Number from './type-configs/number';
-import Text, { DB_TYPES as textDbTypes } from './type-configs/text';
+import Text from './type-configs/text';
 import Time from './type-configs/time';
 import Uri from './type-configs/uri';
 import type {
@@ -50,7 +51,7 @@ const comboAbstractTypeCategories: Partial<
   [abstractTypeCategory.JsonObject]: jsonObjectFactory,
 };
 
-export const defaultDbType = textDbTypes.TEXT;
+export const defaultDbType = DB_TYPES.TEXT;
 
 export function constructAbstractTypeMapFromResponse(
   abstractTypesResponse: AbstractTypeResponse[],
diff --git a/mathesar_ui/src/stores/abstract-types/abstractTypesMap.ts b/mathesar_ui/src/stores/abstract-types/abstractTypesMap.ts
index a38f74810d..e9130bbc2c 100644
--- a/mathesar_ui/src/stores/abstract-types/abstractTypesMap.ts
+++ b/mathesar_ui/src/stores/abstract-types/abstractTypesMap.ts
@@ -1,4 +1,5 @@
 import { constructAbstractTypeMapFromResponse } from './abstractTypeCategories';
+import { DB_TYPES } from './dbTypes';
 import type { AbstractTypeResponse } from './types';
 
 /**
@@ -10,78 +11,84 @@ const typesResponse: AbstractTypeResponse[] = [
   {
     identifier: 'boolean',
     name: 'Boolean',
-    db_types: ['boolean'],
+    db_types: [DB_TYPES.BOOLEAN],
   },
   {
     identifier: 'date',
     name: 'Date',
-    db_types: ['date'],
+    db_types: [DB_TYPES.DATE],
   },
   {
     identifier: 'time',
     name: 'Time',
-    db_types: ['time with time zone', 'time without time zone'],
+    db_types: [DB_TYPES.TIME_WITH_TZ, DB_TYPES.TIME_WITHOUT_TZ],
   },
   {
     identifier: 'datetime',
     name: 'Date & Time',
-    db_types: ['timestamp with time zone', 'timestamp without time zone'],
+    db_types: [DB_TYPES.TIMESTAMP_WITH_TZ, DB_TYPES.TIMESTAMP_WITHOUT_TZ],
   },
   {
     identifier: 'duration',
     name: 'Duration',
-    db_types: ['interval'],
+    db_types: [DB_TYPES.INTERVAL],
   },
   {
     identifier: 'email',
     name: 'Email',
-    db_types: ['mathesar_types.email'],
+    db_types: [DB_TYPES.MSAR__EMAIL],
   },
   {
     identifier: 'money',
     name: 'Money',
     db_types: [
-      'mathesar_types.multicurrency_money',
-      'mathesar_types.mathesar_money',
-      'money',
+      DB_TYPES.MONEY,
+      DB_TYPES.MSAR__MATHESAR_MONEY,
+      DB_TYPES.MSAR__MULTICURRENCY_MONEY,
     ],
   },
   {
     identifier: 'number',
     name: 'Number',
     db_types: [
-      'double precision',
-      'real',
-      'smallint',
-      'bigint',
-      'integer',
-      'numeric',
+      DB_TYPES.DOUBLE_PRECISION,
+      DB_TYPES.REAL,
+      DB_TYPES.SMALLINT,
+      DB_TYPES.BIGINT,
+      DB_TYPES.INTEGER,
+      DB_TYPES.NUMERIC,
     ],
   },
   {
     identifier: 'text',
     name: 'Text',
-    db_types: ['text', 'character', '"char"', 'name', 'character varying'],
+    db_types: [
+      DB_TYPES.CHAR,
+      DB_TYPES.CHARACTER_VARYING,
+      DB_TYPES.CHARACTER,
+      DB_TYPES.NAME,
+      DB_TYPES.TEXT,
+    ],
   },
   {
     identifier: 'uri',
     name: 'URI',
-    db_types: ['mathesar_types.uri'],
+    db_types: [DB_TYPES.MSAR__URI],
   },
   {
     identifier: 'jsonlist',
     name: 'JSON List',
-    db_types: ['mathesar_types.mathesar_json_array'],
+    db_types: [DB_TYPES.MSAR__MATHESAR_JSON_ARRAY],
   },
   {
     identifier: 'map',
     name: 'Map',
-    db_types: ['mathesar_types.mathesar_json_object'],
+    db_types: [DB_TYPES.MSAR__MATHESAR_JSON_OBJECT],
   },
   {
     identifier: 'array',
     name: 'Array',
-    db_types: ['_array'],
+    db_types: [DB_TYPES.ARRAY],
   },
 ];
 
diff --git a/mathesar_ui/src/stores/abstract-types/dbTypes.ts b/mathesar_ui/src/stores/abstract-types/dbTypes.ts
new file mode 100644
index 0000000000..19a4621286
--- /dev/null
+++ b/mathesar_ui/src/stores/abstract-types/dbTypes.ts
@@ -0,0 +1,47 @@
+export const DB_TYPES = {
+  ARRAY: '_array',
+  BIGINT: 'bigint',
+  BIT: 'bit',
+  BOOLEAN: 'boolean',
+  BYTEA: 'bytea',
+  CHAR: '"char"',
+  CHARACTER_VARYING: 'character varying',
+  CHARACTER: 'character',
+  CIDR: 'cidr',
+  DATE: 'date',
+  DATERANGE: 'daterange',
+  DECIMAL: 'decimal',
+  DOUBLE_PRECISION: 'double precision',
+  INET: 'inet',
+  INT4RANGE: 'int4range',
+  INT8RANGE: 'int8range',
+  INTEGER: 'integer',
+  INTERVAL: 'interval',
+  JSON: 'json',
+  JSONB: 'jsonb',
+  LINE: 'line',
+  MACADDR: 'macaddr',
+  MONEY: 'money',
+  MSAR__EMAIL: 'mathesar_types.email',
+  MSAR__MATHESAR_JSON_ARRAY: 'mathesar_types.mathesar_json_array',
+  MSAR__MATHESAR_JSON_OBJECT: 'mathesar_types.mathesar_json_object',
+  MSAR__MATHESAR_MONEY: 'mathesar_types.mathesar_money',
+  MSAR__MULTICURRENCY_MONEY: 'mathesar_types.multicurrency_money',
+  MSAR__URI: 'mathesar_types.uri',
+  NAME: 'name',
+  NUMERIC: 'numeric',
+  NUMRANGE: 'numrange',
+  OID: 'oid',
+  REAL: 'real',
+  REGCLASS: 'regclass',
+  SMALLINT: 'smallint',
+  TEXT: 'text',
+  TIME_WITH_TZ: 'time with time zone',
+  TIME_WITHOUT_TZ: 'time without time zone',
+  TIMESTAMP_WITH_TZ: 'timestamp with time zone',
+  TIMESTAMP_WITHOUT_TZ: 'timestamp without time zone',
+  TSRANGE: 'tsrange',
+  TSTZRANGE: 'tstzrange',
+  TSVECTOR: 'tsvector',
+  UUID: 'uuid',
+};
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/datetime.ts b/mathesar_ui/src/stores/abstract-types/type-configs/datetime.ts
index 1f366a2740..97602bc710 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/datetime.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/datetime.ts
@@ -7,6 +7,7 @@ import {
 import { iconUiTypeDateTime } from '@mathesar/icons';
 import type { FormValues } from '@mathesar-component-library/types';
 
+import { DB_TYPES } from '../dbTypes';
 import type {
   AbstractTypeConfigForm,
   AbstractTypeConfiguration,
@@ -15,11 +16,6 @@ import type {
 
 import { getDateFormatOptions, getTimeFormatOptions } from './utils';
 
-const DB_TYPES = {
-  TIMESTAMP_WITH_TZ: 'timestamp with time zone',
-  TIMESTAMP_WITHOUT_TZ: 'timestamp without time zone',
-};
-
 const dbForm: AbstractTypeConfigForm = {
   variables: {
     supportTimeZones: {
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/email.ts b/mathesar_ui/src/stores/abstract-types/type-configs/email.ts
index d9a8485424..367161f280 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/email.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/email.ts
@@ -1,10 +1,11 @@
 import { iconUiTypeEmail } from '@mathesar/icons';
 
+import { DB_TYPES } from '../dbTypes';
 import type { AbstractTypeConfiguration } from '../types';
 
 const emailType: AbstractTypeConfiguration = {
   getIcon: () => ({ ...iconUiTypeEmail, label: 'Email' }),
-  defaultDbType: 'mathesar_types.email',
+  defaultDbType: DB_TYPES.MSAR__EMAIL,
   cellInfo: {
     type: 'string',
   },
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/money.ts b/mathesar_ui/src/stores/abstract-types/type-configs/money.ts
index 789dbea426..4f60809c01 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/money.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/money.ts
@@ -8,6 +8,7 @@ import {
 import { iconUiTypeMoney } from '@mathesar/icons';
 import type { FormValues } from '@mathesar-component-library/types';
 
+import { DB_TYPES } from '../dbTypes';
 import type {
   AbstractTypeConfigForm,
   AbstractTypeConfiguration,
@@ -15,11 +16,6 @@ import type {
 
 import { getDecimalPlaces } from './number';
 
-const DB_TYPES = {
-  MONEY: 'MONEY',
-  MATHESAR_TYPES__MATHESAR_MONEY: 'MATHESAR_TYPES.MATHESAR_MONEY',
-};
-
 const displayForm: AbstractTypeConfigForm = {
   variables: {
     currencySymbol: {
@@ -141,7 +137,7 @@ const moneyType: AbstractTypeConfiguration = {
   cellInfo: {
     type: 'money',
   },
-  defaultDbType: DB_TYPES.MATHESAR_TYPES__MATHESAR_MONEY,
+  defaultDbType: DB_TYPES.MSAR__MATHESAR_MONEY,
   getDisplayConfig: () => ({
     form: displayForm,
     determineDisplayOptions,
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/number.ts b/mathesar_ui/src/stores/abstract-types/type-configs/number.ts
index 0986c592ce..37c1639c04 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/number.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/number.ts
@@ -8,22 +8,13 @@ import type { DbType } from '@mathesar/AppTypes';
 import { iconUiTypeNumber } from '@mathesar/icons';
 import type { FormValues } from '@mathesar-component-library/types';
 
+import { DB_TYPES } from '../dbTypes';
 import type {
   AbstractTypeConfigForm,
   AbstractTypeConfiguration,
   AbstractTypeDbConfig,
 } from '../types';
 
-const DB_TYPES = {
-  DECIMAL: 'decimal',
-  NUMERIC: 'numeric',
-  INTEGER: 'integer',
-  SMALLINT: 'smallint',
-  BIGINT: 'bigint',
-  REAL: 'real',
-  DOUBLE_PRECISION: 'double precision',
-};
-
 const dbForm: AbstractTypeConfigForm = {
   variables: {
     numberType: {
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/text.ts b/mathesar_ui/src/stores/abstract-types/type-configs/text.ts
index 5dbd4fdb56..7cfcd8af03 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/text.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/text.ts
@@ -3,18 +3,13 @@ import type { DbType } from '@mathesar/AppTypes';
 import { iconUiTypeText } from '@mathesar/icons';
 import type { FormValues } from '@mathesar-component-library/types';
 
+import { DB_TYPES } from '../dbTypes';
 import type {
   AbstractTypeConfigForm,
   AbstractTypeConfiguration,
   AbstractTypeDbConfig,
 } from '../types';
 
-export const DB_TYPES = {
-  VARCHAR: 'character varying',
-  CHAR: 'character',
-  TEXT: 'text',
-};
-
 const dbForm: AbstractTypeConfigForm = {
   variables: {
     restrictFieldSize: {
@@ -61,10 +56,12 @@ function determineDbType(dbFormValues: FormValues, columnType: DbType): DbType {
       const integerValueOfLength =
         typeof length === 'string' ? parseInt(length, 10) : length;
       if (integerValueOfLength > 255) {
-        return DB_TYPES.VARCHAR;
+        return DB_TYPES.CHARACTER_VARYING;
       }
     }
-    return columnType === DB_TYPES.CHAR ? DB_TYPES.CHAR : DB_TYPES.VARCHAR;
+    return columnType === DB_TYPES.CHARACTER
+      ? DB_TYPES.CHARACTER
+      : DB_TYPES.CHARACTER_VARYING;
   }
   return DB_TYPES.TEXT;
 }
@@ -75,7 +72,7 @@ function determineDbTypeAndOptions(
 ): ReturnType<AbstractTypeDbConfig['determineDbTypeAndOptions']> {
   const dbType = determineDbType(dbFormValues, columnType);
   const typeOptions: Column['type_options'] = {};
-  if (dbType === DB_TYPES.CHAR || dbType === DB_TYPES.VARCHAR) {
+  if (dbType === DB_TYPES.CHARACTER || dbType === DB_TYPES.CHARACTER_VARYING) {
     typeOptions.length = Number(dbFormValues.length);
   }
   return {
@@ -89,8 +86,8 @@ function constructDbFormValuesFromTypeOptions(
   typeOptions: Column['type_options'],
 ): FormValues {
   switch (columnType) {
-    case DB_TYPES.CHAR:
-    case DB_TYPES.VARCHAR:
+    case DB_TYPES.CHARACTER:
+    case DB_TYPES.CHARACTER_VARYING:
       return {
         length: (typeOptions?.length as number) ?? null,
         restrictFieldSize: true,
@@ -104,14 +101,14 @@ function constructDbFormValuesFromTypeOptions(
 
 const textType: AbstractTypeConfiguration = {
   getIcon: () => ({ ...iconUiTypeText, label: 'Text' }),
-  defaultDbType: DB_TYPES.VARCHAR,
+  defaultDbType: DB_TYPES.CHARACTER_VARYING,
   cellInfo: {
     type: 'string',
     config: {
       multiLine: true,
     },
     conditionalConfig: {
-      [DB_TYPES.CHAR]: {
+      [DB_TYPES.CHARACTER]: {
         multiLine: false,
       },
     },
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/time.ts b/mathesar_ui/src/stores/abstract-types/type-configs/time.ts
index 42e739c7c3..ce121860c8 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/time.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/time.ts
@@ -6,6 +6,7 @@ import {
 import { iconUiTypeTime } from '@mathesar/icons';
 import type { FormValues } from '@mathesar-component-library/types';
 
+import { DB_TYPES } from '../dbTypes';
 import type {
   AbstractTypeConfigForm,
   AbstractTypeConfiguration,
@@ -14,11 +15,6 @@ import type {
 
 import { getTimeFormatOptions } from './utils';
 
-const DB_TYPES = {
-  TIME_WITH_TZ: 'time with time zone',
-  TIME_WITHOUT_TZ: 'time without time zone',
-};
-
 const dbForm: AbstractTypeConfigForm = {
   variables: {
     supportTimeZones: {
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/uri.ts b/mathesar_ui/src/stores/abstract-types/type-configs/uri.ts
index 0245b23b19..72d3fbd314 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/uri.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/uri.ts
@@ -1,14 +1,11 @@
 import { iconUiTypeUri } from '@mathesar/icons';
 
+import { DB_TYPES } from '../dbTypes';
 import type { AbstractTypeConfiguration } from '../types';
 
-const DB_TYPES = {
-  MATHESAR_TYPES__URI: 'mathesar_types.uri',
-};
-
 const uriType: AbstractTypeConfiguration = {
   getIcon: () => iconUiTypeUri,
-  defaultDbType: DB_TYPES.MATHESAR_TYPES__URI,
+  defaultDbType: DB_TYPES.MSAR__URI,
   cellInfo: {
     type: 'uri',
   },
diff --git a/mathesar_ui/src/stores/abstract-types/typeCastMap.ts b/mathesar_ui/src/stores/abstract-types/typeCastMap.ts
new file mode 100644
index 0000000000..f0b54ae27d
--- /dev/null
+++ b/mathesar_ui/src/stores/abstract-types/typeCastMap.ts
@@ -0,0 +1,430 @@
+import { DB_TYPES } from './dbTypes';
+
+export const typeCastMap = {
+  [DB_TYPES.BIGINT]: [
+    DB_TYPES.BIGINT,
+    DB_TYPES.BOOLEAN,
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.DOUBLE_PRECISION,
+    DB_TYPES.INTEGER,
+    DB_TYPES.MONEY,
+    DB_TYPES.MSAR__MATHESAR_MONEY,
+    DB_TYPES.MSAR__MULTICURRENCY_MONEY,
+    DB_TYPES.NUMERIC,
+    DB_TYPES.REAL,
+    DB_TYPES.SMALLINT,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.BIT]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.BOOLEAN]: [
+    DB_TYPES.BIGINT,
+    DB_TYPES.BOOLEAN,
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.DOUBLE_PRECISION,
+    DB_TYPES.INTEGER,
+    DB_TYPES.NUMERIC,
+    DB_TYPES.REAL,
+    DB_TYPES.SMALLINT,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.BYTEA]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.CHAR]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.CHARACTER_VARYING]: [
+    DB_TYPES.BIGINT,
+    DB_TYPES.BOOLEAN,
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.DATE,
+    DB_TYPES.DOUBLE_PRECISION,
+    DB_TYPES.INTEGER,
+    DB_TYPES.INTERVAL,
+    DB_TYPES.JSON,
+    DB_TYPES.JSONB,
+    DB_TYPES.MONEY,
+    DB_TYPES.MSAR__EMAIL,
+    DB_TYPES.MSAR__MATHESAR_JSON_ARRAY,
+    DB_TYPES.MSAR__MATHESAR_JSON_OBJECT,
+    DB_TYPES.MSAR__MATHESAR_MONEY,
+    DB_TYPES.MSAR__MULTICURRENCY_MONEY,
+    DB_TYPES.MSAR__URI,
+    DB_TYPES.NUMERIC,
+    DB_TYPES.REAL,
+    DB_TYPES.SMALLINT,
+    DB_TYPES.TEXT,
+    DB_TYPES.TIME_WITH_TZ,
+    DB_TYPES.TIME_WITHOUT_TZ,
+    DB_TYPES.TIMESTAMP_WITH_TZ,
+    DB_TYPES.TIMESTAMP_WITHOUT_TZ,
+  ],
+
+  [DB_TYPES.CHARACTER]: [
+    DB_TYPES.BIGINT,
+    DB_TYPES.BOOLEAN,
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.DATE,
+    DB_TYPES.DOUBLE_PRECISION,
+    DB_TYPES.INTEGER,
+    DB_TYPES.INTERVAL,
+    DB_TYPES.JSON,
+    DB_TYPES.JSONB,
+    DB_TYPES.MONEY,
+    DB_TYPES.MSAR__EMAIL,
+    DB_TYPES.MSAR__MATHESAR_JSON_ARRAY,
+    DB_TYPES.MSAR__MATHESAR_JSON_OBJECT,
+    DB_TYPES.MSAR__MATHESAR_MONEY,
+    DB_TYPES.MSAR__MULTICURRENCY_MONEY,
+    DB_TYPES.MSAR__URI,
+    DB_TYPES.NUMERIC,
+    DB_TYPES.REAL,
+    DB_TYPES.SMALLINT,
+    DB_TYPES.TEXT,
+    DB_TYPES.TIMESTAMP_WITH_TZ,
+    DB_TYPES.TIMESTAMP_WITHOUT_TZ,
+  ],
+
+  [DB_TYPES.CIDR]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.DATE]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.DATE,
+    DB_TYPES.TEXT,
+    DB_TYPES.TIMESTAMP_WITHOUT_TZ,
+  ],
+
+  [DB_TYPES.DATERANGE]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.DOUBLE_PRECISION]: [
+    DB_TYPES.BIGINT,
+    DB_TYPES.BOOLEAN,
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.DOUBLE_PRECISION,
+    DB_TYPES.INTEGER,
+    DB_TYPES.MONEY,
+    DB_TYPES.MSAR__MATHESAR_MONEY,
+    DB_TYPES.MSAR__MULTICURRENCY_MONEY,
+    DB_TYPES.NUMERIC,
+    DB_TYPES.REAL,
+    DB_TYPES.SMALLINT,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.INET]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.INT4RANGE]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.INT8RANGE]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.INTEGER]: [
+    DB_TYPES.BIGINT,
+    DB_TYPES.BOOLEAN,
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.DOUBLE_PRECISION,
+    DB_TYPES.INTEGER,
+    DB_TYPES.MONEY,
+    DB_TYPES.MSAR__MATHESAR_MONEY,
+    DB_TYPES.MSAR__MULTICURRENCY_MONEY,
+    DB_TYPES.NUMERIC,
+    DB_TYPES.REAL,
+    DB_TYPES.SMALLINT,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.INTERVAL]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.INTERVAL,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.JSON]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.JSON,
+    DB_TYPES.JSONB,
+    DB_TYPES.MSAR__MATHESAR_JSON_ARRAY,
+    DB_TYPES.MSAR__MATHESAR_JSON_OBJECT,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.JSONB]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.JSON,
+    DB_TYPES.JSONB,
+    DB_TYPES.MSAR__MATHESAR_JSON_ARRAY,
+    DB_TYPES.MSAR__MATHESAR_JSON_OBJECT,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.MACADDR]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.MSAR__EMAIL]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.MSAR__EMAIL,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.MSAR__MATHESAR_JSON_ARRAY]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.JSON,
+    DB_TYPES.JSONB,
+    DB_TYPES.MSAR__MATHESAR_JSON_ARRAY,
+    DB_TYPES.MSAR__MATHESAR_JSON_OBJECT,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.MSAR__MATHESAR_JSON_OBJECT]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.JSON,
+    DB_TYPES.JSONB,
+    DB_TYPES.MSAR__MATHESAR_JSON_ARRAY,
+    DB_TYPES.MSAR__MATHESAR_JSON_OBJECT,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.MSAR__MATHESAR_MONEY]: [
+    DB_TYPES.BIGINT,
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.DOUBLE_PRECISION,
+    DB_TYPES.INTEGER,
+    DB_TYPES.MONEY,
+    DB_TYPES.MSAR__MATHESAR_MONEY,
+    DB_TYPES.MSAR__MULTICURRENCY_MONEY,
+    DB_TYPES.NUMERIC,
+    DB_TYPES.REAL,
+    DB_TYPES.SMALLINT,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.MSAR__MULTICURRENCY_MONEY]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.MSAR__MULTICURRENCY_MONEY,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.MSAR__URI]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.MSAR__URI,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.MONEY]: [
+    DB_TYPES.BIGINT,
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.DOUBLE_PRECISION,
+    DB_TYPES.INTEGER,
+    DB_TYPES.MONEY,
+    DB_TYPES.MSAR__MATHESAR_MONEY,
+    DB_TYPES.MSAR__MULTICURRENCY_MONEY,
+    DB_TYPES.NUMERIC,
+    DB_TYPES.REAL,
+    DB_TYPES.SMALLINT,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.NUMERIC]: [
+    DB_TYPES.BIGINT,
+    DB_TYPES.BOOLEAN,
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.DOUBLE_PRECISION,
+    DB_TYPES.INTEGER,
+    DB_TYPES.MONEY,
+    DB_TYPES.MSAR__MATHESAR_MONEY,
+    DB_TYPES.MSAR__MULTICURRENCY_MONEY,
+    DB_TYPES.NUMERIC,
+    DB_TYPES.REAL,
+    DB_TYPES.SMALLINT,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.NUMRANGE]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.OID]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.REAL]: [
+    DB_TYPES.BIGINT,
+    DB_TYPES.BOOLEAN,
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.DOUBLE_PRECISION,
+    DB_TYPES.INTEGER,
+    DB_TYPES.MONEY,
+    DB_TYPES.MSAR__MATHESAR_MONEY,
+    DB_TYPES.MSAR__MULTICURRENCY_MONEY,
+    DB_TYPES.NUMERIC,
+    DB_TYPES.REAL,
+    DB_TYPES.SMALLINT,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.REGCLASS]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.SMALLINT]: [
+    DB_TYPES.BIGINT,
+    DB_TYPES.BOOLEAN,
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.DOUBLE_PRECISION,
+    DB_TYPES.INTEGER,
+    DB_TYPES.MONEY,
+    DB_TYPES.MSAR__MATHESAR_MONEY,
+    DB_TYPES.MSAR__MULTICURRENCY_MONEY,
+    DB_TYPES.NUMERIC,
+    DB_TYPES.REAL,
+    DB_TYPES.SMALLINT,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.TEXT]: [
+    DB_TYPES.BIGINT,
+    DB_TYPES.BOOLEAN,
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.DATE,
+    DB_TYPES.DOUBLE_PRECISION,
+    DB_TYPES.INTEGER,
+    DB_TYPES.INTERVAL,
+    DB_TYPES.JSON,
+    DB_TYPES.JSONB,
+    DB_TYPES.MONEY,
+    DB_TYPES.MSAR__EMAIL,
+    DB_TYPES.MSAR__MATHESAR_JSON_ARRAY,
+    DB_TYPES.MSAR__MATHESAR_JSON_OBJECT,
+    DB_TYPES.MSAR__MATHESAR_MONEY,
+    DB_TYPES.MSAR__MULTICURRENCY_MONEY,
+    DB_TYPES.MSAR__URI,
+    DB_TYPES.NUMERIC,
+    DB_TYPES.REAL,
+    DB_TYPES.SMALLINT,
+    DB_TYPES.TEXT,
+    DB_TYPES.TIME_WITH_TZ,
+    DB_TYPES.TIME_WITHOUT_TZ,
+    DB_TYPES.TIMESTAMP_WITH_TZ,
+    DB_TYPES.TIMESTAMP_WITHOUT_TZ,
+  ],
+
+  [DB_TYPES.TIME_WITH_TZ]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.TEXT,
+    DB_TYPES.TIME_WITH_TZ,
+    DB_TYPES.TIME_WITHOUT_TZ,
+  ],
+
+  [DB_TYPES.TIME_WITHOUT_TZ]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.TEXT,
+    DB_TYPES.TIME_WITH_TZ,
+    DB_TYPES.TIME_WITHOUT_TZ,
+  ],
+
+  [DB_TYPES.TIMESTAMP_WITH_TZ]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.DATE,
+    DB_TYPES.TEXT,
+    DB_TYPES.TIMESTAMP_WITH_TZ,
+    DB_TYPES.TIMESTAMP_WITHOUT_TZ,
+  ],
+
+  [DB_TYPES.TIMESTAMP_WITHOUT_TZ]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.DATE,
+    DB_TYPES.TEXT,
+    DB_TYPES.TIMESTAMP_WITH_TZ,
+    DB_TYPES.TIMESTAMP_WITHOUT_TZ,
+  ],
+
+  [DB_TYPES.TSRANGE]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.TSTZRANGE]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.TSVECTOR]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.TEXT,
+  ],
+
+  [DB_TYPES.UUID]: [
+    DB_TYPES.CHARACTER_VARYING,
+    DB_TYPES.CHARACTER,
+    DB_TYPES.TEXT,
+  ],
+};

From 41ef0cc49b5b2e16afab0efd68da03bc3d3dc034 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 13 Sep 2024 16:04:42 +0530
Subject: [PATCH 0881/1141] fix test

---
 mathesar/tests/rpc/test_database_privileges.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/mathesar/tests/rpc/test_database_privileges.py b/mathesar/tests/rpc/test_database_privileges.py
index abb43bf274..f836a54edd 100644
--- a/mathesar/tests/rpc/test_database_privileges.py
+++ b/mathesar/tests/rpc/test_database_privileges.py
@@ -77,6 +77,13 @@ def mock_tansfer_db_ownership(
     ):
         if new_owner_oid != _new_owner_oid:
             raise AssertionError('incorrect parameters passed')
+        return {
+            'oid': 1988103,
+            'name': 'mathesar',
+            'owner_oid': new_owner_oid,
+            'current_role_priv': ['CONNECT', 'CREATE', 'TEMPORARY'],
+            'current_role_owns': True
+        }
 
     monkeypatch.setattr(privileges, 'connect', mock_connect)
     monkeypatch.setattr(

From 5488e970110a370db1565939d9c19310b65b6e76 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 13 Sep 2024 17:17:05 +0530
Subject: [PATCH 0882/1141] change get_schemas->list_schemas

---
 db/schemas/operations/select.py |  4 ++--
 db/sql/test_00_msar.sql         | 16 ++++++++--------
 mathesar/rpc/schemas/base.py    |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/db/schemas/operations/select.py b/db/schemas/operations/select.py
index 046fbbc015..550493e468 100644
--- a/db/schemas/operations/select.py
+++ b/db/schemas/operations/select.py
@@ -6,8 +6,8 @@
 from db.connection import exec_msar_func
 
 
-def get_schemas(conn):
-    return exec_msar_func(conn, 'get_schemas').fetchone()[0]
+def list_schemas(conn):
+    return exec_msar_func(conn, 'list_schemas').fetchone()[0]
 
 
 def reflect_schema(engine, name=None, oid=None, metadata=None):
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 7751b705c7..ee9285a4e4 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -2784,20 +2784,20 @@ END;
 $$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION test_get_schemas() RETURNS SETOF TEXT AS $$
+CREATE OR REPLACE FUNCTION test_list_schemas() RETURNS SETOF TEXT AS $$
 DECLARE
   initial_schema_count int;
   foo_schema jsonb;
 BEGIN
   -- Get the initial schema count
-  SELECT jsonb_array_length(msar.get_schemas()) INTO initial_schema_count;
+  SELECT jsonb_array_length(msar.list_schemas()) INTO initial_schema_count;
 
   -- Create a schema
   CREATE SCHEMA foo;
   -- We should now have one additional schema
-  RETURN NEXT is(jsonb_array_length(msar.get_schemas()), initial_schema_count + 1);
+  RETURN NEXT is(jsonb_array_length(msar.list_schemas()), initial_schema_count + 1);
   -- Reflect the "foo" schema
-  SELECT jsonb_path_query(msar.get_schemas(), '$[*] ? (@.name == "foo")') INTO foo_schema;
+  SELECT jsonb_path_query(msar.list_schemas(), '$[*] ? (@.name == "foo")') INTO foo_schema;
   -- We should have a foo schema object
   RETURN NEXT is(jsonb_typeof(foo_schema), 'object');
   -- It should have no description
@@ -2811,7 +2811,7 @@ BEGIN
   CREATE TABLE foo.test_table_1 (id serial PRIMARY KEY);
   CREATE TABLE foo.test_table_2 (id serial PRIMARY KEY);
   -- Reflect again
-  SELECT jsonb_path_query(msar.get_schemas(), '$[*] ? (@.name == "foo")') INTO foo_schema;
+  SELECT jsonb_path_query(msar.list_schemas(), '$[*] ? (@.name == "foo")') INTO foo_schema;
   -- We should see the description we set
   RETURN NEXT is(foo_schema->'description'#>>'{}', 'A test schema');
   -- We should see two tables
@@ -2821,16 +2821,16 @@ BEGIN
   DROP TABLE foo.test_table_1;
   DROP TABLE foo.test_table_2;
   -- Reflect the "foo" schema
-  SELECT jsonb_path_query(msar.get_schemas(), '$[*] ? (@.name == "foo")') INTO foo_schema;
+  SELECT jsonb_path_query(msar.list_schemas(), '$[*] ? (@.name == "foo")') INTO foo_schema;
   -- The "foo" schema should now have no tables
   RETURN NEXT is((foo_schema->'table_count')::int, 0);
 
   -- Drop the "foo" schema
   DROP SCHEMA foo;
   -- We should now have no "foo" schema
-  RETURN NEXT ok(NOT jsonb_path_exists(msar.get_schemas(), '$[*] ? (@.name == "foo")'));
+  RETURN NEXT ok(NOT jsonb_path_exists(msar.list_schemas(), '$[*] ? (@.name == "foo")'));
   -- We should see the initial schema count again
-  RETURN NEXT is(jsonb_array_length(msar.get_schemas()), initial_schema_count);
+  RETURN NEXT is(jsonb_array_length(msar.list_schemas()), initial_schema_count);
 END;
 $$ LANGUAGE plpgsql;
 
diff --git a/mathesar/rpc/schemas/base.py b/mathesar/rpc/schemas/base.py
index 733f908ac3..8c6a77d035 100644
--- a/mathesar/rpc/schemas/base.py
+++ b/mathesar/rpc/schemas/base.py
@@ -8,7 +8,7 @@
 
 from db.constants import INTERNAL_SCHEMAS
 from db.schemas.operations.create import create_schema
-from db.schemas.operations.select import get_schemas
+from db.schemas.operations.select import list_schemas
 from db.schemas.operations.drop import drop_schema_via_oid
 from db.schemas.operations.alter import patch_schema
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
@@ -93,7 +93,7 @@ def list_(*, database_id: int, **kwargs) -> list[SchemaInfo]:
     """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
-        schemas = get_schemas(conn)
+        schemas = list_schemas(conn)
 
     return [s for s in schemas if s['name'] not in INTERNAL_SCHEMAS]
 

From eb7cb96a0c2e5bc808fc13b16749575f43e6b1d7 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 13 Sep 2024 20:27:38 +0530
Subject: [PATCH 0883/1141] add sql functions to transfer ownership for sch and
 tab and wire them up to python

---
 db/roles/operations/ownership.py |   8 ++
 db/sql/00_msar.sql               | 134 ++++++++++++++++++++++++-------
 2 files changed, 115 insertions(+), 27 deletions(-)

diff --git a/db/roles/operations/ownership.py b/db/roles/operations/ownership.py
index 560df23dfc..bdde2248ba 100644
--- a/db/roles/operations/ownership.py
+++ b/db/roles/operations/ownership.py
@@ -3,3 +3,11 @@
 
 def transfer_database_ownership(new_owner_oid, conn):
     return exec_msar_func(conn, 'transfer_database_ownership', new_owner_oid).fetchone()[0]
+
+
+def transfer_schema_ownership(schema_oid, new_owner_oid, conn):
+    return exec_msar_func(conn, 'transfer_schema_ownership', schema_oid, new_owner_oid).fetchone()[0]
+
+
+def transfer_table_ownership(table_oid, new_owner_oid, conn):
+    return exec_msar_func(conn, 'transfer_table_ownership', table_oid, new_owner_oid).fetchone()[0]
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index e75eb51da7..63e905cd8c 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -918,7 +918,7 @@ SELECT jsonb_build_object(
   'name', relname,
   'schema', relnamespace::bigint,
   'description', msar.obj_description(oid, 'pg_class'),
-  'owner_oid', relowner,
+  'owner_oid', relowner::bigint,
   'current_role_priv', msar.list_table_privileges_for_current_role(tab_id),
   'current_role_owns', pg_catalog.pg_has_role(relowner, 'USAGE')
 ) FROM pg_catalog.pg_class WHERE oid = tab_id;
@@ -949,7 +949,7 @@ SELECT coalesce(
       'name', pgc.relname,
       'schema', pgc.relnamespace::bigint,
       'description', msar.obj_description(pgc.oid, 'pg_class'),
-      'owner_oid', pgc.relowner,
+      'owner_oid', pgc.relowner::bigint,
       'current_role_priv', msar.list_table_privileges_for_current_role(pgc.oid),
       'current_role_owns', pg_catalog.pg_has_role(pgc.relowner, 'USAGE')
     )
@@ -976,7 +976,36 @@ WHERE has_privilege;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
-CREATE OR REPLACE FUNCTION msar.get_schemas() RETURNS jsonb AS $$/*
+CREATE OR REPLACE FUNCTION msar.schema_info_table() RETURNS TABLE
+(
+  oid bigint, -- The OID of the schema.
+  name name, -- Name of the role.
+  description text, -- The description of the schema on the database.
+  owner_oid bigint, -- The owner of the schema.
+  current_role_priv jsonb, -- Privileges of the current role on the schema.
+  current_role_owns boolean, -- Whether the current role owns the schema.
+  table_count integer -- The number of tables in the schema.
+) AS $$
+SELECT 
+  s.oid::bigint AS oid,
+  s.nspname AS name,
+  pg_catalog.obj_description(s.oid) AS description,
+  s.nspowner::bigint AS owner_oid,
+  msar.list_schema_privileges_for_current_role(s.oid) AS current_role_priv,
+  pg_catalog.pg_has_role(s.nspowner, 'USAGE') AS current_role_owns,
+  COALESCE(count(c.oid), 0) AS table_count
+FROM pg_catalog.pg_namespace s
+LEFT JOIN pg_catalog.pg_class c ON c.relnamespace = s.oid AND c.relkind = 'r'
+GROUP BY
+  s.oid,
+  s.nspname,
+  s.nspowner;
+-- Filter on relkind so that we only count tables. This must be done in the ON clause so that
+-- we still get a row for schemas with no tables.
+$$ LANGUAGE SQL STABLE;
+
+
+CREATE OR REPLACE FUNCTION msar.list_schemas() RETURNS jsonb AS $$/*
 Return a json array of objects describing the user-defined schemas in the database.
 
 PostgreSQL system schemas are ignored.
@@ -997,30 +1026,30 @@ Each returned JSON object in the array will have the form:
   }
 */
 SELECT jsonb_agg(schema_data)
-FROM (
-  SELECT 
-    s.oid::bigint AS oid,
-    s.nspname AS name,
-    pg_catalog.obj_description(s.oid) AS description,
-    s.nspowner::bigint AS owner_oid,
-    msar.list_schema_privileges_for_current_role(s.oid) AS current_role_priv,
-    pg_catalog.pg_has_role(s.nspowner, 'USAGE') AS current_role_owns,
-    COALESCE(count(c.oid), 0) AS table_count
-  FROM pg_catalog.pg_namespace s
-  LEFT JOIN pg_catalog.pg_class c ON
-    c.relnamespace = s.oid AND
-    -- Filter on relkind so that we only count tables. This must be done in the ON clause so that
-    -- we still get a row for schemas with no tables.
-    c.relkind = 'r'
-  WHERE
-    s.nspname <> 'information_schema' AND
-    s.nspname NOT LIKE 'pg_%'
-  GROUP BY
-    s.oid,
-    s.nspname,
-    s.nspowner
-) AS schema_data;
-$$ LANGUAGE SQL;
+FROM msar.schema_info_table() AS schema_data
+WHERE schema_data.name <> 'information_schema'
+AND schema_data.name NOT LIKE 'pg_%';
+$$ LANGUAGE SQL STABLE;
+
+
+CREATE OR REPLACE FUNCTION msar.get_schema(sch_id regnamespace) RETURNS jsonb AS $$/*
+Return a json object describing the user-defined schema in the database.
+
+Each returned JSON object will have the form:
+  {
+    "oid": <int>
+    "name": <str>
+    "description": <str|null>
+    "owner_oid": <int>,
+    "current_role_priv": [<str>],
+    "current_role_owns": <bool>,
+    "table_count": <int>
+  }
+*/
+SELECT to_jsonb(schema_data)
+FROM msar.schema_info_table() AS schema_data
+WHERE schema_data.oid = sch_id;
+$$ LANGUAGE SQL STABLE;
 
 
 CREATE OR REPLACE FUNCTION msar.list_schema_privileges(sch_id regnamespace) RETURNS jsonb AS $$/*
@@ -1459,6 +1488,57 @@ END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION
+msar.transfer_schema_ownership(sch_id regnamespace, new_owner_oid regrole) RETURNS jsonb AS $$/*
+Transfers ownership of a given schema to a new owner.
+
+Args:
+  sch_id: The OID of the schema to transfer.
+  new_owner_oid: The OID of the role whom we want to be the new owner of the schema.
+
+NOTE: To successfully transfer ownership of a schema to a new owner the current user must:
+  - Be a Superuser/Owner of the schema.
+  - Be a `MEMBER` of the new owning role. i.e. The current role should be able to `SET ROLE`
+    to the new owning role.
+  - Have `CREATE` privilege for the database.
+*/
+BEGIN
+  EXECUTE format(
+    'ALTER SCHEMA %I OWNER TO %I',
+    msar.get_schema_name(sch_id),
+    msar.get_role_name(new_owner_oid)
+  );
+  RETURN msar.get_schema(sch_id);
+END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.transfer_table_ownership(tab_id regclass, new_owner_oid regrole) RETURNS jsonb AS $$/*
+Transfers ownership of a given table to a new owner.
+
+Args:
+  tab_id: The OID of the table to transfer.
+  new_owner_oid: The OID of the role whom we want to be the new owner of the table.
+
+NOTE: To successfully transfer ownership of a table to a new owner the current user must:
+  - Be a Superuser/Owner of the table.
+  - Be a `MEMBER` of the new owning role. i.e. The current role should be able to `SET ROLE`
+    to the new owning role.
+  - Have `CREATE` privilege on the table's schema.
+*/
+BEGIN
+  EXECUTE format(
+    'ALTER TABLE %I.%I OWNER TO %I',
+    msar.get_relation_schema_name(tab_id),
+    msar.get_relation_name(tab_id),
+    msar.get_role_name(new_owner_oid)
+  );
+  RETURN msar.get_table(tab_id);
+END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 -- ALTER SCHEMA FUNCTIONS

From b659a3ba620fc6eb3bd433539cd28de91d86809c Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 13 Sep 2024 20:28:29 +0530
Subject: [PATCH 0884/1141] create rpc endpoint for sch and tab
 tranfer_ownership

---
 mathesar/rpc/schemas/privileges.py | 28 ++++++++++++++++++++++++++++
 mathesar/rpc/tables/privileges.py  | 28 ++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/mathesar/rpc/schemas/privileges.py b/mathesar/rpc/schemas/privileges.py
index d96893d4d8..0fd1e474e8 100644
--- a/mathesar/rpc/schemas/privileges.py
+++ b/mathesar/rpc/schemas/privileges.py
@@ -3,10 +3,12 @@
 from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
 
+from db.roles.operations.ownership import transfer_schema_ownership
 from db.roles.operations.select import list_schema_privileges
 from db.roles.operations.update import replace_schema_privileges_for_roles
 from mathesar.rpc.utils import connect
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+from mathesar.rpc.schemas.base import SchemaInfo
 
 
 class SchemaPrivileges(TypedDict):
@@ -84,3 +86,29 @@ def replace_for_roles(
             conn, schema_oid, [SchemaPrivileges.from_dict(i) for i in privileges]
         )
     return [SchemaPrivileges.from_dict(i) for i in raw_priv]
+
+
+@rpc_method(name="schemas.privileges.transfer_ownership")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def transfer_ownership(*, schema_oid: int, new_owner_oid: int, database_id: int, **kwargs) -> SchemaInfo:
+    """
+    Transfers ownership of a given schema to a new owner.
+
+    Args:
+        sch_id: The OID of the schema to transfer.
+        new_owner_oid: The OID of the role whom we want to be the new owner of the schema.
+
+    Note: To successfully transfer ownership of a schema to a new owner the current user must:
+        - Be a Superuser/Owner of the schema.
+        - Be a `MEMBER` of the new owning role. i.e. The current role should be able to `SET ROLE`
+          to the new owning role.
+        - Have `CREATE` privilege for the database.
+
+    Returns:
+        Information about the schema, and the current user privileges.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        schema_info = transfer_schema_ownership(schema_oid, new_owner_oid, conn)
+    return SchemaInfo(schema_info)
diff --git a/mathesar/rpc/tables/privileges.py b/mathesar/rpc/tables/privileges.py
index 64ae9ec7dd..2780b52171 100644
--- a/mathesar/rpc/tables/privileges.py
+++ b/mathesar/rpc/tables/privileges.py
@@ -3,10 +3,12 @@
 from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
 
+from db.roles.operations.ownership import transfer_table_ownership
 from db.roles.operations.select import list_table_privileges
 from db.roles.operations.update import replace_table_privileges_for_roles
 from mathesar.rpc.utils import connect
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
+from mathesar.rpc.tables.base import TableInfo
 
 
 class TablePrivileges(TypedDict):
@@ -81,3 +83,29 @@ def replace_for_roles(
             conn, table_oid, [TablePrivileges.from_dict(i) for i in privileges]
         )
     return [TablePrivileges.from_dict(i) for i in raw_priv]
+
+
+@rpc_method(name="tables.privileges.transfer_ownership")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def transfer_ownership(*, table_oid: int, new_owner_oid: int, database_id: int, **kwargs) -> TableInfo:
+    """
+    Transfers ownership of a given table to a new owner.
+
+    Args:
+        tab_id: The OID of the table to transfer.
+        new_owner_oid: The OID of the role whom we want to be the new owner of the table.
+
+    Note: To successfully transfer ownership of a table to a new owner the current user must:
+        - Be a Superuser/Owner of the table.
+        - Be a `MEMBER` of the new owning role. i.e. The current role should be able to `SET ROLE`
+          to the new owning role.
+        - Have `CREATE` privilege on the table's schema.
+
+    Returns:
+        Information about the table, and the current user privileges.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        table_info = transfer_table_ownership(table_oid, new_owner_oid, conn)
+    return TableInfo(table_info)

From 61afdcca2c6f61208e65e0489289e57e4ffef40b Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 13 Sep 2024 20:29:48 +0530
Subject: [PATCH 0885/1141] add docs, endpoint and mocks tests

---
 docs/docs/api/rpc.md                         |  2 +
 mathesar/tests/rpc/test_endpoints.py         | 10 ++++
 mathesar/tests/rpc/test_schema_privileges.py | 47 +++++++++++++++++
 mathesar/tests/rpc/test_table_privileges.py  | 55 ++++++++++++++++++++
 4 files changed, 114 insertions(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 0dc03a70c3..32e8a09dc6 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -112,6 +112,7 @@ To use an RPC function:
       members:
       - list_direct
       - replace_for_roles
+      - transfer_ownership
       - SchemaPrivileges
 
 ## Tables
@@ -142,6 +143,7 @@ To use an RPC function:
       members:
       - list_direct
       - replace_for_roles
+      - transfer_ownership
       - TablePrivileges
 
 ## Table Metadata
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index e0eed5320e..c78ffaa85f 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -313,6 +313,11 @@
         "schemas.privileges.replace_for_roles",
         [user_is_authenticated]
     ),
+    (
+        schemas.privileges.transfer_ownership,
+        "schemas.privileges.transfer_ownership",
+        [user_is_authenticated]
+    ),
 
     (
         servers.configured.list_,
@@ -388,6 +393,11 @@
         "tables.privileges.replace_for_roles",
         [user_is_authenticated]
     ),
+    (
+        tables.privileges.transfer_ownership,
+        "tables.privileges.transfer_ownership",
+        [user_is_authenticated]
+    ),
 
     (
         tables.metadata.list_,
diff --git a/mathesar/tests/rpc/test_schema_privileges.py b/mathesar/tests/rpc/test_schema_privileges.py
index 8a934afc00..d06ba60376 100644
--- a/mathesar/tests/rpc/test_schema_privileges.py
+++ b/mathesar/tests/rpc/test_schema_privileges.py
@@ -94,3 +94,50 @@ def mock_replace_privileges(
         request=request
     )
     assert actual_response == expect_response
+
+
+def test_transfer_schema_ownership(rf, monkeypatch):
+    _username = 'alice'
+    _password = 'pass1234'
+    _database_id = 2
+    _new_owner_oid = 443123
+    _schema_oid = 3314713
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=_username, password=_password)
+
+    @contextmanager
+    def mock_connect(database_id, user):
+        if database_id == _database_id and user.username == _username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_tansfer_schema_ownership(
+            schema_oid,
+            new_owner_oid,
+            conn
+    ):
+        if schema_oid != _schema_oid and new_owner_oid != _new_owner_oid:
+            raise AssertionError('incorrect parameters passed')
+        return {
+            'oid': schema_oid,
+            'name': 'testingpriv',
+            'owner_oid': 2573031,
+            'description': None,
+            'table_count': 2,
+            'current_role_owns': True,
+            'current_role_priv': ['USAGE', 'CREATE']
+        }
+
+    monkeypatch.setattr(schema_privileges, 'connect', mock_connect)
+    monkeypatch.setattr(
+        schema_privileges,
+        'transfer_schema_ownership',
+        mock_tansfer_schema_ownership
+    )
+    schema_privileges.transfer_ownership(
+        schema_oid=_schema_oid, new_owner_oid=_new_owner_oid, database_id=_database_id, request=request
+    )
diff --git a/mathesar/tests/rpc/test_table_privileges.py b/mathesar/tests/rpc/test_table_privileges.py
index bbd190b83b..cbd8510e4b 100644
--- a/mathesar/tests/rpc/test_table_privileges.py
+++ b/mathesar/tests/rpc/test_table_privileges.py
@@ -116,3 +116,58 @@ def mock_replace_privileges(
         request=request
     )
     assert actual_response == expect_response
+
+
+def test_transfer_table_ownership(rf, monkeypatch):
+    _username = 'alice'
+    _password = 'pass1234'
+    _database_id = 2
+    _new_owner_oid = 443123
+    _table_oid = 2573196
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=_username, password=_password)
+
+    @contextmanager
+    def mock_connect(database_id, user):
+        if database_id == _database_id and user.username == _username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_tansfer_table_ownership(
+            table_oid,
+            new_owner_oid,
+            conn
+    ):
+        if table_oid != _table_oid and new_owner_oid != _new_owner_oid:
+            raise AssertionError('incorrect parameters passed')
+        return {
+            'oid': table_oid,
+            'name': 'x',
+            'schema': 2200,
+            'owner_oid': 2573031,
+            'description': None,
+            'current_role_owns': True,
+            'current_role_priv': [
+                'SELECT',
+                'INSERT',
+                'UPDATE',
+                'DELETE',
+                'TRUNCATE',
+                'REFERENCES',
+                'TRIGGER'
+            ]
+        }
+
+    monkeypatch.setattr(table_privileges, 'connect', mock_connect)
+    monkeypatch.setattr(
+        table_privileges,
+        'transfer_table_ownership',
+        mock_tansfer_table_ownership
+    )
+    table_privileges.transfer_ownership(
+        table_oid=_table_oid, new_owner_oid=_new_owner_oid, database_id=_database_id, request=request
+    )

From 6a4db555ead85d8248cd46fb20bd9f7c3cdd5045 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 13 Sep 2024 20:33:57 +0530
Subject: [PATCH 0886/1141] fix docstrings

---
 mathesar/rpc/schemas/privileges.py | 4 ++--
 mathesar/rpc/tables/privileges.py  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mathesar/rpc/schemas/privileges.py b/mathesar/rpc/schemas/privileges.py
index 0fd1e474e8..14a8974de8 100644
--- a/mathesar/rpc/schemas/privileges.py
+++ b/mathesar/rpc/schemas/privileges.py
@@ -95,8 +95,8 @@ def transfer_ownership(*, schema_oid: int, new_owner_oid: int, database_id: int,
     """
     Transfers ownership of a given schema to a new owner.
 
-    Args:
-        sch_id: The OID of the schema to transfer.
+    Attributes:
+        schema_oid: The OID of the schema to transfer.
         new_owner_oid: The OID of the role whom we want to be the new owner of the schema.
 
     Note: To successfully transfer ownership of a schema to a new owner the current user must:
diff --git a/mathesar/rpc/tables/privileges.py b/mathesar/rpc/tables/privileges.py
index 2780b52171..755d983e48 100644
--- a/mathesar/rpc/tables/privileges.py
+++ b/mathesar/rpc/tables/privileges.py
@@ -92,8 +92,8 @@ def transfer_ownership(*, table_oid: int, new_owner_oid: int, database_id: int,
     """
     Transfers ownership of a given table to a new owner.
 
-    Args:
-        tab_id: The OID of the table to transfer.
+    Attributes:
+        table_oid: The OID of the table to transfer.
         new_owner_oid: The OID of the role whom we want to be the new owner of the table.
 
     Note: To successfully transfer ownership of a table to a new owner the current user must:

From 8bf69496a280e8b6939b830383c31f974fef33a3 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 16 Sep 2024 11:17:11 +0530
Subject: [PATCH 0887/1141] Rename previous 'users-and-permissions' systems
 directory to 'users'

---
 mathesar_ui/src/pages/admin-users/EditUserPage.svelte        | 5 +----
 mathesar_ui/src/pages/admin-users/NewUserPage.svelte         | 2 +-
 mathesar_ui/src/pages/admin-users/UserRow.svelte             | 2 +-
 mathesar_ui/src/pages/user-profile/ProfilePage.svelte        | 5 +----
 .../PasswordChangeForm.svelte                                | 0
 .../SelectDisplayLanguage.svelte                             | 0
 .../{users-and-permissions => users}/SelectUserType.svelte   | 0
 .../{users-and-permissions => users}/UserDetailsForm.svelte  | 0
 .../src/systems/{users-and-permissions => users}/index.ts    | 0
 .../src/systems/{users-and-permissions => users}/utils.ts    | 0
 10 files changed, 4 insertions(+), 10 deletions(-)
 rename mathesar_ui/src/systems/{users-and-permissions => users}/PasswordChangeForm.svelte (100%)
 rename mathesar_ui/src/systems/{users-and-permissions => users}/SelectDisplayLanguage.svelte (100%)
 rename mathesar_ui/src/systems/{users-and-permissions => users}/SelectUserType.svelte (100%)
 rename mathesar_ui/src/systems/{users-and-permissions => users}/UserDetailsForm.svelte (100%)
 rename mathesar_ui/src/systems/{users-and-permissions => users}/index.ts (100%)
 rename mathesar_ui/src/systems/{users-and-permissions => users}/utils.ts (100%)

diff --git a/mathesar_ui/src/pages/admin-users/EditUserPage.svelte b/mathesar_ui/src/pages/admin-users/EditUserPage.svelte
index c3dfd5f1a3..7a27990de1 100644
--- a/mathesar_ui/src/pages/admin-users/EditUserPage.svelte
+++ b/mathesar_ui/src/pages/admin-users/EditUserPage.svelte
@@ -15,10 +15,7 @@
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import type { UserModel } from '@mathesar/stores/users';
   import { getUsersStoreFromContext } from '@mathesar/stores/users';
-  import {
-    PasswordChangeForm,
-    UserDetailsForm,
-  } from '@mathesar/systems/users-and-permissions';
+  import { PasswordChangeForm, UserDetailsForm } from '@mathesar/systems/users';
   import { Icon, SpinnerButton } from '@mathesar-component-library';
 
   const userProfileStore = getUserProfileStoreFromContext();
diff --git a/mathesar_ui/src/pages/admin-users/NewUserPage.svelte b/mathesar_ui/src/pages/admin-users/NewUserPage.svelte
index 9a08545ac6..9d17a8b589 100644
--- a/mathesar_ui/src/pages/admin-users/NewUserPage.svelte
+++ b/mathesar_ui/src/pages/admin-users/NewUserPage.svelte
@@ -11,7 +11,7 @@
     getEditUsersPageUrl,
   } from '@mathesar/routes/urls';
   import { getUsersStoreFromContext } from '@mathesar/stores/users';
-  import { UserDetailsForm } from '@mathesar/systems/users-and-permissions';
+  import { UserDetailsForm } from '@mathesar/systems/users';
   import { Icon } from '@mathesar-component-library';
 
   const usersStore = getUsersStoreFromContext();
diff --git a/mathesar_ui/src/pages/admin-users/UserRow.svelte b/mathesar_ui/src/pages/admin-users/UserRow.svelte
index 1c957666c6..b67a8da3c2 100644
--- a/mathesar_ui/src/pages/admin-users/UserRow.svelte
+++ b/mathesar_ui/src/pages/admin-users/UserRow.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { getEditUsersPageUrl } from '@mathesar/routes/urls';
   import type { UserModel } from '@mathesar/stores/users';
-  import { getUserTypeInfoFromUserModel } from '@mathesar/systems/users-and-permissions';
+  import { getUserTypeInfoFromUserModel } from '@mathesar/systems/users';
   import { Icon } from '@mathesar-component-library';
 
   export let user: UserModel;
diff --git a/mathesar_ui/src/pages/user-profile/ProfilePage.svelte b/mathesar_ui/src/pages/user-profile/ProfilePage.svelte
index 1aeb20cb33..3fe7d6587e 100644
--- a/mathesar_ui/src/pages/user-profile/ProfilePage.svelte
+++ b/mathesar_ui/src/pages/user-profile/ProfilePage.svelte
@@ -6,10 +6,7 @@
   import InsetPageLayout from '@mathesar/layouts/InsetPageLayout.svelte';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
-  import {
-    PasswordChangeForm,
-    UserDetailsForm,
-  } from '@mathesar/systems/users-and-permissions';
+  import { PasswordChangeForm, UserDetailsForm } from '@mathesar/systems/users';
 
   const userProfileStore = getUserProfileStoreFromContext();
 
diff --git a/mathesar_ui/src/systems/users-and-permissions/PasswordChangeForm.svelte b/mathesar_ui/src/systems/users/PasswordChangeForm.svelte
similarity index 100%
rename from mathesar_ui/src/systems/users-and-permissions/PasswordChangeForm.svelte
rename to mathesar_ui/src/systems/users/PasswordChangeForm.svelte
diff --git a/mathesar_ui/src/systems/users-and-permissions/SelectDisplayLanguage.svelte b/mathesar_ui/src/systems/users/SelectDisplayLanguage.svelte
similarity index 100%
rename from mathesar_ui/src/systems/users-and-permissions/SelectDisplayLanguage.svelte
rename to mathesar_ui/src/systems/users/SelectDisplayLanguage.svelte
diff --git a/mathesar_ui/src/systems/users-and-permissions/SelectUserType.svelte b/mathesar_ui/src/systems/users/SelectUserType.svelte
similarity index 100%
rename from mathesar_ui/src/systems/users-and-permissions/SelectUserType.svelte
rename to mathesar_ui/src/systems/users/SelectUserType.svelte
diff --git a/mathesar_ui/src/systems/users-and-permissions/UserDetailsForm.svelte b/mathesar_ui/src/systems/users/UserDetailsForm.svelte
similarity index 100%
rename from mathesar_ui/src/systems/users-and-permissions/UserDetailsForm.svelte
rename to mathesar_ui/src/systems/users/UserDetailsForm.svelte
diff --git a/mathesar_ui/src/systems/users-and-permissions/index.ts b/mathesar_ui/src/systems/users/index.ts
similarity index 100%
rename from mathesar_ui/src/systems/users-and-permissions/index.ts
rename to mathesar_ui/src/systems/users/index.ts
diff --git a/mathesar_ui/src/systems/users-and-permissions/utils.ts b/mathesar_ui/src/systems/users/utils.ts
similarity index 100%
rename from mathesar_ui/src/systems/users-and-permissions/utils.ts
rename to mathesar_ui/src/systems/users/utils.ts

From 7b69fb2bc6aaba06ed7652d8b513ae0f96345ae0 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 16 Sep 2024 11:49:51 +0530
Subject: [PATCH 0888/1141] Ensure owner_oid is returned as an integer

---
 db/sql/00_msar.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index ab62cd156e..33a2793ff9 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -918,7 +918,7 @@ SELECT jsonb_build_object(
   'name', relname,
   'schema', relnamespace::bigint,
   'description', msar.obj_description(oid, 'pg_class'),
-  'owner_oid', relowner,
+  'owner_oid', relowner::bigint,
   'current_role_priv', msar.list_table_privileges_for_current_role(tab_id),
   'current_role_owns', pg_catalog.pg_has_role(relowner, 'USAGE')
 ) FROM pg_catalog.pg_class WHERE oid = tab_id;
@@ -949,7 +949,7 @@ SELECT coalesce(
       'name', pgc.relname,
       'schema', pgc.relnamespace::bigint,
       'description', msar.obj_description(pgc.oid, 'pg_class'),
-      'owner_oid', pgc.relowner,
+      'owner_oid', pgc.relowner::bigint,
       'current_role_priv', msar.list_table_privileges_for_current_role(pgc.oid),
       'current_role_owns', pg_catalog.pg_has_role(pgc.relowner, 'USAGE')
     )

From 254ee108db654f4279d90604d5836fbc95d167e9 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 16 Sep 2024 13:04:03 +0530
Subject: [PATCH 0889/1141] Implement Schema model

---
 mathesar_ui/src/api/rest/types/queries.ts     |  4 +-
 mathesar_ui/src/api/rpc/schemas.ts            | 12 ++-
 mathesar_ui/src/components/SchemaName.svelte  |  2 +-
 .../breadcrumb/EntitySelector.svelte          |  2 +-
 .../breadcrumb/SchemaSelector.svelte          |  2 +-
 .../components/breadcrumb/breadcrumbTypes.ts  |  2 +-
 mathesar_ui/src/models/Schema.ts              | 32 +++++++
 .../data-explorer/DataExplorerPage.svelte     |  2 +-
 .../schemas/SchemaConstituentCounts.svelte    |  2 +-
 .../pages/database/schemas/SchemaRow.svelte   |  2 +-
 .../database/schemas/SchemasSection.svelte    |  4 +-
 .../pages/exploration/ExplorationPage.svelte  |  2 +-
 .../src/pages/exploration/Header.svelte       |  2 +-
 .../preview/ImportPreviewContent.svelte       |  2 +-
 .../import/preview/ImportPreviewPage.svelte   |  2 +-
 .../import/preview/importPreviewPageUtils.ts  |  2 +-
 .../import/upload/ImportUploadPage.svelte     |  2 +-
 .../schema/CreateEmptyTableButton.svelte      |  2 +-
 .../CreateNewExplorationTutorial.svelte       |  2 +-
 .../pages/schema/CreateNewTableButton.svelte  |  2 +-
 .../schema/CreateNewTableTutorial.svelte      |  2 +-
 .../src/pages/schema/ExplorationItem.svelte   |  2 +-
 .../src/pages/schema/ExplorationsList.svelte  |  2 +-
 .../pages/schema/SchemaExplorations.svelte    |  2 +-
 .../src/pages/schema/SchemaOverview.svelte    |  2 +-
 .../src/pages/schema/SchemaPage.svelte        |  2 +-
 .../src/pages/schema/SchemaTables.svelte      |  2 +-
 mathesar_ui/src/pages/schema/TableCard.svelte |  2 +-
 .../src/pages/schema/TablesList.svelte        |  2 +-
 .../src/routes/DataExplorerRoute.svelte       |  8 +-
 .../src/routes/ExplorationRoute.svelte        |  2 +-
 mathesar_ui/src/routes/ImportRoute.svelte     |  2 +-
 mathesar_ui/src/routes/RecordPageRoute.svelte |  2 +-
 mathesar_ui/src/routes/TableRoute.svelte      |  2 +-
 mathesar_ui/src/stores/queries.ts             | 20 ++--
 mathesar_ui/src/stores/schemas.ts             | 96 +++++++++----------
 mathesar_ui/src/stores/tables.ts              | 12 ++-
 .../systems/schemas/AddEditSchemaModal.svelte |  4 +-
 mathesar_ui/src/utils/preloadData.ts          |  4 +-
 39 files changed, 152 insertions(+), 102 deletions(-)
 create mode 100644 mathesar_ui/src/models/Schema.ts

diff --git a/mathesar_ui/src/api/rest/types/queries.ts b/mathesar_ui/src/api/rest/types/queries.ts
index e5d5144e50..01e6d86462 100644
--- a/mathesar_ui/src/api/rest/types/queries.ts
+++ b/mathesar_ui/src/api/rest/types/queries.ts
@@ -1,6 +1,6 @@
 import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
 import type { Column } from '@mathesar/api/rpc/columns';
-import type { Schema } from '@mathesar/api/rpc/schemas';
+import type { RawSchema } from '@mathesar/api/rpc/schemas';
 import type { JoinPath } from '@mathesar/api/rpc/tables';
 import type { FilterId } from '@mathesar/stores/abstract-types/types';
 
@@ -183,7 +183,7 @@ export interface QueryResultsResponse {
 
 export interface QueryRunResponse extends QueryResultsResponse {
   query: {
-    schema: Schema['oid'];
+    schema: RawSchema['oid'];
     base_table: QueryInstance['base_table'];
     initial_columns: QueryInstanceInitialColumn[];
     transformations?: QueryInstanceTransformation[];
diff --git a/mathesar_ui/src/api/rpc/schemas.ts b/mathesar_ui/src/api/rpc/schemas.ts
index 486a7d4728..dc97aa578b 100644
--- a/mathesar_ui/src/api/rpc/schemas.ts
+++ b/mathesar_ui/src/api/rpc/schemas.ts
@@ -1,10 +1,18 @@
 import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
 
-export interface Schema {
+import type { RawRole } from './roles';
+
+export const allSchemaPrivileges = ['USAGE', 'CREATE'] as const;
+export type SchemaPrivilege = (typeof allSchemaPrivileges)[number];
+
+export interface RawSchema {
   oid: number;
   name: string;
   description: string;
   table_count: number;
+  owner_oid: RawRole['oid'];
+  current_role_priv: SchemaPrivilege[];
+  current_role_owns: boolean;
 }
 
 export const schemas = {
@@ -12,7 +20,7 @@ export const schemas = {
     {
       database_id: number;
     },
-    Schema[]
+    RawSchema[]
   >(),
 
   /** Returns the OID of the newly-created schema */
diff --git a/mathesar_ui/src/components/SchemaName.svelte b/mathesar_ui/src/components/SchemaName.svelte
index d3a0199027..d7788c4399 100644
--- a/mathesar_ui/src/components/SchemaName.svelte
+++ b/mathesar_ui/src/components/SchemaName.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import { iconSchema } from '@mathesar/icons';
+  import type { Schema } from '@mathesar/models/Schema';
 
   import NameWithIcon from './NameWithIcon.svelte';
 
diff --git a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
index f5b685439f..d06715fc4e 100644
--- a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
@@ -3,10 +3,10 @@
   import { meta } from 'tinro';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Table } from '@mathesar/api/rpc/tables';
   import { iconTable } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import { getExplorationPageUrl } from '@mathesar/routes/urls';
   import { queries as queriesStore } from '@mathesar/stores/queries';
   import { currentTableId, currentTables } from '@mathesar/stores/tables';
diff --git a/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte b/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte
index d495654006..11c84be493 100644
--- a/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import { iconSchema } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
   import {
     currentSchemaId,
diff --git a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
index 1266acf62a..35324ed85e 100644
--- a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
+++ b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
@@ -1,11 +1,11 @@
 import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-import type { Schema } from '@mathesar/api/rpc/schemas';
 import type { Table } from '@mathesar/api/rpc/tables';
 import type {
   ComponentAndProps,
   IconProps,
 } from '@mathesar/component-library/types';
 import type { Database } from '@mathesar/models/Database';
+import type { Schema } from '@mathesar/models/Schema';
 
 export interface BreadcrumbItemHome {
   type: 'home';
diff --git a/mathesar_ui/src/models/Schema.ts b/mathesar_ui/src/models/Schema.ts
new file mode 100644
index 0000000000..aaa8610861
--- /dev/null
+++ b/mathesar_ui/src/models/Schema.ts
@@ -0,0 +1,32 @@
+import type { RawSchema, SchemaPrivilege } from '@mathesar/api/rpc/schemas';
+
+import type { Database } from './Database';
+
+export class Schema {
+  readonly oid: number;
+
+  readonly name: string;
+
+  readonly description: string;
+
+  table_count: number;
+
+  readonly owner_oid: number;
+
+  readonly current_role_priv: SchemaPrivilege[];
+
+  readonly current_role_owns: boolean;
+
+  readonly database: Database;
+
+  constructor(props: { database: Database; rawSchema: RawSchema }) {
+    this.oid = props.rawSchema.oid;
+    this.name = props.rawSchema.name;
+    this.description = props.rawSchema.description;
+    this.table_count = props.rawSchema.table_count;
+    this.owner_oid = props.rawSchema.owner_oid;
+    this.current_role_priv = props.rawSchema.current_role_priv;
+    this.current_role_owns = props.rawSchema.current_role_owns;
+    this.database = props.database;
+  }
+}
diff --git a/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte b/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte
index a97cb5e3aa..c94ba02f36 100644
--- a/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte
+++ b/mathesar_ui/src/pages/data-explorer/DataExplorerPage.svelte
@@ -2,9 +2,9 @@
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
 
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import {
     getExplorationPageUrl,
diff --git a/mathesar_ui/src/pages/database/schemas/SchemaConstituentCounts.svelte b/mathesar_ui/src/pages/database/schemas/SchemaConstituentCounts.svelte
index d9677f567b..46cf8408c7 100644
--- a/mathesar_ui/src/pages/database/schemas/SchemaConstituentCounts.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemaConstituentCounts.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Schema } from '@mathesar/api/rpc/schemas';
+  import type { Schema } from '@mathesar/models/Schema';
 
   export let schema: Schema;
 </script>
diff --git a/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte b/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
index 2e83202e50..14a067d1a1 100644
--- a/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
@@ -2,7 +2,6 @@
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
 
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import DropdownMenu from '@mathesar/component-library/dropdown-menu/DropdownMenu.svelte';
   import MenuDivider from '@mathesar/component-library/menu/MenuDivider.svelte';
   import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
@@ -14,6 +13,7 @@
     iconNotEditable,
   } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
   import { ButtonMenuItem, Icon } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
index 7250f40d08..90b81541a5 100644
--- a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
@@ -1,16 +1,16 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import { iconAddNew } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import { confirmDelete } from '@mathesar/stores/confirmation';
   import { modal } from '@mathesar/stores/modal';
-  import type { DBSchemaStoreData } from '@mathesar/stores/schemas';
   import {
+    type DBSchemaStoreData,
     deleteSchema as deleteSchemaAPI,
     schemas as schemasStore,
   } from '@mathesar/stores/schemas';
diff --git a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
index 501472fdd4..c2f75f56bf 100644
--- a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
+++ b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
@@ -3,9 +3,9 @@
   import { router } from 'tinro';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
   import { abstractTypesMap } from '@mathesar/stores/abstract-types';
   import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
diff --git a/mathesar_ui/src/pages/exploration/Header.svelte b/mathesar_ui/src/pages/exploration/Header.svelte
index 98ada6f753..7ae578d9e0 100644
--- a/mathesar_ui/src/pages/exploration/Header.svelte
+++ b/mathesar_ui/src/pages/exploration/Header.svelte
@@ -2,10 +2,10 @@
   import { _ } from 'svelte-i18n';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import EntityPageHeader from '@mathesar/components/EntityPageHeader.svelte';
   import { iconExploration, iconInspector } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import { getExplorationEditorPageUrl } from '@mathesar/routes/urls';
   import { Button, Icon } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index 48d8d727d7..cd7ad4bbf9 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -5,7 +5,6 @@
   import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
   import { api } from '@mathesar/api/rpc';
   import type { Column } from '@mathesar/api/rpc/columns';
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { ColumnPreviewSpec, Table } from '@mathesar/api/rpc/tables';
   import {
     Field,
@@ -17,6 +16,7 @@
   import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
   import { iconDeleteMajor } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import { runner } from '@mathesar/packages/json-rpc-client-builder';
   import {
     getImportPreviewPageUrl,
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
index 742a81c290..c9d5dc7b2a 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
@@ -3,9 +3,9 @@
   import { router } from 'tinro';
 
   import { dataFilesApi } from '@mathesar/api/rest/dataFiles';
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { getTablePageUrl } from '@mathesar/routes/urls';
   import AsyncStore from '@mathesar/stores/AsyncStore';
diff --git a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
index 30a244dcd4..b360ff907c 100644
--- a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
+++ b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
@@ -1,10 +1,10 @@
 import { dataFilesApi } from '@mathesar/api/rest/dataFiles';
 import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
 import type { Column } from '@mathesar/api/rpc/columns';
-import type { Schema } from '@mathesar/api/rpc/schemas';
 import type { Table } from '@mathesar/api/rpc/tables';
 import { getCellCap } from '@mathesar/components/cell-fabric/utils';
 import type { Database } from '@mathesar/models/Database';
+import type { Schema } from '@mathesar/models/Schema';
 import { getAbstractTypeForDbType } from '@mathesar/stores/abstract-types';
 import type {
   AbstractType,
diff --git a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
index 1d437a22e8..c64594817b 100644
--- a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
+++ b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
@@ -4,7 +4,6 @@
 
   import { dataFilesApi } from '@mathesar/api/rest/dataFiles';
   import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import Spinner from '@mathesar/component-library/spinner/Spinner.svelte';
   import DocsLink from '@mathesar/components/DocsLink.svelte';
   import {
@@ -21,6 +20,7 @@
   import { iconPaste, iconUrl } from '@mathesar/icons';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { getImportPreviewPageUrl } from '@mathesar/routes/urls';
   import { createTableFromDataFile } from '@mathesar/stores/tables';
diff --git a/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte b/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
index 3407d93a94..12178c7f9c 100644
--- a/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
+++ b/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { router } from 'tinro';
 
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import { getTablePageUrl } from '@mathesar/routes/urls';
   import { createTable } from '@mathesar/stores/tables';
   import { Button, Spinner } from '@mathesar-component-library';
diff --git a/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte b/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte
index a6087c57ff..d4d4ed0856 100644
--- a/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte
+++ b/mathesar_ui/src/pages/schema/CreateNewExplorationTutorial.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
   import { AnchorButton, Tutorial } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte b/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
index f60a71ecc3..07e9f91489 100644
--- a/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
+++ b/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
@@ -2,11 +2,11 @@
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
 
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import Icon from '@mathesar/component-library/icon/Icon.svelte';
   import LinkMenuItem from '@mathesar/component-library/menu/LinkMenuItem.svelte';
   import { iconAddNew } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import { getImportPageUrl, getTablePageUrl } from '@mathesar/routes/urls';
   import { createTable } from '@mathesar/stores/tables';
   import {
diff --git a/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte b/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte
index 45d88ef382..1d90d56aeb 100644
--- a/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte
+++ b/mathesar_ui/src/pages/schema/CreateNewTableTutorial.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import { getImportPageUrl } from '@mathesar/routes/urls';
   import { AnchorButton, Tutorial } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/pages/schema/ExplorationItem.svelte b/mathesar_ui/src/pages/schema/ExplorationItem.svelte
index 31a5030312..45cb9511ef 100644
--- a/mathesar_ui/src/pages/schema/ExplorationItem.svelte
+++ b/mathesar_ui/src/pages/schema/ExplorationItem.svelte
@@ -2,10 +2,10 @@
   import { _ } from 'svelte-i18n';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import TableName from '@mathesar/components/TableName.svelte';
   import { iconExploration } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import { getExplorationPageUrl } from '@mathesar/routes/urls';
   import { currentTablesData as tablesStore } from '@mathesar/stores/tables';
   import { Icon } from '@mathesar-component-library';
diff --git a/mathesar_ui/src/pages/schema/ExplorationsList.svelte b/mathesar_ui/src/pages/schema/ExplorationsList.svelte
index 136fb76e50..872c3c7562 100644
--- a/mathesar_ui/src/pages/schema/ExplorationsList.svelte
+++ b/mathesar_ui/src/pages/schema/ExplorationsList.svelte
@@ -2,9 +2,9 @@
   import { _ } from 'svelte-i18n';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import { iconExploration } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
 
   import EmptyEntity from './EmptyEntity.svelte';
   import ExplorationItem from './ExplorationItem.svelte';
diff --git a/mathesar_ui/src/pages/schema/SchemaExplorations.svelte b/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
index ac89d6569b..e90da5cd36 100644
--- a/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
@@ -2,10 +2,10 @@
   import { _ } from 'svelte-i18n';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
   import { AnchorButton } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/pages/schema/SchemaOverview.svelte b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
index ca570f8383..382561d5c0 100644
--- a/mathesar_ui/src/pages/schema/SchemaOverview.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
@@ -3,12 +3,12 @@
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Table } from '@mathesar/api/rpc/tables';
   import SpinnerButton from '@mathesar/component-library/spinner-button/SpinnerButton.svelte';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { iconRefresh } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
   import { refetchQueriesForSchema } from '@mathesar/stores/queries';
   import { refetchTablesForSchema } from '@mathesar/stores/tables';
diff --git a/mathesar_ui/src/pages/schema/SchemaPage.svelte b/mathesar_ui/src/pages/schema/SchemaPage.svelte
index bd4d311427..02f2eda913 100644
--- a/mathesar_ui/src/pages/schema/SchemaPage.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPage.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import AppSecondaryHeader from '@mathesar/components/AppSecondaryHeader.svelte';
   import { iconEdit, iconSchema } from '@mathesar/icons';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import {
     getSchemaPageExplorationsSectionUrl,
diff --git a/mathesar_ui/src/pages/schema/SchemaTables.svelte b/mathesar_ui/src/pages/schema/SchemaTables.svelte
index 0c4da003e3..1ccc271d8c 100644
--- a/mathesar_ui/src/pages/schema/SchemaTables.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaTables.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Table } from '@mathesar/api/rpc/tables';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
 
   import CreateNewTableButton from './CreateNewTableButton.svelte';
   import CreateNewTableTutorial from './CreateNewTableTutorial.svelte';
diff --git a/mathesar_ui/src/pages/schema/TableCard.svelte b/mathesar_ui/src/pages/schema/TableCard.svelte
index be81b93a6a..4ce44dbeab 100644
--- a/mathesar_ui/src/pages/schema/TableCard.svelte
+++ b/mathesar_ui/src/pages/schema/TableCard.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Table } from '@mathesar/api/rpc/tables';
   import LinkMenuItem from '@mathesar/component-library/menu/LinkMenuItem.svelte';
   import TableName from '@mathesar/components/TableName.svelte';
@@ -13,6 +12,7 @@
     iconSelectRecord,
   } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import {
     getImportPreviewPageUrl,
     getTablePageUrl,
diff --git a/mathesar_ui/src/pages/schema/TablesList.svelte b/mathesar_ui/src/pages/schema/TablesList.svelte
index 32eea054b7..a71a74d2d1 100644
--- a/mathesar_ui/src/pages/schema/TablesList.svelte
+++ b/mathesar_ui/src/pages/schema/TablesList.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Table } from '@mathesar/api/rpc/tables';
   import { iconTable } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
 
   import EmptyEntity from './EmptyEntity.svelte';
   import TableCard from './TableCard.svelte';
diff --git a/mathesar_ui/src/routes/DataExplorerRoute.svelte b/mathesar_ui/src/routes/DataExplorerRoute.svelte
index bdbcf4c53c..d4d8ed5814 100644
--- a/mathesar_ui/src/routes/DataExplorerRoute.svelte
+++ b/mathesar_ui/src/routes/DataExplorerRoute.svelte
@@ -4,11 +4,11 @@
   import { router } from 'tinro';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { CancellablePromise } from '@mathesar/component-library';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import { iconEdit, iconExploration } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import DataExplorerPage from '@mathesar/pages/data-explorer/DataExplorerPage.svelte';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import {
@@ -16,8 +16,10 @@
     getExplorationEditorPageUrl,
   } from '@mathesar/routes/urls';
   import { abstractTypesMap } from '@mathesar/stores/abstract-types';
-  import type { UnsavedQueryInstance } from '@mathesar/stores/queries';
-  import { getQuery } from '@mathesar/stores/queries';
+  import {
+    type UnsavedQueryInstance,
+    getQuery,
+  } from '@mathesar/stores/queries';
   import {
     QueryManager,
     QueryModel,
diff --git a/mathesar_ui/src/routes/ExplorationRoute.svelte b/mathesar_ui/src/routes/ExplorationRoute.svelte
index 7b6689956e..2f0435029c 100644
--- a/mathesar_ui/src/routes/ExplorationRoute.svelte
+++ b/mathesar_ui/src/routes/ExplorationRoute.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import ExplorationPage from '@mathesar/pages/exploration/ExplorationPage.svelte';
   import { queries } from '@mathesar/stores/queries';
diff --git a/mathesar_ui/src/routes/ImportRoute.svelte b/mathesar_ui/src/routes/ImportRoute.svelte
index 920a20f0f9..bd3ac76701 100644
--- a/mathesar_ui/src/routes/ImportRoute.svelte
+++ b/mathesar_ui/src/routes/ImportRoute.svelte
@@ -2,10 +2,10 @@
   import { _ } from 'svelte-i18n';
   import { Route } from 'tinro';
 
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import { iconImportData } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import ImportPreviewPage from '@mathesar/pages/import/preview/ImportPreviewPage.svelte';
   import ImportUploadPage from '@mathesar/pages/import/upload/ImportUploadPage.svelte';
 
diff --git a/mathesar_ui/src/routes/RecordPageRoute.svelte b/mathesar_ui/src/routes/RecordPageRoute.svelte
index 99d46b27b0..11fe8b3661 100644
--- a/mathesar_ui/src/routes/RecordPageRoute.svelte
+++ b/mathesar_ui/src/routes/RecordPageRoute.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import type { Table } from '@mathesar/api/rpc/tables';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import RecordPage from '@mathesar/pages/record/RecordPage.svelte';
   import RecordStore from '@mathesar/pages/record/RecordStore';
 
diff --git a/mathesar_ui/src/routes/TableRoute.svelte b/mathesar_ui/src/routes/TableRoute.svelte
index 302e30a593..901fa84d7e 100644
--- a/mathesar_ui/src/routes/TableRoute.svelte
+++ b/mathesar_ui/src/routes/TableRoute.svelte
@@ -3,9 +3,9 @@
   import { _ } from 'svelte-i18n';
   import { Route } from 'tinro';
 
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import ErrorPage from '@mathesar/pages/ErrorPage.svelte';
   import TablePage from '@mathesar/pages/table/TablePage.svelte';
   import { currentTableId, currentTablesData } from '@mathesar/stores/tables';
diff --git a/mathesar_ui/src/stores/queries.ts b/mathesar_ui/src/stores/queries.ts
index 5dc21f936c..7880e613d9 100644
--- a/mathesar_ui/src/stores/queries.ts
+++ b/mathesar_ui/src/stores/queries.ts
@@ -32,8 +32,14 @@
  * to having us use the currentSchemaId store directly.
  */
 
-import type { Readable, Unsubscriber, Writable } from 'svelte/store';
-import { derived, get, writable } from 'svelte/store';
+import {
+  type Readable,
+  type Unsubscriber,
+  type Writable,
+  derived,
+  get,
+  writable,
+} from 'svelte/store';
 
 import type {
   QueryGetResponse,
@@ -42,21 +48,19 @@ import type {
   QueryRunRequest,
   QueryRunResponse,
 } from '@mathesar/api/rest/types/queries';
-import type {
-  PaginatedResponse,
-  RequestStatus,
-} from '@mathesar/api/rest/utils/requestUtils';
 import {
+  type PaginatedResponse,
+  type RequestStatus,
   addQueryParamsToUrl,
   deleteAPI,
   getAPI,
   postAPI,
   putAPI,
 } from '@mathesar/api/rest/utils/requestUtils';
-import type { Schema } from '@mathesar/api/rpc/schemas';
+import type { Schema } from '@mathesar/models/Schema';
 import CacheManager from '@mathesar/utils/CacheManager';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
-import { SHARED_LINK_UUID_QUERY_PARAM } from '@mathesar/utils/shares';
+import type { SHARED_LINK_UUID_QUERY_PARAM } from '@mathesar/utils/shares';
 import { CancellablePromise } from '@mathesar-component-library';
 
 import { currentSchemaId } from './schemas';
diff --git a/mathesar_ui/src/stores/schemas.ts b/mathesar_ui/src/stores/schemas.ts
index 3fbf5f7e3f..d17160781e 100644
--- a/mathesar_ui/src/stores/schemas.ts
+++ b/mathesar_ui/src/stores/schemas.ts
@@ -1,10 +1,17 @@
-import type { Readable, Unsubscriber, Writable } from 'svelte/store';
-import { derived, get, writable } from 'svelte/store';
+import {
+  type Readable,
+  type Unsubscriber,
+  type Writable,
+  derived,
+  get,
+  writable,
+} from 'svelte/store';
 
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { api } from '@mathesar/api/rpc';
-import type { Schema } from '@mathesar/api/rpc/schemas';
+import type { RawSchema } from '@mathesar/api/rpc/schemas';
 import type { Database } from '@mathesar/models/Database';
+import { Schema } from '@mathesar/models/Schema';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import type { CancellablePromise } from '@mathesar-component-library';
 
@@ -27,26 +34,26 @@ const dbSchemaStoreMap: Map<
 > = new Map();
 const dbSchemasRequestMap: Map<
   Database['id'],
-  CancellablePromise<Schema[]>
+  CancellablePromise<RawSchema[]>
 > = new Map();
 
 function setDBSchemaStore(
-  databaseId: Database['id'],
-  schemas: Schema[],
+  database: Database,
+  rawSchemas: RawSchema[],
 ): Writable<DBSchemaStoreData> {
   const schemaMap: DBSchemaStoreData['data'] = new Map();
-  schemas.forEach((schema) => {
-    schemaMap.set(schema.oid, schema);
+  rawSchemas.forEach((rawSchema) => {
+    schemaMap.set(rawSchema.oid, new Schema({ database, rawSchema }));
   });
   const storeValue: DBSchemaStoreData = {
     requestStatus: { state: 'success' },
     data: schemaMap,
   };
 
-  let store = dbSchemaStoreMap.get(databaseId);
+  let store = dbSchemaStoreMap.get(database.id);
   if (!store) {
     store = writable(storeValue);
-    dbSchemaStoreMap.set(databaseId, store);
+    dbSchemaStoreMap.set(database.id, store);
   } else {
     store.set(storeValue);
   }
@@ -107,11 +114,11 @@ export function addCountToSchemaNumTables(
 }
 
 async function refetchSchemasForDB(
-  databaseId: Database['id'],
+  database: Database,
 ): Promise<DBSchemaStoreData | undefined> {
-  const store = dbSchemaStoreMap.get(databaseId);
+  const store = dbSchemaStoreMap.get(database.id);
   if (!store) {
-    console.error(`DB Schemas store for database: ${databaseId} not found.`);
+    console.error(`DB Schemas store for database: ${database.id} not found.`);
     return undefined;
   }
 
@@ -121,13 +128,13 @@ async function refetchSchemasForDB(
       requestStatus: { state: 'processing' },
     }));
 
-    dbSchemasRequestMap.get(databaseId)?.cancel();
+    dbSchemasRequestMap.get(database.id)?.cancel();
 
-    const schemaRequest = api.schemas.list({ database_id: databaseId }).run();
-    dbSchemasRequestMap.set(databaseId, schemaRequest);
+    const schemaRequest = api.schemas.list({ database_id: database.id }).run();
+    dbSchemasRequestMap.set(database.id, schemaRequest);
     const schemas = await schemaRequest;
 
-    const dbSchemasStore = setDBSchemaStore(databaseId, schemas);
+    const dbSchemasStore = setDBSchemaStore(database, schemas);
 
     return get(dbSchemasStore);
   } catch (err) {
@@ -146,57 +153,48 @@ async function refetchSchemasForDB(
 
 let preload = true;
 
-function getSchemasStoreForDB(
-  databaseId: Database['id'],
-): Writable<DBSchemaStoreData> {
-  let store = dbSchemaStoreMap.get(databaseId);
+function getSchemasStoreForDB(database: Database): Writable<DBSchemaStoreData> {
+  let store = dbSchemaStoreMap.get(database.id);
   if (!store) {
     store = writable({
       requestStatus: { state: 'processing' },
       data: new Map(),
     });
-    dbSchemaStoreMap.set(databaseId, store);
-    if (preload && commonData.current_database === databaseId) {
-      store = setDBSchemaStore(databaseId, commonData.schemas ?? []);
+    dbSchemaStoreMap.set(database.id, store);
+    if (preload && commonData.current_database === database.id) {
+      store = setDBSchemaStore(database, commonData.schemas ?? []);
     } else {
-      void refetchSchemasForDB(databaseId);
+      void refetchSchemasForDB(database);
     }
     preload = false;
   } else if (get(store).requestStatus.state === 'failure') {
-    void refetchSchemasForDB(databaseId);
+    void refetchSchemasForDB(database);
   }
   return store;
 }
 
-export function getSchemaInfo(
-  databaseId: Database['id'],
-  schemaId: Schema['oid'],
-): Schema | undefined {
-  const store = dbSchemaStoreMap.get(databaseId);
-  if (!store) {
-    return undefined;
-  }
-  return get(store).data.get(schemaId);
-}
-
 export async function createSchema(
-  databaseId: Database['id'],
+  database: Database,
   name: Schema['name'],
   description: Schema['description'],
 ): Promise<void> {
   const schemaOid = await api.schemas
     .add({
-      database_id: databaseId,
+      database_id: database.id,
       name,
       description,
     })
     .run();
-  updateSchemaInDBSchemaStore(databaseId, {
-    oid: schemaOid,
-    name,
-    description,
-    table_count: 0,
-  });
+  /**
+   * TODO_BETA: Update the following once
+   * https://github.com/mathesar-foundation/mathesar/issues/3834 is done.
+   */
+  const schemaList = await api.schemas.list({ database_id: database.id }).run();
+  const rawSchema = schemaList.find((rs) => rs.oid === schemaOid);
+  if (!rawSchema) {
+    throw new Error('Schema not found');
+  }
+  updateSchemaInDBSchemaStore(database.id, new Schema({ database, rawSchema }));
 }
 
 export async function updateSchema(
@@ -230,17 +228,17 @@ export async function deleteSchema(
 }
 
 export const schemas: Readable<DBSchemaStoreData> = derived(
-  databasesStore.currentDatabaseId,
-  ($currentDatabaseId, set) => {
+  databasesStore.currentDatabase,
+  ($currentDatabase, set) => {
     let unsubscribe: Unsubscriber;
 
-    if (!$currentDatabaseId) {
+    if (!$currentDatabase) {
       set({
         requestStatus: { state: 'success' },
         data: new Map(),
       });
     } else {
-      const store = getSchemasStoreForDB($currentDatabaseId);
+      const store = getSchemasStoreForDB($currentDatabase);
       unsubscribe = store.subscribe((dbSchemasData) => {
         set(dbSchemasData);
       });
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index 7248448117..d843a41025 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -10,8 +10,14 @@
  */
 
 import { execPipe, filter, find, map } from 'iter-tools';
-import type { Readable, Writable } from 'svelte/store';
-import { derived, get, readable, writable } from 'svelte/store';
+import {
+  type Readable,
+  type Writable,
+  derived,
+  get,
+  readable,
+  writable,
+} from 'svelte/store';
 import { _ } from 'svelte-i18n';
 
 import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
@@ -19,10 +25,10 @@ import type { SplitTableResponse } from '@mathesar/api/rest/types/tables/split_t
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { api } from '@mathesar/api/rpc';
 import type { ColumnPatchSpec } from '@mathesar/api/rpc/columns';
-import type { Schema } from '@mathesar/api/rpc/schemas';
 import type { Table } from '@mathesar/api/rpc/tables';
 import { invalidIf } from '@mathesar/components/form';
 import type { Database } from '@mathesar/models/Database';
+import type { Schema } from '@mathesar/models/Schema';
 import {
   type RpcRequest,
   batchSend,
diff --git a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
index 140593c671..0f03bcade1 100644
--- a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
+++ b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Schema } from '@mathesar/api/rpc/schemas';
   import Identifier from '@mathesar/components/Identifier.svelte';
   import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
   import NameAndDescInputModalForm from '@mathesar/components/NameAndDescInputModalForm.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import type { Database } from '@mathesar/models/Database';
+  import type { Schema } from '@mathesar/models/Schema';
   import {
     createSchema,
     schemas,
@@ -45,7 +45,7 @@
       if (schema) {
         await updateSchema(database.id, { ...schema, name, description });
       } else {
-        await createSchema(database.id, name, description);
+        await createSchema(database, name, description);
       }
     } catch (err) {
       toast.fromError(err);
diff --git a/mathesar_ui/src/utils/preloadData.ts b/mathesar_ui/src/utils/preloadData.ts
index e9373c091a..cc4fd304af 100644
--- a/mathesar_ui/src/utils/preloadData.ts
+++ b/mathesar_ui/src/utils/preloadData.ts
@@ -1,14 +1,14 @@
 import type { QueryInstance } from '@mathesar/api/rest/types/queries';
 import type { User } from '@mathesar/api/rest/users';
 import type { RawDatabase } from '@mathesar/api/rpc/databases';
-import type { Schema } from '@mathesar/api/rpc/schemas';
+import type { RawSchema } from '@mathesar/api/rpc/schemas';
 import type { RawServer } from '@mathesar/api/rpc/servers';
 import type { Table } from '@mathesar/api/rpc/tables';
 
 export interface CommonData {
   databases: RawDatabase[];
   servers: RawServer[];
-  schemas: Schema[];
+  schemas: RawSchema[];
   tables: Table[];
   queries: QueryInstance[];
   current_database: RawDatabase['id'] | null;

From ecd7103bdcd65e3dc10fcbe18dc613f123f6bdcf Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 16 Sep 2024 13:32:02 +0530
Subject: [PATCH 0890/1141] Add methods to patch and delete in Schema model

---
 mathesar_ui/src/api/rpc/schemas.ts            | 10 ++--
 .../breadcrumb/DatabaseSelector.svelte        |  4 +-
 mathesar_ui/src/models/Schema.ts              | 29 ++++++++++-
 .../database/schemas/SchemasSection.svelte    |  2 +-
 mathesar_ui/src/stores/databases.ts           |  2 +-
 mathesar_ui/src/stores/schemas.ts             | 51 +++++++------------
 .../systems/schemas/AddEditSchemaModal.svelte |  4 +-
 7 files changed, 57 insertions(+), 45 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/schemas.ts b/mathesar_ui/src/api/rpc/schemas.ts
index dc97aa578b..488b32f616 100644
--- a/mathesar_ui/src/api/rpc/schemas.ts
+++ b/mathesar_ui/src/api/rpc/schemas.ts
@@ -8,7 +8,7 @@ export type SchemaPrivilege = (typeof allSchemaPrivileges)[number];
 export interface RawSchema {
   oid: number;
   name: string;
-  description: string;
+  description: string | null;
   table_count: number;
   owner_oid: RawRole['oid'];
   current_role_priv: SchemaPrivilege[];
@@ -27,8 +27,8 @@ export const schemas = {
   add: rpcMethodTypeContainer<
     {
       database_id: number;
-      name: string;
-      description?: string;
+      name: RawSchema['name'];
+      description?: RawSchema['description'];
     },
     number
   >(),
@@ -38,8 +38,8 @@ export const schemas = {
       database_id: number;
       schema_oid: number;
       patch: {
-        name?: string;
-        description?: string;
+        name?: RawSchema['name'];
+        description?: RawSchema['description'];
       };
     },
     void
diff --git a/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte b/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
index 2de97b3e83..9ea3e021b4 100644
--- a/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
@@ -9,7 +9,7 @@
   import BreadcrumbSelector from './BreadcrumbSelector.svelte';
   import type { BreadcrumbSelectorEntry } from './breadcrumbTypes';
 
-  const { databases, currentDatabaseId } = databasesStore;
+  const { databases, currentDatabase } = databasesStore;
 
   function makeBreadcrumbSelectorEntry(
     database: Database,
@@ -19,7 +19,7 @@
       label: database.name,
       href: getDatabasePageUrl(database.id),
       icon: iconDatabase,
-      isActive: () => database.id === $currentDatabaseId,
+      isActive: () => database.id === $currentDatabase?.id,
     };
   }
 
diff --git a/mathesar_ui/src/models/Schema.ts b/mathesar_ui/src/models/Schema.ts
index aaa8610861..8abc15d6d3 100644
--- a/mathesar_ui/src/models/Schema.ts
+++ b/mathesar_ui/src/models/Schema.ts
@@ -1,4 +1,6 @@
+import { api } from '@mathesar/api/rpc';
 import type { RawSchema, SchemaPrivilege } from '@mathesar/api/rpc/schemas';
+import type { CancellablePromise } from '@mathesar-component-library';
 
 import type { Database } from './Database';
 
@@ -7,7 +9,7 @@ export class Schema {
 
   readonly name: string;
 
-  readonly description: string;
+  readonly description: RawSchema['description'];
 
   table_count: number;
 
@@ -29,4 +31,29 @@ export class Schema {
     this.current_role_owns = props.rawSchema.current_role_owns;
     this.database = props.database;
   }
+
+  updateNameAndDescription(props: {
+    name: string;
+    description?: RawSchema['description'];
+  }): CancellablePromise<void> {
+    return api.schemas
+      .patch({
+        database_id: this.database.id,
+        schema_oid: this.oid,
+        patch: {
+          name: props.name,
+          description: props.description,
+        },
+      })
+      .run();
+  }
+
+  delete(): CancellablePromise<void> {
+    return api.schemas
+      .delete({
+        database_id: this.database.id,
+        schema_oid: this.oid,
+      })
+      .run();
+  }
 }
diff --git a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
index 90b81541a5..a5788a0f3e 100644
--- a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
@@ -62,7 +62,7 @@
       identifierName: schema.name,
       body: [$_('schema_delete_warning'), $_('are_you_sure_to_proceed')],
       onProceed: async () => {
-        await deleteSchemaAPI(database.id, schema.oid);
+        await deleteSchemaAPI(schema);
         // TODO: Create common util to handle data clearing & sync between stores
         removeTablesStore(database, schema);
       },
diff --git a/mathesar_ui/src/stores/databases.ts b/mathesar_ui/src/stores/databases.ts
index bcd58a8434..055b3e1c86 100644
--- a/mathesar_ui/src/stores/databases.ts
+++ b/mathesar_ui/src/stores/databases.ts
@@ -25,7 +25,7 @@ class DatabasesStore {
 
   readonly databases: Readable<ImmutableMap<Database['id'], Database>>;
 
-  readonly currentDatabaseId = writable<Database['id'] | undefined>();
+  private readonly currentDatabaseId = writable<Database['id'] | undefined>();
 
   readonly currentDatabase: Readable<Database | undefined>;
 
diff --git a/mathesar_ui/src/stores/schemas.ts b/mathesar_ui/src/stores/schemas.ts
index d17160781e..7b2ba19fa8 100644
--- a/mathesar_ui/src/stores/schemas.ts
+++ b/mathesar_ui/src/stores/schemas.ts
@@ -76,14 +76,11 @@ function updateSchemaInDBSchemaStore(
   }
 }
 
-function removeSchemaInDBSchemaStore(
-  databaseId: Database['id'],
-  schemaId: Schema['oid'],
-) {
-  const store = dbSchemaStoreMap.get(databaseId);
+function removeSchemaInDBSchemaStore(database: Database, schema: Schema) {
+  const store = dbSchemaStoreMap.get(database.id);
   if (store) {
     store.update((value) => {
-      value.data?.delete(schemaId);
+      value.data?.delete(schema.oid);
       return {
         ...value,
         data: new Map(value.data),
@@ -175,14 +172,16 @@ function getSchemasStoreForDB(database: Database): Writable<DBSchemaStoreData> {
 
 export async function createSchema(
   database: Database,
-  name: Schema['name'],
-  description: Schema['description'],
+  props: {
+    name: Schema['name'];
+    description: Schema['description'];
+  },
 ): Promise<void> {
   const schemaOid = await api.schemas
     .add({
       database_id: database.id,
-      name,
-      description,
+      name: props.name,
+      description: props.description,
     })
     .run();
   /**
@@ -198,33 +197,19 @@ export async function createSchema(
 }
 
 export async function updateSchema(
-  databaseId: Database['id'],
   schema: Schema,
+  patch: {
+    name: Schema['name'];
+    description: Schema['description'];
+  },
 ): Promise<void> {
-  await api.schemas
-    .patch({
-      database_id: databaseId,
-      schema_oid: schema.oid,
-      patch: {
-        name: schema.name,
-        description: schema.description,
-      },
-    })
-    .run();
-  updateSchemaInDBSchemaStore(databaseId, schema);
+  await schema.updateNameAndDescription(patch);
+  updateSchemaInDBSchemaStore(schema.database.id, schema);
 }
 
-export async function deleteSchema(
-  databaseId: Database['id'],
-  schemaId: Schema['oid'],
-): Promise<void> {
-  await api.schemas
-    .delete({
-      database_id: databaseId,
-      schema_oid: schemaId,
-    })
-    .run();
-  removeSchemaInDBSchemaStore(databaseId, schemaId);
+export async function deleteSchema(schema: Schema): Promise<void> {
+  await schema.delete();
+  removeSchemaInDBSchemaStore(schema.database, schema);
 }
 
 export const schemas: Readable<DBSchemaStoreData> = derived(
diff --git a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
index 0f03bcade1..c57496ae83 100644
--- a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
+++ b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
@@ -43,9 +43,9 @@
   async function save(name: string, description: string) {
     try {
       if (schema) {
-        await updateSchema(database.id, { ...schema, name, description });
+        await updateSchema(schema, { name, description });
       } else {
-        await createSchema(database, name, description);
+        await createSchema(database, { name, description });
       }
     } catch (err) {
       toast.fromError(err);

From 1a210221b96a2a149dfead162f80dc3f9f839ef7 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 16 Sep 2024 14:22:48 +0530
Subject: [PATCH 0891/1141] Use stores for schema name, description, and
 tableCount

---
 mathesar_ui/src/components/AppHeader.svelte   |  2 +-
 mathesar_ui/src/components/SchemaName.svelte  |  5 +-
 .../breadcrumb/SchemaSelector.svelte          |  4 +-
 mathesar_ui/src/models/Schema.ts              | 58 ++++++++++++++-----
 .../schemas/SchemaConstituentCounts.svelte    |  4 +-
 .../pages/database/schemas/SchemaRow.svelte   | 14 +++--
 .../database/schemas/SchemasSection.svelte    |  5 +-
 .../pages/exploration/ExplorationPage.svelte  |  4 +-
 .../preview/ImportPreviewContent.svelte       |  5 +-
 .../import/preview/importPreviewPageUtils.ts  |  7 +--
 .../import/upload/ImportUploadPage.svelte     |  1 -
 mathesar_ui/src/pages/pageTitleUtils.ts       |  3 +-
 .../schema/CreateEmptyTableButton.svelte      |  2 +-
 .../pages/schema/CreateNewTableButton.svelte  |  2 +-
 .../src/pages/schema/SchemaOverview.svelte    |  3 +-
 .../src/pages/schema/SchemaPage.svelte        | 15 ++---
 mathesar_ui/src/pages/schema/TableCard.svelte |  2 +-
 mathesar_ui/src/stores/schemas.ts             | 36 +-----------
 mathesar_ui/src/stores/tables.ts              | 35 +++++------
 .../systems/schemas/AddEditSchemaModal.svelte | 20 +++----
 .../table-inspector/table/TableActions.svelte |  2 +-
 21 files changed, 113 insertions(+), 116 deletions(-)

diff --git a/mathesar_ui/src/components/AppHeader.svelte b/mathesar_ui/src/components/AppHeader.svelte
index df50ad55c9..35709b9695 100644
--- a/mathesar_ui/src/components/AppHeader.svelte
+++ b/mathesar_ui/src/components/AppHeader.svelte
@@ -57,7 +57,7 @@
       return;
     }
     isCreatingNewEmptyTable = true;
-    const table = await createTable({ database, schema });
+    const table = await createTable({ schema });
     isCreatingNewEmptyTable = false;
     router.goto(getTablePageUrl(database.id, schema.oid, table.oid), false);
   }
diff --git a/mathesar_ui/src/components/SchemaName.svelte b/mathesar_ui/src/components/SchemaName.svelte
index d7788c4399..a1e8ff3d5c 100644
--- a/mathesar_ui/src/components/SchemaName.svelte
+++ b/mathesar_ui/src/components/SchemaName.svelte
@@ -7,12 +7,13 @@
   export let schema: Schema;
   export let iconHasBox = false;
 
-  $: isLocked = schema.name === 'public';
+  $: ({ name, isPublicSchema } = schema);
+  $: isLocked = $isPublicSchema;
 </script>
 
 <span class="schema-name" class:is-locked={isLocked}>
   <NameWithIcon icon={iconSchema} {iconHasBox}>
-    {schema.name}
+    {$name}
   </NameWithIcon>
 </span>
 
diff --git a/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte b/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte
index 11c84be493..fb7a15ad54 100644
--- a/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/SchemaSelector.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { get } from 'svelte/store';
   import { _ } from 'svelte-i18n';
 
   import { iconSchema } from '@mathesar/icons';
@@ -18,7 +19,8 @@
   function makeBreadcrumbSelectorItem(schema: Schema): BreadcrumbSelectorEntry {
     return {
       type: 'simple',
-      label: schema.name,
+      // TODO_BETA: Make label a store
+      label: get(schema.name),
       href: getSchemaPageUrl(database.id, schema.oid),
       icon: iconSchema,
       isActive() {
diff --git a/mathesar_ui/src/models/Schema.ts b/mathesar_ui/src/models/Schema.ts
index 8abc15d6d3..c081fda179 100644
--- a/mathesar_ui/src/models/Schema.ts
+++ b/mathesar_ui/src/models/Schema.ts
@@ -1,17 +1,31 @@
+import { type Readable, derived, writable } from 'svelte/store';
+
 import { api } from '@mathesar/api/rpc';
 import type { RawSchema, SchemaPrivilege } from '@mathesar/api/rpc/schemas';
-import type { CancellablePromise } from '@mathesar-component-library';
+import { CancellablePromise } from '@mathesar-component-library';
 
 import type { Database } from './Database';
 
 export class Schema {
   readonly oid: number;
 
-  readonly name: string;
+  private _name;
+
+  get name(): Readable<RawSchema['name']> {
+    return this._name;
+  }
+
+  private _description;
+
+  get description(): Readable<RawSchema['description']> {
+    return this._description;
+  }
 
-  readonly description: RawSchema['description'];
+  private _tableCount;
 
-  table_count: number;
+  get tableCount(): Readable<RawSchema['table_count']> {
+    return this._tableCount;
+  }
 
   readonly owner_oid: number;
 
@@ -19,13 +33,15 @@ export class Schema {
 
   readonly current_role_owns: boolean;
 
+  readonly isPublicSchema = derived(this.name, ($name) => $name === 'public');
+
   readonly database: Database;
 
   constructor(props: { database: Database; rawSchema: RawSchema }) {
     this.oid = props.rawSchema.oid;
-    this.name = props.rawSchema.name;
-    this.description = props.rawSchema.description;
-    this.table_count = props.rawSchema.table_count;
+    this._name = writable(props.rawSchema.name);
+    this._description = writable(props.rawSchema.description);
+    this._tableCount = writable(props.rawSchema.table_count);
     this.owner_oid = props.rawSchema.owner_oid;
     this.current_role_priv = props.rawSchema.current_role_priv;
     this.current_role_owns = props.rawSchema.current_role_owns;
@@ -34,18 +50,32 @@ export class Schema {
 
   updateNameAndDescription(props: {
     name: string;
-    description?: RawSchema['description'];
-  }): CancellablePromise<void> {
-    return api.schemas
+    description: RawSchema['description'];
+  }): CancellablePromise<Schema> {
+    const promise = api.schemas
       .patch({
         database_id: this.database.id,
         schema_oid: this.oid,
-        patch: {
-          name: props.name,
-          description: props.description,
-        },
+        patch: props,
       })
       .run();
+
+    return new CancellablePromise(
+      (resolve, reject) => {
+        promise
+          .then(() => {
+            this._name.set(props.name);
+            this._description.set(props.description);
+            return resolve(this);
+          }, reject)
+          .catch(reject);
+      },
+      () => promise.cancel(),
+    );
+  }
+
+  updateTableCount(count: number) {
+    this._tableCount.set(count);
   }
 
   delete(): CancellablePromise<void> {
diff --git a/mathesar_ui/src/pages/database/schemas/SchemaConstituentCounts.svelte b/mathesar_ui/src/pages/database/schemas/SchemaConstituentCounts.svelte
index 46cf8408c7..4450d33ad8 100644
--- a/mathesar_ui/src/pages/database/schemas/SchemaConstituentCounts.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemaConstituentCounts.svelte
@@ -4,11 +4,13 @@
   import type { Schema } from '@mathesar/models/Schema';
 
   export let schema: Schema;
+
+  $: ({ tableCount } = schema);
 </script>
 
 <div class="container">
   <p class="table-count">
-    {$_('count_tables', { values: { count: schema.table_count } })}
+    {$_('count_tables', { values: { count: $tableCount } })}
   </p>
 </div>
 
diff --git a/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte b/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
index 14a067d1a1..43bc69b4bf 100644
--- a/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
@@ -24,12 +24,14 @@
   export let database: Database;
   export let schema: Schema;
 
+  $: ({ name, description, isPublicSchema } = schema);
+
   let isHovered = false;
   let isFocused = false;
 
   $: href = getSchemaPageUrl(database.id, schema.oid);
-  $: isDefault = schema.name === 'public';
-  $: isLocked = schema.name === 'public';
+  $: isDefault = $isPublicSchema;
+  $: isLocked = $isPublicSchema;
 </script>
 
 <div
@@ -68,9 +70,9 @@
     {/if}
   </div>
 
-  {#if schema.description}
-    <p class="description" title={schema.description}>
-      {schema.description}
+  {#if $description}
+    <p class="description" title={$description}>
+      {$description}
     </p>
   {/if}
 
@@ -86,7 +88,7 @@
   <a
     {href}
     class="hyperlink-overlay"
-    aria-label={schema.name}
+    aria-label={$name}
     on:mouseenter={() => {
       isHovered = true;
     }}
diff --git a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
index a5788a0f3e..a1a98eb02c 100644
--- a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { get } from 'svelte/store';
   import { _ } from 'svelte-i18n';
 
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
@@ -37,7 +38,7 @@
   ): Schema[] {
     const filtered: Schema[] = [];
     schemaData.forEach((schema) => {
-      if (schema.name?.toLowerCase().includes(filter.toLowerCase())) {
+      if (get(schema.name).toLowerCase().includes(filter.toLowerCase())) {
         filtered.push(schema);
       }
     });
@@ -59,7 +60,7 @@
   function deleteSchema(schema: Schema) {
     void confirmDelete({
       identifierType: $_('schema'),
-      identifierName: schema.name,
+      identifierName: get(schema.name),
       body: [$_('schema_delete_warning'), $_('are_you_sure_to_proceed')],
       onProceed: async () => {
         await deleteSchemaAPI(schema);
diff --git a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
index c2f75f56bf..14062dad8c 100644
--- a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
+++ b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
@@ -24,6 +24,8 @@
   export let query: QueryInstance;
   export let shareConsumer: ShareConsumer | undefined = undefined;
 
+  $: schemaName = schema.name;
+
   let queryRunner: QueryRunner | undefined;
   let isInspectorOpen = true;
 
@@ -50,7 +52,7 @@
 </script>
 
 <svelte:head>
-  <title>{query.name} | {schema.name} | {$_('mathesar')}</title>
+  <title>{query.name} | {$schemaName} | {$_('mathesar')}</title>
 </svelte:head>
 
 <LayoutWithHeader fitViewport>
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index cd7ad4bbf9..5080e40f7a 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -72,14 +72,11 @@
   $: form = makeForm({ customizedTableName });
 
   $: headerUpdateRequest = makeHeaderUpdateRequest({
-    database,
     schema,
     table,
     dataFile,
   });
-  $: cancelationRequest = new AsyncStore(() =>
-    deleteTable(database, schema, table.oid),
-  );
+  $: cancelationRequest = new AsyncStore(() => deleteTable(schema, table.oid));
   $: typeSuggestionsRequest = new AsyncStore(() =>
     api.data_modeling
       .suggest_types({ table_oid: table.oid, database_id: database.id })
diff --git a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
index b360ff907c..fca7a3c956 100644
--- a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
+++ b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
@@ -47,13 +47,11 @@ export function processColumns(
 }
 
 export function makeHeaderUpdateRequest({
-  database,
   schema,
   table,
   dataFile,
 }: {
-  database: Pick<Database, 'id'>;
-  schema: Pick<Schema, 'oid'>;
+  schema: Schema;
   table: Pick<Table, 'oid'>;
   dataFile: Pick<DataFile, 'id'>;
 }) {
@@ -65,13 +63,12 @@ export function makeHeaderUpdateRequest({
     customizedTableName: string;
   }) {
     await Promise.all([
-      deleteTable(database, schema, table.oid),
+      deleteTable(schema, table.oid),
       dataFilesApi.update(dataFile.id, {
         header: firstRowIsHeader,
       }),
     ]);
     return createTableFromDataFile({
-      database,
       schema,
       dataFile,
       name: customizedTableName,
diff --git a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
index c64594817b..1e4b38af86 100644
--- a/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
+++ b/mathesar_ui/src/pages/import/upload/ImportUploadPage.svelte
@@ -114,7 +114,6 @@
         return;
       }
       const table = await createTableFromDataFile({
-        database,
         schema,
         dataFile: { id: dataFileId },
       });
diff --git a/mathesar_ui/src/pages/pageTitleUtils.ts b/mathesar_ui/src/pages/pageTitleUtils.ts
index 842ad8997a..4b65bea9b8 100644
--- a/mathesar_ui/src/pages/pageTitleUtils.ts
+++ b/mathesar_ui/src/pages/pageTitleUtils.ts
@@ -9,7 +9,8 @@ function makePageTitle(parts: string[]): string {
   const schema = get(currentSchema);
   const allParts = [...parts];
   if (schema) {
-    allParts.push(schema.name);
+    // TODO_BETA: Make this reactive
+    allParts.push(get(schema.name));
   }
   allParts.push(get(_)('mathesar'));
   return allParts.join(SEPARATOR);
diff --git a/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte b/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
index 12178c7f9c..835686e5ff 100644
--- a/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
+++ b/mathesar_ui/src/pages/schema/CreateEmptyTableButton.svelte
@@ -17,7 +17,7 @@
 
   async function handleCreateEmptyTable() {
     isCreatingNewTable = true;
-    const table = await createTable({ database, schema });
+    const table = await createTable({ schema });
     isCreatingNewTable = false;
     router.goto(getTablePageUrl(database.id, schema.oid, table.oid), false);
   }
diff --git a/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte b/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
index 07e9f91489..435bca05b6 100644
--- a/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
+++ b/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
@@ -22,7 +22,7 @@
 
   async function handleCreateEmptyTable() {
     isCreatingNewTable = true;
-    const table = await createTable({ database, schema });
+    const table = await createTable({ schema });
     isCreatingNewTable = false;
     router.goto(getTablePageUrl(database.id, schema.oid, table.oid), false);
   }
diff --git a/mathesar_ui/src/pages/schema/SchemaOverview.svelte b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
index 382561d5c0..cefe667de0 100644
--- a/mathesar_ui/src/pages/schema/SchemaOverview.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
@@ -36,6 +36,7 @@
   $: showTableCreationTutorial = !hasTables;
   $: showExplorationTutorial = hasTables && !hasExplorations;
   $: isExplorationsLoading = explorationsRequestStatus.state === 'processing';
+  $: ({ tableCount } = schema);
 
   // Viewers can explore, they cannot save explorations
   $: canExplore = hasTables && hasExplorations && !isExplorationsLoading;
@@ -49,7 +50,7 @@
       </svelte:fragment>
     </OverviewHeader>
     {#if tablesRequestStatus.state === 'processing'}
-      <TableSkeleton numTables={schema.table_count} />
+      <TableSkeleton numTables={$tableCount} />
     {:else if tablesRequestStatus.state === 'failure'}
       <ErrorBox>
         <p>{tablesRequestStatus.errors[0]}</p>
diff --git a/mathesar_ui/src/pages/schema/SchemaPage.svelte b/mathesar_ui/src/pages/schema/SchemaPage.svelte
index 02f2eda913..afd98299dd 100644
--- a/mathesar_ui/src/pages/schema/SchemaPage.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPage.svelte
@@ -71,16 +71,17 @@
     addEditModal.open();
   }
 
-  $: isDefault = schema.name === 'public';
+  $: ({ name, description, tableCount } = schema);
+  $: isDefault = $name === 'public';
 
   logEvent('opened_schema', {
     database_name: database.name,
-    schema_name: schema.name,
+    schema_name: $name,
     source: 'schema_page',
   });
 </script>
 
-<svelte:head><title>{makeSimplePageTitle(schema.name)}</title></svelte:head>
+<svelte:head><title>{makeSimplePageTitle($name)}</title></svelte:head>
 
 <LayoutWithHeader
   restrictWidth
@@ -91,7 +92,7 @@
   <AppSecondaryHeader
     slot="secondary-header"
     pageTitleAndMetaProps={{
-      name: schema.name,
+      name: $name,
       icon: iconSchema,
     }}
   >
@@ -105,9 +106,9 @@
     </div>
 
     <svelte:fragment slot="bottom">
-      {#if schema.description}
+      {#if $description}
         <span class="description">
-          {schema.description}
+          {$description}
         </span>
       {/if}
     </svelte:fragment>
@@ -134,7 +135,7 @@
     {:else if activeTab?.id === 'tables'}
       <div class="tab-container">
         {#if tablesRequestStatus.state === 'processing'}
-          <TableSkeleton numTables={schema.table_count} />
+          <TableSkeleton numTables={$tableCount} />
         {:else}
           <SchemaTables {tablesMap} {database} {schema} />
         {/if}
diff --git a/mathesar_ui/src/pages/schema/TableCard.svelte b/mathesar_ui/src/pages/schema/TableCard.svelte
index 4ce44dbeab..da54bc7267 100644
--- a/mathesar_ui/src/pages/schema/TableCard.svelte
+++ b/mathesar_ui/src/pages/schema/TableCard.svelte
@@ -67,7 +67,7 @@
         },
       },
       onProceed: async () => {
-        await deleteTable(database, schema, table.oid);
+        await deleteTable(schema, table.oid);
       },
     });
   }
diff --git a/mathesar_ui/src/stores/schemas.ts b/mathesar_ui/src/stores/schemas.ts
index 7b2ba19fa8..e57988476e 100644
--- a/mathesar_ui/src/stores/schemas.ts
+++ b/mathesar_ui/src/stores/schemas.ts
@@ -89,27 +89,6 @@ function removeSchemaInDBSchemaStore(database: Database, schema: Schema) {
   }
 }
 
-export function addCountToSchemaNumTables(
-  database: Pick<Database, 'id'>,
-  schema: Pick<Schema, 'oid'>,
-  count: number,
-) {
-  const store = dbSchemaStoreMap.get(database.id);
-  if (store) {
-    store.update((value) => {
-      const schemaToModify = value.data.get(schema.oid);
-      if (schemaToModify) {
-        schemaToModify.table_count += count;
-        value.data.set(schema.oid, schemaToModify);
-      }
-      return {
-        ...value,
-        data: new Map(value.data),
-      };
-    });
-  }
-}
-
 async function refetchSchemasForDB(
   database: Database,
 ): Promise<DBSchemaStoreData | undefined> {
@@ -173,8 +152,8 @@ function getSchemasStoreForDB(database: Database): Writable<DBSchemaStoreData> {
 export async function createSchema(
   database: Database,
   props: {
-    name: Schema['name'];
-    description: Schema['description'];
+    name: string;
+    description: string | null;
   },
 ): Promise<void> {
   const schemaOid = await api.schemas
@@ -196,17 +175,6 @@ export async function createSchema(
   updateSchemaInDBSchemaStore(database.id, new Schema({ database, rawSchema }));
 }
 
-export async function updateSchema(
-  schema: Schema,
-  patch: {
-    name: Schema['name'];
-    description: Schema['description'];
-  },
-): Promise<void> {
-  await schema.updateNameAndDescription(patch);
-  updateSchemaInDBSchemaStore(schema.database.id, schema);
-}
-
 export async function deleteSchema(schema: Schema): Promise<void> {
   await schema.delete();
   removeSchemaInDBSchemaStore(schema.database, schema);
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index d843a41025..b63c20cb22 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -47,7 +47,7 @@ import {
 } from '@mathesar-component-library';
 
 import { currentDatabase } from './databases';
-import { addCountToSchemaNumTables, currentSchemaId } from './schemas';
+import { currentSchemaId } from './schemas';
 
 const commonData = preloadCommonData();
 
@@ -205,22 +205,21 @@ function findStoreContainingTable(
 }
 
 export function deleteTable(
-  database: Pick<Database, 'id'>,
-  schema: Pick<Schema, 'oid'>,
+  schema: Schema,
   tableOid: Table['oid'],
 ): CancellablePromise<void> {
   const promise = api.tables
     .delete({
-      database_id: database.id,
+      database_id: schema.database.id,
       table_oid: tableOid,
     })
     .run();
   return new CancellablePromise(
     (resolve, reject) => {
       void promise.then(() => {
-        addCountToSchemaNumTables(database, schema, -1);
+        schema.updateTableCount(get(schema.tableCount) - 1);
         tablesStores
-          .get([database.id, schema.oid])
+          .get([schema.database.id, schema.oid])
           ?.update((tableStoreData) => {
             tableStoreData.tablesMap.delete(tableOid);
             return {
@@ -313,22 +312,20 @@ export async function updateTable({
 }
 
 function addTableToStore({
-  database,
   schema,
   table,
 }: {
-  database: Pick<Database, 'id'>;
-  schema: Pick<Schema, 'oid'>;
+  schema: Schema;
   table: Partial<Table> & Pick<Table, 'oid' | 'name'>;
 }): Table {
-  addCountToSchemaNumTables(database, schema, 1);
+  schema.updateTableCount(get(schema.tableCount) + 1);
   const fullTable: Table = {
     description: null,
     metadata: null,
     schema: schema.oid,
     ...table,
   };
-  const tablesStore = tablesStores.get([database.id, schema.oid]);
+  const tablesStore = tablesStores.get([schema.database.id, schema.oid]);
   tablesStore?.update((tablesData) => {
     const tables = sortTables([...tablesData.tablesMap.values(), fullTable]);
     return {
@@ -340,22 +337,20 @@ function addTableToStore({
 }
 
 export function createTable({
-  database,
   schema,
 }: {
-  database: Pick<Database, 'id'>;
-  schema: Pick<Schema, 'oid'>;
+  schema: Schema;
 }): CancellablePromise<Table> {
   const promise = api.tables
     .add({
-      database_id: database.id,
+      database_id: schema.database.id,
       schema_oid: schema.oid,
     })
     .run();
   return new CancellablePromise(
     (resolve, reject) => {
       void promise.then(
-        (table) => resolve(addTableToStore({ database, schema, table })),
+        (table) => resolve(addTableToStore({ schema, table })),
         reject,
       );
     },
@@ -366,14 +361,13 @@ export function createTable({
 }
 
 export async function createTableFromDataFile(props: {
-  database: Pick<Database, 'id'>;
-  schema: Pick<Schema, 'oid'>;
+  schema: Schema;
   dataFile: Pick<DataFile, 'id'>;
   name?: string;
 }): Promise<Table> {
   const created = await api.tables
     .import({
-      database_id: props.database.id,
+      database_id: props.schema.database.id,
       schema_oid: props.schema.oid,
       table_name: props.name,
       data_file_id: props.dataFile.id,
@@ -381,7 +375,6 @@ export async function createTableFromDataFile(props: {
     .run();
 
   const basicTable = addTableToStore({
-    database: props.database,
     schema: props.schema,
     table: {
       oid: created.oid,
@@ -391,7 +384,7 @@ export async function createTableFromDataFile(props: {
   });
 
   const fullTable = await updateTable({
-    database: props.database,
+    database: props.schema.database,
     table: {
       ...basicTable,
       metadata: {
diff --git a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
index c57496ae83..5f0f59837f 100644
--- a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
+++ b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { get } from 'svelte/store';
   import { _ } from 'svelte-i18n';
 
   import Identifier from '@mathesar/components/Identifier.svelte';
@@ -7,11 +8,7 @@
   import { RichText } from '@mathesar/components/rich-text';
   import type { Database } from '@mathesar/models/Database';
   import type { Schema } from '@mathesar/models/Schema';
-  import {
-    createSchema,
-    schemas,
-    updateSchema,
-  } from '@mathesar/stores/schemas';
+  import { createSchema, schemas } from '@mathesar/stores/schemas';
   import { toast } from '@mathesar/stores/toast';
   import type { ModalController } from '@mathesar-component-library';
 
@@ -19,14 +16,17 @@
   export let controller: ModalController;
   export let schema: Schema | undefined = undefined;
 
+  $: schemaName = schema?.name;
+  $: schemaDescription = schema?.description;
+
   function nameIsDuplicate(name: string) {
     // Handling the condition when the new name is equal to the current name
     // But the user has made sone key down events
-    if (schema && name.trim() === schema.name) {
+    if (schema && name.trim() === $schemaName) {
       return false;
     }
     return Array.from($schemas?.data || []).some(
-      ([, s]) => s.name.toLowerCase().trim() === name.trim(),
+      ([, s]) => get(s.name).toLowerCase().trim() === $schemaName?.trim(),
     );
   }
 
@@ -43,7 +43,7 @@
   async function save(name: string, description: string) {
     try {
       if (schema) {
-        await updateSchema(schema, { name, description });
+        await schema.updateNameAndDescription({ name, description });
       } else {
         await createSchema(database, { name, description });
       }
@@ -57,8 +57,8 @@
   {controller}
   {save}
   {getNameValidationErrors}
-  getInitialName={() => schema?.name ?? ''}
-  getInitialDescription={() => schema?.description ?? ''}
+  getInitialName={() => $schemaName ?? ''}
+  getInitialDescription={() => $schemaDescription ?? ''}
   saveButtonLabel={schema ? $_('save') : $_('create_new_schema')}
 >
   <svelte:fragment slot="helpText">
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
index 70160a48ee..28c6567ed6 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
@@ -67,7 +67,7 @@
         const database = $currentDatabase;
         const schema = $currentSchema;
         if (database && schema) {
-          await deleteTable(database, schema, table.oid);
+          await deleteTable(schema, table.oid);
           router.goto(getSchemaPageUrl(database.id, schema.oid), true);
         }
       },

From a5e4ce976f0f34120dba51c276b2352b764ab4ad Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 16 Sep 2024 14:32:01 +0530
Subject: [PATCH 0892/1141] Reduce usage of currentDatabase store

---
 .../preview/ImportPreviewContent.svelte       | 19 ++++++++++---------
 .../import/preview/ImportPreviewPage.svelte   |  7 ++-----
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index 5080e40f7a..15d91eed4c 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -25,7 +25,6 @@
   } from '@mathesar/routes/urls';
   import { abstractTypesMap } from '@mathesar/stores/abstract-types';
   import AsyncStore from '@mathesar/stores/AsyncStore';
-  import { currentDatabase } from '@mathesar/stores/databases';
   import {
     currentTables,
     deleteTable,
@@ -54,7 +53,6 @@
   /** Set via back-end */
   const TRUNCATION_LIMIT = 20;
 
-  export let database: Database;
   export let schema: Schema;
   export let table: Table;
   export let dataFile: DataFile;
@@ -79,14 +77,14 @@
   $: cancelationRequest = new AsyncStore(() => deleteTable(schema, table.oid));
   $: typeSuggestionsRequest = new AsyncStore(() =>
     api.data_modeling
-      .suggest_types({ table_oid: table.oid, database_id: database.id })
+      .suggest_types({ table_oid: table.oid, database_id: schema.database.id })
       .run(),
   );
   $: previewRequest = new AsyncStore(
     (columnPreviewSpecs: ColumnPreviewSpec[]) =>
       api.tables
         .get_import_preview({
-          database_id: database.id,
+          database_id: schema.database.id,
           table_oid: table.oid,
           columns: columnPreviewSpecs,
         })
@@ -101,7 +99,7 @@
 
   async function init() {
     const columnsResponse = await columnsFetch.run({
-      database_id: $currentDatabase.id,
+      database_id: schema.database.id,
       table_oid: table.oid,
     });
     const fetchedColumns = columnsResponse?.resolvedValue;
@@ -130,7 +128,7 @@
   }) {
     const tableId = props.table?.oid ?? table.oid;
     router.goto(
-      getImportPreviewPageUrl(database.id, schema.oid, tableId, {
+      getImportPreviewPageUrl(schema.database.id, schema.oid, tableId, {
         useColumnTypeInference:
           props.useColumnTypeInference ?? useColumnTypeInference,
       }),
@@ -164,7 +162,7 @@
   async function cancel() {
     const response = await cancelationRequest.run();
     if (response.isOk) {
-      router.goto(getSchemaPageUrl(database.id, schema.oid), true);
+      router.goto(getSchemaPageUrl(schema.database.id, schema.oid), true);
     } else {
       toast.fromError(response.error);
     }
@@ -173,7 +171,7 @@
   async function finishImport() {
     try {
       await updateTable({
-        database,
+        database: schema.database,
         table: {
           oid: table.oid,
           name: $customizedTableName,
@@ -186,7 +184,10 @@
           .filter(([, { selected }]) => !selected)
           .map(([id]) => parseInt(id, 10)),
       });
-      router.goto(getTablePageUrl(database.id, schema.oid, table.oid), true);
+      router.goto(
+        getTablePageUrl(schema.database.id, schema.oid, table.oid),
+        true,
+      );
     } catch (err) {
       toast.fromError(err);
     }
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
index c9d5dc7b2a..f15c44b189 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
@@ -9,7 +9,6 @@
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { getTablePageUrl } from '@mathesar/routes/urls';
   import AsyncStore from '@mathesar/stores/AsyncStore';
-  import { currentDatabase } from '@mathesar/stores/databases';
   import { getTableFromStoreOrApi } from '@mathesar/stores/tables';
   import { getErrorMessage } from '@mathesar/utils/errors';
   import { tableRequiresImportConfirmation } from '@mathesar/utils/tables';
@@ -31,9 +30,8 @@
   }
 
   $: void (async () => {
-    const table = (
-      await tableFetch.run({ database: $currentDatabase, tableOid: tableId })
-    ).resolvedValue;
+    const table = (await tableFetch.run({ database, tableOid: tableId }))
+      .resolvedValue;
     if (!table) {
       return;
     }
@@ -56,7 +54,6 @@
 
 {#if $tableFetch.resolvedValue && $dataFileFetch.resolvedValue}
   <ImportPreviewContent
-    {database}
     {schema}
     table={$tableFetch.resolvedValue}
     dataFile={$dataFileFetch.resolvedValue}

From 87c0c2c88cfd8a651e215c0c6aa2b372c8091bae Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 16 Sep 2024 15:31:21 +0530
Subject: [PATCH 0893/1141] Implement Permissions modal -> 'Share' tab for
 Schemas

---
 mathesar_ui/src/api/rpc/schemas.ts            |  25 ++++
 mathesar_ui/src/i18n/languages/en/dict.json   |   6 +
 mathesar_ui/src/models/Schema.ts              |  15 ++-
 .../src/pages/schema/SchemaPage.svelte        |   7 ++
 .../schema/SchemaPermissionsModal.svelte      | 119 ++++++++++++++++++
 5 files changed, 171 insertions(+), 1 deletion(-)
 create mode 100644 mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte

diff --git a/mathesar_ui/src/api/rpc/schemas.ts b/mathesar_ui/src/api/rpc/schemas.ts
index 488b32f616..0f7b3a0bac 100644
--- a/mathesar_ui/src/api/rpc/schemas.ts
+++ b/mathesar_ui/src/api/rpc/schemas.ts
@@ -1,5 +1,6 @@
 import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
 
+import type { RawDatabase } from './databases';
 import type { RawRole } from './roles';
 
 export const allSchemaPrivileges = ['USAGE', 'CREATE'] as const;
@@ -15,6 +16,11 @@ export interface RawSchema {
   current_role_owns: boolean;
 }
 
+export interface RawSchemaPrivilegesForRole {
+  role_oid: RawRole['oid'];
+  direct: SchemaPrivilege[];
+}
+
 export const schemas = {
   list: rpcMethodTypeContainer<
     {
@@ -52,4 +58,23 @@ export const schemas = {
     },
     void
   >(),
+
+  privileges: {
+    list_direct: rpcMethodTypeContainer<
+      {
+        database_id: RawDatabase['id'];
+        schema_oid: RawSchema['oid'];
+      },
+      Array<RawSchemaPrivilegesForRole>
+    >(),
+
+    replace_for_roles: rpcMethodTypeContainer<
+      {
+        database_id: RawDatabase['id'];
+        schema_oid: RawSchema['oid'];
+        privileges: Array<RawSchemaPrivilegesForRole>;
+      },
+      Array<RawSchemaPrivilegesForRole>
+    >(),
+  },
 };
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 1477b656c3..c3f42cbedd 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -438,6 +438,7 @@
   "provide_details_connect_existing_database": "Provide the details to connect an existing PostgreSQL database to Mathesar",
   "provide_url_to_file": "Provide a URL to the file",
   "public_schema_info": "Every PostgreSQL database includes the \"public\" schema. This protected schema can be read by anybody who accesses the database.",
+  "read": "Read",
   "read_release_notes": "Read the [releaseNotesLink](release notes) to see if this release requires any special upgrade instructions.",
   "readonly_access": "Read-Only Access",
   "record": "Record",
@@ -496,10 +497,15 @@
   "saving": "Saving",
   "saving_changes": "Saving Changes",
   "schema": "Schema",
+  "schema_access_create_help": "Can acccess the schema and create new tables",
+  "schema_access_read_help": "Can access the schema",
   "schema_delete_warning": "All objects in this schema will be deleted permanently, including (but not limited to) tables and views. Some of these objects may not be visible in the Mathesar UI.",
   "schema_name_already_exists": "A schema with that name already exists.",
   "schema_name_cannot_be_empty": "Schema name cannot be empty",
   "schema_not_found": "Schema not found.",
+  "schema_permissions": "Schema Permissions",
+  "schema_privilege_create_help": "Allow creation of objects within the schema.",
+  "schema_privilege_usage_help": "Allow usage of the schema.",
   "schemas": "Schemas",
   "schemas_matching_search": "{count, plural, one {{count} schema matches [searchValue]} other {{count} schemas match [searchValue]}}",
   "schemas_to_install": "Schemas to install",
diff --git a/mathesar_ui/src/models/Schema.ts b/mathesar_ui/src/models/Schema.ts
index c081fda179..4a4de7abd4 100644
--- a/mathesar_ui/src/models/Schema.ts
+++ b/mathesar_ui/src/models/Schema.ts
@@ -2,7 +2,8 @@ import { type Readable, derived, writable } from 'svelte/store';
 
 import { api } from '@mathesar/api/rpc';
 import type { RawSchema, SchemaPrivilege } from '@mathesar/api/rpc/schemas';
-import { CancellablePromise } from '@mathesar-component-library';
+import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
+import { CancellablePromise, ImmutableMap } from '@mathesar-component-library';
 
 import type { Database } from './Database';
 
@@ -86,4 +87,16 @@ export class Schema {
       })
       .run();
   }
+
+  constructSchemaPrivilegesStore() {
+    return new AsyncRpcApiStore(api.schemas.privileges.list_direct, {
+      postProcess: (rawSchemaPrivilegesForRoles) =>
+        new ImmutableMap(
+          rawSchemaPrivilegesForRoles.map((rawSchemaPrivilegesForRole) => [
+            rawSchemaPrivilegesForRole.role_oid,
+            rawSchemaPrivilegesForRole,
+          ]),
+        ),
+    });
+  }
 }
diff --git a/mathesar_ui/src/pages/schema/SchemaPage.svelte b/mathesar_ui/src/pages/schema/SchemaPage.svelte
index afd98299dd..5ea848b28e 100644
--- a/mathesar_ui/src/pages/schema/SchemaPage.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPage.svelte
@@ -22,6 +22,7 @@
   import ExplorationSkeleton from './ExplorationSkeleton.svelte';
   import SchemaExplorations from './SchemaExplorations.svelte';
   import SchemaOverview from './SchemaOverview.svelte';
+  import SchemaPermissionsModal from './SchemaPermissionsModal.svelte';
   import SchemaTables from './SchemaTables.svelte';
   import TableSkeleton from './TableSkeleton.svelte';
 
@@ -30,6 +31,7 @@
   export let section: string;
 
   const addEditModal = modal.spawnModalController();
+  const permissionsModal = modal.spawnModalController();
 
   // NOTE: This has to be same as the name key in the paths prop of Route component
   type TabsKey = 'overview' | 'tables' | 'explorations';
@@ -103,6 +105,9 @@
           <span>{$_('edit_schema')}</span>
         </Button>
       {/if}
+      <Button appearance="secondary" on:click={() => permissionsModal.open()}>
+        <span>{$_('schema_permissions')}</span>
+      </Button>
     </div>
 
     <svelte:fragment slot="bottom">
@@ -159,6 +164,8 @@
 
 <AddEditSchemaModal controller={addEditModal} {database} {schema} />
 
+<SchemaPermissionsModal controller={permissionsModal} {schema} />
+
 <style lang="scss">
   .tab-container {
     padding-top: 2rem;
diff --git a/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte b/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte
new file mode 100644
index 0000000000..08b91930e1
--- /dev/null
+++ b/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte
@@ -0,0 +1,119 @@
+<script lang="ts">
+  import { readable } from 'svelte/store';
+  import { _ } from 'svelte-i18n';
+
+  import { api } from '@mathesar/api/rpc';
+  import type {
+    RawSchemaPrivilegesForRole,
+    SchemaPrivilege,
+  } from '@mathesar/api/rpc/schemas';
+  import { DatabaseRouteContext } from '@mathesar/contexts/DatabaseRouteContext';
+  import type { Schema } from '@mathesar/models/Schema';
+  import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
+  import { AsyncStoreValue } from '@mathesar/stores/AsyncStore';
+  import { toast } from '@mathesar/stores/toast';
+  import {
+    type AccessControlConfig,
+    PermissionsModal,
+    PermissionsOverview,
+    TransferOwnership,
+  } from '@mathesar/systems/permissions';
+  import {
+    ImmutableMap,
+    type ModalController,
+  } from '@mathesar-component-library';
+
+  export let controller: ModalController;
+  export let schema: Schema;
+
+  $: schemaPrivileges = schema.constructSchemaPrivilegesStore();
+
+  const databaseContext = DatabaseRouteContext.get();
+  $: ({ roles } = $databaseContext);
+
+  const accessControlConfig: AccessControlConfig<
+    'read' | 'read_and_create',
+    SchemaPrivilege
+  > = {
+    allPrivileges: [
+      {
+        id: 'USAGE',
+        help: $_('schema_privilege_usage_help'),
+      },
+      {
+        id: 'CREATE',
+        help: $_('schema_privilege_create_help'),
+      },
+    ],
+    access: {
+      levels: [
+        {
+          id: 'read',
+          privileges: new Set(['USAGE']),
+          name: $_('read'),
+          help: $_('schema_access_read_help'),
+        },
+        {
+          id: 'read_and_create',
+          privileges: new Set(['USAGE', 'CREATE']),
+          name: $_('create'),
+          help: $_('schema_access_create_help'),
+        },
+      ],
+      default: 'read',
+    },
+  };
+
+  function getAsyncStoresForPermissions() {
+    void AsyncRpcApiStore.runBatched([
+      schemaPrivileges.batchRunner({
+        database_id: schema.database.id,
+        schema_oid: schema.oid,
+      }),
+      roles.batchRunner({ database_id: schema.database.id }),
+    ]);
+    return {
+      roles,
+      privilegesForRoles: schemaPrivileges,
+      permissionsMetaData: readable(
+        new AsyncStoreValue<Schema, string>({
+          isLoading: false,
+          settlement: {
+            state: 'resolved',
+            value: schema,
+          },
+        }),
+      ),
+    };
+  }
+
+  async function savePrivilegesForRoles(
+    privileges: RawSchemaPrivilegesForRole[],
+  ) {
+    const response = await api.schemas.privileges
+      .replace_for_roles({
+        database_id: schema.database.id,
+        schema_oid: schema.oid,
+        privileges,
+      })
+      .run();
+    schemaPrivileges.updateResolvedValue(
+      () => new ImmutableMap(response.map((pr) => [pr.role_oid, pr])),
+    );
+    toast.success($_('access_for_roles_saved_successfully'));
+  }
+</script>
+
+<PermissionsModal {controller} onClose={() => schemaPrivileges.reset()}>
+  <span slot="title">
+    {$_('schema_permissions')}
+  </span>
+  <PermissionsOverview
+    slot="share"
+    {controller}
+    {accessControlConfig}
+    getAsyncStores={getAsyncStoresForPermissions}
+    {savePrivilegesForRoles}
+  />
+  <TransferOwnership slot="transfer-ownership" {controller} />
+</PermissionsModal>

From 61503ffca2c0251940ddf8aea4fc9a552e63fef7 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Mon, 16 Sep 2024 15:47:31 +0530
Subject: [PATCH 0894/1141] alter schemas add and patch to return SchemaInfo
 and fix tests

---
 db/schemas/operations/alter.py  |  5 ++++-
 db/schemas/operations/create.py |  2 +-
 db/sql/00_msar.sql              | 14 ++++++++++----
 db/sql/test_00_msar.sql         |  6 +++---
 mathesar/rpc/schemas/base.py    | 11 +++++++----
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/db/schemas/operations/alter.py b/db/schemas/operations/alter.py
index 994cdb1fae..03f933b491 100644
--- a/db/schemas/operations/alter.py
+++ b/db/schemas/operations/alter.py
@@ -27,5 +27,8 @@ def patch_schema(schema_oid, conn, patch):
         patch: A dict mapping the following fields to new values:
             - 'name' (optional): New name for the schema.
             - 'description' (optional): New description for the schema.
+
+    Returns:
+        The SchemaInfo describing the user-defined schema in the database.
     """
-    exec_msar_func(conn, "patch_schema", schema_oid, json.dumps(patch))
+    return exec_msar_func(conn, "patch_schema", schema_oid, json.dumps(patch)).fetchone()[0]
diff --git a/db/schemas/operations/create.py b/db/schemas/operations/create.py
index 8be771c362..02f8973d02 100644
--- a/db/schemas/operations/create.py
+++ b/db/schemas/operations/create.py
@@ -48,6 +48,6 @@ def create_schema(schema_name, conn, description=None):
     If a schema already exists with the given name, this function will raise an error.
 
     Returns:
-        The integer oid of the newly created schema.
+        The SchemaInfo describing the user-defined schema in the database.
     """
     return exec_msar_func(conn, 'create_schema', schema_name, description).fetchone()[0]
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 63e905cd8c..d5b66e20d5 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1585,7 +1585,8 @@ END;
 $$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION msar.patch_schema(sch_id oid, patch jsonb) RETURNS void AS $$/*
+DROP FUNCTION IF EXISTS msar.patch_schema(oid, jsonb);
+CREATE OR REPLACE FUNCTION msar.patch_schema(sch_id oid, patch jsonb) RETURNS jsonb AS $$/*
 Modify a schema according to the given patch.
 
 Args:
@@ -1594,11 +1595,15 @@ Args:
     - name: (optional) The new name of the schema
     - description: (optional) The new description of the schema. To remove a description, pass an
       empty string or NULL.
+
+Returns:
+  A json object describing the user-defined schema in the database.
 */
 BEGIN
   PERFORM msar.rename_schema(sch_id, patch->>'name');
   PERFORM CASE WHEN patch ? 'description'
   THEN msar.set_schema_description(sch_id, patch->>'description') END;
+  RETURN msar.get_schema(sch_id);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
@@ -1645,10 +1650,11 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+DROP FUNCTION IF EXISTS msar.create_schema(text, text);
 CREATE OR REPLACE FUNCTION msar.create_schema(
   sch_name text,
   description text DEFAULT ''
-) RETURNS oid AS $$/*
+) RETURNS jsonb AS $$/*
 Create a schema, possibly with a description.
 
 If a schema with the given name already exists, an exception will be raised.
@@ -1658,7 +1664,7 @@ Args:
   description: (optional) A description for the schema, UNQUOTED.
 
 Returns:
-  The integer OID of the schema
+  A json object describing the user-defined schema in the database.
 
 Note: This function does not support IF NOT EXISTS because it's simpler that way. I originally tried
 to support descriptions and if_not_exists in the same function, but as I discovered more edge cases
@@ -1669,7 +1675,7 @@ BEGIN
   EXECUTE 'CREATE SCHEMA ' || quote_ident(sch_name);
   schema_oid := msar.get_schema_oid(sch_name);
   PERFORM msar.set_schema_description(schema_oid, description);
-  RETURN schema_oid;
+  RETURN msar.get_schema(schema_oid);
 END;
 $$ LANGUAGE plpgsql;
 
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index ee9285a4e4..6995c3b8c7 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -1188,7 +1188,7 @@ $$ LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION test_create_schema_without_description() RETURNS SETOF TEXT AS $$
 DECLARE sch_oid oid;
 BEGIN
-  SELECT msar.create_schema('foo bar') INTO sch_oid;
+  SELECT msar.create_schema('foo bar') ->> 'oid' INTO sch_oid;
   RETURN NEXT has_schema('foo bar');
   RETURN NEXT is(sch_oid, msar.get_schema_oid('foo bar'));
   RETURN NEXT is(obj_description(sch_oid), NULL);
@@ -1199,7 +1199,7 @@ $$ LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION test_create_schema_with_description() RETURNS SETOF TEXT AS $$
 DECLARE sch_oid oid;
 BEGIN
-  SELECT msar.create_schema('foo bar', 'yay') INTO sch_oid;
+  SELECT msar.create_schema('foo bar', 'yay') ->> 'oid' INTO sch_oid;
   RETURN NEXT has_schema('foo bar');
   RETURN NEXT is(sch_oid, msar.get_schema_oid('foo bar'));
   RETURN NEXT is(obj_description(sch_oid), 'yay');
@@ -1210,7 +1210,7 @@ $$ LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION test_create_schema_that_already_exists() RETURNS SETOF TEXT AS $t$
 DECLARE sch_oid oid;
 BEGIN
-  SELECT msar.create_schema('foo bar') INTO sch_oid;
+  SELECT msar.create_schema('foo bar') ->> 'oid' INTO sch_oid;
   RETURN NEXT throws_ok($$SELECT msar.create_schema('foo bar')$$, '42P06');
   RETURN NEXT is(msar.create_schema_if_not_exists('foo bar'), sch_oid);
 END;
diff --git a/mathesar/rpc/schemas/base.py b/mathesar/rpc/schemas/base.py
index 8c6a77d035..ae9dbcfabf 100644
--- a/mathesar/rpc/schemas/base.py
+++ b/mathesar/rpc/schemas/base.py
@@ -58,7 +58,7 @@ def add(
     database_id: int,
     description: Optional[str] = None,
     **kwargs,
-) -> int:
+) -> SchemaInfo:
     """
     Add a schema
 
@@ -68,7 +68,7 @@ def add(
         description: A description of the schema
 
     Returns:
-        The integer OID of the schema created
+        The SchemaInfo describing the user-defined schema in the database.
     """
     with connect(database_id, kwargs.get(REQUEST_KEY).user) as conn:
         return create_schema(
@@ -116,7 +116,7 @@ def delete(*, schema_oid: int, database_id: int, **kwargs) -> None:
 @rpc_method(name="schemas.patch")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def patch(*, schema_oid: int, database_id: int, patch: SchemaPatch, **kwargs) -> None:
+def patch(*, schema_oid: int, database_id: int, patch: SchemaPatch, **kwargs) -> SchemaInfo:
     """
     Patch a schema, given its OID.
 
@@ -124,6 +124,9 @@ def patch(*, schema_oid: int, database_id: int, patch: SchemaPatch, **kwargs) ->
         schema_oid: The OID of the schema to delete.
         database_id: The Django id of the database containing the schema.
         patch: A SchemaPatch object containing the fields to update.
+
+    Returns:
+        The SchemaInfo describing the user-defined schema in the database.
     """
     with connect(database_id, kwargs.get(REQUEST_KEY).user) as conn:
-        patch_schema(schema_oid, conn, patch)
+        return patch_schema(schema_oid, conn, patch)

From 5446236417c3ac3c0034baef4209db1076541dbd Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Mon, 16 Sep 2024 15:54:05 +0530
Subject: [PATCH 0895/1141] implement schemas.get endpoint

---
 db/schemas/operations/select.py      |  4 ++++
 docs/docs/api/rpc.md                 |  1 +
 mathesar/rpc/schemas/base.py         | 22 +++++++++++++++++++++-
 mathesar/tests/rpc/test_endpoints.py |  5 +++++
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/db/schemas/operations/select.py b/db/schemas/operations/select.py
index 550493e468..973876909a 100644
--- a/db/schemas/operations/select.py
+++ b/db/schemas/operations/select.py
@@ -10,6 +10,10 @@ def list_schemas(conn):
     return exec_msar_func(conn, 'list_schemas').fetchone()[0]
 
 
+def get_schema(schema_oid, conn):
+    return exec_msar_func(conn, 'get_schema').fetchone()[0]
+
+
 def reflect_schema(engine, name=None, oid=None, metadata=None):
     # If we have both arguments, the behavior is undefined.
     try:
diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 32e8a09dc6..ebab76b488 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -99,6 +99,7 @@ To use an RPC function:
     options:
       members:
       - list_
+      - get
       - add
       - delete
       - patch
diff --git a/mathesar/rpc/schemas/base.py b/mathesar/rpc/schemas/base.py
index ae9dbcfabf..32a9699726 100644
--- a/mathesar/rpc/schemas/base.py
+++ b/mathesar/rpc/schemas/base.py
@@ -8,7 +8,7 @@
 
 from db.constants import INTERNAL_SCHEMAS
 from db.schemas.operations.create import create_schema
-from db.schemas.operations.select import list_schemas
+from db.schemas.operations.select import list_schemas, get_schema
 from db.schemas.operations.drop import drop_schema_via_oid
 from db.schemas.operations.alter import patch_schema
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
@@ -98,6 +98,26 @@ def list_(*, database_id: int, **kwargs) -> list[SchemaInfo]:
     return [s for s in schemas if s['name'] not in INTERNAL_SCHEMAS]
 
 
+@rpc_method(name="schemas.get")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def get(*, schema_oid: int, database_id: int, **kwargs) -> SchemaInfo:
+    """
+    Get information about a schema in a database.
+
+    Args:
+        schema_oid: The OID of the schema to get.
+        database_id: The Django id of the database containing the table.
+
+    Returns:
+        The SchemaInfo describing the user-defined schema in the database.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        schema_info = get_schema(conn)
+    return schema_info
+
+
 @rpc_method(name="schemas.delete")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index c78ffaa85f..218d4ebeb8 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -297,6 +297,11 @@
         "schemas.list",
         [user_is_authenticated]
     ),
+    (
+        schemas.get,
+        "schemas.get",
+        [user_is_authenticated]
+    ),
     (
         schemas.patch,
         "schemas.patch",

From 1e3879b9086c0a087642bcdaa7d3b38e78855245 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 16 Sep 2024 18:01:29 +0530
Subject: [PATCH 0896/1141] Implement basic Table model and update references

---
 mathesar_ui/src/api/rpc/tables.ts             |  10 +-
 mathesar_ui/src/components/SelectTable.svelte |   2 +-
 .../SelectTableWithinCurrentSchema.svelte     |   2 +-
 mathesar_ui/src/components/TableName.svelte   |   2 +-
 .../BreadcrumbRecordSelector.svelte           |   2 +-
 .../breadcrumb/EntitySelector.svelte          |   2 +-
 .../components/breadcrumb/breadcrumbTypes.ts  |   2 +-
 .../src/components/cell-fabric/utils.ts       |   2 +-
 mathesar_ui/src/models/Table.ts               |  50 +++++
 .../preview/ImportPreviewContent.svelte       |   6 +-
 .../import/preview/ImportPreviewPage.svelte   |   2 +-
 .../import/preview/importPreviewPageUtils.ts  |   2 +-
 .../src/pages/record/RecordPage.svelte        |   2 +-
 .../src/pages/record/RecordPageContent.svelte |   2 +-
 mathesar_ui/src/pages/record/RecordStore.ts   |   2 +-
 .../src/pages/record/TableWidget.svelte       |   2 +-
 mathesar_ui/src/pages/schema/EditTable.svelte |   4 +-
 .../src/pages/schema/SchemaOverview.svelte    |   4 +-
 .../src/pages/schema/SchemaTables.svelte      |   2 +-
 mathesar_ui/src/pages/schema/TableCard.svelte |   2 +-
 .../src/pages/schema/TablesList.svelte        |   2 +-
 mathesar_ui/src/pages/table/TablePage.svelte  |   2 +-
 mathesar_ui/src/routes/RecordPageRoute.svelte |   2 +-
 .../src/stores/table-data/TableStructure.ts   |   2 +-
 mathesar_ui/src/stores/table-data/columns.ts  |   2 +-
 .../src/stores/table-data/constraints.ts      |   2 +-
 .../src/stores/table-data/processedColumns.ts |   4 +-
 mathesar_ui/src/stores/table-data/records.ts  |   7 +-
 .../src/stores/table-data/tabularData.ts      |   2 +-
 mathesar_ui/src/stores/tables.ts              | 192 +++++++++---------
 .../systems/data-explorer/ActionsPane.svelte  |   2 +-
 .../src/systems/data-explorer/QueryManager.ts |   9 +-
 .../data-explorer/urlSerializationUtils.ts    |   2 +-
 .../src/systems/data-explorer/utils.ts        |  10 +-
 .../RecordSelectorNavigationButton.svelte     |   2 +-
 .../src/systems/table-view/TableView.svelte   |   2 +-
 .../actions-pane/ShareTableDropdown.svelte    |   2 +-
 .../constraints/NewFkConstraint.svelte        |   2 +-
 .../systems/table-view/header/Header.svelte   |   9 +-
 .../link-table/LinkTableForm.svelte           |   2 +-
 .../link-table/LinkTablePill.svelte           |   2 +-
 .../link-table/LinkTypeOption.svelte          |   2 +-
 .../table-view/link-table/NewColumn.svelte    |   2 +-
 .../link-table/SelectLinkType.svelte          |   2 +-
 .../table-view/link-table/linkTableUtils.ts   |   2 +-
 .../ExtractColumnsModal.svelte                |  11 +-
 .../columnExtractionTypes.ts                  |   2 +-
 .../columnExtractionUtils.ts                  |   2 +-
 .../FkRecordSummaryConfig.svelte              |   2 +-
 .../record-summary/RecordSummaryConfig.svelte |   4 +-
 .../table/TableDescription.svelte             |   3 +-
 .../table-inspector/table/TableName.svelte    |   2 +-
 mathesar_ui/src/utils/columnUtils.ts          |   2 +-
 mathesar_ui/src/utils/preloadData.ts          |   4 +-
 mathesar_ui/src/utils/tables.ts               |  18 +-
 55 files changed, 223 insertions(+), 200 deletions(-)
 create mode 100644 mathesar_ui/src/models/Table.ts

diff --git a/mathesar_ui/src/api/rpc/tables.ts b/mathesar_ui/src/api/rpc/tables.ts
index 8579bf1b6d..6085b1e648 100644
--- a/mathesar_ui/src/api/rpc/tables.ts
+++ b/mathesar_ui/src/api/rpc/tables.ts
@@ -28,7 +28,7 @@ interface TableMetadata {
   record_summary_template: string | null;
 }
 
-export interface Table extends RawTable {
+export interface RawTableWithMetadata extends RawTable {
   metadata: TableMetadata | null;
 }
 
@@ -36,7 +36,7 @@ export interface Table extends RawTable {
 export type JoinPath = [number, number][][];
 
 export interface JoinableTable {
-  target: Table['oid'];
+  target: RawTableWithMetadata['oid'];
   join_path: JoinPath;
   /**
    * [Constraint OID, is_reversed]
@@ -62,7 +62,7 @@ export interface JoinableTablesResult {
   target_table_info: Record<
     string,
     {
-      name: Table['name'];
+      name: RawTableWithMetadata['name'];
       /** Keys are stringified column attnum values */
       columns: Record<
         string,
@@ -100,7 +100,7 @@ export const tables = {
       database_id: number;
       schema_oid: number;
     },
-    Table[]
+    RawTableWithMetadata[]
   >(),
 
   get: rpcMethodTypeContainer<
@@ -116,7 +116,7 @@ export const tables = {
       database_id: number;
       table_oid: number;
     },
-    Table
+    RawTableWithMetadata
   >(),
 
   /** Returns the oid of the table created */
diff --git a/mathesar_ui/src/components/SelectTable.svelte b/mathesar_ui/src/components/SelectTable.svelte
index 12ded514be..b0dd8d67ad 100644
--- a/mathesar_ui/src/components/SelectTable.svelte
+++ b/mathesar_ui/src/components/SelectTable.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rpc/tables';
+  import type { Table } from '@mathesar/models/Table';
   import { Select } from '@mathesar-component-library';
   import type { SelectProps } from '@mathesar-component-library/types';
 
diff --git a/mathesar_ui/src/components/SelectTableWithinCurrentSchema.svelte b/mathesar_ui/src/components/SelectTableWithinCurrentSchema.svelte
index 77d3b3ddd6..e0b97b75b2 100644
--- a/mathesar_ui/src/components/SelectTableWithinCurrentSchema.svelte
+++ b/mathesar_ui/src/components/SelectTableWithinCurrentSchema.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Table } from '@mathesar/api/rpc/tables';
+  import type { Table } from '@mathesar/models/Table';
   import { importVerifiedTables } from '@mathesar/stores/tables';
   import type { SelectProps } from '@mathesar-component-library/types';
 
diff --git a/mathesar_ui/src/components/TableName.svelte b/mathesar_ui/src/components/TableName.svelte
index f913b5cde5..051a09c50e 100644
--- a/mathesar_ui/src/components/TableName.svelte
+++ b/mathesar_ui/src/components/TableName.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import type { ComponentProps } from 'svelte';
 
-  import type { Table } from '@mathesar/api/rpc/tables';
   import { iconTable } from '@mathesar/icons';
+  import type { Table } from '@mathesar/models/Table';
   import { tableRequiresImportConfirmation } from '@mathesar/utils/tables';
 
   import NameWithIcon from './NameWithIcon.svelte';
diff --git a/mathesar_ui/src/components/breadcrumb/BreadcrumbRecordSelector.svelte b/mathesar_ui/src/components/breadcrumb/BreadcrumbRecordSelector.svelte
index ffcddbc722..3ceb7bb501 100644
--- a/mathesar_ui/src/components/breadcrumb/BreadcrumbRecordSelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/BreadcrumbRecordSelector.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import type { Table } from '@mathesar/api/rpc/tables';
   import { iconExpandRight } from '@mathesar/icons';
+  import type { Table } from '@mathesar/models/Table';
   import { getRecordSelectorFromContext } from '@mathesar/systems/record-selector/RecordSelectorController';
   import { Button, Icon, iconSearch } from '@mathesar-component-library';
 
diff --git a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
index d06715fc4e..04d9506afb 100644
--- a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
@@ -3,10 +3,10 @@
   import { meta } from 'tinro';
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-  import type { Table } from '@mathesar/api/rpc/tables';
   import { iconTable } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
   import type { Schema } from '@mathesar/models/Schema';
+  import type { Table } from '@mathesar/models/Table';
   import { getExplorationPageUrl } from '@mathesar/routes/urls';
   import { queries as queriesStore } from '@mathesar/stores/queries';
   import { currentTableId, currentTables } from '@mathesar/stores/tables';
diff --git a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
index 35324ed85e..4b34d4c76a 100644
--- a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
+++ b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
@@ -1,11 +1,11 @@
 import type { QueryInstance } from '@mathesar/api/rest/types/queries';
-import type { Table } from '@mathesar/api/rpc/tables';
 import type {
   ComponentAndProps,
   IconProps,
 } from '@mathesar/component-library/types';
 import type { Database } from '@mathesar/models/Database';
 import type { Schema } from '@mathesar/models/Schema';
+import type { Table } from '@mathesar/models/Table';
 
 export interface BreadcrumbItemHome {
   type: 'home';
diff --git a/mathesar_ui/src/components/cell-fabric/utils.ts b/mathesar_ui/src/components/cell-fabric/utils.ts
index ddcff2edf7..f4356e141c 100644
--- a/mathesar_ui/src/components/cell-fabric/utils.ts
+++ b/mathesar_ui/src/components/cell-fabric/utils.ts
@@ -1,5 +1,5 @@
 import type { Column } from '@mathesar/api/rpc/columns';
-import type { Table } from '@mathesar/api/rpc/tables';
+import type { Table } from '@mathesar/models/Table';
 import type { CellInfo } from '@mathesar/stores/abstract-types/types';
 import type { RecordSummariesForSheet } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
 import type { ComponentAndProps } from '@mathesar-component-library/types';
diff --git a/mathesar_ui/src/models/Table.ts b/mathesar_ui/src/models/Table.ts
new file mode 100644
index 0000000000..f20ab4c9a1
--- /dev/null
+++ b/mathesar_ui/src/models/Table.ts
@@ -0,0 +1,50 @@
+import type { RawTableWithMetadata } from '@mathesar/api/rpc/tables';
+import { mergeTableMetadata } from '@mathesar/utils/tables';
+import type { RecursivePartial } from '@mathesar-component-library';
+
+import type { Schema } from './Schema';
+
+export class Table {
+  oid: number;
+
+  name: string;
+
+  description: string | null;
+
+  metadata;
+
+  schema;
+
+  constructor(props: {
+    schema: Schema;
+    rawTableWithMetadata: RawTableWithMetadata;
+  }) {
+    this.oid = props.rawTableWithMetadata.oid;
+    this.name = props.rawTableWithMetadata.name;
+    this.description = props.rawTableWithMetadata.description;
+    this.metadata = props.rawTableWithMetadata.metadata;
+    this.schema = props.schema;
+  }
+
+  // TODO_BETA: Replace this with an update method that updates
+  // the same table object
+  // @deprecated
+  withProperties(
+    _rawTableWithMetadata: RecursivePartial<RawTableWithMetadata>,
+  ) {
+    return new Table({
+      schema: this.schema,
+      rawTableWithMetadata: {
+        oid: this.oid,
+        name: this.name,
+        description: this.description,
+        schema: this.schema.oid,
+        ..._rawTableWithMetadata,
+        metadata: mergeTableMetadata(
+          this.metadata,
+          _rawTableWithMetadata.metadata,
+        ),
+      },
+    });
+  }
+}
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index 15d91eed4c..fb21769193 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -5,7 +5,7 @@
   import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
   import { api } from '@mathesar/api/rpc';
   import type { Column } from '@mathesar/api/rpc/columns';
-  import type { ColumnPreviewSpec, Table } from '@mathesar/api/rpc/tables';
+  import type { ColumnPreviewSpec } from '@mathesar/api/rpc/tables';
   import {
     Field,
     FieldLayout,
@@ -15,8 +15,8 @@
   } from '@mathesar/components/form';
   import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
   import { iconDeleteMajor } from '@mathesar/icons';
-  import type { Database } from '@mathesar/models/Database';
   import type { Schema } from '@mathesar/models/Schema';
+  import type { Table } from '@mathesar/models/Table';
   import { runner } from '@mathesar/packages/json-rpc-client-builder';
   import {
     getImportPreviewPageUrl,
@@ -171,7 +171,7 @@
   async function finishImport() {
     try {
       await updateTable({
-        database: schema.database,
+        schema,
         table: {
           oid: table.oid,
           name: $customizedTableName,
diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
index f15c44b189..affc0d205e 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewPage.svelte
@@ -30,7 +30,7 @@
   }
 
   $: void (async () => {
-    const table = (await tableFetch.run({ database, tableOid: tableId }))
+    const table = (await tableFetch.run({ schema, tableOid: tableId }))
       .resolvedValue;
     if (!table) {
       return;
diff --git a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
index fca7a3c956..289f3e02ce 100644
--- a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
+++ b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
@@ -1,10 +1,10 @@
 import { dataFilesApi } from '@mathesar/api/rest/dataFiles';
 import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
 import type { Column } from '@mathesar/api/rpc/columns';
-import type { Table } from '@mathesar/api/rpc/tables';
 import { getCellCap } from '@mathesar/components/cell-fabric/utils';
 import type { Database } from '@mathesar/models/Database';
 import type { Schema } from '@mathesar/models/Schema';
+import type { Table } from '@mathesar/models/Table';
 import { getAbstractTypeForDbType } from '@mathesar/stores/abstract-types';
 import type {
   AbstractType,
diff --git a/mathesar_ui/src/pages/record/RecordPage.svelte b/mathesar_ui/src/pages/record/RecordPage.svelte
index ff6faa0c9c..d71ba95940 100644
--- a/mathesar_ui/src/pages/record/RecordPage.svelte
+++ b/mathesar_ui/src/pages/record/RecordPage.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import type { Table } from '@mathesar/api/rpc/tables';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
+  import type { Table } from '@mathesar/models/Table';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { abstractTypesMap } from '@mathesar/stores/abstract-types';
   import { currentDatabase } from '@mathesar/stores/databases';
diff --git a/mathesar_ui/src/pages/record/RecordPageContent.svelte b/mathesar_ui/src/pages/record/RecordPageContent.svelte
index 6657ed200e..a7e8f4d2fe 100644
--- a/mathesar_ui/src/pages/record/RecordPageContent.svelte
+++ b/mathesar_ui/src/pages/record/RecordPageContent.svelte
@@ -3,7 +3,6 @@
 
   import { getDetailedRecordsErrors } from '@mathesar/api/rest/utils/recordUtils';
   import { api } from '@mathesar/api/rpc';
-  import type { Table } from '@mathesar/api/rpc/tables';
   import {
     FormSubmit,
     makeForm,
@@ -15,6 +14,7 @@
   import TableName from '@mathesar/components/TableName.svelte';
   import { iconRecord, iconSave, iconUndo } from '@mathesar/icons';
   import InsetPageLayout from '@mathesar/layouts/InsetPageLayout.svelte';
+  import type { Table } from '@mathesar/models/Table';
   import { currentDatabase } from '@mathesar/stores/databases';
   import type { TableStructure } from '@mathesar/stores/table-data';
   import { currentTable } from '@mathesar/stores/tables';
diff --git a/mathesar_ui/src/pages/record/RecordStore.ts b/mathesar_ui/src/pages/record/RecordStore.ts
index b7cab9d766..be4a11aed5 100644
--- a/mathesar_ui/src/pages/record/RecordStore.ts
+++ b/mathesar_ui/src/pages/record/RecordStore.ts
@@ -3,9 +3,9 @@ import { type Writable, writable } from 'svelte/store';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { api } from '@mathesar/api/rpc';
 import type { RecordsResponse } from '@mathesar/api/rpc/records';
-import type { Table } from '@mathesar/api/rpc/tables';
 import { WritableMap } from '@mathesar/component-library';
 import type { Database } from '@mathesar/models/Database';
+import type { Table } from '@mathesar/models/Table';
 import RecordSummaryStore from '@mathesar/stores/table-data/record-summaries/RecordSummaryStore';
 import { buildRecordSummariesForSheet } from '@mathesar/stores/table-data/record-summaries/recordSummaryUtils';
 import { getErrorMessage } from '@mathesar/utils/errors';
diff --git a/mathesar_ui/src/pages/record/TableWidget.svelte b/mathesar_ui/src/pages/record/TableWidget.svelte
index 664732dcbd..ad08a3c7a1 100644
--- a/mathesar_ui/src/pages/record/TableWidget.svelte
+++ b/mathesar_ui/src/pages/record/TableWidget.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import type { Column } from '@mathesar/api/rpc/columns';
-  import type { Table } from '@mathesar/api/rpc/tables';
   import TableName from '@mathesar/components/TableName.svelte';
+  import type { Table } from '@mathesar/models/Table';
   import { abstractTypesMap } from '@mathesar/stores/abstract-types';
   import { currentDatabase } from '@mathesar/stores/databases';
   import {
diff --git a/mathesar_ui/src/pages/schema/EditTable.svelte b/mathesar_ui/src/pages/schema/EditTable.svelte
index 10012a5678..6652ce09b3 100644
--- a/mathesar_ui/src/pages/schema/EditTable.svelte
+++ b/mathesar_ui/src/pages/schema/EditTable.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rpc/tables';
   import Identifier from '@mathesar/components/Identifier.svelte';
   import NameAndDescInputModalForm from '@mathesar/components/NameAndDescInputModalForm.svelte';
   import { RichText } from '@mathesar/components/rich-text';
+  import type { Table } from '@mathesar/models/Table';
   import { currentDatabase } from '@mathesar/stores/databases';
   import {
     factoryToGetTableNameValidationErrors,
@@ -22,7 +22,7 @@
 
   async function handleSave(name: string, description: string) {
     await updateTable({
-      database: $currentDatabase,
+      schema: table.schema,
       table: {
         oid: table.oid,
         name,
diff --git a/mathesar_ui/src/pages/schema/SchemaOverview.svelte b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
index cefe667de0..555c650140 100644
--- a/mathesar_ui/src/pages/schema/SchemaOverview.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
@@ -3,12 +3,12 @@
 
   import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
-  import type { Table } from '@mathesar/api/rpc/tables';
   import SpinnerButton from '@mathesar/component-library/spinner-button/SpinnerButton.svelte';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { iconRefresh } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
   import type { Schema } from '@mathesar/models/Schema';
+  import type { Table } from '@mathesar/models/Table';
   import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
   import { refetchQueriesForSchema } from '@mathesar/stores/queries';
   import { refetchTablesForSchema } from '@mathesar/stores/tables';
@@ -57,7 +57,7 @@
         <div>
           <SpinnerButton
             onClick={async () => {
-              await refetchTablesForSchema(database, schema);
+              await refetchTablesForSchema(schema);
             }}
             label={$_('retry')}
             icon={iconRefresh}
diff --git a/mathesar_ui/src/pages/schema/SchemaTables.svelte b/mathesar_ui/src/pages/schema/SchemaTables.svelte
index 1ccc271d8c..a35f09c6cb 100644
--- a/mathesar_ui/src/pages/schema/SchemaTables.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaTables.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rpc/tables';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import type { Database } from '@mathesar/models/Database';
   import type { Schema } from '@mathesar/models/Schema';
+  import type { Table } from '@mathesar/models/Table';
 
   import CreateNewTableButton from './CreateNewTableButton.svelte';
   import CreateNewTableTutorial from './CreateNewTableTutorial.svelte';
diff --git a/mathesar_ui/src/pages/schema/TableCard.svelte b/mathesar_ui/src/pages/schema/TableCard.svelte
index da54bc7267..b9628772b3 100644
--- a/mathesar_ui/src/pages/schema/TableCard.svelte
+++ b/mathesar_ui/src/pages/schema/TableCard.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rpc/tables';
   import LinkMenuItem from '@mathesar/component-library/menu/LinkMenuItem.svelte';
   import TableName from '@mathesar/components/TableName.svelte';
   import {
@@ -13,6 +12,7 @@
   } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
   import type { Schema } from '@mathesar/models/Schema';
+  import type { Table } from '@mathesar/models/Table';
   import {
     getImportPreviewPageUrl,
     getTablePageUrl,
diff --git a/mathesar_ui/src/pages/schema/TablesList.svelte b/mathesar_ui/src/pages/schema/TablesList.svelte
index a71a74d2d1..d0cfc82175 100644
--- a/mathesar_ui/src/pages/schema/TablesList.svelte
+++ b/mathesar_ui/src/pages/schema/TablesList.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rpc/tables';
   import { iconTable } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
   import type { Schema } from '@mathesar/models/Schema';
+  import type { Table } from '@mathesar/models/Table';
 
   import EmptyEntity from './EmptyEntity.svelte';
   import TableCard from './TableCard.svelte';
diff --git a/mathesar_ui/src/pages/table/TablePage.svelte b/mathesar_ui/src/pages/table/TablePage.svelte
index a5502a0b6f..9d1cfed6a6 100644
--- a/mathesar_ui/src/pages/table/TablePage.svelte
+++ b/mathesar_ui/src/pages/table/TablePage.svelte
@@ -2,9 +2,9 @@
   import { tick } from 'svelte';
   import { router } from 'tinro';
 
-  import type { Table } from '@mathesar/api/rpc/tables';
   import { focusActiveCell } from '@mathesar/components/sheet/utils';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
+  import type { Table } from '@mathesar/models/Table';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { abstractTypesMap } from '@mathesar/stores/abstract-types';
   import { currentDatabase } from '@mathesar/stores/databases';
diff --git a/mathesar_ui/src/routes/RecordPageRoute.svelte b/mathesar_ui/src/routes/RecordPageRoute.svelte
index 11fe8b3661..3c34e2c553 100644
--- a/mathesar_ui/src/routes/RecordPageRoute.svelte
+++ b/mathesar_ui/src/routes/RecordPageRoute.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-  import type { Table } from '@mathesar/api/rpc/tables';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import type { Database } from '@mathesar/models/Database';
   import type { Schema } from '@mathesar/models/Schema';
+  import type { Table } from '@mathesar/models/Table';
   import RecordPage from '@mathesar/pages/record/RecordPage.svelte';
   import RecordStore from '@mathesar/pages/record/RecordStore';
 
diff --git a/mathesar_ui/src/stores/table-data/TableStructure.ts b/mathesar_ui/src/stores/table-data/TableStructure.ts
index 1188b3fc4e..08462c0df8 100644
--- a/mathesar_ui/src/stores/table-data/TableStructure.ts
+++ b/mathesar_ui/src/stores/table-data/TableStructure.ts
@@ -3,9 +3,9 @@ import { derived } from 'svelte/store';
 
 import { States } from '@mathesar/api/rest/utils/requestUtils';
 import type { Column } from '@mathesar/api/rpc/columns';
-import type { Table } from '@mathesar/api/rpc/tables';
 import type { DBObjectEntry } from '@mathesar/AppTypes';
 import type { Database } from '@mathesar/models/Database';
+import type { Table } from '@mathesar/models/Table';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
 
 import { ColumnsDataStore } from './columns';
diff --git a/mathesar_ui/src/stores/table-data/columns.ts b/mathesar_ui/src/stores/table-data/columns.ts
index 5f9ff410ad..e0655b1c31 100644
--- a/mathesar_ui/src/stores/table-data/columns.ts
+++ b/mathesar_ui/src/stores/table-data/columns.ts
@@ -7,8 +7,8 @@ import type {
   ColumnCreationSpec,
   ColumnPatchSpec,
 } from '@mathesar/api/rpc/columns';
-import type { Table } from '@mathesar/api/rpc/tables';
 import type { Database } from '@mathesar/models/Database';
+import type { Table } from '@mathesar/models/Table';
 import { getErrorMessage } from '@mathesar/utils/errors';
 import type { ShareConsumer } from '@mathesar/utils/shares';
 import {
diff --git a/mathesar_ui/src/stores/table-data/constraints.ts b/mathesar_ui/src/stores/table-data/constraints.ts
index 675a3113ab..7263310117 100644
--- a/mathesar_ui/src/stores/table-data/constraints.ts
+++ b/mathesar_ui/src/stores/table-data/constraints.ts
@@ -14,7 +14,7 @@ import type {
   Constraint,
   ConstraintRecipe,
 } from '@mathesar/api/rpc/constraints';
-import type { Table } from '@mathesar/api/rpc/tables';
+import type { Table } from '@mathesar/models/Table';
 import type { Database } from '@mathesar/models/Database';
 import type { ShareConsumer } from '@mathesar/utils/shares';
 import type { CancellablePromise } from '@mathesar-component-library';
diff --git a/mathesar_ui/src/stores/table-data/processedColumns.ts b/mathesar_ui/src/stores/table-data/processedColumns.ts
index 4d6a8faa2a..7416223c2c 100644
--- a/mathesar_ui/src/stores/table-data/processedColumns.ts
+++ b/mathesar_ui/src/stores/table-data/processedColumns.ts
@@ -2,7 +2,6 @@ import type { Readable } from 'svelte/store';
 
 import type { Column } from '@mathesar/api/rpc/columns';
 import type { Constraint } from '@mathesar/api/rpc/constraints';
-import type { Table } from '@mathesar/api/rpc/tables';
 import type { CellColumnFabric } from '@mathesar/components/cell-fabric/types';
 import {
   getCellCap,
@@ -11,9 +10,10 @@ import {
   getInitialInputValue,
 } from '@mathesar/components/cell-fabric/utils';
 import { retrieveFilters } from '@mathesar/components/filter-entry/utils';
+import type { Table } from '@mathesar/models/Table';
 import {
   getAbstractTypeForDbType,
-  getFiltersForAbstractType,
+  type getFiltersForAbstractType,
   getPreprocFunctionsForAbstractType,
 } from '@mathesar/stores/abstract-types';
 import type {
diff --git a/mathesar_ui/src/stores/table-data/records.ts b/mathesar_ui/src/stores/table-data/records.ts
index 279a329a03..71468c6fb3 100644
--- a/mathesar_ui/src/stores/table-data/records.ts
+++ b/mathesar_ui/src/stores/table-data/records.ts
@@ -17,14 +17,14 @@ import type {
   RecordsListParams,
   RecordsResponse,
 } from '@mathesar/api/rpc/records';
-import type { Table } from '@mathesar/api/rpc/tables';
 import type { Database } from '@mathesar/models/Database';
+import type { Table } from '@mathesar/models/Table';
 import { getErrorMessage } from '@mathesar/utils/errors';
 import { pluralize } from '@mathesar/utils/languageUtils';
 import type Pagination from '@mathesar/utils/Pagination';
 import type { ShareConsumer } from '@mathesar/utils/shares';
 import {
-  CancellablePromise,
+  type CancellablePromise,
   WritableMap,
   getGloballyUniqueId,
   isDefinedNonNullable,
@@ -38,8 +38,7 @@ import RecordSummaryStore from './record-summaries/RecordSummaryStore';
 import { buildRecordSummariesForSheet } from './record-summaries/recordSummaryUtils';
 import type { SearchFuzzy } from './searchFuzzy';
 import type { Sorting } from './sorting';
-import type { RowKey } from './utils';
-import { getCellKey, validateRow } from './utils';
+import { type RowKey, getCellKey, validateRow } from './utils';
 
 export interface RecordsRequestParamsData {
   pagination: Pagination;
diff --git a/mathesar_ui/src/stores/table-data/tabularData.ts b/mathesar_ui/src/stores/table-data/tabularData.ts
index faabd9a9e9..138d949b1e 100644
--- a/mathesar_ui/src/stores/table-data/tabularData.ts
+++ b/mathesar_ui/src/stores/table-data/tabularData.ts
@@ -3,11 +3,11 @@ import { type Readable, type Writable, derived, writable } from 'svelte/store';
 
 import { States } from '@mathesar/api/rest/utils/requestUtils';
 import type { Column } from '@mathesar/api/rpc/columns';
-import type { Table } from '@mathesar/api/rpc/tables';
 import Plane from '@mathesar/components/sheet/selection/Plane';
 import Series from '@mathesar/components/sheet/selection/Series';
 import SheetSelectionStore from '@mathesar/components/sheet/selection/SheetSelectionStore';
 import type { Database } from '@mathesar/models/Database';
+import type { Table } from '@mathesar/models/Table';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
 import type { ShareConsumer } from '@mathesar/utils/shares';
 import { orderProcessedColumns } from '@mathesar/utils/tables';
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index b63c20cb22..72961b8365 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -9,7 +9,7 @@
  * sorting.
  */
 
-import { execPipe, filter, find, map } from 'iter-tools';
+import { execPipe, filter, map } from 'iter-tools';
 import {
   type Readable,
   type Writable,
@@ -25,29 +25,25 @@ import type { SplitTableResponse } from '@mathesar/api/rest/types/tables/split_t
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { api } from '@mathesar/api/rpc';
 import type { ColumnPatchSpec } from '@mathesar/api/rpc/columns';
-import type { Table } from '@mathesar/api/rpc/tables';
+import type { RawTableWithMetadata } from '@mathesar/api/rpc/tables';
 import { invalidIf } from '@mathesar/components/form';
 import type { Database } from '@mathesar/models/Database';
 import type { Schema } from '@mathesar/models/Schema';
+import { Table } from '@mathesar/models/Table';
 import {
   type RpcRequest,
   batchSend,
 } from '@mathesar/packages/json-rpc-client-builder';
 import { TupleMap } from '@mathesar/packages/tuple-map';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
-import {
-  mergeTables,
-  tableRequiresImportConfirmation,
-} from '@mathesar/utils/tables';
+import { tableRequiresImportConfirmation } from '@mathesar/utils/tables';
 import {
   CancellablePromise,
   type RecursivePartial,
   collapse,
-  defined,
 } from '@mathesar-component-library';
 
-import { currentDatabase } from './databases';
-import { currentSchemaId } from './schemas';
+import { currentSchema } from './schemas';
 
 const commonData = preloadCommonData();
 
@@ -75,18 +71,14 @@ const tablesStores = new TupleMap<
 
 const tablesRequests = new TupleMap<
   [Database['id'], Schema['oid']],
-  CancellablePromise<Table[]>
+  CancellablePromise<RawTableWithMetadata[]>
 >();
 
 function sortTables(tables: Iterable<Table>): Table[] {
   return [...tables].sort((a, b) => a.name.localeCompare(b.name));
 }
 
-function setTablesStore(
-  database: Pick<Database, 'id'>,
-  schema: Pick<Schema, 'oid'>,
-  tables?: Table[],
-): TablesStore {
+function setTablesStore(schema: Schema, tables: Table[]): TablesStore {
   const tablesMap: TablesMap = new Map();
   if (tables) {
     sortTables(tables).forEach((t) => tablesMap.set(t.oid, t));
@@ -97,10 +89,10 @@ function setTablesStore(
     requestStatus: { state: 'success' },
   };
 
-  let store = tablesStores.get([database.id, schema.oid]);
+  let store = tablesStores.get([schema.database.id, schema.oid]);
   if (!store) {
     store = writable(storeValue);
-    tablesStores.set([database.id, schema.oid], store);
+    tablesStores.set([schema.database.id, schema.oid], store);
   } else {
     store.set(storeValue);
   }
@@ -115,10 +107,9 @@ export function removeTablesStore(
 }
 
 export async function refetchTablesForSchema(
-  database: Pick<Database, 'id'>,
-  schema: Pick<Schema, 'oid'>,
+  schema: Schema,
 ): Promise<TablesData | undefined> {
-  const store = tablesStores.get([database.id, schema.oid]);
+  const store = tablesStores.get([schema.database.id, schema.oid]);
   if (!store) {
     // TODO: why are we logging an error here? I would expect that we'd either
     // throw or ignore. If there's a reason for this logging, please add a code
@@ -133,18 +124,27 @@ export async function refetchTablesForSchema(
       requestStatus: { state: 'processing' },
     }));
 
-    tablesRequests.get([database.id, schema.oid])?.cancel();
+    tablesRequests.get([schema.database.id, schema.oid])?.cancel();
 
     const tablesRequest = api.tables
       .list_with_metadata({
-        database_id: database.id,
+        database_id: schema.database.id,
         schema_oid: schema.oid,
       })
       .run();
-    tablesRequests.set([database.id, schema.oid], tablesRequest);
+    tablesRequests.set([schema.database.id, schema.oid], tablesRequest);
     const tableEntries = await tablesRequest;
 
-    const schemaTablesStore = setTablesStore(database, schema, tableEntries);
+    const schemaTablesStore = setTablesStore(
+      schema,
+      tableEntries.map(
+        (t) =>
+          new Table({
+            schema,
+            rawTableWithMetadata: t,
+          }),
+      ),
+    );
 
     return get(schemaTablesStore);
   } catch (err) {
@@ -163,47 +163,39 @@ export async function refetchTablesForSchema(
 
 let preload = true;
 
-function getTablesStore(
-  database: Pick<Database, 'id'>,
-  schema: Pick<Schema, 'oid'>,
-): TablesStore {
-  let store = tablesStores.get([database.id, schema.oid]);
+function getTablesStore(schema: Schema): TablesStore {
+  let store = tablesStores.get([schema.database.id, schema.oid]);
   if (!store) {
     store = writable({
       requestStatus: { state: 'processing' },
       tablesMap: new Map(),
     });
-    tablesStores.set([database.id, schema.oid], store);
+    tablesStores.set([schema.database.id, schema.oid], store);
     if (
       preload &&
       commonData.current_schema === schema.oid &&
-      commonData.current_database === database.id
+      commonData.current_database === schema.database.id
     ) {
-      store = setTablesStore(database, schema, commonData.tables ?? []);
+      store = setTablesStore(
+        schema,
+        commonData.tables.map(
+          (t) =>
+            new Table({
+              schema,
+              rawTableWithMetadata: t,
+            }),
+        ),
+      );
     } else {
-      void refetchTablesForSchema(database, schema);
+      void refetchTablesForSchema(schema);
     }
     preload = false;
   } else if (get(store).requestStatus.state === 'failure') {
-    void refetchTablesForSchema(database, schema);
+    void refetchTablesForSchema(schema);
   }
   return store;
 }
 
-function findStoreContainingTable(
-  database: Pick<Database, 'id'>,
-  tableOid: Table['oid'],
-): TablesStore | undefined {
-  return defined(
-    find(
-      ([[databaseId], tablesStore]) =>
-        databaseId === database.id && get(tablesStore).tablesMap.has(tableOid),
-      tablesStores,
-    ),
-    ([, tablesStore]) => tablesStore,
-  );
-}
-
 export function deleteTable(
   schema: Schema,
   tableOid: Table['oid'],
@@ -241,25 +233,27 @@ export function deleteTable(
  * the store.
  */
 export async function updateTable({
-  database,
-  table,
+  schema,
+  table: rawPartialTable,
   columnPatchSpecs,
   columnsToDelete,
 }: {
-  database: Pick<Database, 'id'>;
-  table: RecursivePartial<Table> & { oid: Table['oid'] };
+  schema: Schema;
+  table: RecursivePartial<RawTableWithMetadata> & {
+    oid: RawTableWithMetadata['oid'];
+  };
   columnPatchSpecs?: ColumnPatchSpec[];
   columnsToDelete?: number[];
 }): Promise<Table> {
   const requests: RpcRequest<void>[] = [];
-  if (table.name || table.description) {
+  if (rawPartialTable.name || rawPartialTable.description) {
     requests.push(
       api.tables.patch({
-        database_id: database.id,
-        table_oid: table.oid,
+        database_id: schema.database.id,
+        table_oid: rawPartialTable.oid,
         table_data_dict: {
-          name: table.name,
-          description: table.description,
+          name: rawPartialTable.name,
+          description: rawPartialTable.description,
         },
       }),
     );
@@ -267,26 +261,26 @@ export async function updateTable({
   if (columnPatchSpecs) {
     requests.push(
       api.columns.patch({
-        database_id: database.id,
-        table_oid: table.oid,
+        database_id: schema.database.id,
+        table_oid: rawPartialTable.oid,
         column_data_list: columnPatchSpecs,
       }),
     );
   }
-  if (table.metadata) {
+  if (rawPartialTable.metadata) {
     requests.push(
       api.tables.metadata.set({
-        database_id: database.id,
-        table_oid: table.oid,
-        metadata: table.metadata,
+        database_id: schema.database.id,
+        table_oid: rawPartialTable.oid,
+        metadata: rawPartialTable.metadata,
       }),
     );
   }
   if (columnsToDelete?.length) {
     requests.push(
       api.columns.delete({
-        database_id: database.id,
-        table_oid: table.oid,
+        database_id: schema.database.id,
+        table_oid: rawPartialTable.oid,
         column_attnums: columnsToDelete,
       }),
     );
@@ -294,13 +288,13 @@ export async function updateTable({
   await batchSend(requests);
 
   let newTable: Table | undefined;
-  const tableStore = findStoreContainingTable(database, table.oid);
-  if (!tableStore) throw new Error('Table store not found');
-  tableStore.update((tablesData) => {
-    const oldTable = tablesData.tablesMap.get(table.oid);
+  const tablesStore = tablesStores.get([schema.database.id, schema.oid]);
+  if (!tablesStore) throw new Error('Table store not found');
+  tablesStore.update((tablesData) => {
+    const oldTable = tablesData.tablesMap.get(rawPartialTable.oid);
     if (!oldTable) throw new Error('Table not found within store.');
-    newTable = mergeTables(oldTable, table);
-    tablesData.tablesMap.set(table.oid, newTable);
+    newTable = oldTable.withProperties(rawPartialTable);
+    tablesData.tablesMap.set(rawPartialTable.oid, newTable);
     const tablesMap: TablesMap = new Map();
     sortTables([...tablesData.tablesMap.values()]).forEach((t) => {
       tablesMap.set(t.oid, t);
@@ -313,18 +307,22 @@ export async function updateTable({
 
 function addTableToStore({
   schema,
-  table,
+  rawTable,
 }: {
   schema: Schema;
-  table: Partial<Table> & Pick<Table, 'oid' | 'name'>;
+  rawTable: Partial<RawTableWithMetadata> &
+    Pick<RawTableWithMetadata, 'oid' | 'name'>;
 }): Table {
   schema.updateTableCount(get(schema.tableCount) + 1);
-  const fullTable: Table = {
-    description: null,
-    metadata: null,
-    schema: schema.oid,
-    ...table,
-  };
+  const fullTable: Table = new Table({
+    schema,
+    rawTableWithMetadata: {
+      description: null,
+      metadata: null,
+      schema: schema.oid,
+      ...rawTable,
+    },
+  });
   const tablesStore = tablesStores.get([schema.database.id, schema.oid]);
   tablesStore?.update((tablesData) => {
     const tables = sortTables([...tablesData.tablesMap.values(), fullTable]);
@@ -350,7 +348,7 @@ export function createTable({
   return new CancellablePromise(
     (resolve, reject) => {
       void promise.then(
-        (table) => resolve(addTableToStore({ schema, table })),
+        (rawTable) => resolve(addTableToStore({ schema, rawTable })),
         reject,
       );
     },
@@ -376,7 +374,7 @@ export async function createTableFromDataFile(props: {
 
   const basicTable = addTableToStore({
     schema: props.schema,
-    table: {
+    rawTable: {
       oid: created.oid,
       name: created.name,
       schema: props.schema.oid,
@@ -384,9 +382,9 @@ export async function createTableFromDataFile(props: {
   });
 
   const fullTable = await updateTable({
-    database: props.schema.database,
+    schema: props.schema,
     table: {
-      ...basicTable,
+      oid: basicTable.oid,
       metadata: {
         import_verified: false,
         data_file_id: props.dataFile.id,
@@ -431,13 +429,13 @@ export function moveColumns(
 }
 
 export function getTableFromStoreOrApi({
-  database,
+  schema,
   tableOid,
 }: {
-  database: Pick<Database, 'id'>;
+  schema: Schema;
   tableOid: Table['oid'];
 }): CancellablePromise<Table> {
-  const tablesStore = findStoreContainingTable(database, tableOid);
+  const tablesStore = tablesStores.get([schema.database.id, schema.oid]);
   if (tablesStore) {
     const table = get(tablesStore).tablesMap.get(tableOid);
     if (table) {
@@ -448,14 +446,15 @@ export function getTableFromStoreOrApi({
   }
   const promise = api.tables
     .get_with_metadata({
-      database_id: database.id,
+      database_id: schema.database.id,
       table_oid: tableOid,
     })
     .run();
   return new CancellablePromise(
     (resolve, reject) => {
-      void promise.then((table) => {
-        const store = tablesStores.get([database.id, table.schema]);
+      void promise.then((rawTableWithMetadata) => {
+        const table = new Table({ schema, rawTableWithMetadata });
+        const store = tablesStores.get([schema.database.id, schema.oid]);
         if (store) {
           store.update((existing) => {
             const tableMap = new Map<number, Table>();
@@ -479,10 +478,8 @@ export function getTableFromStoreOrApi({
 }
 
 export const currentTablesData = collapse(
-  derived([currentDatabase, currentSchemaId], ([database, schemaOid]) =>
-    !database || !schemaOid
-      ? readable(makeEmptyTablesData())
-      : getTablesStore(database, { oid: schemaOid }),
+  derived([currentSchema], ([schema]) =>
+    !schema ? readable(makeEmptyTablesData()) : getTablesStore(schema),
   ),
 );
 
@@ -524,10 +521,9 @@ export const currentTable = derived(
 );
 
 export async function refetchTablesForCurrentSchema() {
-  const database = get(currentDatabase);
-  const schemaOid = get(currentSchemaId);
-  if (schemaOid) {
-    await refetchTablesForSchema(database, { oid: schemaOid });
+  const schema = get(currentSchema);
+  if (schema) {
+    await refetchTablesForSchema(schema);
   }
 }
 
@@ -535,7 +531,7 @@ export function factoryToGetTableNameValidationErrors(
   database: Pick<Database, 'id'>,
   table: Table,
 ): Readable<(n: string) => string[]> {
-  const tablesStore = tablesStores.get([database.id, table.schema]);
+  const tablesStore = tablesStores.get([database.id, table.schema.oid]);
   if (!tablesStore) throw new Error('Tables store not found');
 
   const otherTableNames = derived(
diff --git a/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte b/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
index 7fd62e8439..8f40dcbcf9 100644
--- a/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
+++ b/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
@@ -2,7 +2,6 @@
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rpc/tables';
   import EntityPageHeader from '@mathesar/components/EntityPageHeader.svelte';
   import ModificationStatus from '@mathesar/components/ModificationStatus.svelte';
   import NameAndDescInputModalForm from '@mathesar/components/NameAndDescInputModalForm.svelte';
@@ -14,6 +13,7 @@
     iconRedo,
     iconUndo,
   } from '@mathesar/icons';
+  import type { Table } from '@mathesar/models/Table';
   import { modal } from '@mathesar/stores/modal';
   import { queries } from '@mathesar/stores/queries';
   import { currentTablesData as tablesDataStore } from '@mathesar/stores/tables';
diff --git a/mathesar_ui/src/systems/data-explorer/QueryManager.ts b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
index 4d40856160..942cb71f59 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryManager.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
@@ -8,7 +8,10 @@ import type {
 } from '@mathesar/api/rest/types/queries';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { api } from '@mathesar/api/rpc';
-import type { JoinableTablesResult, Table } from '@mathesar/api/rpc/tables';
+import type {
+  JoinableTablesResult,
+  RawTableWithMetadata,
+} from '@mathesar/api/rpc/tables';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
 import { currentDatabase } from '@mathesar/stores/databases';
 import { createQuery, putQuery } from '@mathesar/stores/queries';
@@ -62,7 +65,9 @@ export default class QueryManager extends QueryRunner {
 
   // Promises
 
-  private baseTableFetchPromise: CancellablePromise<Table> | undefined;
+  private baseTableFetchPromise:
+    | CancellablePromise<RawTableWithMetadata>
+    | undefined;
 
   private joinableColumnsFetchPromise:
     | CancellablePromise<JoinableTablesResult>
diff --git a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
index a077f35d08..1436bba1d7 100644
--- a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
+++ b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
@@ -1,6 +1,6 @@
 import type { QueryInstanceSummarizationTransformation } from '@mathesar/api/rest/types/queries';
 import type { Column } from '@mathesar/api/rpc/columns';
-import type { Table } from '@mathesar/api/rpc/tables';
+import type { Table } from '@mathesar/models/Table';
 import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
 import type { UnsavedQueryInstance } from '@mathesar/stores/queries';
 import type { TerseGrouping } from '@mathesar/stores/table-data';
diff --git a/mathesar_ui/src/systems/data-explorer/utils.ts b/mathesar_ui/src/systems/data-explorer/utils.ts
index 0c86c6601c..3eb38d698b 100644
--- a/mathesar_ui/src/systems/data-explorer/utils.ts
+++ b/mathesar_ui/src/systems/data-explorer/utils.ts
@@ -1,6 +1,3 @@
-import type { Simplify } from 'type-fest';
-import type { SimplifyDeep } from 'type-fest/source/merge-deep';
-
 import type {
   QueryColumnMetaData,
   QueryGeneratedColumnSource,
@@ -9,11 +6,7 @@ import type {
   QueryRunResponse,
 } from '@mathesar/api/rest/types/queries';
 import type { Column } from '@mathesar/api/rpc/columns';
-import type {
-  JoinPath,
-  JoinableTablesResult,
-  Table,
-} from '@mathesar/api/rpc/tables';
+import type { JoinPath, JoinableTablesResult } from '@mathesar/api/rpc/tables';
 import type { CellColumnFabric } from '@mathesar/components/cell-fabric/types';
 import {
   getCellCap,
@@ -21,6 +14,7 @@ import {
   getDisplayFormatter,
   getInitialInputValue,
 } from '@mathesar/components/cell-fabric/utils';
+import type { Table } from '@mathesar/models/Table';
 import {
   getAbstractTypeForDbType,
   getFiltersForAbstractType,
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorNavigationButton.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorNavigationButton.svelte
index 9d3ed1b2e3..e30d892e7a 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorNavigationButton.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorNavigationButton.svelte
@@ -2,9 +2,9 @@
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rpc/tables';
   import { Icon } from '@mathesar/component-library';
   import { iconSelectRecord } from '@mathesar/icons';
+  import type { Table } from '@mathesar/models/Table';
 
   import { getRecordSelectorFromContext } from './RecordSelectorController';
 
diff --git a/mathesar_ui/src/systems/table-view/TableView.svelte b/mathesar_ui/src/systems/table-view/TableView.svelte
index 0a1db2cd5d..0b82b843c8 100644
--- a/mathesar_ui/src/systems/table-view/TableView.svelte
+++ b/mathesar_ui/src/systems/table-view/TableView.svelte
@@ -3,11 +3,11 @@
   import type { ComponentProps } from 'svelte';
   import { get } from 'svelte/store';
 
-  import type { Table } from '@mathesar/api/rpc/tables';
   import { ImmutableMap, Spinner } from '@mathesar/component-library';
   import { Sheet } from '@mathesar/components/sheet';
   import { SheetClipboardHandler } from '@mathesar/components/sheet/SheetClipboardHandler';
   import { rowHeaderWidthPx } from '@mathesar/geometry';
+  import type { Table } from '@mathesar/models/Table';
   import {
     ID_ADD_NEW_COLUMN,
     ID_ROW_CONTROL_COLUMN,
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/ShareTableDropdown.svelte b/mathesar_ui/src/systems/table-view/actions-pane/ShareTableDropdown.svelte
index 884322182c..7772fbff0a 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/ShareTableDropdown.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/ShareTableDropdown.svelte
@@ -2,8 +2,8 @@
   import { _ } from 'svelte-i18n';
 
   import tableShareApi from '@mathesar/api/rest/tableShares';
-  import type { Table } from '@mathesar/api/rpc/tables';
   import { iconShare } from '@mathesar/icons';
+  import type { Table } from '@mathesar/models/Table';
   import { getSharedTablePageUrl } from '@mathesar/routes/urls';
   import ShareEntity from '@mathesar/systems/shares/ShareEntity.svelte';
   import { Dropdown, Icon } from '@mathesar-component-library';
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
index 3e00bd9762..1dffb1b0da 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rpc/tables';
   import {
     type FilledFormValues,
     FormSubmit,
@@ -15,6 +14,7 @@
   import SelectProcessedColumn from '@mathesar/components/SelectProcessedColumn.svelte';
   import SelectTable from '@mathesar/components/SelectTable.svelte';
   import TableName from '@mathesar/components/TableName.svelte';
+  import type { Table } from '@mathesar/models/Table';
   import { abstractTypesMap } from '@mathesar/stores/abstract-types';
   import { currentDatabase } from '@mathesar/stores/databases';
   import {
diff --git a/mathesar_ui/src/systems/table-view/header/Header.svelte b/mathesar_ui/src/systems/table-view/header/Header.svelte
index 926a7f7dd5..c736b1108b 100644
--- a/mathesar_ui/src/systems/table-view/header/Header.svelte
+++ b/mathesar_ui/src/systems/table-view/header/Header.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { first } from 'iter-tools';
 
-  import type { Table } from '@mathesar/api/rpc/tables';
   import { ContextMenu } from '@mathesar/component-library';
   import {
     SheetCellResizer,
@@ -10,11 +9,11 @@
     SheetHeader,
   } from '@mathesar/components/sheet';
   import SheetOriginCell from '@mathesar/components/sheet/cells/SheetOriginCell.svelte';
-  import { currentDatabase } from '@mathesar/stores/databases';
-  import type { ProcessedColumn } from '@mathesar/stores/table-data';
+  import type { Table } from '@mathesar/models/Table';
   import {
     ID_ADD_NEW_COLUMN,
     ID_ROW_CONTROL_COLUMN,
+    type ProcessedColumn,
     getTabularDataStoreFromContext,
   } from '@mathesar/stores/table-data';
   import { updateTable } from '@mathesar/stores/tables';
@@ -28,7 +27,7 @@
 
   export let hasNewColumnButton = false;
   export let columnOrder: number[];
-  export let table: Pick<Table, 'oid'>;
+  export let table: Table;
 
   $: columnOrder = columnOrder ?? [];
   $: ({ selection, processedColumns } = $tabularData);
@@ -87,7 +86,7 @@
     }
 
     void updateTable({
-      database: $currentDatabase,
+      schema: table.schema,
       table: {
         oid: table.oid,
         metadata: { column_order: newColumnOrder },
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index d288943939..5b7199a98c 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -3,7 +3,6 @@
 
   import type { LinksPostRequest } from '@mathesar/api/rest/types/links';
   import { postAPI } from '@mathesar/api/rest/utils/requestUtils';
-  import type { Table } from '@mathesar/api/rpc/tables';
   import {
     Field,
     FieldLayout,
@@ -18,6 +17,7 @@
   import { RichText } from '@mathesar/components/rich-text';
   import SelectTable from '@mathesar/components/SelectTable.svelte';
   import { iconTableLink } from '@mathesar/icons';
+  import type { Table } from '@mathesar/models/Table';
   import { currentDatabase } from '@mathesar/stores/databases';
   import {
     ColumnsDataStore,
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTablePill.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTablePill.svelte
index f6fb64885c..4c2297bd5d 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTablePill.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTablePill.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import type { Table } from '@mathesar/api/rpc/tables';
   import TableName from '@mathesar/components/TableName.svelte';
+  import type { Table } from '@mathesar/models/Table';
 
   export let table: Pick<Table, 'name'>;
   export let which: 'base' | 'target' | 'mapping';
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte
index 4d7447e99e..a063f43ef4 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTypeOption.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rpc/tables';
   import type { FieldStore } from '@mathesar/components/form';
   import { RichText } from '@mathesar/components/rich-text';
+  import type { Table } from '@mathesar/models/Table';
   import { Label, Radio, assertExhaustive } from '@mathesar-component-library';
 
   import Diagram from './diagram/Diagram.svelte';
diff --git a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
index b503c8b8c5..ff598160ac 100644
--- a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
@@ -2,9 +2,9 @@
   import type { ComponentProps } from 'svelte';
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rpc/tables';
   import { Field, type FieldStore } from '@mathesar/components/form';
   import { RichText } from '@mathesar/components/rich-text';
+  import type { Table } from '@mathesar/models/Table';
   import { Spinner } from '@mathesar-component-library';
 
   import Pill from './LinkTablePill.svelte';
diff --git a/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte b/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
index 16289909fc..95d65a4fdd 100644
--- a/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rpc/tables';
   import type { FieldStore } from '@mathesar/components/form';
   import FieldErrors from '@mathesar/components/form/FieldErrors.svelte';
   import FieldLayout from '@mathesar/components/form/FieldLayout.svelte';
+  import type { Table } from '@mathesar/models/Table';
 
   import Pill from './LinkTablePill.svelte';
   import type { LinkType } from './linkTableUtils';
diff --git a/mathesar_ui/src/systems/table-view/link-table/linkTableUtils.ts b/mathesar_ui/src/systems/table-view/link-table/linkTableUtils.ts
index e4d5183600..cd3dfcbff7 100644
--- a/mathesar_ui/src/systems/table-view/link-table/linkTableUtils.ts
+++ b/mathesar_ui/src/systems/table-view/link-table/linkTableUtils.ts
@@ -1,8 +1,8 @@
 import { get } from 'svelte/store';
 import { _ } from 'svelte-i18n';
 
-import type { Table } from '@mathesar/api/rpc/tables';
 import { invalidIf } from '@mathesar/components/form';
+import type { Table } from '@mathesar/models/Table';
 import { getAvailableName } from '@mathesar/utils/db';
 
 export type LinkType = 'manyToOne' | 'oneToMany' | 'manyToMany';
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
index b522b7ec87..86d53665cb 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
@@ -16,7 +16,6 @@
   import SelectProcessedColumns from '@mathesar/components/SelectProcessedColumns.svelte';
   import { scrollBasedOnSelection } from '@mathesar/components/sheet';
   import TableName from '@mathesar/components/TableName.svelte';
-  import { currentDatabase } from '@mathesar/stores/databases';
   import {
     type ProcessedColumn,
     getTabularDataStoreFromContext,
@@ -146,11 +145,7 @@
         if (!targetTableId) {
           throw new Error($_('no_target_table_selected'));
         }
-        await moveColumns(
-          $tabularData.table.oid,
-          extractedColumnIds,
-          targetTableId,
-        );
+        await moveColumns(currentTable.oid, extractedColumnIds, targetTableId);
         const fkColumns = $linkedTable?.columns ?? [];
         let fkColumnId: number | undefined = undefined;
         if (fkColumns.length === 1) {
@@ -164,14 +159,14 @@
         );
       } else {
         const response = await splitTable({
-          id: $tabularData.table.oid,
+          id: currentTable.oid,
           idsOfColumnsToExtract: extractedColumnIds,
           extractedTableName: newTableName,
           newFkColumnName: $newFkColumnName,
         });
         followUps.push(
           getTableFromStoreOrApi({
-            database: $currentDatabase,
+            schema: currentTable.schema,
             tableOid: response.extracted_table,
           }),
         );
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionTypes.ts b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionTypes.ts
index 6e1eacca5c..ec896928bb 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionTypes.ts
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionTypes.ts
@@ -1,5 +1,5 @@
 import type { FkConstraint } from '@mathesar/api/rpc/constraints';
-import type { Table } from '@mathesar/api/rpc/tables';
+import type { Table } from '@mathesar/models/Table';
 import type { ProcessedColumn } from '@mathesar/stores/table-data';
 
 export type ColumnExtractionTargetType = 'newTable' | 'existingTable';
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts
index b6e0b53dca..9c38a0e225 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/columnExtractionUtils.ts
@@ -2,13 +2,13 @@ import { get } from 'svelte/store';
 import { _ } from 'svelte-i18n';
 
 import type { Constraint, FkConstraint } from '@mathesar/api/rpc/constraints';
-import type { Table } from '@mathesar/api/rpc/tables';
 import { isDefinedNonNullable } from '@mathesar/component-library';
 import {
   type ValidationOutcome,
   invalid,
   valid,
 } from '@mathesar/components/form';
+import type { Table } from '@mathesar/models/Table';
 import {
   type ProcessedColumn,
   constraintIsFk,
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
index dcf0dd5ee4..b2a7472faa 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Table } from '@mathesar/api/rpc/tables';
+  import type { Table } from '@mathesar/models/Table';
   import { abstractTypesMap } from '@mathesar/stores/abstract-types';
   import { currentDatabase } from '@mathesar/stores/databases';
   import { Meta, TabularData } from '@mathesar/stores/table-data';
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
index c7b8b0882a..01527f5c1c 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { Table } from '@mathesar/api/rpc/tables';
   import {
     FormSubmit,
     makeForm,
@@ -13,6 +12,7 @@
   import LinkedRecord from '@mathesar/components/LinkedRecord.svelte';
   import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
   import { RichText } from '@mathesar/components/rich-text';
+  import type { Table } from '@mathesar/models/Table';
   import { currentDatabase } from '@mathesar/stores/databases';
   import type { RecordRow, TabularData } from '@mathesar/stores/table-data';
   import { updateTable } from '@mathesar/stores/tables';
@@ -65,7 +65,7 @@
   async function save() {
     try {
       await updateTable({
-        database: $currentDatabase,
+        schema: table.schema,
         table: {
           oid: table.oid,
           metadata: {
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
index 5f4b9cf776..126fbc93ac 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableDescription.svelte
@@ -2,7 +2,6 @@
   import { _ } from 'svelte-i18n';
 
   import EditableTextWithActions from '@mathesar/components/EditableTextWithActions.svelte';
-  import { currentDatabase } from '@mathesar/stores/databases';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import { updateTable } from '@mathesar/stores/tables';
 
@@ -14,7 +13,7 @@
 
   async function handleSave(description: string) {
     await updateTable({
-      database: $currentDatabase,
+      schema: table.schema,
       table: { oid: table.oid, description },
     });
   }
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
index abdcdcb6c3..5b0a8570ab 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
@@ -21,7 +21,7 @@
 
   async function handleSubmit(name: string) {
     await updateTable({
-      database: $currentDatabase,
+      schema: table.schema,
       table: {
         oid: table.oid,
         name,
diff --git a/mathesar_ui/src/utils/columnUtils.ts b/mathesar_ui/src/utils/columnUtils.ts
index 27c5d1089f..2beef6c841 100644
--- a/mathesar_ui/src/utils/columnUtils.ts
+++ b/mathesar_ui/src/utils/columnUtils.ts
@@ -1,8 +1,8 @@
 import type { Column } from '@mathesar/api/rpc/columns';
 import type { ConstraintType } from '@mathesar/api/rpc/constraints';
-import type { Table } from '@mathesar/api/rpc/tables';
 import { type ValidationFn, uniqueWith } from '@mathesar/components/form';
 import { iconConstraint, iconTableLink } from '@mathesar/icons';
+import type { Table } from '@mathesar/models/Table';
 import {
   abstractTypesMap,
   getAbstractTypeForDbType,
diff --git a/mathesar_ui/src/utils/preloadData.ts b/mathesar_ui/src/utils/preloadData.ts
index cc4fd304af..e89af7a3a5 100644
--- a/mathesar_ui/src/utils/preloadData.ts
+++ b/mathesar_ui/src/utils/preloadData.ts
@@ -3,13 +3,13 @@ import type { User } from '@mathesar/api/rest/users';
 import type { RawDatabase } from '@mathesar/api/rpc/databases';
 import type { RawSchema } from '@mathesar/api/rpc/schemas';
 import type { RawServer } from '@mathesar/api/rpc/servers';
-import type { Table } from '@mathesar/api/rpc/tables';
+import type { RawTableWithMetadata } from '@mathesar/api/rpc/tables';
 
 export interface CommonData {
   databases: RawDatabase[];
   servers: RawServer[];
   schemas: RawSchema[];
-  tables: Table[];
+  tables: RawTableWithMetadata[];
   queries: QueryInstance[];
   current_database: RawDatabase['id'] | null;
   internal_db_connection: {
diff --git a/mathesar_ui/src/utils/tables.ts b/mathesar_ui/src/utils/tables.ts
index b3a38f58a7..39877f442e 100644
--- a/mathesar_ui/src/utils/tables.ts
+++ b/mathesar_ui/src/utils/tables.ts
@@ -1,7 +1,7 @@
 import { filter } from 'iter-tools';
 
-import type { Table } from '@mathesar/api/rpc/tables';
 import type { RecursivePartial } from '@mathesar/component-library';
+import type { Table } from '@mathesar/models/Table';
 import {
   getImportPreviewPageUrl,
   getTablePageUrl,
@@ -9,7 +9,7 @@ import {
 import type { ProcessedColumn } from '@mathesar/stores/table-data';
 
 /** If the same value exists for `a` and `b`, the value from `b` will be used */
-function mergeTableMetadata(
+export function mergeTableMetadata(
   a: Table['metadata'],
   b?: RecursivePartial<Table['metadata']>,
 ): Table['metadata'] {
@@ -28,20 +28,6 @@ function mergeTableMetadata(
   };
 }
 
-/** If the same value exists for `a` and `b`, the value from `b` will be used */
-export function mergeTables(a: Table, b: RecursivePartial<Table>): Table {
-  // I don't love this function, but for now it works. It seems like we ought to
-  // have a more generic way to do this sort of thing, perhaps with a library,
-  // perhaps with JSON serialization. It's kind of hard do find a type-safe
-  // approach that's compatible with our RecursivePartial type. I'm open to more
-  // generalized ways of doing this!
-  return {
-    ...a,
-    ...b,
-    metadata: mergeTableMetadata(a.metadata, b.metadata),
-  };
-}
-
 interface TableWithImportVerification {
   metadata?: {
     import_verified: boolean | null;

From bb3f1868a9435e673002b68dead9f2ad5547d831 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 16 Sep 2024 18:20:10 +0530
Subject: [PATCH 0897/1141] Reduce usage of currentDatabase and currentSchema
 stores

---
 .../database/schemas/SchemasSection.svelte    |  2 +-
 .../src/pages/record/RecordPage.svelte        |  3 +-
 .../src/pages/record/RecordPageContent.svelte |  3 +-
 .../src/pages/record/TableWidget.svelte       |  3 +-
 mathesar_ui/src/pages/schema/EditTable.svelte |  6 +-
 mathesar_ui/src/pages/table/TablePage.svelte  |  3 +-
 mathesar_ui/src/stores/tables.ts              | 20 ++---
 .../RecordSelectorWindow.svelte               |  3 +-
 .../constraints/NewFkConstraint.svelte        |  3 +-
 .../link-table/LinkTableForm.svelte           |  7 +-
 .../FkRecordSummaryConfig.svelte              |  3 +-
 .../record-summary/RecordSummaryConfig.svelte |  1 -
 .../table-inspector/table/TableActions.svelte | 77 ++++++++-----------
 .../table-inspector/table/TableName.svelte    |  6 +-
 .../table/links/TableLinks.svelte             |  4 +-
 15 files changed, 52 insertions(+), 92 deletions(-)

diff --git a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
index a1a98eb02c..a507dfdb8c 100644
--- a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
@@ -65,7 +65,7 @@
       onProceed: async () => {
         await deleteSchemaAPI(schema);
         // TODO: Create common util to handle data clearing & sync between stores
-        removeTablesStore(database, schema);
+        removeTablesStore(schema);
       },
     });
   }
diff --git a/mathesar_ui/src/pages/record/RecordPage.svelte b/mathesar_ui/src/pages/record/RecordPage.svelte
index d71ba95940..fb92caf08e 100644
--- a/mathesar_ui/src/pages/record/RecordPage.svelte
+++ b/mathesar_ui/src/pages/record/RecordPage.svelte
@@ -3,7 +3,6 @@
   import type { Table } from '@mathesar/models/Table';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { abstractTypesMap } from '@mathesar/stores/abstract-types';
-  import { currentDatabase } from '@mathesar/stores/databases';
   import { TableStructure } from '@mathesar/stores/table-data';
   import { currentTable } from '@mathesar/stores/tables';
 
@@ -15,7 +14,7 @@
 
   $: table = $currentTable as Table;
   $: tableStructure = new TableStructure({
-    database: $currentDatabase,
+    database: table.schema.database,
     table,
     abstractTypesMap,
   });
diff --git a/mathesar_ui/src/pages/record/RecordPageContent.svelte b/mathesar_ui/src/pages/record/RecordPageContent.svelte
index a7e8f4d2fe..7e68da67ad 100644
--- a/mathesar_ui/src/pages/record/RecordPageContent.svelte
+++ b/mathesar_ui/src/pages/record/RecordPageContent.svelte
@@ -15,7 +15,6 @@
   import { iconRecord, iconSave, iconUndo } from '@mathesar/icons';
   import InsetPageLayout from '@mathesar/layouts/InsetPageLayout.svelte';
   import type { Table } from '@mathesar/models/Table';
-  import { currentDatabase } from '@mathesar/stores/databases';
   import type { TableStructure } from '@mathesar/stores/table-data';
   import { currentTable } from '@mathesar/stores/tables';
 
@@ -42,7 +41,7 @@
   function getJoinableTablesResult(tableId: number) {
     return api.tables
       .list_joinable({
-        database_id: $currentDatabase.id,
+        database_id: table.schema.database.id,
         table_oid: tableId,
         max_depth: 1,
       })
diff --git a/mathesar_ui/src/pages/record/TableWidget.svelte b/mathesar_ui/src/pages/record/TableWidget.svelte
index ad08a3c7a1..a056292d4e 100644
--- a/mathesar_ui/src/pages/record/TableWidget.svelte
+++ b/mathesar_ui/src/pages/record/TableWidget.svelte
@@ -3,7 +3,6 @@
   import TableName from '@mathesar/components/TableName.svelte';
   import type { Table } from '@mathesar/models/Table';
   import { abstractTypesMap } from '@mathesar/stores/abstract-types';
-  import { currentDatabase } from '@mathesar/stores/databases';
   import {
     Meta,
     TabularData,
@@ -27,7 +26,7 @@
   export let fkColumn: Pick<Column, 'id' | 'name'>;
 
   $: tabularData = new TabularData({
-    database: $currentDatabase,
+    database: table.schema.database,
     table,
     abstractTypesMap,
     meta,
diff --git a/mathesar_ui/src/pages/schema/EditTable.svelte b/mathesar_ui/src/pages/schema/EditTable.svelte
index 6652ce09b3..2c29a1295c 100644
--- a/mathesar_ui/src/pages/schema/EditTable.svelte
+++ b/mathesar_ui/src/pages/schema/EditTable.svelte
@@ -5,7 +5,6 @@
   import NameAndDescInputModalForm from '@mathesar/components/NameAndDescInputModalForm.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import type { Table } from '@mathesar/models/Table';
-  import { currentDatabase } from '@mathesar/stores/databases';
   import {
     factoryToGetTableNameValidationErrors,
     updateTable,
@@ -15,10 +14,7 @@
   export let table: Table;
   export let modalController: ModalController;
 
-  $: getNameValidationErrors = factoryToGetTableNameValidationErrors(
-    $currentDatabase,
-    table,
-  );
+  $: getNameValidationErrors = factoryToGetTableNameValidationErrors(table);
 
   async function handleSave(name: string, description: string) {
     await updateTable({
diff --git a/mathesar_ui/src/pages/table/TablePage.svelte b/mathesar_ui/src/pages/table/TablePage.svelte
index 9d1cfed6a6..780e3f665a 100644
--- a/mathesar_ui/src/pages/table/TablePage.svelte
+++ b/mathesar_ui/src/pages/table/TablePage.svelte
@@ -7,7 +7,6 @@
   import type { Table } from '@mathesar/models/Table';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import { abstractTypesMap } from '@mathesar/stores/abstract-types';
-  import { currentDatabase } from '@mathesar/stores/databases';
   import {
     Meta,
     TabularData,
@@ -36,7 +35,7 @@
   $: ({ query } = $router);
   $: meta = Meta.fromSerialization(query[metaSerializationQueryKey] ?? '');
   $: tabularData = new TabularData({
-    database: $currentDatabase,
+    database: table.schema.database,
     table,
     abstractTypesMap,
     meta,
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index 72961b8365..7a9df7dc91 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -99,11 +99,8 @@ function setTablesStore(schema: Schema, tables: Table[]): TablesStore {
   return store;
 }
 
-export function removeTablesStore(
-  database: Pick<Database, 'id'>,
-  schema: Pick<Schema, 'oid'>,
-): void {
-  tablesStores.delete([database.id, schema.oid]);
+export function removeTablesStore(schema: Schema): void {
+  tablesStores.delete([schema.database.id, schema.oid]);
 }
 
 export async function refetchTablesForSchema(
@@ -520,18 +517,13 @@ export const currentTable = derived(
       : $tables.tablesMap.get($currentTableId),
 );
 
-export async function refetchTablesForCurrentSchema() {
-  const schema = get(currentSchema);
-  if (schema) {
-    await refetchTablesForSchema(schema);
-  }
-}
-
 export function factoryToGetTableNameValidationErrors(
-  database: Pick<Database, 'id'>,
   table: Table,
 ): Readable<(n: string) => string[]> {
-  const tablesStore = tablesStores.get([database.id, table.schema.oid]);
+  const tablesStore = tablesStores.get([
+    table.schema.database.id,
+    table.schema.oid,
+  ]);
   if (!tablesStore) throw new Error('Tables store not found');
 
   const otherTableNames = derived(
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
index fdd5546c17..f235411e61 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorWindow.svelte
@@ -4,7 +4,6 @@
   import { RichText } from '@mathesar/components/rich-text';
   import TableName from '@mathesar/components/TableName.svelte';
   import { abstractTypesMap } from '@mathesar/stores/abstract-types';
-  import { currentDatabase } from '@mathesar/stores/databases';
   import { Meta, TabularData } from '@mathesar/stores/table-data';
   import { currentTablesMap } from '@mathesar/stores/tables';
   import Pagination from '@mathesar/utils/Pagination';
@@ -35,7 +34,7 @@
   $: tabularData =
     $tableId && table
       ? new TabularData({
-          database: $currentDatabase,
+          database: table.schema.database,
           abstractTypesMap,
           meta: new Meta({ pagination: new Pagination({ size: 10 }) }),
           hasEnhancedPrimaryKeyCell: false,
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
index 1dffb1b0da..412d18de76 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
@@ -16,7 +16,6 @@
   import TableName from '@mathesar/components/TableName.svelte';
   import type { Table } from '@mathesar/models/Table';
   import { abstractTypesMap } from '@mathesar/stores/abstract-types';
-  import { currentDatabase } from '@mathesar/stores/databases';
   import {
     type ProcessedColumn,
     TableStructure,
@@ -79,7 +78,7 @@
 
   $: targetTableStructure = $targetTable
     ? new TableStructure({
-        database: $currentDatabase,
+        database: $targetTable.schema.database,
         table: $targetTable,
         abstractTypesMap,
       })
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index 5b7199a98c..3c2b9c0d01 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -18,7 +18,6 @@
   import SelectTable from '@mathesar/components/SelectTable.svelte';
   import { iconTableLink } from '@mathesar/icons';
   import type { Table } from '@mathesar/models/Table';
-  import { currentDatabase } from '@mathesar/stores/databases';
   import {
     ColumnsDataStore,
     getTabularDataStoreFromContext,
@@ -26,7 +25,7 @@
   import {
     currentTables,
     importVerifiedTables as importVerifiedTablesStore,
-    refetchTablesForCurrentSchema,
+    refetchTablesForSchema,
     validateNewTableName,
   } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
@@ -77,7 +76,7 @@
   $: linkType = requiredField<LinkType>('manyToOne');
   $: $targetTable, linkType.reset();
   $: targetColumnsStore = target
-    ? new ColumnsDataStore({ database: $currentDatabase, table: target })
+    ? new ColumnsDataStore({ database: target.schema.database, table: target })
     : undefined;
   $: targetColumns = ensureReadable(targetColumnsStore?.columns ?? []);
   $: targetColumnsFetchStatus = ensureReadable(targetColumnsStore?.fetchStatus);
@@ -199,7 +198,7 @@
 
   async function reFetchOtherThingsThatChanged() {
     if ($linkType === 'manyToMany') {
-      await refetchTablesForCurrentSchema();
+      await refetchTablesForSchema(base.schema);
       return;
     }
     const tableWithNewColumn = $linkType === 'oneToMany' ? target : base;
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
index b2a7472faa..8d1bbf29ab 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/FkRecordSummaryConfig.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import type { Table } from '@mathesar/models/Table';
   import { abstractTypesMap } from '@mathesar/stores/abstract-types';
-  import { currentDatabase } from '@mathesar/stores/databases';
   import { Meta, TabularData } from '@mathesar/stores/table-data';
   import RecordSummaryConfig from '@mathesar/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte';
   import Pagination from '@mathesar/utils/Pagination';
@@ -9,7 +8,7 @@
   export let table: Table;
 
   $: tabularData = new TabularData({
-    database: $currentDatabase,
+    database: table.schema.database,
     table,
     abstractTypesMap,
     meta: new Meta({ pagination: new Pagination({ size: 1 }) }),
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
index 01527f5c1c..f1cd88e4af 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
@@ -13,7 +13,6 @@
   import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import type { Table } from '@mathesar/models/Table';
-  import { currentDatabase } from '@mathesar/stores/databases';
   import type { RecordRow, TabularData } from '@mathesar/stores/table-data';
   import { updateTable } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
index 28c6567ed6..55ec972e02 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
@@ -5,8 +5,6 @@
   import { iconDeleteMajor, iconExploration } from '@mathesar/icons';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
   import { confirmDelete } from '@mathesar/stores/confirmation';
-  import { databasesStore } from '@mathesar/stores/databases';
-  import { currentSchema } from '@mathesar/stores/schemas';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import { deleteTable } from '@mathesar/stores/tables';
   import {
@@ -24,33 +22,25 @@
   import TableDeleteConfirmationBody from './TableDeleteConfirmationBody.svelte';
 
   const tabularData = getTabularDataStoreFromContext();
-  const { currentDatabase } = databasesStore;
 
   $: ({ table, columnsDataStore, meta } = $tabularData);
   $: ({ grouping } = meta);
   $: ({ columns } = columnsDataStore);
-  $: explorationPageUrl =
-    $currentDatabase && $currentSchema
-      ? createDataExplorerUrlToExploreATable(
-          $currentDatabase?.id,
-          $currentSchema.oid,
-          table,
-        )
-      : '';
-  $: summarizationUrl = (() => {
-    if (!$currentDatabase || !$currentSchema) {
-      return undefined;
-    }
-    return constructDataExplorerUrlToSummarizeFromGroup(
-      $currentDatabase.id,
-      $currentSchema.oid,
+  $: explorationPageUrl = createDataExplorerUrlToExploreATable(
+    table.schema.database.id,
+    table.schema.oid,
+    table,
+  );
+  $: summarizationUrl = (() =>
+    constructDataExplorerUrlToSummarizeFromGroup(
+      table.schema.database.id,
+      table.schema.oid,
       {
         baseTable: table,
         columns: $columns,
         terseGrouping: $grouping.terse(),
       },
-    );
-  })();
+    ))();
 
   function handleDeleteTable() {
     void confirmDelete({
@@ -62,46 +52,41 @@
         },
       },
       onProceed: async () => {
-        // TODO handle error when deleting
-        // TODO: Get db and schema from prop or context
-        const database = $currentDatabase;
-        const schema = $currentSchema;
-        if (database && schema) {
-          await deleteTable(schema, table.oid);
-          router.goto(getSchemaPageUrl(database.id, schema.oid), true);
-        }
+        await deleteTable(table.schema, table.oid);
+        router.goto(
+          getSchemaPageUrl(table.schema.database.id, table.schema.oid),
+          true,
+        );
       },
     });
   }
 </script>
 
 <div class="actions-container">
-  {#if $currentDatabase && $currentSchema}
-    <AnchorButton href={explorationPageUrl}>
+  <AnchorButton href={explorationPageUrl}>
+    <div class="action-item">
+      <div>
+        <Icon {...iconExploration} /> <span>{$_('explore_data')}</span>
+        <Help>
+          {$_('open_table_in_data_explorer')}
+        </Help>
+      </div>
+      <Icon {...iconExternalLink} />
+    </div>
+  </AnchorButton>
+  {#if summarizationUrl}
+    <AnchorButton href={summarizationUrl}>
       <div class="action-item">
         <div>
-          <Icon {...iconExploration} /> <span>{$_('explore_data')}</span>
+          <Icon {...iconExploration} />
+          <span>{$_('summarize_in_data_explorer')}</span>
           <Help>
-            {$_('open_table_in_data_explorer')}
+            {$_('summarize_in_data_explorer_help')}
           </Help>
         </div>
         <Icon {...iconExternalLink} />
       </div>
     </AnchorButton>
-    {#if summarizationUrl}
-      <AnchorButton href={summarizationUrl}>
-        <div class="action-item">
-          <div>
-            <Icon {...iconExploration} />
-            <span>{$_('summarize_in_data_explorer')}</span>
-            <Help>
-              {$_('summarize_in_data_explorer_help')}
-            </Help>
-          </div>
-          <Icon {...iconExternalLink} />
-        </div>
-      </AnchorButton>
-    {/if}
   {/if}
 
   <Button appearance="outline-primary" on:click={handleDeleteTable}>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
index 5b0a8570ab..2a4a9ea018 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableName.svelte
@@ -2,7 +2,6 @@
   import { _ } from 'svelte-i18n';
 
   import EditableTextWithActions from '@mathesar/components/EditableTextWithActions.svelte';
-  import { currentDatabase } from '@mathesar/stores/databases';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import {
     factoryToGetTableNameValidationErrors,
@@ -14,10 +13,7 @@
   export let disabled = false;
 
   $: ({ table } = $tabularData);
-  $: getNameValidationErrors = factoryToGetTableNameValidationErrors(
-    $currentDatabase,
-    table,
-  );
+  $: getNameValidationErrors = factoryToGetTableNameValidationErrors(table);
 
   async function handleSubmit(name: string) {
     await updateTable({
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/links/TableLinks.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/links/TableLinks.svelte
index efeea905c3..0cf88edc4f 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/links/TableLinks.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/links/TableLinks.svelte
@@ -2,7 +2,6 @@
   import { api } from '@mathesar/api/rpc';
   import { Spinner } from '@mathesar/component-library';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
-  import { currentDatabase } from '@mathesar/stores/databases';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import { getErrorMessage } from '@mathesar/utils/errors';
 
@@ -11,6 +10,7 @@
   const tabularData = getTabularDataStoreFromContext();
 
   $: columns = $tabularData.processedColumns;
+  $: table = $tabularData.table;
 
   function getJoinableTables(databaseId: number, tableOid: number) {
     return api.tables
@@ -24,7 +24,7 @@
 </script>
 
 <div>
-  {#await getJoinableTables($currentDatabase.id, $tabularData.table.oid)}
+  {#await getJoinableTables(table.schema.database.id, table.oid)}
     <Spinner />
   {:then joinableTablesResult}
     <LinksSectionContainer

From 885c20a036b77a1c2f6c04457cd6d153e4f9fdf5 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 16 Sep 2024 18:29:44 +0530
Subject: [PATCH 0898/1141] Fix linter error

---
 mathesar_ui/src/stores/table-data/constraints.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar_ui/src/stores/table-data/constraints.ts b/mathesar_ui/src/stores/table-data/constraints.ts
index 7263310117..177c0fabd0 100644
--- a/mathesar_ui/src/stores/table-data/constraints.ts
+++ b/mathesar_ui/src/stores/table-data/constraints.ts
@@ -14,8 +14,8 @@ import type {
   Constraint,
   ConstraintRecipe,
 } from '@mathesar/api/rpc/constraints';
-import type { Table } from '@mathesar/models/Table';
 import type { Database } from '@mathesar/models/Database';
+import type { Table } from '@mathesar/models/Table';
 import type { ShareConsumer } from '@mathesar/utils/shares';
 import type { CancellablePromise } from '@mathesar-component-library';
 

From 38349e9d267b1e7fbc6dec49a8c446f915a33598 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 16 Sep 2024 09:56:46 -0400
Subject: [PATCH 0899/1141] Implement RPC changes for record selector

---
 mathesar_ui/src/api/rpc/records.ts              | 11 ++++++++++-
 mathesar_ui/src/stores/table-data/records.ts    | 12 ++++++++++--
 .../src/stores/table-data/searchFuzzy.ts        | 17 ++++++-----------
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/records.ts b/mathesar_ui/src/api/rpc/records.ts
index 1179834df3..e82f8adf3e 100644
--- a/mathesar_ui/src/api/rpc/records.ts
+++ b/mathesar_ui/src/api/rpc/records.ts
@@ -74,7 +74,14 @@ export interface RecordsListParams {
   order?: SortingEntry[];
   grouping?: Grouping;
   filter?: SqlExpr;
-  search_fuzzy?: Record<string, unknown>[];
+  return_record_summaries?: boolean;
+}
+
+export interface RecordsSearchParams {
+  database_id: number;
+  table_oid: number;
+  search_params: { attnum: number; literal: unknown }[];
+  limit?: number;
   return_record_summaries?: boolean;
 }
 
@@ -129,6 +136,8 @@ export const records = {
 
   list: rpcMethodTypeContainer<RecordsListParams, RecordsResponse>(),
 
+  search: rpcMethodTypeContainer<RecordsSearchParams, RecordsResponse>(),
+
   delete: rpcMethodTypeContainer<
     {
       database_id: number;
diff --git a/mathesar_ui/src/stores/table-data/records.ts b/mathesar_ui/src/stores/table-data/records.ts
index 279a329a03..b29397d047 100644
--- a/mathesar_ui/src/stores/table-data/records.ts
+++ b/mathesar_ui/src/stores/table-data/records.ts
@@ -16,6 +16,7 @@ import type {
   Result as ApiRecord,
   RecordsListParams,
   RecordsResponse,
+  RecordsSearchParams,
 } from '@mathesar/api/rpc/records';
 import type { Table } from '@mathesar/api/rpc/tables';
 import type { Database } from '@mathesar/models/Database';
@@ -400,13 +401,20 @@ export class RecordsData {
         ...params.filtering
           .withEntries(contextualFilterEntries)
           .recordsRequestParams(),
-        ...params.searchFuzzy.recordsRequestParams(),
         return_record_summaries: this.loadIntrinsicRecordSummaries,
         // TODO_BETA Do we need shareConsumer here? Previously we had been
         // passing `...this.shareConsumer?.getQueryParams()`
       };
 
-      this.promise = api.records.list(recordsListParams).run();
+      const fuzzySearchParams = params.searchFuzzy.getSearchParams();
+      const recordSearchParams: RecordsSearchParams = {
+        ...this.apiContext,
+        search_params: fuzzySearchParams,
+      };
+
+      this.promise = fuzzySearchParams.length
+        ? api.records.search(recordSearchParams).run()
+        : api.records.list(recordsListParams).run();
 
       const response = await this.promise;
       const totalCount = response.count || 0;
diff --git a/mathesar_ui/src/stores/table-data/searchFuzzy.ts b/mathesar_ui/src/stores/table-data/searchFuzzy.ts
index 92040e486e..4b966c146d 100644
--- a/mathesar_ui/src/stores/table-data/searchFuzzy.ts
+++ b/mathesar_ui/src/stores/table-data/searchFuzzy.ts
@@ -1,4 +1,4 @@
-import type { RecordsListParams } from '@mathesar/api/rpc/records';
+import type { RecordsSearchParams } from '@mathesar/api/rpc/records';
 import { ImmutableMap } from '@mathesar/component-library';
 
 /**
@@ -18,15 +18,10 @@ export class SearchFuzzy extends ImmutableMap<number, unknown> {
     this.valueIsValid = valueIsSearchable;
   }
 
-  recordsRequestParams(): Pick<RecordsListParams, 'search_fuzzy'> {
-    if (this.size === 0) {
-      return {};
-    }
-    return {
-      search_fuzzy: [...this].map(([columnId, value]) => ({
-        field: columnId,
-        literal: value,
-      })),
-    };
+  getSearchParams(): RecordsSearchParams['search_params'] {
+    return [...this].map(([columnId, value]) => ({
+      attnum: columnId,
+      literal: value,
+    }));
   }
 }

From d3107a677d4a72b8d814fd9ccf9e2ca0764c6d47 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Mon, 16 Sep 2024 19:50:27 +0530
Subject: [PATCH 0900/1141] add optional owner_oid param for tables.add

---
 db/tables/operations/create.py           | 4 ++++
 mathesar/rpc/tables/base.py              | 5 ++++-
 mathesar/tests/rpc/tables/test_t_base.py | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/db/tables/operations/create.py b/db/tables/operations/create.py
index 699ac9aaad..13fa5802a7 100644
--- a/db/tables/operations/create.py
+++ b/db/tables/operations/create.py
@@ -29,6 +29,7 @@ def create_mathesar_table(engine, table_name, schema_oid, columns=[], constraint
         table_name,
         json.dumps(columns),
         json.dumps(constraints),
+        None,
         comment
     ).fetchone()[0]["oid"]
 
@@ -39,6 +40,7 @@ def create_table_on_database(
     conn,
     column_data_list=[],
     constraint_data_list=[],
+    owner_oid=None,
     comment=None
 ):
     """
@@ -49,6 +51,7 @@ def create_table_on_database(
         schema_oid: The OID of the schema where the table will be created.
         columns: The columns dict for the new table, in order. (optional)
         constraints: The constraints dict for the new table. (optional)
+        owner_oid: The OID of the role who will own the new table.(optional)
         comment: The comment for the new table. (optional)
 
     Returns:
@@ -61,6 +64,7 @@ def create_table_on_database(
         table_name,
         json.dumps(column_data_list),
         json.dumps(constraint_data_list),
+        owner_oid,
         comment
     ).fetchone()[0]
 
diff --git a/mathesar/rpc/tables/base.py b/mathesar/rpc/tables/base.py
index 08869a1b5c..02cdeb4a6e 100644
--- a/mathesar/rpc/tables/base.py
+++ b/mathesar/rpc/tables/base.py
@@ -201,6 +201,7 @@ def add(
     table_name: str = None,
     column_data_list: list[CreatableColumnInfo] = [],
     constraint_data_list: list[CreatableConstraintInfo] = [],
+    owner_oid: int = None,
     comment: str = None,
     **kwargs
 ) -> AddedTableInfo:
@@ -213,6 +214,8 @@ def add(
         table_name: Name of the table to be created.
         column_data_list: A list describing columns to be created for the new table, in order.
         constraint_data_list: A list describing constraints to be created for the new table.
+        owner_oid: The OID of the role who will own the new table.
+            If owner_oid is None, the current role will be the owner of the new table.
         comment: The comment for the new table.
 
     Returns:
@@ -221,7 +224,7 @@ def add(
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
         created_table_oid = create_table_on_database(
-            table_name, schema_oid, conn, column_data_list, constraint_data_list, comment
+            table_name, schema_oid, conn, column_data_list, constraint_data_list, owner_oid, comment
         )
     return created_table_oid
 
diff --git a/mathesar/tests/rpc/tables/test_t_base.py b/mathesar/tests/rpc/tables/test_t_base.py
index 2997c8b7e2..9a0f432f90 100644
--- a/mathesar/tests/rpc/tables/test_t_base.py
+++ b/mathesar/tests/rpc/tables/test_t_base.py
@@ -145,7 +145,7 @@ def mock_connect(_database_id, user):
         else:
             raise AssertionError('incorrect parameters passed')
 
-    def mock_table_add(table_name, _schema_oid, conn, column_data_list, constraint_data_list, comment):
+    def mock_table_add(table_name, _schema_oid, conn, column_data_list, constraint_data_list, owner_oid, comment):
         if _schema_oid != schema_oid:
             raise AssertionError('incorrect parameters passed')
         return {"oid": 1964474, "name": "newtable"}

From 800f7b156006dec4a0a4b89d74bb647c5999e3d0 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Mon, 16 Sep 2024 19:57:18 +0530
Subject: [PATCH 0901/1141] add optional owner_oid param for schemas.add

---
 db/schemas/operations/create.py | 9 +++++----
 mathesar/rpc/schemas/base.py    | 4 ++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/db/schemas/operations/create.py b/db/schemas/operations/create.py
index 02f8973d02..07e6a3f28a 100644
--- a/db/schemas/operations/create.py
+++ b/db/schemas/operations/create.py
@@ -16,7 +16,7 @@ def create_schema_via_sql_alchemy(schema_name, engine, description=None):
         The integer oid of the newly created schema.
     """
     return execute_msar_func_with_engine(
-        engine, 'create_schema', schema_name, description
+        engine, 'create_schema', schema_name, None, description
     ).fetchone()[0]
 
 
@@ -36,18 +36,19 @@ def create_schema_if_not_exists_via_sql_alchemy(schema_name, engine):
     ).fetchone()[0]
 
 
-def create_schema(schema_name, conn, description=None):
+def create_schema(schema_name, conn, owner_oid, description=None):
     """
     Create a schema using a psycopg connection.
 
     Args:
         schema_name: Name of the schema to create.
         conn: a psycopg connection
-        description: A new description to set on the schema.
+        owner_oid: The OID of the role who will own the new schema.(optional)
+        description: A new description to set on the schema.(optional)
 
     If a schema already exists with the given name, this function will raise an error.
 
     Returns:
         The SchemaInfo describing the user-defined schema in the database.
     """
-    return exec_msar_func(conn, 'create_schema', schema_name, description).fetchone()[0]
+    return exec_msar_func(conn, 'create_schema', schema_name, owner_oid, description).fetchone()[0]
diff --git a/mathesar/rpc/schemas/base.py b/mathesar/rpc/schemas/base.py
index 32a9699726..c3d91c4eba 100644
--- a/mathesar/rpc/schemas/base.py
+++ b/mathesar/rpc/schemas/base.py
@@ -56,6 +56,7 @@ def add(
     *,
     name: str,
     database_id: int,
+    owner_oid: int = None,
     description: Optional[str] = None,
     **kwargs,
 ) -> SchemaInfo:
@@ -65,6 +66,8 @@ def add(
     Args:
         name: The name of the schema to add.
         database_id: The Django id of the database containing the schema.
+        owner_oid: The OID of the role who will own the new schema.
+            If owner_oid is None, the current role will be the owner of the new schema.
         description: A description of the schema
 
     Returns:
@@ -74,6 +77,7 @@ def add(
         return create_schema(
             schema_name=name,
             conn=conn,
+            owner_oid=owner_oid,
             description=description
         )
 

From 611b892e0ba24f92a61c00663f3e307becc314a8 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Mon, 16 Sep 2024 19:58:27 +0530
Subject: [PATCH 0902/1141] add sql changes necessary for allowing setting
 owner at the time of table/schema creation

---
 db/sql/00_msar.sql      | 38 ++++++++++++++++++++++++++------------
 db/sql/test_00_msar.sql | 24 ++++++++++++------------
 2 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index d5b66e20d5..3f73460268 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1653,6 +1653,7 @@ $$ LANGUAGE plpgsql;
 DROP FUNCTION IF EXISTS msar.create_schema(text, text);
 CREATE OR REPLACE FUNCTION msar.create_schema(
   sch_name text,
+  own_id regrole,
   description text DEFAULT ''
 ) RETURNS jsonb AS $$/*
 Create a schema, possibly with a description.
@@ -1660,21 +1661,27 @@ Create a schema, possibly with a description.
 If a schema with the given name already exists, an exception will be raised.
 
 Args:
-  sch_name: the name of the schema to be created, UNQUOTED.
+  sch_name: The name of the schema to be created, UNQUOTED.
+  own_id:      (optional) The OID of the role who will own the new schema.
   description: (optional) A description for the schema, UNQUOTED.
 
 Returns:
   A json object describing the user-defined schema in the database.
 
-Note: This function does not support IF NOT EXISTS because it's simpler that way. I originally tried
-to support descriptions and if_not_exists in the same function, but as I discovered more edge cases
-and inconsistencies, it got too complex, and I didn't think we'd have a good enough use case for it.
+Note:
+  - This function does not support IF NOT EXISTS because it's simpler that way. I originally tried
+    to support descriptions and if_not_exists in the same function, but as I discovered more edge cases
+    and inconsistencies, it got too complex, and I didn't think we'd have a good enough use case for it.
+  - If own_id is NULL, the current role will be the owner of the new schema.
 */
 DECLARE schema_oid oid;
 BEGIN
   EXECUTE 'CREATE SCHEMA ' || quote_ident(sch_name);
   schema_oid := msar.get_schema_oid(sch_name);
   PERFORM msar.set_schema_description(schema_oid, description);
+  IF own_id IS NOT NULL THEN
+    PERFORM msar.transfer_schema_ownership(schema_oid, own_id);
+  END IF;
   RETURN msar.get_schema(schema_oid);
 END;
 $$ LANGUAGE plpgsql;
@@ -2990,7 +2997,7 @@ $$ LANGUAGE SQL;
 DROP FUNCTION IF EXISTS msar.add_mathesar_table(oid, text, jsonb, jsonb, text);
 
 CREATE OR REPLACE FUNCTION
-msar.add_mathesar_table(sch_id oid, tab_name text, col_defs jsonb, con_defs jsonb, comment_ text)
+msar.add_mathesar_table(sch_id oid, tab_name text, col_defs jsonb, con_defs jsonb, own_id regrole, comment_ text)
   RETURNS jsonb AS $$/*
 Add a table, with a default id column, returning the OID & name of the created table.
 
@@ -2999,13 +3006,16 @@ Args:
   tab_name (optional): The unquoted name for the new table.
   col_defs (optional): The columns for the new table, in order.
   con_defs (optional): The constraints for the new table.
+  own_id   (optional): The OID of the role who will own the new table.
   comment_ (optional): The comment for the new table.
 
-Note that if tab_name is null, the table will be created with a name in the format 'Table <n>'.
-If col_defs is null, the table will still be created with a default 'id' column. Also,
-if an 'id' column is given in the input, it will be replaced with our default 'id' column. This is
-the behavior of the current python functions, so we're keeping it for now. In any case, the created
-table will always have our default 'id' column as its first column.
+Note:
+  - If tab_name is NULL, the table will be created with a name in the format 'Table <n>'.
+  - If col_defs is NULL, the table will still be created with a default 'id' column. Also,
+    if an 'id' column is given in the input, it will be replaced with our default 'id' column. This is
+    the behavior of the current python functions, so we're keeping it for now. In any case, the created
+    table will always have our default 'id' column as its first column.
+  - If own_id is NULL, the current role will be the owner of the new table.
 */
 DECLARE
   schema_name text;
@@ -3049,6 +3059,9 @@ BEGIN
   PERFORM __msar.add_table(fq_table_name, column_defs, constraint_defs);
   created_table_id := fq_table_name::regclass::oid;
   PERFORM msar.comment_on_table(created_table_id, comment_);
+  IF own_id IS NOT NULL THEN
+    PERFORM msar.transfer_table_ownership(created_table_id, own_id);
+  END IF;
   RETURN jsonb_build_object(
     'oid', created_table_id::bigint,
     'name', relname
@@ -3099,7 +3112,7 @@ DECLARE
   copy_sql text;
 BEGIN
   -- Create string table
-  rel_id := msar.add_mathesar_table(sch_id, tab_name, col_defs, NULL, comment_) ->> 'oid';
+  rel_id := msar.add_mathesar_table(sch_id, tab_name, col_defs, NULL, NULL, comment_) ->> 'oid';
   -- Get unquoted schema and table name for the created table
   SELECT nspname, relname INTO sch_name, rel_name
   FROM pg_catalog.pg_class AS pgc
@@ -3828,7 +3841,7 @@ The elements of the mapping_columns array must have the form
 DECLARE
   added_table_id oid;
 BEGIN
-  added_table_id := msar.add_mathesar_table(sch_id, tab_name, NULL, NULL, NULL) ->> 'oid';
+  added_table_id := msar.add_mathesar_table(sch_id, tab_name, NULL, NULL, NULL, NULL) ->> 'oid';
   PERFORM msar.add_foreign_key_column(column_name, added_table_id, referent_table_oid)
   FROM jsonb_to_recordset(mapping_columns) AS x(column_name text, referent_table_oid oid);
   RETURN added_table_id;
@@ -3875,6 +3888,7 @@ BEGIN
     new_tab_name,
     extracted_col_defs,
     extracted_con_defs,
+    NULL, -- own_id is set to NULL so the current role would be the owner of the extracted table.
     format('Extracted from %s', __msar.get_qualified_relation_name(tab_id))
   ) ->> 'oid';
   -- Create a new fkey column and foreign key linking the original table to the extracted one.
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 6995c3b8c7..c22f0177f1 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -1188,7 +1188,7 @@ $$ LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION test_create_schema_without_description() RETURNS SETOF TEXT AS $$
 DECLARE sch_oid oid;
 BEGIN
-  SELECT msar.create_schema('foo bar') ->> 'oid' INTO sch_oid;
+  SELECT msar.create_schema('foo bar', NULL) ->> 'oid' INTO sch_oid;
   RETURN NEXT has_schema('foo bar');
   RETURN NEXT is(sch_oid, msar.get_schema_oid('foo bar'));
   RETURN NEXT is(obj_description(sch_oid), NULL);
@@ -1199,7 +1199,7 @@ $$ LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION test_create_schema_with_description() RETURNS SETOF TEXT AS $$
 DECLARE sch_oid oid;
 BEGIN
-  SELECT msar.create_schema('foo bar', 'yay') ->> 'oid' INTO sch_oid;
+  SELECT msar.create_schema('foo bar', NULL, 'yay') ->> 'oid' INTO sch_oid;
   RETURN NEXT has_schema('foo bar');
   RETURN NEXT is(sch_oid, msar.get_schema_oid('foo bar'));
   RETURN NEXT is(obj_description(sch_oid), 'yay');
@@ -1210,8 +1210,8 @@ $$ LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION test_create_schema_that_already_exists() RETURNS SETOF TEXT AS $t$
 DECLARE sch_oid oid;
 BEGIN
-  SELECT msar.create_schema('foo bar') ->> 'oid' INTO sch_oid;
-  RETURN NEXT throws_ok($$SELECT msar.create_schema('foo bar')$$, '42P06');
+  SELECT msar.create_schema('foo bar', NULL) ->> 'oid' INTO sch_oid;
+  RETURN NEXT throws_ok($$SELECT msar.create_schema('foo bar', NULL)$$, '42P06');
   RETURN NEXT is(msar.create_schema_if_not_exists('foo bar'), sch_oid);
 END;
 $t$ LANGUAGE plpgsql;
@@ -1480,7 +1480,7 @@ CREATE OR REPLACE FUNCTION test_add_mathesar_table_minimal_id_col() RETURNS SETO
 BEGIN
   PERFORM __setup_create_table();
   PERFORM msar.add_mathesar_table(
-    'tab_create_schema'::regnamespace::oid, 'anewtable', null, null, null
+    'tab_create_schema'::regnamespace::oid, 'anewtable', null, null, null, null
   );
   RETURN NEXT col_is_pk(
     'tab_create_schema', 'anewtable', 'id', 'id column should be pkey'
@@ -1502,7 +1502,7 @@ DECLARE
 BEGIN
   PERFORM __setup_create_table();
   PERFORM msar.add_mathesar_table(
-    'tab_create_schema'::regnamespace::oid, badname, null, null, null
+    'tab_create_schema'::regnamespace::oid, badname, null, null, null, null
   );
   RETURN NEXT has_table('tab_create_schema'::name, badname::name);
 END;
@@ -1515,7 +1515,7 @@ DECLARE
 BEGIN
   PERFORM __setup_create_table();
   PERFORM msar.add_mathesar_table(
-    'tab_create_schema'::regnamespace::oid, null, null, null, null
+    'tab_create_schema'::regnamespace::oid, null, null, null, null, null
   );
   RETURN NEXT has_table('tab_create_schema'::name, generated_name::name);
 END;
@@ -1529,10 +1529,10 @@ DECLARE
 BEGIN
   PERFORM __setup_create_table();
   PERFORM msar.add_mathesar_table(
-    'tab_create_schema'::regnamespace::oid, null, null, null, null
+    'tab_create_schema'::regnamespace::oid, null, null, null, null, null
   );
   PERFORM msar.add_mathesar_table(
-    'tab_create_schema'::regnamespace::oid, null, null, null, null
+    'tab_create_schema'::regnamespace::oid, null, null, null, null, null
   );
   RETURN NEXT has_table('tab_create_schema'::name, 'Table 1'::name);
   RETURN NEXT has_table('tab_create_schema'::name, 'Table 2'::name);
@@ -1544,7 +1544,7 @@ BEGIN
   );
   RETURN NEXT hasnt_table('tab_create_schema'::name, 'Table 1'::name);
   PERFORM msar.add_mathesar_table(
-    'tab_create_schema'::regnamespace::oid, null, null, null, null
+    'tab_create_schema'::regnamespace::oid, null, null, null, null, null
   );
   RETURN NEXT has_table('tab_create_schema'::name, generated_name::name);
 END;
@@ -1564,7 +1564,7 @@ BEGIN
     'tab_create_schema'::regnamespace::oid,
     'cols_table',
     col_defs,
-    null, null
+    null, null, null
   );
   RETURN NEXT col_is_pk(
     'tab_create_schema', 'cols_table', 'id', 'id column should be pkey'
@@ -1619,7 +1619,7 @@ DECLARE
 BEGIN
   PERFORM __setup_create_table();
   PERFORM msar.add_mathesar_table(
-    'tab_create_schema'::regnamespace::oid, 'cols_table', null, null, comment_
+    'tab_create_schema'::regnamespace::oid, 'cols_table', null, null, null, comment_
   );
   RETURN NEXT col_is_pk(
     'tab_create_schema', 'cols_table', 'id', 'id column should be pkey'

From b74a3d80aa68616810cfa1bdcf28a5a277e920a2 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 16 Sep 2024 10:52:05 -0400
Subject: [PATCH 0903/1141] Fix auto-focusing of input in record selector

---
 .../RecordSelectorTable.svelte                | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
index f558f61344..b2913bf19b 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte
@@ -38,6 +38,7 @@
   let columnWithFocus: Column | undefined = undefined;
   /** It will be undefined if we're loading data, for example. */
   let selectionIndex: number | undefined = undefined;
+  let tableElement: HTMLElement;
 
   $: setRecordSelectorControllerInContext(nestedController);
   $: ({ columnWithNestedSelectorOpen, purpose } = controller);
@@ -181,26 +182,30 @@
     }
   }
 
-  onMount(() => {
-    window.addEventListener('keydown', handleKeydown, { capture: true });
-    return () => {
-      window.removeEventListener('keydown', handleKeydown, { capture: true });
-    };
-  });
+  function findBestColumnIdToFocus(): number {
+    const firstNonPkColumn = $columns.find((c) => c.primary_key === false);
+    return firstNonPkColumn?.id ?? $columns[0].id;
+  }
 
-  onMount(async () => {
-    const columnId = $columns.find((c) => !c.primary_key)?.id;
-    if (columnId === undefined) {
-      return;
-    }
+  async function focusBestInput() {
+    const columnId = findBestColumnIdToFocus();
     await tick();
     const selector = `.record-selector-input.column-${columnId}`;
-    const input = document.querySelector<HTMLElement>(selector);
+    const input = tableElement.querySelector<HTMLElement>(selector);
     if (input) {
       input.focus();
     }
+  }
+
+  onMount(() => {
+    window.addEventListener('keydown', handleKeydown, { capture: true });
+    return () => {
+      window.removeEventListener('keydown', handleKeydown, { capture: true });
+    };
   });
 
+  onMount(focusBestInput);
+
   const overflowDetails = makeOverflowDetails();
   const {
     hasOverflowTop,
@@ -216,6 +221,7 @@
   class:has-overflow-right={$hasOverflowRight}
   class:has-overflow-bottom={$hasOverflowBottom}
   class:has-overflow-left={$hasOverflowLeft}
+  bind:this={tableElement}
 >
   <div class="scroll-container" use:overflowObserver={overflowDetails}>
     <div class="table">

From 713ed9da3a5b8ff0a0f1c36888ddfabef7599615 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 16 Sep 2024 16:32:35 -0400
Subject: [PATCH 0904/1141] Use RPC API for column metadata

---
 mathesar_ui/src/api/rest/types/queries.ts     |  2 +-
 mathesar_ui/src/api/rpc/columns.ts            | 46 +++++++++++--------
 .../AbstractTypeDisplayOptions.svelte         |  5 +-
 .../components/abstract-type-control/utils.ts |  6 +--
 .../cell-fabric/data-types/arrayFactory.ts    |  4 +-
 .../cell-fabric/data-types/boolean.ts         |  8 ++--
 .../data-types/components/typeDefinitions.ts  |  5 +-
 .../components/cell-fabric/data-types/date.ts |  4 +-
 .../cell-fabric/data-types/datetime.ts        |  6 +--
 .../cell-fabric/data-types/duration.ts        |  4 +-
 .../cell-fabric/data-types/money.ts           | 12 ++---
 .../cell-fabric/data-types/number.ts          |  8 ++--
 .../components/cell-fabric/data-types/time.ts |  4 +-
 .../filter-entry/FilterEntry.svelte           |  2 +-
 .../import/preview/importPreviewPageUtils.ts  |  2 +-
 .../abstract-types/type-configs/boolean.ts    | 20 ++++----
 .../abstract-types/type-configs/date.ts       | 12 ++---
 .../abstract-types/type-configs/datetime.ts   | 14 +++---
 .../abstract-types/type-configs/duration.ts   | 33 +++++++------
 .../abstract-types/type-configs/money.ts      | 31 +++++++------
 .../abstract-types/type-configs/number.ts     | 29 ++++++------
 .../abstract-types/type-configs/time.ts       | 12 ++---
 .../src/stores/abstract-types/types.ts        |  6 +--
 mathesar_ui/src/stores/table-data/columns.ts  | 24 ++++++++++
 .../src/systems/data-explorer/utils.ts        |  6 +--
 .../column/ColumnFormatting.svelte            | 12 ++---
 .../utils/duration/DurationSpecification.ts   |  6 +--
 27 files changed, 172 insertions(+), 151 deletions(-)

diff --git a/mathesar_ui/src/api/rest/types/queries.ts b/mathesar_ui/src/api/rest/types/queries.ts
index 01e6d86462..9eedea375a 100644
--- a/mathesar_ui/src/api/rest/types/queries.ts
+++ b/mathesar_ui/src/api/rest/types/queries.ts
@@ -130,7 +130,7 @@ export interface QueryResultColumn {
   display_name: string | null;
   type: Column['type'];
   type_options: Column['type_options'];
-  display_options: Column['display_options'];
+  metadata: Column['metadata'];
 }
 
 export interface QueryInitialColumnSource {
diff --git a/mathesar_ui/src/api/rpc/columns.ts b/mathesar_ui/src/api/rpc/columns.ts
index 26a1751706..b6d59a47de 100644
--- a/mathesar_ui/src/api/rpc/columns.ts
+++ b/mathesar_ui/src/api/rpc/columns.ts
@@ -68,10 +68,10 @@ export interface ColumnTypeOptions {
 }
 
 /**
- * The column display options values, typed as we need in order to render them
- * in the UI.
+ * The column metadata values, typed as we need in order to render them in the
+ * UI.
  */
-export interface RequiredColumnDisplayOptions {
+export interface RequiredColumnMetadata {
   /** The type of input used for boolean values */
   bool_input: BooleanInputType;
 
@@ -104,18 +104,14 @@ export interface RequiredColumnDisplayOptions {
   duration_min: DurationUnit;
 
   duration_max: DurationUnit;
-
-  duration_show_units: boolean;
 }
 
-/** The column display options values, types as we get them from the API. */
-type ColumnDisplayOptions = {
-  [K in keyof RequiredColumnDisplayOptions]?:
-    | RequiredColumnDisplayOptions[K]
-    | null;
+/** The column metadata values, types as we get them from the API. */
+export type ColumnMetadata = {
+  [K in keyof RequiredColumnMetadata]?: RequiredColumnMetadata[K] | null;
 };
 
-export const defaultColumnDisplayOptions: RequiredColumnDisplayOptions = {
+export const defaultColumnMetadata: RequiredColumnMetadata = {
   bool_input: 'checkbox',
   bool_true: 'true',
   bool_false: 'false',
@@ -129,17 +125,16 @@ export const defaultColumnDisplayOptions: RequiredColumnDisplayOptions = {
   date_format: 'none',
   duration_min: 's',
   duration_max: 'm',
-  duration_show_units: true,
 };
 
 /**
- * Gets a display option value from a column, if present. Otherwise returns the
- * default value for that display option.
+ * Gets a metadata value from a column, if present. Otherwise returns the
+ * default value for that metadata value.
  */
-export function getColumnDisplayOption<
-  Option extends keyof RequiredColumnDisplayOptions,
->(column: Pick<Column, 'display_options'>, opt: Option) {
-  return column.display_options?.[opt] ?? defaultColumnDisplayOptions[opt];
+export function getColumnMetadataValue<
+  Key extends keyof RequiredColumnMetadata,
+>(column: Pick<Column, 'metadata'>, k: Key) {
+  return column.metadata?.[k] ?? defaultColumnMetadata[k];
 }
 
 interface ColumnDefault {
@@ -167,7 +162,7 @@ interface RawColumn {
  * The raw column data from the user database combined with Mathesar's metadata
  */
 export interface Column extends RawColumn {
-  display_options: ColumnDisplayOptions | null;
+  metadata: ColumnMetadata | null;
 }
 
 export interface ColumnCreationSpec {
@@ -189,6 +184,8 @@ export interface ColumnPatchSpec {
   default?: ColumnDefault | null;
 }
 
+type ColumnMetadataBlob = ColumnMetadata & { attnum: number };
+
 export const columns = {
   list: rpcMethodTypeContainer<
     {
@@ -233,4 +230,15 @@ export const columns = {
     },
     void
   >(),
+
+  metadata: {
+    set: rpcMethodTypeContainer<
+      {
+        database_id: number;
+        table_oid: number;
+        column_meta_data_list: ColumnMetadataBlob[];
+      },
+      void
+    >(),
+  },
 };
diff --git a/mathesar_ui/src/components/abstract-type-control/AbstractTypeDisplayOptions.svelte b/mathesar_ui/src/components/abstract-type-control/AbstractTypeDisplayOptions.svelte
index 1b3e587d80..99a0c558ea 100644
--- a/mathesar_ui/src/components/abstract-type-control/AbstractTypeDisplayOptions.svelte
+++ b/mathesar_ui/src/components/abstract-type-control/AbstractTypeDisplayOptions.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import type { Readable } from 'svelte/store';
 
+  import type { ColumnMetadata } from '@mathesar/api/rpc/columns';
   import type { AbstractTypeDisplayConfig } from '@mathesar/stores/abstract-types/types';
   import {
     FormBuilder,
@@ -11,9 +12,7 @@
     FormValues,
   } from '@mathesar-component-library/types';
 
-  import type { ColumnWithAbstractType } from './utils';
-
-  export let displayOptions: ColumnWithAbstractType['display_options'];
+  export let displayOptions: ColumnMetadata;
   export let displayOptionsConfig: AbstractTypeDisplayConfig;
   export let displayForm: FormBuildConfiguration;
   export let displayFormValues: Readable<FormValues>;
diff --git a/mathesar_ui/src/components/abstract-type-control/utils.ts b/mathesar_ui/src/components/abstract-type-control/utils.ts
index 84d003c891..270970077b 100644
--- a/mathesar_ui/src/components/abstract-type-control/utils.ts
+++ b/mathesar_ui/src/components/abstract-type-control/utils.ts
@@ -15,14 +15,14 @@ import DurationConfiguration from './config-components/DurationConfiguration.sve
 export interface ColumnWithAbstractType
   extends Pick<
     Column,
-    'id' | 'type' | 'type_options' | 'display_options' | 'valid_target_types'
+    'id' | 'type' | 'type_options' | 'metadata' | 'valid_target_types'
   > {
   abstractType: AbstractType;
 }
 
 export type ColumnTypeOptionsSaveArgs = Pick<
   ColumnWithAbstractType,
-  'type' | 'type_options' | 'display_options'
+  'type' | 'type_options' | 'metadata'
 >;
 
 export function getFormValueStore(
@@ -79,7 +79,7 @@ export function constructDisplayForm(
     const displayFormValues =
       column.type === selectedDbType
         ? displayOptionsConfig.constructDisplayFormValuesFromDisplayOptions(
-            column.display_options,
+            column.metadata,
           )
         : {};
     displayForm = makeForm(displayOptionsConfig.form, displayFormValues, {
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/arrayFactory.ts b/mathesar_ui/src/components/cell-fabric/data-types/arrayFactory.ts
index 4f65d1defb..c7ccc79dcc 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/arrayFactory.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/arrayFactory.ts
@@ -15,7 +15,7 @@ export interface ArrayLikeColumn extends CellColumnLike {
   type_options: {
     item_type: DbType;
   } | null;
-  display_options: Record<string, never> | null;
+  metadata: Record<string, never> | null;
 }
 
 type ComponentFactoryMap = Record<SimpleCellDataTypes, CellComponentFactory>;
@@ -39,7 +39,7 @@ function makeDisplayFormatter(
         {
           type: itemDbType,
           type_options: null,
-          display_options: column.display_options,
+          metadata: column.metadata,
         },
         config,
       )(cellValue);
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/boolean.ts b/mathesar_ui/src/components/cell-fabric/data-types/boolean.ts
index 112f966071..f44ced4692 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/boolean.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/boolean.ts
@@ -1,4 +1,4 @@
-import { type Column, getColumnDisplayOption } from '@mathesar/api/rpc/columns';
+import { type Column, getColumnMetadataValue } from '@mathesar/api/rpc/columns';
 import { Select, isDefinedNonNullable } from '@mathesar-component-library';
 import type {
   ComponentAndProps,
@@ -24,8 +24,8 @@ interface BooleanLabels {
 
 function getLabels(column: Column): BooleanLabels {
   return {
-    true: getColumnDisplayOption(column, 'bool_true'),
-    false: getColumnDisplayOption(column, 'bool_false'),
+    true: getColumnMetadataValue(column, 'bool_true'),
+    false: getColumnMetadataValue(column, 'bool_false'),
   };
 }
 
@@ -52,7 +52,7 @@ function getProps(
 const booleanType: CellComponentFactory = {
   initialInputValue: null,
   get: (column: Column): ComponentAndProps<Props> => {
-    const displayOptions = column.display_options ?? undefined;
+    const displayOptions = column.metadata ?? undefined;
     if (displayOptions && displayOptions.bool_input === 'dropdown') {
       return {
         component: SingleSelectCell,
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts b/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts
index e32705b26c..42e09772e5 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/components/typeDefinitions.ts
@@ -9,10 +9,7 @@ import type {
   SelectProps,
 } from '@mathesar-component-library/types';
 
-export type CellColumnLike = Pick<
-  Column,
-  'type' | 'type_options' | 'display_options'
->;
+export type CellColumnLike = Pick<Column, 'type' | 'type_options' | 'metadata'>;
 
 export interface CellColumnFabric {
   id: string | number;
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/date.ts b/mathesar_ui/src/components/cell-fabric/data-types/date.ts
index 66c130800b..761beb5ae3 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/date.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/date.ts
@@ -1,4 +1,4 @@
-import { type Column, getColumnDisplayOption } from '@mathesar/api/rpc/columns';
+import { type Column, getColumnMetadataValue } from '@mathesar/api/rpc/columns';
 import {
   DateTimeFormatter,
   DateTimeSpecification,
@@ -12,7 +12,7 @@ import type { DateTimeCellExternalProps } from './components/typeDefinitions';
 import type { CellComponentFactory } from './typeDefinitions';
 
 function getProps(column: Column): DateTimeCellExternalProps {
-  const format = getColumnDisplayOption(column, 'date_format');
+  const format = getColumnMetadataValue(column, 'date_format');
   const specification = new DateTimeSpecification({
     type: 'date',
     dateFormat: format,
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/datetime.ts b/mathesar_ui/src/components/cell-fabric/data-types/datetime.ts
index a5ef36949c..e63f911c28 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/datetime.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/datetime.ts
@@ -1,4 +1,4 @@
-import { type Column, getColumnDisplayOption } from '@mathesar/api/rpc/columns';
+import { type Column, getColumnMetadataValue } from '@mathesar/api/rpc/columns';
 import {
   DateTimeFormatter,
   DateTimeSpecification,
@@ -15,8 +15,8 @@ function getProps(
   column: Column,
   supportTimeZone: boolean,
 ): DateTimeCellExternalProps {
-  const dateFormat = getColumnDisplayOption(column, 'date_format');
-  const timeFormat = getColumnDisplayOption(column, 'time_format');
+  const dateFormat = getColumnMetadataValue(column, 'date_format');
+  const timeFormat = getColumnMetadataValue(column, 'time_format');
   const specification = new DateTimeSpecification({
     type: supportTimeZone ? 'timestampWithTZ' : 'timestamp',
     dateFormat,
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/duration.ts b/mathesar_ui/src/components/cell-fabric/data-types/duration.ts
index 2864958f0c..91b82000a1 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/duration.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/duration.ts
@@ -18,8 +18,8 @@ import type { CellComponentFactory } from './typeDefinitions';
 
 function getProps(column: Column): FormattedInputCellExternalProps {
   const defaults = DurationSpecification.getDefaults();
-  const max = column.display_options?.duration_max ?? defaults.max;
-  const min = column.display_options?.duration_min ?? defaults.min;
+  const max = column.metadata?.duration_max ?? defaults.max;
+  const min = column.metadata?.duration_min ?? defaults.min;
   const durationSpecification = new DurationSpecification({ max, min });
   const formatter = new DurationFormatter(durationSpecification);
   return {
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/money.ts b/mathesar_ui/src/components/cell-fabric/data-types/money.ts
index 8666d4fc49..707a92b377 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/money.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/money.ts
@@ -1,7 +1,7 @@
 import {
   type Column,
   type NumberFormat,
-  getColumnDisplayOption,
+  getColumnMetadataValue,
 } from '@mathesar/api/rpc/columns';
 import {
   StringifiedNumberFormatter,
@@ -31,22 +31,22 @@ function ColumnIsInteger(column: Column): boolean {
 function getFormatterOptions(
   column: Column,
 ): MoneyCellExternalProps['formatterOptions'] {
-  const format = getColumnDisplayOption(column, 'num_format');
+  const format = getColumnMetadataValue(column, 'num_format');
   return {
     locale: (format && localeMap.get(format)) ?? undefined,
     useGrouping: getUseGrouping(column),
     allowFloat: !ColumnIsInteger(column),
     allowNegative: true,
-    minimumFractionDigits: getColumnDisplayOption(
+    minimumFractionDigits: getColumnMetadataValue(
       column,
       'num_min_frac_digits',
     ),
-    maximumFractionDigits: getColumnDisplayOption(
+    maximumFractionDigits: getColumnMetadataValue(
       column,
       'num_max_frac_digits',
     ),
-    currencySymbol: getColumnDisplayOption(column, 'mon_currency_symbol'),
-    currencySymbolLocation: getColumnDisplayOption(
+    currencySymbol: getColumnMetadataValue(column, 'mon_currency_symbol'),
+    currencySymbolLocation: getColumnMetadataValue(
       column,
       'mon_currency_location',
     ),
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/number.ts b/mathesar_ui/src/components/cell-fabric/data-types/number.ts
index d1d93eadd0..8c7faa1c51 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/number.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/number.ts
@@ -1,7 +1,7 @@
 import {
   type Column,
   type NumberFormat,
-  getColumnDisplayOption,
+  getColumnMetadataValue,
 } from '@mathesar/api/rpc/columns';
 import {
   StringifiedNumberFormatter,
@@ -50,7 +50,7 @@ function getAllowFloat(
 export function getUseGrouping(
   column: Column,
 ): NumberCellExternalProps['formatterOptions']['useGrouping'] {
-  const grouping = getColumnDisplayOption(column, 'num_grouping');
+  const grouping = getColumnMetadataValue(column, 'num_grouping');
   switch (grouping) {
     case 'always':
       return 'always';
@@ -67,7 +67,7 @@ function getFormatterOptions(
   column: Column,
   config?: Config,
 ): NumberCellExternalProps['formatterOptions'] {
-  const displayOptions = column.display_options;
+  const displayOptions = column.metadata;
   const format = displayOptions?.num_format ?? null;
   const locale = (format && localeMap.get(format)) ?? undefined;
   const useGrouping = getUseGrouping(column);
@@ -86,7 +86,7 @@ function getFormatterOptions(
 
 function getProps(column: Column, config?: Config): NumberCellExternalProps {
   const basicFormatterOptions = getFormatterOptions(column, config);
-  const displayOptions = column.display_options;
+  const displayOptions = column.metadata;
   const maximumFractionDigits =
     displayOptions?.num_max_frac_digits ?? undefined;
   const formatterOptions = {
diff --git a/mathesar_ui/src/components/cell-fabric/data-types/time.ts b/mathesar_ui/src/components/cell-fabric/data-types/time.ts
index f4301ceae0..9a5ae70ae6 100644
--- a/mathesar_ui/src/components/cell-fabric/data-types/time.ts
+++ b/mathesar_ui/src/components/cell-fabric/data-types/time.ts
@@ -1,4 +1,4 @@
-import { type Column, getColumnDisplayOption } from '@mathesar/api/rpc/columns';
+import { type Column, getColumnMetadataValue } from '@mathesar/api/rpc/columns';
 import {
   DateTimeFormatter,
   DateTimeSpecification,
@@ -15,7 +15,7 @@ function getProps(
   column: Column,
   supportTimeZone: boolean,
 ): DateTimeCellExternalProps {
-  const format = getColumnDisplayOption(column, 'time_format');
+  const format = getColumnMetadataValue(column, 'time_format');
   const specification = new DateTimeSpecification({
     type: supportTimeZone ? 'timeWithTZ' : 'time',
     timeFormat: format,
diff --git a/mathesar_ui/src/components/filter-entry/FilterEntry.svelte b/mathesar_ui/src/components/filter-entry/FilterEntry.svelte
index 68b3eb2220..578ae353c7 100644
--- a/mathesar_ui/src/components/filter-entry/FilterEntry.svelte
+++ b/mathesar_ui/src/components/filter-entry/FilterEntry.svelte
@@ -157,7 +157,7 @@
     return getDbTypeBasedInputCap({
       type: parameterTypeId,
       type_options: {},
-      display_options: {},
+      metadata: {},
     });
   }
 
diff --git a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
index fca7a3c956..e72dbbfb73 100644
--- a/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
+++ b/mathesar_ui/src/pages/import/preview/importPreviewPageUtils.ts
@@ -107,6 +107,6 @@ export function finalizeColumns(
       name: columnPropertiesMap[column.id]?.displayName ?? '',
       type: column.type,
       type_options: column.type_options,
-      display_options: column.display_options,
+      metadata: column.metadata,
     }));
 }
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/boolean.ts b/mathesar_ui/src/stores/abstract-types/type-configs/boolean.ts
index b42c7c2ceb..335acbff40 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/boolean.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/boolean.ts
@@ -1,7 +1,7 @@
 import {
   type BooleanInputType,
   type Column,
-  getColumnDisplayOption,
+  getColumnMetadataValue,
 } from '@mathesar/api/rpc/columns';
 import { iconUiTypeBoolean } from '@mathesar/icons';
 import type { FormValues } from '@mathesar-component-library/types';
@@ -84,10 +84,8 @@ const displayForm: AbstractTypeConfigForm = {
   },
 };
 
-function determineDisplayOptions(
-  formValues: FormValues,
-): Column['display_options'] {
-  const displayOptions: Column['display_options'] = {
+function determineDisplayOptions(formValues: FormValues): Column['metadata'] {
+  const displayOptions: Column['metadata'] = {
     bool_input: formValues.displayAs as BooleanInputType,
   };
   if (formValues.displayAs === 'dropdown' && formValues.useCustomLabels) {
@@ -98,16 +96,16 @@ function determineDisplayOptions(
 }
 
 function constructDisplayFormValuesFromDisplayOptions(
-  displayOptions: Column['display_options'],
+  metadata: Column['metadata'],
 ): FormValues {
-  const column = { display_options: displayOptions };
+  const column = { metadata };
   const formValues: FormValues = {
-    displayAs: getColumnDisplayOption(column, 'bool_input'),
+    displayAs: getColumnMetadataValue(column, 'bool_input'),
   };
-  if (displayOptions?.bool_true || displayOptions?.bool_false) {
+  if (metadata?.bool_true || metadata?.bool_false) {
     formValues.useCustomLabels = true;
-    formValues.trueLabel = getColumnDisplayOption(column, 'bool_true');
-    formValues.falseLabel = getColumnDisplayOption(column, 'bool_false');
+    formValues.trueLabel = getColumnMetadataValue(column, 'bool_true');
+    formValues.falseLabel = getColumnMetadataValue(column, 'bool_false');
   }
   return formValues;
 }
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/date.ts b/mathesar_ui/src/stores/abstract-types/type-configs/date.ts
index 9e1fa9ee47..17e81dc78d 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/date.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/date.ts
@@ -1,7 +1,7 @@
 import {
   type Column,
   type DateFormat,
-  getColumnDisplayOption,
+  getColumnMetadataValue,
 } from '@mathesar/api/rpc/columns';
 import { iconUiTypeDate } from '@mathesar/icons';
 import type { FormValues } from '@mathesar-component-library/types';
@@ -34,20 +34,18 @@ const displayForm: AbstractTypeConfigForm = {
   },
 };
 
-function determineDisplayOptions(
-  formValues: FormValues,
-): Column['display_options'] {
+function determineDisplayOptions(formValues: FormValues): Column['metadata'] {
   return {
     date_format: formValues.format as DateFormat,
   };
 }
 
 function constructDisplayFormValuesFromDisplayOptions(
-  displayOptions: Column['display_options'],
+  metadata: Column['metadata'],
 ): FormValues {
-  const column = { display_options: displayOptions };
+  const column = { metadata };
   const formValues: FormValues = {
-    format: getColumnDisplayOption(column, 'date_format'),
+    format: getColumnMetadataValue(column, 'date_format'),
   };
   return formValues;
 }
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/datetime.ts b/mathesar_ui/src/stores/abstract-types/type-configs/datetime.ts
index 97602bc710..e84550d45d 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/datetime.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/datetime.ts
@@ -2,7 +2,7 @@ import {
   type Column,
   type DateFormat,
   type TimeFormat,
-  getColumnDisplayOption,
+  getColumnMetadataValue,
 } from '@mathesar/api/rpc/columns';
 import { iconUiTypeDateTime } from '@mathesar/icons';
 import type { FormValues } from '@mathesar-component-library/types';
@@ -89,8 +89,8 @@ const displayForm: AbstractTypeConfigForm = {
 
 function determineDisplayOptions(
   dispFormValues: FormValues,
-): Column['display_options'] {
-  const displayOptions: Column['display_options'] = {
+): Column['metadata'] {
+  const displayOptions: Column['metadata'] = {
     date_format: dispFormValues.dateFormat as DateFormat,
     time_format: dispFormValues.timeFormat as TimeFormat,
   };
@@ -98,12 +98,12 @@ function determineDisplayOptions(
 }
 
 function constructDisplayFormValuesFromDisplayOptions(
-  displayOptions: Column['display_options'],
+  metadata: Column['metadata'],
 ): FormValues {
-  const column = { display_options: displayOptions };
+  const column = { metadata };
   const formValues: FormValues = {
-    dateFormat: getColumnDisplayOption(column, 'date_format'),
-    timeFormat: getColumnDisplayOption(column, 'time_format'),
+    dateFormat: getColumnMetadataValue(column, 'date_format'),
+    timeFormat: getColumnMetadataValue(column, 'time_format'),
   };
   return formValues;
 }
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/duration.ts b/mathesar_ui/src/stores/abstract-types/type-configs/duration.ts
index da7d4fb81f..f4b10cf7a3 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/duration.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/duration.ts
@@ -1,4 +1,9 @@
-import { type Column, getColumnDisplayOption } from '@mathesar/api/rpc/columns';
+import {
+  type Column,
+  type ColumnMetadata,
+  type DurationUnit,
+  getColumnMetadataValue,
+} from '@mathesar/api/rpc/columns';
 import { iconUiTypeDuration } from '@mathesar/icons';
 import { DurationSpecification } from '@mathesar/utils/duration';
 import type { FormValues } from '@mathesar-component-library/types';
@@ -22,8 +27,8 @@ const displayForm: AbstractTypeConfigForm = {
     durationConfig: {
       type: 'custom',
       default: {
-        max: durationDefaults.max,
-        min: durationDefaults.min,
+        duration_max: durationDefaults.max,
+        duration_min: durationDefaults.min,
       },
     },
   },
@@ -39,24 +44,26 @@ const displayForm: AbstractTypeConfigForm = {
   },
 };
 
-function determineDisplayOptions(
-  formValues: FormValues,
-): Column['display_options'] {
-  const displayOptions: Column['display_options'] = {
-    ...(formValues.durationConfig as Record<string, unknown>),
-    duration_show_units: false,
+function determineDisplayOptions(formValues: FormValues): ColumnMetadata {
+  const durationConfig = formValues.durationConfig as {
+    max: DurationUnit;
+    min: DurationUnit;
+  };
+  const displayOptions: Column['metadata'] = {
+    duration_max: durationConfig.max,
+    duration_min: durationConfig.min,
   };
   return displayOptions;
 }
 
 function constructDisplayFormValuesFromDisplayOptions(
-  displayOptions: Column['display_options'],
+  metadata: Column['metadata'],
 ): FormValues {
-  const column = { display_options: displayOptions };
+  const column = { metadata };
   const formValues: FormValues = {
     durationConfig: {
-      max: getColumnDisplayOption(column, 'duration_max'),
-      min: getColumnDisplayOption(column, 'duration_min'),
+      max: getColumnMetadataValue(column, 'duration_max'),
+      min: getColumnMetadataValue(column, 'duration_min'),
     },
   };
   return formValues;
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/money.ts b/mathesar_ui/src/stores/abstract-types/type-configs/money.ts
index 4f60809c01..c2c9e552a2 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/money.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/money.ts
@@ -3,7 +3,7 @@ import {
   type CurrencyLocation,
   type NumberFormat,
   type NumberGrouping,
-  getColumnDisplayOption,
+  getColumnMetadataValue,
 } from '@mathesar/api/rpc/columns';
 import { iconUiTypeMoney } from '@mathesar/icons';
 import type { FormValues } from '@mathesar-component-library/types';
@@ -38,8 +38,8 @@ const displayForm: AbstractTypeConfigForm = {
     },
     useGrouping: {
       type: 'string',
-      enum: ['true', 'false'],
-      default: 'true',
+      enum: ['auto', 'always', 'never'],
+      default: 'auto',
     },
   },
   layout: {
@@ -69,8 +69,9 @@ const displayForm: AbstractTypeConfigForm = {
         variable: 'useGrouping',
         label: 'Digit Grouping',
         options: {
-          true: { label: 'On' },
-          false: { label: 'Off' },
+          auto: { label: 'Auto' },
+          always: { label: 'Always' },
+          never: { label: 'Never' },
         },
       },
       {
@@ -98,9 +99,9 @@ interface MoneyFormValues extends Record<string, unknown> {
   useGrouping: NumberGrouping;
 }
 
-function determineDisplayOptions(form: FormValues): Column['display_options'] {
+function determineDisplayOptions(form: FormValues): Column['metadata'] {
   const f = form as MoneyFormValues;
-  const opts: Partial<Column['display_options']> = {
+  const opts: Partial<Column['metadata']> = {
     mon_currency_symbol: f.currencySymbol,
     mon_currency_location: f.currencySymbolLocation,
     num_format: f.numberFormat === 'none' ? null : f.numberFormat,
@@ -112,22 +113,22 @@ function determineDisplayOptions(form: FormValues): Column['display_options'] {
 }
 
 function constructDisplayFormValuesFromDisplayOptions(
-  displayOptions: Column['display_options'],
+  metadata: Column['metadata'],
 ): MoneyFormValues {
-  const column = { display_options: displayOptions };
+  const column = { metadata };
   const decimalPlaces = getDecimalPlaces(
-    displayOptions?.num_min_frac_digits ?? null,
-    displayOptions?.num_max_frac_digits ?? null,
+    metadata?.num_min_frac_digits ?? null,
+    metadata?.num_max_frac_digits ?? null,
   );
   const displayFormValues: MoneyFormValues = {
-    numberFormat: getColumnDisplayOption(column, 'num_format') ?? 'none',
-    currencySymbol: getColumnDisplayOption(column, 'mon_currency_symbol') ?? '',
+    numberFormat: getColumnMetadataValue(column, 'num_format') ?? 'none',
+    currencySymbol: getColumnMetadataValue(column, 'mon_currency_symbol') ?? '',
     decimalPlaces,
-    currencySymbolLocation: getColumnDisplayOption(
+    currencySymbolLocation: getColumnMetadataValue(
       column,
       'mon_currency_location',
     ),
-    useGrouping: getColumnDisplayOption(column, 'num_grouping'),
+    useGrouping: getColumnMetadataValue(column, 'num_grouping'),
   };
   return displayFormValues;
 }
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/number.ts b/mathesar_ui/src/stores/abstract-types/type-configs/number.ts
index 37c1639c04..9cd5246729 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/number.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/number.ts
@@ -2,7 +2,7 @@ import {
   type Column,
   type NumberFormat,
   type NumberGrouping,
-  getColumnDisplayOption,
+  getColumnMetadataValue,
 } from '@mathesar/api/rpc/columns';
 import type { DbType } from '@mathesar/AppTypes';
 import { iconUiTypeNumber } from '@mathesar/icons';
@@ -202,8 +202,8 @@ const displayForm: AbstractTypeConfigForm = {
     },
     useGrouping: {
       type: 'string',
-      enum: ['true', 'false'],
-      default: 'false',
+      enum: ['auto', 'always', 'never'],
+      default: 'auto',
     },
     numberFormat: {
       type: 'string',
@@ -224,8 +224,9 @@ const displayForm: AbstractTypeConfigForm = {
         variable: 'useGrouping',
         label: 'Digit Grouping',
         options: {
-          true: { label: 'On' },
-          false: { label: 'Off' },
+          auto: { label: 'Auto' },
+          always: { label: 'Always' },
+          never: { label: 'Never' },
         },
       },
       {
@@ -245,11 +246,9 @@ const displayForm: AbstractTypeConfigForm = {
   },
 };
 
-function determineDisplayOptions(
-  formValues: FormValues,
-): Column['display_options'] {
+function determineDisplayOptions(formValues: FormValues): Column['metadata'] {
   const decimalPlaces = formValues.decimalPlaces as number | null;
-  const opts: Partial<Column['display_options']> = {
+  const opts: Partial<Column['metadata']> = {
     num_format:
       formValues.numberFormat === 'none'
         ? undefined
@@ -279,16 +278,16 @@ export function getDecimalPlaces(
 }
 
 function constructDisplayFormValuesFromDisplayOptions(
-  displayOptions: Column['display_options'],
+  metadata: Column['metadata'],
 ): FormValues {
-  const column = { display_options: displayOptions };
+  const column = { metadata };
   const decimalPlaces = getDecimalPlaces(
-    displayOptions?.num_min_frac_digits ?? null,
-    displayOptions?.num_max_frac_digits ?? null,
+    metadata?.num_min_frac_digits ?? null,
+    metadata?.num_max_frac_digits ?? null,
   );
   const formValues: FormValues = {
-    numberFormat: getColumnDisplayOption(column, 'num_format'),
-    useGrouping: getColumnDisplayOption(column, 'num_grouping'),
+    numberFormat: getColumnMetadataValue(column, 'num_format'),
+    useGrouping: getColumnMetadataValue(column, 'num_grouping'),
     decimalPlaces,
   };
   return formValues;
diff --git a/mathesar_ui/src/stores/abstract-types/type-configs/time.ts b/mathesar_ui/src/stores/abstract-types/type-configs/time.ts
index ce121860c8..cf6a54adba 100644
--- a/mathesar_ui/src/stores/abstract-types/type-configs/time.ts
+++ b/mathesar_ui/src/stores/abstract-types/type-configs/time.ts
@@ -1,7 +1,7 @@
 import {
   type Column,
   type TimeFormat,
-  getColumnDisplayOption,
+  getColumnMetadataValue,
 } from '@mathesar/api/rpc/columns';
 import { iconUiTypeTime } from '@mathesar/icons';
 import type { FormValues } from '@mathesar-component-library/types';
@@ -75,20 +75,18 @@ const displayForm: AbstractTypeConfigForm = {
   },
 };
 
-function determineDisplayOptions(
-  formValues: FormValues,
-): Column['display_options'] {
+function determineDisplayOptions(formValues: FormValues): Column['metadata'] {
   return {
     time_format: formValues.format as TimeFormat,
   };
 }
 
 function constructDisplayFormValuesFromDisplayOptions(
-  displayOptions: Column['display_options'],
+  metadata: Column['metadata'],
 ): FormValues {
-  const column = { display_options: displayOptions };
+  const column = { metadata };
   return {
-    format: getColumnDisplayOption(column, 'time_format'),
+    format: getColumnMetadataValue(column, 'time_format'),
   };
 }
 
diff --git a/mathesar_ui/src/stores/abstract-types/types.ts b/mathesar_ui/src/stores/abstract-types/types.ts
index 3c00223dff..12df20c435 100644
--- a/mathesar_ui/src/stores/abstract-types/types.ts
+++ b/mathesar_ui/src/stores/abstract-types/types.ts
@@ -48,11 +48,9 @@ export interface AbstractTypeDbConfig {
 
 export interface AbstractTypeDisplayConfig {
   form: AbstractTypeConfigForm;
-  determineDisplayOptions: (
-    dbFormValues: FormValues,
-  ) => Column['display_options'];
+  determineDisplayOptions: (dbFormValues: FormValues) => Column['metadata'];
   constructDisplayFormValuesFromDisplayOptions: (
-    displayOptions: Column['display_options'],
+    displayOptions: Column['metadata'],
   ) => FormValues;
 }
 
diff --git a/mathesar_ui/src/stores/table-data/columns.ts b/mathesar_ui/src/stores/table-data/columns.ts
index 5f9ff410ad..34d73ce082 100644
--- a/mathesar_ui/src/stores/table-data/columns.ts
+++ b/mathesar_ui/src/stores/table-data/columns.ts
@@ -5,6 +5,7 @@ import { api } from '@mathesar/api/rpc';
 import type {
   Column,
   ColumnCreationSpec,
+  ColumnMetadata,
   ColumnPatchSpec,
 } from '@mathesar/api/rpc/columns';
 import type { Table } from '@mathesar/api/rpc/tables';
@@ -148,6 +149,29 @@ export class ColumnsDataStore extends EventHandler<{
     await this.dispatch('columnPatched');
   }
 
+  async setDisplayOptions(
+    column: Pick<Column, 'id'>,
+    displayOptions: ColumnMetadata | null,
+  ): Promise<void> {
+    await api.columns.metadata
+      .set({
+        ...this.apiContext,
+        column_meta_data_list: [{ attnum: column.id, ...displayOptions }],
+      })
+      .run();
+
+    this.fetchedColumns.update((columns) =>
+      columns.map((c) =>
+        c.id === column.id
+          ? {
+              ...c,
+              metadata: { ...c.metadata, ...displayOptions },
+            }
+          : c,
+      ),
+    );
+  }
+
   destroy(): void {
     this.promise?.cancel();
     this.promise = undefined;
diff --git a/mathesar_ui/src/systems/data-explorer/utils.ts b/mathesar_ui/src/systems/data-explorer/utils.ts
index 0c86c6601c..c84be95b8a 100644
--- a/mathesar_ui/src/systems/data-explorer/utils.ts
+++ b/mathesar_ui/src/systems/data-explorer/utils.ts
@@ -319,7 +319,7 @@ function processColumn(
     display_name: columnInfo.display_name ?? columnInfo.alias,
     type: columnInfo.type ?? 'unknown',
     type_options: columnInfo.type_options ?? null,
-    display_options: columnInfo.display_options ?? null,
+    metadata: columnInfo.metadata ?? null,
   };
 
   const abstractType = getAbstractTypeForDbType(column.type, abstractTypeMap);
@@ -448,7 +448,7 @@ export function speculateColumnMetaData({
                 display_name: null,
                 type: inputColumn?.type ?? 'unknown',
                 type_options: inputColumn?.type_options ?? null,
-                display_options: inputColumn?.display_options ?? null,
+                metadata: inputColumn?.metadata ?? null,
                 is_initial_column: false,
                 input_alias: group.inputAlias,
               },
@@ -482,7 +482,7 @@ export function speculateColumnMetaData({
                         //     ?.column.type ?? 'unknown',
                       }
                     : null,
-                display_options: null,
+                metadata: null,
                 is_initial_column: false,
                 input_alias: aggregation.inputAlias,
               },
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte
index 0814d26d64..b14cc95a2c 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte
@@ -2,10 +2,10 @@
   import { _ } from 'svelte-i18n';
 
   import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+  import type { ColumnMetadata } from '@mathesar/api/rpc/columns';
   import { createValidationContext } from '@mathesar/component-library';
   import CancelOrProceedButtonPair from '@mathesar/component-library/cancel-or-proceed-button-pair/CancelOrProceedButtonPair.svelte';
   import AbstractTypeDisplayOptions from '@mathesar/components/abstract-type-control/AbstractTypeDisplayOptions.svelte';
-  import type { ColumnWithAbstractType } from '@mathesar/components/abstract-type-control/types';
   import { constructDisplayForm } from '@mathesar/components/abstract-type-control/utils';
   import {
     type ProcessedColumn,
@@ -20,9 +20,7 @@
   const tabularData = getTabularDataStoreFromContext();
   $: ({ columnsDataStore } = $tabularData);
 
-  let displayOptions: ColumnWithAbstractType['display_options'] = {
-    ...(column.column.display_options ?? {}),
-  };
+  let displayOptions: ColumnMetadata = column.column.metadata ?? {};
   let typeChangeState: RequestStatus;
 
   const validationContext = createValidationContext();
@@ -37,11 +35,7 @@
   async function save() {
     typeChangeState = { state: 'processing' };
     try {
-      // TODO_BETA: fix this
-      //
-      // await columnsDataStore.patch(column.id, {
-      //   display_options: displayOptions,
-      // });
+      await columnsDataStore.setDisplayOptions(column, displayOptions);
       actionButtonsVisible = false;
       typeChangeState = { state: 'success' };
     } catch (err) {
diff --git a/mathesar_ui/src/utils/duration/DurationSpecification.ts b/mathesar_ui/src/utils/duration/DurationSpecification.ts
index c109897b69..cd41487c32 100644
--- a/mathesar_ui/src/utils/duration/DurationSpecification.ts
+++ b/mathesar_ui/src/utils/duration/DurationSpecification.ts
@@ -1,7 +1,7 @@
 import {
   type DurationUnit,
   allDurationUnits,
-  defaultColumnDisplayOptions,
+  defaultColumnMetadata,
 } from '@mathesar/api/rpc/columns';
 
 export interface DurationConfig {
@@ -10,8 +10,8 @@ export interface DurationConfig {
 }
 
 const defaults: DurationConfig = {
-  max: defaultColumnDisplayOptions.duration_max,
-  min: defaultColumnDisplayOptions.duration_min,
+  max: defaultColumnMetadata.duration_max,
+  min: defaultColumnMetadata.duration_min,
 };
 
 const formattingTokens: Record<DurationUnit, string> = {

From 9ebc6c5c50183d82688737dada526d1b5a3d0cfd Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Tue, 17 Sep 2024 14:58:06 +0530
Subject: [PATCH 0905/1141] Fix public schema identification

---
 mathesar_ui/src/models/Schema.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mathesar_ui/src/models/Schema.ts b/mathesar_ui/src/models/Schema.ts
index 4a4de7abd4..ec9119102b 100644
--- a/mathesar_ui/src/models/Schema.ts
+++ b/mathesar_ui/src/models/Schema.ts
@@ -34,13 +34,14 @@ export class Schema {
 
   readonly current_role_owns: boolean;
 
-  readonly isPublicSchema = derived(this.name, ($name) => $name === 'public');
+  readonly isPublicSchema;
 
   readonly database: Database;
 
   constructor(props: { database: Database; rawSchema: RawSchema }) {
     this.oid = props.rawSchema.oid;
     this._name = writable(props.rawSchema.name);
+    this.isPublicSchema = derived(this._name, ($name) => $name === 'public');
     this._description = writable(props.rawSchema.description);
     this._tableCount = writable(props.rawSchema.table_count);
     this.owner_oid = props.rawSchema.owner_oid;

From e3ce5c2a2ddab7273d50790b71b1b76731149f4a Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 17 Sep 2024 15:38:37 -0400
Subject: [PATCH 0906/1141] Propagate RPC changes to Link Table dialog

---
 mathesar_ui/src/api/rest/types/links.ts       | 27 ------
 mathesar_ui/src/api/rpc/data_modeling.ts      | 51 ++++++++++
 .../link-table/LinkTableForm.svelte           | 92 ++++++++++---------
 3 files changed, 99 insertions(+), 71 deletions(-)
 delete mode 100644 mathesar_ui/src/api/rest/types/links.ts

diff --git a/mathesar_ui/src/api/rest/types/links.ts b/mathesar_ui/src/api/rest/types/links.ts
deleted file mode 100644
index e985f534b6..0000000000
--- a/mathesar_ui/src/api/rest/types/links.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-interface Referent {
-  referent_table: number;
-  column_name: string;
-}
-
-interface OneToAny {
-  reference_table: number;
-  reference_column_name: string;
-  referent_table: number;
-}
-
-export interface OneToOne extends OneToAny {
-  link_type: 'one-to-one';
-}
-export interface OneToMany extends OneToAny {
-  link_type: 'one-to-many';
-}
-
-export interface ManyToMany {
-  link_type: 'many-to-many';
-  mapping_table_name: string;
-  referents: Referent[];
-}
-
-export type LinksPostRequest = OneToOne | OneToMany | ManyToMany;
-
-export type LinkType = LinksPostRequest['link_type'];
diff --git a/mathesar_ui/src/api/rpc/data_modeling.ts b/mathesar_ui/src/api/rpc/data_modeling.ts
index d7862003cd..428afaa490 100644
--- a/mathesar_ui/src/api/rpc/data_modeling.ts
+++ b/mathesar_ui/src/api/rpc/data_modeling.ts
@@ -1,5 +1,29 @@
 import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
 
+interface Referent {
+  referent_table: number;
+  column_name: string;
+}
+
+interface OneToAny {
+  reference_table: number;
+  reference_column_name: string;
+  referent_table: number;
+}
+
+export interface OneToOne extends OneToAny {
+  link_type: 'one-to-one';
+}
+export interface OneToMany extends OneToAny {
+  link_type: 'one-to-many';
+}
+
+export interface ManyToMany {
+  link_type: 'many-to-many';
+  mapping_table_name: string;
+  referents: Referent[];
+}
+
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const data_modeling = {
   /**
@@ -13,4 +37,31 @@ export const data_modeling = {
     },
     Record<string, string>
   >(),
+
+  add_foreign_key_column: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      /** The OID of the table getting the new column. */
+      referrer_table_oid: number;
+      /** The OID of the table being referenced. */
+      referent_table_oid: number;
+      /** The name of the column to create. */
+      column_name: string;
+    },
+    void
+  >(),
+
+  add_mapping_table: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      schema_oid: number;
+      /** The name for the new mapping table. */
+      table_name: string;
+      mapping_columns: {
+        column_name: string;
+        referent_table_oid: number;
+      }[];
+    },
+    void
+  >(),
 };
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index d288943939..525ccfb109 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -1,8 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { LinksPostRequest } from '@mathesar/api/rest/types/links';
-  import { postAPI } from '@mathesar/api/rest/utils/requestUtils';
+  import { api } from '@mathesar/api/rpc';
   import type { Table } from '@mathesar/api/rpc/tables';
   import {
     Field,
@@ -35,6 +34,7 @@
     getSuggestedFkColumnName,
   } from '@mathesar/utils/columnUtils';
   import { getAvailableName } from '@mathesar/utils/db';
+  import { getErrorMessage } from '@mathesar/utils/errors';
   import { makeSingular } from '@mathesar/utils/languageUtils';
   import {
     assertExhaustive,
@@ -159,44 +159,6 @@
   // Saving
   // ===========================================================================
 
-  function getRequestBody(
-    values: FilledFormValues<typeof form>,
-  ): LinksPostRequest {
-    if ($linkType === 'oneToMany') {
-      return {
-        link_type: 'one-to-many',
-        reference_table: values.targetTable.oid,
-        reference_column_name: $columnNameInTarget,
-        referent_table: base.oid,
-      };
-    }
-    if ($linkType === 'manyToOne') {
-      return {
-        link_type: 'one-to-many',
-        reference_table: base.oid,
-        reference_column_name: $columnNameInBase,
-        referent_table: values.targetTable.oid,
-      };
-    }
-    if ($linkType === 'manyToMany') {
-      return {
-        link_type: 'many-to-many',
-        mapping_table_name: $mappingTableName,
-        referents: [
-          {
-            referent_table: base.oid,
-            column_name: $columnNameMappingToBase,
-          },
-          {
-            referent_table: values.targetTable.oid,
-            column_name: $columnNameMappingToTarget,
-          },
-        ],
-      };
-    }
-    return assertExhaustive($linkType);
-  }
-
   async function reFetchOtherThingsThatChanged() {
     if ($linkType === 'manyToMany') {
       await refetchTablesForCurrentSchema();
@@ -212,10 +174,52 @@
   }
 
   async function handleSave(values: FilledFormValues<typeof form>) {
-    await postAPI('/api/db/v0/links/', getRequestBody(values));
-    toast.success('The link has been created successfully');
-    await reFetchOtherThingsThatChanged();
-    close();
+    try {
+      if ($linkType === 'oneToMany') {
+        await api.data_modeling
+          .add_foreign_key_column({
+            database_id: $currentDatabase.id,
+            referrer_table_oid: values.targetTable.oid,
+            referent_table_oid: base.oid,
+            column_name: $columnNameInTarget,
+          })
+          .run();
+      } else if ($linkType === 'manyToOne') {
+        await api.data_modeling
+          .add_foreign_key_column({
+            database_id: $currentDatabase.id,
+            referrer_table_oid: base.oid,
+            referent_table_oid: values.targetTable.oid,
+            column_name: $columnNameInBase,
+          })
+          .run();
+      } else if ($linkType === 'manyToMany') {
+        await api.data_modeling
+          .add_mapping_table({
+            database_id: $currentDatabase.id,
+            schema_oid: base.schema,
+            table_name: $mappingTableName,
+            mapping_columns: [
+              {
+                referent_table_oid: base.oid,
+                column_name: $columnNameMappingToBase,
+              },
+              {
+                referent_table_oid: values.targetTable.oid,
+                column_name: $columnNameMappingToTarget,
+              },
+            ],
+          })
+          .run();
+      } else {
+        assertExhaustive($linkType);
+      }
+      toast.success('The link has been created successfully');
+      await reFetchOtherThingsThatChanged();
+      close();
+    } catch (error) {
+      toast.error(getErrorMessage(error));
+    }
   }
 </script>
 

From 2fd2e326270aef0936a40dd8d7ab87f0d705e490 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Wed, 18 Sep 2024 10:11:54 +0200
Subject: [PATCH 0907/1141] Add string

---
 mathesar_ui/src/i18n/languages/en/dict.json               | 3 ++-
 mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 095a5316dd..b72ff5f312 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -319,7 +319,7 @@
   "many_to_many_link_base_help": "The column in [mappingTable] that will link to [baseTable].",
   "many_to_many_link_description": "Multiple [baseTable] and [targetTable] records can link to each other through a new [mappingTable]",
   "many_to_many_link_target_help": "The column in [mappingTable] that will link to [targetTable].",
-  "many_to_many_self_referential_link_description": "Multiple [baseTable] records can link to each other through a new [mapping]",
+  "many_to_many_self_referential_link_description": "Multiple [baseTable] records can link to each other through a new [mappingTable]",
   "many_to_one": "Many to One",
   "many_to_one_link_description": "Multiple [baseTable] records can link to the same [targetTable] record.",
   "mapping_table_description": "The table that will store the many-to-many relationship between records of {count, plural, one {this table} other {the two tables}}.",
@@ -493,6 +493,7 @@
   "schema_description": "Use schemas to organize related tables into logical groups within your database.",
   "schema_name_already_exists": "A schema with that name already exists.",
   "schema_name_cannot_be_empty": "Schema name cannot be empty",
+  "schema_name_placeholder": "Eg. Personal Finances, Movies",
   "schema_not_found": "Schema not found.",
   "schemas": "Schemas",
   "schemas_matching_search": "{count, plural, one {{count} schema matches [searchValue]} other {{count} schemas match [searchValue]}}",
diff --git a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
index bb9dc92459..224158bbd0 100644
--- a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
+++ b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
@@ -60,7 +60,7 @@
   getInitialName={() => schema?.name ?? ''}
   getInitialDescription={() => schema?.description ?? ''}
   saveButtonLabel={schema ? $_('save') : $_('create_new_schema')}
-  namePlaceholder="Eg. Personal Finances, Movies"
+  namePlaceholder={$_('schema_name_placeholder')}
 >
   <svelte:fragment slot="helpText">
     {#if !schema}

From 348a70d8540a029055a6d1c815ed613b54bc1d33 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Wed, 18 Sep 2024 10:46:05 +0200
Subject: [PATCH 0908/1141] add string

---
 mathesar_ui/src/i18n/languages/en/dict.json                     | 1 +
 .../systems/table-view/constraints/NewUniqueConstraint.svelte   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index b72ff5f312..aa855f462c 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -19,6 +19,7 @@
   "add_new_sort_condition": "Add new sort condition",
   "add_tables_to_new_schema": "You've created a new schema, now add tables to it.",
   "add_transformation_step": "Add transformation step",
+  "add_unique_constraint": "Add Unique Constraint",
   "add_user": "Add User",
   "admin": "Admin",
   "admin_access": "Admin Access",
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
index f8573d14aa..56a6020384 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewUniqueConstraint.svelte
@@ -176,7 +176,7 @@
   <CancelOrProceedButtonPair
     onProceed={handleSave}
     onCancel={handleCancel}
-    proceedButton={{ label: $_('Add Unique Constraint') }}
+    proceedButton={{ label: $_('add_unique_constraint') }}
     {canProceed}
     size="small"
   />

From 8ccb9b6a90e18a383a9a8f7808b6dde229ffa7f6 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Wed, 18 Sep 2024 10:52:17 +0200
Subject: [PATCH 0909/1141] revert create link changes

---
 .../link-table/LinkTableForm.svelte           | 105 ++++++++----------
 .../table-view/link-table/NewColumn.svelte    |  37 ++----
 2 files changed, 55 insertions(+), 87 deletions(-)

diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index 254b37a839..d288943939 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -219,13 +219,9 @@
   }
 </script>
 
-<div class="description">
-  {$_('link_table_description')}
-</div>
-
 <div class="form" class:self-referential={isSelfReferential}>
   <FieldLayout>
-    <InfoBox fullWidth={true}>
+    <InfoBox>
       {$_('links_info')}
     </InfoBox>
   </FieldLayout>
@@ -267,50 +263,49 @@
         {:else if $linkType === 'manyToOne'}
           <NewColumn {base} {target} field={columnNameInBase} />
         {:else if $linkType === 'manyToMany'}
-          <p>
-            <RichText
-              text={'We will create a new table [mappingTable].'}
-              let:slotName
-            >
-              {#if slotName === 'mappingTable'}
-                <Pill table={{ name: $mappingTableName }} which="mapping" />
-              {:else if slotName === 'targetTable'}
-                <Pill table={target} which="target" />
-              {:else if slotName === 'baseTable'}
-                <Pill table={base} which="base" />
-              {/if}
-            </RichText>
-          </p>
-          <Field field={mappingTableName} label={$_('Name of New Table')}>
-            <span slot="help">
-              {$_('mapping_table_description', {
-                values: {
-                  count: isSelfReferential ? 1 : 2,
-                },
-              })}
-            </span>
-          </Field>
-          {#if $mappingTableName}
-            <NewColumn
-              base={{ name: $mappingTableName }}
-              baseWhich="mapping"
-              target={base}
-              targetWhich="base"
-              field={columnNameMappingToBase}
-              label={$_('Name of New Column {number}', {
-                values: { number: 1 },
-              })}
-            />
-            <NewColumn
-              base={{ name: $mappingTableName }}
-              baseWhich="mapping"
-              target={isSelfReferential ? base : target}
-              targetWhich={isSelfReferential ? 'base' : 'target'}
-              field={columnNameMappingToTarget}
-              label={$_('Name of New Column {number}', {
-                values: { number: 2 },
-              })}
-            />
+          {#if isSelfReferential}
+            <p>{$_('we_will_create_a_new_table')}</p>
+            <Field field={mappingTableName} label={$_('table_name')} />
+            {#if $mappingTableName}
+              <p>
+                <RichText
+                  text={$_('we_will_add_two_columns_in_x_to_y')}
+                  let:slotName
+                >
+                  {#if slotName === 'mappingTable'}
+                    <Pill table={{ name: $mappingTableName }} which="mapping" />
+                  {:else if slotName === 'targetTable'}
+                    <Pill table={target} which="target" />
+                  {/if}
+                </RichText>
+              </p>
+              <Field
+                field={columnNameMappingToBase}
+                label={$_('column_number_name', { values: { number: 1 } })}
+              />
+              <Field
+                field={columnNameMappingToTarget}
+                label={$_('column_number_name', { values: { number: 2 } })}
+              />
+            {/if}
+          {:else}
+            <p>{$_('we_will_create_a_new_table')}</p>
+            <Field field={mappingTableName} label={$_('table_name')} />
+            {#if $mappingTableName}
+              <NewColumn
+                base={{ name: $mappingTableName }}
+                baseWhich="mapping"
+                target={base}
+                targetWhich="base"
+                field={columnNameMappingToBase}
+              />
+              <NewColumn
+                base={{ name: $mappingTableName }}
+                baseWhich="mapping"
+                {target}
+                field={columnNameMappingToTarget}
+              />
+            {/if}
           {/if}
         {:else}
           {assertExhaustive($linkType)}
@@ -345,16 +340,4 @@
     --target-fill: var(--base-fill);
     --target-stroke: var(--base-stroke);
   }
-  .description {
-    margin-bottom: 1rem;
-  }
-  :global(.form .outcome-box .labeled-input.layout-inline .label-content) {
-    align-items: flex-start;
-  }
-  :global(.form .outcome-box .label) {
-    width: 12rem;
-  }
-  :global(.form .outcome-box .label-content .input) {
-    flex-grow: 1;
-  }
 </style>
diff --git a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
index bc998d02bb..b503c8b8c5 100644
--- a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
@@ -9,7 +9,7 @@
 
   import Pill from './LinkTablePill.svelte';
 
-  export let label = 'Name of New Column';
+  const label = 'Column Name';
 
   type Which = ComponentProps<Pill>['which'];
 
@@ -21,20 +21,15 @@
   export let targetColumnsAreLoading = false;
 </script>
 
-{#if baseWhich !== 'mapping'}
-  <p>
-    <RichText text={$_('we_will_add_a_column_in_x_to_y')} let:slotName>
-      {#if slotName === 'baseTable'}
-        <Pill table={base} which={baseWhich} />
-      {:else if slotName === 'targetTable'}
-        <Pill table={target} which={targetWhich} />
-      {:else if slotName === 'mappingTable'}
-        <Pill table={base} which={baseWhich} />
-      {/if}
-    </RichText>
-  </p>
-{/if}
-
+<p>
+  <RichText text={$_('we_will_add_a_column_in_x_to_y')} let:slotName>
+    {#if slotName === 'baseTable'}
+      <Pill table={base} which={baseWhich} />
+    {:else if slotName === 'targetTable'}
+      <Pill table={target} which={targetWhich} />
+    {/if}
+  </RichText>
+</p>
 {#if targetColumnsAreLoading}
   <!--
     We need to wait for the columns to load because we can't suggest a valid
@@ -43,15 +38,5 @@
   {label}
   <Spinner />
 {:else}
-  <Field {field} {label}>
-    <span slot="help">
-      <RichText text={$_('new_column_link_help')} let:slotName>
-        {#if slotName === 'baseTable'}
-          <Pill table={base} which={baseWhich} />
-        {:else if slotName === 'targetTable'}
-          <Pill table={target} which={targetWhich} />
-        {/if}
-      </RichText>
-    </span>
-  </Field>
+  <Field {field} {label} />
 {/if}

From 8c6525a6d962269c4d3127265e70f76f5ac0252f Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 18 Sep 2024 16:30:50 +0530
Subject: [PATCH 0910/1141] fix response for split_table

---
 db/tables/operations/split.py |  8 ++++++--
 docs/docs/api/rpc.md          |  1 +
 mathesar/rpc/data_modeling.py | 20 ++++++++++++++++++--
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/db/tables/operations/split.py b/db/tables/operations/split.py
index aa2869073b..e3a710d8bb 100644
--- a/db/tables/operations/split.py
+++ b/db/tables/operations/split.py
@@ -23,11 +23,15 @@ def split_table(
     extracted_table_name,
     relationship_fk_column_name=None
 ):
-    exec_msar_func(
+    extracted_table_oid, new_fkey_attnum = exec_msar_func(
         conn,
         'extract_columns_from_table',
         old_table_oid,
         extracted_column_attnums,
         extracted_table_name,
         relationship_fk_column_name
-    )
+    ).fetchone()[0]
+    return {
+        'extracted_table_oid': extracted_table_oid,
+        'new_fkey_attnum': new_fkey_attnum
+    }
diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 32e8a09dc6..1233f53443 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -285,6 +285,7 @@ To use an RPC function:
       - split_table
       - move_columns
       - MappingColumn
+      - SplitTableInfo
 
 ## Responses
 
diff --git a/mathesar/rpc/data_modeling.py b/mathesar/rpc/data_modeling.py
index f1482237d9..62f9a08eb1 100644
--- a/mathesar/rpc/data_modeling.py
+++ b/mathesar/rpc/data_modeling.py
@@ -106,6 +106,19 @@ def suggest_types(*, table_oid: int, database_id: int, **kwargs) -> dict:
         return infer_types.infer_table_column_data_types(conn, table_oid)
 
 
+class SplitTableInfo(TypedDict):
+    """
+    Information about a table, created from column extraction.
+
+    Attributes:
+        extracted_table_oid: The OID of the table that is created from column extraction.
+        new_fkey_attnum: The attnum of the newly created foreign key column
+          referring the extracted_table on the original table.
+    """
+    extracted_table_oid: int
+    new_fkey_attnum: int
+
+
 @rpc_method(name="data_modeling.split_table")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
@@ -117,7 +130,7 @@ def split_table(
     database_id: int,
     relationship_fk_column_name: str = None,
     **kwargs
-) -> None:
+) -> SplitTableInfo:
     """
     Extract columns from a table to create a new table, linked by a foreign key.
 
@@ -127,10 +140,13 @@ def split_table(
         extracted_table_name: The name of the new table to be made from the extracted columns.
         database_id: The Django id of the database containing the table.
         relationship_fk_column_name: The name to give the new foreign key column in the remainder table (optional)
+
+    Returns:
+        The SplitTableInfo object describing the details for the created table as a result of column extraction.
     """
     user = kwargs.get(REQUEST_KEY).user
     with connect(database_id, user) as conn:
-        split.split_table(
+        return split.split_table(
             conn,
             table_oid,
             column_attnums,

From 709d1398c119937d13c6e2218c81eda17d77228d Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 18 Sep 2024 16:36:34 +0530
Subject: [PATCH 0911/1141] fix docstring indentation

---
 mathesar/rpc/data_modeling.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/rpc/data_modeling.py b/mathesar/rpc/data_modeling.py
index 62f9a08eb1..82dd3d56ca 100644
--- a/mathesar/rpc/data_modeling.py
+++ b/mathesar/rpc/data_modeling.py
@@ -113,7 +113,7 @@ class SplitTableInfo(TypedDict):
     Attributes:
         extracted_table_oid: The OID of the table that is created from column extraction.
         new_fkey_attnum: The attnum of the newly created foreign key column
-          referring the extracted_table on the original table.
+                         referring the extracted_table on the original table.
     """
     extracted_table_oid: int
     new_fkey_attnum: int

From 5a613e468ec0c41bdc6fb6a0153d152eb3c119b4 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 18 Sep 2024 16:55:27 +0530
Subject: [PATCH 0912/1141] Update RawTable interface, and fetch table to
 update in store instead of inferring

---
 mathesar_ui/src/api/rpc/tables.ts |  40 +++++++++
 mathesar_ui/src/models/Schema.ts  |   2 +-
 mathesar_ui/src/models/Table.ts   |  39 ++++-----
 mathesar_ui/src/stores/tables.ts  | 132 +++++++++++++-----------------
 mathesar_ui/src/utils/tables.ts   |  21 -----
 5 files changed, 110 insertions(+), 124 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/tables.ts b/mathesar_ui/src/api/rpc/tables.ts
index 6085b1e648..f90586b9f8 100644
--- a/mathesar_ui/src/api/rpc/tables.ts
+++ b/mathesar_ui/src/api/rpc/tables.ts
@@ -2,6 +2,19 @@ import type { RecursivePartial } from '@mathesar/component-library';
 import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
 
 import type { ColumnTypeOptions } from './columns';
+import type { RawDatabase } from './databases';
+import type { RawRole } from './roles';
+
+export const allTablePrivileges = [
+  'SELECT',
+  'INSERT',
+  'UPDATE',
+  'DELETE',
+  'TRUNCATE',
+  'REFERENCES',
+  'TRIGGER',
+] as const;
+export type TablePrivilege = (typeof allTablePrivileges)[number];
 
 export interface RawTable {
   oid: number;
@@ -9,6 +22,14 @@ export interface RawTable {
   /** The OID of the schema containing the table */
   schema: number;
   description: string | null;
+  owner_oid: RawRole['oid'];
+  current_role_priv: TablePrivilege[];
+  current_role_owns: boolean;
+}
+
+export interface RawTablePrivilegesForRole {
+  role_oid: RawRole['oid'];
+  direct: TablePrivilege[];
 }
 
 interface TableMetadata {
@@ -205,4 +226,23 @@ export const tables = {
       void
     >(),
   },
+
+  privileges: {
+    list_direct: rpcMethodTypeContainer<
+      {
+        database_id: RawDatabase['id'];
+        table_oid: RawTable['oid'];
+      },
+      Array<RawTablePrivilegesForRole>
+    >(),
+
+    replace_for_roles: rpcMethodTypeContainer<
+      {
+        database_id: RawDatabase['id'];
+        table_oid: RawTable['oid'];
+        privileges: Array<RawTablePrivilegesForRole>;
+      },
+      Array<RawTablePrivilegesForRole>
+    >(),
+  },
 };
diff --git a/mathesar_ui/src/models/Schema.ts b/mathesar_ui/src/models/Schema.ts
index ec9119102b..88c88cfd50 100644
--- a/mathesar_ui/src/models/Schema.ts
+++ b/mathesar_ui/src/models/Schema.ts
@@ -76,7 +76,7 @@ export class Schema {
     );
   }
 
-  updateTableCount(count: number) {
+  setTableCount(count: number) {
     this._tableCount.set(count);
   }
 
diff --git a/mathesar_ui/src/models/Table.ts b/mathesar_ui/src/models/Table.ts
index f20ab4c9a1..8be78e79c9 100644
--- a/mathesar_ui/src/models/Table.ts
+++ b/mathesar_ui/src/models/Table.ts
@@ -1,7 +1,9 @@
-import type { RawTableWithMetadata } from '@mathesar/api/rpc/tables';
-import { mergeTableMetadata } from '@mathesar/utils/tables';
-import type { RecursivePartial } from '@mathesar-component-library';
+import type {
+  RawTableWithMetadata,
+  TablePrivilege,
+} from '@mathesar/api/rpc/tables';
 
+import type { Role } from './Role';
 import type { Schema } from './Schema';
 
 export class Table {
@@ -15,6 +17,12 @@ export class Table {
 
   schema;
 
+  owner_oid: Role['oid'];
+
+  current_role_priv: TablePrivilege[];
+
+  current_role_owns: boolean;
+
   constructor(props: {
     schema: Schema;
     rawTableWithMetadata: RawTableWithMetadata;
@@ -23,28 +31,9 @@ export class Table {
     this.name = props.rawTableWithMetadata.name;
     this.description = props.rawTableWithMetadata.description;
     this.metadata = props.rawTableWithMetadata.metadata;
+    this.owner_oid = props.rawTableWithMetadata.owner_oid;
+    this.current_role_priv = props.rawTableWithMetadata.current_role_priv;
+    this.current_role_owns = props.rawTableWithMetadata.current_role_owns;
     this.schema = props.schema;
   }
-
-  // TODO_BETA: Replace this with an update method that updates
-  // the same table object
-  // @deprecated
-  withProperties(
-    _rawTableWithMetadata: RecursivePartial<RawTableWithMetadata>,
-  ) {
-    return new Table({
-      schema: this.schema,
-      rawTableWithMetadata: {
-        oid: this.oid,
-        name: this.name,
-        description: this.description,
-        schema: this.schema.oid,
-        ..._rawTableWithMetadata,
-        metadata: mergeTableMetadata(
-          this.metadata,
-          _rawTableWithMetadata.metadata,
-        ),
-      },
-    });
-  }
 }
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index 7a9df7dc91..006194430f 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -206,7 +206,7 @@ export function deleteTable(
   return new CancellablePromise(
     (resolve, reject) => {
       void promise.then(() => {
-        schema.updateTableCount(get(schema.tableCount) - 1);
+        schema.setTableCount(get(schema.tableCount) - 1);
         tablesStores
           .get([schema.database.id, schema.oid])
           ?.update((tableStoreData) => {
@@ -225,10 +225,31 @@ export function deleteTable(
   );
 }
 
-/**
- * @throws Error if the table store is not found or if the table is not found in
- * the store.
- */
+function updateTableStoreIfPresent({
+  schema,
+  rawTableWithMetadata,
+}: {
+  schema: Schema;
+  rawTableWithMetadata: RawTableWithMetadata;
+}): Table {
+  const fullTable: Table = new Table({
+    schema,
+    rawTableWithMetadata,
+  });
+  const tablesStore = tablesStores.get([schema.database.id, schema.oid]);
+  if (tablesStore) {
+    tablesStore.update((tablesData) => {
+      const tables = sortTables([...tablesData.tablesMap.values(), fullTable]);
+      return {
+        ...tablesData,
+        tablesMap: new Map(tables.map((t) => [t.oid, t])),
+      };
+    });
+    schema.setTableCount(get(tablesStore).tablesMap.size);
+  }
+  return fullTable;
+}
+
 export async function updateTable({
   schema,
   table: rawPartialTable,
@@ -284,75 +305,38 @@ export async function updateTable({
   }
   await batchSend(requests);
 
-  let newTable: Table | undefined;
-  const tablesStore = tablesStores.get([schema.database.id, schema.oid]);
-  if (!tablesStore) throw new Error('Table store not found');
-  tablesStore.update((tablesData) => {
-    const oldTable = tablesData.tablesMap.get(rawPartialTable.oid);
-    if (!oldTable) throw new Error('Table not found within store.');
-    newTable = oldTable.withProperties(rawPartialTable);
-    tablesData.tablesMap.set(rawPartialTable.oid, newTable);
-    const tablesMap: TablesMap = new Map();
-    sortTables([...tablesData.tablesMap.values()]).forEach((t) => {
-      tablesMap.set(t.oid, t);
-    });
-    return { ...tablesData, tablesMap };
-  });
-  if (!newTable) throw new Error('Table not updated.');
-  return newTable;
-}
-
-function addTableToStore({
-  schema,
-  rawTable,
-}: {
-  schema: Schema;
-  rawTable: Partial<RawTableWithMetadata> &
-    Pick<RawTableWithMetadata, 'oid' | 'name'>;
-}): Table {
-  schema.updateTableCount(get(schema.tableCount) + 1);
-  const fullTable: Table = new Table({
-    schema,
-    rawTableWithMetadata: {
-      description: null,
-      metadata: null,
-      schema: schema.oid,
-      ...rawTable,
-    },
-  });
-  const tablesStore = tablesStores.get([schema.database.id, schema.oid]);
-  tablesStore?.update((tablesData) => {
-    const tables = sortTables([...tablesData.tablesMap.values(), fullTable]);
-    return {
-      ...tablesData,
-      tablesMap: new Map(tables.map((t) => [t.oid, t])),
-    };
-  });
-  return fullTable;
+  // TODO: Remove once tables.patch_with_metadata response provides RawTableWithMetadata
+  const rawTableWithMetadata = await api.tables
+    .get_with_metadata({
+      database_id: schema.database.id,
+      table_oid: rawPartialTable.oid,
+    })
+    .run();
+  return updateTableStoreIfPresent({ schema, rawTableWithMetadata });
 }
 
-export function createTable({
+export async function createTable({
   schema,
 }: {
   schema: Schema;
-}): CancellablePromise<Table> {
-  const promise = api.tables
+}): Promise<Table> {
+  const created = await api.tables
     .add({
       database_id: schema.database.id,
       schema_oid: schema.oid,
     })
     .run();
-  return new CancellablePromise(
-    (resolve, reject) => {
-      void promise.then(
-        (rawTable) => resolve(addTableToStore({ schema, rawTable })),
-        reject,
-      );
-    },
-    () => {
-      promise.cancel();
-    },
-  );
+
+  // TODO: Remove once tables.patch response provides RawTable
+  const rawTableWithMetadata = await api.tables
+    .get_with_metadata({
+      database_id: schema.database.id,
+      table_oid: created.oid,
+    })
+    .run();
+
+  schema.setTableCount(get(schema.tableCount) + 1);
+  return updateTableStoreIfPresent({ schema, rawTableWithMetadata });
 }
 
 export async function createTableFromDataFile(props: {
@@ -360,28 +344,22 @@ export async function createTableFromDataFile(props: {
   dataFile: Pick<DataFile, 'id'>;
   name?: string;
 }): Promise<Table> {
+  const { schema } = props;
+
   const created = await api.tables
     .import({
-      database_id: props.schema.database.id,
-      schema_oid: props.schema.oid,
+      database_id: schema.database.id,
+      schema_oid: schema.oid,
       table_name: props.name,
       data_file_id: props.dataFile.id,
     })
     .run();
 
-  const basicTable = addTableToStore({
-    schema: props.schema,
-    rawTable: {
-      oid: created.oid,
-      name: created.name,
-      schema: props.schema.oid,
-    },
-  });
-
+  schema.setTableCount(get(schema.tableCount) + 1);
   const fullTable = await updateTable({
-    schema: props.schema,
+    schema,
     table: {
-      oid: basicTable.oid,
+      oid: created.oid,
       metadata: {
         import_verified: false,
         data_file_id: props.dataFile.id,
diff --git a/mathesar_ui/src/utils/tables.ts b/mathesar_ui/src/utils/tables.ts
index 39877f442e..c7e7245927 100644
--- a/mathesar_ui/src/utils/tables.ts
+++ b/mathesar_ui/src/utils/tables.ts
@@ -1,6 +1,5 @@
 import { filter } from 'iter-tools';
 
-import type { RecursivePartial } from '@mathesar/component-library';
 import type { Table } from '@mathesar/models/Table';
 import {
   getImportPreviewPageUrl,
@@ -8,26 +7,6 @@ import {
 } from '@mathesar/routes/urls';
 import type { ProcessedColumn } from '@mathesar/stores/table-data';
 
-/** If the same value exists for `a` and `b`, the value from `b` will be used */
-export function mergeTableMetadata(
-  a: Table['metadata'],
-  b?: RecursivePartial<Table['metadata']>,
-): Table['metadata'] {
-  if (!a && !b) return null;
-  if (!b) return a;
-  return {
-    column_order: b.column_order
-      ? b.column_order.map(Number)
-      : a?.column_order ?? null,
-    data_file_id: b.data_file_id ?? a?.data_file_id ?? null,
-    import_verified: b.import_verified ?? a?.import_verified ?? null,
-    record_summary_customized:
-      b.record_summary_customized ?? a?.record_summary_customized ?? null,
-    record_summary_template:
-      b.record_summary_template ?? a?.record_summary_template ?? null,
-  };
-}
-
 interface TableWithImportVerification {
   metadata?: {
     import_verified: boolean | null;

From 5eac703539800258cb85c1e5c628f8b39e90119a Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Wed, 18 Sep 2024 13:36:00 +0200
Subject: [PATCH 0913/1141] fix create link modal and outcome box display

---
 .../src/component-library/button/Button.scss  |   9 ++
 .../src/component-library/commonTypes.ts      |   1 +
 .../message-boxes/MessageBox.svelte           |  10 +-
 .../message-boxes/OutcomeBox.svelte           |   5 +-
 mathesar_ui/src/i18n/languages/en/dict.json   |  17 +-
 .../link-table/LinkTableForm.svelte           | 148 ++++++++++++------
 .../table-view/link-table/NewColumn.svelte    |  49 +++---
 7 files changed, 149 insertions(+), 90 deletions(-)

diff --git a/mathesar_ui/src/component-library/button/Button.scss b/mathesar_ui/src/component-library/button/Button.scss
index f863e9b5c4..0b7bc6a4a3 100644
--- a/mathesar_ui/src/component-library/button/Button.scss
+++ b/mathesar_ui/src/component-library/button/Button.scss
@@ -191,6 +191,15 @@
     opacity: 0.5;
     cursor: not-allowed;
   }
+
+  &.btn-outcome {
+    background-color: var(--purple-100);
+    border: 1px solid var(--purple-200);
+
+    &:hover {
+      border: 1px solid var(--purple-300);
+    }
+  }
 }
 a.btn {
   text-decoration: none;
diff --git a/mathesar_ui/src/component-library/commonTypes.ts b/mathesar_ui/src/component-library/commonTypes.ts
index 7e7321f36d..37bbc96493 100644
--- a/mathesar_ui/src/component-library/commonTypes.ts
+++ b/mathesar_ui/src/component-library/commonTypes.ts
@@ -5,6 +5,7 @@ export type Appearance =
   | 'plain'
   | 'ghost'
   | 'plain-primary'
+  | 'outcome'
   | 'outline-primary';
 
 export type Size = 'small' | 'medium' | 'large';
diff --git a/mathesar_ui/src/components/message-boxes/MessageBox.svelte b/mathesar_ui/src/components/message-boxes/MessageBox.svelte
index 4cab9e64e2..0ee9023a31 100644
--- a/mathesar_ui/src/components/message-boxes/MessageBox.svelte
+++ b/mathesar_ui/src/components/message-boxes/MessageBox.svelte
@@ -4,8 +4,8 @@
 
   export let icon: IconProps | undefined = undefined;
   export let style: string | undefined = undefined;
-  /** When true, the box will take the full width of its parent */
   export let fullWidth = false;
+  export let title: string | undefined = undefined;
 </script>
 
 <div
@@ -20,6 +20,9 @@
     </span>
   {/if}
   <div class="content trim-child-margins">
+    {#if title}
+      <h3 class="title">{title}</h3>
+    {/if}
     <slot />
   </div>
 </div>
@@ -45,4 +48,9 @@
     top: 0.7em;
     color: var(--MessageBox__icon-color, currentcolor);
   }
+  .title {
+    font-size: var(--size-large);
+    font-weight: var(--font-weight-medium);
+    margin-bottom: var(--size-ultra-small);
+  }
 </style>
diff --git a/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte b/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte
index 0d9e9c03df..fdfea4ae6d 100644
--- a/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte
+++ b/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte
@@ -8,10 +8,13 @@
   type $$Props = ComponentProps<MessageBox>;
 
   export let fullWidth = true;
+  export let title = "What's Changing";
 </script>
 
 <div class="outcome-box">
-  <MessageBox icon={iconOutcome} {fullWidth}><slot /></MessageBox>
+  <MessageBox icon={iconOutcome} {fullWidth} {title}>
+    <slot />
+  </MessageBox>
 </div>
 
 <style>
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index bd4a03c2d7..34456d4257 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -88,8 +88,8 @@
   "column_will_not_allow_null": "Column {columnName} will no longer allow NULL",
   "columns": "Columns",
   "columns_moved_to_table": "Columns {columnNames} have been moved to table {tableName}",
-  "columns_removed_from_table_added_to_new_table": "{count, plural, one {The selected column will be moved from [tableName] to the new table} other {The selected columns will be moved from [tableName] to the new table}}.",
-  "columns_removed_from_table_added_to_target": "{count, plural, one {The selected column will be moved from [tableName] to [targetTableName]} other {The selected columns will be moved from [tableName] to [targetTableName]}}.",
+  "columns_removed_from_table_added_to_new_table": "{count, plural, one {The column above will be removed from [tableName] and added to the new table} other {The columns above will be removed from [tableName] and added to the new table}}",
+  "columns_removed_from_table_added_to_target": "{count, plural, one {The column above will be removed from [tableName] and added to [targetTableName]} other {The columns above will be removed from [tableName] and added to [targetTableName]}}",
   "columns_to_extract": "Columns to Extract",
   "columns_to_move": "Columns to Move",
   "columns_unique_values_help": "The columns in this table that should contain unique values.",
@@ -330,13 +330,10 @@
   "manager_access": "Manager Access",
   "manually": "Manually",
   "many_to_many": "Many to Many",
-  "many_to_many_link_base_help": "The column in [mappingTable] that will link to [baseTable].",
   "many_to_many_link_description": "Multiple [baseTable] and [targetTable] records can link to each other through a new [mappingTable]",
-  "many_to_many_link_target_help": "The column in [mappingTable] that will link to [targetTable].",
-  "many_to_many_self_referential_link_description": "Multiple [baseTable] records can link to each other through a new [mappingTable]",
+  "many_to_many_self_referential_link_description": "Multiple [baseTable] records can link to each other through a new [mapping]",
   "many_to_one": "Many to One",
   "many_to_one_link_description": "Multiple [baseTable] records can link to the same [targetTable] record.",
-  "mapping_table_description": "The table that will store the many-to-many relationship between records of {count, plural, one {this table} other {the two tables}}.",
   "mathesar": "Mathesar",
   "mathesar_user": "Mathesar User",
   "max_time_unit": "Max Time Unit",
@@ -352,14 +349,14 @@
   "multiple_records_selected": "{count, plural, one {{count} record selected} other {{count} records selected}}",
   "name": "Name",
   "name_of_link_column": "Name of Link Column",
+  "name_of_new_column": "Name of New Column",
   "name_of_new_table": "Name of New Table",
   "name_your_schema_help": "Name your schema to reflect its purpose. For example, your personal financial schema may be called \"Personal Finances\" and your movie collection \"Movies.\" Add a description to your schema to remember what it's for.",
   "navigate_to_record": "Navigate to a record",
   "navigate_to_table_record": "Navigate to a {tableName} record",
   "needs_import_confirmation": "Needs Import Confirmation",
   "new_column": "New Column",
-  "new_column_added_to_table": "The new column that will be added to [tableName].",
-  "new_column_link_help": "The column in [baseTable] that will link to the [targetTable] table.",
+  "new_column_added_to_table": "A new column will be added to [tableName]",
   "new_foreign_key_constraint": "New Foreign Key Constraint",
   "new_link_wont_work_once_regenerated": "Once you regenerate a new link, the old link will no longer work.",
   "new_password": "New Password",
@@ -653,9 +650,9 @@
   "via_column_component": "via [columnComponent]",
   "viewer": "Viewer",
   "we_can_install_new_version": "We can install this new version for you",
-  "we_will_add_a_column_in_x_to_y": "We'll add a column in [baseTable].",
+  "we_will_add_a_column_in_x_to_y": "We'll add a column in [baseTable] which links to [targetTable].",
   "we_will_add_two_columns_in_x_to_y": "We'll add two columns in [mappingTable] each linking to [targetTable].",
-  "we_will_create_a_new_table": "We'll create a new table.",
+  "we_will_create_a_new_table": "We'll create a new table  [mappingTable].",
   "welcome_to_mathesar_user": "Welcome to Mathesar, {user}!",
   "what_is_a_table": "Tables store your data. It's good to have one table per entity. An entity is a thing you wish to keep data about. For example, in your personal financial schema, you may have a table for your bank accounts and another for your transactions. You can have as many tables as you wish.",
   "what_is_an_exploration": "Explorations let you query your data to uncover trends and insights. They may be stored and run anytime to see the latest data. Explorations make great reports. You might, for example, create an exploration that shows your monthly spending.",
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index 254b37a839..4bbd139d60 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -41,6 +41,7 @@
     ensureReadable,
     portalToWindowFooter,
   } from '@mathesar-component-library';
+  import Collapsible from '@mathesar-component-library-dir/collapsible/Collapsible.svelte';
 
   import Pill from './LinkTablePill.svelte';
   import {
@@ -217,6 +218,9 @@
     await reFetchOtherThingsThatChanged();
     close();
   }
+
+  let isNewTableOpen = false;
+  let isNewColumnsOpen = false;
 </script>
 
 <div class="description">
@@ -225,7 +229,7 @@
 
 <div class="form" class:self-referential={isSelfReferential}>
   <FieldLayout>
-    <InfoBox fullWidth={true}>
+    <InfoBox>
       {$_('links_info')}
     </InfoBox>
   </FieldLayout>
@@ -267,50 +271,87 @@
         {:else if $linkType === 'manyToOne'}
           <NewColumn {base} {target} field={columnNameInBase} />
         {:else if $linkType === 'manyToMany'}
-          <p>
-            <RichText
-              text={'We will create a new table [mappingTable].'}
-              let:slotName
+          {#if isSelfReferential}
+            <Collapsible
+              bind:isOpen={isNewTableOpen}
+              triggerAppearance="outcome"
+            >
+              <svelte:fragment slot="header">
+                <RichText text={$_('we_will_create_a_new_table')} let:slotName>
+                  {#if slotName === 'mappingTable'}
+                    <Pill table={{ name: $mappingTableName }} which="mapping" />
+                  {/if}
+                </RichText>
+              </svelte:fragment>
+              <svelte:fragment slot="content">
+                <Field field={mappingTableName} label={$_('table_name')} />
+              </svelte:fragment>
+            </Collapsible>
+            {#if $mappingTableName}
+              <Collapsible
+                bind:isOpen={isNewColumnsOpen}
+                triggerAppearance="outcome"
+              >
+                <svelte:fragment slot="header">
+                  <RichText
+                    text={$_('we_will_add_two_columns_in_x_to_y')}
+                    let:slotName
+                  >
+                    {#if slotName === 'mappingTable'}
+                      <Pill
+                        table={{ name: $mappingTableName }}
+                        which="mapping"
+                      />
+                    {:else if slotName === 'targetTable'}
+                      <Pill table={target} which="target" />
+                    {/if}
+                  </RichText>
+                </svelte:fragment>
+
+                <svelte:fragment slot="content">
+                  <Field
+                    field={columnNameMappingToBase}
+                    label={$_('column_number_name', { values: { number: 1 } })}
+                  />
+                  <Field
+                    field={columnNameMappingToTarget}
+                    label={$_('column_number_name', { values: { number: 2 } })}
+                  />
+                </svelte:fragment>
+              </Collapsible>
+            {/if}
+          {:else}
+            <Collapsible
+              bind:isOpen={isNewTableOpen}
+              triggerAppearance="outcome"
             >
-              {#if slotName === 'mappingTable'}
-                <Pill table={{ name: $mappingTableName }} which="mapping" />
-              {:else if slotName === 'targetTable'}
-                <Pill table={target} which="target" />
-              {:else if slotName === 'baseTable'}
-                <Pill table={base} which="base" />
-              {/if}
-            </RichText>
-          </p>
-          <Field field={mappingTableName} label={$_('Name of New Table')}>
-            <span slot="help">
-              {$_('mapping_table_description', {
-                values: {
-                  count: isSelfReferential ? 1 : 2,
-                },
-              })}
-            </span>
-          </Field>
-          {#if $mappingTableName}
-            <NewColumn
-              base={{ name: $mappingTableName }}
-              baseWhich="mapping"
-              target={base}
-              targetWhich="base"
-              field={columnNameMappingToBase}
-              label={$_('Name of New Column {number}', {
-                values: { number: 1 },
-              })}
-            />
-            <NewColumn
-              base={{ name: $mappingTableName }}
-              baseWhich="mapping"
-              target={isSelfReferential ? base : target}
-              targetWhich={isSelfReferential ? 'base' : 'target'}
-              field={columnNameMappingToTarget}
-              label={$_('Name of New Column {number}', {
-                values: { number: 2 },
-              })}
-            />
+              <svelte:fragment slot="header">
+                <RichText text={$_('we_will_create_a_new_table')} let:slotName>
+                  {#if slotName === 'mappingTable'}
+                    <Pill table={{ name: $mappingTableName }} which="mapping" />
+                  {/if}
+                </RichText>
+              </svelte:fragment>
+
+              <svelte:fragment slot="content">
+                <Field field={mappingTableName} label={$_('table_name')} />
+              </svelte:fragment>
+            </Collapsible>
+            {#if $mappingTableName}
+              <NewColumn
+                base={{ name: $mappingTableName }}
+                baseWhich="mapping"
+                target={base}
+                targetWhich="base"
+                field={columnNameMappingToBase}
+              />
+              <NewColumn
+                base={{ name: $mappingTableName }}
+                baseWhich="mapping"
+                {target}
+                field={columnNameMappingToTarget}
+              />
+            {/if}
           {/if}
         {:else}
           {assertExhaustive($linkType)}
@@ -348,13 +389,20 @@
   .description {
     margin-bottom: 1rem;
   }
-  :global(.form .outcome-box .labeled-input.layout-inline .label-content) {
-    align-items: flex-start;
+  :global(
+      .form
+        .collapsible
+        .collapsible-header
+        .collapsible-header-btn
+        .collapsible-header-title
+    ) {
+    font-weight: var(--font-weight-medium);
   }
-  :global(.form .outcome-box .label) {
-    width: 12rem;
+  :global(.form .collapsible-content) {
+    padding: var(--size-xx-small);
+    margin-top: 0.25em;
   }
-  :global(.form .outcome-box .label-content .input) {
-    flex-grow: 1;
+  :global(.form .collapsible:not(:last-child)) {
+    margin-bottom: var(--size-xx-small);
   }
 </style>
diff --git a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
index bc998d02bb..87f71da7f8 100644
--- a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
@@ -6,10 +6,11 @@
   import { Field, type FieldStore } from '@mathesar/components/form';
   import { RichText } from '@mathesar/components/rich-text';
   import { Spinner } from '@mathesar-component-library';
+  import Collapsible from '@mathesar-component-library-dir/collapsible/Collapsible.svelte';
 
   import Pill from './LinkTablePill.svelte';
 
-  export let label = 'Name of New Column';
+  $: label = $_('name_of_new_column');
 
   type Which = ComponentProps<Pill>['which'];
 
@@ -19,39 +20,31 @@
   export let targetWhich: Which = 'target';
   export let field: FieldStore;
   export let targetColumnsAreLoading = false;
+
+  let isOpen = false;
 </script>
 
-{#if baseWhich !== 'mapping'}
-  <p>
+<Collapsible bind:isOpen triggerAppearance="outcome">
+  <svelte:fragment slot="header">
     <RichText text={$_('we_will_add_a_column_in_x_to_y')} let:slotName>
       {#if slotName === 'baseTable'}
         <Pill table={base} which={baseWhich} />
       {:else if slotName === 'targetTable'}
         <Pill table={target} which={targetWhich} />
-      {:else if slotName === 'mappingTable'}
-        <Pill table={base} which={baseWhich} />
       {/if}
     </RichText>
-  </p>
-{/if}
-
-{#if targetColumnsAreLoading}
-  <!--
-    We need to wait for the columns to load because we can't suggest a valid
-    column name until we know the existing columns in the table.
-  -->
-  {label}
-  <Spinner />
-{:else}
-  <Field {field} {label}>
-    <span slot="help">
-      <RichText text={$_('new_column_link_help')} let:slotName>
-        {#if slotName === 'baseTable'}
-          <Pill table={base} which={baseWhich} />
-        {:else if slotName === 'targetTable'}
-          <Pill table={target} which={targetWhich} />
-        {/if}
-      </RichText>
-    </span>
-  </Field>
-{/if}
+  </svelte:fragment>
+
+  <svelte:fragment slot="content">
+    {#if targetColumnsAreLoading}
+      <!--
+        We need to wait for the columns to load because we can't suggest a valid
+        column name until we know the existing columns in the table.
+      -->
+      {label}
+      <Spinner />
+    {:else}
+      <Field {field} {label} />
+    {/if}
+  </svelte:fragment>
+</Collapsible>

From c74151d38d9de7fef843c1c21e55b1a2d9166561 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Wed, 18 Sep 2024 13:36:09 +0200
Subject: [PATCH 0914/1141] revert extract changes

---
 .../ExtractColumnsModal.svelte                | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
index 4c97cb30b5..b522b7ec87 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
@@ -269,6 +269,7 @@
       field={linkedTable}
       input={{ component: SelectLinkedTable, props: { linkedTables } }}
       label={$_('linked_table')}
+      layout="stacked"
     />
   {/if}
 
@@ -317,19 +318,14 @@
         </RichText>
       </p>
       {#if $targetType === 'newTable'}
-        <Field
-          field={newFkColumnName}
-          label={$_('name_of_link_column')}
-          layout="stacked"
-        >
-          <span slot="help">
-            <RichText text={$_('new_column_added_to_table')} let:slotName>
-              {#if slotName === 'tableName'}
-                <TableName table={currentTable} truncate={false} bold />
-              {/if}
-            </RichText>
-          </span>
-        </Field>
+        <p>
+          <RichText text={$_('new_column_added_to_table')} let:slotName>
+            {#if slotName === 'tableName'}
+              <TableName table={currentTable} truncate={false} bold />
+            {/if}
+          </RichText>
+        </p>
+        <Field field={newFkColumnName} label={$_('column_name')} />
       {/if}
     </OutcomeBox>
   </FieldLayout>

From 037ef9a6ab94ddbbf0a5e802308cc995c6395136 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 18 Sep 2024 17:11:27 +0530
Subject: [PATCH 0915/1141] use {} instead of NULL in record summaries for fk
 records with null values

---
 db/sql/00_msar.sql | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 63e905cd8c..32dfbb7695 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -4592,7 +4592,7 @@ SELECT 'jsonb_build_object(' || string_agg(
   format(
     $j$
     %1$L, jsonb_object_agg(
-      summary_cte_%1$s.fkey, summary_cte_%1$s.summary
+      summary_cte_%1$s.fkey, COALESCE(summary_cte_%1$s.summary, '{}'::jsonb)
     ) FILTER (WHERE summary_cte_%1$s.fkey IS NOT NULL)
     $j$,
     conkey
@@ -4606,7 +4606,11 @@ CREATE OR REPLACE FUNCTION
 msar.build_self_summary_json_expr(tab_id oid) RETURNS TEXT AS $$/*
 */
 SELECT CASE WHEN quote_ident(msar.get_selectable_pkey_attnum(tab_id)::text) IS NOT NULL THEN
-  'jsonb_object_agg(summary_cte_self.key, summary_cte_self.summary) FILTER (WHERE summary_cte_self.key IS NOT NULL)'
+  $j$
+  jsonb_object_agg(
+    summary_cte_self.key, COALESCE(summary_cte_self.summary, '{}'::jsonb)
+  ) FILTER (WHERE summary_cte_self.key IS NOT NULL)
+  $j$
 END;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 

From 66ab34cccd21cf6504d1838cf0cb91243ba0921c Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 18 Sep 2024 17:21:14 +0530
Subject: [PATCH 0916/1141] Implement Table Permissions modal -> 'Share' tab

---
 mathesar_ui/src/i18n/languages/en/dict.json   |  11 ++
 mathesar_ui/src/models/Table.ts               |  15 ++
 .../table-inspector/table/TableMode.svelte    |   8 +
 .../table/TablePermissions.svelte             | 145 ++++++++++++++++++
 4 files changed, 179 insertions(+)
 create mode 100644 mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte

diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index c3f42cbedd..90b98d811e 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -566,6 +566,8 @@
   "sync_external_changes_data_help": "External changes to data (e.g. adding or editing rows) will be automatically reflected without clicking this button.",
   "sync_external_changes_structure_help": "If you make structural changes to the database outside Mathesar (e.g. using another tool to add a schema, table, or column), those changes will not be reflected in Mathesar until you manually sync them with this button.",
   "table": "Table",
+  "table_access_read_help": "Can read table records",
+  "table_access_write_help": "Can read, update, delete, and create table records",
   "table_delete_permanent_warning": "Warning: This action is permanent and once deleted, the table cannot be recovered.",
   "table_does_not_link": "This table does not link to any other tables",
   "table_name": "Table Name",
@@ -573,7 +575,15 @@
   "table_name_cannot_be_empty": "The table name cannot be empty.",
   "table_not_found": "Table not found.",
   "table_not_shared": "This table is currently not shared.",
+  "table_permissions": "Table Permissions",
   "table_preview": "Table Preview",
+  "table_privilege_delete_help": "Allow deletion of records within the table.",
+  "table_privilege_insert_help": "Allow creation of new records within the table.",
+  "table_privilege_references_help": "Allow creation of foreign key references to the table.",
+  "table_privilege_select_help": "Allow reading data from the table.",
+  "table_privilege_trigger_help": "Allow creation of triggers on the table.",
+  "table_privilege_truncate_help": "Allow truncation (removal of all records) of the table.",
+  "table_privilege_update_help": "Allow updating of records within the table.",
   "table_with_name_already_exists": "A table with that name already exists.",
   "tables": "Tables",
   "tables_matching_search": "{count, plural, one {{count} table matches [searchValue]} other {{count} tables match [searchValue]}}",
@@ -660,6 +670,7 @@
   "while_upgrading": "While Upgrading",
   "why_is_this_needed": "Why is this needed?",
   "window_remains_open_mathesar_unusable": "This window will remain open but all features within Mathesar will be unusable.",
+  "write": "Write",
   "yes": "Yes",
   "yes_summarize_as_list": "Yes, summarize as a list",
   "yesterday": "Yesterday"
diff --git a/mathesar_ui/src/models/Table.ts b/mathesar_ui/src/models/Table.ts
index 8be78e79c9..07e107bec2 100644
--- a/mathesar_ui/src/models/Table.ts
+++ b/mathesar_ui/src/models/Table.ts
@@ -1,7 +1,10 @@
+import { api } from '@mathesar/api/rpc';
 import type {
   RawTableWithMetadata,
   TablePrivilege,
 } from '@mathesar/api/rpc/tables';
+import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
+import { ImmutableMap } from '@mathesar-component-library';
 
 import type { Role } from './Role';
 import type { Schema } from './Schema';
@@ -36,4 +39,16 @@ export class Table {
     this.current_role_owns = props.rawTableWithMetadata.current_role_owns;
     this.schema = props.schema;
   }
+
+  constructTablePrivilegesStore() {
+    return new AsyncRpcApiStore(api.tables.privileges.list_direct, {
+      postProcess: (rawTablePrivilegesForRoles) =>
+        new ImmutableMap(
+          rawTablePrivilegesForRoles.map((rawTablePrivilegesForRole) => [
+            rawTablePrivilegesForRole.role_oid,
+            rawTablePrivilegesForRole,
+          ]),
+        ),
+    });
+  }
 }
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
index e2fea8a19a..dd0a53c768 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
@@ -13,6 +13,7 @@
   import TableActions from './TableActions.svelte';
   import TableDescription from './TableDescription.svelte';
   import TableName from './TableName.svelte';
+  import TablePermissions from './TablePermissions.svelte';
 
   const tabularData = getTabularDataStoreFromContext();
 </script>
@@ -30,6 +31,13 @@
     </div>
   </Collapsible>
 
+  <Collapsible isOpen triggerAppearance="plain">
+    <CollapsibleHeader slot="header" title={$_('table_permissions')} />
+    <div slot="content" class="content-container">
+      <TablePermissions />
+    </div>
+  </Collapsible>
+
   <Collapsible isOpen triggerAppearance="plain">
     <CollapsibleHeader
       slot="header"
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
new file mode 100644
index 0000000000..c39e8fd801
--- /dev/null
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
@@ -0,0 +1,145 @@
+<script lang="ts">
+  import { readable } from 'svelte/store';
+  import { _ } from 'svelte-i18n';
+
+  import { api } from '@mathesar/api/rpc';
+  import type {
+    RawTablePrivilegesForRole,
+    TablePrivilege,
+  } from '@mathesar/api/rpc/tables';
+  import { DatabaseRouteContext } from '@mathesar/contexts/DatabaseRouteContext';
+  import type { Table } from '@mathesar/models/Table';
+  import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
+  import { AsyncStoreValue } from '@mathesar/stores/AsyncStore';
+  import { modal } from '@mathesar/stores/modal';
+  import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
+  import { toast } from '@mathesar/stores/toast';
+  import {
+    type AccessControlConfig,
+    PermissionsModal,
+    PermissionsOverview,
+    TransferOwnership,
+  } from '@mathesar/systems/permissions';
+  import { Button, ImmutableMap } from '@mathesar-component-library';
+
+  const controller = modal.spawnModalController();
+  const tabularData = getTabularDataStoreFromContext();
+
+  $: table = $tabularData.table;
+  $: tablePrivileges = table.constructTablePrivilegesStore();
+
+  const databaseContext = DatabaseRouteContext.get();
+  $: ({ roles } = $databaseContext);
+
+  const accessControlConfig: AccessControlConfig<
+    'read' | 'write',
+    TablePrivilege
+  > = {
+    allPrivileges: [
+      {
+        id: 'SELECT',
+        help: $_('table_privilege_select_help'),
+      },
+      {
+        id: 'INSERT',
+        help: $_('table_privilege_insert_help'),
+      },
+      {
+        id: 'UPDATE',
+        help: $_('table_privilege_update_help'),
+      },
+      {
+        id: 'DELETE',
+        help: $_('table_privilege_delete_help'),
+      },
+      {
+        id: 'TRUNCATE',
+        help: $_('table_privilege_truncate_help'),
+      },
+      {
+        id: 'REFERENCES',
+        help: $_('table_privilege_references_help'),
+      },
+      {
+        id: 'TRIGGER',
+        help: $_('table_privilege_trigger_help'),
+      },
+    ],
+    access: {
+      levels: [
+        {
+          id: 'read',
+          privileges: new Set(['SELECT']),
+          name: $_('read'),
+          help: $_('table_access_read_help'),
+        },
+        {
+          id: 'write',
+          privileges: new Set(['SELECT', 'INSERT', 'UPDATE', 'DELETE']),
+          name: $_('write'),
+          help: $_('table_access_write_help'),
+        },
+      ],
+      default: 'read',
+    },
+  };
+
+  function getAsyncStoresForPermissions() {
+    void AsyncRpcApiStore.runBatched([
+      tablePrivileges.batchRunner({
+        database_id: table.schema.database.id,
+        table_oid: table.oid,
+      }),
+      roles.batchRunner({ database_id: table.schema.database.id }),
+    ]);
+    return {
+      roles,
+      privilegesForRoles: tablePrivileges,
+      permissionsMetaData: readable(
+        new AsyncStoreValue<Table, string>({
+          isLoading: false,
+          settlement: {
+            state: 'resolved',
+            value: table,
+          },
+        }),
+      ),
+    };
+  }
+
+  async function savePrivilegesForRoles(
+    privileges: RawTablePrivilegesForRole[],
+  ) {
+    const response = await api.tables.privileges
+      .replace_for_roles({
+        database_id: table.schema.database.id,
+        table_oid: table.oid,
+        privileges,
+      })
+      .run();
+    tablePrivileges.updateResolvedValue(
+      () => new ImmutableMap(response.map((pr) => [pr.role_oid, pr])),
+    );
+    toast.success($_('access_for_roles_saved_successfully'));
+  }
+</script>
+
+<div>
+  <Button appearance="secondary" on:click={() => controller.open()}>
+    <span>{$_('table_permissions')}</span>
+  </Button>
+</div>
+
+<PermissionsModal {controller} onClose={() => tablePrivileges.reset()}>
+  <span slot="title">
+    {$_('table_permissions')}
+  </span>
+  <PermissionsOverview
+    slot="share"
+    {controller}
+    {accessControlConfig}
+    getAsyncStores={getAsyncStoresForPermissions}
+    {savePrivilegesForRoles}
+  />
+  <TransferOwnership slot="transfer-ownership" {controller} />
+</PermissionsModal>

From 823c288e570ba7e88a04b1829524cf87828fa2a9 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Wed, 18 Sep 2024 13:53:25 +0200
Subject: [PATCH 0917/1141] fix string

---
 mathesar_ui/src/i18n/languages/en/dict.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 34456d4257..06c8a713ac 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -455,6 +455,7 @@
   "recover_query_click_button": "You can attempt to recover the query by clicking on the button below.",
   "redirected_login_page_password_change": "You'll be redirected to the login page once you change your password.",
   "redo": "Redo",
+  "referencing_column": "Referencing Column",
   "refresh": "Refresh",
   "regenerate_link": "Regenerate Link",
   "related_records": "Related Records",

From 813b1fb525c1885b86e1068329432e9d947e193b Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 18 Sep 2024 17:23:56 +0530
Subject: [PATCH 0918/1141] Hide public share dropdown

---
 .../src/systems/table-view/actions-pane/ActionsPane.svelte    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte b/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
index d3efda3a0e..a4f62357fc 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
@@ -10,7 +10,6 @@
   import FilterDropdown from './record-operations/filter/FilterDropdown.svelte';
   import GroupDropdown from './record-operations/group/GroupDropdown.svelte';
   import SortDropdown from './record-operations/sort/SortDropdown.svelte';
-  import ShareTableDropdown from './ShareTableDropdown.svelte';
 
   type TableActionsContext = 'page' | 'shared-consumer-page';
 
@@ -48,7 +47,8 @@
 
   <div class="aux-actions" slot="actions-right">
     {#if context === 'page'}
-      <ShareTableDropdown id={table.oid} />
+      <!-- TODO: Display Share option when we re-implement it with the new permissions structure -->
+      <!-- <ShareTableDropdown id={table.oid} /> -->
 
       <Button
         appearance="secondary"

From f691a313148d790610db57a38031b57c82de9f68 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 18 Sep 2024 08:03:30 -0400
Subject: [PATCH 0919/1141] Simplify test_get_record_from_table

- Don't leak implementation details into test (i.e. the 'query' field)
- Focus assertions on most relevant behavior
---
 db/sql/test_00_msar.sql | 40 ++++++++--------------------------------
 1 file changed, 8 insertions(+), 32 deletions(-)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index ee9285a4e4..adc641b44c 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -3957,41 +3957,17 @@ DECLARE
 BEGIN
   PERFORM __setup_list_records_table();
   rel_id := 'atable'::regclass::oid;
+  
+  -- We should be able to retrieve a single record
   RETURN NEXT is(
-    msar.get_record_from_table(rel_id, 2),
-    $j${
-      "count": 1,
-      "results": [
-        {"1": 2, "2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]}
-      ],
-      "grouping": null,
-      "linked_record_summaries": null,
-      "record_summaries": null
-    }$j$ || jsonb_build_object(
-      'query', concat(
-        'SELECT msar.format_data(id) AS "1", msar.format_data(col1) AS "2",',
-        ' msar.format_data(col2) AS "3", msar.format_data(col3) AS "4",',
-        ' msar.format_data(col4) AS "5" FROM public.atable WHERE (id) = (''2'')',
-        ' ORDER BY "1" ASC LIMIT NULL OFFSET NULL'
-      )
-    )
+    msar.get_record_from_table(rel_id, 2) -> 'results',
+    '[{"1": 2, "2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]}]'::jsonb
   );
+
+  -- We should get an empty array if the record does not exist
   RETURN NEXT is(
-    msar.get_record_from_table(rel_id, 200),
-    $j${
-      "count": 0,
-      "results": [],
-      "grouping": null,
-      "linked_record_summaries": null,
-      "record_summaries": null
-    }$j$ || jsonb_build_object(
-      'query', concat(
-        'SELECT msar.format_data(id) AS "1", msar.format_data(col1) AS "2",',
-        ' msar.format_data(col2) AS "3", msar.format_data(col3) AS "4",',
-        ' msar.format_data(col4) AS "5" FROM public.atable WHERE (id) = (''200'')',
-        ' ORDER BY "1" ASC LIMIT NULL OFFSET NULL'
-      )
-    )
+    msar.get_record_from_table(rel_id, 200) -> 'results',
+    '[]'::jsonb
   );
 END;
 $$ LANGUAGE plpgsql;

From 6251380cc0487e6edd24a1737aa9e2ee3faf86ce Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 18 Sep 2024 17:45:46 +0530
Subject: [PATCH 0920/1141] minor fix

---
 db/sql/00_msar.sql | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 32dfbb7695..ca9093e6b8 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -4591,9 +4591,11 @@ WITH fkey_map_cte AS (SELECT * FROM msar.get_fkey_map_table(tab_id))
 SELECT 'jsonb_build_object(' || string_agg(
   format(
     $j$
-    %1$L, jsonb_object_agg(
-      summary_cte_%1$s.fkey, COALESCE(summary_cte_%1$s.summary, '{}'::jsonb)
-    ) FILTER (WHERE summary_cte_%1$s.fkey IS NOT NULL)
+    %1$L, COALESCE(
+      jsonb_object_agg(
+        summary_cte_%1$s.fkey, summary_cte_%1$s.summary
+      ) FILTER (WHERE summary_cte_%1$s.fkey IS NOT NULL), '{}'::jsonb
+    )
     $j$,
     conkey
   ), ', '
@@ -4607,9 +4609,11 @@ msar.build_self_summary_json_expr(tab_id oid) RETURNS TEXT AS $$/*
 */
 SELECT CASE WHEN quote_ident(msar.get_selectable_pkey_attnum(tab_id)::text) IS NOT NULL THEN
   $j$
-  jsonb_object_agg(
-    summary_cte_self.key, COALESCE(summary_cte_self.summary, '{}'::jsonb)
-  ) FILTER (WHERE summary_cte_self.key IS NOT NULL)
+  COALESCE(
+    jsonb_object_agg(
+      summary_cte_self.key, summary_cte_self.summary
+    ) FILTER (WHERE summary_cte_self.key IS NOT NULL), '{}'::jsonb
+  )
   $j$
 END;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;

From 0d149cdc456f25a5a3630fd2b5f86b5721adb492 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 18 Sep 2024 17:47:41 +0530
Subject: [PATCH 0921/1141] Hide public sharing option in Exploration page

---
 mathesar_ui/src/pages/exploration/Header.svelte | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mathesar_ui/src/pages/exploration/Header.svelte b/mathesar_ui/src/pages/exploration/Header.svelte
index 7ae578d9e0..0750d5bf5b 100644
--- a/mathesar_ui/src/pages/exploration/Header.svelte
+++ b/mathesar_ui/src/pages/exploration/Header.svelte
@@ -9,8 +9,6 @@
   import { getExplorationEditorPageUrl } from '@mathesar/routes/urls';
   import { Button, Icon } from '@mathesar-component-library';
 
-  import ShareExplorationDropdown from './ShareExplorationDropdown.svelte';
-
   export let database: Database;
   export let schema: Schema;
   export let query: QueryInstance;
@@ -33,7 +31,8 @@
       >
         <span>{$_('edit_in_data_explorer')}</span>
       </a>
-      <ShareExplorationDropdown id={query.id} />
+      <!-- TODO: Display Share option when we re-implement it with the new permissions structure -->
+      <!-- <ShareExplorationDropdown id={query.id} /> -->
     {/if}
     <Button
       appearance="secondary"

From a68550e52f2c1e241a84ec76a6ae5e4434300102 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 18 Sep 2024 17:48:02 +0530
Subject: [PATCH 0922/1141] Fix bug: Collaborator email displayed as undefined
 when not present

---
 .../database/settings/collaborators/CollaboratorRow.svelte      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
index 80f27be6e3..10223b547c 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
@@ -25,7 +25,7 @@
   <div>
     {#if user}
       <div>{userName}</div>
-      <div>{user.email}</div>
+      <div>{user.email ?? ''}</div>
     {:else}
       {collaborator.userId}
     {/if}

From 54520c5d653f1805e971353e2f89af6f780fd264 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 18 Sep 2024 08:24:53 -0400
Subject: [PATCH 0923/1141] Add failing test for get record via string PK

---
 db/sql/test_00_msar.sql | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index adc641b44c..bbfed413a7 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -3954,21 +3954,27 @@ $$ LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION test_get_record_from_table() RETURNS SETOF TEXT AS $$
 DECLARE
   rel_id oid;
+  record_2_results jsonb := '[
+    {
+      "1": 2,
+      "2": 34,
+      "3": "sdflfflsk",
+      "4": null,
+      "5": [1, 2, 3, 4]
+    }
+  ]'::jsonb;
 BEGIN
   PERFORM __setup_list_records_table();
   rel_id := 'atable'::regclass::oid;
   
   -- We should be able to retrieve a single record
-  RETURN NEXT is(
-    msar.get_record_from_table(rel_id, 2) -> 'results',
-    '[{"1": 2, "2": 34, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]}]'::jsonb
-  );
+  RETURN NEXT is(msar.get_record_from_table(rel_id, 2) -> 'results', record_2_results);
+
+  -- We should be able to retrieve a record via stringified primary key
+  RETURN NEXT is(msar.get_record_from_table(rel_id, '2') -> 'results', record_2_results);
 
   -- We should get an empty array if the record does not exist
-  RETURN NEXT is(
-    msar.get_record_from_table(rel_id, 200) -> 'results',
-    '[]'::jsonb
-  );
+  RETURN NEXT is(msar.get_record_from_table(rel_id, 200) -> 'results', '[]'::jsonb);
 END;
 $$ LANGUAGE plpgsql;
 

From dec37b2dda3eef0796924262867ef1264412f80d Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 18 Sep 2024 08:27:03 -0400
Subject: [PATCH 0924/1141] Make get_record_from_table work with string PKs

---
 db/sql/00_msar.sql | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 63e905cd8c..cb61e635d1 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -4775,10 +4775,14 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+DROP FUNCTION IF EXISTS msar.get_record_from_table(oid, anyelement);
+DROP FUNCTION IF EXISTS msar.get_record_from_table(oid, anyelement, boolean);
+DROP FUNCTION IF EXISTS msar.get_record_from_table(oid, text, boolean);
+DROP FUNCTION IF EXISTS msar.get_record_from_table(oid, numeric, boolean);
 CREATE OR REPLACE FUNCTION
 msar.get_record_from_table(
   tab_id oid,
-  rec_id anyelement,
+  rec_id text,
   return_record_summaries boolean DEFAULT false
 ) RETURNS jsonb AS $$/*
 Get single record from a table. Only columns to which the user has access are returned.
@@ -4802,6 +4806,14 @@ SELECT msar.list_records_from_table(
 )
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
+CREATE OR REPLACE FUNCTION
+msar.get_record_from_table(
+  tab_id oid,
+  rec_id numeric,
+  return_record_summaries boolean DEFAULT false
+) RETURNS jsonb AS $$
+SELECT msar.get_record_from_table(tab_id, rec_id::text, return_record_summaries);
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 CREATE OR REPLACE FUNCTION
 msar.delete_records_from_table(tab_id oid, rec_ids jsonb) RETURNS integer AS $$/*

From d4fba8348e5470f4633787a417f33dded28270bc Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 18 Sep 2024 08:52:24 -0400
Subject: [PATCH 0925/1141] Simplify arg to anycompatible type

---
 db/sql/00_msar.sql | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index cb61e635d1..d8b93ca655 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -4779,10 +4779,11 @@ DROP FUNCTION IF EXISTS msar.get_record_from_table(oid, anyelement);
 DROP FUNCTION IF EXISTS msar.get_record_from_table(oid, anyelement, boolean);
 DROP FUNCTION IF EXISTS msar.get_record_from_table(oid, text, boolean);
 DROP FUNCTION IF EXISTS msar.get_record_from_table(oid, numeric, boolean);
+DROP FUNCTION IF EXISTS msar.get_record_from_table(oid, anycompatible, boolean);
 CREATE OR REPLACE FUNCTION
 msar.get_record_from_table(
   tab_id oid,
-  rec_id text,
+  rec_id anycompatible,
   return_record_summaries boolean DEFAULT false
 ) RETURNS jsonb AS $$/*
 Get single record from a table. Only columns to which the user has access are returned.
@@ -4806,14 +4807,6 @@ SELECT msar.list_records_from_table(
 )
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
-CREATE OR REPLACE FUNCTION
-msar.get_record_from_table(
-  tab_id oid,
-  rec_id numeric,
-  return_record_summaries boolean DEFAULT false
-) RETURNS jsonb AS $$
-SELECT msar.get_record_from_table(tab_id, rec_id::text, return_record_summaries);
-$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 CREATE OR REPLACE FUNCTION
 msar.delete_records_from_table(tab_id oid, rec_ids jsonb) RETURNS integer AS $$/*

From fc79b7fb3f4506a74e18e8dee70870abd173502b Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 18 Sep 2024 19:08:52 +0530
Subject: [PATCH 0926/1141] Fix schema creation on frontend based on the
 changes to the RPC method

---
 mathesar_ui/src/api/rpc/schemas.ts                    |  5 ++---
 mathesar_ui/src/stores/schemas.ts                     | 11 +----------
 .../src/systems/schemas/AddEditSchemaModal.svelte     |  2 +-
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/schemas.ts b/mathesar_ui/src/api/rpc/schemas.ts
index 0f7b3a0bac..7d00e7fc41 100644
--- a/mathesar_ui/src/api/rpc/schemas.ts
+++ b/mathesar_ui/src/api/rpc/schemas.ts
@@ -29,14 +29,13 @@ export const schemas = {
     RawSchema[]
   >(),
 
-  /** Returns the OID of the newly-created schema */
   add: rpcMethodTypeContainer<
     {
       database_id: number;
       name: RawSchema['name'];
       description?: RawSchema['description'];
     },
-    number
+    RawSchema
   >(),
 
   patch: rpcMethodTypeContainer<
@@ -48,7 +47,7 @@ export const schemas = {
         description?: RawSchema['description'];
       };
     },
-    void
+    RawSchema
   >(),
 
   delete: rpcMethodTypeContainer<
diff --git a/mathesar_ui/src/stores/schemas.ts b/mathesar_ui/src/stores/schemas.ts
index e57988476e..25af9a80a4 100644
--- a/mathesar_ui/src/stores/schemas.ts
+++ b/mathesar_ui/src/stores/schemas.ts
@@ -156,22 +156,13 @@ export async function createSchema(
     description: string | null;
   },
 ): Promise<void> {
-  const schemaOid = await api.schemas
+  const rawSchema = await api.schemas
     .add({
       database_id: database.id,
       name: props.name,
       description: props.description,
     })
     .run();
-  /**
-   * TODO_BETA: Update the following once
-   * https://github.com/mathesar-foundation/mathesar/issues/3834 is done.
-   */
-  const schemaList = await api.schemas.list({ database_id: database.id }).run();
-  const rawSchema = schemaList.find((rs) => rs.oid === schemaOid);
-  if (!rawSchema) {
-    throw new Error('Schema not found');
-  }
   updateSchemaInDBSchemaStore(database.id, new Schema({ database, rawSchema }));
 }
 
diff --git a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
index 5f0f59837f..77185548b2 100644
--- a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
+++ b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
@@ -26,7 +26,7 @@
       return false;
     }
     return Array.from($schemas?.data || []).some(
-      ([, s]) => get(s.name).toLowerCase().trim() === $schemaName?.trim(),
+      ([, s]) => get(s.name).toLowerCase().trim() === name?.trim(),
     );
   }
 

From be1e0d4ee2b2a513b08cdd6796813c91ada4d4c2 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 18 Sep 2024 19:49:28 +0530
Subject: [PATCH 0927/1141] Move common permissions types to different utility
 file

---
 mathesar_ui/src/systems/permissions/index.ts  |  2 +-
 .../permissions/overview/AccessControl.svelte | 15 ++++++-----
 .../overview/AccessControlRow.svelte          |  3 ++-
 .../systems/permissions/overview/Owner.svelte |  3 ++-
 .../overview/PermissionsOverview.svelte       |  9 ++++---
 .../overview/{utils.ts => overviewUtils.ts}   | 27 ++-----------------
 .../systems/permissions/permissionsUtils.ts   | 27 +++++++++++++++++++
 7 files changed, 48 insertions(+), 38 deletions(-)
 rename mathesar_ui/src/systems/permissions/overview/{utils.ts => overviewUtils.ts} (55%)
 create mode 100644 mathesar_ui/src/systems/permissions/permissionsUtils.ts

diff --git a/mathesar_ui/src/systems/permissions/index.ts b/mathesar_ui/src/systems/permissions/index.ts
index e7339830b8..df933c85a0 100644
--- a/mathesar_ui/src/systems/permissions/index.ts
+++ b/mathesar_ui/src/systems/permissions/index.ts
@@ -1,4 +1,4 @@
 export { default as PermissionsModal } from './PermissionsModal.svelte';
 export { default as PermissionsOverview } from './overview/PermissionsOverview.svelte';
 export { default as TransferOwnership } from './transfer-ownership/TransferOwnership.svelte';
-export { type AccessControlConfig } from './overview/utils';
+export { type AccessControlConfig } from './overview/overviewUtils';
diff --git a/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte b/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
index fbec8d0263..fe667129dc 100644
--- a/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
@@ -17,18 +17,21 @@
     portalToWindowFooter,
   } from '@mathesar-component-library';
 
+  import type {
+    PermissionsMetaData,
+    RolePrivileges,
+  } from '../permissionsUtils';
+
   import AccessControlRow from './AccessControlRow.svelte';
   import OverviewSection from './OverviewSection.svelte';
+  import {
+    type AccessControlConfig,
+    getObjectAccessPrivilegeMap,
+  } from './overviewUtils';
   import {
     RoleAccessLevelAndPrivileges,
     customAccess,
   } from './RoleAccessLevelAndPrivileges';
-  import {
-    type AccessControlConfig,
-    type PermissionsMetaData,
-    type RolePrivileges,
-    getObjectAccessPrivilegeMap,
-  } from './utils';
 
   type AccessLevel = $$Generic;
   type Privilege = $$Generic;
diff --git a/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte b/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
index f260a433c0..03ecc4f4b7 100644
--- a/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
@@ -12,12 +12,13 @@
     Select,
   } from '@mathesar-component-library';
 
+  import type { PermissionsMetaData } from '../permissionsUtils';
+
   import {
     type RoleAccessLevelAndPrivileges,
     customAccess,
   } from './RoleAccessLevelAndPrivileges';
   import RoleWithChildren from './RoleWithChildren.svelte';
-  import type { PermissionsMetaData } from './utils';
 
   type AccessLevel = $$Generic;
   type Privilege = $$Generic;
diff --git a/mathesar_ui/src/systems/permissions/overview/Owner.svelte b/mathesar_ui/src/systems/permissions/overview/Owner.svelte
index c81ba89978..158b524870 100644
--- a/mathesar_ui/src/systems/permissions/overview/Owner.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/Owner.svelte
@@ -4,9 +4,10 @@
   import type { Role } from '@mathesar/models/Role';
   import type { ImmutableMap } from '@mathesar-component-library';
 
+  import type { PermissionsMetaData } from '../permissionsUtils';
+
   import OverviewSection from './OverviewSection.svelte';
   import RoleWithChildren from './RoleWithChildren.svelte';
-  import type { PermissionsMetaData } from './utils';
 
   type Privilege = $$Generic;
 
diff --git a/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte b/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte
index e2b27f1397..c4dcf8c4d9 100644
--- a/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte
@@ -9,13 +9,14 @@
     isDefinedNonNullable,
   } from '@mathesar-component-library';
 
-  import AccessControl from './AccessControl.svelte';
-  import Owner from './Owner.svelte';
   import type {
-    AccessControlConfig,
     PermissionsAsyncStores,
     RolePrivileges,
-  } from './utils';
+  } from '../permissionsUtils';
+
+  import AccessControl from './AccessControl.svelte';
+  import type { AccessControlConfig } from './overviewUtils';
+  import Owner from './Owner.svelte';
 
   type AccessLevel = $$Generic;
   type Privilege = $$Generic;
diff --git a/mathesar_ui/src/systems/permissions/overview/utils.ts b/mathesar_ui/src/systems/permissions/overview/overviewUtils.ts
similarity index 55%
rename from mathesar_ui/src/systems/permissions/overview/utils.ts
rename to mathesar_ui/src/systems/permissions/overview/overviewUtils.ts
index 66a1702cbf..cf1fa5a1e6 100644
--- a/mathesar_ui/src/systems/permissions/overview/utils.ts
+++ b/mathesar_ui/src/systems/permissions/overview/overviewUtils.ts
@@ -1,19 +1,13 @@
-import type { Readable } from 'svelte/store';
-
 import type { Role } from '@mathesar/models/Role';
-import type { AsyncStoreValue } from '@mathesar/stores/AsyncStore';
 import type { ImmutableMap } from '@mathesar-component-library';
 
+import type { RolePrivileges } from '../permissionsUtils';
+
 import {
   type AccessLevelConfig,
   RoleAccessLevelAndPrivileges,
 } from './RoleAccessLevelAndPrivileges';
 
-export interface RolePrivileges<Privilege> {
-  role_oid: Role['oid'];
-  direct: Privilege[];
-}
-
 export interface AccessControlConfig<AccessLevel, Privilege> {
   allPrivileges: {
     id: Privilege;
@@ -25,23 +19,6 @@ export interface AccessControlConfig<AccessLevel, Privilege> {
   };
 }
 
-export interface PermissionsMetaData<Privilege> {
-  oid: number;
-  owner_oid: Role['oid'];
-  current_role_priv: Privilege[];
-  current_role_owns: boolean;
-}
-
-export interface PermissionsAsyncStores<Privilege, E = string> {
-  roles: Readable<AsyncStoreValue<ImmutableMap<Role['oid'], Role>, E>>;
-  privilegesForRoles: Readable<
-    AsyncStoreValue<ImmutableMap<number, RolePrivileges<Privilege>>, E>
-  >;
-  permissionsMetaData: Readable<
-    AsyncStoreValue<PermissionsMetaData<Privilege>, E>
-  >;
-}
-
 export function getObjectAccessPrivilegeMap<A, P>(
   accessLevelConfig: readonly AccessLevelConfig<A, P>[],
   privilegesForRole: ImmutableMap<Role['oid'], RolePrivileges<P>>,
diff --git a/mathesar_ui/src/systems/permissions/permissionsUtils.ts b/mathesar_ui/src/systems/permissions/permissionsUtils.ts
new file mode 100644
index 0000000000..14d44bb88f
--- /dev/null
+++ b/mathesar_ui/src/systems/permissions/permissionsUtils.ts
@@ -0,0 +1,27 @@
+import type { Readable } from 'svelte/store';
+
+import type { Role } from '@mathesar/models/Role';
+import type { AsyncStoreValue } from '@mathesar/stores/AsyncStore';
+import type { ImmutableMap } from '@mathesar-component-library';
+
+export interface RolePrivileges<Privilege> {
+  role_oid: Role['oid'];
+  direct: Privilege[];
+}
+
+export interface PermissionsMetaData<Privilege> {
+  oid: number;
+  owner_oid: Role['oid'];
+  current_role_priv: Privilege[];
+  current_role_owns: boolean;
+}
+
+export interface PermissionsAsyncStores<Privilege, E = string> {
+  roles: Readable<AsyncStoreValue<ImmutableMap<Role['oid'], Role>, E>>;
+  privilegesForRoles: Readable<
+    AsyncStoreValue<ImmutableMap<number, RolePrivileges<Privilege>>, E>
+  >;
+  permissionsMetaData: Readable<
+    AsyncStoreValue<PermissionsMetaData<Privilege>, E>
+  >;
+}

From 08cd6abf8217b762c6c5a81f400ddf9191a4d015 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 18 Sep 2024 11:09:46 -0400
Subject: [PATCH 0928/1141] Simplify DROP statements

---
 db/sql/00_msar.sql | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index d8b93ca655..dc4a0f417f 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -4777,9 +4777,6 @@ $$ LANGUAGE plpgsql;
 
 DROP FUNCTION IF EXISTS msar.get_record_from_table(oid, anyelement);
 DROP FUNCTION IF EXISTS msar.get_record_from_table(oid, anyelement, boolean);
-DROP FUNCTION IF EXISTS msar.get_record_from_table(oid, text, boolean);
-DROP FUNCTION IF EXISTS msar.get_record_from_table(oid, numeric, boolean);
-DROP FUNCTION IF EXISTS msar.get_record_from_table(oid, anycompatible, boolean);
 CREATE OR REPLACE FUNCTION
 msar.get_record_from_table(
   tab_id oid,

From 64d29f9d09150fda560e3271da3da5dca51da7fa Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 18 Sep 2024 20:41:30 +0530
Subject: [PATCH 0929/1141] Get stores in the outer permissions modal content
 component instead of overview component

---
 .../DatabasePermissionsModal.svelte           |  9 ++-
 .../schema/SchemaPermissionsModal.svelte      |  9 ++-
 .../permissions/PermissionsModal.svelte       | 70 +++++++------------
 .../PermissionsModalContent.svelte            | 66 +++++++++++++++++
 .../overview/PermissionsOverview.svelte       |  4 +-
 .../table/TablePermissions.svelte             |  9 ++-
 6 files changed, 115 insertions(+), 52 deletions(-)
 create mode 100644 mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte

diff --git a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
index c38e52525b..ae6ccab270 100644
--- a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
+++ b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
@@ -89,7 +89,11 @@
   }
 </script>
 
-<PermissionsModal {controller} onClose={() => databasePrivileges.reset()}>
+<PermissionsModal
+  {controller}
+  getAsyncStores={getAsyncStoresForPermissions}
+  onClose={() => databasePrivileges.reset()}
+>
   <span slot="title">
     {$_('database_permissions')}
   </span>
@@ -97,7 +101,8 @@
     slot="share"
     {controller}
     {accessControlConfig}
-    getAsyncStores={getAsyncStoresForPermissions}
+    let:asyncStores
+    {asyncStores}
     {savePrivilegesForRoles}
   />
   <TransferOwnership slot="transfer-ownership" {controller} />
diff --git a/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte b/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte
index 08b91930e1..34dd0d78fa 100644
--- a/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte
@@ -104,7 +104,11 @@
   }
 </script>
 
-<PermissionsModal {controller} onClose={() => schemaPrivileges.reset()}>
+<PermissionsModal
+  {controller}
+  getAsyncStores={getAsyncStoresForPermissions}
+  onClose={() => schemaPrivileges.reset()}
+>
   <span slot="title">
     {$_('schema_permissions')}
   </span>
@@ -112,7 +116,8 @@
     slot="share"
     {controller}
     {accessControlConfig}
-    getAsyncStores={getAsyncStoresForPermissions}
+    let:asyncStores
+    {asyncStores}
     {savePrivilegesForRoles}
   />
   <TransferOwnership slot="transfer-ownership" {controller} />
diff --git a/mathesar_ui/src/systems/permissions/PermissionsModal.svelte b/mathesar_ui/src/systems/permissions/PermissionsModal.svelte
index e0e0322ef0..9950900fe6 100644
--- a/mathesar_ui/src/systems/permissions/PermissionsModal.svelte
+++ b/mathesar_ui/src/systems/permissions/PermissionsModal.svelte
@@ -4,56 +4,38 @@
   import {
     ControlledModal,
     type ModalController,
-    TabContainer,
   } from '@mathesar-component-library';
 
-  export let controller: ModalController;
-  export let onClose: () => void = () => {};
+  import PermissionsModalContent from './PermissionsModalContent.svelte';
+  import type { PermissionsAsyncStores } from './permissionsUtils';
 
-  const tabs = [
-    {
-      id: 'share',
-      label: $_('share'),
-    },
-    // {
-    //   id: 'transfer_ownership',
-    //   label: $_('transfer_ownership'),
-    // },
-  ];
-  let activeTab = tabs[0];
+  type Privilege = $$Generic;
 
-  function onModalClose() {
-    [activeTab] = tabs;
-    onClose();
+  interface $$Slots {
+    title: Record<never, never>;
+    share: {
+      asyncStores: PermissionsAsyncStores<Privilege, string>;
+    };
+    'transfer-ownership': {
+      asyncStores: PermissionsAsyncStores<Privilege, string>;
+    };
   }
+
+  export let controller: ModalController;
+  export let getAsyncStores: () => PermissionsAsyncStores<Privilege>;
+  export let onClose: () => void = () => {};
 </script>
 
-<ControlledModal {controller} on:close={onModalClose}>
+<ControlledModal {controller} on:close={() => onClose()}>
   <slot name="title" slot="title" />
-  <div class="tabs">
-    <TabContainer
-      bind:activeTab
-      {tabs}
-      uniformTabWidth={false}
-      tabStyle="compact"
-    >
-      <div class="tab-content">
-        {#if activeTab.id === 'share'}
-          <slot name="share" {controller} />
-        {:else}
-          <slot name="transfer-ownership" {controller} />
-        {/if}
-      </div>
-    </TabContainer>
-  </div>
-</ControlledModal>
-
-<style lang="scss">
-  .tabs {
-    --Tab_margin-right: var(--size-small);
 
-    .tab-content {
-      margin-top: var(--size-base);
-    }
-  }
-</style>
+  <PermissionsModalContent {getAsyncStores}>
+    <slot slot="share" name="share" let:asyncStores {asyncStores} />
+    <slot
+      slot="transfer-ownership"
+      name="transfer-ownership"
+      let:asyncStores
+      {asyncStores}
+    />
+  </PermissionsModalContent>
+</ControlledModal>
diff --git a/mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte b/mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte
new file mode 100644
index 0000000000..013e580afb
--- /dev/null
+++ b/mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte
@@ -0,0 +1,66 @@
+<script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import Errors from '@mathesar/components/Errors.svelte';
+  import { Spinner, TabContainer } from '@mathesar-component-library';
+
+  import type { PermissionsAsyncStores } from './permissionsUtils';
+
+  type Privilege = $$Generic;
+
+  export let getAsyncStores: () => PermissionsAsyncStores<Privilege>;
+
+  $: asyncStores = getAsyncStores();
+  $: ({ permissionsMetaData } = asyncStores);
+
+  const tabs = [
+    {
+      id: 'share',
+      label: $_('share'),
+      for: 'all',
+    },
+    {
+      id: 'transfer_ownership',
+      label: $_('transfer_ownership'),
+      for: 'owner',
+    },
+  ];
+  $: displayedTabs = $permissionsMetaData.resolvedValue?.current_role_owns
+    ? tabs
+    : tabs.filter((t) => t.for === 'all');
+</script>
+
+<div class="content">
+  {#if $permissionsMetaData.isLoading}
+    <Spinner />
+  {:else if $permissionsMetaData.resolvedValue}
+    <div class="tabs">
+      <TabContainer
+        tabs={displayedTabs}
+        uniformTabWidth={false}
+        tabStyle="compact"
+        let:activeTab
+      >
+        <div class="tab-content">
+          {#if activeTab?.id === 'share'}
+            <slot name="share" {asyncStores} />
+          {:else if activeTab?.id === 'transfer_ownership'}
+            <slot name="transfer-ownership" {asyncStores} />
+          {/if}
+        </div>
+      </TabContainer>
+    </div>
+  {:else if $permissionsMetaData.error}
+    <Errors errors={[$permissionsMetaData.error]} fullWidth />
+  {/if}
+</div>
+
+<style lang="scss">
+  .tabs {
+    --Tab_margin-right: var(--size-small);
+
+    .tab-content {
+      margin-top: var(--size-base);
+    }
+  }
+</style>
diff --git a/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte b/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte
index c4dcf8c4d9..133d8c21aa 100644
--- a/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte
@@ -23,12 +23,12 @@
 
   export let controller: ModalController;
   export let accessControlConfig: AccessControlConfig<AccessLevel, Privilege>;
-  export let getAsyncStores: () => PermissionsAsyncStores<Privilege>;
   export let savePrivilegesForRoles: (
     privileges: RolePrivileges<Privilege>[],
   ) => Promise<void>;
 
-  $: ({ roles, privilegesForRoles, permissionsMetaData } = getAsyncStores());
+  export let asyncStores: PermissionsAsyncStores<Privilege>;
+  $: ({ roles, privilegesForRoles, permissionsMetaData } = asyncStores);
 
   $: isLoading =
     $roles.isLoading ||
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
index c39e8fd801..8f4b493237 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
@@ -130,7 +130,11 @@
   </Button>
 </div>
 
-<PermissionsModal {controller} onClose={() => tablePrivileges.reset()}>
+<PermissionsModal
+  {controller}
+  getAsyncStores={getAsyncStoresForPermissions}
+  onClose={() => tablePrivileges.reset()}
+>
   <span slot="title">
     {$_('table_permissions')}
   </span>
@@ -138,7 +142,8 @@
     slot="share"
     {controller}
     {accessControlConfig}
-    getAsyncStores={getAsyncStoresForPermissions}
+    let:asyncStores
+    {asyncStores}
     {savePrivilegesForRoles}
   />
   <TransferOwnership slot="transfer-ownership" {controller} />

From d775eb50c5b8dc7ad721ae677e06b357fa58f7c0 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 17 Sep 2024 16:46:31 -0400
Subject: [PATCH 0930/1141] Implement move_columns and split_table RPC APIs on
 front end

---
 .../src/api/rest/types/tables/split_table.ts  | 17 ---------
 mathesar_ui/src/api/rpc/data_modeling.ts      | 26 ++++++++++++++
 mathesar_ui/src/stores/tables.ts              | 35 -------------------
 .../ExtractColumnsModal.svelte                | 35 +++++++++++--------
 4 files changed, 46 insertions(+), 67 deletions(-)
 delete mode 100644 mathesar_ui/src/api/rest/types/tables/split_table.ts

diff --git a/mathesar_ui/src/api/rest/types/tables/split_table.ts b/mathesar_ui/src/api/rest/types/tables/split_table.ts
deleted file mode 100644
index a0c5ead2a5..0000000000
--- a/mathesar_ui/src/api/rest/types/tables/split_table.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * This is the POST request for: `/api/db/v0/tables/<table_id>/split_table`
- */
-export interface SplitTableRequest {
-  extract_columns: number[];
-  extracted_table_name: string;
-  relationship_fk_column_name?: string;
-}
-
-/**
- * This is the POST response for: `/api/db/v0/tables/<table_id>/split_table`
- */
-export interface SplitTableResponse {
-  extracted_table: number;
-  remainder_table: number;
-  fk_column: number;
-}
diff --git a/mathesar_ui/src/api/rpc/data_modeling.ts b/mathesar_ui/src/api/rpc/data_modeling.ts
index 428afaa490..8b2932a9ce 100644
--- a/mathesar_ui/src/api/rpc/data_modeling.ts
+++ b/mathesar_ui/src/api/rpc/data_modeling.ts
@@ -26,6 +26,32 @@ export interface ManyToMany {
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const data_modeling = {
+  move_columns: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      source_table_oid: number;
+      target_table_oid: number;
+      move_column_attnums: number[];
+    },
+    void
+  >(),
+
+  split_table: rpcMethodTypeContainer<
+    {
+      database_id: number;
+      /** The OID of the table whose columns we’ll extract. */
+      table_oid: number;
+      /** A list of the attnums of the columns to extract. */
+      column_attnums: number[];
+      extracted_table_name: string;
+      relationship_fk_column_name?: string;
+    },
+    {
+      extracted_table_oid: number;
+      new_fkey_attnum: number;
+    }
+  >(),
+
   /**
    * Returns a record where keys are stringified column attnums and values are
    * postgresql types
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index b63c20cb22..0088e82872 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -21,7 +21,6 @@ import {
 import { _ } from 'svelte-i18n';
 
 import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
-import type { SplitTableResponse } from '@mathesar/api/rest/types/tables/split_table';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { api } from '@mathesar/api/rpc';
 import type { ColumnPatchSpec } from '@mathesar/api/rpc/columns';
@@ -396,40 +395,6 @@ export async function createTableFromDataFile(props: {
   return fullTable;
 }
 
-export function splitTable({
-  id,
-  idsOfColumnsToExtract,
-  extractedTableName,
-  newFkColumnName,
-}: {
-  id: number;
-  idsOfColumnsToExtract: number[];
-  extractedTableName: string;
-  newFkColumnName?: string;
-}): CancellablePromise<SplitTableResponse> {
-  throw new Error('Not implemented'); // TODO_BETA
-
-  // const body: SplitTableRequest = {
-  //   extract_columns: idsOfColumnsToExtract,
-  //   extracted_table_name: extractedTableName,
-  //   relationship_fk_column_name: newFkColumnName,
-  // };
-  // return postAPI(`/api/db/v0/tables/${id}/split_table/`, body);
-}
-
-export function moveColumns(
-  tableOid: number,
-  idsOfColumnsToMove: number[],
-  targetTableId: number,
-): CancellablePromise<null> {
-  throw new Error('Not implemented'); // TODO_BETA
-
-  // return postAPI(`/api/db/v0/tables/${tableOid}/move_columns/`, {
-  //   move_columns: idsOfColumnsToMove,
-  //   target_table: targetTableId,
-  // });
-}
-
 export function getTableFromStoreOrApi({
   database,
   tableOid,
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
index b522b7ec87..d07419bb5f 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
@@ -3,6 +3,7 @@
   import { get } from 'svelte/store';
   import { _ } from 'svelte-i18n';
 
+  import { api } from '@mathesar/api/rpc';
   import {
     Field,
     FormSubmit,
@@ -23,8 +24,6 @@
   } from '@mathesar/stores/table-data';
   import {
     getTableFromStoreOrApi,
-    moveColumns,
-    splitTable,
     currentTablesData as tablesDataStore,
     validateNewTableName,
   } from '@mathesar/stores/tables';
@@ -146,11 +145,14 @@
         if (!targetTableId) {
           throw new Error($_('no_target_table_selected'));
         }
-        await moveColumns(
-          $tabularData.table.oid,
-          extractedColumnIds,
-          targetTableId,
-        );
+        await api.data_modeling
+          .move_columns({
+            database_id: $currentDatabase.id,
+            source_table_oid: $tabularData.table.oid,
+            move_column_attnums: extractedColumnIds,
+            target_table_oid: targetTableId,
+          })
+          .run();
         const fkColumns = $linkedTable?.columns ?? [];
         let fkColumnId: number | undefined = undefined;
         if (fkColumns.length === 1) {
@@ -163,22 +165,25 @@
           ),
         );
       } else {
-        const response = await splitTable({
-          id: $tabularData.table.oid,
-          idsOfColumnsToExtract: extractedColumnIds,
-          extractedTableName: newTableName,
-          newFkColumnName: $newFkColumnName,
-        });
+        const response = await api.data_modeling
+          .split_table({
+            database_id: $currentDatabase.id,
+            table_oid: $tabularData.table.oid,
+            column_attnums: extractedColumnIds,
+            extracted_table_name: newTableName,
+            relationship_fk_column_name: $newFkColumnName,
+          })
+          .run();
         followUps.push(
           getTableFromStoreOrApi({
             database: $currentDatabase,
-            tableOid: response.extracted_table,
+            tableOid: response.extracted_table_oid,
           }),
         );
         followUps.push(
           $tabularData.refreshAfterColumnExtraction(
             extractedColumnIds,
-            response.fk_column,
+            response.new_fkey_attnum,
           ),
         );
       }

From d0427b21a16280d5fde08f503f586ba11765b486 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 18 Sep 2024 13:18:58 -0400
Subject: [PATCH 0931/1141] Begin organizing new Explorations TS types

---
 .../types/queries.ts => rpc/explorations.ts}  | 117 ++++++++++++------
 mathesar_ui/src/api/rpc/index.ts              |   2 +
 mathesar_ui/src/components/QueryName.svelte   |   2 +-
 .../breadcrumb/EntitySelector.svelte          |   2 +-
 .../components/breadcrumb/breadcrumbTypes.ts  |   2 +-
 .../pages/exploration/ExplorationPage.svelte  |   2 +-
 .../src/pages/exploration/Header.svelte       |   2 +-
 .../ShareExplorationDropdown.svelte           |   2 +-
 .../src/pages/schema/ExplorationItem.svelte   |   4 +-
 .../src/pages/schema/ExplorationsList.svelte  |   2 +-
 .../pages/schema/SchemaExplorations.svelte    |   2 +-
 .../src/pages/schema/SchemaOverview.svelte    |   2 +-
 .../src/routes/DataExplorerRoute.svelte       |  10 +-
 .../operations/summarization.ts               |   2 +-
 .../src/stores/abstract-types/types.ts        |   2 +-
 mathesar_ui/src/stores/queries.ts             |  18 ++-
 .../systems/data-explorer/ActionsPane.svelte  |   6 +-
 .../systems/data-explorer/DataExplorer.svelte |   2 +-
 .../QueryFilterTransformationModel.ts         |   2 +-
 .../QueryHideTransformationModel.ts           |   2 +-
 .../systems/data-explorer/QueryListEntry.ts   |   2 +-
 .../src/systems/data-explorer/QueryManager.ts |   8 +-
 .../src/systems/data-explorer/QueryModel.ts   |  24 ++--
 .../src/systems/data-explorer/QueryRunner.ts  |  19 ++-
 .../QuerySortTransformationModel.ts           |   2 +-
 .../QuerySummarizationTransformationModel.ts  |   2 +-
 .../data-explorer/QueryUndoRedoManager.ts     |   2 +-
 .../ExplorationTab.svelte                     |   2 +-
 .../column-tab/DeleteColumnAction.svelte      |   2 +-
 .../transformationUtils.ts                    |   2 +-
 .../data-explorer/urlSerializationUtils.ts    |  12 +-
 .../src/systems/data-explorer/utils.ts        |   7 +-
 mathesar_ui/src/utils/preloadData.ts          |   2 +-
 33 files changed, 153 insertions(+), 118 deletions(-)
 rename mathesar_ui/src/api/{rest/types/queries.ts => rpc/explorations.ts} (61%)

diff --git a/mathesar_ui/src/api/rest/types/queries.ts b/mathesar_ui/src/api/rpc/explorations.ts
similarity index 61%
rename from mathesar_ui/src/api/rest/types/queries.ts
rename to mathesar_ui/src/api/rpc/explorations.ts
index 9eedea375a..2099fbd9ed 100644
--- a/mathesar_ui/src/api/rest/types/queries.ts
+++ b/mathesar_ui/src/api/rpc/explorations.ts
@@ -1,14 +1,11 @@
 import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
-import type { Column } from '@mathesar/api/rpc/columns';
+import type { Column, ColumnMetadata } from '@mathesar/api/rpc/columns';
 import type { RawSchema } from '@mathesar/api/rpc/schemas';
 import type { JoinPath } from '@mathesar/api/rpc/tables';
+import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
 import type { FilterId } from '@mathesar/stores/abstract-types/types';
 
-export type QueryColumnAlias = string;
-
-/**
- * endpoint: /api/db/v0/queries/<query_id>/
- */
+type QueryColumnAlias = string;
 
 export interface QueryInstanceInitialColumn {
   alias: QueryColumnAlias;
@@ -16,8 +13,6 @@ export interface QueryInstanceInitialColumn {
   jp_path?: JoinPath;
 }
 
-// TODO: Extend this to support more complicated filters
-// Requires UX reconsideration
 type FilterConditionParams = [
   { column_name: [string] },
   ...{ literal: [unknown] }[],
@@ -29,8 +24,6 @@ export interface QueryInstanceFilterTransformation {
   spec: FilterCondition;
 }
 
-// This is defined as a value instead of a type because we have a need to
-// iterate over it.
 export const querySummarizationFunctionIds = [
   'distinct_aggregate_to_array',
   'count',
@@ -86,32 +79,43 @@ export type QueryInstanceTransformation =
   | QueryInstanceHideTransformation
   | QueryInstanceSortTransformation;
 
+/** Called `ExplorationInfo` in Python docs */
 export interface QueryInstance {
   readonly id: number;
+  readonly database_id: number;
   readonly name: string;
   readonly description?: string;
-  readonly base_table: number;
+  readonly base_table_oid: number;
   readonly initial_columns?: QueryInstanceInitialColumn[];
   readonly transformations?: QueryInstanceTransformation[];
   readonly display_names: Record<string, string> | null;
+  readonly display_options?: unknown[];
 }
 
+export type UnsavedQueryInstance = Partial<QueryInstance>;
+
 export interface QueryGetResponse extends QueryInstance {
   readonly schema: number;
 }
 
 /**
- * endpoint: /api/db/v0/queries/
- */
-
-export type QueriesList = PaginatedResponse<QueryInstance>;
-
-/**
- * endpoint: /api/db/v0/queries/<query_id>/run/
+ * TODO: refactor this to match:
+ *
+ * ```ts
+ * interface ExplorationDef {
+ *   database_id: number;
+ *   name: string;
+ *   base_table_oid: number;
+ *   initial_columns: unknown[];
+ *   transformations?: unknown[];
+ *   display_options?: unknown[];
+ *   display_names?: Record<string, unknown>;
+ *   description?: string;
+ * }
+ * ```
  */
-
 export interface QueryRunRequest {
-  base_table: QueryInstance['base_table'];
+  base_table: QueryInstance['base_table_oid'];
   initial_columns: QueryInstanceInitialColumn[];
   transformations?: QueryInstanceTransformation[];
   display_names: QueryInstance['display_names'];
@@ -130,7 +134,7 @@ export interface QueryResultColumn {
   display_name: string | null;
   type: Column['type'];
   type_options: Column['type_options'];
-  metadata: Column['metadata'];
+  display_options: ColumnMetadata;
 }
 
 export interface QueryInitialColumnSource {
@@ -145,15 +149,11 @@ export interface QueryGeneratedColumnSource {
   input_alias: string;
 }
 
-export type QueryColumnSource =
-  | QueryInitialColumnSource
-  | QueryGeneratedColumnSource;
-
-export interface QueryInitialColumnMetaData
+interface QueryInitialColumnMetaData
   extends QueryResultColumn,
     QueryInitialColumnSource {}
 
-export interface QueryVirtualColumnMetaData
+interface QueryVirtualColumnMetaData
   extends QueryResultColumn,
     QueryGeneratedColumnSource {}
 
@@ -161,31 +161,68 @@ export type QueryColumnMetaData =
   | QueryInitialColumnMetaData
   | QueryVirtualColumnMetaData;
 
-/**
- *  TODO: The API always returns empty array for table results,
- * however for queries it returns null. Remove the union once
- * the API is made consistent.
- *
- * Tracked in https://github.com/centerofci/mathesar/issues/1716
- */
-
 export type QueryResultRecord = Record<string, unknown>;
 
 type QueryResultRecords =
   | PaginatedResponse<QueryResultRecord>
   | { count: 0; results: null };
 
-export interface QueryResultsResponse {
+/** Called `ExplorationResult` in Python docs */
+export interface QueryRunResponse {
   records: QueryResultRecords;
   output_columns: QueryColumnAlias[];
   column_metadata: Record<string, QueryColumnMetaData>;
-}
-
-export interface QueryRunResponse extends QueryResultsResponse {
   query: {
     schema: RawSchema['oid'];
-    base_table: QueryInstance['base_table'];
+    base_table: QueryInstance['base_table_oid'];
     initial_columns: QueryInstanceInitialColumn[];
     transformations?: QueryInstanceTransformation[];
   };
+  limit: unknown;
+  offset: unknown;
+  filter: unknown;
+  order_by: unknown;
+  /** Specifies a list of dicts containing column names and searched expression. */
+  search: unknown;
+  /** A list of column names for which you want duplicate records. */
+  duplicate_only: unknown;
 }
+
+// =============================================================================
+
+interface ExplorationDef {
+  database_id: number;
+  name: string;
+  base_table_oid: number;
+  initial_columns: unknown[];
+  transformations?: unknown[];
+  display_options?: unknown[];
+  display_names?: Record<string, unknown>;
+  description?: string;
+}
+
+export const explorations = {
+  list: rpcMethodTypeContainer<{ database_id: number }, QueryInstance[]>(),
+
+  get: rpcMethodTypeContainer<{ exploration_id: number }, QueryInstance>(),
+
+  add: rpcMethodTypeContainer<ExplorationDef, void>(),
+
+  delete: rpcMethodTypeContainer<{ exploration_id: number }, void>(),
+
+  replace: rpcMethodTypeContainer<{ new_exploration: QueryInstance }, void>(),
+
+  run: rpcMethodTypeContainer<
+    { exploration_def: ExplorationDef },
+    QueryRunResponse
+  >(),
+
+  run_saved: rpcMethodTypeContainer<
+    {
+      exploration_id: number;
+      limit: number;
+      offset: number;
+    },
+    QueryRunResponse
+  >(),
+};
diff --git a/mathesar_ui/src/api/rpc/index.ts b/mathesar_ui/src/api/rpc/index.ts
index e72a315b05..16510638df 100644
--- a/mathesar_ui/src/api/rpc/index.ts
+++ b/mathesar_ui/src/api/rpc/index.ts
@@ -7,6 +7,7 @@ import { columns } from './columns';
 import { constraints } from './constraints';
 import { data_modeling } from './data_modeling';
 import { databases } from './databases';
+import { explorations } from './explorations';
 import { records } from './records';
 import { roles } from './roles';
 import { schemas } from './schemas';
@@ -23,6 +24,7 @@ export const api = buildRpcApi({
     constraints,
     data_modeling,
     databases,
+    explorations,
     records,
     roles,
     schemas,
diff --git a/mathesar_ui/src/components/QueryName.svelte b/mathesar_ui/src/components/QueryName.svelte
index be85152f28..47afacdbc0 100644
--- a/mathesar_ui/src/components/QueryName.svelte
+++ b/mathesar_ui/src/components/QueryName.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+  import type { QueryInstance } from '@mathesar/api/rpc/explorations';
   import { iconExploration } from '@mathesar/icons';
 
   import NameWithIcon from './NameWithIcon.svelte';
diff --git a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
index d06715fc4e..a6f5c43570 100644
--- a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
@@ -2,7 +2,7 @@
   import { _ } from 'svelte-i18n';
   import { meta } from 'tinro';
 
-  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+  import type { QueryInstance } from '@mathesar/api/rpc/explorations';
   import type { Table } from '@mathesar/api/rpc/tables';
   import { iconTable } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
diff --git a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
index 35324ed85e..5a98e2f413 100644
--- a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
+++ b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
@@ -1,4 +1,4 @@
-import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+import type { QueryInstance } from '@mathesar/api/rpc/explorations';
 import type { Table } from '@mathesar/api/rpc/tables';
 import type {
   ComponentAndProps,
diff --git a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
index 14062dad8c..1000a31d55 100644
--- a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
+++ b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
@@ -2,7 +2,7 @@
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
 
-  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+  import type { QueryInstance } from '@mathesar/api/rpc/explorations';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import type { Database } from '@mathesar/models/Database';
   import type { Schema } from '@mathesar/models/Schema';
diff --git a/mathesar_ui/src/pages/exploration/Header.svelte b/mathesar_ui/src/pages/exploration/Header.svelte
index 7ae578d9e0..0a74c6764f 100644
--- a/mathesar_ui/src/pages/exploration/Header.svelte
+++ b/mathesar_ui/src/pages/exploration/Header.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+  import type { QueryInstance } from '@mathesar/api/rpc/explorations';
   import EntityPageHeader from '@mathesar/components/EntityPageHeader.svelte';
   import { iconExploration, iconInspector } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
diff --git a/mathesar_ui/src/pages/exploration/ShareExplorationDropdown.svelte b/mathesar_ui/src/pages/exploration/ShareExplorationDropdown.svelte
index 133e6b9c38..04004cef53 100644
--- a/mathesar_ui/src/pages/exploration/ShareExplorationDropdown.svelte
+++ b/mathesar_ui/src/pages/exploration/ShareExplorationDropdown.svelte
@@ -2,7 +2,7 @@
   import { _ } from 'svelte-i18n';
 
   import queryShareApi from '@mathesar/api/rest/queryShares';
-  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+  import type { QueryInstance } from '@mathesar/api/rpc/explorations';
   import { iconShare } from '@mathesar/icons';
   import { getSharedExplorationPageUrl } from '@mathesar/routes/urls';
   import ShareEntity from '@mathesar/systems/shares/ShareEntity.svelte';
diff --git a/mathesar_ui/src/pages/schema/ExplorationItem.svelte b/mathesar_ui/src/pages/schema/ExplorationItem.svelte
index 45cb9511ef..0d3bde4aab 100644
--- a/mathesar_ui/src/pages/schema/ExplorationItem.svelte
+++ b/mathesar_ui/src/pages/schema/ExplorationItem.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+  import type { QueryInstance } from '@mathesar/api/rpc/explorations';
   import TableName from '@mathesar/components/TableName.svelte';
   import { iconExploration } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
@@ -14,7 +14,7 @@
   export let database: Database;
   export let schema: Schema;
 
-  $: baseTable = $tablesStore.tablesMap.get(exploration.base_table);
+  $: baseTable = $tablesStore.tablesMap.get(exploration.base_table_oid);
 </script>
 
 <a
diff --git a/mathesar_ui/src/pages/schema/ExplorationsList.svelte b/mathesar_ui/src/pages/schema/ExplorationsList.svelte
index 872c3c7562..91d3d5b23f 100644
--- a/mathesar_ui/src/pages/schema/ExplorationsList.svelte
+++ b/mathesar_ui/src/pages/schema/ExplorationsList.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+  import type { QueryInstance } from '@mathesar/api/rpc/explorations';
   import { iconExploration } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
   import type { Schema } from '@mathesar/models/Schema';
diff --git a/mathesar_ui/src/pages/schema/SchemaExplorations.svelte b/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
index e90da5cd36..af7633e7e9 100644
--- a/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+  import type { QueryInstance } from '@mathesar/api/rpc/explorations';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import type { Database } from '@mathesar/models/Database';
diff --git a/mathesar_ui/src/pages/schema/SchemaOverview.svelte b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
index cefe667de0..3d7f80477a 100644
--- a/mathesar_ui/src/pages/schema/SchemaOverview.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
   import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+  import type { QueryInstance } from '@mathesar/api/rpc/explorations';
   import type { Table } from '@mathesar/api/rpc/tables';
   import SpinnerButton from '@mathesar/component-library/spinner-button/SpinnerButton.svelte';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
diff --git a/mathesar_ui/src/routes/DataExplorerRoute.svelte b/mathesar_ui/src/routes/DataExplorerRoute.svelte
index d4d8ed5814..d323a350e9 100644
--- a/mathesar_ui/src/routes/DataExplorerRoute.svelte
+++ b/mathesar_ui/src/routes/DataExplorerRoute.svelte
@@ -3,7 +3,10 @@
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
 
-  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+  import type {
+    QueryInstance,
+    UnsavedQueryInstance,
+  } from '@mathesar/api/rpc/explorations';
   import type { CancellablePromise } from '@mathesar/component-library';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
   import { iconEdit, iconExploration } from '@mathesar/icons';
@@ -16,10 +19,7 @@
     getExplorationEditorPageUrl,
   } from '@mathesar/routes/urls';
   import { abstractTypesMap } from '@mathesar/stores/abstract-types';
-  import {
-    type UnsavedQueryInstance,
-    getQuery,
-  } from '@mathesar/stores/queries';
+  import { getQuery } from '@mathesar/stores/queries';
   import {
     QueryManager,
     QueryModel,
diff --git a/mathesar_ui/src/stores/abstract-types/operations/summarization.ts b/mathesar_ui/src/stores/abstract-types/operations/summarization.ts
index 90040f475e..84af280518 100644
--- a/mathesar_ui/src/stores/abstract-types/operations/summarization.ts
+++ b/mathesar_ui/src/stores/abstract-types/operations/summarization.ts
@@ -1,4 +1,4 @@
-import { querySummarizationFunctionIds } from '@mathesar/api/rest/types/queries';
+import { querySummarizationFunctionIds } from '@mathesar/api/rpc/explorations';
 
 import { abstractTypeCategory } from '../constants';
 import type {
diff --git a/mathesar_ui/src/stores/abstract-types/types.ts b/mathesar_ui/src/stores/abstract-types/types.ts
index 12df20c435..793d809278 100644
--- a/mathesar_ui/src/stores/abstract-types/types.ts
+++ b/mathesar_ui/src/stores/abstract-types/types.ts
@@ -1,6 +1,6 @@
-import type { QuerySummarizationFunctionId } from '@mathesar/api/rest/types/queries';
 import type { States } from '@mathesar/api/rest/utils/requestUtils';
 import type { Column } from '@mathesar/api/rpc/columns';
+import type { QuerySummarizationFunctionId } from '@mathesar/api/rpc/explorations';
 import type { DbType } from '@mathesar/AppTypes';
 import type { CellDataType } from '@mathesar/components/cell-fabric/data-types/typeDefinitions';
 import type {
diff --git a/mathesar_ui/src/stores/queries.ts b/mathesar_ui/src/stores/queries.ts
index 7880e613d9..6b5e084cb4 100644
--- a/mathesar_ui/src/stores/queries.ts
+++ b/mathesar_ui/src/stores/queries.ts
@@ -41,13 +41,6 @@ import {
   writable,
 } from 'svelte/store';
 
-import type {
-  QueryGetResponse,
-  QueryInstance,
-  QueryResultsResponse,
-  QueryRunRequest,
-  QueryRunResponse,
-} from '@mathesar/api/rest/types/queries';
 import {
   type PaginatedResponse,
   type RequestStatus,
@@ -57,6 +50,13 @@ import {
   postAPI,
   putAPI,
 } from '@mathesar/api/rest/utils/requestUtils';
+import type {
+  QueryGetResponse,
+  QueryInstance,
+  QueryRunRequest,
+  QueryRunResponse,
+  UnsavedQueryInstance,
+} from '@mathesar/api/rpc/explorations';
 import type { Schema } from '@mathesar/models/Schema';
 import CacheManager from '@mathesar/utils/CacheManager';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
@@ -67,8 +67,6 @@ import { currentSchemaId } from './schemas';
 
 const commonData = preloadCommonData();
 
-export type UnsavedQueryInstance = Partial<QueryInstance>;
-
 export interface QueriesStoreSubstance {
   schemaId: Schema['oid'];
   requestStatus: RequestStatus;
@@ -291,7 +289,7 @@ export function fetchQueryResults(
     offset: number;
     [SHARED_LINK_UUID_QUERY_PARAM]?: string;
   },
-): CancellablePromise<QueryResultsResponse> {
+): CancellablePromise<QueryRunResponse> {
   const url = addQueryParamsToUrl(
     `/api/db/v0/queries/${queryId}/results/`,
     params,
diff --git a/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte b/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
index 7fd62e8439..d323f1b7b1 100644
--- a/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
+++ b/mathesar_ui/src/systems/data-explorer/ActionsPane.svelte
@@ -41,8 +41,8 @@
   export let isInspectorOpen: boolean;
 
   $: ({ query, state, queryHasUnsavedChanges } = queryManager);
-  $: currentTable = $query.base_table
-    ? $tablesDataStore.tablesMap.get($query.base_table)
+  $: currentTable = $query.base_table_oid
+    ? $tablesDataStore.tablesMap.get($query.base_table_oid)
     : undefined;
   $: isSaved = $query.isSaved();
   $: hasNoColumns = $query.initial_columns.length === 0;
@@ -160,7 +160,7 @@
             label={querySaveRequestStatus === 'processing'
               ? $_('saving')
               : $_('save')}
-            disabled={!$query.base_table ||
+            disabled={!$query.base_table_oid ||
               hasNoColumns ||
               querySaveRequestStatus === 'processing'}
             onClick={saveExistingOrCreateNew}
diff --git a/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte b/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte
index 8a203fb6df..51da8f9a80 100644
--- a/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte
+++ b/mathesar_ui/src/systems/data-explorer/DataExplorer.svelte
@@ -28,7 +28,7 @@
     bind:isInspectorOpen
     on:close
   />
-  {#if !$query.base_table}
+  {#if !$query.base_table_oid}
     <div class="initial-content">
       {#if $queries.requestStatus.state === 'success' && $queries.data.size === 0}
         <div class="tutorial-holder">
diff --git a/mathesar_ui/src/systems/data-explorer/QueryFilterTransformationModel.ts b/mathesar_ui/src/systems/data-explorer/QueryFilterTransformationModel.ts
index 1f4a069951..80010b6478 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryFilterTransformationModel.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryFilterTransformationModel.ts
@@ -1,7 +1,7 @@
 import { get } from 'svelte/store';
 import { _ } from 'svelte-i18n';
 
-import type { QueryInstanceFilterTransformation } from '@mathesar/api/rest/types/queries';
+import type { QueryInstanceFilterTransformation } from '@mathesar/api/rpc/explorations';
 import { validateFilterEntry } from '@mathesar/components/filter-entry';
 import { getLimitedFilterInformationById } from '@mathesar/stores/abstract-types';
 import type { FilterId } from '@mathesar/stores/abstract-types/types';
diff --git a/mathesar_ui/src/systems/data-explorer/QueryHideTransformationModel.ts b/mathesar_ui/src/systems/data-explorer/QueryHideTransformationModel.ts
index b8c856d510..75ef59bd98 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryHideTransformationModel.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryHideTransformationModel.ts
@@ -1,7 +1,7 @@
 import { get } from 'svelte/store';
 import { _ } from 'svelte-i18n';
 
-import type { QueryInstanceHideTransformation } from '@mathesar/api/rest/types/queries';
+import type { QueryInstanceHideTransformation } from '@mathesar/api/rpc/explorations';
 
 export interface QueryHideTransformationEntry {
   columnAliases: string[];
diff --git a/mathesar_ui/src/systems/data-explorer/QueryListEntry.ts b/mathesar_ui/src/systems/data-explorer/QueryListEntry.ts
index 4b10ed06ff..ddbd85f733 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryListEntry.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryListEntry.ts
@@ -1,4 +1,4 @@
-import type { UnsavedQueryInstance } from '@mathesar/stores/queries';
+import type { UnsavedQueryInstance } from '@mathesar/api/rpc/explorations';
 
 export default class QueryListEntry {
   queryJSON: UnsavedQueryInstance;
diff --git a/mathesar_ui/src/systems/data-explorer/QueryManager.ts b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
index 4d40856160..ab13d60d7d 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryManager.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
@@ -2,12 +2,12 @@ import type { Writable } from 'svelte/store';
 import { get, writable } from 'svelte/store';
 import { _ } from 'svelte-i18n';
 
+import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+import { api } from '@mathesar/api/rpc';
 import type {
   QueryInstance,
   QueryRunResponse,
-} from '@mathesar/api/rest/types/queries';
-import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
-import { api } from '@mathesar/api/rpc';
+} from '@mathesar/api/rpc/explorations';
 import type { JoinableTablesResult, Table } from '@mathesar/api/rpc/tables';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
 import { currentDatabase } from '@mathesar/stores/databases';
@@ -98,7 +98,7 @@ export default class QueryManager extends QueryRunner {
   }
 
   private async calculateInputColumnTree(): Promise<void> {
-    const baseTableId = get(this.query).base_table;
+    const baseTableId = get(this.query).base_table_oid;
     if (!baseTableId) {
       this.inputColumns.set({
         baseTableColumns: new Map(),
diff --git a/mathesar_ui/src/systems/data-explorer/QueryModel.ts b/mathesar_ui/src/systems/data-explorer/QueryModel.ts
index 2cc3efd67f..46d582a25e 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryModel.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryModel.ts
@@ -3,8 +3,8 @@ import type {
   QueryInstanceInitialColumn,
   QueryInstanceTransformation,
   QueryRunRequest,
-} from '@mathesar/api/rest/types/queries';
-import type { UnsavedQueryInstance } from '@mathesar/stores/queries';
+  UnsavedQueryInstance,
+} from '@mathesar/api/rpc/explorations';
 import { assertExhaustive } from '@mathesar-component-library';
 
 import QueryFilterTransformationModel from './QueryFilterTransformationModel';
@@ -49,9 +49,9 @@ function getTransformationModel(
 }
 
 function validate(
-  queryModel: Pick<QueryModel, 'base_table' | 'transformationModels'>,
+  queryModel: Pick<QueryModel, 'base_table_oid' | 'transformationModels'>,
 ): { isValid: boolean; isRunnable: boolean } {
-  if (queryModel.base_table === undefined) {
+  if (queryModel.base_table_oid === undefined) {
     return { isValid: false, isRunnable: false };
   }
   const isValid = queryModel.transformationModels.every((transformation) =>
@@ -61,7 +61,7 @@ function validate(
 }
 
 export default class QueryModel {
-  readonly base_table: UnsavedQueryInstance['base_table'];
+  readonly base_table_oid: UnsavedQueryInstance['base_table_oid'];
 
   readonly id: UnsavedQueryInstance['id'];
 
@@ -80,7 +80,7 @@ export default class QueryModel {
   readonly isRunnable: boolean;
 
   constructor(model?: UnsavedQueryInstance | QueryModel) {
-    this.base_table = model?.base_table;
+    this.base_table_oid = model?.base_table_oid;
     this.id = model?.id;
     this.name = model?.name;
     this.description = model?.description;
@@ -95,7 +95,7 @@ export default class QueryModel {
     this.transformationModels = transformationModels;
     this.display_names = model?.display_names ?? {};
     const validationResult = validate({
-      base_table: model?.base_table,
+      base_table_oid: model?.base_table_oid,
       transformationModels,
     });
     this.isValid = validationResult.isValid;
@@ -104,7 +104,7 @@ export default class QueryModel {
 
   withBaseTable(base_table?: number): QueryModelUpdateDiff {
     const model = new QueryModel({
-      base_table,
+      base_table_oid: base_table,
       id: this.id,
       name: this.name,
     });
@@ -112,7 +112,7 @@ export default class QueryModel {
       model,
       type: 'baseTable',
       diff: {
-        base_table,
+        base_table_oid: base_table,
       },
     };
   }
@@ -433,7 +433,7 @@ export default class QueryModel {
   }
 
   toRunRequestJson(): Omit<QueryRunRequest, 'parameters'> {
-    if (this.base_table === undefined) {
+    if (this.base_table_oid === undefined) {
       throw new Error(
         'Cannot formulate run request since base_table is undefined',
       );
@@ -442,7 +442,7 @@ export default class QueryModel {
       ? this.transformationModels
       : this.transformationModels.filter((transform) => transform.isValid());
     return {
-      base_table: this.base_table,
+      base_table: this.base_table_oid,
       initial_columns: this.initial_columns,
       transformations: transformations.map((entry) => entry.toJson()),
       display_names: this.display_names,
@@ -458,7 +458,7 @@ export default class QueryModel {
       id: this.id,
       name: this.name,
       description: this.description,
-      base_table: this.base_table,
+      base_table_oid: this.base_table_oid,
       initial_columns: this.initial_columns,
       transformations: this.transformationModels.map((entry) => entry.toJson()),
       display_names: this.display_names,
diff --git a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
index 4829acf33f..1ad1f29d07 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
@@ -1,14 +1,13 @@
 import type { Readable, Writable } from 'svelte/store';
 import { derived, get, writable } from 'svelte/store';
 
+import { ApiMultiError } from '@mathesar/api/rest/utils/errors';
+import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import type {
   QueryColumnMetaData,
   QueryResultRecord,
-  QueryResultsResponse,
   QueryRunResponse,
-} from '@mathesar/api/rest/types/queries';
-import { ApiMultiError } from '@mathesar/api/rest/utils/errors';
-import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+} from '@mathesar/api/rpc/explorations';
 import Plane from '@mathesar/components/sheet/selection/Plane';
 import Series from '@mathesar/components/sheet/selection/Series';
 import SheetSelectionStore from '@mathesar/components/sheet/selection/SheetSelectionStore';
@@ -72,13 +71,13 @@ export default class QueryRunner {
 
   inspector: QueryInspector;
 
-  private runPromise: CancellablePromise<QueryResultsResponse> | undefined;
+  private runPromise: CancellablePromise<QueryRunResponse> | undefined;
 
   private runMode: QueryRunMode;
 
   private onRunWithObjectCallback?: (results: QueryRunResponse) => unknown;
 
-  private onRunWithIdCallback?: (results: QueryResultsResponse) => unknown;
+  private onRunWithIdCallback?: (results: QueryRunResponse) => unknown;
 
   private shareConsumer?: ShareConsumer;
 
@@ -94,7 +93,7 @@ export default class QueryRunner {
     abstractTypeMap: AbstractTypesMap;
     runMode?: QueryRunMode;
     onRunWithObject?: (instance: QueryRunResponse) => unknown;
-    onRunWithId?: (instance: QueryResultsResponse) => unknown;
+    onRunWithId?: (instance: QueryRunResponse) => unknown;
     shareConsumer?: ShareConsumer;
   }) {
     this.abstractTypeMap = abstractTypeMap;
@@ -149,11 +148,11 @@ export default class QueryRunner {
     );
   }
 
-  async run(): Promise<QueryResultsResponse | undefined> {
+  async run(): Promise<QueryRunResponse | undefined> {
     this.runPromise?.cancel();
     const queryModel = this.getQueryModel();
 
-    if (queryModel.base_table === undefined) {
+    if (queryModel.base_table_oid === undefined) {
       const rowsData = { totalCount: 0, rows: [] };
       this.columnsMetaData.set(new ImmutableMap());
       this.processedColumns.set(new ImmutableMap());
@@ -162,7 +161,7 @@ export default class QueryRunner {
       return undefined;
     }
 
-    let response: QueryResultsResponse;
+    let response: QueryRunResponse;
     let triggerCallback: () => unknown;
     try {
       const paginationParams = get(this.pagination).recordsRequestParams();
diff --git a/mathesar_ui/src/systems/data-explorer/QuerySortTransformationModel.ts b/mathesar_ui/src/systems/data-explorer/QuerySortTransformationModel.ts
index 53142f20fa..a59b8d79de 100644
--- a/mathesar_ui/src/systems/data-explorer/QuerySortTransformationModel.ts
+++ b/mathesar_ui/src/systems/data-explorer/QuerySortTransformationModel.ts
@@ -1,7 +1,7 @@
 import { get } from 'svelte/store';
 import { _ } from 'svelte-i18n';
 
-import type { QueryInstanceSortTransformation } from '@mathesar/api/rest/types/queries';
+import type { QueryInstanceSortTransformation } from '@mathesar/api/rpc/explorations';
 import type { SortDirection } from '@mathesar/components/sort-entry/utils';
 
 export interface QuerySortTransformationEntry {
diff --git a/mathesar_ui/src/systems/data-explorer/QuerySummarizationTransformationModel.ts b/mathesar_ui/src/systems/data-explorer/QuerySummarizationTransformationModel.ts
index 0c3c8fab22..1c7842bf53 100644
--- a/mathesar_ui/src/systems/data-explorer/QuerySummarizationTransformationModel.ts
+++ b/mathesar_ui/src/systems/data-explorer/QuerySummarizationTransformationModel.ts
@@ -4,7 +4,7 @@ import { _ } from 'svelte-i18n';
 import type {
   QueryInstanceSummarizationTransformation,
   QuerySummarizationFunctionId,
-} from '@mathesar/api/rest/types/queries';
+} from '@mathesar/api/rpc/explorations';
 import { ImmutableMap } from '@mathesar-component-library';
 
 export interface QuerySummarizationAggregationEntry {
diff --git a/mathesar_ui/src/systems/data-explorer/QueryUndoRedoManager.ts b/mathesar_ui/src/systems/data-explorer/QueryUndoRedoManager.ts
index fe49bac2d9..8d25f7ad91 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryUndoRedoManager.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryUndoRedoManager.ts
@@ -1,4 +1,4 @@
-import type { UnsavedQueryInstance } from '@mathesar/stores/queries';
+import type { UnsavedQueryInstance } from '@mathesar/api/rpc/explorations';
 
 import QueryListEntry from './QueryListEntry';
 import QueryModel from './QueryModel';
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte
index 714924618a..821f39610f 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte
@@ -2,7 +2,7 @@
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
 
-  import type { QueryInstance } from '@mathesar/api/rest/types/queries';
+  import type { QueryInstance } from '@mathesar/api/rpc/explorations';
   import Form from '@mathesar/components/Form.svelte';
   import FormField from '@mathesar/components/FormField.svelte';
   import { iconDeleteMajor } from '@mathesar/icons';
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/DeleteColumnAction.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/DeleteColumnAction.svelte
index ab68127620..3a499bf430 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/DeleteColumnAction.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/column-tab/DeleteColumnAction.svelte
@@ -31,7 +31,7 @@
         const source = $columnsMetaData.get(initialColumn.alias)?.source;
         return (
           source?.is_initial_column &&
-          source.input_table_id === $query.base_table
+          source.input_table_id === $query.base_table_oid
         );
       },
     );
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/transformationUtils.ts b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/transformationUtils.ts
index bb2a3a196b..eedd7bf76c 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/transformationUtils.ts
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/transformationUtils.ts
@@ -1,4 +1,4 @@
-import type { QueryInstanceInitialColumn } from '@mathesar/api/rest/types/queries';
+import type { QueryInstanceInitialColumn } from '@mathesar/api/rpc/explorations';
 
 import type { QueryTransformationModel } from '../../QueryModel';
 import {
diff --git a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
index a077f35d08..a1ea68738e 100644
--- a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
+++ b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
@@ -1,8 +1,10 @@
-import type { QueryInstanceSummarizationTransformation } from '@mathesar/api/rest/types/queries';
 import type { Column } from '@mathesar/api/rpc/columns';
+import type {
+  QueryInstanceSummarizationTransformation,
+  UnsavedQueryInstance,
+} from '@mathesar/api/rpc/explorations';
 import type { Table } from '@mathesar/api/rpc/tables';
 import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
-import type { UnsavedQueryInstance } from '@mathesar/stores/queries';
 import type { TerseGrouping } from '@mathesar/stores/table-data';
 import Url64 from '@mathesar/utils/Url64';
 
@@ -103,7 +105,7 @@ export function constructQueryModelFromHash(
     !terseSummarization.terseGrouping?.length ||
     !terseSummarization.columns
   ) {
-    return { base_table: baseTable.oid };
+    return { base_table_oid: baseTable.oid };
   }
 
   const columnMap = new Map(
@@ -117,7 +119,7 @@ export function constructQueryModelFromHash(
     .filter((entry): entry is TerseSummarizedColumn => entry !== undefined);
 
   if (groupingColumns.length === 0) {
-    return { base_table: baseTable.oid };
+    return { base_table_oid: baseTable.oid };
   }
 
   const baseGroupingColumn = groupingColumns[0];
@@ -173,7 +175,7 @@ export function constructQueryModelFromHash(
   );
 
   return {
-    base_table: baseTable.oid,
+    base_table_oid: baseTable.oid,
     initial_columns: initialColumns,
     transformations,
     display_names: displayNames,
diff --git a/mathesar_ui/src/systems/data-explorer/utils.ts b/mathesar_ui/src/systems/data-explorer/utils.ts
index c84be95b8a..152d295d23 100644
--- a/mathesar_ui/src/systems/data-explorer/utils.ts
+++ b/mathesar_ui/src/systems/data-explorer/utils.ts
@@ -1,14 +1,11 @@
-import type { Simplify } from 'type-fest';
-import type { SimplifyDeep } from 'type-fest/source/merge-deep';
-
+import type { Column } from '@mathesar/api/rpc/columns';
 import type {
   QueryColumnMetaData,
   QueryGeneratedColumnSource,
   QueryInitialColumnSource,
   QueryResultColumn,
   QueryRunResponse,
-} from '@mathesar/api/rest/types/queries';
-import type { Column } from '@mathesar/api/rpc/columns';
+} from '@mathesar/api/rpc/explorations';
 import type {
   JoinPath,
   JoinableTablesResult,
diff --git a/mathesar_ui/src/utils/preloadData.ts b/mathesar_ui/src/utils/preloadData.ts
index cc4fd304af..e3830c1b66 100644
--- a/mathesar_ui/src/utils/preloadData.ts
+++ b/mathesar_ui/src/utils/preloadData.ts
@@ -1,6 +1,6 @@
-import type { QueryInstance } from '@mathesar/api/rest/types/queries';
 import type { User } from '@mathesar/api/rest/users';
 import type { RawDatabase } from '@mathesar/api/rpc/databases';
+import type { QueryInstance } from '@mathesar/api/rpc/explorations';
 import type { RawSchema } from '@mathesar/api/rpc/schemas';
 import type { RawServer } from '@mathesar/api/rpc/servers';
 import type { Table } from '@mathesar/api/rpc/tables';

From aeca61d350777dcc925ac4c8f16e429fdb4590ef Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 18 Sep 2024 09:21:28 -0400
Subject: [PATCH 0932/1141] Fix KeyError when sending explorations.run results

Co-authored-by: Sean Colsen <colsen.sean@gmail.com>
Co-authored-by: Anish Umale <umaleanish120@gmail.com>
---
 mathesar/rpc/explorations.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mathesar/rpc/explorations.py b/mathesar/rpc/explorations.py
index 391cf0266e..7a3d28d5ae 100644
--- a/mathesar/rpc/explorations.py
+++ b/mathesar/rpc/explorations.py
@@ -117,12 +117,12 @@ def from_dict(cls, e):
             records=e["records"],
             output_columns=e["output_columns"],
             column_metadata=e["column_metadata"],
-            limit=e["limit"],
-            offset=e["offset"],
-            filter=e["filter"],
-            order_by=e["order_by"],
-            search=e["search"],
-            duplicate_only=e["duplicate_only"]
+            limit=e.get("limit", None),
+            offset=e.get("offset", None),
+            filter=e.get("filter", None),
+            order_by=e.get("order_by", None),
+            search=e.get("search", None),
+            duplicate_only=e.get("duplicate_only", None),
         )
 
 

From c9b9fa49dc536306911e7213ba1cf7972b602d67 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 18 Sep 2024 13:20:31 -0400
Subject: [PATCH 0933/1141] Rename display_options to metadata in exploration
 results

Co-authored-by: Sean Colsen <colsen.sean@gmail.com>
Co-authored-by: Anish Umale <umaleanish120@gmail.com>
---
 mathesar/utils/explorations.py                 | 2 +-
 mathesar_ui/src/api/rpc/explorations.ts        | 2 +-
 mathesar_ui/src/systems/data-explorer/utils.ts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mathesar/utils/explorations.py b/mathesar/utils/explorations.py
index c726829a08..dbc2c9783a 100644
--- a/mathesar/utils/explorations.py
+++ b/mathesar/utils/explorations.py
@@ -155,7 +155,7 @@ def _get_exploration_column_metadata(
             "display_name": exploration_def["display_names"].get(alias),
             "type": sa_col.db_type.id,
             "type_options": sa_col.type_options,
-            "display_options": ColumnMetaDataRecord.from_model(column_metadata) if column_metadata else None,
+            "metadata": ColumnMetaDataRecord.from_model(column_metadata) if column_metadata else None,
             "is_initial_column": True if initial_column else False,
             "input_column_name": input_column_name,
             "input_table_name": input_table_name,
diff --git a/mathesar_ui/src/api/rpc/explorations.ts b/mathesar_ui/src/api/rpc/explorations.ts
index 2099fbd9ed..8269488969 100644
--- a/mathesar_ui/src/api/rpc/explorations.ts
+++ b/mathesar_ui/src/api/rpc/explorations.ts
@@ -134,7 +134,7 @@ export interface QueryResultColumn {
   display_name: string | null;
   type: Column['type'];
   type_options: Column['type_options'];
-  display_options: ColumnMetadata;
+  metadata: ColumnMetadata | null;
 }
 
 export interface QueryInitialColumnSource {
diff --git a/mathesar_ui/src/systems/data-explorer/utils.ts b/mathesar_ui/src/systems/data-explorer/utils.ts
index 152d295d23..8ee38aaa8f 100644
--- a/mathesar_ui/src/systems/data-explorer/utils.ts
+++ b/mathesar_ui/src/systems/data-explorer/utils.ts
@@ -311,7 +311,7 @@ function processColumn(
     Partial<QueryColumnMetaData>,
   abstractTypeMap: AbstractTypesMap,
 ): ProcessedQueryResultColumn {
-  const column = {
+  const column: QueryResultColumn = {
     alias: columnInfo.alias,
     display_name: columnInfo.display_name ?? columnInfo.alias,
     type: columnInfo.type ?? 'unknown',

From 43083f8d90d855b93a38b60f6059836cf173f7bc Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 18 Sep 2024 13:21:54 -0400
Subject: [PATCH 0934/1141] Remove database_id param from exp run, run_saved

Co-authored-by: Sean Colsen <colsen.sean@gmail.com>
Co-authored-by: Anish Umale <umaleanish120@gmail.com>
---
 mathesar/rpc/explorations.py   | 16 ++++++++--------
 mathesar/utils/explorations.py | 20 +++++++++-----------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/mathesar/rpc/explorations.py b/mathesar/rpc/explorations.py
index 7a3d28d5ae..a01bf1d0b8 100644
--- a/mathesar/rpc/explorations.py
+++ b/mathesar/rpc/explorations.py
@@ -6,6 +6,7 @@
 from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
 
+from mathesar.models.base import Explorations
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 from mathesar.rpc.utils import connect
 from mathesar.utils.explorations import (
@@ -176,36 +177,35 @@ def delete(*, exploration_id: int, **kwargs) -> None:
 @rpc_method(name="explorations.run")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def run(*, exploration_def: ExplorationDef, database_id: int, limit: int = 100, offset: int = 0, **kwargs) -> ExplorationResult:
+def run(*, exploration_def: ExplorationDef, limit: int = 100, offset: int = 0, **kwargs) -> ExplorationResult:
     """
     Run an exploration.
 
     Args:
         exploration_def: A dict describing an exploration to run.
-        database_id: The Django id of the database containing the base table for the exploration.
     """
     user = kwargs.get(REQUEST_KEY).user
-    with connect(database_id, user) as conn:
-        exploration_result = run_exploration(exploration_def, database_id, conn, limit, offset)
+    with connect(exploration_def['database_id'], user) as conn:
+        exploration_result = run_exploration(exploration_def, conn, limit, offset)
     return ExplorationResult.from_dict(exploration_result)
 
 
 @rpc_method(name='explorations.run_saved')
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def run_saved(*, exploration_id: int, database_id: int, limit: int = 100, offset: int = 0, **kwargs) -> ExplorationResult:
+def run_saved(*, exploration_id: int, limit: int = 100, offset: int = 0, **kwargs) -> ExplorationResult:
     """
     Run a saved exploration.
 
     Args:
         exploration_id: The Django id of the exploration to run.
-        database_id: The Django id of the database containing the base table for the exploration.
         limit: The max number of rows to return.(default 100)
         offset: The number of rows to skip.(default 0)
     """
     user = kwargs.get(REQUEST_KEY).user
-    with connect(database_id, user) as conn:
-        exploration_result = run_saved_exploration(exploration_id, limit, offset, database_id, conn)
+    exp_model = Explorations.objects.get(id=exploration_id)
+    with connect(exp_model.database.id, user) as conn:
+        exploration_result = run_saved_exploration(exp_model, limit, offset, conn)
     return ExplorationResult.from_dict(exploration_result)
 
 
diff --git a/mathesar/utils/explorations.py b/mathesar/utils/explorations.py
index dbc2c9783a..1e5f1b0534 100644
--- a/mathesar/utils/explorations.py
+++ b/mathesar/utils/explorations.py
@@ -47,7 +47,7 @@ def create_exploration(exploration_def):
     )
 
 
-def run_exploration(exploration_def, database_id, conn, limit=100, offset=0):
+def run_exploration(exploration_def, conn, limit=100, offset=0):
     engine = create_future_engine_with_custom_types(
         conn.info.user,
         conn.info.password,
@@ -94,7 +94,6 @@ def run_exploration(exploration_def, database_id, conn, limit=100, offset=0):
     column_metadata = _get_exploration_column_metadata(
         exploration_def,
         processed_initial_columns,
-        database_id,
         db_query,
         conn,
         engine,
@@ -117,21 +116,20 @@ def run_exploration(exploration_def, database_id, conn, limit=100, offset=0):
     }
 
 
-def run_saved_exploration(exploration_id, limit, offset, database_id, conn):
-    exp_model = Explorations.objects.get(id=exploration_id)
+def run_saved_exploration(exp_model, limit, offset, conn):
     exploration_def = {
-        "base_table_oid": exp_model["base_table_oid"],
-        "initial_columns": exp_model["initial_columns"],
-        "display_names": exp_model["display_names"],
-        "transformations": exp_model["transformations"]
+        "database_id": exp_model.database.id,
+        "base_table_oid": exp_model.base_table_oid,
+        "initial_columns": exp_model.initial_columns,
+        "display_names": exp_model.display_names,
+        "transformations": exp_model.transformations,
     }
-    return run_exploration(exploration_def, database_id, conn, limit, offset)
+    return run_exploration(exploration_def, conn, limit, offset)
 
 
 def _get_exploration_column_metadata(
     exploration_def,
     processed_initial_columns,
-    database_id,
     db_query,
     conn,
     engine,
@@ -144,7 +142,7 @@ def _get_exploration_column_metadata(
             if alias == col.alias:
                 initial_column = col
         column_metadata = ColumnMetaData.objects.filter(
-            database__id=database_id,
+            database__id=exploration_def["database_id"],
             table_oid=initial_column.reloid,
             attnum=sa_col.column_attnum
         ).first() if initial_column else None

From a8462728f26aec37c410a8b22eee6b7e3e8aaed1 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 18 Sep 2024 13:22:58 -0400
Subject: [PATCH 0935/1141] Don't require display_names in explorations

Co-authored-by: Sean Colsen <colsen.sean@gmail.com>
Co-authored-by: Anish Umale <umaleanish120@gmail.com>
---
 .../0016_alter_explorations_display_names.py   | 18 ++++++++++++++++++
 mathesar/models/base.py                        |  2 +-
 mathesar/utils/explorations.py                 |  3 ++-
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 mathesar/migrations/0016_alter_explorations_display_names.py

diff --git a/mathesar/migrations/0016_alter_explorations_display_names.py b/mathesar/migrations/0016_alter_explorations_display_names.py
new file mode 100644
index 0000000000..4d7cd53765
--- /dev/null
+++ b/mathesar/migrations/0016_alter_explorations_display_names.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.11 on 2024-09-18 14:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mathesar', '0015_tablemetadata_data_file'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='explorations',
+            name='display_names',
+            field=models.JSONField(null=True),
+        ),
+    ]
diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index 797665102b..59759d1324 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -154,5 +154,5 @@ class Explorations(BaseModel):
     initial_columns = models.JSONField()
     transformations = models.JSONField(null=True)
     display_options = models.JSONField(null=True)
-    display_names = models.JSONField(null=False)
+    display_names = models.JSONField(null=True)
     description = models.CharField(null=True)
diff --git a/mathesar/utils/explorations.py b/mathesar/utils/explorations.py
index 1e5f1b0534..4b236686e5 100644
--- a/mathesar/utils/explorations.py
+++ b/mathesar/utils/explorations.py
@@ -148,9 +148,10 @@ def _get_exploration_column_metadata(
         ).first() if initial_column else None
         input_table_name = get_table(initial_column.reloid, conn)["name"] if initial_column else None
         input_column_name = initial_column.get_name(engine, metadata) if initial_column else None
+        display_names = exploration_def.get("display_names", None)
         exploration_column_metadata[alias] = {
             "alias": alias,
-            "display_name": exploration_def["display_names"].get(alias),
+            "display_name": display_names.get(alias) if display_names is not None else None,
             "type": sa_col.db_type.id,
             "type_options": sa_col.type_options,
             "metadata": ColumnMetaDataRecord.from_model(column_metadata) if column_metadata else None,

From 490dd43852b90fa0970aa59a2fab8fe314b1fa4d Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 18 Sep 2024 13:34:07 -0400
Subject: [PATCH 0936/1141] Allow patching records via string pks

---
 db/sql/00_msar.sql      |  3 ++-
 db/sql/test_00_msar.sql | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index e3121e5c49..ad286fbfa7 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -4914,10 +4914,11 @@ FROM jsonb_each_text(rec_def);
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
+DROP FUNCTION IF EXISTS msar.patch_record_in_table(oid, anyelement, jsonb, boolean);
 CREATE OR REPLACE FUNCTION
 msar.patch_record_in_table(
   tab_id oid,
-  rec_id anyelement,
+  rec_id anycompatible,
   rec_def jsonb,
   return_record_summaries boolean DEFAULT false
 ) RETURNS jsonb AS $$/*
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 1ba8dd142f..29e7fa8f6e 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -4259,6 +4259,24 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+CREATE OR REPLACE FUNCTION test_patch_record_in_table_string_pk() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+BEGIN
+  PERFORM __setup_add_record_table();
+  rel_id := 'atable'::regclass::oid;
+  RETURN NEXT is(
+    msar.patch_record_in_table( rel_id, '2', '{"2": 10}'),
+    $p${
+      "results": [{"1": 2, "2": 10, "3": "sdflfflsk", "4": null, "5": [1, 2, 3, 4]}],
+      "linked_record_summaries": null,
+      "record_summaries": null
+    }$p$
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
 CREATE OR REPLACE FUNCTION test_patch_record_in_table_multi() RETURNS SETOF TEXT AS $$
 DECLARE
   rel_id oid;

From d2707f1cdc09ff2040b3749eaf83358329ee8824 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 19 Sep 2024 12:06:16 +0530
Subject: [PATCH 0937/1141] Move loading of stores to the modal content
 component from overview

---
 .../DatabasePermissionsModal.svelte           | 11 +++-
 .../schema/SchemaPermissionsModal.svelte      | 11 +++-
 .../permissions/PermissionsModal.svelte       | 20 +++----
 .../PermissionsModalContent.svelte            | 53 +++++++++++++++---
 .../overview/PermissionsOverview.svelte       | 56 +++++--------------
 .../systems/permissions/permissionsUtils.ts   | 23 +++++++-
 .../TransferOwnership.svelte                  |  7 +++
 .../table/TablePermissions.svelte             | 11 +++-
 8 files changed, 116 insertions(+), 76 deletions(-)

diff --git a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
index ae6ccab270..f8eb9ce334 100644
--- a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
+++ b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
@@ -101,9 +101,14 @@
     slot="share"
     {controller}
     {accessControlConfig}
-    let:asyncStores
-    {asyncStores}
+    let:storeValues
+    {storeValues}
     {savePrivilegesForRoles}
   />
-  <TransferOwnership slot="transfer-ownership" {controller} />
+  <TransferOwnership
+    slot="transfer-ownership"
+    {controller}
+    let:storeValues
+    {storeValues}
+  />
 </PermissionsModal>
diff --git a/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte b/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte
index 34dd0d78fa..de50c42cc4 100644
--- a/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte
@@ -116,9 +116,14 @@
     slot="share"
     {controller}
     {accessControlConfig}
-    let:asyncStores
-    {asyncStores}
+    let:storeValues
+    {storeValues}
     {savePrivilegesForRoles}
   />
-  <TransferOwnership slot="transfer-ownership" {controller} />
+  <TransferOwnership
+    slot="transfer-ownership"
+    {controller}
+    let:storeValues
+    {storeValues}
+  />
 </PermissionsModal>
diff --git a/mathesar_ui/src/systems/permissions/PermissionsModal.svelte b/mathesar_ui/src/systems/permissions/PermissionsModal.svelte
index 9950900fe6..be895ce28c 100644
--- a/mathesar_ui/src/systems/permissions/PermissionsModal.svelte
+++ b/mathesar_ui/src/systems/permissions/PermissionsModal.svelte
@@ -7,18 +7,14 @@
   } from '@mathesar-component-library';
 
   import PermissionsModalContent from './PermissionsModalContent.svelte';
-  import type { PermissionsAsyncStores } from './permissionsUtils';
+  import type {
+    PermissionsAsyncStores,
+    PermissionsModalSlots,
+  } from './permissionsUtils';
 
   type Privilege = $$Generic;
-
-  interface $$Slots {
+  interface $$Slots extends PermissionsModalSlots<Privilege> {
     title: Record<never, never>;
-    share: {
-      asyncStores: PermissionsAsyncStores<Privilege, string>;
-    };
-    'transfer-ownership': {
-      asyncStores: PermissionsAsyncStores<Privilege, string>;
-    };
   }
 
   export let controller: ModalController;
@@ -30,12 +26,12 @@
   <slot name="title" slot="title" />
 
   <PermissionsModalContent {getAsyncStores}>
-    <slot slot="share" name="share" let:asyncStores {asyncStores} />
+    <slot slot="share" name="share" let:storeValues {storeValues} />
     <slot
       slot="transfer-ownership"
       name="transfer-ownership"
-      let:asyncStores
-      {asyncStores}
+      let:storeValues
+      {storeValues}
     />
   </PermissionsModalContent>
 </ControlledModal>
diff --git a/mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte b/mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte
index 013e580afb..d37aae130d 100644
--- a/mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte
+++ b/mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte
@@ -2,16 +2,51 @@
   import { _ } from 'svelte-i18n';
 
   import Errors from '@mathesar/components/Errors.svelte';
-  import { Spinner, TabContainer } from '@mathesar-component-library';
+  import {
+    ImmutableMap,
+    Spinner,
+    TabContainer,
+    isDefinedNonNullable,
+  } from '@mathesar-component-library';
 
-  import type { PermissionsAsyncStores } from './permissionsUtils';
+  import type {
+    PermissionsAsyncStores,
+    PermissionsModalSlots,
+  } from './permissionsUtils';
 
   type Privilege = $$Generic;
+  type $$Slots = PermissionsModalSlots<Privilege>;
 
   export let getAsyncStores: () => PermissionsAsyncStores<Privilege>;
 
   $: asyncStores = getAsyncStores();
-  $: ({ permissionsMetaData } = asyncStores);
+  $: ({ roles, privilegesForRoles, permissionsMetaData } = asyncStores);
+
+  $: isLoading =
+    $roles.isLoading ||
+    $privilegesForRoles.isLoading ||
+    $permissionsMetaData.isLoading;
+  $: isSuccess =
+    $roles.isOk && $privilegesForRoles.isOk && $permissionsMetaData.isOk;
+  $: errors = [
+    $roles.error,
+    $privilegesForRoles.error,
+    $permissionsMetaData.error,
+  ].filter((entry): entry is string => isDefinedNonNullable(entry));
+
+  $: rolesValue = new ImmutableMap($roles.resolvedValue);
+  $: permissionsMetaDataValue = $permissionsMetaData.resolvedValue;
+  $: privilegesForRolesValue = new ImmutableMap(
+    $privilegesForRoles.resolvedValue,
+  );
+  $: storeValues =
+    isSuccess && permissionsMetaDataValue
+      ? {
+          roles: rolesValue,
+          permissionsMetaData: permissionsMetaDataValue,
+          privilegesForRoles: privilegesForRolesValue,
+        }
+      : undefined;
 
   const tabs = [
     {
@@ -31,9 +66,9 @@
 </script>
 
 <div class="content">
-  {#if $permissionsMetaData.isLoading}
+  {#if isLoading}
     <Spinner />
-  {:else if $permissionsMetaData.resolvedValue}
+  {:else if isSuccess && storeValues}
     <div class="tabs">
       <TabContainer
         tabs={displayedTabs}
@@ -43,15 +78,15 @@
       >
         <div class="tab-content">
           {#if activeTab?.id === 'share'}
-            <slot name="share" {asyncStores} />
+            <slot name="share" {storeValues} />
           {:else if activeTab?.id === 'transfer_ownership'}
-            <slot name="transfer-ownership" {asyncStores} />
+            <slot name="transfer-ownership" {storeValues} />
           {/if}
         </div>
       </TabContainer>
     </div>
-  {:else if $permissionsMetaData.error}
-    <Errors errors={[$permissionsMetaData.error]} fullWidth />
+  {:else}
+    <Errors {errors} fullWidth />
   {/if}
 </div>
 
diff --git a/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte b/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte
index 133d8c21aa..93fa63b1c7 100644
--- a/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte
@@ -1,16 +1,10 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import Errors from '@mathesar/components/Errors.svelte';
-  import {
-    ImmutableMap,
-    type ModalController,
-    Spinner,
-    isDefinedNonNullable,
-  } from '@mathesar-component-library';
+  import { type ModalController } from '@mathesar-component-library';
 
   import type {
-    PermissionsAsyncStores,
+    PermissionsStoreValues,
     RolePrivileges,
   } from '../permissionsUtils';
 
@@ -27,42 +21,18 @@
     privileges: RolePrivileges<Privilege>[],
   ) => Promise<void>;
 
-  export let asyncStores: PermissionsAsyncStores<Privilege>;
-  $: ({ roles, privilegesForRoles, permissionsMetaData } = asyncStores);
-
-  $: isLoading =
-    $roles.isLoading ||
-    $privilegesForRoles.isLoading ||
-    $permissionsMetaData.isLoading;
-  $: isSuccess =
-    $roles.isOk && $privilegesForRoles.isOk && $permissionsMetaData.isOk;
-  $: errors = [
-    $roles.error,
-    $privilegesForRoles.error,
-    $permissionsMetaData.error,
-  ].filter((entry): entry is string => isDefinedNonNullable(entry));
-
-  $: rolesValue = new ImmutableMap($roles.resolvedValue);
-  $: permissionsMetaDataValue = $permissionsMetaData.resolvedValue;
-  $: privilegesForRolesValue = new ImmutableMap(
-    $privilegesForRoles.resolvedValue,
-  );
+  export let storeValues: PermissionsStoreValues<Privilege>;
+  $: ({ roles, privilegesForRoles, permissionsMetaData } = storeValues);
 </script>
 
 <div class="permissions-overview">
-  {#if isLoading}
-    <Spinner />
-  {:else if isSuccess && permissionsMetaDataValue}
-    <Owner roles={rolesValue} permissionsMetaData={permissionsMetaDataValue} />
-    <AccessControl
-      {controller}
-      config={accessControlConfig}
-      roles={rolesValue}
-      privilegesForRoles={privilegesForRolesValue}
-      permissionsMetaData={permissionsMetaDataValue}
-      {savePrivilegesForRoles}
-    />
-  {:else}
-    <Errors {errors} fullWidth />
-  {/if}
+  <Owner {roles} {permissionsMetaData} />
+  <AccessControl
+    {controller}
+    config={accessControlConfig}
+    {roles}
+    {privilegesForRoles}
+    {permissionsMetaData}
+    {savePrivilegesForRoles}
+  />
 </div>
diff --git a/mathesar_ui/src/systems/permissions/permissionsUtils.ts b/mathesar_ui/src/systems/permissions/permissionsUtils.ts
index 14d44bb88f..b789f907d7 100644
--- a/mathesar_ui/src/systems/permissions/permissionsUtils.ts
+++ b/mathesar_ui/src/systems/permissions/permissionsUtils.ts
@@ -16,12 +16,29 @@ export interface PermissionsMetaData<Privilege> {
   current_role_owns: boolean;
 }
 
+export interface PermissionsStoreValues<Privilege> {
+  roles: ImmutableMap<Role['oid'], Role>;
+  privilegesForRoles: ImmutableMap<number, RolePrivileges<Privilege>>;
+  permissionsMetaData: PermissionsMetaData<Privilege>;
+}
+
 export interface PermissionsAsyncStores<Privilege, E = string> {
-  roles: Readable<AsyncStoreValue<ImmutableMap<Role['oid'], Role>, E>>;
+  roles: Readable<
+    AsyncStoreValue<PermissionsStoreValues<Privilege>['roles'], E>
+  >;
   privilegesForRoles: Readable<
-    AsyncStoreValue<ImmutableMap<number, RolePrivileges<Privilege>>, E>
+    AsyncStoreValue<PermissionsStoreValues<Privilege>['privilegesForRoles'], E>
   >;
   permissionsMetaData: Readable<
-    AsyncStoreValue<PermissionsMetaData<Privilege>, E>
+    AsyncStoreValue<PermissionsStoreValues<Privilege>['permissionsMetaData'], E>
   >;
 }
+
+export interface PermissionsModalSlots<Privilege> {
+  share: {
+    storeValues: PermissionsStoreValues<Privilege>;
+  };
+  'transfer-ownership': {
+    storeValues: PermissionsStoreValues<Privilege>;
+  };
+}
diff --git a/mathesar_ui/src/systems/permissions/transfer-ownership/TransferOwnership.svelte b/mathesar_ui/src/systems/permissions/transfer-ownership/TransferOwnership.svelte
index 8bf8a565a0..dd92c943e6 100644
--- a/mathesar_ui/src/systems/permissions/transfer-ownership/TransferOwnership.svelte
+++ b/mathesar_ui/src/systems/permissions/transfer-ownership/TransferOwnership.svelte
@@ -7,7 +7,13 @@
     portalToWindowFooter,
   } from '@mathesar-component-library';
 
+  import type { PermissionsStoreValues } from '../permissionsUtils';
+
+  type Privilege = $$Generic;
+
   export let controller: ModalController;
+  export let storeValues: PermissionsStoreValues<Privilege>;
+  $: ({ roles, permissionsMetaData } = storeValues);
 
   const form = makeForm({});
 
@@ -15,6 +21,7 @@
 </script>
 
 <div use:portalToWindowFooter class="footer">
+  <div></div>
   <FormSubmit
     {form}
     canProceed={$form.hasChanges}
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
index 8f4b493237..3c2f485232 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
@@ -142,9 +142,14 @@
     slot="share"
     {controller}
     {accessControlConfig}
-    let:asyncStores
-    {asyncStores}
+    let:storeValues
+    {storeValues}
     {savePrivilegesForRoles}
   />
-  <TransferOwnership slot="transfer-ownership" {controller} />
+  <TransferOwnership
+    slot="transfer-ownership"
+    {controller}
+    let:storeValues
+    {storeValues}
+  />
 </PermissionsModal>

From 6a7c62b2a64367ba4b8294497126e4f54fce4acb Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 19 Sep 2024 12:20:45 +0530
Subject: [PATCH 0938/1141] Add isOptionDisabled prop to Select

---
 mathesar_ui/src/component-library/select/Select.svelte  | 6 +++++-
 mathesar_ui/src/component-library/select/SelectTypes.ts | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/mathesar_ui/src/component-library/select/Select.svelte b/mathesar_ui/src/component-library/select/Select.svelte
index f9e18920c4..8ebfaa208b 100644
--- a/mathesar_ui/src/component-library/select/Select.svelte
+++ b/mathesar_ui/src/component-library/select/Select.svelte
@@ -82,10 +82,13 @@
    */
   export let valuesAreEqual: DefinedProps['valuesAreEqual'] = (a, b) => a === b;
 
+  export let isOptionDisabled: DefinedProps['isOptionDisabled'] = () => false;
+
   export let autoSelect: DefinedProps['autoSelect'] = 'first';
 
   function setValueFromArray(values: readonly (Option | undefined)[]) {
-    [value] = values;
+    const firstEnabledOption = values.find((opt) => !isOptionDisabled(opt));
+    value = firstEnabledOption;
     dispatch('change', value);
     dispatch('input', value);
     dispatch('artificialChange', value);
@@ -140,6 +143,7 @@
   {labelKey}
   {getLabel}
   checkEquality={valuesAreEqual}
+  checkIfOptionIsDisabled={isOptionDisabled}
   let:api
   let:isOpen
 >
diff --git a/mathesar_ui/src/component-library/select/SelectTypes.ts b/mathesar_ui/src/component-library/select/SelectTypes.ts
index c27a7c7da6..8406e22b9f 100644
--- a/mathesar_ui/src/component-library/select/SelectTypes.ts
+++ b/mathesar_ui/src/component-library/select/SelectTypes.ts
@@ -14,6 +14,9 @@ export interface SelectProps<Option> extends BaseInputProps {
   triggerAppearance?: Appearance;
   ariaLabel?: string;
   valuesAreEqual?: ListBoxProps<Option | undefined>['checkEquality'];
+  isOptionDisabled?: ListBoxProps<
+    Option | undefined
+  >['checkIfOptionIsDisabled'];
   /**
    * When options change and the selected value is either undefined or
    * not present in the options array, autoSelect determines how to

From dc55bda756469affe7c738804e8fd2d04688c7f8 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 19 Sep 2024 12:37:21 +0530
Subject: [PATCH 0939/1141] Visually distinguish disabled options and show all
 roles and disable added ones in collaborator modal

---
 mathesar_ui/src/component-library/list-box/ListBox.scss    | 5 +++++
 .../src/component-library/list-box/ListBoxOptions.svelte   | 2 ++
 .../settings/collaborators/AddCollaboratorModal.svelte     | 7 +++----
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/mathesar_ui/src/component-library/list-box/ListBox.scss b/mathesar_ui/src/component-library/list-box/ListBox.scss
index 9065c56847..82faf33d72 100644
--- a/mathesar_ui/src/component-library/list-box/ListBox.scss
+++ b/mathesar_ui/src/component-library/list-box/ListBox.scss
@@ -28,6 +28,11 @@
     &.in-focus {
       background: #f3f4f5;
     }
+
+    &.disabled {
+      color: var(--slate-300);
+      cursor: not-allowed;
+    }
   }
 
   &.multiple {
diff --git a/mathesar_ui/src/component-library/list-box/ListBoxOptions.svelte b/mathesar_ui/src/component-library/list-box/ListBoxOptions.svelte
index c1b3683f96..3c3d314e3d 100644
--- a/mathesar_ui/src/component-library/list-box/ListBoxOptions.svelte
+++ b/mathesar_ui/src/component-library/list-box/ListBoxOptions.svelte
@@ -76,9 +76,11 @@
     {@const isSelected = $value.some((opt) =>
       $staticProps.checkEquality(opt, option),
     )}
+    {@const isDisabled = $staticProps.checkIfOptionIsDisabled(option)}
     <li
       role="option"
       class:selected={isSelected}
+      class:disabled={isDisabled}
       class:in-focus={index === $focusedOptionIndex}
       aria-selected={isSelected ? true : undefined}
       on:click={() => api.pick(option)}
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte b/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte
index 64460036f8..db762e0a97 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte
@@ -38,9 +38,6 @@
   $: addedUsers = new Set(
     [...collaboratorsMap.values()].map((cbr) => cbr.userId),
   );
-  $: usersNotAdded = [...usersMap.values()].filter(
-    (user) => !addedUsers.has(user.id),
-  );
 
   async function addCollaborator() {
     if ($userId && $configuredRoleId) {
@@ -64,7 +61,7 @@
       input={{
         component: SelectUser,
         props: {
-          options: usersNotAdded.map((user) => user.id),
+          options: [...usersMap.values()].map((user) => user.id),
           getLabel: (option) => {
             if (option) {
               return usersMap.get(option)?.username ?? String(option);
@@ -72,6 +69,8 @@
             return $_('select_user');
           },
           autoSelect: 'none',
+          isOptionDisabled: (option) =>
+            option !== undefined && addedUsers.has(option),
         },
       }}
     />

From 900abeaf979600565574de45c0c8dd7f0b4045dc Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 19 Sep 2024 10:11:57 +0200
Subject: [PATCH 0940/1141] update label

---
 .../column/column-extraction/ExtractColumnsModal.svelte         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
index ba6a073ff2..9335f9e17e 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
@@ -329,7 +329,7 @@
             {/if}
           </RichText>
         </p>
-        <Field field={newFkColumnName} label={$_('column_name')} />
+        <Field field={newFkColumnName} label={$_('name_of_link_column')} />
       {/if}
     </OutcomeBox>
   </FieldLayout>

From 6910dc64fb0a61549225259f23a2858ee38dbebb Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 19 Sep 2024 10:16:09 +0200
Subject: [PATCH 0941/1141] fix bug

---
 .../table-view/header/new-column-cell/NewColumnCell.svelte       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mathesar_ui/src/systems/table-view/header/new-column-cell/NewColumnCell.svelte b/mathesar_ui/src/systems/table-view/header/new-column-cell/NewColumnCell.svelte
index 520d6abb85..2b0907ba64 100644
--- a/mathesar_ui/src/systems/table-view/header/new-column-cell/NewColumnCell.svelte
+++ b/mathesar_ui/src/systems/table-view/header/new-column-cell/NewColumnCell.svelte
@@ -53,6 +53,7 @@
       field={columnType}
       input={{ component: ColumnTypeSelector }}
       label={$_('select_type')}
+      layout="stacked"
     />
     <div class="submit">
       <FormSubmit

From b436fcdd54f81780d1eb14805251bf126a71ffb8 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 19 Sep 2024 15:57:36 +0530
Subject: [PATCH 0942/1141] implement roles.delete endpoint

---
 db/roles/operations/drop.py      |  5 +++++
 db/sql/00_msar.sql               | 17 +++++++++++++++++
 docs/docs/api/rpc.md             |  1 +
 mathesar/rpc/roles/base.py       | 22 ++++++++++++++++++++++
 mathesar/tests/rpc/test_roles.py | 30 ++++++++++++++++++++++++++++++
 5 files changed, 75 insertions(+)
 create mode 100644 db/roles/operations/drop.py

diff --git a/db/roles/operations/drop.py b/db/roles/operations/drop.py
new file mode 100644
index 0000000000..6c426bcbba
--- /dev/null
+++ b/db/roles/operations/drop.py
@@ -0,0 +1,5 @@
+from db.connection import exec_msar_func
+
+
+def drop_role(role_oid, conn):
+    exec_msar_func(conn, 'drop_role', role_oid)
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index fa902eb064..d70bbd6005 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1326,6 +1326,23 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+CREATE OR REPLACE FUNCTION
+msar.drop_role(rol_id regrole) RETURNS void AS $$/*
+Drop a role.
+
+Note:
+- To drop a superuser role, you must be a superuser yourself.
+- To drop non-superuser roles, you must have CREATEROLE privilege and have been granted ADMIN OPTION on the role.
+
+Args:
+  rol_id: The OID of the role to drop on the database.
+*/
+BEGIN
+  EXECUTE format('DROP ROLE %I', msar.get_role_name(rol_id));
+END;
+$$ LANGUAGE plpgsql;
+
+
 CREATE OR REPLACE FUNCTION
 msar.build_database_privilege_replace_expr(rol_id regrole, privileges_ jsonb) RETURNS TEXT AS $$
 SELECT string_agg(
diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 6933ca652e..459f2531de 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -252,6 +252,7 @@ To use an RPC function:
       members:
       - list_
       - add
+      - delete
       - get_current_role
       - RoleInfo
       - RoleMember
diff --git a/mathesar/rpc/roles/base.py b/mathesar/rpc/roles/base.py
index 9eb0de8402..ce1f7d3e8a 100644
--- a/mathesar/rpc/roles/base.py
+++ b/mathesar/rpc/roles/base.py
@@ -10,6 +10,7 @@
 from mathesar.rpc.utils import connect
 from db.roles.operations.select import list_roles, get_current_role_from_db
 from db.roles.operations.create import create_role
+from db.roles.operations.drop import drop_role
 
 
 class RoleMember(TypedDict):
@@ -118,6 +119,27 @@ def add(
     return RoleInfo.from_dict(role)
 
 
+@rpc_method(name="roles.delete")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def delete(
+    *,
+    role_oid: int,
+    database_id: int,
+    **kwargs
+) -> None:
+    """
+    Drop a role on a database server.
+
+    Args:
+        role_oid: The OID of the role to drop on the database.
+        database_id: The Django id of the database.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        drop_role(role_oid, conn)
+
+
 @rpc_method(name="roles.get_current_role")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
diff --git a/mathesar/tests/rpc/test_roles.py b/mathesar/tests/rpc/test_roles.py
index 7d9cbe539f..35b82cdd17 100644
--- a/mathesar/tests/rpc/test_roles.py
+++ b/mathesar/tests/rpc/test_roles.py
@@ -110,6 +110,36 @@ def mock_create_role(rolename, password, login, conn):
     roles.add(rolename=_username, database_id=_database_id, password=_password, login=True, request=request)
 
 
+def test_roles_delete(rf, monkeypatch):
+    _username = 'alice'
+    _password = 'pass1234'
+    _database_id = 2
+    _role_oid = 10
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=_username, password=_password)
+
+    @contextmanager
+    def mock_connect(database_id, user):
+        if database_id == _database_id and user.username == _username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_drop_role(role_oid, conn):
+        if (
+            role_oid != _role_oid
+        ):
+            raise AssertionError('incorrect parameters passed')
+        return None
+
+    monkeypatch.setattr(roles.base, 'connect', mock_connect)
+    monkeypatch.setattr(roles.base, 'drop_role', mock_drop_role)
+    roles.delete(role_oid=_role_oid, database_id=_database_id, request=request)
+
+
 def test_get_current_role(rf, monkeypatch):
     _username = 'alice'
     _password = 'pass1234'

From ee3d35193cdb5b2ce1d058466f4cc0df662cfecd Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 19 Sep 2024 16:17:55 +0530
Subject: [PATCH 0943/1141] add drop database sql functions

---
 db/sql/00_msar.sql | 50 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index d70bbd6005..a03e814736 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -516,6 +516,28 @@ END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION msar.get_database_name(dat_id oid) RETURNS TEXT AS $$/*
+Return the UNQUOTED name of a given database.
+
+If the database does not exist, an exception will be raised.
+
+Args:
+  dat_id: The OID of the role.
+*/
+DECLARE dat_name text;
+BEGIN
+  SELECT datname INTO dat_name FROM pg_catalog.pg_database WHERE oid=dat_id;
+
+  IF dat_name IS NULL THEN
+    RAISE EXCEPTION 'Database with OID % does not exist', dat_id
+    USING ERRCODE = '42704'; -- undefined_object
+  END IF;
+
+  RETURN dat_name;
+END;
+$$ LANGUAGE plpgsql STABLE RETURNS NULL ON NULL INPUT;
+
+
 CREATE OR REPLACE FUNCTION msar.get_role_name(rol_oid oid) RETURNS TEXT AS $$/*
 Return the UNQUOTED name of a given role.
 
@@ -526,7 +548,7 @@ Args:
 */
 DECLARE rol_name text;
 BEGIN
-  SELECT rolname INTO rol_name FROM pg_roles WHERE oid=rol_oid;
+  SELECT rolname INTO rol_name FROM pg_catalog.pg_roles WHERE oid=rol_oid;
 
   IF rol_name IS NULL THEN
     RAISE EXCEPTION 'Role with OID % does not exist', rol_oid
@@ -535,7 +557,7 @@ BEGIN
 
   RETURN rol_name;
 END;
-$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+$$ LANGUAGE plpgsql STABLE RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION msar.get_constraint_type_api_code(contype char) RETURNS TEXT AS $$/*
@@ -1697,6 +1719,30 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+----------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------------------------------------
+-- DROP DATABASE FUNCTIONS
+--
+-- Drop a database.
+----------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------------------------------------
+
+
+CREATE OR REPLACE FUNCTION
+msar.drop_database(dat_id oid) RETURNS void AS $$/*
+Drop a database
+
+If no database exists with the given oid, an exception will be raised.
+
+Args:
+  dat_id: The OID of the role to drop.
+*/
+BEGIN
+  EXECUTE format('DROP DATABASE %I', msar.get_database_name(dat_id));
+END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 -- DROP SCHEMA FUNCTIONS

From 0870db9be306b88ca597938cd87b0bbb5174e1f4 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 19 Sep 2024 16:21:14 +0530
Subject: [PATCH 0944/1141] add drop_database sql function with name input

---
 db/sql/00_msar.sql | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index a03e814736..b0e9639bb6 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1743,6 +1743,21 @@ END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
+CREATE OR REPLACE FUNCTION
+msar.drop_database(dat_name text) RETURNS void AS $$/*
+Drop a database
+
+If no database exists with the given name, an exception will be raised.
+
+Args:
+  dat_id: An unqoted name of the database to be dropped.
+*/
+BEGIN
+  EXECUTE format('DROP DATABASE %I', dat_name);
+END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
 ----------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------------
 -- DROP SCHEMA FUNCTIONS

From f251ee7f5d945dcdaf3982c5b3eb7aefef390f61 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 19 Sep 2024 16:35:24 +0530
Subject: [PATCH 0945/1141] Pass currentRole store to permissions modals

---
 mathesar_ui/src/api/rpc/roles.ts                 | 10 ++++++++++
 mathesar_ui/src/contexts/DatabaseRouteContext.ts |  3 +++
 mathesar_ui/src/models/Database.ts               |  9 +++++++++
 .../permissions/DatabasePermissionsModal.svelte  |  4 +++-
 .../pages/schema/SchemaPermissionsModal.svelte   |  4 +++-
 .../permissions/PermissionsModalContent.svelte   | 16 ++++++++++++----
 .../src/systems/permissions/permissionsUtils.ts  |  7 +++++++
 .../table/TablePermissions.svelte                |  4 +++-
 8 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/roles.ts b/mathesar_ui/src/api/rpc/roles.ts
index 4db5252a03..d481a70485 100644
--- a/mathesar_ui/src/api/rpc/roles.ts
+++ b/mathesar_ui/src/api/rpc/roles.ts
@@ -53,6 +53,16 @@ export const roles = {
     RawRole
   >(),
 
+  get_current_role: rpcMethodTypeContainer<
+    {
+      database_id: RawDatabase['id'];
+    },
+    {
+      current_role: RawRole;
+      parent_roles: RawRole[];
+    }
+  >(),
+
   delete: rpcMethodTypeContainer<
     {
       database_id: RawDatabase['id'];
diff --git a/mathesar_ui/src/contexts/DatabaseRouteContext.ts b/mathesar_ui/src/contexts/DatabaseRouteContext.ts
index ae4dd52f78..dce1133f6e 100644
--- a/mathesar_ui/src/contexts/DatabaseRouteContext.ts
+++ b/mathesar_ui/src/contexts/DatabaseRouteContext.ts
@@ -12,10 +12,13 @@ export class DatabaseRouteContext {
 
   underlyingDatabase;
 
+  currentRole;
+
   constructor(database: Database) {
     this.database = database;
     this.roles = database.constructRolesStore();
     this.underlyingDatabase = database.constructUnderlyingDatabaseStore();
+    this.currentRole = database.constructCurrentRoleStore();
   }
 
   /**
diff --git a/mathesar_ui/src/models/Database.ts b/mathesar_ui/src/models/Database.ts
index d867e06320..0769c464a4 100644
--- a/mathesar_ui/src/models/Database.ts
+++ b/mathesar_ui/src/models/Database.ts
@@ -79,6 +79,15 @@ export class Database {
     return new AsyncRpcApiStore(api.databases.get);
   }
 
+  constructCurrentRoleStore() {
+    return new AsyncRpcApiStore(api.roles.get_current_role, {
+      postProcess: (currentRole) => ({
+        currentRoleOid: currentRole.current_role.oid,
+        parentRoleOids: currentRole.parent_roles.map((pr) => pr.oid),
+      }),
+    });
+  }
+
   addCollaborator(
     userId: number,
     configuredRoleId: ConfiguredRole['id'],
diff --git a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
index f8eb9ce334..4149ea7ed2 100644
--- a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
+++ b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
@@ -23,7 +23,7 @@
   export let controller: ModalController;
 
   const databaseContext = DatabaseRouteContext.get();
-  $: ({ database, roles, underlyingDatabase } = $databaseContext);
+  $: ({ database, roles, underlyingDatabase, currentRole } = $databaseContext);
   $: databasePrivileges = database.constructDatabasePrivilegesStore();
 
   const accessControlConfig: AccessControlConfig<
@@ -68,11 +68,13 @@
       databasePrivileges.batchRunner({ database_id: database.id }),
       roles.batchRunner({ database_id: database.id }),
       underlyingDatabase.batchRunner({ database_id: database.id }),
+      currentRole.batchRunner({ database_id: database.id }),
     ]);
     return {
       roles,
       privilegesForRoles: databasePrivileges,
       permissionsMetaData: underlyingDatabase,
+      currentRole,
     };
   }
 
diff --git a/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte b/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte
index de50c42cc4..2d1019f47a 100644
--- a/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte
@@ -29,7 +29,7 @@
   $: schemaPrivileges = schema.constructSchemaPrivilegesStore();
 
   const databaseContext = DatabaseRouteContext.get();
-  $: ({ roles } = $databaseContext);
+  $: ({ roles, currentRole } = $databaseContext);
 
   const accessControlConfig: AccessControlConfig<
     'read' | 'read_and_create',
@@ -71,6 +71,7 @@
         schema_oid: schema.oid,
       }),
       roles.batchRunner({ database_id: schema.database.id }),
+      currentRole.batchRunner({ database_id: schema.database.id }),
     ]);
     return {
       roles,
@@ -84,6 +85,7 @@
           },
         }),
       ),
+      currentRole,
     };
   }
 
diff --git a/mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte b/mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte
index d37aae130d..d4809ea893 100644
--- a/mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte
+++ b/mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte
@@ -20,18 +20,24 @@
   export let getAsyncStores: () => PermissionsAsyncStores<Privilege>;
 
   $: asyncStores = getAsyncStores();
-  $: ({ roles, privilegesForRoles, permissionsMetaData } = asyncStores);
+  $: ({ roles, privilegesForRoles, permissionsMetaData, currentRole } =
+    asyncStores);
 
   $: isLoading =
     $roles.isLoading ||
     $privilegesForRoles.isLoading ||
-    $permissionsMetaData.isLoading;
+    $permissionsMetaData.isLoading ||
+    $currentRole.isLoading;
   $: isSuccess =
-    $roles.isOk && $privilegesForRoles.isOk && $permissionsMetaData.isOk;
+    $roles.isOk &&
+    $privilegesForRoles.isOk &&
+    $permissionsMetaData.isOk &&
+    $currentRole.isOk;
   $: errors = [
     $roles.error,
     $privilegesForRoles.error,
     $permissionsMetaData.error,
+    $currentRole.error,
   ].filter((entry): entry is string => isDefinedNonNullable(entry));
 
   $: rolesValue = new ImmutableMap($roles.resolvedValue);
@@ -39,12 +45,14 @@
   $: privilegesForRolesValue = new ImmutableMap(
     $privilegesForRoles.resolvedValue,
   );
+  $: currentRoleValue = $currentRole.resolvedValue;
   $: storeValues =
-    isSuccess && permissionsMetaDataValue
+    isSuccess && permissionsMetaDataValue && currentRoleValue
       ? {
           roles: rolesValue,
           permissionsMetaData: permissionsMetaDataValue,
           privilegesForRoles: privilegesForRolesValue,
+          currentRole: currentRoleValue,
         }
       : undefined;
 
diff --git a/mathesar_ui/src/systems/permissions/permissionsUtils.ts b/mathesar_ui/src/systems/permissions/permissionsUtils.ts
index b789f907d7..0a48174514 100644
--- a/mathesar_ui/src/systems/permissions/permissionsUtils.ts
+++ b/mathesar_ui/src/systems/permissions/permissionsUtils.ts
@@ -20,6 +20,10 @@ export interface PermissionsStoreValues<Privilege> {
   roles: ImmutableMap<Role['oid'], Role>;
   privilegesForRoles: ImmutableMap<number, RolePrivileges<Privilege>>;
   permissionsMetaData: PermissionsMetaData<Privilege>;
+  currentRole: {
+    currentRoleOid: Role['oid'];
+    parentRoleOids: Role['oid'][];
+  };
 }
 
 export interface PermissionsAsyncStores<Privilege, E = string> {
@@ -32,6 +36,9 @@ export interface PermissionsAsyncStores<Privilege, E = string> {
   permissionsMetaData: Readable<
     AsyncStoreValue<PermissionsStoreValues<Privilege>['permissionsMetaData'], E>
   >;
+  currentRole: Readable<
+    AsyncStoreValue<PermissionsStoreValues<Privilege>['currentRole'], E>
+  >;
 }
 
 export interface PermissionsModalSlots<Privilege> {
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
index 3c2f485232..1b2e17c44e 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
@@ -29,7 +29,7 @@
   $: tablePrivileges = table.constructTablePrivilegesStore();
 
   const databaseContext = DatabaseRouteContext.get();
-  $: ({ roles } = $databaseContext);
+  $: ({ roles, currentRole } = $databaseContext);
 
   const accessControlConfig: AccessControlConfig<
     'read' | 'write',
@@ -91,6 +91,7 @@
         table_oid: table.oid,
       }),
       roles.batchRunner({ database_id: table.schema.database.id }),
+      currentRole.batchRunner({ database_id: table.schema.database.id }),
     ]);
     return {
       roles,
@@ -104,6 +105,7 @@
           },
         }),
       ),
+      currentRole,
     };
   }
 

From 739ea57f6b86c29bc455db3e2e3331efc34138cf Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 19 Sep 2024 16:51:39 +0530
Subject: [PATCH 0946/1141] implement databases.delete and
 databases.configured.disconnect endpoints

---
 db/databases/operations/drop.py      |  5 +++++
 mathesar/rpc/databases/base.py       | 17 +++++++++++++++++
 mathesar/rpc/databases/configured.py | 14 ++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 db/databases/operations/drop.py

diff --git a/db/databases/operations/drop.py b/db/databases/operations/drop.py
new file mode 100644
index 0000000000..0941b5910b
--- /dev/null
+++ b/db/databases/operations/drop.py
@@ -0,0 +1,5 @@
+from db.connection import exec_msar_func
+
+
+def drop_database(database_oid, conn):
+    exec_msar_func(conn, 'drop_database', database_oid)
diff --git a/mathesar/rpc/databases/base.py b/mathesar/rpc/databases/base.py
index da2968a447..fa68060e34 100644
--- a/mathesar/rpc/databases/base.py
+++ b/mathesar/rpc/databases/base.py
@@ -5,6 +5,7 @@
 
 from mathesar.rpc.utils import connect
 from db.databases.operations.select import get_database
+from db.databases.operations.drop import drop_database
 from mathesar.rpc.exceptions.handlers import handle_rpc_exceptions
 
 
@@ -53,3 +54,19 @@ def get(*, database_id: int, **kwargs) -> DatabaseInfo:
     with connect(database_id, user) as conn:
         db_info = get_database(conn)
     return DatabaseInfo.from_dict(db_info)
+
+
+@rpc_method(name="databases.delete")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def delete(*, database_oid: int, database_id: int, **kwargs) -> None:
+    """
+    Drop a database from the server.
+
+    Args:
+        database_oid: The OID of the database to delete on the database.
+        database_id: The Django id of the database to connect to.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        drop_database(database_oid, conn)
diff --git a/mathesar/rpc/databases/configured.py b/mathesar/rpc/databases/configured.py
index f22ca281e3..47de58acc0 100644
--- a/mathesar/rpc/databases/configured.py
+++ b/mathesar/rpc/databases/configured.py
@@ -50,3 +50,17 @@ def list_(*, server_id: int = None, **kwargs) -> list[ConfiguredDatabaseInfo]:
         database_qs = Database.objects.all()
 
     return [ConfiguredDatabaseInfo.from_model(db_model) for db_model in database_qs]
+
+
+@rpc_method(name="databases.configured.disconnect")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def disconnect(*, database_id: int, **kwargs) -> None:
+    """
+    Disconnect a configured database.
+
+    Args:
+        database_id: The Django id of the database.
+    """
+    database_qs = Database.objects.get(database__id=database_id)
+    database_qs.delete()

From 19e3530df580d15eaaff97f3a686cc513de389c0 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 19 Sep 2024 16:58:53 +0530
Subject: [PATCH 0947/1141] add endpoint tests

---
 docs/docs/api/rpc.md                 |  2 ++
 mathesar/tests/rpc/test_endpoints.py | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 459f2531de..bc88e9f725 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -64,6 +64,7 @@ To use an RPC function:
     options:
       members:
       - get
+      - delete
       - DatabaseInfo
 
 ## Configured Databases
@@ -72,6 +73,7 @@ To use an RPC function:
     options:
       members:
       - list_
+      - disconnect
       - ConfiguredDatabaseInfo
 
 ## Database Privileges
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 218d4ebeb8..3a8f5a38d0 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -144,12 +144,22 @@
         "databases.get",
         [user_is_authenticated]
     ),
+    (
+        databases.delete,
+        "databases.delete",
+        [user_is_authenticated]
+    ),
 
     (
         databases.configured.list_,
         "databases.configured.list",
         [user_is_authenticated]
     ),
+    (
+        databases.configured.disconnect,
+        "databases.configured.disconnect",
+        [user_is_authenticated]
+    ),
 
     (
         databases.privileges.list_direct,
@@ -255,6 +265,11 @@
         "roles.add",
         [user_is_authenticated]
     ),
+    (
+        roles.delete,
+        "roles.delete",
+        [user_is_authenticated]
+    ),
     (
         roles.get_current_role,
         "roles.get_current_role",

From 4be937d34840e5e6c443f111092207422004bd84 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 19 Sep 2024 18:32:13 +0530
Subject: [PATCH 0948/1141] fix drop databases from python

---
 db/databases/operations/drop.py      | 11 ++++++++++-
 db/sql/00_msar.sql                   | 10 +++++-----
 mathesar/rpc/databases/configured.py |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/db/databases/operations/drop.py b/db/databases/operations/drop.py
index 0941b5910b..1d58aa4e4d 100644
--- a/db/databases/operations/drop.py
+++ b/db/databases/operations/drop.py
@@ -1,5 +1,14 @@
 from db.connection import exec_msar_func
+from psycopg import sql
 
 
 def drop_database(database_oid, conn):
-    exec_msar_func(conn, 'drop_database', database_oid)
+    cursor = conn.cursor()
+    conn.autocommit = True
+    drop_database_query = exec_msar_func(
+        conn,
+        'drop_database_query',
+        database_oid
+    ).fetchone()[0]
+    cursor.execute(sql.SQL(drop_database_query))
+    cursor.close()
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index b0e9639bb6..4ef29a1868 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1729,8 +1729,8 @@ $$ LANGUAGE plpgsql;
 
 
 CREATE OR REPLACE FUNCTION
-msar.drop_database(dat_id oid) RETURNS void AS $$/*
-Drop a database
+msar.drop_database_query(dat_id oid) RETURNS text AS $$/*
+Return the SQL query to drop a database.
 
 If no database exists with the given oid, an exception will be raised.
 
@@ -1738,13 +1738,13 @@ Args:
   dat_id: The OID of the role to drop.
 */
 BEGIN
-  EXECUTE format('DROP DATABASE %I', msar.get_database_name(dat_id));
+  RETURN format('DROP DATABASE %I', msar.get_database_name(dat_id));
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-msar.drop_database(dat_name text) RETURNS void AS $$/*
+msar.drop_database_query(dat_name text) RETURNS text AS $$/*
 Drop a database
 
 If no database exists with the given name, an exception will be raised.
@@ -1753,7 +1753,7 @@ Args:
   dat_id: An unqoted name of the database to be dropped.
 */
 BEGIN
-  EXECUTE format('DROP DATABASE %I', dat_name);
+  RETURN format('DROP DATABASE %I', dat_name);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
diff --git a/mathesar/rpc/databases/configured.py b/mathesar/rpc/databases/configured.py
index 47de58acc0..4758785d66 100644
--- a/mathesar/rpc/databases/configured.py
+++ b/mathesar/rpc/databases/configured.py
@@ -62,5 +62,5 @@ def disconnect(*, database_id: int, **kwargs) -> None:
     Args:
         database_id: The Django id of the database.
     """
-    database_qs = Database.objects.get(database__id=database_id)
+    database_qs = Database.objects.get(id=database_id)
     database_qs.delete()

From 156ce4447497011658b435d6eb21948e02fb1b87 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 19 Sep 2024 18:32:43 +0530
Subject: [PATCH 0949/1141] Implement transferring ownership in database
 permissions modal

---
 mathesar_ui/src/api/rpc/databases.ts          |  7 ++
 mathesar_ui/src/i18n/languages/en/dict.json   |  2 +
 mathesar_ui/src/models/Database.ts            |  9 ++-
 mathesar_ui/src/models/UnderlyingDatabase.ts  | 72 +++++++++++++++++++
 .../DatabasePermissionsModal.svelte           | 10 +++
 .../PermissionsModalContent.svelte            |  3 +-
 .../permissions/overview/AccessControl.svelte | 11 +--
 .../overview/AccessControlRow.svelte          |  6 +-
 .../systems/permissions/overview/Owner.svelte |  4 +-
 .../systems/permissions/permissionsUtils.ts   |  6 +-
 .../TransferOwnership.svelte                  | 71 ++++++++++++++++--
 11 files changed, 182 insertions(+), 19 deletions(-)
 create mode 100644 mathesar_ui/src/models/UnderlyingDatabase.ts

diff --git a/mathesar_ui/src/api/rpc/databases.ts b/mathesar_ui/src/api/rpc/databases.ts
index 6b4e567ca5..4275369051 100644
--- a/mathesar_ui/src/api/rpc/databases.ts
+++ b/mathesar_ui/src/api/rpc/databases.ts
@@ -91,5 +91,12 @@ export const databases = {
       },
       Array<RawDatabasePrivilegesForRole>
     >(),
+    transfer_ownership: rpcMethodTypeContainer<
+      {
+        database_id: RawDatabase['id'];
+        new_owner_oid: RawRole['oid'];
+      },
+      RawUnderlyingDatabase
+    >(),
   },
 };
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 90b98d811e..70ef6ae812 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -155,6 +155,7 @@
   "database_access_create_help": "Can access the database and create new schemas",
   "database_name": "Database Name",
   "database_not_found": "Database with id [connectionId] is not found.",
+  "database_ownership_updated_successfully": "Database ownership has been updated successfully.",
   "database_permissions": "Database Permissions",
   "database_privilege_connect_help": "Allow connections to the database.",
   "database_privilege_create_help": "Allow creation of new schemas.",
@@ -353,6 +354,7 @@
   "new_column_added_to_table": "A new column will be added to [tableName]",
   "new_foreign_key_constraint": "New Foreign Key Constraint",
   "new_link_wont_work_once_regenerated": "Once you regenerate a new link, the old link will no longer work.",
+  "new_owner": "New Owner",
   "new_password": "New Password",
   "new_pg_user_privileges_help": "The user will be granted CONNECT and CREATE privileges on the database.",
   "new_record": "New Record",
diff --git a/mathesar_ui/src/models/Database.ts b/mathesar_ui/src/models/Database.ts
index 0769c464a4..35c90a72dc 100644
--- a/mathesar_ui/src/models/Database.ts
+++ b/mathesar_ui/src/models/Database.ts
@@ -11,6 +11,7 @@ import { Collaborator } from './Collaborator';
 import { ConfiguredRole } from './ConfiguredRole';
 import { Role } from './Role';
 import type { Server } from './Server';
+import { UnderlyingDatabase } from './UnderlyingDatabase';
 
 export class Database {
   readonly id: number;
@@ -76,7 +77,13 @@ export class Database {
   }
 
   constructUnderlyingDatabaseStore() {
-    return new AsyncRpcApiStore(api.databases.get);
+    return new AsyncRpcApiStore(api.databases.get, {
+      postProcess: (rawUnderlyingDatabase) =>
+        new UnderlyingDatabase({
+          database: this,
+          rawUnderlyingDatabase,
+        }),
+    });
   }
 
   constructCurrentRoleStore() {
diff --git a/mathesar_ui/src/models/UnderlyingDatabase.ts b/mathesar_ui/src/models/UnderlyingDatabase.ts
new file mode 100644
index 0000000000..50e607352e
--- /dev/null
+++ b/mathesar_ui/src/models/UnderlyingDatabase.ts
@@ -0,0 +1,72 @@
+import { type Readable, writable } from 'svelte/store';
+
+import { api } from '@mathesar/api/rpc';
+import type { RawUnderlyingDatabase } from '@mathesar/api/rpc/databases';
+import { CancellablePromise } from '@mathesar-component-library';
+
+import type { Database } from './Database';
+import type { Role } from './Role';
+
+export class UnderlyingDatabase {
+  readonly oid: number;
+
+  private _ownerOid;
+
+  get ownerOid(): Readable<RawUnderlyingDatabase['owner_oid']> {
+    return this._ownerOid;
+  }
+
+  private _currentRolePrivileges;
+
+  get currentRolePrivileges(): Readable<
+    RawUnderlyingDatabase['current_role_priv']
+  > {
+    return this._currentRolePrivileges;
+  }
+
+  private _currentRoleOwns;
+
+  get currentRoleOwns(): Readable<RawUnderlyingDatabase['current_role_owns']> {
+    return this._currentRoleOwns;
+  }
+
+  readonly database: Database;
+
+  constructor(props: {
+    database: Database;
+    rawUnderlyingDatabase: RawUnderlyingDatabase;
+  }) {
+    this.oid = props.rawUnderlyingDatabase.oid;
+    this._ownerOid = writable(props.rawUnderlyingDatabase.owner_oid);
+    this._currentRolePrivileges = writable(
+      props.rawUnderlyingDatabase.current_role_priv,
+    );
+    this._currentRoleOwns = writable(
+      props.rawUnderlyingDatabase.current_role_owns,
+    );
+    this.database = props.database;
+  }
+
+  updateOwner(newOwner: Role['oid']) {
+    const promise = api.databases.privileges
+      .transfer_ownership({
+        database_id: this.database.id,
+        new_owner_oid: newOwner,
+      })
+      .run();
+
+    return new CancellablePromise(
+      (resolve, reject) => {
+        promise
+          .then((result) => {
+            this._ownerOid.set(result.owner_oid);
+            this._currentRolePrivileges.set(result.current_role_priv);
+            this._currentRoleOwns.set(result.current_role_owns);
+            return resolve(this);
+          }, reject)
+          .catch(reject);
+      },
+      () => promise.cancel(),
+    );
+  }
+}
diff --git a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
index 4149ea7ed2..1368844383 100644
--- a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
+++ b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
@@ -7,6 +7,7 @@
     RawDatabasePrivilegesForRole,
   } from '@mathesar/api/rpc/databases';
   import { DatabaseRouteContext } from '@mathesar/contexts/DatabaseRouteContext';
+  import type { Role } from '@mathesar/models/Role';
   import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
   import { toast } from '@mathesar/stores/toast';
   import {
@@ -89,6 +90,14 @@
     );
     toast.success($_('access_for_roles_saved_successfully'));
   }
+
+  async function transferOwnership(newOwner: Role['oid']) {
+    if (!$underlyingDatabase.resolvedValue) {
+      throw new Error('Database has not been stored');
+    }
+    await $underlyingDatabase.resolvedValue.updateOwner(newOwner);
+    toast.success($_('database_ownership_updated_successfully'));
+  }
 </script>
 
 <PermissionsModal
@@ -110,6 +119,7 @@
   <TransferOwnership
     slot="transfer-ownership"
     {controller}
+    {transferOwnership}
     let:storeValues
     {storeValues}
   />
diff --git a/mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte b/mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte
index d4809ea893..2d91bbfb6b 100644
--- a/mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte
+++ b/mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte
@@ -68,7 +68,8 @@
       for: 'owner',
     },
   ];
-  $: displayedTabs = $permissionsMetaData.resolvedValue?.current_role_owns
+  $: currentRoleOwns = $permissionsMetaData.resolvedValue?.currentRoleOwns;
+  $: displayedTabs = $currentRoleOwns
     ? tabs
     : tabs.filter((t) => t.for === 'all');
 </script>
diff --git a/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte b/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
index fe667129dc..01480256c2 100644
--- a/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
@@ -49,8 +49,9 @@
     rp: RolePrivileges<Privilege>[],
   ) => Promise<void>;
 
+  $: ({ ownerOid, currentRoleOwns } = permissionsMetaData);
   $: modifiablePrivileges = privilegesForRoles.filterValues(
-    (pr) => pr.role_oid !== permissionsMetaData.owner_oid,
+    (pr) => pr.role_oid !== $ownerOid,
   );
   $: roleAccessField = requiredField(
     getObjectAccessPrivilegeMap(config.access.levels, modifiablePrivileges),
@@ -119,12 +120,13 @@
       ...rolesWithAccessRemoved,
       ...rolesWithNewOrUpdatedAccess,
     ]);
+    controller.close();
   }
 </script>
 
 <OverviewSection title={$_('granted_access')}>
   <svelte:fragment slot="actions">
-    {#if permissionsMetaData.current_role_owns}
+    {#if $currentRoleOwns}
       <DropdownMenu
         label={$_('add_roles')}
         icon={iconAddNew}
@@ -133,8 +135,7 @@
         {#each [...roles.values()] as role (role.oid)}
           <ButtonMenuItem
             on:click={() => addAccess(role.oid)}
-            disabled={$roleAccessField.has(role.oid) ||
-              role.oid === permissionsMetaData.owner_oid}
+            disabled={$roleAccessField.has(role.oid) || role.oid === $ownerOid}
           >
             {role.name}
           </ButtonMenuItem>
@@ -164,7 +165,7 @@
   {/each}
 </OverviewSection>
 
-{#if permissionsMetaData.current_role_owns}
+{#if $currentRoleOwns}
   <div use:portalToWindowFooter class="footer">
     <FormSubmit
       {form}
diff --git a/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte b/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
index 03ecc4f4b7..fba2198556 100644
--- a/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
@@ -51,6 +51,8 @@
 
   let isRolePermissionsOpen = false;
 
+  $: currentRoleOwns = permissionsMetaData.currentRoleOwns;
+
   function setCustomPrivileges(pr: Privilege[]) {
     setAccess(roleAccess.roleOid, roleAccess.withCustomAccess(pr));
   }
@@ -70,7 +72,7 @@
 <div class="access-selection">
   <RoleWithChildren {rolesMap} roleOid={roleAccess.roleOid} />
   <div>
-    {#if permissionsMetaData.current_role_owns}
+    {#if $currentRoleOwns}
       <Select
         options={[...accessLevelsInfoMap.keys()]}
         value={roleAccess.accessLevel}
@@ -97,7 +99,7 @@
       </div>
     {/if}
   </div>
-  {#if permissionsMetaData.current_role_owns}
+  {#if $currentRoleOwns}
     <div>
       <Button
         appearance="secondary"
diff --git a/mathesar_ui/src/systems/permissions/overview/Owner.svelte b/mathesar_ui/src/systems/permissions/overview/Owner.svelte
index 158b524870..2dbc2322b6 100644
--- a/mathesar_ui/src/systems/permissions/overview/Owner.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/Owner.svelte
@@ -13,8 +13,10 @@
 
   export let roles: ImmutableMap<Role['oid'], Role>;
   export let permissionsMetaData: PermissionsMetaData<Privilege>;
+
+  $: ownerOid = permissionsMetaData.ownerOid;
 </script>
 
 <OverviewSection title={$_('owner')}>
-  <RoleWithChildren rolesMap={roles} roleOid={permissionsMetaData.owner_oid} />
+  <RoleWithChildren rolesMap={roles} roleOid={$ownerOid} />
 </OverviewSection>
diff --git a/mathesar_ui/src/systems/permissions/permissionsUtils.ts b/mathesar_ui/src/systems/permissions/permissionsUtils.ts
index 0a48174514..5f0d4eae9b 100644
--- a/mathesar_ui/src/systems/permissions/permissionsUtils.ts
+++ b/mathesar_ui/src/systems/permissions/permissionsUtils.ts
@@ -11,9 +11,9 @@ export interface RolePrivileges<Privilege> {
 
 export interface PermissionsMetaData<Privilege> {
   oid: number;
-  owner_oid: Role['oid'];
-  current_role_priv: Privilege[];
-  current_role_owns: boolean;
+  ownerOid: Readable<Role['oid']>;
+  currentRolePrivileges: Readable<Privilege[]>;
+  currentRoleOwns: Readable<boolean>;
 }
 
 export interface PermissionsStoreValues<Privilege> {
diff --git a/mathesar_ui/src/systems/permissions/transfer-ownership/TransferOwnership.svelte b/mathesar_ui/src/systems/permissions/transfer-ownership/TransferOwnership.svelte
index dd92c943e6..fcb8f39b59 100644
--- a/mathesar_ui/src/systems/permissions/transfer-ownership/TransferOwnership.svelte
+++ b/mathesar_ui/src/systems/permissions/transfer-ownership/TransferOwnership.svelte
@@ -1,9 +1,16 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import { FormSubmit, makeForm } from '@mathesar/components/form';
+  import {
+    FormSubmit,
+    makeForm,
+    requiredField,
+  } from '@mathesar/components/form';
+  import Field from '@mathesar/components/form/Field.svelte';
+  import type { Role } from '@mathesar/models/Role';
   import {
     type ModalController,
+    Select,
     portalToWindowFooter,
   } from '@mathesar-component-library';
 
@@ -12,16 +19,68 @@
   type Privilege = $$Generic;
 
   export let controller: ModalController;
+  export let transferOwnership: (o: Role['oid']) => Promise<void>;
+
   export let storeValues: PermissionsStoreValues<Privilege>;
-  $: ({ roles, permissionsMetaData } = storeValues);
+  $: ({ roles, permissionsMetaData, currentRole } = storeValues);
+
+  $: roleOids = [...roles.values()].map((r) => r.oid);
+  $: ownerOid = permissionsMetaData.ownerOid;
+  $: currentRoleInfo = roles.get(currentRole.currentRoleOid);
+
+  /**
+   * The current role might directly or indirectly own the object.
+   * In the list of possible new owners, display:
+   * - The current role, if it's not the direct owner.
+   * - The list of roles inheried by current role (direct or indirect),
+   *   omitting the direct owner.
+   *
+   * If the current role is a db superuser, then display all roles expect
+   * the direct owner.
+   */
+  $: possibleNewOwners = currentRoleInfo?.super
+    ? roleOids
+    : [...currentRole.parentRoleOids.values(), currentRole.currentRoleOid];
+  $: possibleNewOwnersWithoutCurrentOwner = new Set(
+    possibleNewOwners.filter((oid) => oid !== $ownerOid),
+  );
 
-  const form = makeForm({});
+  const SelectRole = Select<Role['oid']>;
+  const newOwner = requiredField<number | undefined>(undefined);
+  const form = makeForm({ newOwner });
 
-  function transferOwnership() {}
+  async function transfer() {
+    if ($newOwner) {
+      await transferOwnership($newOwner);
+    }
+    controller.close();
+  }
 </script>
 
+<div>
+  <Field
+    label={$_('new_owner')}
+    layout="stacked"
+    field={newOwner}
+    input={{
+      component: SelectRole,
+      props: {
+        options: roleOids,
+        getLabel: (option) => {
+          if (option) {
+            return roles.get(option)?.name ?? String(option);
+          }
+          return $_('select_role');
+        },
+        autoSelect: 'none',
+        isOptionDisabled: (option) =>
+          option !== undefined &&
+          !possibleNewOwnersWithoutCurrentOwner.has(option),
+      },
+    }}
+  />
+</div>
 <div use:portalToWindowFooter class="footer">
-  <div></div>
   <FormSubmit
     {form}
     canProceed={$form.hasChanges}
@@ -29,7 +88,7 @@
     onCancel={() => {
       controller.close();
     }}
-    onProceed={transferOwnership}
+    onProceed={transfer}
     proceedButton={{ label: $_('transfer_ownership') }}
     cancelButton={{ label: $_('cancel') }}
   />

From 9cc36f91e40c4066dae9a05fafa56fe9aba100a1 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 19 Sep 2024 18:38:16 +0530
Subject: [PATCH 0950/1141] fix docstring for drop_database sql

---
 db/sql/00_msar.sql | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 4ef29a1868..4e85cc69c7 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1745,9 +1745,7 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 CREATE OR REPLACE FUNCTION
 msar.drop_database_query(dat_name text) RETURNS text AS $$/*
-Drop a database
-
-If no database exists with the given name, an exception will be raised.
+Return the SQL query to drop a database.
 
 Args:
   dat_id: An unqoted name of the database to be dropped.

From e843d9aaa7825d58f765504213763df237fbdedc Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 19 Sep 2024 18:50:27 +0530
Subject: [PATCH 0951/1141] Implement transferring ownership for schemas

---
 mathesar_ui/src/api/rpc/schemas.ts            |  9 ++++
 mathesar_ui/src/i18n/languages/en/dict.json   |  1 +
 mathesar_ui/src/models/Schema.ts              | 49 ++++++++++++++++---
 .../schema/SchemaPermissionsModal.svelte      |  7 +++
 4 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/schemas.ts b/mathesar_ui/src/api/rpc/schemas.ts
index 7d00e7fc41..c6901e1e81 100644
--- a/mathesar_ui/src/api/rpc/schemas.ts
+++ b/mathesar_ui/src/api/rpc/schemas.ts
@@ -75,5 +75,14 @@ export const schemas = {
       },
       Array<RawSchemaPrivilegesForRole>
     >(),
+
+    transfer_ownership: rpcMethodTypeContainer<
+      {
+        database_id: RawDatabase['id'];
+        schema_oid: RawSchema['oid'];
+        new_owner_oid: RawRole['oid'];
+      },
+      RawSchema
+    >(),
   },
 };
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 70ef6ae812..dec08f7112 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -505,6 +505,7 @@
   "schema_name_already_exists": "A schema with that name already exists.",
   "schema_name_cannot_be_empty": "Schema name cannot be empty",
   "schema_not_found": "Schema not found.",
+  "schema_ownership_updated_successfully": "Schema ownership has been updated successfully.",
   "schema_permissions": "Schema Permissions",
   "schema_privilege_create_help": "Allow creation of objects within the schema.",
   "schema_privilege_usage_help": "Allow usage of the schema.",
diff --git a/mathesar_ui/src/models/Schema.ts b/mathesar_ui/src/models/Schema.ts
index 88c88cfd50..ae78698121 100644
--- a/mathesar_ui/src/models/Schema.ts
+++ b/mathesar_ui/src/models/Schema.ts
@@ -6,6 +6,7 @@ import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
 import { CancellablePromise, ImmutableMap } from '@mathesar-component-library';
 
 import type { Database } from './Database';
+import type { Role } from './Role';
 
 export class Schema {
   readonly oid: number;
@@ -28,11 +29,23 @@ export class Schema {
     return this._tableCount;
   }
 
-  readonly owner_oid: number;
+  private _ownerOid;
 
-  readonly current_role_priv: SchemaPrivilege[];
+  get ownerOid(): Readable<RawSchema['owner_oid']> {
+    return this._ownerOid;
+  }
+
+  private _currentRolePrivileges;
+
+  get currentRolePrivileges(): Readable<RawSchema['current_role_priv']> {
+    return this._currentRolePrivileges;
+  }
+
+  private _currentRoleOwns;
 
-  readonly current_role_owns: boolean;
+  get currentRoleOwns(): Readable<RawSchema['current_role_owns']> {
+    return this._currentRoleOwns;
+  }
 
   readonly isPublicSchema;
 
@@ -44,9 +57,9 @@ export class Schema {
     this.isPublicSchema = derived(this._name, ($name) => $name === 'public');
     this._description = writable(props.rawSchema.description);
     this._tableCount = writable(props.rawSchema.table_count);
-    this.owner_oid = props.rawSchema.owner_oid;
-    this.current_role_priv = props.rawSchema.current_role_priv;
-    this.current_role_owns = props.rawSchema.current_role_owns;
+    this._ownerOid = writable(props.rawSchema.owner_oid);
+    this._currentRolePrivileges = writable(props.rawSchema.current_role_priv);
+    this._currentRoleOwns = writable(props.rawSchema.current_role_owns);
     this.database = props.database;
   }
 
@@ -76,6 +89,30 @@ export class Schema {
     );
   }
 
+  updateOwner(newOwner: Role['oid']) {
+    const promise = api.schemas.privileges
+      .transfer_ownership({
+        database_id: this.database.id,
+        schema_oid: this.oid,
+        new_owner_oid: newOwner,
+      })
+      .run();
+
+    return new CancellablePromise(
+      (resolve, reject) => {
+        promise
+          .then((result) => {
+            this._ownerOid.set(result.owner_oid);
+            this._currentRolePrivileges.set(result.current_role_priv);
+            this._currentRoleOwns.set(result.current_role_owns);
+            return resolve(this);
+          }, reject)
+          .catch(reject);
+      },
+      () => promise.cancel(),
+    );
+  }
+
   setTableCount(count: number) {
     this._tableCount.set(count);
   }
diff --git a/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte b/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte
index 2d1019f47a..cc02e589a0 100644
--- a/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte
@@ -8,6 +8,7 @@
     SchemaPrivilege,
   } from '@mathesar/api/rpc/schemas';
   import { DatabaseRouteContext } from '@mathesar/contexts/DatabaseRouteContext';
+  import type { Role } from '@mathesar/models/Role';
   import type { Schema } from '@mathesar/models/Schema';
   import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
   import { AsyncStoreValue } from '@mathesar/stores/AsyncStore';
@@ -104,6 +105,11 @@
     );
     toast.success($_('access_for_roles_saved_successfully'));
   }
+
+  async function transferOwnership(newOwner: Role['oid']) {
+    await schema.updateOwner(newOwner);
+    toast.success($_('schema_ownership_updated_successfully'));
+  }
 </script>
 
 <PermissionsModal
@@ -125,6 +131,7 @@
   <TransferOwnership
     slot="transfer-ownership"
     {controller}
+    {transferOwnership}
     let:storeValues
     {storeValues}
   />

From 51c05eec96923f157c149870417b2db90cdc6d82 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 19 Sep 2024 18:50:39 +0530
Subject: [PATCH 0952/1141] Implement transferring ownership for tables

---
 mathesar_ui/src/api/rpc/tables.ts             |  9 +++
 mathesar_ui/src/i18n/languages/en/dict.json   |  1 +
 mathesar_ui/src/models/Table.ts               | 63 +++++++++++++++----
 .../table/TablePermissions.svelte             |  7 +++
 4 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/tables.ts b/mathesar_ui/src/api/rpc/tables.ts
index f90586b9f8..d2d392380d 100644
--- a/mathesar_ui/src/api/rpc/tables.ts
+++ b/mathesar_ui/src/api/rpc/tables.ts
@@ -244,5 +244,14 @@ export const tables = {
       },
       Array<RawTablePrivilegesForRole>
     >(),
+
+    transfer_ownership: rpcMethodTypeContainer<
+      {
+        database_id: RawDatabase['id'];
+        table_oid: RawTable['oid'];
+        new_owner_oid: RawRole['oid'];
+      },
+      RawTable
+    >(),
   },
 };
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index dec08f7112..c873d86941 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -578,6 +578,7 @@
   "table_name_cannot_be_empty": "The table name cannot be empty.",
   "table_not_found": "Table not found.",
   "table_not_shared": "This table is currently not shared.",
+  "table_ownership_updated_successfully": "Table ownership has been updated successfully.",
   "table_permissions": "Table Permissions",
   "table_preview": "Table Preview",
   "table_privilege_delete_help": "Allow deletion of records within the table.",
diff --git a/mathesar_ui/src/models/Table.ts b/mathesar_ui/src/models/Table.ts
index 07e107bec2..56c83709cc 100644
--- a/mathesar_ui/src/models/Table.ts
+++ b/mathesar_ui/src/models/Table.ts
@@ -1,10 +1,9 @@
+import { type Readable, writable } from 'svelte/store';
+
 import { api } from '@mathesar/api/rpc';
-import type {
-  RawTableWithMetadata,
-  TablePrivilege,
-} from '@mathesar/api/rpc/tables';
+import type { RawTableWithMetadata } from '@mathesar/api/rpc/tables';
 import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
-import { ImmutableMap } from '@mathesar-component-library';
+import { CancellablePromise, ImmutableMap } from '@mathesar-component-library';
 
 import type { Role } from './Role';
 import type { Schema } from './Schema';
@@ -20,11 +19,25 @@ export class Table {
 
   schema;
 
-  owner_oid: Role['oid'];
+  private _ownerOid;
+
+  get ownerOid(): Readable<RawTableWithMetadata['owner_oid']> {
+    return this._ownerOid;
+  }
+
+  private _currentRolePrivileges;
+
+  get currentRolePrivileges(): Readable<
+    RawTableWithMetadata['current_role_priv']
+  > {
+    return this._currentRolePrivileges;
+  }
 
-  current_role_priv: TablePrivilege[];
+  private _currentRoleOwns;
 
-  current_role_owns: boolean;
+  get currentRoleOwns(): Readable<RawTableWithMetadata['current_role_owns']> {
+    return this._currentRoleOwns;
+  }
 
   constructor(props: {
     schema: Schema;
@@ -34,12 +47,40 @@ export class Table {
     this.name = props.rawTableWithMetadata.name;
     this.description = props.rawTableWithMetadata.description;
     this.metadata = props.rawTableWithMetadata.metadata;
-    this.owner_oid = props.rawTableWithMetadata.owner_oid;
-    this.current_role_priv = props.rawTableWithMetadata.current_role_priv;
-    this.current_role_owns = props.rawTableWithMetadata.current_role_owns;
+    this._ownerOid = writable(props.rawTableWithMetadata.owner_oid);
+    this._currentRolePrivileges = writable(
+      props.rawTableWithMetadata.current_role_priv,
+    );
+    this._currentRoleOwns = writable(
+      props.rawTableWithMetadata.current_role_owns,
+    );
     this.schema = props.schema;
   }
 
+  updateOwner(newOwner: Role['oid']) {
+    const promise = api.tables.privileges
+      .transfer_ownership({
+        database_id: this.schema.database.id,
+        table_oid: this.oid,
+        new_owner_oid: newOwner,
+      })
+      .run();
+
+    return new CancellablePromise(
+      (resolve, reject) => {
+        promise
+          .then((result) => {
+            this._ownerOid.set(result.owner_oid);
+            this._currentRolePrivileges.set(result.current_role_priv);
+            this._currentRoleOwns.set(result.current_role_owns);
+            return resolve(this);
+          }, reject)
+          .catch(reject);
+      },
+      () => promise.cancel(),
+    );
+  }
+
   constructTablePrivilegesStore() {
     return new AsyncRpcApiStore(api.tables.privileges.list_direct, {
       postProcess: (rawTablePrivilegesForRoles) =>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
index 1b2e17c44e..477d6945b6 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
@@ -8,6 +8,7 @@
     TablePrivilege,
   } from '@mathesar/api/rpc/tables';
   import { DatabaseRouteContext } from '@mathesar/contexts/DatabaseRouteContext';
+  import type { Role } from '@mathesar/models/Role';
   import type { Table } from '@mathesar/models/Table';
   import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
   import { AsyncStoreValue } from '@mathesar/stores/AsyncStore';
@@ -124,6 +125,11 @@
     );
     toast.success($_('access_for_roles_saved_successfully'));
   }
+
+  async function transferOwnership(newOwner: Role['oid']) {
+    await table.updateOwner(newOwner);
+    toast.success($_('table_ownership_updated_successfully'));
+  }
 </script>
 
 <div>
@@ -151,6 +157,7 @@
   <TransferOwnership
     slot="transfer-ownership"
     {controller}
+    {transferOwnership}
     let:storeValues
     {storeValues}
   />

From 925640c2b1fa4abd5534b50244037718832b6085 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 19 Sep 2024 19:28:10 +0530
Subject: [PATCH 0953/1141] Move current access permissions metadata into
 separate class

---
 mathesar_ui/src/models/Schema.ts              | 29 +++----------
 mathesar_ui/src/models/Table.ts               | 37 +++-------------
 mathesar_ui/src/models/UnderlyingDatabase.ts  | 35 ++-------------
 .../models/internal/ObjectCurrentAccess.ts    | 43 +++++++++++++++++++
 .../PermissionsModalContent.svelte            |  3 +-
 .../permissions/overview/AccessControl.svelte |  2 +-
 .../overview/AccessControlRow.svelte          |  2 +-
 .../systems/permissions/overview/Owner.svelte |  2 +-
 .../overview/PermissionsOverview.svelte       |  2 +-
 .../systems/permissions/permissionsUtils.ts   |  5 +--
 .../TransferOwnership.svelte                  |  2 +-
 11 files changed, 66 insertions(+), 96 deletions(-)
 create mode 100644 mathesar_ui/src/models/internal/ObjectCurrentAccess.ts

diff --git a/mathesar_ui/src/models/Schema.ts b/mathesar_ui/src/models/Schema.ts
index ae78698121..25ba2da1de 100644
--- a/mathesar_ui/src/models/Schema.ts
+++ b/mathesar_ui/src/models/Schema.ts
@@ -1,11 +1,12 @@
 import { type Readable, derived, writable } from 'svelte/store';
 
 import { api } from '@mathesar/api/rpc';
-import type { RawSchema, SchemaPrivilege } from '@mathesar/api/rpc/schemas';
+import type { RawSchema } from '@mathesar/api/rpc/schemas';
 import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
 import { CancellablePromise, ImmutableMap } from '@mathesar-component-library';
 
 import type { Database } from './Database';
+import { ObjectCurrentAccess } from './internal/ObjectCurrentAccess';
 import type { Role } from './Role';
 
 export class Schema {
@@ -29,23 +30,7 @@ export class Schema {
     return this._tableCount;
   }
 
-  private _ownerOid;
-
-  get ownerOid(): Readable<RawSchema['owner_oid']> {
-    return this._ownerOid;
-  }
-
-  private _currentRolePrivileges;
-
-  get currentRolePrivileges(): Readable<RawSchema['current_role_priv']> {
-    return this._currentRolePrivileges;
-  }
-
-  private _currentRoleOwns;
-
-  get currentRoleOwns(): Readable<RawSchema['current_role_owns']> {
-    return this._currentRoleOwns;
-  }
+  readonly currentAccess;
 
   readonly isPublicSchema;
 
@@ -57,9 +42,7 @@ export class Schema {
     this.isPublicSchema = derived(this._name, ($name) => $name === 'public');
     this._description = writable(props.rawSchema.description);
     this._tableCount = writable(props.rawSchema.table_count);
-    this._ownerOid = writable(props.rawSchema.owner_oid);
-    this._currentRolePrivileges = writable(props.rawSchema.current_role_priv);
-    this._currentRoleOwns = writable(props.rawSchema.current_role_owns);
+    this.currentAccess = new ObjectCurrentAccess(props.rawSchema);
     this.database = props.database;
   }
 
@@ -102,9 +85,7 @@ export class Schema {
       (resolve, reject) => {
         promise
           .then((result) => {
-            this._ownerOid.set(result.owner_oid);
-            this._currentRolePrivileges.set(result.current_role_priv);
-            this._currentRoleOwns.set(result.current_role_owns);
+            this.currentAccess.set(result);
             return resolve(this);
           }, reject)
           .catch(reject);
diff --git a/mathesar_ui/src/models/Table.ts b/mathesar_ui/src/models/Table.ts
index 56c83709cc..5749160ef5 100644
--- a/mathesar_ui/src/models/Table.ts
+++ b/mathesar_ui/src/models/Table.ts
@@ -1,10 +1,9 @@
-import { type Readable, writable } from 'svelte/store';
-
 import { api } from '@mathesar/api/rpc';
 import type { RawTableWithMetadata } from '@mathesar/api/rpc/tables';
 import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
 import { CancellablePromise, ImmutableMap } from '@mathesar-component-library';
 
+import { ObjectCurrentAccess } from './internal/ObjectCurrentAccess';
 import type { Role } from './Role';
 import type { Schema } from './Schema';
 
@@ -17,27 +16,9 @@ export class Table {
 
   metadata;
 
-  schema;
-
-  private _ownerOid;
-
-  get ownerOid(): Readable<RawTableWithMetadata['owner_oid']> {
-    return this._ownerOid;
-  }
-
-  private _currentRolePrivileges;
+  readonly schema;
 
-  get currentRolePrivileges(): Readable<
-    RawTableWithMetadata['current_role_priv']
-  > {
-    return this._currentRolePrivileges;
-  }
-
-  private _currentRoleOwns;
-
-  get currentRoleOwns(): Readable<RawTableWithMetadata['current_role_owns']> {
-    return this._currentRoleOwns;
-  }
+  readonly currentAccess;
 
   constructor(props: {
     schema: Schema;
@@ -47,13 +28,7 @@ export class Table {
     this.name = props.rawTableWithMetadata.name;
     this.description = props.rawTableWithMetadata.description;
     this.metadata = props.rawTableWithMetadata.metadata;
-    this._ownerOid = writable(props.rawTableWithMetadata.owner_oid);
-    this._currentRolePrivileges = writable(
-      props.rawTableWithMetadata.current_role_priv,
-    );
-    this._currentRoleOwns = writable(
-      props.rawTableWithMetadata.current_role_owns,
-    );
+    this.currentAccess = new ObjectCurrentAccess(props.rawTableWithMetadata);
     this.schema = props.schema;
   }
 
@@ -70,9 +45,7 @@ export class Table {
       (resolve, reject) => {
         promise
           .then((result) => {
-            this._ownerOid.set(result.owner_oid);
-            this._currentRolePrivileges.set(result.current_role_priv);
-            this._currentRoleOwns.set(result.current_role_owns);
+            this.currentAccess.set(result);
             return resolve(this);
           }, reject)
           .catch(reject);
diff --git a/mathesar_ui/src/models/UnderlyingDatabase.ts b/mathesar_ui/src/models/UnderlyingDatabase.ts
index 50e607352e..3c4a75cfbb 100644
--- a/mathesar_ui/src/models/UnderlyingDatabase.ts
+++ b/mathesar_ui/src/models/UnderlyingDatabase.ts
@@ -1,34 +1,15 @@
-import { type Readable, writable } from 'svelte/store';
-
 import { api } from '@mathesar/api/rpc';
 import type { RawUnderlyingDatabase } from '@mathesar/api/rpc/databases';
 import { CancellablePromise } from '@mathesar-component-library';
 
 import type { Database } from './Database';
+import { ObjectCurrentAccess } from './internal/ObjectCurrentAccess';
 import type { Role } from './Role';
 
 export class UnderlyingDatabase {
   readonly oid: number;
 
-  private _ownerOid;
-
-  get ownerOid(): Readable<RawUnderlyingDatabase['owner_oid']> {
-    return this._ownerOid;
-  }
-
-  private _currentRolePrivileges;
-
-  get currentRolePrivileges(): Readable<
-    RawUnderlyingDatabase['current_role_priv']
-  > {
-    return this._currentRolePrivileges;
-  }
-
-  private _currentRoleOwns;
-
-  get currentRoleOwns(): Readable<RawUnderlyingDatabase['current_role_owns']> {
-    return this._currentRoleOwns;
-  }
+  readonly currentAccess;
 
   readonly database: Database;
 
@@ -37,13 +18,7 @@ export class UnderlyingDatabase {
     rawUnderlyingDatabase: RawUnderlyingDatabase;
   }) {
     this.oid = props.rawUnderlyingDatabase.oid;
-    this._ownerOid = writable(props.rawUnderlyingDatabase.owner_oid);
-    this._currentRolePrivileges = writable(
-      props.rawUnderlyingDatabase.current_role_priv,
-    );
-    this._currentRoleOwns = writable(
-      props.rawUnderlyingDatabase.current_role_owns,
-    );
+    this.currentAccess = new ObjectCurrentAccess(props.rawUnderlyingDatabase);
     this.database = props.database;
   }
 
@@ -59,9 +34,7 @@ export class UnderlyingDatabase {
       (resolve, reject) => {
         promise
           .then((result) => {
-            this._ownerOid.set(result.owner_oid);
-            this._currentRolePrivileges.set(result.current_role_priv);
-            this._currentRoleOwns.set(result.current_role_owns);
+            this.currentAccess.set(result);
             return resolve(this);
           }, reject)
           .catch(reject);
diff --git a/mathesar_ui/src/models/internal/ObjectCurrentAccess.ts b/mathesar_ui/src/models/internal/ObjectCurrentAccess.ts
new file mode 100644
index 0000000000..6195c228f3
--- /dev/null
+++ b/mathesar_ui/src/models/internal/ObjectCurrentAccess.ts
@@ -0,0 +1,43 @@
+import { type Readable, writable } from 'svelte/store';
+
+import type { Role } from '../Role';
+
+export class ObjectCurrentAccess<Privilege> {
+  private _ownerOid;
+
+  get ownerOid(): Readable<Role['oid']> {
+    return this._ownerOid;
+  }
+
+  private _currentRolePrivileges;
+
+  get currentRolePrivileges(): Readable<Privilege[]> {
+    return this._currentRolePrivileges;
+  }
+
+  private _currentRoleOwns;
+
+  get currentRoleOwns(): Readable<boolean> {
+    return this._currentRoleOwns;
+  }
+
+  constructor(props: {
+    owner_oid: Role['oid'];
+    current_role_priv: Privilege[];
+    current_role_owns: boolean;
+  }) {
+    this._ownerOid = writable(props.owner_oid);
+    this._currentRolePrivileges = writable(props.current_role_priv);
+    this._currentRoleOwns = writable(props.current_role_owns);
+  }
+
+  set(props: {
+    owner_oid: Role['oid'];
+    current_role_priv: Privilege[];
+    current_role_owns: boolean;
+  }) {
+    this._ownerOid.set(props.owner_oid);
+    this._currentRolePrivileges.set(props.current_role_priv);
+    this._currentRoleOwns.set(props.current_role_owns);
+  }
+}
diff --git a/mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte b/mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte
index 2d91bbfb6b..b91809a4a0 100644
--- a/mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte
+++ b/mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte
@@ -68,7 +68,8 @@
       for: 'owner',
     },
   ];
-  $: currentRoleOwns = $permissionsMetaData.resolvedValue?.currentRoleOwns;
+  $: currentRoleOwns =
+    $permissionsMetaData.resolvedValue?.currentAccess.currentRoleOwns;
   $: displayedTabs = $currentRoleOwns
     ? tabs
     : tabs.filter((t) => t.for === 'all');
diff --git a/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte b/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
index 01480256c2..27b925dc04 100644
--- a/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/AccessControl.svelte
@@ -49,7 +49,7 @@
     rp: RolePrivileges<Privilege>[],
   ) => Promise<void>;
 
-  $: ({ ownerOid, currentRoleOwns } = permissionsMetaData);
+  $: ({ ownerOid, currentRoleOwns } = permissionsMetaData.currentAccess);
   $: modifiablePrivileges = privilegesForRoles.filterValues(
     (pr) => pr.role_oid !== $ownerOid,
   );
diff --git a/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte b/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
index fba2198556..96b1fdffc6 100644
--- a/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/AccessControlRow.svelte
@@ -51,7 +51,7 @@
 
   let isRolePermissionsOpen = false;
 
-  $: currentRoleOwns = permissionsMetaData.currentRoleOwns;
+  $: currentRoleOwns = permissionsMetaData.currentAccess.currentRoleOwns;
 
   function setCustomPrivileges(pr: Privilege[]) {
     setAccess(roleAccess.roleOid, roleAccess.withCustomAccess(pr));
diff --git a/mathesar_ui/src/systems/permissions/overview/Owner.svelte b/mathesar_ui/src/systems/permissions/overview/Owner.svelte
index 2dbc2322b6..7c9765b002 100644
--- a/mathesar_ui/src/systems/permissions/overview/Owner.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/Owner.svelte
@@ -14,7 +14,7 @@
   export let roles: ImmutableMap<Role['oid'], Role>;
   export let permissionsMetaData: PermissionsMetaData<Privilege>;
 
-  $: ownerOid = permissionsMetaData.ownerOid;
+  $: ownerOid = permissionsMetaData.currentAccess.ownerOid;
 </script>
 
 <OverviewSection title={$_('owner')}>
diff --git a/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte b/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte
index 93fa63b1c7..1757f505a5 100644
--- a/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte
+++ b/mathesar_ui/src/systems/permissions/overview/PermissionsOverview.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import { type ModalController } from '@mathesar-component-library';
+  import type { ModalController } from '@mathesar-component-library';
 
   import type {
     PermissionsStoreValues,
diff --git a/mathesar_ui/src/systems/permissions/permissionsUtils.ts b/mathesar_ui/src/systems/permissions/permissionsUtils.ts
index 5f0d4eae9b..d715f7b4b2 100644
--- a/mathesar_ui/src/systems/permissions/permissionsUtils.ts
+++ b/mathesar_ui/src/systems/permissions/permissionsUtils.ts
@@ -1,5 +1,6 @@
 import type { Readable } from 'svelte/store';
 
+import type { ObjectCurrentAccess } from '@mathesar/models/internal/ObjectCurrentAccess';
 import type { Role } from '@mathesar/models/Role';
 import type { AsyncStoreValue } from '@mathesar/stores/AsyncStore';
 import type { ImmutableMap } from '@mathesar-component-library';
@@ -11,9 +12,7 @@ export interface RolePrivileges<Privilege> {
 
 export interface PermissionsMetaData<Privilege> {
   oid: number;
-  ownerOid: Readable<Role['oid']>;
-  currentRolePrivileges: Readable<Privilege[]>;
-  currentRoleOwns: Readable<boolean>;
+  currentAccess: ObjectCurrentAccess<Privilege>;
 }
 
 export interface PermissionsStoreValues<Privilege> {
diff --git a/mathesar_ui/src/systems/permissions/transfer-ownership/TransferOwnership.svelte b/mathesar_ui/src/systems/permissions/transfer-ownership/TransferOwnership.svelte
index fcb8f39b59..67bb57a2c3 100644
--- a/mathesar_ui/src/systems/permissions/transfer-ownership/TransferOwnership.svelte
+++ b/mathesar_ui/src/systems/permissions/transfer-ownership/TransferOwnership.svelte
@@ -25,7 +25,7 @@
   $: ({ roles, permissionsMetaData, currentRole } = storeValues);
 
   $: roleOids = [...roles.values()].map((r) => r.oid);
-  $: ownerOid = permissionsMetaData.ownerOid;
+  $: ownerOid = permissionsMetaData.currentAccess.ownerOid;
   $: currentRoleInfo = roles.get(currentRole.currentRoleOid);
 
   /**

From 5ee2e034c0d224d59688e9dc5026266c881ac547 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 19 Sep 2024 19:32:59 +0530
Subject: [PATCH 0954/1141] Fix typecheck error when using inline slot props in
 slot tag

---
 .../permissions/PermissionsModal.svelte        | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/mathesar_ui/src/systems/permissions/PermissionsModal.svelte b/mathesar_ui/src/systems/permissions/PermissionsModal.svelte
index be895ce28c..bf38906718 100644
--- a/mathesar_ui/src/systems/permissions/PermissionsModal.svelte
+++ b/mathesar_ui/src/systems/permissions/PermissionsModal.svelte
@@ -26,12 +26,16 @@
   <slot name="title" slot="title" />
 
   <PermissionsModalContent {getAsyncStores}>
-    <slot slot="share" name="share" let:storeValues {storeValues} />
-    <slot
-      slot="transfer-ownership"
-      name="transfer-ownership"
-      let:storeValues
-      {storeValues}
-    />
+    <!--
+      -- `<slot name="share" let:storeValues {storeValues} />` seems
+      -- to result in a error when performing typecheck even though
+      -- it works.
+    -->
+    <svelte:fragment slot="share" let:storeValues>
+      <slot name="share" {storeValues} />
+    </svelte:fragment>
+    <svelte:fragment slot="transfer-ownership" let:storeValues>
+      <slot name="transfer-ownership" {storeValues} />
+    </svelte:fragment>
   </PermissionsModalContent>
 </ControlledModal>

From 09a30c4943b3158dcd5fbb54ebc353a8ef74d222 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 19 Sep 2024 20:04:26 +0530
Subject: [PATCH 0955/1141] Rename isSuperUser to isMathesarAdmin for better
 differentiating between Mathesar superuser and database superuser

---
 mathesar_ui/src/AppContext.svelte                     | 2 +-
 mathesar_ui/src/components/AppHeader.svelte           | 2 +-
 mathesar_ui/src/pages/home/HomePage.svelte            | 2 +-
 mathesar_ui/src/pages/user-profile/ProfilePage.svelte | 2 +-
 mathesar_ui/src/routes/AuthenticatedRoutes.svelte     | 2 +-
 mathesar_ui/src/stores/users.ts                       | 6 +++---
 mathesar_ui/src/systems/users/utils.ts                | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mathesar_ui/src/AppContext.svelte b/mathesar_ui/src/AppContext.svelte
index 87e28eaeaa..563672bd6f 100644
--- a/mathesar_ui/src/AppContext.svelte
+++ b/mathesar_ui/src/AppContext.svelte
@@ -29,7 +29,7 @@
 
     const userProfileStore = setUserProfileStoreInContext(user);
     const userProfile = get(userProfileStore);
-    if (commonData.is_authenticated && userProfile.isSuperUser) {
+    if (commonData.is_authenticated && userProfile.isMathesarAdmin) {
       // Toggle these lines to test with a mock tag name
       // setReleasesStoreInContext('1.75.0');
       setReleasesStoreInContext(commonData.current_release_tag_name);
diff --git a/mathesar_ui/src/components/AppHeader.svelte b/mathesar_ui/src/components/AppHeader.svelte
index 35709b9695..a624a768c4 100644
--- a/mathesar_ui/src/components/AppHeader.svelte
+++ b/mathesar_ui/src/components/AppHeader.svelte
@@ -126,7 +126,7 @@
           <LinkMenuItem icon={iconConnection} href={HOME_URL}>
             {$_('databases')}
           </LinkMenuItem>
-          {#if $userProfile.isSuperUser}
+          {#if $userProfile.isMathesarAdmin}
             <LinkMenuItem
               icon={iconSettingsMajor}
               href={ADMIN_URL}
diff --git a/mathesar_ui/src/pages/home/HomePage.svelte b/mathesar_ui/src/pages/home/HomePage.svelte
index 9a020a5e5a..d67dac61d0 100644
--- a/mathesar_ui/src/pages/home/HomePage.svelte
+++ b/mathesar_ui/src/pages/home/HomePage.svelte
@@ -22,7 +22,7 @@
 
   const userProfileStore = getUserProfileStoreFromContext();
   $: userProfile = $userProfileStore;
-  $: isSuperUser = userProfile?.isSuperUser;
+  $: isSuperUser = userProfile?.isMathesarAdmin;
 
   let filterQuery = '';
 
diff --git a/mathesar_ui/src/pages/user-profile/ProfilePage.svelte b/mathesar_ui/src/pages/user-profile/ProfilePage.svelte
index 3fe7d6587e..aae54fa830 100644
--- a/mathesar_ui/src/pages/user-profile/ProfilePage.svelte
+++ b/mathesar_ui/src/pages/user-profile/ProfilePage.svelte
@@ -40,7 +40,7 @@
         <PasswordChangeForm userId={userProfile.id} />
       </InsetPageSection>
 
-      {#if !userProfile.isSuperUser}
+      {#if !userProfile.isMathesarAdmin}
         <InsetPageSection>
           <h2 class="large-bold-header" slot="header">
             {$_('delete_account')}
diff --git a/mathesar_ui/src/routes/AuthenticatedRoutes.svelte b/mathesar_ui/src/routes/AuthenticatedRoutes.svelte
index 1d4a90520f..7608225c37 100644
--- a/mathesar_ui/src/routes/AuthenticatedRoutes.svelte
+++ b/mathesar_ui/src/routes/AuthenticatedRoutes.svelte
@@ -33,7 +33,7 @@
   <UserProfileRoute />
 </Route>
 
-{#if userProfile?.isSuperUser}
+{#if userProfile?.isMathesarAdmin}
   <Route path="/administration/*" firstmatch>
     <AdminRoute />
   </Route>
diff --git a/mathesar_ui/src/stores/users.ts b/mathesar_ui/src/stores/users.ts
index 70e749c08a..631eadbc22 100644
--- a/mathesar_ui/src/stores/users.ts
+++ b/mathesar_ui/src/stores/users.ts
@@ -11,7 +11,7 @@ import type { MakeWritablePropertiesReadable } from '@mathesar/utils/typeUtils';
 export class UserModel {
   readonly id: User['id'];
 
-  readonly isSuperUser: User['is_superuser'];
+  readonly isMathesarAdmin: User['is_superuser'];
 
   readonly fullName: User['full_name'];
 
@@ -23,7 +23,7 @@ export class UserModel {
 
   constructor(userDetails: User) {
     this.id = userDetails.id;
-    this.isSuperUser = userDetails.is_superuser;
+    this.isMathesarAdmin = userDetails.is_superuser;
     this.fullName = userDetails.full_name;
     this.email = userDetails.email;
     this.username = userDetails.username;
@@ -37,7 +37,7 @@ export class UserModel {
   getUser(): User {
     return {
       id: this.id,
-      is_superuser: this.isSuperUser,
+      is_superuser: this.isMathesarAdmin,
       username: this.username,
       full_name: this.fullName,
       email: this.email,
diff --git a/mathesar_ui/src/systems/users/utils.ts b/mathesar_ui/src/systems/users/utils.ts
index 4805ed35ed..379ed93d80 100644
--- a/mathesar_ui/src/systems/users/utils.ts
+++ b/mathesar_ui/src/systems/users/utils.ts
@@ -23,9 +23,9 @@ export function getUserTypeInfoFromUserModel(userModel: UserModel): {
   type: UserType;
   displayName: string;
 } {
-  const type: UserType = userModel.isSuperUser ? 'admin' : 'standard';
+  const type: UserType = userModel.isMathesarAdmin ? 'admin' : 'standard';
   const displayName = getDisplayNameForUserType(type);
-  const icon = userModel.isSuperUser ? iconAdminUser : iconUser;
+  const icon = userModel.isMathesarAdmin ? iconAdminUser : iconUser;
   return {
     icon,
     type,

From f7527ce3f4403dca7c7ca2fb1e10965caefcad8b Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 19 Sep 2024 16:43:27 +0200
Subject: [PATCH 0956/1141] fix button size

---
 .../table-view/table-inspector/table/TablePermissions.svelte    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
index c39e8fd801..214de389ef 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
@@ -125,7 +125,7 @@
 </script>
 
 <div>
-  <Button appearance="secondary" on:click={() => controller.open()}>
+  <Button appearance="secondary" on:click={() => controller.open()} size="small">
     <span>{$_('table_permissions')}</span>
   </Button>
 </div>

From d74ef5ec94c6f5e362d81a4c9c2baf5978e41a23 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 19 Sep 2024 16:46:48 +0200
Subject: [PATCH 0957/1141] fix button appearance

---
 .../table-view/table-inspector/table/TableActions.svelte        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
index 55ec972e02..f786bc281f 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
@@ -63,7 +63,7 @@
 </script>
 
 <div class="actions-container">
-  <AnchorButton href={explorationPageUrl}>
+  <AnchorButton href={explorationPageUrl} appearance="secondary">
     <div class="action-item">
       <div>
         <Icon {...iconExploration} /> <span>{$_('explore_data')}</span>

From 6542e005a10e78f99d12454027389b4e80af0d38 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 19 Sep 2024 16:51:36 +0200
Subject: [PATCH 0958/1141] revert change

---
 mathesar_ui/src/components/form/Field.svelte | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mathesar_ui/src/components/form/Field.svelte b/mathesar_ui/src/components/form/Field.svelte
index 736c8e860b..e009c79766 100644
--- a/mathesar_ui/src/components/form/Field.svelte
+++ b/mathesar_ui/src/components/form/Field.svelte
@@ -29,9 +29,7 @@
 <FieldLayout>
   {#if label || $$slots.label}
     <LabeledInput {layout} {label}>
-      <svelte:fragment slot="label">
-        <slot name="label" />
-      </svelte:fragment>
+      <slot name="label" slot="label" />
       <svelte:component
         this={inputComponent}
         bind:value={$field}

From 176b845ebd4573ce93bc2dd365081922b03c44ba Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 19 Sep 2024 22:59:21 +0200
Subject: [PATCH 0959/1141] revert changes

---
 .../ForeignKeyConstraintDetails.svelte        |   1 -
 .../constraints/NewFkConstraint.svelte        |  12 +-
 .../link-table/LinkTableForm.svelte           | 105 ++++++++----------
 .../table-view/link-table/NewColumn.svelte    |  37 ++----
 4 files changed, 60 insertions(+), 95 deletions(-)

diff --git a/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte b/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
index 38b968eaf3..0167c3eda9 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
@@ -91,7 +91,6 @@
 
   .target-details {
     display: flex;
-    align-items: center;
 
     > :global(* + *) {
       margin-left: 0.25rem;
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
index 8ed7490082..412d18de76 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
@@ -120,6 +120,8 @@
 </script>
 
 <div class="add-new-fk-constraint">
+  <span class="title">{$_('new_foreign_key_constraint')}</span>
+
   <Field
     field={baseColumn}
     input={{
@@ -127,12 +129,8 @@
       props: { columns: baseTableColumns },
     }}
     layout="stacked"
-    label={$_('referencing_column')}
-  >
-    <span slot="help">
-      {$_('column_references_target_table')}
-    </span>
-  </Field>
+    label={$_('column_references_target_table')}
+  />
 
   <Field
     field={targetTable}
@@ -191,7 +189,7 @@
     onProceed={handleSave}
     onCancel={onClose}
     size="small"
-    proceedButton={{ label: $_('add_foreign_key_constraint') }}
+    proceedButton={{ label: $_('add') }}
   />
 </div>
 
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index f8e0c6e4a9..eedd371df8 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -222,13 +222,9 @@
   }
 </script>
 
-<div class="description">
-  {$_('link_table_description')}
-</div>
-
 <div class="form" class:self-referential={isSelfReferential}>
   <FieldLayout>
-    <InfoBox fullWidth={true}>
+    <InfoBox>
       {$_('links_info')}
     </InfoBox>
   </FieldLayout>
@@ -270,50 +266,49 @@
         {:else if $linkType === 'manyToOne'}
           <NewColumn {base} {target} field={columnNameInBase} />
         {:else if $linkType === 'manyToMany'}
-          <p>
-            <RichText
-              text={'We will create a new table [mappingTable].'}
-              let:slotName
-            >
-              {#if slotName === 'mappingTable'}
-                <Pill table={{ name: $mappingTableName }} which="mapping" />
-              {:else if slotName === 'targetTable'}
-                <Pill table={target} which="target" />
-              {:else if slotName === 'baseTable'}
-                <Pill table={base} which="base" />
-              {/if}
-            </RichText>
-          </p>
-          <Field field={mappingTableName} label={$_('Name of New Table')}>
-            <span slot="help">
-              {$_('mapping_table_description', {
-                values: {
-                  count: isSelfReferential ? 1 : 2,
-                },
-              })}
-            </span>
-          </Field>
-          {#if $mappingTableName}
-            <NewColumn
-              base={{ name: $mappingTableName }}
-              baseWhich="mapping"
-              target={base}
-              targetWhich="base"
-              field={columnNameMappingToBase}
-              label={$_('Name of New Column {number}', {
-                values: { number: 1 },
-              })}
-            />
-            <NewColumn
-              base={{ name: $mappingTableName }}
-              baseWhich="mapping"
-              target={isSelfReferential ? base : target}
-              targetWhich={isSelfReferential ? 'base' : 'target'}
-              field={columnNameMappingToTarget}
-              label={$_('Name of New Column {number}', {
-                values: { number: 2 },
-              })}
-            />
+          {#if isSelfReferential}
+            <p>{$_('we_will_create_a_new_table')}</p>
+            <Field field={mappingTableName} label={$_('table_name')} />
+            {#if $mappingTableName}
+              <p>
+                <RichText
+                  text={$_('we_will_add_two_columns_in_x_to_y')}
+                  let:slotName
+                >
+                  {#if slotName === 'mappingTable'}
+                    <Pill table={{ name: $mappingTableName }} which="mapping" />
+                  {:else if slotName === 'targetTable'}
+                    <Pill table={target} which="target" />
+                  {/if}
+                </RichText>
+              </p>
+              <Field
+                field={columnNameMappingToBase}
+                label={$_('column_number_name', { values: { number: 1 } })}
+              />
+              <Field
+                field={columnNameMappingToTarget}
+                label={$_('column_number_name', { values: { number: 2 } })}
+              />
+            {/if}
+          {:else}
+            <p>{$_('we_will_create_a_new_table')}</p>
+            <Field field={mappingTableName} label={$_('table_name')} />
+            {#if $mappingTableName}
+              <NewColumn
+                base={{ name: $mappingTableName }}
+                baseWhich="mapping"
+                target={base}
+                targetWhich="base"
+                field={columnNameMappingToBase}
+              />
+              <NewColumn
+                base={{ name: $mappingTableName }}
+                baseWhich="mapping"
+                {target}
+                field={columnNameMappingToTarget}
+              />
+            {/if}
           {/if}
         {:else}
           {assertExhaustive($linkType)}
@@ -348,16 +343,4 @@
     --target-fill: var(--base-fill);
     --target-stroke: var(--base-stroke);
   }
-  .description {
-    margin-bottom: 1rem;
-  }
-  :global(.form .outcome-box .labeled-input.layout-inline .label-content) {
-    align-items: flex-start;
-  }
-  :global(.form .outcome-box .label) {
-    width: 12rem;
-  }
-  :global(.form .outcome-box .label-content .input) {
-    flex-grow: 1;
-  }
 </style>
diff --git a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
index 194ef816de..ff598160ac 100644
--- a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
@@ -9,7 +9,7 @@
 
   import Pill from './LinkTablePill.svelte';
 
-  export let label = 'Name of New Column';
+  const label = 'Column Name';
 
   type Which = ComponentProps<Pill>['which'];
 
@@ -21,20 +21,15 @@
   export let targetColumnsAreLoading = false;
 </script>
 
-{#if baseWhich !== 'mapping'}
-  <p>
-    <RichText text={$_('we_will_add_a_column_in_x_to_y')} let:slotName>
-      {#if slotName === 'baseTable'}
-        <Pill table={base} which={baseWhich} />
-      {:else if slotName === 'targetTable'}
-        <Pill table={target} which={targetWhich} />
-      {:else if slotName === 'mappingTable'}
-        <Pill table={base} which={baseWhich} />
-      {/if}
-    </RichText>
-  </p>
-{/if}
-
+<p>
+  <RichText text={$_('we_will_add_a_column_in_x_to_y')} let:slotName>
+    {#if slotName === 'baseTable'}
+      <Pill table={base} which={baseWhich} />
+    {:else if slotName === 'targetTable'}
+      <Pill table={target} which={targetWhich} />
+    {/if}
+  </RichText>
+</p>
 {#if targetColumnsAreLoading}
   <!--
     We need to wait for the columns to load because we can't suggest a valid
@@ -43,15 +38,5 @@
   {label}
   <Spinner />
 {:else}
-  <Field {field} {label}>
-    <span slot="help">
-      <RichText text={$_('new_column_link_help')} let:slotName>
-        {#if slotName === 'baseTable'}
-          <Pill table={base} which={baseWhich} />
-        {:else if slotName === 'targetTable'}
-          <Pill table={target} which={targetWhich} />
-        {/if}
-      </RichText>
-    </span>
-  </Field>
+  <Field {field} {label} />
 {/if}

From ef83ca9a6a66fe3910efaad7545199923acc371b Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 19 Sep 2024 23:08:29 +0200
Subject: [PATCH 0960/1141] revert changes

---
 .../src/component-library/window/Window.scss  |  7 ++----
 .../NameAndDescInputModalForm.svelte          |  8 +++----
 .../InstallationSchemaSelector.svelte         | 13 +++++++++--
 .../systems/schemas/AddEditSchemaModal.svelte | 14 +++---------
 .../ConstraintCollapseHeader.svelte           |  2 +-
 .../constraints/ConstraintTypeSection.svelte  | 10 ++++-----
 .../constraints/TableConstraintsModal.svelte  |  1 +
 .../link-table/SelectLinkType.svelte          |  1 -
 .../ExtractColumnsModal.svelte                | 22 ++++++++-----------
 9 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/mathesar_ui/src/component-library/window/Window.scss b/mathesar_ui/src/component-library/window/Window.scss
index f5a0a506b6..dffb8641f0 100644
--- a/mathesar_ui/src/component-library/window/Window.scss
+++ b/mathesar_ui/src/component-library/window/Window.scss
@@ -3,7 +3,6 @@
   border-radius: 0.4em;
   min-height: var(--window-min-height, 7em);
   width: var(--window-width, 100%);
-  min-width: var(--window-min-width, 40em);
   overflow: hidden;
   display: grid;
   grid-template: auto 1fr auto / auto;
@@ -16,16 +15,14 @@
     display: flex;
     justify-content: flex-end;
     align-items: flex-start;
-    padding: 1rem;
-    border-bottom: 1px solid var(--slate-200);
     .title {
       &:empty {
         display: none;
       }
       flex: 1 1 100%;
-      margin: auto;
+      padding: 1rem 1rem 0.5rem 1rem;
       font-weight: 500;
-      font-size: var(--text-size-x-large);
+      font-size: var(--text-size-large);
     }
   }
 
diff --git a/mathesar_ui/src/components/NameAndDescInputModalForm.svelte b/mathesar_ui/src/components/NameAndDescInputModalForm.svelte
index ecb35ad75d..300e8be269 100644
--- a/mathesar_ui/src/components/NameAndDescInputModalForm.svelte
+++ b/mathesar_ui/src/components/NameAndDescInputModalForm.svelte
@@ -29,8 +29,6 @@
   export let getInitialName: () => string = () => '';
   export let getInitialDescription: () => string = () => '';
   export let save: (name: string, description: string) => Promise<void>;
-  export let namePlaceholder = $_('name');
-  export let descriptionPlaceholder = $_('description');
 
   /**
    * NOTE: This is NOT a feature
@@ -102,7 +100,7 @@
             nameHasChanged = true;
           }}
           disabled={isSubmitting}
-          placeholder={namePlaceholder}
+          placeholder={$_('name')}
           id="name"
         />
         {#if nameHasChanged && nameValidationErrors.length}
@@ -120,7 +118,7 @@
             bind:value={description}
             aria-label={$_('description')}
             disabled={isSubmitting}
-            placeholder={descriptionPlaceholder}
+            placeholder={$_('description')}
           />
         </LabeledInput>
       </div>
@@ -148,7 +146,7 @@
     flex-direction: column;
 
     > :global(* + *) {
-      margin-top: 0.25rem;
+      margin-top: 1rem;
     }
   }
 
diff --git a/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte b/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte
index 6913d6c142..618a66d1a0 100644
--- a/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte
@@ -29,9 +29,8 @@
   export let installationSchemas: RequiredField<InstallationSchema[]>;
 </script>
 
-<div>
+<div class="schemas-cbgroup">
   <CheckboxGroup
-    boxed
     label={$_('schemas_to_install')}
     ariaLabel={$_('schemas_to_install')}
     bind:values={$installationSchemas}
@@ -41,3 +40,13 @@
     getCheckboxDisabled={(o) => o === 'internal'}
   />
 </div>
+
+<style>
+  .schemas-cbgroup :global(ul.options) {
+    background: var(--white);
+    padding: 1rem;
+    border: 1px solid var(--slate-200);
+    border-radius: var(--border-radius-m);
+    margin-top: var(--size-ultra-small);
+  }
+</style>
diff --git a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
index e9d3f71613..77185548b2 100644
--- a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
+++ b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
@@ -60,13 +60,12 @@
   getInitialName={() => $schemaName ?? ''}
   getInitialDescription={() => $schemaDescription ?? ''}
   saveButtonLabel={schema ? $_('save') : $_('create_new_schema')}
-  namePlaceholder="Eg. Personal Finances, Movies"
 >
   <svelte:fragment slot="helpText">
     {#if !schema}
-      <span class="description">
-        {$_('schema_description')}
-      </span>
+      <InfoBox>
+        {$_('name_your_schema_help')}
+      </InfoBox>
     {/if}
   </svelte:fragment>
 
@@ -82,10 +81,3 @@
     {/if}
   </span>
 </NameAndDescInputModalForm>
-
-<style>
-  .description {
-    display: inline-block;
-    margin-bottom: 1rem;
-  }
-</style>
diff --git a/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte b/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte
index 9246057343..3e60be951a 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte
@@ -45,7 +45,7 @@
     font-size: var(--text-size-small);
     background-color: var(--slate-200);
     border-radius: var(--border-radius-xl);
-    padding: 0.25rem 0.75rem;
+    padding: 0.285rem 0.428rem;
     margin-bottom: var(--size-super-ultra-small);
   }
 </style>
diff --git a/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte b/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
index a96ff82242..52c7b02da1 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
@@ -137,7 +137,7 @@
     }
 
     :global(.collapsible-content) {
-      padding-left: var(--size-x-large);
+      padding-left: 1rem;
     }
 
     .null {
@@ -150,14 +150,14 @@
     justify-content: space-between;
     align-items: center;
     font-size: var(--text-size-large);
-    font-weight: var(--font-weight-medium);
+
     border-bottom: 1px solid var(--slate-200);
-    min-height: 2.5rem;
-    margin-bottom: var(--size-xx-small);
+    padding: 0.25rem;
+    margin-bottom: 0.5rem;
   }
 
   .add-constraint {
-    padding: var(--size-base);
+    padding: 0.5rem;
     border: 1px solid var(--slate-300);
     border-radius: var(--border-radius-m);
   }
diff --git a/mathesar_ui/src/systems/table-view/constraints/TableConstraintsModal.svelte b/mathesar_ui/src/systems/table-view/constraints/TableConstraintsModal.svelte
index 67b8befe9c..df84f81fa2 100644
--- a/mathesar_ui/src/systems/table-view/constraints/TableConstraintsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/TableConstraintsModal.svelte
@@ -22,6 +22,7 @@
 <style lang="scss">
   .description {
     display: inline-block;
+    font-size: var(--text-size-small);
     margin-bottom: 1rem;
   }
 </style>
diff --git a/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte b/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
index 78aa05a9a7..95d65a4fdd 100644
--- a/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
@@ -48,7 +48,6 @@
   }
   legend {
     margin-bottom: 0.5rem;
-    font-weight: var(--font-weight-medium);
   }
   .options {
     display: grid;
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
index 6f52e650fa..ba6a073ff2 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/column-extraction/ExtractColumnsModal.svelte
@@ -273,6 +273,7 @@
       field={linkedTable}
       input={{ component: SelectLinkedTable, props: { linkedTables } }}
       label={$_('linked_table')}
+      layout="stacked"
     />
   {/if}
 
@@ -321,19 +322,14 @@
         </RichText>
       </p>
       {#if $targetType === 'newTable'}
-        <Field
-          field={newFkColumnName}
-          label={$_('name_of_link_column')}
-          layout="stacked"
-        >
-          <span slot="help">
-            <RichText text={$_('new_column_added_to_table')} let:slotName>
-              {#if slotName === 'tableName'}
-                <TableName table={currentTable} truncate={false} bold />
-              {/if}
-            </RichText>
-          </span>
-        </Field>
+        <p>
+          <RichText text={$_('new_column_added_to_table')} let:slotName>
+            {#if slotName === 'tableName'}
+              <TableName table={currentTable} truncate={false} bold />
+            {/if}
+          </RichText>
+        </p>
+        <Field field={newFkColumnName} label={$_('column_name')} />
       {/if}
     </OutcomeBox>
   </FieldLayout>

From c195b7ad08ad261b31bbaf7d1f3b1208d88956cf Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Fri, 20 Sep 2024 10:33:28 +0200
Subject: [PATCH 0961/1141] style updates

---
 .../src/component-library/button/Button.scss  | 25 +++++++++++++++++++
 .../src/component-library/commonTypes.ts      |  1 +
 .../table-inspector/TableInspector.svelte     | 15 ++++++++---
 .../column/ColumnActions.svelte               |  4 +--
 .../table-inspector/column/ColumnMode.svelte  |  4 +--
 .../table-inspector/record/RecordMode.svelte  |  4 +--
 .../table-inspector/record/RowActions.svelte  |  4 +--
 .../table/AdvancedActions.svelte              |  2 +-
 .../table-inspector/table/TableActions.svelte |  2 +-
 .../table-inspector/table/TableMode.svelte    |  4 +--
 .../table/links/LinkItem.svelte               | 11 ++++----
 .../table/links/LinkSection.svelte            |  2 +-
 12 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/mathesar_ui/src/component-library/button/Button.scss b/mathesar_ui/src/component-library/button/Button.scss
index 9cd2322834..b377a50413 100644
--- a/mathesar_ui/src/component-library/button/Button.scss
+++ b/mathesar_ui/src/component-library/button/Button.scss
@@ -191,6 +191,31 @@
     opacity: 0.5;
     cursor: not-allowed;
   }
+
+  &.btn-action {
+    background: var(--sand-100);
+    border-color: var(--sand-400);
+
+    &:not(:disabled) {
+      &:hover,
+      &.hover {
+        background: var(--sand-200);
+        border-color: var(--sand-500);
+      }
+
+      &:active,
+      &.active {
+        background: var(--sand-300);
+        border-color: var(--sand-600);
+      }
+
+      &:focus,
+      &.focus {
+        outline: 2px solid var(--sand-500);
+        outline-offset: 1px;
+      }
+    }
+  }
 }
 a.btn {
   text-decoration: none;
diff --git a/mathesar_ui/src/component-library/commonTypes.ts b/mathesar_ui/src/component-library/commonTypes.ts
index 7e7321f36d..3c1402bac1 100644
--- a/mathesar_ui/src/component-library/commonTypes.ts
+++ b/mathesar_ui/src/component-library/commonTypes.ts
@@ -5,6 +5,7 @@ export type Appearance =
   | 'plain'
   | 'ghost'
   | 'plain-primary'
+  | 'action'
   | 'outline-primary';
 
 export type Size = 'small' | 'medium' | 'large';
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte b/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
index 870fab24d7..aa48ef6647 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
@@ -48,16 +48,23 @@
 <style lang="scss">
   .table-inspector {
     height: 100%;
-    box-shadow:
-      0px 2px 2px 0px rgba(0, 0, 0, 0.14),
-      0px 3px 1px -2px rgba(0, 0, 0, 0.12),
-      0px 1px 5px 0px rgba(0, 0, 0, 0.2);
+    box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05);
     position: relative;
     background-color: var(--sand-100);
     isolation: isolate;
 
+    :global(.tabs-container) {
+      padding: 3px;
+    }
+
     :global(.collapsible > .collapsible-header > button.btn) {
       background-color: var(--sand-200);
+      transition: all 0.2s ease;
+      border-radius: 4px;
+      margin: 3px 0;
+      font-weight: var(--font-weight-medium);
+      outline: none;
+      border: 2px solid transparent;
 
       &:hover {
         background-color: var(--sand-300);
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnActions.svelte
index db041a5014..1c68e9b12a 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnActions.svelte
@@ -55,7 +55,7 @@
 </script>
 
 <div class="actions-container">
-  <Button on:click={handleMoveColumnsToNewLinkedTable} appearance="secondary">
+  <Button on:click={handleMoveColumnsToNewLinkedTable} appearance="action">
     <div class="action-item">
       <div>
         <Icon {...iconMoveColumnsToNewLinkedTable} />
@@ -69,7 +69,7 @@
     </div>
   </Button>
   {#if canMoveToLinkedTable}
-    <Button on:click={handleMoveColumnsToExistingLinkedTable} appearance="secondary">
+    <Button on:click={handleMoveColumnsToExistingLinkedTable} appearance="action">
       <div class="action-item">
         <div>
           <Icon {...iconMoveColumnsToExistingLinkedTable} />
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
index f1223d5e6b..3529183e0d 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
@@ -154,7 +154,7 @@
 
 <style lang="scss">
   .column-mode-container {
-    padding-bottom: 1rem;
+    padding-bottom: var(--size-small);
     display: flex;
     flex-direction: column;
   }
@@ -164,7 +164,7 @@
   }
 
   .content-container {
-    padding: 1rem;
+    padding: var(--size-small);
     display: flex;
     flex-direction: column;
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
index eec9c58c3b..b432eb8aa0 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
@@ -43,7 +43,7 @@
 
 <style lang="scss">
   .column-mode-container {
-    padding-bottom: 1rem;
+    padding-bottom: var(--size-small);
     display: flex;
     flex-direction: column;
   }
@@ -57,7 +57,7 @@
   }
 
   .content-container {
-    padding: 1rem;
+    padding: var(--size-small);
     display: flex;
     flex-direction: column;
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
index 0d82071311..2c60d17e1d 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
@@ -65,7 +65,7 @@
 
 <div class="actions-container">
   {#if recordPageLink}
-    <AnchorButton href={recordPageLink} appearance="secondary">
+    <AnchorButton href={recordPageLink} appearance="action">
       <div class="action-item">
         <div>
           <Icon {...iconRecord} />
@@ -75,7 +75,7 @@
       </div>
     </AnchorButton>
   {/if}
-  <Button on:click={handleDeleteRecords} appearance="secondary">
+  <Button on:click={handleDeleteRecords} appearance="action">
     <Icon {...iconDeleteMajor} />
     <span>
       {$_('delete_records', { values: { count: selectedRowCount } })}
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/AdvancedActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/AdvancedActions.svelte
index 6044256246..95d90f2a1e 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/AdvancedActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/AdvancedActions.svelte
@@ -16,7 +16,7 @@
 </script>
 
 <div class="actions-container">
-  <Button on:click={() => constraintsModal.open()} appearance="secondary">
+  <Button on:click={() => constraintsModal.open()} appearance="action">
     <div class="action-item">
       <div>
         <Icon {...iconConstraint} /> <span>{$_('constraints')}</span>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
index f786bc281f..5222bd06f6 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
@@ -63,7 +63,7 @@
 </script>
 
 <div class="actions-container">
-  <AnchorButton href={explorationPageUrl} appearance="secondary">
+  <AnchorButton href={explorationPageUrl} appearance="action">
     <div class="action-item">
       <div>
         <Icon {...iconExploration} /> <span>{$_('explore_data')}</span>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
index dd0a53c768..63eace0379 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
@@ -74,11 +74,11 @@
 
 <style lang="scss">
   .table-mode-container {
-    padding-bottom: 1rem;
+    padding-bottom: var(--size-small);
   }
 
   .content-container {
-    padding: 1rem;
+    padding: var(--size-small);
     display: flex;
     flex-direction: column;
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkItem.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkItem.svelte
index bb3b313383..d701cea97f 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkItem.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkItem.svelte
@@ -30,17 +30,18 @@
 
 <style lang="scss">
   .link-item-container {
-    border-left: 4px solid var(--yellow-300);
+    border-left: 3px solid var(--yellow-300);
     background-color: var(--white);
-    padding: 0.5rem;
-    border-radius: var(--border-radius-m);
+    padding: 0.5rem 0.625rem;
+    border-radius: 0.375rem;
     cursor: pointer;
     display: flex;
     flex-direction: column;
-    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.06);
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
 
     &:hover {
-      background: var(--slate-100);
+      background: var(--slate-50);
+      box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
     }
 
     > :global(* + *) {
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkSection.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkSection.svelte
index c8d334777e..e74a2235d3 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkSection.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkSection.svelte
@@ -55,7 +55,7 @@
       flex-direction: column;
 
       > :global(* + *) {
-        margin-top: 0.75rem;
+        margin-top: 0.5rem;
       }
     }
   }

From 18dcc67acf3cd4e02f73270cec5fa7f22ec04f1e Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Fri, 20 Sep 2024 13:24:51 +0200
Subject: [PATCH 0962/1141] remove unused classes

---
 .../src/systems/table-view/link-table/LinkTableForm.svelte   | 3 ---
 .../record-summary/RecordSummaryConfig.svelte                | 5 -----
 2 files changed, 8 deletions(-)

diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index 9bcff5fc18..c829704c6f 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -385,9 +385,6 @@
     --target-fill: var(--base-fill);
     --target-stroke: var(--base-stroke);
   }
-  .description {
-    margin-bottom: 1rem;
-  }
   :global(
       .form
         .collapsible
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
index 14cc129ab0..906028c708 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte
@@ -160,11 +160,6 @@
 </div>
 
 <style>
-  .heading {
-    margin-block: 0;
-    color: var(--color-text-muted);
-    font-size: var(--text-size-small);
-  }
   .content > :global(* + *) {
     margin-top: 1rem;
   }

From 4f789be1fe41dba71a77d2121bad54040702a4d8 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Fri, 20 Sep 2024 13:26:40 +0200
Subject: [PATCH 0963/1141] remove placeholder

---
 mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
index 2af8e42032..77185548b2 100644
--- a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
+++ b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
@@ -60,7 +60,6 @@
   getInitialName={() => $schemaName ?? ''}
   getInitialDescription={() => $schemaDescription ?? ''}
   saveButtonLabel={schema ? $_('save') : $_('create_new_schema')}
-  namePlaceholder={$_('schema_name_placeholder')}
 >
   <svelte:fragment slot="helpText">
     {#if !schema}

From 37e214031f7db8ab3452d2949d797b5f31e8fd00 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Fri, 20 Sep 2024 13:34:40 +0200
Subject: [PATCH 0964/1141] remove unused element

---
 .../src/component-library/labeled-input/LabeledInput.svelte  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mathesar_ui/src/component-library/labeled-input/LabeledInput.svelte b/mathesar_ui/src/component-library/labeled-input/LabeledInput.svelte
index af49c2d29a..21c8d02a88 100644
--- a/mathesar_ui/src/component-library/labeled-input/LabeledInput.svelte
+++ b/mathesar_ui/src/component-library/labeled-input/LabeledInput.svelte
@@ -6,7 +6,6 @@
   export let label: string | undefined = undefined;
   export let help: string | undefined = undefined;
   export let layout: LabeledInputLayout = 'inline';
-  export let description: string | undefined = undefined;
 </script>
 
 <div
@@ -24,11 +23,7 @@
       -->
       <span class="label">{label ?? ''}<slot name="label" /></span>
       <span class="input"><slot /></span>
-
       <span class="help">{help ?? ''}<slot name="help" /></span>
     </span>
-    <span class="description">
-      <slot name="description" />
-    </span>
   </Label>
 </div>

From b4d4d1adddf0b851854a3a1576da768a22c30ebf Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Fri, 20 Sep 2024 13:42:16 +0200
Subject: [PATCH 0965/1141] remove invalid property

---
 .../table-inspector/record-summary/AppendColumn.svelte           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/AppendColumn.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/AppendColumn.svelte
index 3a12231bbe..34dce46827 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record-summary/AppendColumn.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record-summary/AppendColumn.svelte
@@ -39,7 +39,6 @@
   icon={iconAddNew}
   {disabled}
   size="small"
-  appearance="secondary"
 >
   {#each columns as column (column.id)}
     <ButtonMenuItem

From 4d81d5966511e20c0c2f863f3c422295e13f2e3e Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Fri, 20 Sep 2024 14:03:44 +0200
Subject: [PATCH 0966/1141] update font weight

---
 .../table-view/table-inspector/table/links/LinkSection.svelte    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkSection.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkSection.svelte
index e74a2235d3..ce340e0724 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkSection.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/links/LinkSection.svelte
@@ -34,6 +34,7 @@
       align-items: center;
       justify-content: space-between;
       margin-bottom: 0.5rem;
+      font-weight: var(--font-weight-medium);
 
       > :global(* + *) {
         margin-left: 0.25rem;

From 6b4331988ba8acd4474b84d07fc431de994dc75d Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 20 Sep 2024 18:42:38 +0530
Subject: [PATCH 0967/1141] Admin level permission checks and minor syling
 improvements

---
 .../tabs/TabContainer.svelte                  | 49 ++++++++++---------
 mathesar_ui/src/components/Errors.svelte      |  5 +-
 .../pages/database/DatabasePageWrapper.svelte | 34 +++++++------
 .../collaborators/CollaboratorRow.svelte      |  6 +++
 .../collaborators/Collaborators.svelte        | 10 +++-
 .../RoleConfiguration.svelte                  |  6 +++
 mathesar_ui/src/pages/home/HomePage.svelte    |  5 +-
 mathesar_ui/src/stores/userProfile.ts         | 11 +++--
 .../PermissionsModalContent.svelte            |  9 ++--
 9 files changed, 88 insertions(+), 47 deletions(-)

diff --git a/mathesar_ui/src/component-library/tabs/TabContainer.svelte b/mathesar_ui/src/component-library/tabs/TabContainer.svelte
index bdce6d6691..ef77d4032f 100644
--- a/mathesar_ui/src/component-library/tabs/TabContainer.svelte
+++ b/mathesar_ui/src/component-library/tabs/TabContainer.svelte
@@ -27,6 +27,9 @@
   export let fillContainerHeight = false;
   export let uniformTabWidth = true;
   export let tabStyle: 'default' | 'compact' = 'default';
+  export let hideTabsInCaseOfSingleTab = false;
+
+  $: hideTabs = hideTabsInCaseOfSingleTab && tabs.length === 1;
 
   function selectActiveTab(e: Event, tab: Tab) {
     const hasLink = !!tab[linkKey];
@@ -88,28 +91,30 @@
   class:fill-container-height={fillContainerHeight}
   class:compact={tabStyle === 'compact'}
 >
-  <ul role="tablist" class="tabs" class:fill-tab-width={fillTabWidth}>
-    {#each tabs as tab, index (tab[idKey] || tab)}
-      <TabComponent
-        {componentId}
-        {tab}
-        {allowRemoval}
-        {uniformTabWidth}
-        link={getTabLink(tab)}
-        totalTabs={tabs.length}
-        isActive={tab[idKey] === activeTab?.[idKey]}
-        on:focus={focusTab}
-        on:blur={blurTab}
-        on:click={checkAndPreventDefault}
-        on:mousedown={(e) => selectActiveTab(e, tab)}
-        on:remove={(e) => removeTab(e, index)}
-      >
-        <slot name="tab" {tab}>
-          {tab[labelKey]}
-        </slot>
-      </TabComponent>
-    {/each}
-  </ul>
+  {#if !hideTabs}
+    <ul role="tablist" class="tabs" class:fill-tab-width={fillTabWidth}>
+      {#each tabs as tab, index (tab[idKey] || tab)}
+        <TabComponent
+          {componentId}
+          {tab}
+          {allowRemoval}
+          {uniformTabWidth}
+          link={getTabLink(tab)}
+          totalTabs={tabs.length}
+          isActive={tab[idKey] === activeTab?.[idKey]}
+          on:focus={focusTab}
+          on:blur={blurTab}
+          on:click={checkAndPreventDefault}
+          on:mousedown={(e) => selectActiveTab(e, tab)}
+          on:remove={(e) => removeTab(e, index)}
+        >
+          <slot name="tab" {tab}>
+            {tab[labelKey]}
+          </slot>
+        </TabComponent>
+      {/each}
+    </ul>
+  {/if}
 
   <div class="tab-content-holder">
     <div
diff --git a/mathesar_ui/src/components/Errors.svelte b/mathesar_ui/src/components/Errors.svelte
index f196d95a32..3db46b9cdd 100644
--- a/mathesar_ui/src/components/Errors.svelte
+++ b/mathesar_ui/src/components/Errors.svelte
@@ -11,7 +11,10 @@
       {errors[0]}
     {:else}
       <ul class="list">
-        {#each errors as error (error)}
+        <!-- Do not use a key here since
+          -- error messages could be the same.
+          -->
+        {#each errors as error}
           <li>{error}</li>
         {/each}
       </ul>
diff --git a/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
index 65979b8fcf..69ff6255cc 100644
--- a/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
+++ b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
@@ -15,6 +15,7 @@
     getDatabasePageSettingsSectionUrl,
   } from '@mathesar/routes/urls';
   import { modal } from '@mathesar/stores/modal';
+  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import {
     Button,
     ButtonMenuItem,
@@ -26,6 +27,9 @@
 
   const permissionsModal = modal.spawnModalController();
 
+  const userProfileStore = getUserProfileStoreFromContext();
+  $: ({ isMathesarAdmin } = $userProfileStore);
+
   export let database: Database;
 
   type Section = 'schemas' | 'settings';
@@ -76,20 +80,22 @@
         <span>{$_('database_permissions')}</span>
       </Button>
 
-      <!-- <DropdownMenu
-        showArrow={false}
-        triggerAppearance="plain"
-        closeOnInnerClick={false}
-        icon={iconMoreActions}
-        preferredPlacement="bottom-end"
-      >
-        <ButtonMenuItem icon={iconDeleteMajor}>
-          {$_('disconnect_database')}
-        </ButtonMenuItem>
-        <ButtonMenuItem icon={iconDeleteMajor} danger>
-          {$_('delete_database')}
-        </ButtonMenuItem>
-      </DropdownMenu> -->
+      {#if isMathesarAdmin}
+        <DropdownMenu
+          showArrow={false}
+          triggerAppearance="plain"
+          closeOnInnerClick={false}
+          icon={iconMoreActions}
+          preferredPlacement="bottom-end"
+        >
+          <ButtonMenuItem icon={iconDeleteMajor}>
+            {$_('disconnect_database')}
+          </ButtonMenuItem>
+          <ButtonMenuItem icon={iconDeleteMajor} danger>
+            {$_('delete_database')}
+          </ButtonMenuItem>
+        </DropdownMenu>
+      {/if}
     </div>
   </AppSecondaryHeader>
 
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
index 10223b547c..f5048b68ee 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
@@ -7,6 +7,7 @@
   import { iconDeleteMajor, iconEdit } from '@mathesar/icons';
   import type { Collaborator } from '@mathesar/models/Collaborator';
   import { confirmDelete } from '@mathesar/stores/confirmation';
+  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { Button, SpinnerButton } from '@mathesar-component-library';
 
   export let collaborator: Collaborator;
@@ -15,6 +16,9 @@
   const routeContext = DatabaseSettingsRouteContext.get();
   $: ({ configuredRoles, users } = $routeContext);
 
+  const userProfileStore = getUserProfileStoreFromContext();
+  $: ({ isMathesarAdmin } = $userProfileStore);
+
   $: user = $users.resolvedValue?.get(collaborator.userId);
   $: configuredRoleId = collaborator.configuredRoleId;
   $: configuredRole = $configuredRoles.resolvedValue?.get($configuredRoleId);
@@ -44,6 +48,7 @@
       <Button
         appearance="secondary"
         on:click={() => editRoleForCollaborator(collaborator)}
+        disabled={!isMathesarAdmin}
       >
         <Icon {...iconEdit} size="0.8em" />
       </Button>
@@ -61,6 +66,7 @@
     icon={{ ...iconDeleteMajor, size: '0.8em' }}
     label=""
     appearance="secondary"
+    disabled={!isMathesarAdmin}
   />
 </GridTableCell>
 
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
index 36837f1585..78970e3981 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
@@ -10,6 +10,7 @@
   import type { Collaborator } from '@mathesar/models/Collaborator';
   import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
   import { modal } from '@mathesar/stores/modal';
+  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import {
     Button,
     Spinner,
@@ -26,6 +27,9 @@
   const addCollaboratorModal = modal.spawnModalController();
   const editCollaboratorRoleModal = modal.spawnModalController();
 
+  const userProfileStore = getUserProfileStoreFromContext();
+  $: ({ isMathesarAdmin } = $userProfileStore);
+
   $: ({ database, configuredRoles, collaborators, users } = $routeContext);
 
   $: void AsyncRpcApiStore.runBatched([
@@ -56,7 +60,11 @@
   </svelte:fragment>
   <svelte:fragment slot="actions">
     {#if isSuccess}
-      <Button appearance="primary" on:click={() => addCollaboratorModal.open()}>
+      <Button
+        appearance="primary"
+        on:click={() => addCollaboratorModal.open()}
+        disabled={!isMathesarAdmin}
+      >
         <Icon {...iconAddNew} />
         <span>{$_('add_collaborator')}</span>
       </Button>
diff --git a/mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte b/mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte
index 9e1689922a..852b17fd87 100644
--- a/mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte
+++ b/mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte
@@ -18,6 +18,7 @@
   import { confirm } from '@mathesar/stores/confirmation';
   import { modal } from '@mathesar/stores/modal';
   import { toast } from '@mathesar/stores/toast';
+  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { getErrorMessage } from '@mathesar/utils/errors';
   import {
     Button,
@@ -32,6 +33,8 @@
 
   const routeContext = DatabaseSettingsRouteContext.get();
   const configureRoleModalController = modal.spawnModalController();
+  const userProfileStore = getUserProfileStoreFromContext();
+  $: ({ isMathesarAdmin } = $userProfileStore);
 
   $: ({ database, databaseRouteContext, configuredRoles, combinedLoginRoles } =
     $routeContext);
@@ -88,12 +91,14 @@
                   <Button
                     appearance="secondary"
                     on:click={() => configureRole(combinedLoginRole)}
+                    disabled={!isMathesarAdmin}
                   >
                     <Icon {...iconEdit} size="0.8em" />
                     <span>{$_('configure_password')}</span>
                   </Button>
                   <SpinnerButton
                     appearance="secondary"
+                    disabled={!isMathesarAdmin}
                     confirm={() =>
                       confirm({
                         title: {
@@ -124,6 +129,7 @@
                 <Button
                   appearance="secondary"
                   on:click={() => configureRole(combinedLoginRole)}
+                  disabled={!isMathesarAdmin}
                 >
                   <Icon {...iconConfigurePassword} size="0.8em" />
                   <span>{$_('configure_in_mathesar')}</span>
diff --git a/mathesar_ui/src/pages/home/HomePage.svelte b/mathesar_ui/src/pages/home/HomePage.svelte
index d67dac61d0..7bcdd1a1b2 100644
--- a/mathesar_ui/src/pages/home/HomePage.svelte
+++ b/mathesar_ui/src/pages/home/HomePage.svelte
@@ -21,8 +21,7 @@
   const connectDbModalController = modal.spawnModalController();
 
   const userProfileStore = getUserProfileStoreFromContext();
-  $: userProfile = $userProfileStore;
-  $: isSuperUser = userProfile?.isMathesarAdmin;
+  $: ({ isMathesarAdmin } = $userProfileStore);
 
   let filterQuery = '';
 
@@ -71,7 +70,7 @@
         on:clear={handleClearFilterQuery}
       >
         <svelte:fragment slot="action">
-          {#if isSuperUser}
+          {#if isMathesarAdmin}
             <Button
               appearance="primary"
               on:click={() => connectDbModalController.open()}
diff --git a/mathesar_ui/src/stores/userProfile.ts b/mathesar_ui/src/stores/userProfile.ts
index 4f9230609b..1c94c6fd7f 100644
--- a/mathesar_ui/src/stores/userProfile.ts
+++ b/mathesar_ui/src/stores/userProfile.ts
@@ -9,14 +9,19 @@ const contextKey = Symbol('UserProfileStore');
 
 export type UserProfileStore = Writable<UserModel>;
 
-export function getUserProfileStoreFromContext(): UserProfileStore | undefined {
-  return getContext<UserProfileStore>(contextKey);
+export function getUserProfileStoreFromContext(): UserProfileStore {
+  const userProfileStore = getContext<UserProfileStore | undefined>(contextKey);
+  if (!userProfileStore) {
+    throw Error('User profile store context not found');
+  }
+  return userProfileStore;
 }
 
 export function setUserProfileStoreInContext(
   user: User | UserModel,
 ): UserProfileStore {
-  if (getUserProfileStoreFromContext() !== undefined) {
+  const existingStore = getContext<UserProfileStore | undefined>(contextKey);
+  if (existingStore) {
     throw Error('User profile store context has already been set');
   }
   const userProfileStore: UserProfileStore = writable(
diff --git a/mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte b/mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte
index b91809a4a0..9119ef874e 100644
--- a/mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte
+++ b/mathesar_ui/src/systems/permissions/PermissionsModalContent.svelte
@@ -79,11 +79,12 @@
   {#if isLoading}
     <Spinner />
   {:else if isSuccess && storeValues}
-    <div class="tabs">
+    <div class="tabs" class:tabs-displayed={displayedTabs.length > 1}>
       <TabContainer
         tabs={displayedTabs}
         uniformTabWidth={false}
         tabStyle="compact"
+        hideTabsInCaseOfSingleTab={true}
         let:activeTab
       >
         <div class="tab-content">
@@ -104,8 +105,10 @@
   .tabs {
     --Tab_margin-right: var(--size-small);
 
-    .tab-content {
-      margin-top: var(--size-base);
+    &.tabs-displayed {
+      .tab-content {
+        margin-top: var(--size-base);
+      }
     }
   }
 </style>

From 3dca1b7b7ba9cc0b8becc3595a6fe28aba56b525 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 20 Sep 2024 19:04:13 +0530
Subject: [PATCH 0968/1141] Check for create privileges on database to enable
 create schema button

---
 .../models/internal/ObjectCurrentAccess.ts    |  6 +--
 .../database/schemas/SchemasSection.svelte    | 44 ++++++++++++++-----
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/mathesar_ui/src/models/internal/ObjectCurrentAccess.ts b/mathesar_ui/src/models/internal/ObjectCurrentAccess.ts
index 6195c228f3..c810698c85 100644
--- a/mathesar_ui/src/models/internal/ObjectCurrentAccess.ts
+++ b/mathesar_ui/src/models/internal/ObjectCurrentAccess.ts
@@ -11,7 +11,7 @@ export class ObjectCurrentAccess<Privilege> {
 
   private _currentRolePrivileges;
 
-  get currentRolePrivileges(): Readable<Privilege[]> {
+  get currentRolePrivileges(): Readable<Set<Privilege>> {
     return this._currentRolePrivileges;
   }
 
@@ -27,7 +27,7 @@ export class ObjectCurrentAccess<Privilege> {
     current_role_owns: boolean;
   }) {
     this._ownerOid = writable(props.owner_oid);
-    this._currentRolePrivileges = writable(props.current_role_priv);
+    this._currentRolePrivileges = writable(new Set(props.current_role_priv));
     this._currentRoleOwns = writable(props.current_role_owns);
   }
 
@@ -37,7 +37,7 @@ export class ObjectCurrentAccess<Privilege> {
     current_role_owns: boolean;
   }) {
     this._ownerOid.set(props.owner_oid);
-    this._currentRolePrivileges.set(props.current_role_priv);
+    this._currentRolePrivileges.set(new Set(props.current_role_priv));
     this._currentRoleOwns.set(props.current_role_owns);
   }
 }
diff --git a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
index a507dfdb8c..f58838442c 100644
--- a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
@@ -3,8 +3,9 @@
   import { _ } from 'svelte-i18n';
 
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
-  import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
+  import Errors from '@mathesar/components/Errors.svelte';
   import { RichText } from '@mathesar/components/rich-text';
+  import { DatabaseRouteContext } from '@mathesar/contexts/DatabaseRouteContext';
   import { iconAddNew } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
   import type { Schema } from '@mathesar/models/Schema';
@@ -17,17 +18,29 @@
   } from '@mathesar/stores/schemas';
   import { removeTablesStore } from '@mathesar/stores/tables';
   import AddEditSchemaModal from '@mathesar/systems/schemas/AddEditSchemaModal.svelte';
-  import { Button, Icon } from '@mathesar-component-library';
+  import {
+    Button,
+    Icon,
+    isDefinedNonNullable,
+  } from '@mathesar-component-library';
 
   import SchemaListSkeleton from './SchemaListSkeleton.svelte';
   import SchemaRow from './SchemaRow.svelte';
 
   const addEditModal = modal.spawnModalController();
+  const databaseRouteContext = DatabaseRouteContext.get();
 
   export let database: Database;
 
+  $: ({ database, underlyingDatabase } = $databaseRouteContext);
+  $: void underlyingDatabase.run({ database_id: database.id });
   $: schemasMap = $schemasStore.data;
   $: schemasRequestStatus = $schemasStore.requestStatus;
+  $: isLoading =
+    $underlyingDatabase.isLoading ||
+    schemasRequestStatus.state === 'processing';
+  $: currentRoleDatabasePrivileges =
+    $underlyingDatabase.resolvedValue?.currentAccess.currentRolePrivileges;
 
   let filterQuery = '';
   let targetSchema: Schema | undefined;
@@ -77,7 +90,10 @@
 
 <div class="schema-list-wrapper">
   <div class="schema-list-title-container">
-    <h2 class="schema-list-title">{$_('schemas')} ({schemasMap.size})</h2>
+    <h2 class="schema-list-title">
+      {$_('schemas')}
+      {schemasMap.size ? `(${schemasMap.size})` : ''}
+    </h2>
   </div>
   <EntityContainerWithFilterBar
     searchPlaceholder={$_('search_schemas')}
@@ -85,7 +101,11 @@
     on:clear={handleClearFilterQuery}
   >
     <svelte:fragment slot="action">
-      <Button on:click={addSchema} appearance="primary">
+      <Button
+        on:click={addSchema}
+        appearance="primary"
+        disabled={!$currentRoleDatabasePrivileges?.has('CREATE')}
+      >
         <Icon {...iconAddNew} />
         <span>{$_('create_schema')}</span>
       </Button>
@@ -114,14 +134,16 @@
             />
           </li>
         {/each}
-      {:else if schemasRequestStatus.state === 'processing'}
+      {:else if schemasRequestStatus.state === 'processing' || isLoading}
         <SchemaListSkeleton />
-      {:else if schemasRequestStatus.state === 'failure'}
-        <ErrorBox fullWidth>
-          {#each schemasRequestStatus.errors as error (error)}
-            <p>{error}</p>
-          {/each}
-        </ErrorBox>
+      {:else if schemasRequestStatus.state === 'failure' || $underlyingDatabase.error}
+        <Errors
+          fullWidth
+          errors={[
+            ...schemasRequestStatus.errors,
+            $underlyingDatabase.error,
+          ].filter(isDefinedNonNullable)}
+        />
       {/if}
     </ul>
   </EntityContainerWithFilterBar>

From 749d1bebfff7f31b3968ab5ec6a09810bb608d2f Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 20 Sep 2024 19:04:33 +0530
Subject: [PATCH 0969/1141] Allow public schema to be editable

---
 .../pages/database/schemas/SchemaRow.svelte   | 71 ++++++-------------
 1 file changed, 23 insertions(+), 48 deletions(-)

diff --git a/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte b/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
index 43bc69b4bf..2d83af9f17 100644
--- a/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
@@ -6,12 +6,7 @@
   import MenuDivider from '@mathesar/component-library/menu/MenuDivider.svelte';
   import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
   import SchemaName from '@mathesar/components/SchemaName.svelte';
-  import {
-    iconDeleteMajor,
-    iconEdit,
-    iconMoreActions,
-    iconNotEditable,
-  } from '@mathesar/icons';
+  import { iconDeleteMajor, iconEdit, iconMoreActions } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
   import type { Schema } from '@mathesar/models/Schema';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
@@ -30,44 +25,33 @@
   let isFocused = false;
 
   $: href = getSchemaPageUrl(database.id, schema.oid);
-  $: isDefault = $isPublicSchema;
-  $: isLocked = $isPublicSchema;
 </script>
 
-<div
-  class="schema-row"
-  class:hover={isHovered}
-  class:focus={isFocused}
-  class:is-locked={isLocked}
->
+<div class="schema-row" class:hover={isHovered} class:focus={isFocused}>
   <div class="title-and-meta">
     <div class="name"><SchemaName {schema} iconHasBox /></div>
 
-    {#if isLocked}
-      <div class="lock"><Icon {...iconNotEditable} /></div>
-    {:else}
-      <div class="menu-trigger">
-        <DropdownMenu
-          showArrow={false}
-          triggerAppearance="plain"
-          preferredPlacement="bottom-end"
-          icon={iconMoreActions}
-          menuStyle="--Menu__padding-x:0.8em;"
+    <div class="menu-trigger">
+      <DropdownMenu
+        showArrow={false}
+        triggerAppearance="plain"
+        preferredPlacement="bottom-end"
+        icon={iconMoreActions}
+        menuStyle="--Menu__padding-x:0.8em;"
+      >
+        <ButtonMenuItem on:click={() => dispatch('edit')} icon={iconEdit}>
+          {$_('edit_schema')}
+        </ButtonMenuItem>
+        <MenuDivider />
+        <ButtonMenuItem
+          danger
+          on:click={() => dispatch('delete')}
+          icon={iconDeleteMajor}
         >
-          <ButtonMenuItem on:click={() => dispatch('edit')} icon={iconEdit}>
-            {$_('edit_schema')}
-          </ButtonMenuItem>
-          <MenuDivider />
-          <ButtonMenuItem
-            danger
-            on:click={() => dispatch('delete')}
-            icon={iconDeleteMajor}
-          >
-            {$_('delete_schema')}
-          </ButtonMenuItem>
-        </DropdownMenu>
-      </div>
-    {/if}
+          {$_('delete_schema')}
+        </ButtonMenuItem>
+      </DropdownMenu>
+    </div>
   </div>
 
   {#if $description}
@@ -78,7 +62,7 @@
 
   <SchemaConstituentCounts {schema} />
 
-  {#if isDefault}
+  {#if $isPublicSchema}
     <InfoBox>
       {$_('public_schema_info')}
     </InfoBox>
@@ -132,10 +116,6 @@
     outline-offset: 1px;
   }
 
-  .schema-row.is-locked {
-    background-color: var(--slate-100);
-  }
-
   .hyperlink-overlay {
     position: absolute;
     height: 100%;
@@ -174,9 +154,4 @@
     --icon-color: var(--brand-500);
     overflow: hidden;
   }
-
-  .lock {
-    color: var(--slate-300);
-    align-self: baseline;
-  }
 </style>

From 0377527230dc1bf59ad451761af81a4a2414e1d8 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 20 Sep 2024 19:16:08 +0530
Subject: [PATCH 0970/1141] Disable edit and delete schema actions in card
 based on ownership

---
 .../NameAndDescInputModalForm.svelte          | 46 ++++++-------------
 mathesar_ui/src/i18n/languages/en/dict.json   |  4 +-
 .../pages/database/schemas/SchemaRow.svelte   | 12 +++--
 .../systems/schemas/AddEditSchemaModal.svelte |  4 +-
 4 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/mathesar_ui/src/components/NameAndDescInputModalForm.svelte b/mathesar_ui/src/components/NameAndDescInputModalForm.svelte
index 300e8be269..f56d1f1123 100644
--- a/mathesar_ui/src/components/NameAndDescInputModalForm.svelte
+++ b/mathesar_ui/src/components/NameAndDescInputModalForm.svelte
@@ -13,13 +13,11 @@
 
   import TextArea from '@mathesar/component-library/text-area/TextArea.svelte';
   import { toast } from '@mathesar/stores/toast';
-  import {
-    LabeledInput,
-    type ModalController,
-  } from '@mathesar-component-library';
   import {
     CancelOrProceedButtonPair,
     ControlledModal,
+    LabeledInput,
+    type ModalController,
     TextInput,
   } from '@mathesar-component-library';
 
@@ -29,19 +27,7 @@
   export let getInitialName: () => string = () => '';
   export let getInitialDescription: () => string = () => '';
   export let save: (name: string, description: string) => Promise<void>;
-
-  /**
-   * NOTE: This is NOT a feature
-   *
-   * Ideally this component should not have this prop
-   * since the name of the component itself suggests
-   * that its used to edit both name and description
-   *
-   * But still adding this prop to support only editing
-   * table name. Since editing table description is planned
-   * but will come in future.
-   */
-  export let hideDescription = false;
+  export let disabled = false;
 
   let isSubmitting = false;
   let inputElement: HTMLInputElement;
@@ -76,7 +62,7 @@
   }
 
   $: nameValidationErrors = getNameValidationErrors(name);
-  $: canProceed = !nameValidationErrors.length;
+  $: canProceed = !nameValidationErrors.length && !disabled;
 </script>
 
 <ControlledModal
@@ -99,7 +85,7 @@
           on:input={() => {
             nameHasChanged = true;
           }}
-          disabled={isSubmitting}
+          disabled={isSubmitting || disabled}
           placeholder={$_('name')}
           id="name"
         />
@@ -111,18 +97,16 @@
       </LabeledInput>
     </div>
 
-    {#if !hideDescription}
-      <div class="input-container">
-        <LabeledInput label={$_('description')} layout="stacked">
-          <TextArea
-            bind:value={description}
-            aria-label={$_('description')}
-            disabled={isSubmitting}
-            placeholder={$_('description')}
-          />
-        </LabeledInput>
-      </div>
-    {/if}
+    <div class="input-container">
+      <LabeledInput label={$_('description')} layout="stacked">
+        <TextArea
+          bind:value={description}
+          aria-label={$_('description')}
+          disabled={isSubmitting || disabled}
+          placeholder={$_('description')}
+        />
+      </LabeledInput>
+    </div>
   </div>
   <CancelOrProceedButtonPair
     proceedButton={{ label: saveButtonLabel }}
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index c873d86941..73ac81bfc6 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -214,8 +214,9 @@
   "edit_in_data_explorer": "Edit in Data Explorer",
   "edit_role_for_collaborator_value": "Edit Role for ''{collaborator}''",
   "edit_schema": "Edit Schema",
+  "edit_schema_with_name": "Edit Schema [schemaName]",
   "edit_table": "Edit Table",
-  "edit_table_with_name": "Edit [tableName] Table",
+  "edit_table_with_name": "Edit Table [tableName]",
   "edit_user": "Edit User",
   "editor": "Editor",
   "editor_access": "Editor Access",
@@ -468,7 +469,6 @@
   "remove_old_link_create_new": "Remove old link and create a new link?",
   "remove_sorting_type": "Remove {sortingType} Sorting",
   "removing_role_configuration_warning": "Removing this configuration will prevent collaborators assigned to this role from accessing databases on server ''{server}''.",
-  "rename_schema": "Rename [schemaName] Schema",
   "reset": "Reset",
   "restrict_to_unique": "Restrict to Unique",
   "restrict_to_unique_help": "Enable this option to make sure that the column only contains unique values. Useful for columns that contain identifiers, such as a person's ID number or emails.",
diff --git a/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte b/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
index 2d83af9f17..5783a5478f 100644
--- a/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
@@ -10,7 +10,7 @@
   import type { Database } from '@mathesar/models/Database';
   import type { Schema } from '@mathesar/models/Schema';
   import { getSchemaPageUrl } from '@mathesar/routes/urls';
-  import { ButtonMenuItem, Icon } from '@mathesar-component-library';
+  import { ButtonMenuItem } from '@mathesar-component-library';
 
   import SchemaConstituentCounts from './SchemaConstituentCounts.svelte';
 
@@ -19,7 +19,8 @@
   export let database: Database;
   export let schema: Schema;
 
-  $: ({ name, description, isPublicSchema } = schema);
+  $: ({ name, description, isPublicSchema, currentAccess } = schema);
+  $: ({ currentRoleOwns } = currentAccess);
 
   let isHovered = false;
   let isFocused = false;
@@ -39,7 +40,11 @@
         icon={iconMoreActions}
         menuStyle="--Menu__padding-x:0.8em;"
       >
-        <ButtonMenuItem on:click={() => dispatch('edit')} icon={iconEdit}>
+        <ButtonMenuItem
+          on:click={() => dispatch('edit')}
+          icon={iconEdit}
+          disabled={!$currentRoleOwns}
+        >
           {$_('edit_schema')}
         </ButtonMenuItem>
         <MenuDivider />
@@ -47,6 +52,7 @@
           danger
           on:click={() => dispatch('delete')}
           icon={iconDeleteMajor}
+          disabled={!$currentRoleOwns}
         >
           {$_('delete_schema')}
         </ButtonMenuItem>
diff --git a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
index 77185548b2..218aa46f52 100644
--- a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
+++ b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
@@ -18,6 +18,7 @@
 
   $: schemaName = schema?.name;
   $: schemaDescription = schema?.description;
+  $: currentRoleOwns = schema?.currentAccess?.currentRoleOwns;
 
   function nameIsDuplicate(name: string) {
     // Handling the condition when the new name is equal to the current name
@@ -60,6 +61,7 @@
   getInitialName={() => $schemaName ?? ''}
   getInitialDescription={() => $schemaDescription ?? ''}
   saveButtonLabel={schema ? $_('save') : $_('create_new_schema')}
+  disabled={!$currentRoleOwns}
 >
   <svelte:fragment slot="helpText">
     {#if !schema}
@@ -71,7 +73,7 @@
 
   <span slot="title" let:initialName>
     {#if schema}
-      <RichText text={$_('rename_schema')} let:slotName>
+      <RichText text={$_('edit_schema_with_name')} let:slotName>
         {#if slotName === 'schemaName'}
           <Identifier>{initialName}</Identifier>
         {/if}

From e84884d867715ed029e630661eeaa4eb75725dae Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 20 Sep 2024 19:36:43 +0530
Subject: [PATCH 0971/1141] Move EditTable modal out of TableCard

---
 mathesar_ui/src/pages/schema/TableCard.svelte  | 16 +++++-----------
 mathesar_ui/src/pages/schema/TablesList.svelte | 17 ++++++++++++++++-
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/mathesar_ui/src/pages/schema/TableCard.svelte b/mathesar_ui/src/pages/schema/TableCard.svelte
index b9628772b3..0cbc37277e 100644
--- a/mathesar_ui/src/pages/schema/TableCard.svelte
+++ b/mathesar_ui/src/pages/schema/TableCard.svelte
@@ -18,7 +18,6 @@
     getTablePageUrl,
   } from '@mathesar/routes/urls';
   import { confirmDelete } from '@mathesar/stores/confirmation';
-  import { modal } from '@mathesar/stores/modal';
   import { deleteTable } from '@mathesar/stores/tables';
   import { createDataExplorerUrlToExploreATable } from '@mathesar/systems/data-explorer';
   import { getRecordSelectorFromContext } from '@mathesar/systems/record-selector/RecordSelectorController';
@@ -31,14 +30,12 @@
     Truncate,
   } from '@mathesar-component-library';
 
-  import EditTable from './EditTable.svelte';
-
   const recordSelector = getRecordSelectorFromContext();
-  const editTableModalController = modal.spawnModalController();
 
   export let table: Table;
   export let database: Database;
   export let schema: Schema;
+  export let openEditTableModal: (_table: Table) => void;
 
   let isHoveringMenuTrigger = false;
   let isHoveringBottomButton = false;
@@ -72,10 +69,6 @@
     });
   }
 
-  function handleEditTable() {
-    editTableModalController.open();
-  }
-
   function handleFindRecord() {
     recordSelector.navigateToRecordPage({ tableId: table.oid });
   }
@@ -141,7 +134,10 @@
         <LinkMenuItem href={explorationPageUrl} icon={iconExploration}>
           {$_('explore_table')}
         </LinkMenuItem>
-        <ButtonMenuItem on:click={handleEditTable} icon={iconEdit}>
+        <ButtonMenuItem
+          on:click={() => openEditTableModal(table)}
+          icon={iconEdit}
+        >
           {$_('edit_table')}
         </ButtonMenuItem>
       {/if}
@@ -171,8 +167,6 @@
   {/if}
 </div>
 
-<EditTable modalController={editTableModalController} {table} />
-
 <style>
   .table-card {
     position: relative;
diff --git a/mathesar_ui/src/pages/schema/TablesList.svelte b/mathesar_ui/src/pages/schema/TablesList.svelte
index d0cfc82175..a7db3bbb58 100644
--- a/mathesar_ui/src/pages/schema/TablesList.svelte
+++ b/mathesar_ui/src/pages/schema/TablesList.svelte
@@ -5,18 +5,29 @@
   import type { Database } from '@mathesar/models/Database';
   import type { Schema } from '@mathesar/models/Schema';
   import type { Table } from '@mathesar/models/Table';
+  import { modal } from '@mathesar/stores/modal';
 
+  import EditTable from './EditTable.svelte';
   import EmptyEntity from './EmptyEntity.svelte';
   import TableCard from './TableCard.svelte';
 
+  const editTableModalController = modal.spawnModalController();
+
   export let tables: Table[];
   export let database: Database;
   export let schema: Schema;
+
+  let selectedTable: Table | undefined;
+
+  function openEditTableModal(table: Table) {
+    selectedTable = table;
+    editTableModalController.open();
+  }
 </script>
 
 <div class="container">
   {#each tables as table (table.oid)}
-    <TableCard {table} {database} {schema} />
+    <TableCard {table} {database} {schema} {openEditTableModal} />
   {:else}
     <EmptyEntity icon={iconTable}>
       <p>{$_('no_tables')}</p>
@@ -24,6 +35,10 @@
   {/each}
 </div>
 
+{#if selectedTable}
+  <EditTable modalController={editTableModalController} table={selectedTable} />
+{/if}
+
 <style lang="scss">
   .container {
     display: grid;

From cb83071358a0fe89a73b3b4eeda16058c5bc9d56 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 20 Sep 2024 21:19:35 +0530
Subject: [PATCH 0972/1141] Perform permission checks in TableCard

---
 mathesar_ui/src/pages/schema/TableCard.svelte | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/mathesar_ui/src/pages/schema/TableCard.svelte b/mathesar_ui/src/pages/schema/TableCard.svelte
index 0cbc37277e..d85c50062e 100644
--- a/mathesar_ui/src/pages/schema/TableCard.svelte
+++ b/mathesar_ui/src/pages/schema/TableCard.svelte
@@ -37,6 +37,8 @@
   export let schema: Schema;
   export let openEditTableModal: (_table: Table) => void;
 
+  $: ({ currentRoleOwns, currentRolePrivileges } = table.currentAccess);
+
   let isHoveringMenuTrigger = false;
   let isHoveringBottomButton = false;
   let isTableCardFocused = false;
@@ -77,6 +79,7 @@
 <div
   class="table-card"
   class:focus={isTableCardFocused}
+  class:no-select={!$currentRolePrivileges.has('SELECT')}
   class:hovering-menu-trigger={isHoveringMenuTrigger}
   class:hovering-bottom-button={isHoveringBottomButton}
   class:unconfirmed-import={requiresImportConfirmation}
@@ -137,6 +140,7 @@
         <ButtonMenuItem
           on:click={() => openEditTableModal(table)}
           icon={iconEdit}
+          disabled={!$currentRoleOwns}
         >
           {$_('edit_table')}
         </ButtonMenuItem>
@@ -145,6 +149,7 @@
         on:click={handleDeleteTable}
         danger
         icon={iconDeleteMajor}
+        disabled={!$currentRoleOwns}
       >
         {$_('delete_table')}
       </ButtonMenuItem>
@@ -160,6 +165,7 @@
         isHoveringBottomButton = false;
       }}
       on:click={handleFindRecord}
+      disabled={!$currentRolePrivileges.has('SELECT')}
     >
       <Icon {...iconSelectRecord} />
       <span class="label">{$_('find_record')}</span>
@@ -256,17 +262,20 @@
     z-index: 1;
     cursor: pointer;
   }
-  .bottom-button:focus {
+  .bottom-button:disabled {
+    cursor: not-allowed;
+  }
+  .bottom-button:not(:disabled):focus {
     outline: 2px solid var(--slate-300);
     outline-offset: 1px;
     border-bottom-left-radius: var(--border-radius-l);
     border-bottom-right-radius: var(--border-radius-l);
   }
 
-  .hovering-bottom-button .bottom-button {
+  .hovering-bottom-button .bottom-button:not(:disabled) {
     color: inherit;
   }
-  .hovering-bottom-button .bottom {
+  .hovering-bottom-button:not(.no-select) .bottom {
     color: inherit;
     background: var(--sand-200);
   }
@@ -279,6 +288,10 @@
     font-size: var(--text-size-small);
     color: var(--color-text-muted);
   }
+  .no-select .bottom-button,
+  .no-select .bottom {
+    color: var(--slate-300);
+  }
   .bottom-button .label {
     margin-left: 0.25rem;
   }

From 8255dfe0aa49520def15cdd410739e9b3c378cb3 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 20 Sep 2024 21:32:52 +0530
Subject: [PATCH 0973/1141] Perform permission checks in schema page

---
 .../pages/schema/CreateNewTableButton.svelte   |  3 +++
 mathesar_ui/src/pages/schema/SchemaPage.svelte | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte b/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
index 435bca05b6..287ce81674 100644
--- a/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
+++ b/mathesar_ui/src/pages/schema/CreateNewTableButton.svelte
@@ -18,6 +18,8 @@
   export let database: Database;
   export let schema: Schema;
 
+  $: ({ currentRolePrivileges } = schema.currentAccess);
+
   let isCreatingNewTable = false;
 
   async function handleCreateEmptyTable() {
@@ -33,6 +35,7 @@
   triggerAppearance="primary"
   closeOnInnerClick={true}
   label={$_('new_table')}
+  disabled={!$currentRolePrivileges.has('CREATE')}
 >
   <div slot="trigger">
     {#if isCreatingNewTable}
diff --git a/mathesar_ui/src/pages/schema/SchemaPage.svelte b/mathesar_ui/src/pages/schema/SchemaPage.svelte
index 5ea848b28e..22dd2f6cb2 100644
--- a/mathesar_ui/src/pages/schema/SchemaPage.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPage.svelte
@@ -73,8 +73,8 @@
     addEditModal.open();
   }
 
-  $: ({ name, description, tableCount } = schema);
-  $: isDefault = $name === 'public';
+  $: ({ name, description, tableCount, currentAccess } = schema);
+  $: ({ currentRoleOwns } = currentAccess);
 
   logEvent('opened_schema', {
     database_name: database.name,
@@ -99,12 +99,14 @@
     }}
   >
     <div slot="action">
-      {#if !isDefault}
-        <Button on:click={handleEditSchema} appearance="secondary">
-          <Icon {...iconEdit} />
-          <span>{$_('edit_schema')}</span>
-        </Button>
-      {/if}
+      <Button
+        on:click={handleEditSchema}
+        appearance="secondary"
+        disabled={!$currentRoleOwns}
+      >
+        <Icon {...iconEdit} />
+        <span>{$_('edit_schema')}</span>
+      </Button>
       <Button appearance="secondary" on:click={() => permissionsModal.open()}>
         <span>{$_('schema_permissions')}</span>
       </Button>

From 535db2eb6897a99072cc5c3446a7e15f30da6c00 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Fri, 20 Sep 2024 21:56:23 +0530
Subject: [PATCH 0974/1141] Perform permission checks in table page and table
 tab in inspector

---
 mathesar_ui/src/i18n/languages/en/dict.json     |  1 +
 mathesar_ui/src/pages/table/TablePage.svelte    | 16 +++++++++++++++-
 .../table-view/actions-pane/ActionsPane.svelte  | 17 +++++++++++------
 .../table-inspector/table/TableActions.svelte   |  7 ++++++-
 .../table-inspector/table/TableMode.svelte      |  8 ++++----
 5 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 73ac81bfc6..67a2095d7d 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -384,6 +384,7 @@
   "no_grouping_condition_added": "No grouping condition has been added",
   "no_matches": "No matches for [searchValue]",
   "no_matching_records": "No matching records",
+  "no_privileges_view_table": "Your role does not have the privileges to view the table",
   "no_record_summary_available": "No record summary available.",
   "no_records_found": "No records found",
   "no_results_found": "No results found",
diff --git a/mathesar_ui/src/pages/table/TablePage.svelte b/mathesar_ui/src/pages/table/TablePage.svelte
index 780e3f665a..744a856c60 100644
--- a/mathesar_ui/src/pages/table/TablePage.svelte
+++ b/mathesar_ui/src/pages/table/TablePage.svelte
@@ -1,7 +1,9 @@
 <script lang="ts">
   import { tick } from 'svelte';
+  import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
 
+  import WarningBox from '@mathesar/components/message-boxes/WarningBox.svelte';
   import { focusActiveCell } from '@mathesar/components/sheet/utils';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import type { Table } from '@mathesar/models/Table';
@@ -34,6 +36,7 @@
 
   $: ({ query } = $router);
   $: meta = Meta.fromSerialization(query[metaSerializationQueryKey] ?? '');
+  $: ({ currentRolePrivileges } = table.currentAccess);
   $: tabularData = new TabularData({
     database: table.schema.database,
     table,
@@ -73,7 +76,15 @@
 <LayoutWithHeader fitViewport restrictWidth={false}>
   <div class="table-page">
     <ActionsPane {context} />
-    <TableView {table} {context} bind:sheetElement />
+    {#if $currentRolePrivileges.has('SELECT')}
+      <TableView {table} {context} bind:sheetElement />
+    {:else}
+      <div class="warning">
+        <WarningBox fullWidth>
+          {$_('no_privileges_view_table')}
+        </WarningBox>
+      </div>
+    {/if}
   </div>
 </LayoutWithHeader>
 
@@ -83,4 +94,7 @@
     grid-template: auto 1fr / 1fr;
     height: 100%;
   }
+  .warning {
+    padding: var(--size-base);
+  }
 </style>
diff --git a/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte b/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
index a4f62357fc..d106a7f9df 100644
--- a/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
+++ b/mathesar_ui/src/systems/table-view/actions-pane/ActionsPane.svelte
@@ -18,9 +18,12 @@
   export let context: TableActionsContext = 'page';
 
   $: ({ table, meta, isLoading, display } = $tabularData);
+  $: ({ currentRolePrivileges } = table.currentAccess);
   $: ({ filtering, sorting, grouping, sheetState } = meta);
   $: ({ isTableInspectorVisible } = display);
 
+  $: isSelectable = $currentRolePrivileges.has('SELECT');
+
   const canViewLinkedEntities = true;
 
   function toggleTableInspector() {
@@ -35,18 +38,20 @@
     icon: iconTable,
   }}
 >
-  <div class="quick-access">
-    <FilterDropdown {filtering} {canViewLinkedEntities} />
-    <SortDropdown {sorting} />
-    <GroupDropdown {grouping} />
-  </div>
+  {#if isSelectable}
+    <div class="quick-access">
+      <FilterDropdown {filtering} {canViewLinkedEntities} />
+      <SortDropdown {sorting} />
+      <GroupDropdown {grouping} />
+    </div>
+  {/if}
 
   {#if context === 'page'}
     <ModificationStatus requestState={$sheetState} />
   {/if}
 
   <div class="aux-actions" slot="actions-right">
-    {#if context === 'page'}
+    {#if context === 'page' && isSelectable}
       <!-- TODO: Display Share option when we re-implement it with the new permissions structure -->
       <!-- <ShareTableDropdown id={table.oid} /> -->
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
index 55ec972e02..d3562d8eaf 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
@@ -41,6 +41,7 @@
         terseGrouping: $grouping.terse(),
       },
     ))();
+  $: ({ currentRoleOwns } = table.currentAccess);
 
   function handleDeleteTable() {
     void confirmDelete({
@@ -89,7 +90,11 @@
     </AnchorButton>
   {/if}
 
-  <Button appearance="outline-primary" on:click={handleDeleteTable}>
+  <Button
+    appearance="outline-primary"
+    on:click={handleDeleteTable}
+    disabled={!$currentRoleOwns}
+  >
     <Icon {...iconDeleteMajor} />
     <span>{$_('delete_table')}</span>
   </Button>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
index dd0a53c768..eb86f86fb1 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
@@ -2,8 +2,6 @@
   import { _ } from 'svelte-i18n';
 
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
-  import { currentTable } from '@mathesar/stores/tables';
-  import RecordSummaryConfig from '@mathesar/systems/table-view/table-inspector/record-summary/RecordSummaryConfig.svelte';
   import { Collapsible } from '@mathesar-component-library';
 
   import CollapsibleHeader from '../CollapsibleHeader.svelte';
@@ -16,6 +14,8 @@
   import TablePermissions from './TablePermissions.svelte';
 
   const tabularData = getTabularDataStoreFromContext();
+  $: ({ table } = $tabularData);
+  $: ({ currentRoleOwns } = table.currentAccess);
 </script>
 
 <div class="table-mode-container">
@@ -26,8 +26,8 @@
       isDbLevelConfiguration
     />
     <div slot="content" class="content-container">
-      <TableName />
-      <TableDescription />
+      <TableName disabled={!$currentRoleOwns} />
+      <TableDescription disabled={!$currentRoleOwns} />
     </div>
   </Collapsible>
 

From e813d934f46545323bf1af33c27c494eb61abf32 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 20 Sep 2024 17:13:15 -0400
Subject: [PATCH 0975/1141] Begin incorporating types into explorations.run

---
 mathesar_ui/src/api/rpc/explorations.ts       | 88 +++++++------------
 .../src/routes/DataExplorerRoute.svelte       |  7 +-
 mathesar_ui/src/stores/queries.ts             |  7 --
 .../src/systems/data-explorer/QueryManager.ts |  2 +-
 .../src/systems/data-explorer/QueryModel.ts   | 30 ++++---
 .../src/systems/data-explorer/QueryRunner.ts  | 13 +--
 .../data-explorer/urlSerializationUtils.ts    | 13 ++-
 .../table-inspector/table/TableActions.svelte |  1 +
 8 files changed, 75 insertions(+), 86 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/explorations.ts b/mathesar_ui/src/api/rpc/explorations.ts
index 8269488969..fe1ade7822 100644
--- a/mathesar_ui/src/api/rpc/explorations.ts
+++ b/mathesar_ui/src/api/rpc/explorations.ts
@@ -81,52 +81,46 @@ export type QueryInstanceTransformation =
 
 /** Called `ExplorationInfo` in Python docs */
 export interface QueryInstance {
-  readonly id: number;
-  readonly database_id: number;
-  readonly name: string;
-  readonly description?: string;
-  readonly base_table_oid: number;
-  readonly initial_columns?: QueryInstanceInitialColumn[];
-  readonly transformations?: QueryInstanceTransformation[];
-  readonly display_names: Record<string, string> | null;
-  readonly display_options?: unknown[];
+  id: number;
+  database_id: number;
+  name: string;
+  description?: string;
+  base_table_oid: number;
+  initial_columns?: QueryInstanceInitialColumn[];
+  transformations?: QueryInstanceTransformation[];
+  display_names: Record<string, string> | null;
+  display_options?: unknown[];
 }
 
-export type UnsavedQueryInstance = Partial<QueryInstance>;
+export type UnsavedQueryInstance = Partial<QueryInstance> & {
+  database_id: number;
+};
 
 export interface QueryGetResponse extends QueryInstance {
   readonly schema: number;
 }
 
 /**
- * TODO: refactor this to match:
- *
- * ```ts
- * interface ExplorationDef {
- *   database_id: number;
- *   name: string;
- *   base_table_oid: number;
- *   initial_columns: unknown[];
- *   transformations?: unknown[];
- *   display_options?: unknown[];
- *   display_names?: Record<string, unknown>;
- *   description?: string;
- * }
- * ```
+ * TODO: fix code duplication with QueryInstance
  */
-export interface QueryRunRequest {
-  base_table: QueryInstance['base_table_oid'];
-  initial_columns: QueryInstanceInitialColumn[];
-  transformations?: QueryInstanceTransformation[];
-  display_names: QueryInstance['display_names'];
-  parameters: {
-    order_by?: {
-      field: QueryColumnAlias;
-      direction: 'asc' | 'desc';
-    }[];
-    limit: number;
-    offset: number;
-  };
+export interface ExplorationDef {
+  database_id: number;
+  base_table_oid: number;
+  initial_columns: unknown[];
+  transformations?: unknown[];
+  display_options?: unknown[];
+  display_names?: Record<string, unknown>;
+  description?: string;
+}
+
+export interface NamedExplorationDef extends ExplorationDef {
+  name: string;
+}
+
+export interface ExplorationRunParams {
+  exploration_def: ExplorationDef;
+  limit: number;
+  offset: number;
 }
 
 export interface QueryResultColumn {
@@ -188,34 +182,18 @@ export interface QueryRunResponse {
   duplicate_only: unknown;
 }
 
-// =============================================================================
-
-interface ExplorationDef {
-  database_id: number;
-  name: string;
-  base_table_oid: number;
-  initial_columns: unknown[];
-  transformations?: unknown[];
-  display_options?: unknown[];
-  display_names?: Record<string, unknown>;
-  description?: string;
-}
-
 export const explorations = {
   list: rpcMethodTypeContainer<{ database_id: number }, QueryInstance[]>(),
 
   get: rpcMethodTypeContainer<{ exploration_id: number }, QueryInstance>(),
 
-  add: rpcMethodTypeContainer<ExplorationDef, void>(),
+  add: rpcMethodTypeContainer<NamedExplorationDef, void>(),
 
   delete: rpcMethodTypeContainer<{ exploration_id: number }, void>(),
 
   replace: rpcMethodTypeContainer<{ new_exploration: QueryInstance }, void>(),
 
-  run: rpcMethodTypeContainer<
-    { exploration_def: ExplorationDef },
-    QueryRunResponse
-  >(),
+  run: rpcMethodTypeContainer<ExplorationRunParams, QueryRunResponse>(),
 
   run_saved: rpcMethodTypeContainer<
     {
diff --git a/mathesar_ui/src/routes/DataExplorerRoute.svelte b/mathesar_ui/src/routes/DataExplorerRoute.svelte
index d323a350e9..9d7bec8894 100644
--- a/mathesar_ui/src/routes/DataExplorerRoute.svelte
+++ b/mathesar_ui/src/routes/DataExplorerRoute.svelte
@@ -78,14 +78,17 @@
       try {
         const newQueryModel = constructQueryModelFromHash(hash);
         router.location.hash.clear();
-        createQueryManager(newQueryModel ?? {});
+        createQueryManager({
+          database_id: database.id,
+          ...(newQueryModel ?? {}),
+        });
         return;
       } catch {
         // fail silently
         console.error('Unable to create query model from hash', hash);
       }
     }
-    createQueryManager({});
+    createQueryManager({ database_id: database.id });
   }
 
   async function loadSavedQuery(_queryId: number) {
diff --git a/mathesar_ui/src/stores/queries.ts b/mathesar_ui/src/stores/queries.ts
index 6b5e084cb4..b1e8a4d219 100644
--- a/mathesar_ui/src/stores/queries.ts
+++ b/mathesar_ui/src/stores/queries.ts
@@ -53,7 +53,6 @@ import {
 import type {
   QueryGetResponse,
   QueryInstance,
-  QueryRunRequest,
   QueryRunResponse,
   UnsavedQueryInstance,
 } from '@mathesar/api/rpc/explorations';
@@ -276,12 +275,6 @@ export function getQuery(
   return new CancellablePromise((resolve) => resolve());
 }
 
-export function runQuery(
-  request: QueryRunRequest,
-): CancellablePromise<QueryRunResponse> {
-  return postAPI('/api/db/v0/queries/run/', request);
-}
-
 export function fetchQueryResults(
   queryId: number,
   params?: {
diff --git a/mathesar_ui/src/systems/data-explorer/QueryManager.ts b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
index c6f274dd6c..407640d0e9 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryManager.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
@@ -91,7 +91,7 @@ export default class QueryManager extends QueryRunner {
       abstractTypeMap,
       onRunWithObject: (response: QueryRunResponse) => {
         this.checkAndUpdateSummarizationAfterRun(
-          new QueryModel(response.query),
+          new QueryModel({ database_id: query.database_id, ...response.query }),
         );
       },
     });
diff --git a/mathesar_ui/src/systems/data-explorer/QueryModel.ts b/mathesar_ui/src/systems/data-explorer/QueryModel.ts
index 46d582a25e..867d0025b9 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryModel.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryModel.ts
@@ -1,8 +1,8 @@
 import type {
+  ExplorationDef,
   QueryInstance,
   QueryInstanceInitialColumn,
   QueryInstanceTransformation,
-  QueryRunRequest,
   UnsavedQueryInstance,
 } from '@mathesar/api/rpc/explorations';
 import { assertExhaustive } from '@mathesar-component-library';
@@ -61,6 +61,8 @@ function validate(
 }
 
 export default class QueryModel {
+  readonly database_id: UnsavedQueryInstance['database_id'];
+
   readonly base_table_oid: UnsavedQueryInstance['base_table_oid'];
 
   readonly id: UnsavedQueryInstance['id'];
@@ -79,23 +81,24 @@ export default class QueryModel {
 
   readonly isRunnable: boolean;
 
-  constructor(model?: UnsavedQueryInstance | QueryModel) {
-    this.base_table_oid = model?.base_table_oid;
-    this.id = model?.id;
-    this.name = model?.name;
-    this.description = model?.description;
-    this.initial_columns = model?.initial_columns ?? [];
+  constructor(model: UnsavedQueryInstance | QueryModel) {
+    this.database_id = model.database_id;
+    this.base_table_oid = model.base_table_oid;
+    this.id = model.id;
+    this.name = model.name;
+    this.description = model.description;
+    this.initial_columns = model.initial_columns ?? [];
     let transformationModels;
     if (model && 'transformationModels' in model) {
       transformationModels = [...model.transformationModels];
     } else {
       transformationModels =
-        model?.transformations?.map(getTransformationModel) ?? [];
+        model.transformations?.map(getTransformationModel) ?? [];
     }
     this.transformationModels = transformationModels;
-    this.display_names = model?.display_names ?? {};
+    this.display_names = model.display_names ?? {};
     const validationResult = validate({
-      base_table_oid: model?.base_table_oid,
+      base_table_oid: model.base_table_oid,
       transformationModels,
     });
     this.isValid = validationResult.isValid;
@@ -104,6 +107,7 @@ export default class QueryModel {
 
   withBaseTable(base_table?: number): QueryModelUpdateDiff {
     const model = new QueryModel({
+      database_id: this.database_id,
       base_table_oid: base_table,
       id: this.id,
       name: this.name,
@@ -432,7 +436,7 @@ export default class QueryModel {
     );
   }
 
-  toRunRequestJson(): Omit<QueryRunRequest, 'parameters'> {
+  toExplorationDef(): ExplorationDef {
     if (this.base_table_oid === undefined) {
       throw new Error(
         'Cannot formulate run request since base_table is undefined',
@@ -442,7 +446,8 @@ export default class QueryModel {
       ? this.transformationModels
       : this.transformationModels.filter((transform) => transform.isValid());
     return {
-      base_table: this.base_table_oid,
+      database_id: this.database_id,
+      base_table_oid: this.base_table_oid,
       initial_columns: this.initial_columns,
       transformations: transformations.map((entry) => entry.toJson()),
       display_names: this.display_names,
@@ -455,6 +460,7 @@ export default class QueryModel {
 
   toJson(): UnsavedQueryInstance {
     return {
+      database_id: this.database_id,
       id: this.id,
       name: this.name,
       description: this.description,
diff --git a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
index 1ad1f29d07..e5aba40599 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
@@ -3,6 +3,7 @@ import { derived, get, writable } from 'svelte/store';
 
 import { ApiMultiError } from '@mathesar/api/rest/utils/errors';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+import { api } from '@mathesar/api/rpc';
 import type {
   QueryColumnMetaData,
   QueryResultRecord,
@@ -12,7 +13,7 @@ import Plane from '@mathesar/components/sheet/selection/Plane';
 import Series from '@mathesar/components/sheet/selection/Series';
 import SheetSelectionStore from '@mathesar/components/sheet/selection/SheetSelectionStore';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
-import { fetchQueryResults, runQuery } from '@mathesar/stores/queries';
+import { fetchQueryResults } from '@mathesar/stores/queries';
 import Pagination from '@mathesar/utils/Pagination';
 import type { ShareConsumer } from '@mathesar/utils/shares';
 import { CancellablePromise, ImmutableMap } from '@mathesar-component-library';
@@ -167,12 +168,12 @@ export default class QueryRunner {
       const paginationParams = get(this.pagination).recordsRequestParams();
       this.runState.set({ state: 'processing' });
       if (this.runMode === 'queryObject') {
-        const internalRunPromise = runQuery({
-          ...queryModel.toRunRequestJson(),
-          parameters: {
+        const internalRunPromise = api.explorations
+          .run({
+            exploration_def: queryModel.toExplorationDef(),
             ...paginationParams,
-          },
-        });
+          })
+          .run();
         this.runPromise = internalRunPromise;
         const internalResponse = await internalRunPromise;
         response = internalResponse;
diff --git a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
index 49eabc3eea..1c8b397c45 100644
--- a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
+++ b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
@@ -12,6 +12,7 @@ type TerseSummarizedColumn = Pick<Column, 'id' | 'name'>;
 type BaseTable = Pick<Table, 'oid' | 'name'>;
 
 interface TerseSummarization {
+  databaseId: number;
   baseTable: BaseTable;
   columns: TerseSummarizedColumn[];
   terseGrouping: TerseGrouping;
@@ -41,6 +42,7 @@ class Streamline {
 
   static terseSummarization(t: TerseSummarization): TerseSummarization {
     return {
+      databaseId: t.databaseId,
       baseTable: Streamline.baseTable(t.baseTable),
       columns: t.columns.map((c) => Streamline.terseSummarizedColumn(c)),
       terseGrouping: t.terseGrouping,
@@ -59,6 +61,7 @@ export function createDataExplorerUrlToExploreATable(
 ) {
   const dataExplorerRouteUrl = getDataExplorerPageUrl(databaseId, schemaId);
   const tableInformationHash = buildTableInformationHash({
+    databaseId,
     baseTable,
     columns: [],
     terseGrouping: [],
@@ -93,11 +96,14 @@ export function constructQueryModelFromHash(
     Url64.decode(hash),
   ) as Partial<TerseSummarization>;
 
+  if (!terseSummarization.databaseId) {
+    return undefined;
+  }
   if (!terseSummarization.baseTable) {
     return undefined;
   }
 
-  const { baseTable } = terseSummarization;
+  const { baseTable, databaseId } = terseSummarization;
   let initialColumns: UnsavedQueryInstance['initial_columns'] = [];
   let transformations: UnsavedQueryInstance['transformations'] = [];
 
@@ -105,7 +111,7 @@ export function constructQueryModelFromHash(
     !terseSummarization.terseGrouping?.length ||
     !terseSummarization.columns
   ) {
-    return { base_table_oid: baseTable.oid };
+    return { database_id: databaseId, base_table_oid: baseTable.oid };
   }
 
   const columnMap = new Map(
@@ -119,7 +125,7 @@ export function constructQueryModelFromHash(
     .filter((entry): entry is TerseSummarizedColumn => entry !== undefined);
 
   if (groupingColumns.length === 0) {
-    return { base_table_oid: baseTable.oid };
+    return { database_id: databaseId, base_table_oid: baseTable.oid };
   }
 
   const baseGroupingColumn = groupingColumns[0];
@@ -175,6 +181,7 @@ export function constructQueryModelFromHash(
   );
 
   return {
+    database_id: databaseId,
     base_table_oid: baseTable.oid,
     initial_columns: initialColumns,
     transformations,
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
index 55ec972e02..52251b385c 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
@@ -36,6 +36,7 @@
       table.schema.database.id,
       table.schema.oid,
       {
+        databaseId: table.schema.database.id,
         baseTable: table,
         columns: $columns,
         terseGrouping: $grouping.terse(),

From f68a2d0dcb6452581acf598ccbb466781789f671 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 20 Sep 2024 17:45:23 -0400
Subject: [PATCH 0976/1141] Clean up some explorations types

---
 mathesar_ui/src/api/rpc/explorations.ts       | 76 ++++++++-----------
 mathesar_ui/src/components/QueryName.svelte   |  4 +-
 .../breadcrumb/EntitySelector.svelte          |  4 +-
 .../components/breadcrumb/breadcrumbTypes.ts  |  4 +-
 .../pages/exploration/ExplorationPage.svelte  |  6 +-
 .../src/pages/exploration/Header.svelte       |  4 +-
 .../ShareExplorationDropdown.svelte           |  4 +-
 .../src/pages/schema/ExplorationItem.svelte   |  4 +-
 .../src/pages/schema/ExplorationsList.svelte  |  4 +-
 .../pages/schema/SchemaExplorations.svelte    |  6 +-
 .../src/pages/schema/SchemaOverview.svelte    |  4 +-
 .../src/routes/DataExplorerRoute.svelte       |  8 +-
 mathesar_ui/src/stores/queries.ts             | 48 ++++++------
 .../systems/data-explorer/QueryListEntry.ts   |  6 +-
 .../src/systems/data-explorer/QueryManager.ts | 14 ++--
 .../src/systems/data-explorer/QueryModel.ts   | 36 ++++-----
 .../src/systems/data-explorer/QueryRunner.ts  | 18 ++---
 .../data-explorer/QueryUndoRedoManager.ts     |  6 +-
 .../ExplorationTab.svelte                     |  4 +-
 .../transformationUtils.ts                    |  4 +-
 .../data-explorer/urlSerializationUtils.ts    |  8 +-
 .../src/systems/data-explorer/utils.ts        |  6 +-
 mathesar_ui/src/utils/preloadData.ts          |  4 +-
 23 files changed, 135 insertions(+), 147 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/explorations.ts b/mathesar_ui/src/api/rpc/explorations.ts
index fe1ade7822..f1f3f3e0c6 100644
--- a/mathesar_ui/src/api/rpc/explorations.ts
+++ b/mathesar_ui/src/api/rpc/explorations.ts
@@ -1,14 +1,12 @@
 import type { PaginatedResponse } from '@mathesar/api/rest/utils/requestUtils';
 import type { Column, ColumnMetadata } from '@mathesar/api/rpc/columns';
-import type { RawSchema } from '@mathesar/api/rpc/schemas';
 import type { JoinPath } from '@mathesar/api/rpc/tables';
 import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
 import type { FilterId } from '@mathesar/stores/abstract-types/types';
 
-type QueryColumnAlias = string;
-
-export interface QueryInstanceInitialColumn {
-  alias: QueryColumnAlias;
+export interface InitialColumn {
+  alias: string;
+  /** The PostgreSQL attnum of the column */
   id: Column['id'];
   jp_path?: JoinPath;
 }
@@ -60,7 +58,8 @@ export interface QueryInstanceSummarizationTransformation {
 
 export interface QueryInstanceHideTransformation {
   type: 'hide';
-  spec: QueryColumnAlias[];
+  /** Column aliases */
+  spec: string[];
 }
 
 export interface QueryInstanceSortTransformation {
@@ -79,46 +78,26 @@ export type QueryInstanceTransformation =
   | QueryInstanceHideTransformation
   | QueryInstanceSortTransformation;
 
-/** Called `ExplorationInfo` in Python docs */
-export interface QueryInstance {
+export interface SavedExploration {
   id: number;
   database_id: number;
   name: string;
   description?: string;
   base_table_oid: number;
-  initial_columns?: QueryInstanceInitialColumn[];
+  initial_columns: InitialColumn[];
   transformations?: QueryInstanceTransformation[];
-  display_names: Record<string, string> | null;
+  display_names?: Record<string, string> | null;
   display_options?: unknown[];
 }
 
-export type UnsavedQueryInstance = Partial<QueryInstance> & {
+export type UnsavedExploration = Partial<SavedExploration> & {
   database_id: number;
 };
 
-export interface QueryGetResponse extends QueryInstance {
-  readonly schema: number;
-}
-
-/**
- * TODO: fix code duplication with QueryInstance
- */
-export interface ExplorationDef {
-  database_id: number;
-  base_table_oid: number;
-  initial_columns: unknown[];
-  transformations?: unknown[];
-  display_options?: unknown[];
-  display_names?: Record<string, unknown>;
-  description?: string;
-}
-
-export interface NamedExplorationDef extends ExplorationDef {
-  name: string;
-}
+export type AnonymousExploration = Omit<SavedExploration, 'id' | 'name'>;
 
 export interface ExplorationRunParams {
-  exploration_def: ExplorationDef;
+  exploration_def: AnonymousExploration;
   limit: number;
   offset: number;
 }
@@ -161,19 +140,21 @@ type QueryResultRecords =
   | PaginatedResponse<QueryResultRecord>
   | { count: 0; results: null };
 
-/** Called `ExplorationResult` in Python docs */
-export interface QueryRunResponse {
+export interface ExplorationResult {
   records: QueryResultRecords;
-  output_columns: QueryColumnAlias[];
+  /** Each string is a column alias */
+  output_columns: string[];
   column_metadata: Record<string, QueryColumnMetaData>;
   query: {
-    schema: RawSchema['oid'];
-    base_table: QueryInstance['base_table_oid'];
-    initial_columns: QueryInstanceInitialColumn[];
+    /** The schema OID */
+    schema: number;
+    /** The table OID */
+    base_table: number;
+    initial_columns: InitialColumn[];
     transformations?: QueryInstanceTransformation[];
   };
-  limit: unknown;
-  offset: unknown;
+  limit: number;
+  offset: number;
   filter: unknown;
   order_by: unknown;
   /** Specifies a list of dicts containing column names and searched expression. */
@@ -183,17 +164,20 @@ export interface QueryRunResponse {
 }
 
 export const explorations = {
-  list: rpcMethodTypeContainer<{ database_id: number }, QueryInstance[]>(),
+  list: rpcMethodTypeContainer<{ database_id: number }, SavedExploration[]>(),
 
-  get: rpcMethodTypeContainer<{ exploration_id: number }, QueryInstance>(),
+  get: rpcMethodTypeContainer<{ exploration_id: number }, SavedExploration>(),
 
-  add: rpcMethodTypeContainer<NamedExplorationDef, void>(),
+  add: rpcMethodTypeContainer<AnonymousExploration & { name: string }, void>(),
 
   delete: rpcMethodTypeContainer<{ exploration_id: number }, void>(),
 
-  replace: rpcMethodTypeContainer<{ new_exploration: QueryInstance }, void>(),
+  replace: rpcMethodTypeContainer<
+    { new_exploration: SavedExploration },
+    void
+  >(),
 
-  run: rpcMethodTypeContainer<ExplorationRunParams, QueryRunResponse>(),
+  run: rpcMethodTypeContainer<ExplorationRunParams, ExplorationResult>(),
 
   run_saved: rpcMethodTypeContainer<
     {
@@ -201,6 +185,6 @@ export const explorations = {
       limit: number;
       offset: number;
     },
-    QueryRunResponse
+    ExplorationResult
   >(),
 };
diff --git a/mathesar_ui/src/components/QueryName.svelte b/mathesar_ui/src/components/QueryName.svelte
index 47afacdbc0..93ac71c7bc 100644
--- a/mathesar_ui/src/components/QueryName.svelte
+++ b/mathesar_ui/src/components/QueryName.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-  import type { QueryInstance } from '@mathesar/api/rpc/explorations';
+  import type { SavedExploration } from '@mathesar/api/rpc/explorations';
   import { iconExploration } from '@mathesar/icons';
 
   import NameWithIcon from './NameWithIcon.svelte';
 
-  export let query: QueryInstance;
+  export let query: SavedExploration;
 </script>
 
 <NameWithIcon icon={iconExploration}>{query.name}</NameWithIcon>
diff --git a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
index 21bb0ca1cc..6e861b870f 100644
--- a/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
+++ b/mathesar_ui/src/components/breadcrumb/EntitySelector.svelte
@@ -2,7 +2,7 @@
   import { _ } from 'svelte-i18n';
   import { meta } from 'tinro';
 
-  import type { QueryInstance } from '@mathesar/api/rpc/explorations';
+  import type { SavedExploration } from '@mathesar/api/rpc/explorations';
   import { iconTable } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
   import type { Schema } from '@mathesar/models/Schema';
@@ -40,7 +40,7 @@
   const currentRoute = meta();
 
   function makeQueryBreadcrumbSelectorItem(
-    queryInstance: QueryInstance,
+    queryInstance: SavedExploration,
   ): SimpleBreadcrumbSelectorEntry {
     return {
       type: 'simple',
diff --git a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
index b384711426..3ec4e391e8 100644
--- a/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
+++ b/mathesar_ui/src/components/breadcrumb/breadcrumbTypes.ts
@@ -1,4 +1,4 @@
-import type { QueryInstance } from '@mathesar/api/rpc/explorations';
+import type { SavedExploration } from '@mathesar/api/rpc/explorations';
 import type {
   ComponentAndProps,
   IconProps,
@@ -51,7 +51,7 @@ export interface BreadcrumbItemExploration {
   type: 'exploration';
   database: Database;
   schema: Schema;
-  query: Pick<QueryInstance, 'id' | 'name'>;
+  query: Pick<SavedExploration, 'id' | 'name'>;
 }
 
 export type BreadcrumbItem =
diff --git a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
index 1000a31d55..77254e8939 100644
--- a/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
+++ b/mathesar_ui/src/pages/exploration/ExplorationPage.svelte
@@ -2,7 +2,7 @@
   import { _ } from 'svelte-i18n';
   import { router } from 'tinro';
 
-  import type { QueryInstance } from '@mathesar/api/rpc/explorations';
+  import type { SavedExploration } from '@mathesar/api/rpc/explorations';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import type { Database } from '@mathesar/models/Database';
   import type { Schema } from '@mathesar/models/Schema';
@@ -21,7 +21,7 @@
 
   export let database: Database;
   export let schema: Schema;
-  export let query: QueryInstance;
+  export let query: SavedExploration;
   export let shareConsumer: ShareConsumer | undefined = undefined;
 
   $: schemaName = schema.name;
@@ -30,7 +30,7 @@
   let isInspectorOpen = true;
 
   function createQueryRunner(
-    _query: QueryInstance,
+    _query: SavedExploration,
     abstractTypeMap: AbstractTypesMap,
   ) {
     queryRunner?.destroy();
diff --git a/mathesar_ui/src/pages/exploration/Header.svelte b/mathesar_ui/src/pages/exploration/Header.svelte
index 0259ebfb36..4e96936d7f 100644
--- a/mathesar_ui/src/pages/exploration/Header.svelte
+++ b/mathesar_ui/src/pages/exploration/Header.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { QueryInstance } from '@mathesar/api/rpc/explorations';
+  import type { SavedExploration } from '@mathesar/api/rpc/explorations';
   import EntityPageHeader from '@mathesar/components/EntityPageHeader.svelte';
   import { iconExploration, iconInspector } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
@@ -11,7 +11,7 @@
 
   export let database: Database;
   export let schema: Schema;
-  export let query: QueryInstance;
+  export let query: SavedExploration;
   export let isInspectorOpen = true;
   export let context: 'page' | 'shared-consumer-page' = 'page';
 </script>
diff --git a/mathesar_ui/src/pages/exploration/ShareExplorationDropdown.svelte b/mathesar_ui/src/pages/exploration/ShareExplorationDropdown.svelte
index 04004cef53..82a7fdcde5 100644
--- a/mathesar_ui/src/pages/exploration/ShareExplorationDropdown.svelte
+++ b/mathesar_ui/src/pages/exploration/ShareExplorationDropdown.svelte
@@ -2,13 +2,13 @@
   import { _ } from 'svelte-i18n';
 
   import queryShareApi from '@mathesar/api/rest/queryShares';
-  import type { QueryInstance } from '@mathesar/api/rpc/explorations';
+  import type { SavedExploration } from '@mathesar/api/rpc/explorations';
   import { iconShare } from '@mathesar/icons';
   import { getSharedExplorationPageUrl } from '@mathesar/routes/urls';
   import ShareEntity from '@mathesar/systems/shares/ShareEntity.svelte';
   import { Dropdown, Icon } from '@mathesar-component-library';
 
-  export let id: QueryInstance['id'];
+  export let id: SavedExploration['id'];
 </script>
 
 <Dropdown
diff --git a/mathesar_ui/src/pages/schema/ExplorationItem.svelte b/mathesar_ui/src/pages/schema/ExplorationItem.svelte
index 0d3bde4aab..0d433750e5 100644
--- a/mathesar_ui/src/pages/schema/ExplorationItem.svelte
+++ b/mathesar_ui/src/pages/schema/ExplorationItem.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { QueryInstance } from '@mathesar/api/rpc/explorations';
+  import type { SavedExploration } from '@mathesar/api/rpc/explorations';
   import TableName from '@mathesar/components/TableName.svelte';
   import { iconExploration } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
@@ -10,7 +10,7 @@
   import { currentTablesData as tablesStore } from '@mathesar/stores/tables';
   import { Icon } from '@mathesar-component-library';
 
-  export let exploration: QueryInstance;
+  export let exploration: SavedExploration;
   export let database: Database;
   export let schema: Schema;
 
diff --git a/mathesar_ui/src/pages/schema/ExplorationsList.svelte b/mathesar_ui/src/pages/schema/ExplorationsList.svelte
index 91d3d5b23f..9f11e1d669 100644
--- a/mathesar_ui/src/pages/schema/ExplorationsList.svelte
+++ b/mathesar_ui/src/pages/schema/ExplorationsList.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { QueryInstance } from '@mathesar/api/rpc/explorations';
+  import type { SavedExploration } from '@mathesar/api/rpc/explorations';
   import { iconExploration } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
   import type { Schema } from '@mathesar/models/Schema';
@@ -9,7 +9,7 @@
   import EmptyEntity from './EmptyEntity.svelte';
   import ExplorationItem from './ExplorationItem.svelte';
 
-  export let explorations: QueryInstance[];
+  export let explorations: SavedExploration[];
   export let database: Database;
   export let schema: Schema;
   export let bordered = true;
diff --git a/mathesar_ui/src/pages/schema/SchemaExplorations.svelte b/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
index af7633e7e9..3c8406758c 100644
--- a/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaExplorations.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
-  import type { QueryInstance } from '@mathesar/api/rpc/explorations';
+  import type { SavedExploration } from '@mathesar/api/rpc/explorations';
   import EntityContainerWithFilterBar from '@mathesar/components/EntityContainerWithFilterBar.svelte';
   import { RichText } from '@mathesar/components/rich-text';
   import type { Database } from '@mathesar/models/Database';
@@ -14,7 +14,7 @@
 
   export let database: Database;
   export let schema: Schema;
-  export let explorationsMap: Map<number, QueryInstance>;
+  export let explorationsMap: Map<number, SavedExploration>;
   export let hasTablesToExplore: boolean;
 
   $: showTutorial = explorationsMap.size === 0 && hasTablesToExplore;
@@ -22,7 +22,7 @@
   let explorationsSearchQuery = '';
 
   function filterExplorations(
-    _explorationsMap: Map<number, QueryInstance>,
+    _explorationsMap: Map<number, SavedExploration>,
     searchQuery: string,
   ) {
     return [..._explorationsMap.values()].filter((exploration) =>
diff --git a/mathesar_ui/src/pages/schema/SchemaOverview.svelte b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
index 8aebde625a..e5f8983b67 100644
--- a/mathesar_ui/src/pages/schema/SchemaOverview.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
@@ -2,7 +2,7 @@
   import { _ } from 'svelte-i18n';
 
   import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
-  import type { QueryInstance } from '@mathesar/api/rpc/explorations';
+  import type { SavedExploration } from '@mathesar/api/rpc/explorations';
   import SpinnerButton from '@mathesar/component-library/spinner-button/SpinnerButton.svelte';
   import ErrorBox from '@mathesar/components/message-boxes/ErrorBox.svelte';
   import { iconRefresh } from '@mathesar/icons';
@@ -24,7 +24,7 @@
   import TablesList from './TablesList.svelte';
 
   export let tablesMap: Map<Table['oid'], Table>;
-  export let explorationsMap: Map<number, QueryInstance>;
+  export let explorationsMap: Map<number, SavedExploration>;
   export let tablesRequestStatus: RequestStatus;
   export let explorationsRequestStatus: RequestStatus;
 
diff --git a/mathesar_ui/src/routes/DataExplorerRoute.svelte b/mathesar_ui/src/routes/DataExplorerRoute.svelte
index 9d7bec8894..bd6db3d9dc 100644
--- a/mathesar_ui/src/routes/DataExplorerRoute.svelte
+++ b/mathesar_ui/src/routes/DataExplorerRoute.svelte
@@ -4,8 +4,8 @@
   import { router } from 'tinro';
 
   import type {
-    QueryInstance,
-    UnsavedQueryInstance,
+    SavedExploration,
+    UnsavedExploration,
   } from '@mathesar/api/rpc/explorations';
   import type { CancellablePromise } from '@mathesar/component-library';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
@@ -33,10 +33,10 @@
   let is404 = false;
 
   let queryManager: QueryManager | undefined;
-  let queryLoadPromise: CancellablePromise<QueryInstance>;
+  let queryLoadPromise: CancellablePromise<SavedExploration>;
   let query: Readable<QueryModel | undefined> = readable(undefined);
 
-  function createQueryManager(queryInstance: UnsavedQueryInstance) {
+  function createQueryManager(queryInstance: UnsavedExploration) {
     queryManager?.destroy();
     queryManager = new QueryManager({
       query: new QueryModel(queryInstance),
diff --git a/mathesar_ui/src/stores/queries.ts b/mathesar_ui/src/stores/queries.ts
index b1e8a4d219..0b5d541b2a 100644
--- a/mathesar_ui/src/stores/queries.ts
+++ b/mathesar_ui/src/stores/queries.ts
@@ -51,10 +51,9 @@ import {
   putAPI,
 } from '@mathesar/api/rest/utils/requestUtils';
 import type {
-  QueryGetResponse,
-  QueryInstance,
-  QueryRunResponse,
-  UnsavedQueryInstance,
+  ExplorationResult,
+  SavedExploration,
+  UnsavedExploration,
 } from '@mathesar/api/rpc/explorations';
 import type { Schema } from '@mathesar/models/Schema';
 import CacheManager from '@mathesar/utils/CacheManager';
@@ -69,7 +68,7 @@ const commonData = preloadCommonData();
 export interface QueriesStoreSubstance {
   schemaId: Schema['oid'];
   requestStatus: RequestStatus;
-  data: Map<QueryInstance['id'], QueryInstance>;
+  data: Map<SavedExploration['id'], SavedExploration>;
 }
 
 // Cache the query list of the last 3 opened schemas
@@ -80,16 +79,18 @@ const schemasCacheManager = new CacheManager<
 
 const requestMap: Map<
   Schema['oid'],
-  CancellablePromise<PaginatedResponse<QueryInstance>>
+  CancellablePromise<PaginatedResponse<SavedExploration>>
 > = new Map();
 
-function sortedQueryEntries(queryEntries: QueryInstance[]): QueryInstance[] {
+function sortedQueryEntries(
+  queryEntries: SavedExploration[],
+): SavedExploration[] {
   return [...queryEntries].sort((a, b) => a.name?.localeCompare(b.name));
 }
 
 function setSchemaQueriesStore(
   schemaId: Schema['oid'],
-  queryEntries?: QueryInstance[],
+  queryEntries?: SavedExploration[],
 ): Writable<QueriesStoreSubstance> {
   const queries: QueriesStoreSubstance['data'] = new Map();
   if (queryEntries) {
@@ -114,7 +115,7 @@ function setSchemaQueriesStore(
   return store;
 }
 
-function findSchemaStoreForQuery(id: QueryInstance['id']) {
+function findSchemaStoreForQuery(id: SavedExploration['id']) {
   return [...schemasCacheManager.cache.values()].find((entry) =>
     get(entry).data.has(id),
   );
@@ -137,7 +138,7 @@ export async function refetchQueriesForSchema(
 
     requestMap.get(schemaId)?.cancel();
 
-    const queriesRequest = getAPI<PaginatedResponse<QueryInstance>>(
+    const queriesRequest = getAPI<PaginatedResponse<SavedExploration>>(
       `/api/db/v0/queries/?schema=${schemaId}&limit=500`,
     );
     requestMap.set(schemaId, queriesRequest);
@@ -209,9 +210,12 @@ export const queries: Readable<Omit<QueriesStoreSubstance, 'schemaId'>> =
   });
 
 export function createQuery(
-  newQuery: UnsavedQueryInstance,
-): CancellablePromise<QueryGetResponse> {
-  const promise = postAPI<QueryGetResponse>('/api/db/v0/queries/', newQuery);
+  newQuery: UnsavedExploration,
+): CancellablePromise<SavedExploration & { schema: number }> {
+  const promise = postAPI<SavedExploration & { schema: number }>(
+    '/api/db/v0/queries/',
+    newQuery,
+  );
   void promise.then((instance) => {
     void refetchQueriesForSchema(instance.schema);
     return instance;
@@ -220,9 +224,9 @@ export function createQuery(
 }
 
 export function putQuery(
-  query: QueryInstance,
-): CancellablePromise<QueryInstance> {
-  const promise = putAPI<QueryInstance>(
+  query: SavedExploration,
+): CancellablePromise<SavedExploration> {
+  const promise = putAPI<SavedExploration>(
     `/api/db/v0/queries/${query.id}/`,
     query,
   );
@@ -240,13 +244,13 @@ export function putQuery(
 }
 
 export function getQuery(
-  queryId: QueryInstance['id'],
-): CancellablePromise<QueryInstance> {
+  queryId: SavedExploration['id'],
+): CancellablePromise<SavedExploration> {
   // TODO: Get schemaId as a query property
   const schemaId = get(currentSchemaId);
-  let innerRequest: CancellablePromise<QueryInstance>;
+  let innerRequest: CancellablePromise<SavedExploration>;
   if (schemaId) {
-    return new CancellablePromise<QueryInstance>(
+    return new CancellablePromise<SavedExploration>(
       (resolve, reject) => {
         const store = getQueriesStoreForSchema(schemaId);
         const storeSubstance = get(store);
@@ -256,7 +260,7 @@ export function getQuery(
           return;
         }
         if (storeSubstance.requestStatus.state !== 'success') {
-          innerRequest = getAPI<QueryInstance>(
+          innerRequest = getAPI<SavedExploration>(
             `/api/db/v0/queries/${queryId}/`,
           );
           void innerRequest.then(
@@ -282,7 +286,7 @@ export function fetchQueryResults(
     offset: number;
     [SHARED_LINK_UUID_QUERY_PARAM]?: string;
   },
-): CancellablePromise<QueryRunResponse> {
+): CancellablePromise<ExplorationResult> {
   const url = addQueryParamsToUrl(
     `/api/db/v0/queries/${queryId}/results/`,
     params,
diff --git a/mathesar_ui/src/systems/data-explorer/QueryListEntry.ts b/mathesar_ui/src/systems/data-explorer/QueryListEntry.ts
index ddbd85f733..eb7e13f2bc 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryListEntry.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryListEntry.ts
@@ -1,7 +1,7 @@
-import type { UnsavedQueryInstance } from '@mathesar/api/rpc/explorations';
+import type { UnsavedExploration } from '@mathesar/api/rpc/explorations';
 
 export default class QueryListEntry {
-  queryJSON: UnsavedQueryInstance;
+  queryJSON: UnsavedExploration;
 
   isValid: boolean;
 
@@ -9,7 +9,7 @@ export default class QueryListEntry {
 
   prev: QueryListEntry | undefined = undefined;
 
-  constructor(queryJSON: UnsavedQueryInstance, isValid: boolean) {
+  constructor(queryJSON: UnsavedExploration, isValid: boolean) {
     this.queryJSON = queryJSON;
     this.isValid = isValid;
   }
diff --git a/mathesar_ui/src/systems/data-explorer/QueryManager.ts b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
index 407640d0e9..d689ac99ae 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryManager.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
@@ -5,8 +5,8 @@ import { _ } from 'svelte-i18n';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { api } from '@mathesar/api/rpc';
 import type {
-  QueryInstance,
-  QueryRunResponse,
+  ExplorationResult,
+  SavedExploration,
 } from '@mathesar/api/rpc/explorations';
 import type {
   JoinableTablesResult,
@@ -73,9 +73,9 @@ export default class QueryManager extends QueryRunner {
     | CancellablePromise<JoinableTablesResult>
     | undefined;
 
-  private querySavePromise: CancellablePromise<QueryInstance> | undefined;
+  private querySavePromise: CancellablePromise<SavedExploration> | undefined;
 
-  private onSaveCallback: (instance: QueryInstance) => unknown;
+  private onSaveCallback: (instance: SavedExploration) => unknown;
 
   constructor({
     query,
@@ -84,12 +84,12 @@ export default class QueryManager extends QueryRunner {
   }: {
     query: QueryModel;
     abstractTypeMap: AbstractTypesMap;
-    onSave?: (instance: QueryInstance) => unknown;
+    onSave?: (instance: SavedExploration) => unknown;
   }) {
     super({
       query,
       abstractTypeMap,
-      onRunWithObject: (response: QueryRunResponse) => {
+      onRunWithObject: (response: ExplorationResult) => {
         this.checkAndUpdateSummarizationAfterRun(
           new QueryModel({ database_id: query.database_id, ...response.query }),
         );
@@ -340,7 +340,7 @@ export default class QueryManager extends QueryRunner {
       // TODO: Check for latest validation status here
       if (queryJSON.id !== undefined) {
         // TODO: Figure out a better way to help TS identify this as a saved instance
-        this.querySavePromise = putQuery(queryJSON as QueryInstance);
+        this.querySavePromise = putQuery(queryJSON as SavedExploration);
       } else {
         this.querySavePromise = createQuery(queryJSON);
       }
diff --git a/mathesar_ui/src/systems/data-explorer/QueryModel.ts b/mathesar_ui/src/systems/data-explorer/QueryModel.ts
index 867d0025b9..5fc0b2440c 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryModel.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryModel.ts
@@ -1,9 +1,9 @@
 import type {
-  ExplorationDef,
-  QueryInstance,
-  QueryInstanceInitialColumn,
+  AnonymousExploration,
+  InitialColumn,
   QueryInstanceTransformation,
-  UnsavedQueryInstance,
+  SavedExploration,
+  UnsavedExploration,
 } from '@mathesar/api/rpc/explorations';
 import { assertExhaustive } from '@mathesar-component-library';
 
@@ -22,7 +22,7 @@ export interface QueryModelUpdateDiff {
     | 'initialColumnName'
     | 'transformations'
     | 'initialColumnsAndTransformations';
-  diff: Partial<UnsavedQueryInstance>;
+  diff: Partial<UnsavedExploration>;
 }
 
 export type QueryTransformationModel =
@@ -61,27 +61,27 @@ function validate(
 }
 
 export default class QueryModel {
-  readonly database_id: UnsavedQueryInstance['database_id'];
+  readonly database_id: UnsavedExploration['database_id'];
 
-  readonly base_table_oid: UnsavedQueryInstance['base_table_oid'];
+  readonly base_table_oid: UnsavedExploration['base_table_oid'];
 
-  readonly id: UnsavedQueryInstance['id'];
+  readonly id: UnsavedExploration['id'];
 
-  readonly name: UnsavedQueryInstance['name'];
+  readonly name: UnsavedExploration['name'];
 
-  readonly description: UnsavedQueryInstance['description'];
+  readonly description: UnsavedExploration['description'];
 
-  readonly initial_columns: QueryInstanceInitialColumn[];
+  readonly initial_columns: InitialColumn[];
 
   readonly transformationModels: QueryTransformationModel[];
 
-  readonly display_names: NonNullable<QueryInstance['display_names']>;
+  readonly display_names: NonNullable<SavedExploration['display_names']>;
 
   readonly isValid: boolean;
 
   readonly isRunnable: boolean;
 
-  constructor(model: UnsavedQueryInstance | QueryModel) {
+  constructor(model: UnsavedExploration | QueryModel) {
     this.database_id = model.database_id;
     this.base_table_oid = model.base_table_oid;
     this.id = model.id;
@@ -163,7 +163,7 @@ export default class QueryModel {
     };
   }
 
-  withInitialColumn(column: QueryInstanceInitialColumn): QueryModelUpdateDiff {
+  withInitialColumn(column: InitialColumn): QueryModelUpdateDiff {
     const initialColumns = [...this.initial_columns, column];
     const model = new QueryModel({
       ...this,
@@ -387,7 +387,7 @@ export default class QueryModel {
     };
   }
 
-  getColumn(columnAlias: string): QueryInstanceInitialColumn | undefined {
+  getColumn(columnAlias: string): InitialColumn | undefined {
     return this.initial_columns.find((column) => column.alias === columnAlias);
   }
 
@@ -436,7 +436,7 @@ export default class QueryModel {
     );
   }
 
-  toExplorationDef(): ExplorationDef {
+  toAnonymousExploration(): AnonymousExploration {
     if (this.base_table_oid === undefined) {
       throw new Error(
         'Cannot formulate run request since base_table is undefined',
@@ -454,11 +454,11 @@ export default class QueryModel {
     };
   }
 
-  getColumnCount(id: QueryInstanceInitialColumn['id']): number {
+  getColumnCount(id: InitialColumn['id']): number {
     return this.initial_columns.filter((entry) => entry.id === id).length;
   }
 
-  toJson(): UnsavedQueryInstance {
+  toJson(): UnsavedExploration {
     return {
       database_id: this.database_id,
       id: this.id,
diff --git a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
index e5aba40599..e115876d59 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
@@ -5,9 +5,9 @@ import { ApiMultiError } from '@mathesar/api/rest/utils/errors';
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { api } from '@mathesar/api/rpc';
 import type {
+  ExplorationResult,
   QueryColumnMetaData,
   QueryResultRecord,
-  QueryRunResponse,
 } from '@mathesar/api/rpc/explorations';
 import Plane from '@mathesar/components/sheet/selection/Plane';
 import Series from '@mathesar/components/sheet/selection/Series';
@@ -72,13 +72,13 @@ export default class QueryRunner {
 
   inspector: QueryInspector;
 
-  private runPromise: CancellablePromise<QueryRunResponse> | undefined;
+  private runPromise: CancellablePromise<ExplorationResult> | undefined;
 
   private runMode: QueryRunMode;
 
-  private onRunWithObjectCallback?: (results: QueryRunResponse) => unknown;
+  private onRunWithObjectCallback?: (results: ExplorationResult) => unknown;
 
-  private onRunWithIdCallback?: (results: QueryRunResponse) => unknown;
+  private onRunWithIdCallback?: (results: ExplorationResult) => unknown;
 
   private shareConsumer?: ShareConsumer;
 
@@ -93,8 +93,8 @@ export default class QueryRunner {
     query: QueryModel;
     abstractTypeMap: AbstractTypesMap;
     runMode?: QueryRunMode;
-    onRunWithObject?: (instance: QueryRunResponse) => unknown;
-    onRunWithId?: (instance: QueryRunResponse) => unknown;
+    onRunWithObject?: (instance: ExplorationResult) => unknown;
+    onRunWithId?: (instance: ExplorationResult) => unknown;
     shareConsumer?: ShareConsumer;
   }) {
     this.abstractTypeMap = abstractTypeMap;
@@ -149,7 +149,7 @@ export default class QueryRunner {
     );
   }
 
-  async run(): Promise<QueryRunResponse | undefined> {
+  async run(): Promise<ExplorationResult | undefined> {
     this.runPromise?.cancel();
     const queryModel = this.getQueryModel();
 
@@ -162,7 +162,7 @@ export default class QueryRunner {
       return undefined;
     }
 
-    let response: QueryRunResponse;
+    let response: ExplorationResult;
     let triggerCallback: () => unknown;
     try {
       const paginationParams = get(this.pagination).recordsRequestParams();
@@ -170,7 +170,7 @@ export default class QueryRunner {
       if (this.runMode === 'queryObject') {
         const internalRunPromise = api.explorations
           .run({
-            exploration_def: queryModel.toExplorationDef(),
+            exploration_def: queryModel.toAnonymousExploration(),
             ...paginationParams,
           })
           .run();
diff --git a/mathesar_ui/src/systems/data-explorer/QueryUndoRedoManager.ts b/mathesar_ui/src/systems/data-explorer/QueryUndoRedoManager.ts
index 8d25f7ad91..06587809e3 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryUndoRedoManager.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryUndoRedoManager.ts
@@ -1,4 +1,4 @@
-import type { UnsavedQueryInstance } from '@mathesar/api/rpc/explorations';
+import type { UnsavedExploration } from '@mathesar/api/rpc/explorations';
 
 import QueryListEntry from './QueryListEntry';
 import QueryModel from './QueryModel';
@@ -11,7 +11,7 @@ export default class QueryUndoRedoManager {
       const { query, isValid } = queryInfo;
       const json = JSON.parse(
         JSON.stringify(query.toJson()),
-      ) as UnsavedQueryInstance;
+      ) as UnsavedExploration;
       this.current = new QueryListEntry(json, isValid);
     }
   }
@@ -22,7 +22,7 @@ export default class QueryUndoRedoManager {
     }
     const json = JSON.parse(
       JSON.stringify(query.toJson()),
-    ) as UnsavedQueryInstance;
+    ) as UnsavedExploration;
     const newNode = new QueryListEntry(json, isValid);
     if (this.current && !this.current.isValid) {
       newNode.prev = this.current.prev;
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte
index 821f39610f..bca709cdf0 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte
@@ -2,7 +2,7 @@
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
 
-  import type { QueryInstance } from '@mathesar/api/rpc/explorations';
+  import type { SavedExploration } from '@mathesar/api/rpc/explorations';
   import Form from '@mathesar/components/Form.svelte';
   import FormField from '@mathesar/components/FormField.svelte';
   import { iconDeleteMajor } from '@mathesar/icons';
@@ -74,7 +74,7 @@
         .withName(name)
         .model.withDescription(description).model;
       // TODO: Write better utility methods to identify saved instances
-      await putQuery(updatedQuery.toJson() as QueryInstance);
+      await putQuery(updatedQuery.toJson() as SavedExploration);
       query.set(updatedQuery);
     } catch (err) {
       const message =
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/transformationUtils.ts b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/transformationUtils.ts
index eedd7bf76c..a674f99d37 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/transformationUtils.ts
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/transformations-pane/transformationUtils.ts
@@ -1,4 +1,4 @@
-import type { QueryInstanceInitialColumn } from '@mathesar/api/rpc/explorations';
+import type { InitialColumn } from '@mathesar/api/rpc/explorations';
 
 import type { QueryTransformationModel } from '../../QueryModel';
 import {
@@ -7,7 +7,7 @@ import {
 } from '../../utils';
 
 export function calcAllowedColumnsPerTransformation(
-  initialColumns: QueryInstanceInitialColumn[],
+  initialColumns: InitialColumn[],
   transformationModels: QueryTransformationModel[],
   columnsMetaData: ProcessedQueryResultColumnMap,
 ): ProcessedQueryResultColumnMap[] {
diff --git a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
index 1c8b397c45..2cca570faf 100644
--- a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
+++ b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
@@ -1,7 +1,7 @@
 import type { Column } from '@mathesar/api/rpc/columns';
 import type {
   QueryInstanceSummarizationTransformation,
-  UnsavedQueryInstance,
+  UnsavedExploration,
 } from '@mathesar/api/rpc/explorations';
 import type { Table } from '@mathesar/models/Table';
 import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
@@ -91,7 +91,7 @@ export function constructDataExplorerUrlToSummarizeFromGroup(
 
 export function constructQueryModelFromHash(
   hash: string,
-): UnsavedQueryInstance | undefined {
+): UnsavedExploration | undefined {
   const terseSummarization = JSON.parse(
     Url64.decode(hash),
   ) as Partial<TerseSummarization>;
@@ -104,8 +104,8 @@ export function constructQueryModelFromHash(
   }
 
   const { baseTable, databaseId } = terseSummarization;
-  let initialColumns: UnsavedQueryInstance['initial_columns'] = [];
-  let transformations: UnsavedQueryInstance['transformations'] = [];
+  let initialColumns: UnsavedExploration['initial_columns'] = [];
+  let transformations: UnsavedExploration['transformations'] = [];
 
   if (
     !terseSummarization.terseGrouping?.length ||
diff --git a/mathesar_ui/src/systems/data-explorer/utils.ts b/mathesar_ui/src/systems/data-explorer/utils.ts
index 956f430faf..525321ef0a 100644
--- a/mathesar_ui/src/systems/data-explorer/utils.ts
+++ b/mathesar_ui/src/systems/data-explorer/utils.ts
@@ -1,10 +1,10 @@
 import type { Column } from '@mathesar/api/rpc/columns';
 import type {
+  ExplorationResult,
   QueryColumnMetaData,
   QueryGeneratedColumnSource,
   QueryInitialColumnSource,
   QueryResultColumn,
-  QueryRunResponse,
 } from '@mathesar/api/rpc/explorations';
 import type { JoinPath, JoinableTablesResult } from '@mathesar/api/rpc/tables';
 import type { CellColumnFabric } from '@mathesar/components/cell-fabric/types';
@@ -359,7 +359,7 @@ function processColumn(
 }
 
 export function processColumnMetaData(
-  columnMetaData: QueryRunResponse['column_metadata'],
+  columnMetaData: ExplorationResult['column_metadata'],
   abstractTypeMap: AbstractTypesMap,
 ): ProcessedQueryResultColumnMap {
   return new ImmutableMap(
@@ -508,7 +508,7 @@ export function speculateColumnMetaData({
 }
 
 export function getProcessedOutputColumns(
-  outputColumnAliases: QueryRunResponse['output_columns'],
+  outputColumnAliases: ExplorationResult['output_columns'],
   processedColumnMetaData: ProcessedQueryResultColumnMap,
 ): ProcessedQueryOutputColumnMap {
   return new ImmutableMap(
diff --git a/mathesar_ui/src/utils/preloadData.ts b/mathesar_ui/src/utils/preloadData.ts
index c3a43bff7b..34cca12bfe 100644
--- a/mathesar_ui/src/utils/preloadData.ts
+++ b/mathesar_ui/src/utils/preloadData.ts
@@ -1,6 +1,6 @@
 import type { User } from '@mathesar/api/rest/users';
 import type { RawDatabase } from '@mathesar/api/rpc/databases';
-import type { QueryInstance } from '@mathesar/api/rpc/explorations';
+import type { SavedExploration } from '@mathesar/api/rpc/explorations';
 import type { RawSchema } from '@mathesar/api/rpc/schemas';
 import type { RawServer } from '@mathesar/api/rpc/servers';
 import type { RawTableWithMetadata } from '@mathesar/api/rpc/tables';
@@ -10,7 +10,7 @@ export interface CommonData {
   servers: RawServer[];
   schemas: RawSchema[];
   tables: RawTableWithMetadata[];
-  queries: QueryInstance[];
+  queries: SavedExploration[];
   current_database: RawDatabase['id'] | null;
   internal_db_connection: {
     database: string;

From 19e1c36a6c0bb478d6b382b0b46ee08d27757695 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Sun, 22 Sep 2024 19:48:58 +0530
Subject: [PATCH 0977/1141] Perform permission checks in table inspector

---
 .../AbstractTypeControl.svelte                | 12 ++++---
 .../AbstractTypeDBOptions.svelte              |  3 +-
 .../column/ColumnActions.svelte               | 14 ++++++--
 .../column/ColumnFormatting.svelte            |  7 +++-
 .../table-inspector/column/ColumnMode.svelte  |  7 ++--
 .../column/ColumnNameAndDescription.svelte    |  3 ++
 .../column/ColumnOptions.svelte               |  5 +--
 .../table-inspector/column/ColumnType.svelte  | 33 +++++++++----------
 .../column/SetDefaultValue.svelte             |  9 ++---
 .../table-inspector/record/RecordMode.svelte  |  3 +-
 .../table-inspector/record/RowActions.svelte  | 10 ++++--
 11 files changed, 68 insertions(+), 38 deletions(-)

diff --git a/mathesar_ui/src/components/abstract-type-control/AbstractTypeControl.svelte b/mathesar_ui/src/components/abstract-type-control/AbstractTypeControl.svelte
index 93301afd3e..847a8566d8 100644
--- a/mathesar_ui/src/components/abstract-type-control/AbstractTypeControl.svelte
+++ b/mathesar_ui/src/components/abstract-type-control/AbstractTypeControl.svelte
@@ -26,17 +26,19 @@
     options: Pick<ColumnTypeOptionsSaveArgs, 'type' | 'type_options'>,
   ) => Promise<unknown>;
   export let showWarnings = true;
+  export let disabled = false;
 
   let selectedAbstractType: ColumnWithAbstractType['abstractType'] =
     column.abstractType;
   let selectedDbType: ColumnWithAbstractType['type'] = column.type;
+  let savedTypeOptions = column.type_options ?? {};
   let typeOptions: ColumnWithAbstractType['type_options'] = {
-    ...(column.type_options ?? {}),
+    ...savedTypeOptions,
   };
   $: actionButtonsVisible =
     selectedAbstractType !== column.abstractType ||
     selectedDbType !== column.type ||
-    !objectsAreDeeplyEqual(column.type_options, typeOptions);
+    !objectsAreDeeplyEqual(savedTypeOptions, typeOptions);
 
   let typeChangeState: RequestStatus;
 
@@ -50,7 +52,8 @@
   function resetAbstractType(_column: ColumnWithAbstractType) {
     selectedAbstractType = _column.abstractType;
     selectedDbType = _column.type;
-    typeOptions = { ...(_column.type_options ?? {}) };
+    savedTypeOptions = _column.type_options ?? {};
+    typeOptions = { ...savedTypeOptions };
   }
   $: resetAbstractType(column);
 
@@ -97,7 +100,7 @@
   {column}
   on:change={(e) => selectTypeAndAbstractType(e.detail)}
   on:reset={() => resetAbstractType(column)}
-  disabled={typeChangeState?.state === 'processing'}
+  disabled={typeChangeState?.state === 'processing' || disabled}
 />
 
 {#if selectedAbstractType && selectedDbType}
@@ -107,6 +110,7 @@
       bind:selectedDbType
       bind:typeOptions
       {column}
+      {disabled}
     />
   {/key}
 {/if}
diff --git a/mathesar_ui/src/components/abstract-type-control/AbstractTypeDBOptions.svelte b/mathesar_ui/src/components/abstract-type-control/AbstractTypeDBOptions.svelte
index 298f6ca67a..82bbe0d70f 100644
--- a/mathesar_ui/src/components/abstract-type-control/AbstractTypeDBOptions.svelte
+++ b/mathesar_ui/src/components/abstract-type-control/AbstractTypeDBOptions.svelte
@@ -18,6 +18,7 @@
   export let selectedDbType: DbType;
   export let typeOptions: ColumnWithAbstractType['type_options'];
   export let column: ColumnWithAbstractType;
+  export let disabled = false;
 
   $: ({ dbOptionsConfig, dbForm, dbFormValues } = constructDbForm(
     selectedAbstractType,
@@ -59,7 +60,7 @@
     {#if dbForm}
       <div class="option-form db-opts">
         <div class="content">
-          <FormBuilder form={dbForm} />
+          <FormBuilder form={dbForm} {disabled} />
         </div>
       </div>
     {/if}
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnActions.svelte
index 41957adf16..d96961566e 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnActions.svelte
@@ -24,9 +24,10 @@
 
   export let columns: ProcessedColumn[];
 
-  $: ({ processedColumns, columnsDataStore } = $tabularData);
+  $: ({ table, processedColumns, columnsDataStore } = $tabularData);
   $: column = columns.length === 1 ? columns[0] : undefined;
   $: canMoveToLinkedTable = [...$processedColumns].some(([, c]) => c.linkFk);
+  $: ({ currentRoleOwns } = table.currentAccess);
 
   function handleDeleteColumn(c: ProcessedColumn) {
     void confirmDelete({
@@ -55,7 +56,10 @@
 </script>
 
 <div class="actions-container">
-  <Button on:click={handleMoveColumnsToNewLinkedTable}>
+  <Button
+    on:click={handleMoveColumnsToNewLinkedTable}
+    disabled={!$currentRoleOwns}
+  >
     <div class="action-item">
       <div>
         <Icon {...iconMoveColumnsToNewLinkedTable} />
@@ -69,7 +73,10 @@
     </div>
   </Button>
   {#if canMoveToLinkedTable}
-    <Button on:click={handleMoveColumnsToExistingLinkedTable}>
+    <Button
+      on:click={handleMoveColumnsToExistingLinkedTable}
+      disabled={!$currentRoleOwns}
+    >
       <div class="action-item">
         <div>
           <Icon {...iconMoveColumnsToExistingLinkedTable} />
@@ -87,6 +94,7 @@
     <Button
       appearance="outline-primary"
       on:click={() => column && handleDeleteColumn(column)}
+      disabled={!$currentRoleOwns}
     >
       <Icon {...iconDeleteMajor} />
       <span>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte
index b14cc95a2c..e04431c224 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnFormatting.svelte
@@ -50,8 +50,13 @@
 
   function cancel() {
     typeChangeState = { state: 'success' };
-    displayOptions = {};
+    displayOptions = column.column.metadata ?? {};
     actionButtonsVisible = false;
+    ({ displayOptionsConfig, displayForm, displayFormValues } =
+      constructDisplayForm(column.abstractType, column.column.type, {
+        ...column.column,
+        abstractType: column.abstractType,
+      }));
   }
 
   $: isSaveDisabled =
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
index 80bfaeb363..6bad8da1f9 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
@@ -18,7 +18,8 @@
 
   const tabularData = getTabularDataStoreFromContext();
 
-  $: ({ processedColumns, selection } = $tabularData);
+  $: ({ table, processedColumns, selection } = $tabularData);
+  $: ({ currentRoleOwns } = table.currentAccess);
   $: selectedColumns = (() => {
     const ids = $selection.columnIds;
     const columns = [];
@@ -68,6 +69,7 @@
             <ColumnNameAndDescription
               {column}
               columnsDataStore={$tabularData.columnsDataStore}
+              currentRoleOwnsTable={$currentRoleOwns}
             />
             {#if column.column.primary_key}
               <ColumnTypeSpecifierTag {column} type="primaryKey" />
@@ -79,6 +81,7 @@
                 {column}
                 columnsDataStore={$tabularData.columnsDataStore}
                 constraintsDataStore={$tabularData.constraintsDataStore}
+                currentRoleOwnsTable={$currentRoleOwns}
               />
             {/if}
           </div>
@@ -113,7 +116,7 @@
     {/if}
 
     {#if column}
-      <Collapsible triggerAppearance="plain">
+      <Collapsible isOpen triggerAppearance="plain">
         <CollapsibleHeader slot="header" title={$_('formatting')} />
         <div slot="content" class="content-container">
           {#key column}
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnNameAndDescription.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnNameAndDescription.svelte
index 4873d8cb04..a3cc7a99c5 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnNameAndDescription.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnNameAndDescription.svelte
@@ -11,6 +11,7 @@
 
   export let column: ProcessedColumn;
   export let columnsDataStore: ColumnsDataStore;
+  export let currentRoleOwnsTable: boolean;
 
   $: ({ columns } = columnsDataStore);
 
@@ -55,6 +56,7 @@
     initialValue={column.column.name}
     onSubmit={handleColumnNameChange}
     {getValidationErrors}
+    disabled={!currentRoleOwnsTable}
   />
 </div>
 
@@ -64,6 +66,7 @@
     initialValue={column.column.description ?? ''}
     onSubmit={handleColumnDescriptionChange}
     isLongText
+    disabled={!currentRoleOwnsTable}
   />
 </div>
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnOptions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnOptions.svelte
index d4cac113b7..978b3ff4bd 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnOptions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnOptions.svelte
@@ -21,6 +21,7 @@
   export let column: ProcessedColumn;
   export let columnsDataStore: ColumnsDataStore;
   export let constraintsDataStore: ConstraintsDataStore;
+  export let currentRoleOwnsTable: boolean;
 
   let isRequestingToggleAllowNull = false;
   let isRequestingToggleAllowDuplicates = false;
@@ -112,7 +113,7 @@
       <Icon class="opt" {...iconLoading} />
     {:else}
       <Checkbox
-        disabled={isRequestingToggleAllowDuplicates}
+        disabled={isRequestingToggleAllowDuplicates || !currentRoleOwnsTable}
         checked={!allowsDuplicates}
         on:change={toggleAllowDuplicates}
       />
@@ -134,7 +135,7 @@
       <Icon class="opt" {...iconLoading} />
     {:else}
       <Checkbox
-        disabled={isRequestingToggleAllowNull}
+        disabled={isRequestingToggleAllowNull || !currentRoleOwnsTable}
         checked={!allowsNull}
         on:change={toggleAllowNull}
       />
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnType.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnType.svelte
index f7044e2b8f..c28e7251b2 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnType.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnType.svelte
@@ -2,7 +2,6 @@
   import { _ } from 'svelte-i18n';
 
   import { AbstractTypeControl } from '@mathesar/components/abstract-type-control';
-  import AbstractTypeSelector from '@mathesar/components/abstract-type-control/AbstractTypeSelector.svelte';
   import type { ColumnTypeOptionsSaveArgs } from '@mathesar/components/abstract-type-control/types';
   import InfoBox from '@mathesar/components/message-boxes/InfoBox.svelte';
   import {
@@ -11,7 +10,8 @@
   } from '@mathesar/stores/table-data';
 
   const tabularData = getTabularDataStoreFromContext();
-  $: ({ columnsDataStore } = $tabularData);
+  $: ({ table, columnsDataStore } = $tabularData);
+  $: ({ currentRoleOwns } = table.currentAccess);
 
   export let column: ProcessedColumn;
 
@@ -25,7 +25,8 @@
       default: null,
     });
   }
-  $: disallowDataTypeChange = column.column.primary_key || !!column.linkFk;
+  $: disallowDataTypeChange =
+    column.column.primary_key || !!column.linkFk || !$currentRoleOwns;
   $: columnWithAbstractType = {
     ...column.column,
     abstractType: column.abstractType,
@@ -41,23 +42,19 @@
   })();
 </script>
 
-{#if disallowDataTypeChange}
-  <AbstractTypeSelector
-    selectedAbstractType={column.abstractType}
+{#key columnWithAbstractType}
+  <AbstractTypeControl
     column={columnWithAbstractType}
-    disabled={true}
+    {save}
+    disabled={disallowDataTypeChange}
   />
-  {#if infoAlertText}
-    <InfoBox>
-      <span class="info-alert">
-        {infoAlertText}
-      </span>
-    </InfoBox>
-  {/if}
-{:else}
-  {#key columnWithAbstractType}
-    <AbstractTypeControl column={columnWithAbstractType} {save} />
-  {/key}
+{/key}
+{#if infoAlertText}
+  <InfoBox>
+    <span class="info-alert">
+      {infoAlertText}
+    </span>
+  </InfoBox>
 {/if}
 
 <style lang="scss">
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte
index fc0bc82ae9..8753034041 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/SetDefaultValue.svelte
@@ -17,8 +17,9 @@
   export let column: ProcessedColumn;
 
   const tabularData = getTabularDataStoreFromContext();
-  $: ({ columnsDataStore, recordsData } = $tabularData);
+  $: ({ table, columnsDataStore, recordsData } = $tabularData);
   $: ({ linkedRecordSummaries } = recordsData);
+  $: ({ currentRoleOwns } = table.currentAccess);
 
   $: initialValue = column.column.default?.value ?? column.initialInputValue;
   $: value = initialValue;
@@ -86,17 +87,17 @@
     }
   }
 
-  $: disabled = typeChangeState?.state === 'processing';
+  $: disabled = typeChangeState?.state === 'processing' || !$currentRoleOwns;
 </script>
 
 <div class="default-value-container">
   <LabeledInput layout="inline-input-first">
     <span slot="label">{$_('no_default_value')}</span>
-    <Radio checked={isDefaultNull} on:change={toggleNoDefault} />
+    <Radio checked={isDefaultNull} on:change={toggleNoDefault} {disabled} />
   </LabeledInput>
   <LabeledInput layout="inline-input-first">
     <span slot="label">{$_('custom_default')}</span>
-    <Radio checked={!isDefaultNull} on:change={toggleNoDefault} />
+    <Radio checked={!isDefaultNull} on:change={toggleNoDefault} {disabled} />
   </LabeledInput>
   {#if !isDefaultNull}
     <DynamicInput
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
index 8f133a18ef..4dbe84ad7c 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
@@ -10,7 +10,7 @@
 
   const tabularData = getTabularDataStoreFromContext();
 
-  $: ({ selection, recordsData } = $tabularData);
+  $: ({ table, selection, recordsData } = $tabularData);
   $: selectedRowIds = $selection.rowIds;
   $: selectedRowCount = selectedRowIds.size;
 </script>
@@ -28,6 +28,7 @@
       <CollapsibleHeader slot="header" title={$_('actions')} />
       <div slot="content" class="content-container">
         <RowActions
+          {table}
           {selectedRowIds}
           {recordsData}
           columnsDataStore={$tabularData.columnsDataStore}
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
index 3b89b9ec7f..20b2c8448b 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record/RowActions.svelte
@@ -2,6 +2,7 @@
   import { _ } from 'svelte-i18n';
 
   import { iconDeleteMajor, iconRecord } from '@mathesar/icons';
+  import type { Table } from '@mathesar/models/Table';
   import { confirmDelete } from '@mathesar/stores/confirmation';
   import { storeToGetRecordPageUrl } from '@mathesar/stores/storeBasedUrls';
   import type {
@@ -15,14 +16,16 @@
     AnchorButton,
     Button,
     Icon,
-    ImmutableSet,
+    type ImmutableSet,
     iconExternalLink,
   } from '@mathesar-component-library';
 
   export let selectedRowIds: ImmutableSet<string>;
   export let recordsData: RecordsData;
   export let columnsDataStore: ColumnsDataStore;
+  export let table: Table;
 
+  $: ({ currentRolePrivileges } = table.currentAccess);
   $: selectedRowCount = selectedRowIds.size;
   $: ({ columns } = columnsDataStore);
   $: ({ selectableRowsMap } = recordsData);
@@ -75,7 +78,10 @@
       </div>
     </AnchorButton>
   {/if}
-  <Button on:click={handleDeleteRecords}>
+  <Button
+    on:click={handleDeleteRecords}
+    disabled={!$currentRolePrivileges.has('DELETE')}
+  >
     <Icon {...iconDeleteMajor} />
     <span>
       {$_('delete_records', { values: { count: selectedRowCount } })}

From 8942f038457760db65036eb9a4f0ddfc64ed5fad Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Sun, 22 Sep 2024 20:33:23 +0530
Subject: [PATCH 0978/1141] Check for permissions while inserting and updating
 records

---
 mathesar_ui/src/api/rpc/columns.ts                   |  9 +++++++++
 .../src/stores/table-data/processedColumns.ts        |  4 +++-
 mathesar_ui/src/systems/table-view/Body.svelte       |  5 +++--
 mathesar_ui/src/systems/table-view/row/Row.svelte    | 12 ++++++++++--
 .../src/systems/table-view/row/RowCell.svelte        |  9 ++++++++-
 5 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/columns.ts b/mathesar_ui/src/api/rpc/columns.ts
index b6d59a47de..45f91f361c 100644
--- a/mathesar_ui/src/api/rpc/columns.ts
+++ b/mathesar_ui/src/api/rpc/columns.ts
@@ -142,6 +142,14 @@ interface ColumnDefault {
   is_dynamic: boolean;
 }
 
+export const allColumnPrivileges = [
+  'SELECT',
+  'INSERT',
+  'UPDATE',
+  'REFERENCES',
+] as const;
+export type ColumnPrivilege = (typeof allColumnPrivileges)[number];
+
 /** The raw column data, from the user database only */
 interface RawColumn {
   /** The PostgreSQL attnum of the column */
@@ -156,6 +164,7 @@ interface RawColumn {
   default: ColumnDefault | null;
   has_dependents: boolean;
   valid_target_types: string[];
+  current_role_priv: ColumnPrivilege[];
 }
 
 /**
diff --git a/mathesar_ui/src/stores/table-data/processedColumns.ts b/mathesar_ui/src/stores/table-data/processedColumns.ts
index 7416223c2c..bc473509bc 100644
--- a/mathesar_ui/src/stores/table-data/processedColumns.ts
+++ b/mathesar_ui/src/stores/table-data/processedColumns.ts
@@ -1,6 +1,6 @@
 import type { Readable } from 'svelte/store';
 
-import type { Column } from '@mathesar/api/rpc/columns';
+import type { Column, ColumnPrivilege } from '@mathesar/api/rpc/columns';
 import type { Constraint } from '@mathesar/api/rpc/constraints';
 import type { CellColumnFabric } from '@mathesar/components/cell-fabric/types';
 import {
@@ -47,6 +47,7 @@ export interface ProcessedColumn extends CellColumnFabric {
     cellValue: unknown,
     recordSummaries?: RecordSummariesForSheet,
   ) => string | null | undefined;
+  currentRolePrivileges: Set<ColumnPrivilege>;
 }
 
 /** Maps column ids to processed columns */
@@ -117,5 +118,6 @@ export function processColumn({
       abstractType.identifier,
     ),
     formatCellValue: getDisplayFormatter(column, column.id),
+    currentRolePrivileges: new Set(column.current_role_priv),
   };
 }
diff --git a/mathesar_ui/src/systems/table-view/Body.svelte b/mathesar_ui/src/systems/table-view/Body.svelte
index 4fec54d0a5..a7ea8eb6d0 100644
--- a/mathesar_ui/src/systems/table-view/Body.svelte
+++ b/mathesar_ui/src/systems/table-view/Body.svelte
@@ -25,7 +25,8 @@
   $: ({ oid } = table);
   $: ({ displayableRecords } = display);
   $: ({ pkColumn } = columnsDataStore);
-  $: canEditTableRecords = true; // TODO_BETA: Implement permissions here
+  $: ({ currentRolePrivileges } = table.currentAccess);
+  $: canAddRow = $currentRolePrivileges.has('INSERT');
 
   function getItemSizeFromRow(row: RowType) {
     if (isHelpTextRow(row)) {
@@ -63,7 +64,7 @@
     >
       <ScrollAndResetHandler {api} />
       {#each items as item (item.key)}
-        {#if $displayableRecords[item.index] && !(isPlaceholderRow($displayableRecords[item.index]) && !canEditTableRecords)}
+        {#if $displayableRecords[item.index] && !(isPlaceholderRow($displayableRecords[item.index]) && !canAddRow)}
           <Row style={item.style} bind:row={$displayableRecords[item.index]} />
         {/if}
       {/each}
diff --git a/mathesar_ui/src/systems/table-view/row/Row.svelte b/mathesar_ui/src/systems/table-view/row/Row.svelte
index fad853668c..f8c6fe11c6 100644
--- a/mathesar_ui/src/systems/table-view/row/Row.svelte
+++ b/mathesar_ui/src/systems/table-view/row/Row.svelte
@@ -27,8 +27,15 @@
 
   const tabularData = getTabularDataStoreFromContext();
 
-  $: ({ recordsData, columnsDataStore, meta, processedColumns, selection } =
-    $tabularData);
+  $: ({
+    table,
+    recordsData,
+    columnsDataStore,
+    meta,
+    processedColumns,
+    selection,
+  } = $tabularData);
+  $: ({ currentRolePrivileges } = table.currentAccess);
   $: ({
     rowStatus,
     rowCreationStatus,
@@ -113,6 +120,7 @@
           {processedColumn}
           {recordsData}
           {rowKey}
+          currentRoleTablePrivileges={$currentRolePrivileges}
         />
       {/each}
     {/if}
diff --git a/mathesar_ui/src/systems/table-view/row/RowCell.svelte b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
index f5e3233ee6..4c576bdaaa 100644
--- a/mathesar_ui/src/systems/table-view/row/RowCell.svelte
+++ b/mathesar_ui/src/systems/table-view/row/RowCell.svelte
@@ -4,6 +4,7 @@
 
   import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
   import { States } from '@mathesar/api/rest/utils/requestUtils';
+  import type { TablePrivilege } from '@mathesar/api/rpc/tables';
   import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
   import CellBackground from '@mathesar/components/CellBackground.svelte';
   import Identifier from '@mathesar/components/Identifier.svelte';
@@ -48,6 +49,7 @@
   export let clientSideErrorMap: WritableMap<CellKey, string[]>;
   export let value: unknown = undefined;
   export let rowKey: string;
+  export let currentRoleTablePrivileges: Set<TablePrivilege>;
 
   $: cellId = makeCellId(getRowSelectionId(row), String(processedColumn.id));
   const canViewLinkedEntities = true;
@@ -63,7 +65,12 @@
   $: canSetNull = column.nullable && value !== null;
   $: hasError = !!errors.length;
   $: isProcessing = modificationStatus?.state === 'processing';
-  $: isEditable = !column.primary_key;
+  // TODO_BETA: Handle case where INSERT is allowed, but UPDATE isn't
+  // i.e. row is a placeholder row and record isn't saved yet
+  $: isEditable =
+    !column.primary_key &&
+    currentRoleTablePrivileges.has('UPDATE') &&
+    processedColumn.currentRolePrivileges.has('UPDATE');
   $: getRecordPageUrl = $storeToGetRecordPageUrl;
   $: linkedRecordHref = linkFk
     ? getRecordPageUrl({ tableId: linkFk.referent_table_oid, recordId: value })

From 1fb2be0f71bc4377e39eb0c48d0021d5d170b939 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Sun, 22 Sep 2024 20:38:12 +0530
Subject: [PATCH 0979/1141] Check permissions for new column and new record
 buttons

---
 .../src/systems/table-view/StatusPane.svelte       | 14 +++++++++++---
 .../src/systems/table-view/TableView.svelte        |  4 ++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/mathesar_ui/src/systems/table-view/StatusPane.svelte b/mathesar_ui/src/systems/table-view/StatusPane.svelte
index 47cc809848..eeee8ed9a1 100644
--- a/mathesar_ui/src/systems/table-view/StatusPane.svelte
+++ b/mathesar_ui/src/systems/table-view/StatusPane.svelte
@@ -16,8 +16,15 @@
 
   export let context: 'page' | 'widget' | 'shared-consumer-page' = 'page';
 
-  $: ({ recordsData, meta, isLoading, columnsDataStore, constraintsDataStore } =
-    $tabularData);
+  $: ({
+    table,
+    recordsData,
+    meta,
+    isLoading,
+    columnsDataStore,
+    constraintsDataStore,
+  } = $tabularData);
+  $: ({ currentRolePrivileges } = table.currentAccess);
   $: ({ pagination } = meta);
   $: ({ size: pageSize, leftBound, rightBound } = $pagination);
   $: ({ totalCount, state, newRecords } = recordsData);
@@ -29,7 +36,8 @@
     $columnsFetchStatus?.state === 'failure' ||
     recordState === States.Error ||
     $constraintsDataStore.state === States.Error;
-  $: hasNewRecordButton = context !== 'widget';
+  $: hasNewRecordButton =
+    context !== 'widget' && $currentRolePrivileges.has('INSERT');
   $: refreshButtonState = (() => {
     let buttonState: 'loading' | 'error' | undefined = undefined;
     if ($isLoading) {
diff --git a/mathesar_ui/src/systems/table-view/TableView.svelte b/mathesar_ui/src/systems/table-view/TableView.svelte
index 0b82b843c8..8dd160bc9f 100644
--- a/mathesar_ui/src/systems/table-view/TableView.svelte
+++ b/mathesar_ui/src/systems/table-view/TableView.svelte
@@ -32,8 +32,8 @@
   let tableInspectorTab: ComponentProps<WithTableInspector>['activeTabId'] =
     'table';
 
+  $: ({ currentRoleOwns } = table.currentAccess);
   $: usesVirtualList = context !== 'widget';
-  $: allowsDdlOperations = context !== 'widget';
   $: sheetHasBorder = context === 'widget';
   $: ({ processedColumns, display, isLoading, selection, recordsData } =
     $tabularData);
@@ -52,7 +52,7 @@
   $: ({ horizontalScrollOffset, scrollOffset, isTableInspectorVisible } =
     display);
   $: columnOrder = table.metadata?.column_order ?? [];
-  $: hasNewColumnButton = allowsDdlOperations;
+  $: hasNewColumnButton = context !== 'widget' && $currentRoleOwns;
   /**
    * These are separate variables for readability and also to keep the door open
    * to more easily displaying the Table Inspector even if DDL operations are

From ce9c388dc65fe1860104c8c71b1b68aa1aa08474 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Sun, 22 Sep 2024 20:45:21 +0530
Subject: [PATCH 0980/1141] Check permissions in Record Selector

---
 .../record-selector/RecordSelectorContent.svelte | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
index 4bbb19e423..bc3c8df083 100644
--- a/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
+++ b/mathesar_ui/src/systems/record-selector/RecordSelectorContent.svelte
@@ -4,6 +4,7 @@
 
   import { States } from '@mathesar/api/rest/utils/requestUtils';
   import { api } from '@mathesar/api/rpc';
+  import WarningBox from '@mathesar/components/message-boxes/WarningBox.svelte';
   import { iconAddNew } from '@mathesar/icons';
   import { storeToGetRecordPageUrl } from '@mathesar/stores/storeBasedUrls';
   import type { TabularData } from '@mathesar/stores/table-data';
@@ -36,6 +37,9 @@
     recordsData,
     table,
   } = tabularData);
+  $: ({ currentRolePrivileges } = table.currentAccess);
+  $: canViewTable = $currentRolePrivileges.has('SELECT');
+  $: canInsertRecords = $currentRolePrivileges.has('INSERT');
   $: ({ purpose: rowType } = controller);
   $: ({ columns, fetchStatus } = columnsDataStore);
   $: ({ state: constraintsState } = $constraintsDataStore);
@@ -105,7 +109,7 @@
     </div>
   {/if}
 
-  {#if isInitialized}
+  {#if isInitialized && canViewTable}
     <RecordSelectorTable
       {tabularData}
       {controller}
@@ -115,7 +119,13 @@
     />
   {/if}
 
-  {#if isInitialized && !records.length}
+  {#if !canViewTable}
+    <WarningBox fullWidth>
+      {$_('no_privileges_view_table')}
+    </WarningBox>
+  {/if}
+
+  {#if isInitialized && !records.length && canViewTable}
     {#if $isLoading}
       <!--
         This only shows when there are no results. When there are results, the
@@ -136,7 +146,7 @@
   {/if}
 
   <div class="footer">
-    {#if hasSearchQueries}
+    {#if hasSearchQueries && canInsertRecords}
       <div class="button">
         <Button
           size="small"

From ac3a0759402ab59d8f51bab916fdf922b53dd269 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Sun, 22 Sep 2024 21:11:24 +0530
Subject: [PATCH 0981/1141] Check permissions in record page

---
 mathesar_ui/src/i18n/languages/en/dict.json   |  3 ++-
 .../src/pages/record/DirectField.svelte       |  8 +++++++-
 .../src/pages/record/RecordPage.svelte        | 19 ++++++++++++++++++-
 .../src/pages/record/RecordPageContent.svelte |  9 ++++++++-
 .../src/pages/record/TableWidget.svelte       | 17 +++++++++++++++--
 5 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 67a2095d7d..062ac90d1a 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -384,7 +384,8 @@
   "no_grouping_condition_added": "No grouping condition has been added",
   "no_matches": "No matches for [searchValue]",
   "no_matching_records": "No matching records",
-  "no_privileges_view_table": "Your role does not have the privileges to view the table",
+  "no_privileges_view_record": "Your role does not have the privileges to view this record.",
+  "no_privileges_view_table": "Your role does not have the privileges to view this table.",
   "no_record_summary_available": "No record summary available.",
   "no_records_found": "No records found",
   "no_results_found": "No results found",
diff --git a/mathesar_ui/src/pages/record/DirectField.svelte b/mathesar_ui/src/pages/record/DirectField.svelte
index 8fe6e239c9..154e50b3f7 100644
--- a/mathesar_ui/src/pages/record/DirectField.svelte
+++ b/mathesar_ui/src/pages/record/DirectField.svelte
@@ -44,13 +44,19 @@
   export let record: RecordStore;
   export let processedColumn: ProcessedColumn;
   export let field: FieldStore;
+  export let canUpdateTableRecords = true;
 
   $: ({ recordSummaries } = record);
   $: ({ column, abstractType } = processedColumn);
+  $: canUpdateColumn = processedColumn.currentRolePrivileges.has('UPDATE');
   $: value = $field;
   $: fieldIsDisabled = field.disabled;
   $: ({ showsError } = field);
-  $: disabled = column.primary_key || $fieldIsDisabled;
+  $: disabled =
+    column.primary_key ||
+    $fieldIsDisabled ||
+    !canUpdateTableRecords ||
+    !canUpdateColumn;
   $: shouldDisplayNullOverlay = !cellDataTypesThatUsePlaceholderText.has(
     abstractType.cellInfo.type,
   );
diff --git a/mathesar_ui/src/pages/record/RecordPage.svelte b/mathesar_ui/src/pages/record/RecordPage.svelte
index fb92caf08e..714fad2d07 100644
--- a/mathesar_ui/src/pages/record/RecordPage.svelte
+++ b/mathesar_ui/src/pages/record/RecordPage.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+  import { _ } from 'svelte-i18n';
+
+  import WarningBox from '@mathesar/components/message-boxes/WarningBox.svelte';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
   import type { Table } from '@mathesar/models/Table';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
@@ -13,6 +16,8 @@
   export let record: RecordStore;
 
   $: table = $currentTable as Table;
+  $: ({ currentRolePrivileges } = table.currentAccess);
+  $: canViewTable = $currentRolePrivileges.has('SELECT');
   $: tableStructure = new TableStructure({
     database: table.schema.database,
     table,
@@ -31,7 +36,19 @@
 <LayoutWithHeader cssVariables={{ '--page-padding': '0' }} fitViewport>
   {#if isLoading}
     <RecordPageLoadingSpinner />
-  {:else}
+  {:else if canViewTable}
     <RecordPageContent {tableStructure} {record} />
+  {:else}
+    <div class="no-access">
+      <WarningBox fullWidth>
+        {$_('no_privileges_view_record')}
+      </WarningBox>
+    </div>
   {/if}
 </LayoutWithHeader>
+
+<style>
+  .no-access {
+    padding: var(--size-base);
+  }
+</style>
diff --git a/mathesar_ui/src/pages/record/RecordPageContent.svelte b/mathesar_ui/src/pages/record/RecordPageContent.svelte
index 7e68da67ad..c6cc04c7be 100644
--- a/mathesar_ui/src/pages/record/RecordPageContent.svelte
+++ b/mathesar_ui/src/pages/record/RecordPageContent.svelte
@@ -27,6 +27,8 @@
   export let tableStructure: TableStructure;
 
   $: table = $currentTable as Table;
+  $: ({ currentRolePrivileges } = table.currentAccess);
+  $: canUpdateTableRecords = $currentRolePrivileges.has('UPDATE');
   $: ({ processedColumns } = tableStructure);
   $: ({ recordPk, summary, fieldValues } = record);
   $: fieldPropsObjects = [...$processedColumns.values()].map((c) => ({
@@ -66,7 +68,12 @@
     </div>
     <div class="fields">
       {#each fieldPropsObjects as { field, processedColumn } (processedColumn.id)}
-        <DirectField {record} {processedColumn} {field} />
+        <DirectField
+          {record}
+          {processedColumn}
+          {field}
+          {canUpdateTableRecords}
+        />
       {/each}
     </div>
     <div class="submit">
diff --git a/mathesar_ui/src/pages/record/TableWidget.svelte b/mathesar_ui/src/pages/record/TableWidget.svelte
index a056292d4e..4652dda3f8 100644
--- a/mathesar_ui/src/pages/record/TableWidget.svelte
+++ b/mathesar_ui/src/pages/record/TableWidget.svelte
@@ -1,5 +1,8 @@
 <script lang="ts">
+  import { _ } from 'svelte-i18n';
+
   import type { Column } from '@mathesar/api/rpc/columns';
+  import WarningBox from '@mathesar/components/message-boxes/WarningBox.svelte';
   import TableName from '@mathesar/components/TableName.svelte';
   import type { Table } from '@mathesar/models/Table';
   import { abstractTypesMap } from '@mathesar/stores/abstract-types';
@@ -33,16 +36,26 @@
     contextualFilters: new Map([[fkColumn.id, recordPk]]),
   });
   $: tabularDataStore.set(tabularData);
+  $: ({ currentRolePrivileges } = table.currentAccess);
+  $: canViewTable = $currentRolePrivileges.has('SELECT');
 </script>
 
 <div class="table-widget">
   <div class="top">
     <h3 class="bold-header"><TableName {table} /></h3>
-    <MiniActionsPane />
+    {#if canViewTable}
+      <MiniActionsPane />
+    {/if}
   </div>
 
   <div class="results">
-    <TableView context="widget" {table} />
+    {#if canViewTable}
+      <TableView context="widget" {table} />
+    {:else}
+      <WarningBox fullWidth>
+        {$_('no_privileges_view_table')}
+      </WarningBox>
+    {/if}
   </div>
 </div>
 

From 378616f22d5f400a91768c28dc673674c55607b0 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Sun, 22 Sep 2024 21:21:29 +0530
Subject: [PATCH 0982/1141] Check permissions on tutorials and shortcuts

---
 .../src/component-library/menu/LinkMenuItem.svelte   |  2 +-
 mathesar_ui/src/components/AppHeader.svelte          |  9 ++++++++-
 mathesar_ui/src/pages/schema/SchemaOverview.svelte   |  4 +++-
 mathesar_ui/src/pages/schema/SchemaTables.svelte     |  4 +++-
 mathesar_ui/src/pages/schema/TablesList.svelte       | 12 ++++++++----
 5 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/mathesar_ui/src/component-library/menu/LinkMenuItem.svelte b/mathesar_ui/src/component-library/menu/LinkMenuItem.svelte
index 0059c873b8..a2c1fb1a11 100644
--- a/mathesar_ui/src/component-library/menu/LinkMenuItem.svelte
+++ b/mathesar_ui/src/component-library/menu/LinkMenuItem.svelte
@@ -14,7 +14,7 @@
 </script>
 
 <MenuItemWrapper
-  tag="a"
+  tag={disabled ? 'span' : 'a'}
   class="menu-item-link {classes}"
   {href}
   {disabled}
diff --git a/mathesar_ui/src/components/AppHeader.svelte b/mathesar_ui/src/components/AppHeader.svelte
index a624a768c4..7d051e6f05 100644
--- a/mathesar_ui/src/components/AppHeader.svelte
+++ b/mathesar_ui/src/components/AppHeader.svelte
@@ -49,6 +49,8 @@
   $: schema = $currentSchema;
   $: upgradable = $releaseDataStore?.value?.upgradeStatus === 'upgradable';
   $: isNormalRoutingContext = commonData.routing_context === 'normal';
+  $: currentRolePrivileges = schema?.currentAccess.currentRolePrivileges;
+  $: canCreateTable = $currentRolePrivileges?.has('CREATE');
 
   let isCreatingNewEmptyTable = false;
 
@@ -81,12 +83,17 @@
             <span class="icon"><Icon {...iconShortcuts} /></span>
             <span class="text">{$_('shortcuts')}</span>
           </span>
-          <ButtonMenuItem icon={iconAddNew} on:click={handleCreateEmptyTable}>
+          <ButtonMenuItem
+            icon={iconAddNew}
+            on:click={handleCreateEmptyTable}
+            disabled={!canCreateTable}
+          >
             {$_('new_table_from_scratch')}
           </ButtonMenuItem>
           <LinkMenuItem
             icon={iconAddNew}
             href={getImportPageUrl(database.id, schema.oid)}
+            disabled={!canCreateTable}
           >
             {$_('new_table_from_data_import')}
           </LinkMenuItem>
diff --git a/mathesar_ui/src/pages/schema/SchemaOverview.svelte b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
index 555c650140..f276684c22 100644
--- a/mathesar_ui/src/pages/schema/SchemaOverview.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
@@ -33,7 +33,9 @@
 
   $: hasTables = tablesMap.size > 0;
   $: hasExplorations = explorationsMap.size > 0;
-  $: showTableCreationTutorial = !hasTables;
+  $: ({ currentRolePrivileges } = schema.currentAccess);
+  $: showTableCreationTutorial =
+    !hasTables && $currentRolePrivileges.has('CREATE');
   $: showExplorationTutorial = hasTables && !hasExplorations;
   $: isExplorationsLoading = explorationsRequestStatus.state === 'processing';
   $: ({ tableCount } = schema);
diff --git a/mathesar_ui/src/pages/schema/SchemaTables.svelte b/mathesar_ui/src/pages/schema/SchemaTables.svelte
index a35f09c6cb..de8c5aaab5 100644
--- a/mathesar_ui/src/pages/schema/SchemaTables.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaTables.svelte
@@ -16,7 +16,9 @@
   export let database: Database;
   export let schema: Schema;
 
-  $: showTutorial = tablesMap.size === 0;
+  $: ({ currentRolePrivileges } = schema.currentAccess);
+  $: showTutorial =
+    tablesMap.size === 0 && $currentRolePrivileges.has('CREATE');
 
   let tableSearchQuery = '';
 
diff --git a/mathesar_ui/src/pages/schema/TablesList.svelte b/mathesar_ui/src/pages/schema/TablesList.svelte
index a7db3bbb58..90cdee0171 100644
--- a/mathesar_ui/src/pages/schema/TablesList.svelte
+++ b/mathesar_ui/src/pages/schema/TablesList.svelte
@@ -25,14 +25,18 @@
   }
 </script>
 
-<div class="container">
-  {#each tables as table (table.oid)}
-    <TableCard {table} {database} {schema} {openEditTableModal} />
+<div class="tables-list">
+  {#if tables.length > 0}
+    <div class="container">
+      {#each tables as table (table.oid)}
+        <TableCard {table} {database} {schema} {openEditTableModal} />
+      {/each}
+    </div>
   {:else}
     <EmptyEntity icon={iconTable}>
       <p>{$_('no_tables')}</p>
     </EmptyEntity>
-  {/each}
+  {/if}
 </div>
 
 {#if selectedTable}

From 0caf27be591ba9c4a101d893904a2c4d8c59ed7a Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Sun, 22 Sep 2024 21:26:42 +0530
Subject: [PATCH 0983/1141] Check permissions in database empty state

---
 .../databases/DatabasesEmptyState.svelte      | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/mathesar_ui/src/systems/databases/DatabasesEmptyState.svelte b/mathesar_ui/src/systems/databases/DatabasesEmptyState.svelte
index 8a495110bf..4c9a26fe64 100644
--- a/mathesar_ui/src/systems/databases/DatabasesEmptyState.svelte
+++ b/mathesar_ui/src/systems/databases/DatabasesEmptyState.svelte
@@ -3,10 +3,14 @@
 
   import { iconAddNew, iconConnection } from '@mathesar/icons';
   import { modal } from '@mathesar/stores/modal';
+  import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { Button, Icon, Tutorial } from '@mathesar-component-library';
 
   import ConnectDatabaseModal from './create-database/ConnectDatabaseModal.svelte';
 
+  const userProfileStore = getUserProfileStoreFromContext();
+  $: ({ isMathesarAdmin } = $userProfileStore);
+
   const connectDatabaseModalController = modal.spawnModalController();
 </script>
 
@@ -23,14 +27,16 @@
         {$_('setup_connections_help')}
       </div>
     </div>
-    <Button
-      slot="footer"
-      appearance="primary"
-      on:click={() => connectDatabaseModalController.open()}
-    >
-      <Icon {...iconAddNew} />
-      <span>{$_('connect_database')}</span>
-    </Button>
+    {#if isMathesarAdmin}
+      <Button
+        slot="footer"
+        appearance="primary"
+        on:click={() => connectDatabaseModalController.open()}
+      >
+        <Icon {...iconAddNew} />
+        <span>{$_('connect_database')}</span>
+      </Button>
+    {/if}
   </Tutorial>
 </div>
 

From 1ccba0d9985b1dc8f6b8ceb92e4d4987aae6aa8f Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Sun, 22 Sep 2024 21:43:09 +0530
Subject: [PATCH 0984/1141] Fix permission errors in schema creation modal and
 typecheck errors

---
 .../src/pages/database/schemas/SchemasSection.svelte     | 2 --
 mathesar_ui/src/routes/DatabaseRoute.svelte              | 2 +-
 .../src/systems/schemas/AddEditSchemaModal.svelte        | 9 +++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
index f58838442c..37e1855235 100644
--- a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
@@ -30,8 +30,6 @@
   const addEditModal = modal.spawnModalController();
   const databaseRouteContext = DatabaseRouteContext.get();
 
-  export let database: Database;
-
   $: ({ database, underlyingDatabase } = $databaseRouteContext);
   $: void underlyingDatabase.run({ database_id: database.id });
   $: schemasMap = $schemasStore.data;
diff --git a/mathesar_ui/src/routes/DatabaseRoute.svelte b/mathesar_ui/src/routes/DatabaseRoute.svelte
index 4fc55478fe..03bc52da3d 100644
--- a/mathesar_ui/src/routes/DatabaseRoute.svelte
+++ b/mathesar_ui/src/routes/DatabaseRoute.svelte
@@ -48,7 +48,7 @@
 
     <DatabasePageWrapper database={$currentDatabase} let:setSection>
       <EventfulRoute path="/schemas" onLoad={() => setSection('schemas')}>
-        <DatabasePageSchemasSection database={$currentDatabase} />
+        <DatabasePageSchemasSection />
       </EventfulRoute>
       <EventfulRoute
         path="/settings/*"
diff --git a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
index 218aa46f52..53a5b8e258 100644
--- a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
+++ b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { get } from 'svelte/store';
+  import { get, readable } from 'svelte/store';
   import { _ } from 'svelte-i18n';
 
   import Identifier from '@mathesar/components/Identifier.svelte';
@@ -16,8 +16,9 @@
   export let controller: ModalController;
   export let schema: Schema | undefined = undefined;
 
-  $: schemaName = schema?.name;
-  $: schemaDescription = schema?.description;
+  $: isEditMode = schema !== undefined;
+  $: schemaName = schema?.name ?? readable('');
+  $: schemaDescription = schema?.description ?? readable('');
   $: currentRoleOwns = schema?.currentAccess?.currentRoleOwns;
 
   function nameIsDuplicate(name: string) {
@@ -61,7 +62,7 @@
   getInitialName={() => $schemaName ?? ''}
   getInitialDescription={() => $schemaDescription ?? ''}
   saveButtonLabel={schema ? $_('save') : $_('create_new_schema')}
-  disabled={!$currentRoleOwns}
+  disabled={isEditMode && !$currentRoleOwns}
 >
   <svelte:fragment slot="helpText">
     {#if !schema}

From acab39b840c063a9f1451197ec0679306fccfa77 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Mon, 23 Sep 2024 10:33:53 +0200
Subject: [PATCH 0985/1141] merge modal changes

---
 .../src/component-library/window/Window.scss       |  7 +++++--
 .../components/NameAndDescInputModalForm.svelte    |  8 +++++---
 .../InstallationSchemaSelector.svelte              | 13 ++-----------
 .../src/systems/schemas/AddEditSchemaModal.svelte  | 14 +++++++++++---
 .../constraints/ConstraintCollapseHeader.svelte    |  2 +-
 .../constraints/ConstraintTypeSection.svelte       | 10 +++++-----
 .../constraints/ForeignKeyConstraintDetails.svelte |  1 +
 .../table-view/constraints/NewFkConstraint.svelte  | 12 +++++++-----
 .../constraints/TableConstraintsModal.svelte       |  1 -
 .../table-view/link-table/LinkTableForm.svelte     |  7 +++++++
 .../table-view/link-table/SelectLinkType.svelte    |  1 +
 11 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/mathesar_ui/src/component-library/window/Window.scss b/mathesar_ui/src/component-library/window/Window.scss
index dffb8641f0..f5a0a506b6 100644
--- a/mathesar_ui/src/component-library/window/Window.scss
+++ b/mathesar_ui/src/component-library/window/Window.scss
@@ -3,6 +3,7 @@
   border-radius: 0.4em;
   min-height: var(--window-min-height, 7em);
   width: var(--window-width, 100%);
+  min-width: var(--window-min-width, 40em);
   overflow: hidden;
   display: grid;
   grid-template: auto 1fr auto / auto;
@@ -15,14 +16,16 @@
     display: flex;
     justify-content: flex-end;
     align-items: flex-start;
+    padding: 1rem;
+    border-bottom: 1px solid var(--slate-200);
     .title {
       &:empty {
         display: none;
       }
       flex: 1 1 100%;
-      padding: 1rem 1rem 0.5rem 1rem;
+      margin: auto;
       font-weight: 500;
-      font-size: var(--text-size-large);
+      font-size: var(--text-size-x-large);
     }
   }
 
diff --git a/mathesar_ui/src/components/NameAndDescInputModalForm.svelte b/mathesar_ui/src/components/NameAndDescInputModalForm.svelte
index 300e8be269..ecb35ad75d 100644
--- a/mathesar_ui/src/components/NameAndDescInputModalForm.svelte
+++ b/mathesar_ui/src/components/NameAndDescInputModalForm.svelte
@@ -29,6 +29,8 @@
   export let getInitialName: () => string = () => '';
   export let getInitialDescription: () => string = () => '';
   export let save: (name: string, description: string) => Promise<void>;
+  export let namePlaceholder = $_('name');
+  export let descriptionPlaceholder = $_('description');
 
   /**
    * NOTE: This is NOT a feature
@@ -100,7 +102,7 @@
             nameHasChanged = true;
           }}
           disabled={isSubmitting}
-          placeholder={$_('name')}
+          placeholder={namePlaceholder}
           id="name"
         />
         {#if nameHasChanged && nameValidationErrors.length}
@@ -118,7 +120,7 @@
             bind:value={description}
             aria-label={$_('description')}
             disabled={isSubmitting}
-            placeholder={$_('description')}
+            placeholder={descriptionPlaceholder}
           />
         </LabeledInput>
       </div>
@@ -146,7 +148,7 @@
     flex-direction: column;
 
     > :global(* + *) {
-      margin-top: 1rem;
+      margin-top: 0.25rem;
     }
   }
 
diff --git a/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte b/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte
index 618a66d1a0..6913d6c142 100644
--- a/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte
+++ b/mathesar_ui/src/systems/databases/create-database/InstallationSchemaSelector.svelte
@@ -29,8 +29,9 @@
   export let installationSchemas: RequiredField<InstallationSchema[]>;
 </script>
 
-<div class="schemas-cbgroup">
+<div>
   <CheckboxGroup
+    boxed
     label={$_('schemas_to_install')}
     ariaLabel={$_('schemas_to_install')}
     bind:values={$installationSchemas}
@@ -40,13 +41,3 @@
     getCheckboxDisabled={(o) => o === 'internal'}
   />
 </div>
-
-<style>
-  .schemas-cbgroup :global(ul.options) {
-    background: var(--white);
-    padding: 1rem;
-    border: 1px solid var(--slate-200);
-    border-radius: var(--border-radius-m);
-    margin-top: var(--size-ultra-small);
-  }
-</style>
diff --git a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
index 77185548b2..31658586f1 100644
--- a/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
+++ b/mathesar_ui/src/systems/schemas/AddEditSchemaModal.svelte
@@ -60,12 +60,13 @@
   getInitialName={() => $schemaName ?? ''}
   getInitialDescription={() => $schemaDescription ?? ''}
   saveButtonLabel={schema ? $_('save') : $_('create_new_schema')}
+  namePlaceholder={$_('schema_name_placeholder')}
 >
   <svelte:fragment slot="helpText">
     {#if !schema}
-      <InfoBox>
-        {$_('name_your_schema_help')}
-      </InfoBox>
+      <span class="description">
+        {$_('schema_description')}
+      </span>
     {/if}
   </svelte:fragment>
 
@@ -81,3 +82,10 @@
     {/if}
   </span>
 </NameAndDescInputModalForm>
+
+<style>
+  .description {
+    display: inline-block;
+    margin-bottom: 1rem;
+  }
+</style>
diff --git a/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte b/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte
index 3e60be951a..9246057343 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ConstraintCollapseHeader.svelte
@@ -45,7 +45,7 @@
     font-size: var(--text-size-small);
     background-color: var(--slate-200);
     border-radius: var(--border-radius-xl);
-    padding: 0.285rem 0.428rem;
+    padding: 0.25rem 0.75rem;
     margin-bottom: var(--size-super-ultra-small);
   }
 </style>
diff --git a/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte b/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
index 52c7b02da1..a96ff82242 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ConstraintTypeSection.svelte
@@ -137,7 +137,7 @@
     }
 
     :global(.collapsible-content) {
-      padding-left: 1rem;
+      padding-left: var(--size-x-large);
     }
 
     .null {
@@ -150,14 +150,14 @@
     justify-content: space-between;
     align-items: center;
     font-size: var(--text-size-large);
-
+    font-weight: var(--font-weight-medium);
     border-bottom: 1px solid var(--slate-200);
-    padding: 0.25rem;
-    margin-bottom: 0.5rem;
+    min-height: 2.5rem;
+    margin-bottom: var(--size-xx-small);
   }
 
   .add-constraint {
-    padding: 0.5rem;
+    padding: var(--size-base);
     border: 1px solid var(--slate-300);
     border-radius: var(--border-radius-m);
   }
diff --git a/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte b/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
index 0167c3eda9..38b968eaf3 100644
--- a/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte
@@ -91,6 +91,7 @@
 
   .target-details {
     display: flex;
+    align-items: center;
 
     > :global(* + *) {
       margin-left: 0.25rem;
diff --git a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
index 412d18de76..8ed7490082 100644
--- a/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/NewFkConstraint.svelte
@@ -120,8 +120,6 @@
 </script>
 
 <div class="add-new-fk-constraint">
-  <span class="title">{$_('new_foreign_key_constraint')}</span>
-
   <Field
     field={baseColumn}
     input={{
@@ -129,8 +127,12 @@
       props: { columns: baseTableColumns },
     }}
     layout="stacked"
-    label={$_('column_references_target_table')}
-  />
+    label={$_('referencing_column')}
+  >
+    <span slot="help">
+      {$_('column_references_target_table')}
+    </span>
+  </Field>
 
   <Field
     field={targetTable}
@@ -189,7 +191,7 @@
     onProceed={handleSave}
     onCancel={onClose}
     size="small"
-    proceedButton={{ label: $_('add') }}
+    proceedButton={{ label: $_('add_foreign_key_constraint') }}
   />
 </div>
 
diff --git a/mathesar_ui/src/systems/table-view/constraints/TableConstraintsModal.svelte b/mathesar_ui/src/systems/table-view/constraints/TableConstraintsModal.svelte
index df84f81fa2..67b8befe9c 100644
--- a/mathesar_ui/src/systems/table-view/constraints/TableConstraintsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/constraints/TableConstraintsModal.svelte
@@ -22,7 +22,6 @@
 <style lang="scss">
   .description {
     display: inline-block;
-    font-size: var(--text-size-small);
     margin-bottom: 1rem;
   }
 </style>
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index c829704c6f..283d4da2ef 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -226,6 +226,10 @@
   let isNewColumnsOpen = false;
 </script>
 
+<div class="description">
+  {$_('link_table_description')}
+</div>
+
 <div class="form" class:self-referential={isSelfReferential}>
   <FieldLayout>
     <InfoBox>
@@ -385,6 +389,9 @@
     --target-fill: var(--base-fill);
     --target-stroke: var(--base-stroke);
   }
+  .description {
+    margin-bottom: 1rem;
+  }
   :global(
       .form
         .collapsible
diff --git a/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte b/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
index 95d65a4fdd..78aa05a9a7 100644
--- a/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/SelectLinkType.svelte
@@ -48,6 +48,7 @@
   }
   legend {
     margin-bottom: 0.5rem;
+    font-weight: var(--font-weight-medium);
   }
   .options {
     display: grid;

From 6c81d8ff6a75b8ebc9bcba467cb05eefac762b25 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Mon, 23 Sep 2024 12:08:25 +0200
Subject: [PATCH 0986/1141] general ui improvements

---
 .../common/styles/variables.scss                | 16 ++++++++--------
 .../src/component-library/help/Help.scss        |  8 +++++++-
 .../src/component-library/tooltip/Tooltip.scss  |  9 ++++-----
 .../src/components/InsetPageSection.svelte      |  4 ++--
 mathesar_ui/src/layouts/InsetPageLayout.svelte  |  2 +-
 .../src/pages/database/schemas/SchemaRow.svelte |  9 +++++----
 .../database/schemas/SchemasSection.svelte      |  4 ++--
 mathesar_ui/src/pages/home/HomePage.svelte      | 14 ++++++++------
 .../src/pages/record/RecordPageContent.svelte   |  4 ++--
 .../src/pages/schema/OverviewHeader.svelte      |  4 ++--
 mathesar_ui/src/pages/schema/SchemaPage.svelte  |  1 +
 mathesar_ui/src/pages/schema/TableCard.svelte   | 17 ++++++++++-------
 12 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/mathesar_ui/src/component-library/common/styles/variables.scss b/mathesar_ui/src/component-library/common/styles/variables.scss
index 2e3e8e7be5..34c3cae8c2 100644
--- a/mathesar_ui/src/component-library/common/styles/variables.scss
+++ b/mathesar_ui/src/component-library/common/styles/variables.scss
@@ -79,17 +79,17 @@
   --brand-box-shadow: var(--red-box-shadow);
 
   --size-extreme-small: 0.1429rem; // 2px
-  --size-super-ultra-small: 0.2858rem; // 4px
+  --size-super-ultra-small: 0.2857rem; // 4px
   --size-ultra-small: 0.4286rem; // 6px
-  --size-xx-small: 0.5715rem; // 8px
+  --size-xx-small: 0.5714rem; // 8px
   --size-x-small: 0.7143rem; // 10px
-  --size-small: 0.8572rem; // 12px
+  --size-small: 0.8571rem; // 12px
   --size-base: 1rem; // 14px
-  --size-large: 1.2rem; // 16.8px
-  --size-x-large: 1.44rem; // 20.2px
-  --size-xx-large: 1.728rem; // 24.2px
-  --size-ultra-large: 2.074rem; // 29px
-  --size-super-ultra-large: 2.488rem; // 34.8px
+  --size-large: 1.1429rem; // 16px
+  --size-x-large: 1.2857rem; // 18px
+  --size-xx-large: 1.4286rem; // 20px
+  --size-ultra-large: 1.5714rem; // 22px
+  --size-super-ultra-large: 2rem; // 28px
 
   --border-radius-xs: 0.071rem; //1px
   --border-radius-s: 0.142rem; //2px
diff --git a/mathesar_ui/src/component-library/help/Help.scss b/mathesar_ui/src/component-library/help/Help.scss
index 86f9bbd520..ed07ee0316 100644
--- a/mathesar_ui/src/component-library/help/Help.scss
+++ b/mathesar_ui/src/component-library/help/Help.scss
@@ -1,3 +1,9 @@
 .help-trigger {
-  color: var(--slate-300);
+  color: var(--slate-400);
+  opacity: 0.6;
+  transition: opacity 0.1s ease-in-out;
+
+  &:hover {
+    opacity: 1;
+  }
 }
diff --git a/mathesar_ui/src/component-library/tooltip/Tooltip.scss b/mathesar_ui/src/component-library/tooltip/Tooltip.scss
index c273119ec2..3fe6aea086 100644
--- a/mathesar_ui/src/component-library/tooltip/Tooltip.scss
+++ b/mathesar_ui/src/component-library/tooltip/Tooltip.scss
@@ -1,9 +1,8 @@
 .dropdown.content.tooltip {
   max-width: min(80vw, 25rem);
-  --Dropdown__background: var(--slate-800);
-  --Dropdown__box-shadow: none;
-  --Dropdown__border: solid 1px white;
+  --Dropdown__background: rgba(var(--slate-800-rgb), 0.85);
+  --Dropdown__box-shadow: 0 4px 8px rgba(0, 0, 0, 0.3);
+  --Dropdown__border: solid 1px rgba(255, 255, 255, 0.5);
   color: var(--white);
-  padding: var(--size-xx-small);
-  line-height: 1.4;
+  padding: var(--size-x-small);
 }
diff --git a/mathesar_ui/src/components/InsetPageSection.svelte b/mathesar_ui/src/components/InsetPageSection.svelte
index d107ac907d..9ab21703ce 100644
--- a/mathesar_ui/src/components/InsetPageSection.svelte
+++ b/mathesar_ui/src/components/InsetPageSection.svelte
@@ -8,8 +8,8 @@
 <style>
   .section {
     background: var(--white);
-    padding: var(--inset-page-section-padding, 1.5rem 1rem);
-    border: solid 1px var(--slate-300);
+    padding: var(--inset-page-section-padding, 2rem 1.5rem);
+    border: solid 1px var(--slate-200);
     border-radius: 0.3rem;
   }
 </style>
diff --git a/mathesar_ui/src/layouts/InsetPageLayout.svelte b/mathesar_ui/src/layouts/InsetPageLayout.svelte
index 2b268f073f..2f43c89723 100644
--- a/mathesar_ui/src/layouts/InsetPageLayout.svelte
+++ b/mathesar_ui/src/layouts/InsetPageLayout.svelte
@@ -27,7 +27,7 @@
     }
   }
   .restrict-width {
-    max-width: var(--max-layout-width);
+    max-width: var(--max-layout-width-data-pages);
     margin-left: auto;
     margin-right: auto;
     width: 100%;
diff --git a/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte b/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
index 43bc69b4bf..bdafeeb44a 100644
--- a/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
@@ -113,7 +113,7 @@
     border-radius: var(--border-radius-l);
     border: 1px solid var(--slate-200);
     background-color: var(--white);
-    padding: 1.142em;
+    padding: 1em;
     display: flex;
     flex-direction: column;
   }
@@ -165,12 +165,12 @@
     flex-direction: row;
     justify-content: space-between;
     align-items: center;
-    flex-grow: 1;
+    flex-grow: 1;    
   }
 
   .name {
-    font-size: var(--text-size-x-large);
-    font-weight: 500;
+    font-size: var(--text-size-xx-large);
+    font-weight: var(--font-weight-medium);
     --icon-color: var(--brand-500);
     overflow: hidden;
   }
@@ -178,5 +178,6 @@
   .lock {
     color: var(--slate-300);
     align-self: baseline;
+    padding: 0.5rem;
   }
 </style>
diff --git a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
index a507dfdb8c..52afa0f00f 100644
--- a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
@@ -146,9 +146,9 @@
     }
 
     .schema-list-title {
-      font-size: var(--text-size-x-large);
-      font-weight: 500;
+      font-size: var(--text-size-ultra-large);
       margin-top: var(--size-super-ultra-small);
+      font-weight: var(--font-weight-medium);
     }
 
     .schema-list {
diff --git a/mathesar_ui/src/pages/home/HomePage.svelte b/mathesar_ui/src/pages/home/HomePage.svelte
index 9a020a5e5a..91a5244157 100644
--- a/mathesar_ui/src/pages/home/HomePage.svelte
+++ b/mathesar_ui/src/pages/home/HomePage.svelte
@@ -117,12 +117,13 @@
   [data-identifier='databases-header'] {
     display: flex;
     align-items: center;
+    padding: 1rem 0;
 
     span {
       flex: 1 0 0;
-      color: var(--slate-800);
-      font-size: var(--size-xx-large);
-      font-weight: 500;
+      color: var(--slate-900);
+      font-size: var(--text-size-ultra-large);
+      font-weight: var(--font-weight-medium);
     }
   }
 
@@ -131,12 +132,13 @@
     margin-top: var(--size-x-large);
     flex-direction: column;
     align-items: stretch;
-    gap: var(--size-x-small);
+    gap: var(--size-medium);
   }
 
   [data-identifier='databases-list-grid'] {
     display: grid;
-    gap: 1rem;
-    margin-top: var(--size-x-large);
+    gap: 1.25rem;
+    margin-top: var(--size-large);
+    grid-template-columns: repeat(auto-fit, minmax(280px, 1fr));
   }
 </style>
diff --git a/mathesar_ui/src/pages/record/RecordPageContent.svelte b/mathesar_ui/src/pages/record/RecordPageContent.svelte
index 7e68da67ad..7cf34fba1d 100644
--- a/mathesar_ui/src/pages/record/RecordPageContent.svelte
+++ b/mathesar_ui/src/pages/record/RecordPageContent.svelte
@@ -58,7 +58,7 @@
       <div class="table-name">
         <RichText text={$_('record_in_table')} let:slotName>
           {#if slotName === 'tableName'}
-            <strong><TableName {table} truncate={false} /></strong>
+            <TableName {table} truncate={false} />
           {/if}
         </RichText>
       </div>
@@ -105,7 +105,7 @@
   .header {
     display: grid;
     grid-template: auto auto / auto 1fr;
-    gap: 0.25rem 1.5rem;
+    gap: 0.5rem 1.5rem;
     align-items: center;
     margin-bottom: 1.5rem;
     overflow: hidden;
diff --git a/mathesar_ui/src/pages/schema/OverviewHeader.svelte b/mathesar_ui/src/pages/schema/OverviewHeader.svelte
index a94dc341c9..cc27c2fb44 100644
--- a/mathesar_ui/src/pages/schema/OverviewHeader.svelte
+++ b/mathesar_ui/src/pages/schema/OverviewHeader.svelte
@@ -28,7 +28,7 @@
   }
 
   .title {
-    font-size: var(--text-size-x-large);
-    font-weight: 500;
+    font-size: var(--text-size-ultra-large);
+    font-weight: var(--font-weight-medium);
   }
 </style>
diff --git a/mathesar_ui/src/pages/schema/SchemaPage.svelte b/mathesar_ui/src/pages/schema/SchemaPage.svelte
index 5ea848b28e..93ffde0652 100644
--- a/mathesar_ui/src/pages/schema/SchemaPage.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPage.svelte
@@ -89,6 +89,7 @@
   restrictWidth
   cssVariables={{
     '--max-layout-width': 'var(--max-layout-width-console-pages)',
+    '--layout-background-color': 'var(--sand-50)',
   }}
 >
   <AppSecondaryHeader
diff --git a/mathesar_ui/src/pages/schema/TableCard.svelte b/mathesar_ui/src/pages/schema/TableCard.svelte
index b9628772b3..c4737f5e50 100644
--- a/mathesar_ui/src/pages/schema/TableCard.svelte
+++ b/mathesar_ui/src/pages/schema/TableCard.svelte
@@ -177,7 +177,7 @@
   .table-card {
     position: relative;
     isolation: isolate;
-    --menu-trigger-size: 4rem;
+    --menu-trigger-size: 3rem;
     --padding: 1rem;
     --bottom-height: 2.5rem;
   }
@@ -192,14 +192,16 @@
   .link {
     display: grid;
     grid-template: auto 1fr auto / 1fr;
-    border: 1px solid var(--slate-300);
+    border: 1px solid var(--slate-200);
     border-radius: var(--border-radius-l);
     cursor: pointer;
     overflow: hidden;
     height: 100%;
+    background-color: var(--white);
+    font-weight: var(--font-weight-medium);
   }
   .link:hover {
-    border-color: var(--slate-500);
+    border-color: var(--slate-300);
     box-shadow: 0 0.2rem 0.4rem 0 rgba(0, 0, 0, 0.1);
   }
   .top {
@@ -217,7 +219,8 @@
   }
   .description:not(:empty) {
     padding: 0 var(--padding) var(--padding) var(--padding);
-    font-size: var(--text-size-small);
+    font-size: var(--text-size-base);
+    color: var(--slate-500);
   }
 
   /** Menu button =========================================================== */
@@ -244,8 +247,8 @@
 
   /** Bottom button========================================================== */
   .table-card .bottom {
-    background: var(--sand-100);
-    border-top: solid 1px var(--sand-200);
+    background: var(--white);
+    border-top: solid 1px var(--slate-100);
   }
   .table-card.unconfirmed-import .bottom {
     background: none;
@@ -274,7 +277,7 @@
   }
   .hovering-bottom-button .bottom {
     color: inherit;
-    background: var(--sand-200);
+    background: var(--slate-50);
   }
   .bottom-button,
   .bottom {

From 3d218290b5cdc4d1f3783ac6b574e8433ce25a53 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Mon, 23 Sep 2024 12:51:11 +0200
Subject: [PATCH 0987/1141] fix error

---
 mathesar_ui/src/pages/database/schemas/SchemaRow.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte b/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
index bdafeeb44a..cfd69cef82 100644
--- a/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
@@ -165,7 +165,7 @@
     flex-direction: row;
     justify-content: space-between;
     align-items: center;
-    flex-grow: 1;    
+    flex-grow: 1;
   }
 
   .name {

From aa0a55d78ffd8ac5e5d7499c7496cbca56df5317 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Mon, 23 Sep 2024 13:25:33 +0200
Subject: [PATCH 0988/1141] update tab container spacing and tabs

---
 mathesar_ui/src/component-library/tabs/TabContainer.scss  | 2 +-
 mathesar_ui/src/pages/database/DatabasePageWrapper.svelte | 6 +++---
 mathesar_ui/src/pages/schema/SchemaPage.svelte            | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/mathesar_ui/src/component-library/tabs/TabContainer.scss b/mathesar_ui/src/component-library/tabs/TabContainer.scss
index 7ad38e1266..25c7186585 100644
--- a/mathesar_ui/src/component-library/tabs/TabContainer.scss
+++ b/mathesar_ui/src/component-library/tabs/TabContainer.scss
@@ -30,7 +30,7 @@
 
       > div,
       a {
-        padding: 0.75rem 0;
+        padding: 0.5rem 1rem;
         white-space: nowrap;
         text-decoration: none;
         text-overflow: ellipsis;
diff --git a/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
index 65979b8fcf..d0d60f51ef 100644
--- a/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
+++ b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
@@ -94,7 +94,7 @@
   </AppSecondaryHeader>
 
   <TabContainer {activeTab} {tabs} uniformTabWidth={false}>
-    <div class="tab-content">
+    <div class="tab-container">
       <slot {setSection} />
     </div>
   </TabContainer>
@@ -103,7 +103,7 @@
 <DatabasePermissionsModal controller={permissionsModal} />
 
 <style>
-  .tab-content {
-    padding: 1rem 0;
+  .tab-container {
+    padding: var(--size-xx-large) 0;
   }
 </style>
diff --git a/mathesar_ui/src/pages/schema/SchemaPage.svelte b/mathesar_ui/src/pages/schema/SchemaPage.svelte
index 93ffde0652..c8d254dc2d 100644
--- a/mathesar_ui/src/pages/schema/SchemaPage.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPage.svelte
@@ -169,8 +169,7 @@
 
 <style lang="scss">
   .tab-container {
-    padding-top: 2rem;
-    padding-bottom: 2rem;
+    padding: var(--size-xx-large) 0;
   }
 
   .tab-header-container {

From f4effce43482dd7a847b5915bfa7340ba2ea08f6 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Mon, 23 Sep 2024 13:36:11 +0200
Subject: [PATCH 0989/1141] revert grid change

---
 mathesar_ui/src/pages/home/HomePage.svelte | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/mathesar_ui/src/pages/home/HomePage.svelte b/mathesar_ui/src/pages/home/HomePage.svelte
index 91a5244157..8de7d6b3af 100644
--- a/mathesar_ui/src/pages/home/HomePage.svelte
+++ b/mathesar_ui/src/pages/home/HomePage.svelte
@@ -117,7 +117,6 @@
   [data-identifier='databases-header'] {
     display: flex;
     align-items: center;
-    padding: 1rem 0;
 
     span {
       flex: 1 0 0;
@@ -132,13 +131,12 @@
     margin-top: var(--size-x-large);
     flex-direction: column;
     align-items: stretch;
-    gap: var(--size-medium);
+    gap: var(--size-x-small);
   }
 
   [data-identifier='databases-list-grid'] {
     display: grid;
-    gap: 1.25rem;
-    margin-top: var(--size-large);
-    grid-template-columns: repeat(auto-fit, minmax(280px, 1fr));
+    gap: 1rem;
+    margin-top: var(--size-x-large);
   }
 </style>

From 7a0df81f50e30f3e4a3553e66eff359dc5a82ed2 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Mon, 23 Sep 2024 13:52:34 +0200
Subject: [PATCH 0990/1141] fix bold style consistency

---
 mathesar_ui/src/App.svelte                     | 2 +-
 mathesar_ui/src/components/NameWithIcon.svelte | 2 +-
 mathesar_ui/src/components/TableName.svelte    | 2 +-
 mathesar_ui/src/pages/home/DatabaseRow.svelte  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mathesar_ui/src/App.svelte b/mathesar_ui/src/App.svelte
index a546ea39a7..5b59698d6d 100644
--- a/mathesar_ui/src/App.svelte
+++ b/mathesar_ui/src/App.svelte
@@ -146,7 +146,7 @@
 
   h1 {
     margin: 0 0 1rem 0;
-    font-size: var(--size-xx-large);
+    font-size: var(--size-ultra-large);
     font-weight: 500;
   }
 
diff --git a/mathesar_ui/src/components/NameWithIcon.svelte b/mathesar_ui/src/components/NameWithIcon.svelte
index fc2c54e170..e886acefd6 100644
--- a/mathesar_ui/src/components/NameWithIcon.svelte
+++ b/mathesar_ui/src/components/NameWithIcon.svelte
@@ -39,7 +39,7 @@
     text-decoration: inherit;
   }
   .name-with-icon.bold {
-    font-weight: 500;
+    font-weight: var(--font-weight-medium);
   }
   .icon {
     color: var(--icon-color, currentcolor);
diff --git a/mathesar_ui/src/components/TableName.svelte b/mathesar_ui/src/components/TableName.svelte
index 051a09c50e..e0c06d5539 100644
--- a/mathesar_ui/src/components/TableName.svelte
+++ b/mathesar_ui/src/components/TableName.svelte
@@ -19,7 +19,7 @@
   $: isNotConfirmed = tableRequiresImportConfirmation(table);
 </script>
 
-<NameWithIcon icon={iconTable} {isLoading} {...$$restProps}>
+<NameWithIcon icon={iconTable} {isLoading} {...$$restProps} bold>
   <slot tableName={table.name}>
     {table.name}
   </slot>
diff --git a/mathesar_ui/src/pages/home/DatabaseRow.svelte b/mathesar_ui/src/pages/home/DatabaseRow.svelte
index 210e6e081d..a5fcb30e98 100644
--- a/mathesar_ui/src/pages/home/DatabaseRow.svelte
+++ b/mathesar_ui/src/pages/home/DatabaseRow.svelte
@@ -54,8 +54,8 @@
     padding-left: var(--size-ultra-small);
 
     .name {
-      font-size: var(--text-size-x-large);
-      font-weight: 500;
+      font-size: var(--text-size-xx-large);
+      font-weight: var(--font-weight-medium);
     }
 
     .server {

From 5f903dbb8c5f7812e972242855772b45e0c884cf Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 23 Sep 2024 17:33:24 +0530
Subject: [PATCH 0991/1141] Implement disconnect database option

---
 mathesar/views.py                             | 12 ++--
 mathesar_ui/src/api/rpc/databases.ts          |  6 ++
 mathesar_ui/src/i18n/languages/en/dict.json   | 15 ++--
 .../pages/database/DatabasePageWrapper.svelte | 71 +++++++++++++++++--
 mathesar_ui/src/routes/DatabaseRoute.svelte   |  2 +-
 mathesar_ui/src/stores/databases.ts           |  9 +++
 .../databases/DatabasesEmptyState.svelte      | 21 +++---
 mathesar_ui/src/utils/preloadData.ts          |  5 +-
 8 files changed, 103 insertions(+), 38 deletions(-)

diff --git a/mathesar/views.py b/mathesar/views.py
index e982e9fa26..f005822e72 100644
--- a/mathesar/views.py
+++ b/mathesar/views.py
@@ -17,7 +17,6 @@
 from mathesar.api.ui.serializers.users import UserSerializer
 from mathesar.api.utils import is_valid_uuid_v4
 from mathesar.database.types import UIType
-from mathesar.models.deprecated import Connection
 from mathesar.models.shares import SharedTable, SharedQuery
 from mathesar.state import reset_reflection
 from mathesar import __version__
@@ -71,14 +70,13 @@ def get_user_data(request):
 
 
 def _get_internal_db_meta():
-    internal_db = Connection.create_from_settings_key('default')
+    internal_db = settings.DATABASES['default']
     if internal_db is not None:
         return {
             'type': 'postgres',
-            'user': internal_db.username,
-            'host': internal_db.host,
-            'port': internal_db.port,
-            'database': internal_db.db_name
+            'host': internal_db['HOST'],
+            'port': internal_db['PORT'],
+            'database_name': internal_db['NAME']
         }
     else:
         return {'type': 'sqlite'}
@@ -92,7 +90,7 @@ def _get_base_data_all_routes(request, database_id=None, schema_id=None):
         'current_release_tag_name': __version__,
         'databases': get_database_list(request),
         'servers': get_servers_list(),
-        'internal_db_connection': _get_internal_db_meta(),
+        'internal_db': _get_internal_db_meta(),
         'is_authenticated': not request.user.is_anonymous,
         'queries': [],
         'schemas': get_schema_list(request, database_id),
diff --git a/mathesar_ui/src/api/rpc/databases.ts b/mathesar_ui/src/api/rpc/databases.ts
index 4275369051..d8d0b2b435 100644
--- a/mathesar_ui/src/api/rpc/databases.ts
+++ b/mathesar_ui/src/api/rpc/databases.ts
@@ -56,6 +56,12 @@ export const databases = {
       },
       Array<RawDatabase>
     >(),
+    disconnect: rpcMethodTypeContainer<
+      {
+        database_id: RawDatabase['id'];
+      },
+      void
+    >(),
   },
   setup: {
     create_new: rpcMethodTypeContainer<
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 062ac90d1a..4c0ecf19ef 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -100,11 +100,6 @@
   "connect_database": "Connect Database",
   "connect_existing_database": "Connect to an Existing Database",
   "connect_with_community_help": "Connect with Mathesar users and contributors in our community chat. Share ideas, get help, and contribute to discussions.",
-  "connection_added_successfully": "The connection has been successfully added.",
-  "connection_deleted_successfully": "The connection has been successfully deleted",
-  "connection_name": "Connection Name",
-  "connection_nickname": "Connection nickname",
-  "connection_updated_successfully": "The connection has been successfully updated",
   "constraint": "Constraint",
   "constraint_name": "Constraint Name",
   "constraint_name_already_exists": "A constraint with that name already exists",
@@ -153,6 +148,8 @@
   "database": "Database",
   "database_access_connect_help": "Can access the database",
   "database_access_create_help": "Can access the database and create new schemas",
+  "database_disconnect_failed": "Unable to disconnect database",
+  "database_disconnect_success": "The database has been disconnected successfully",
   "database_name": "Database Name",
   "database_not_found": "Database with id [connectionId] is not found.",
   "database_ownership_updated_successfully": "Database ownership has been updated successfully.",
@@ -174,10 +171,6 @@
   "delete_associated_mathesar_schemas_help": "Delete associated Mathesar schemas (includes all dependent database objects)",
   "delete_column": "Delete Column",
   "delete_columns_count": "{count, plural, one {Delete Column} other {Delete Columns}}",
-  "delete_connection": "Delete Connection",
-  "delete_connection_db_delete_info": "If you would like to delete the database too, you will need to do so from outside Mathesar by deleting it directly in PostgreSQL.",
-  "delete_connection_info": "The database will not be deleted and will still be accessible outside Mathesar. You may choose to reconnect to it in the future; however, upon disconnecting you will lose Mathesar-specific metadata such as saved explorations, customized column display options, and customized record summary templates.",
-  "delete_connection_with_name": "Delete [connectionName] Database Connection?",
   "delete_database": "Delete Database",
   "delete_exploration": "Delete Exploration",
   "delete_import": "Delete Import",
@@ -194,12 +187,14 @@
   "description": "Description",
   "disable_link": "Disable Link",
   "disable_link_question": "Disable Link?",
-  "disabled_connection_edit_fields_help": "Mathesar does not yet support editing a connection's database name, host, and port. We [issueLink](plan) to add support for this in the future. In the meantime, you can delete this connection and create a new one if needed.",
   "disallow_null_values": "Disallow [null] Values",
   "disallow_null_values_help": "Enable this option to prevent null values in the column. Null values are empty values that are not the same as zero or an empty string.",
   "discard_changes": "Discard Changes",
   "disconnect": "Disconnect",
   "disconnect_database": "Disconnect Database",
+  "disconnect_database_db_delete_info": "If you would like to delete the database too, you will need to do so from outside Mathesar by deleting it directly in PostgreSQL.",
+  "disconnect_database_info": "The database will not be deleted and will still be accessible outside Mathesar. You may choose to reconnect to it in the future; however, upon disconnecting you will lose Mathesar-specific metadata such as saved explorations, customized column display options, and customized record summary templates.",
+  "disconnect_database_with_name": "Disconnect Database [identifier]?",
   "display_language": "Display Language",
   "display_name": "Display Name",
   "documentation_and_resources": "Documentation & Resources",
diff --git a/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
index 69ff6255cc..a8ab75b291 100644
--- a/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
+++ b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
@@ -1,21 +1,28 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
+  import { router } from 'tinro';
 
   import AppSecondaryHeader from '@mathesar/components/AppSecondaryHeader.svelte';
+  import PhraseContainingIdentifier from '@mathesar/components/PhraseContainingIdentifier.svelte';
+  import { DatabaseRouteContext } from '@mathesar/contexts/DatabaseRouteContext';
   import {
     iconDatabase,
     iconDeleteMajor,
     iconMoreActions,
   } from '@mathesar/icons';
   import LayoutWithHeader from '@mathesar/layouts/LayoutWithHeader.svelte';
-  import type { Database } from '@mathesar/models/Database';
   import { makeSimplePageTitle } from '@mathesar/pages/pageTitleUtils';
   import {
+    HOME_URL,
     getDatabasePageSchemasSectionUrl,
     getDatabasePageSettingsSectionUrl,
   } from '@mathesar/routes/urls';
+  import { confirm } from '@mathesar/stores/confirmation';
+  import { databasesStore } from '@mathesar/stores/databases';
   import { modal } from '@mathesar/stores/modal';
+  import { toast } from '@mathesar/stores/toast';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
+  import { preloadCommonData } from '@mathesar/utils/preloadData';
   import {
     Button,
     ButtonMenuItem,
@@ -25,13 +32,23 @@
 
   import DatabasePermissionsModal from './permissions/DatabasePermissionsModal.svelte';
 
+  const databaseRouteContext = DatabaseRouteContext.get();
+  $: ({ database, underlyingDatabase } = $databaseRouteContext);
+  $: void underlyingDatabase.run({ database_id: database.id });
+
+  const commonData = preloadCommonData();
+
+  $: currentRoleOwnsDatabase =
+    $underlyingDatabase.resolvedValue?.currentAccess.currentRoleOwns;
+  $: isDatabaseInInternalServer =
+    database.server.host === commonData.internal_db.host &&
+    database.server.port === commonData.internal_db.port;
+
   const permissionsModal = modal.spawnModalController();
 
   const userProfileStore = getUserProfileStoreFromContext();
   $: ({ isMathesarAdmin } = $userProfileStore);
 
-  export let database: Database;
-
   type Section = 'schemas' | 'settings';
   let section: Section = 'schemas';
 
@@ -52,6 +69,39 @@
   export function setSection(_section: Section) {
     section = _section;
   }
+
+  async function disconnectDatabase() {
+    await confirm({
+      title: {
+        component: PhraseContainingIdentifier,
+        props: {
+          identifier: database.name,
+          wrappingString: $_('disconnect_database_with_name'),
+        },
+      },
+      body: [
+        $_('action_cannot_be_undone'),
+        $_('disconnect_database_info'),
+        $_('disconnect_database_db_delete_info'),
+        $_('are_you_sure_to_proceed'),
+      ],
+      proceedButton: {
+        label: $_('disconnect_database'),
+        icon: undefined,
+      },
+      onProceed: async () => {
+        await databasesStore.disconnectDatabase(database);
+      },
+      onSuccess: () => {
+        toast.success($_('database_disconnect_success'));
+        router.goto(HOME_URL);
+      },
+      onError: (e) =>
+        toast.error({
+          message: `${$_('database_disconnect_failed')} ${e.message}`,
+        }),
+    });
+  }
 </script>
 
 <svelte:head>
@@ -88,12 +138,19 @@
           icon={iconMoreActions}
           preferredPlacement="bottom-end"
         >
-          <ButtonMenuItem icon={iconDeleteMajor}>
+          <ButtonMenuItem icon={iconDeleteMajor} on:click={disconnectDatabase}>
             {$_('disconnect_database')}
           </ButtonMenuItem>
-          <ButtonMenuItem icon={iconDeleteMajor} danger>
-            {$_('delete_database')}
-          </ButtonMenuItem>
+          <!-- TODO_BETA: Allow dropping databases -->
+          <!-- {#if isDatabaseInInternalServer}
+            <ButtonMenuItem
+              icon={iconDeleteMajor}
+              danger
+              disabled={!$currentRoleOwnsDatabase}
+            >
+              {$_('delete_database')}
+            </ButtonMenuItem>
+          {/if} -->
         </DropdownMenu>
       {/if}
     </div>
diff --git a/mathesar_ui/src/routes/DatabaseRoute.svelte b/mathesar_ui/src/routes/DatabaseRoute.svelte
index 03bc52da3d..df93b75b02 100644
--- a/mathesar_ui/src/routes/DatabaseRoute.svelte
+++ b/mathesar_ui/src/routes/DatabaseRoute.svelte
@@ -46,7 +46,7 @@
   <Route path="/*" firstmatch>
     <Route path="/" redirect="schemas/" />
 
-    <DatabasePageWrapper database={$currentDatabase} let:setSection>
+    <DatabasePageWrapper let:setSection>
       <EventfulRoute path="/schemas" onLoad={() => setSection('schemas')}>
         <DatabasePageSchemasSection />
       </EventfulRoute>
diff --git a/mathesar_ui/src/stores/databases.ts b/mathesar_ui/src/stores/databases.ts
index 055b3e1c86..ba9a05d7f7 100644
--- a/mathesar_ui/src/stores/databases.ts
+++ b/mathesar_ui/src/stores/databases.ts
@@ -101,6 +101,15 @@ class DatabasesStore {
     return connectedDatabase;
   }
 
+  async disconnectDatabase(database: Database) {
+    await api.databases.configured
+      .disconnect({
+        database_id: database.id,
+      })
+      .run();
+    this.unsortedDatabases.delete(database.id);
+  }
+
   setCurrentDatabaseId(databaseId: Database['id']) {
     this.currentDatabaseId.set(databaseId);
   }
diff --git a/mathesar_ui/src/systems/databases/DatabasesEmptyState.svelte b/mathesar_ui/src/systems/databases/DatabasesEmptyState.svelte
index 4c9a26fe64..9e6fa57fd8 100644
--- a/mathesar_ui/src/systems/databases/DatabasesEmptyState.svelte
+++ b/mathesar_ui/src/systems/databases/DatabasesEmptyState.svelte
@@ -27,16 +27,17 @@
         {$_('setup_connections_help')}
       </div>
     </div>
-    {#if isMathesarAdmin}
-      <Button
-        slot="footer"
-        appearance="primary"
-        on:click={() => connectDatabaseModalController.open()}
-      >
-        <Icon {...iconAddNew} />
-        <span>{$_('connect_database')}</span>
-      </Button>
-    {/if}
+    <div slot="footer">
+      {#if isMathesarAdmin}
+        <Button
+          appearance="primary"
+          on:click={() => connectDatabaseModalController.open()}
+        >
+          <Icon {...iconAddNew} />
+          <span>{$_('connect_database')}</span>
+        </Button>
+      {/if}
+    </div>
   </Tutorial>
 </div>
 
diff --git a/mathesar_ui/src/utils/preloadData.ts b/mathesar_ui/src/utils/preloadData.ts
index e89af7a3a5..d4ac79a7ac 100644
--- a/mathesar_ui/src/utils/preloadData.ts
+++ b/mathesar_ui/src/utils/preloadData.ts
@@ -12,12 +12,11 @@ export interface CommonData {
   tables: RawTableWithMetadata[];
   queries: QueryInstance[];
   current_database: RawDatabase['id'] | null;
-  internal_db_connection: {
-    database: string;
+  internal_db: {
+    database_name: string;
     host: string;
     port: number;
     type: string;
-    user: string;
   };
   current_schema: number | null;
   user: User;

From dd67534967db087afcf906eddf1540e3ccc0399f Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Mon, 23 Sep 2024 14:53:09 +0200
Subject: [PATCH 0992/1141] fix colors

---
 .../src/component-library/button/Button.scss  |  2 +-
 .../common/styles/variables.scss              | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/mathesar_ui/src/component-library/button/Button.scss b/mathesar_ui/src/component-library/button/Button.scss
index 7c79c43eda..549e384f2c 100644
--- a/mathesar_ui/src/component-library/button/Button.scss
+++ b/mathesar_ui/src/component-library/button/Button.scss
@@ -194,7 +194,7 @@
 
   &.btn-action {
     background: var(--sand-100);
-    border-color: var(--sand-400);
+    border-color: var(--sand-300);
 
     &:not(:disabled) {
       &:hover,
diff --git a/mathesar_ui/src/component-library/common/styles/variables.scss b/mathesar_ui/src/component-library/common/styles/variables.scss
index 34c3cae8c2..1e3f261d3a 100644
--- a/mathesar_ui/src/component-library/common/styles/variables.scss
+++ b/mathesar_ui/src/component-library/common/styles/variables.scss
@@ -37,15 +37,15 @@
 
   --slate-800-rgb: 39, 43, 48;
 
-  --sand-50: #fcfcfb;
-  --sand-100: #f8f7f3;
-  --sand-200: #eee7d8;
-  --sand-300: #e3d7bb;
-  --sand-400: #ccbcd8;
-  --sand-500: #b3a08c;
-  --sand-600: #9a8570;
-  --sand-700: #836a55;
-  --sand-800: #6b4e39;
+  --sand-50: #fdfdfc;
+  --sand-100: #f9f8f5;
+  --sand-200: #f0e9db;
+  --sand-300: #e6dcbf;
+  --sand-400: #d1c3b0;
+  --sand-500: #b8a895;
+  --sand-600: #9f8d7a;
+  --sand-700: #87725f;
+  --sand-800: #6f5744;
 
   --sky-200: #daeefb;
   --sky-300: #99d4f9;
@@ -88,7 +88,7 @@
   --size-large: 1.1429rem; // 16px
   --size-x-large: 1.2857rem; // 18px
   --size-xx-large: 1.4286rem; // 20px
-  --size-ultra-large: 1.5714rem; // 22px
+  --size-ultra-large: 1.7143rem; // 24px
   --size-super-ultra-large: 2rem; // 28px
 
   --border-radius-xs: 0.071rem; //1px

From de6f47f40c91dc335733d83f7234fb3d59833557 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Mon, 23 Sep 2024 14:57:23 +0200
Subject: [PATCH 0993/1141] fix descriptions

---
 mathesar_ui/src/pages/database/schemas/SchemaRow.svelte | 4 ++--
 mathesar_ui/src/pages/home/DatabaseRow.svelte           | 1 +
 mathesar_ui/src/pages/schema/TableCard.svelte           | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte b/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
index cfd69cef82..8e6026a036 100644
--- a/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemaRow.svelte
@@ -151,8 +151,8 @@
 
   .description {
     font-weight: 400;
-    font-size: var(--text-size-large);
-    color: var(--slate-700);
+    font-size: var(--text-size-base);
+    color: var(--slate-500);
     margin-bottom: 0;
     display: -webkit-box;
     -webkit-line-clamp: 1;
diff --git a/mathesar_ui/src/pages/home/DatabaseRow.svelte b/mathesar_ui/src/pages/home/DatabaseRow.svelte
index a5fcb30e98..f523d82809 100644
--- a/mathesar_ui/src/pages/home/DatabaseRow.svelte
+++ b/mathesar_ui/src/pages/home/DatabaseRow.svelte
@@ -61,6 +61,7 @@
     .server {
       font-size: var(--text-size-base);
       margin-top: var(--size-extreme-small);
+      color: var(--slate-500);
     }
   }
 </style>
diff --git a/mathesar_ui/src/pages/schema/TableCard.svelte b/mathesar_ui/src/pages/schema/TableCard.svelte
index c4737f5e50..7d1e9f71bc 100644
--- a/mathesar_ui/src/pages/schema/TableCard.svelte
+++ b/mathesar_ui/src/pages/schema/TableCard.svelte
@@ -221,6 +221,7 @@
     padding: 0 var(--padding) var(--padding) var(--padding);
     font-size: var(--text-size-base);
     color: var(--slate-500);
+    font-weight: var(--font-weight-normal);
   }
 
   /** Menu button =========================================================== */

From 22bf607cb8d38782c2ae20dc3213db53cfe277e3 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Mon, 23 Sep 2024 15:00:41 +0200
Subject: [PATCH 0994/1141] make database icon consistent

---
 mathesar_ui/src/components/PageTitleAndMeta.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mathesar_ui/src/components/PageTitleAndMeta.svelte b/mathesar_ui/src/components/PageTitleAndMeta.svelte
index 8be3f265d7..1155c613f0 100644
--- a/mathesar_ui/src/components/PageTitleAndMeta.svelte
+++ b/mathesar_ui/src/components/PageTitleAndMeta.svelte
@@ -12,7 +12,7 @@
     <div class="left">
       <div class="entity-container">
         <div class="entity-icon">
-          <Icon {...icon} size="2em" />
+          <Icon {...icon} size="1.5em" />
         </div>
         <div class="left-meta-container">
           <span class="entity-name">{name}</span>
@@ -56,7 +56,7 @@
     display: flex;
     justify-content: center;
     align-items: center;
-    border-radius: var(--border-radius-l);
+    border-radius: 50%;
     color: var(--white);
   }
 

From 1e20deb9f27ecb652ff0bb002f5fcb290d83930e Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Mon, 23 Sep 2024 15:29:54 +0200
Subject: [PATCH 0995/1141] remove background color

---
 mathesar_ui/src/component-library/button/Button.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mathesar_ui/src/component-library/button/Button.scss b/mathesar_ui/src/component-library/button/Button.scss
index 549e384f2c..7956465979 100644
--- a/mathesar_ui/src/component-library/button/Button.scss
+++ b/mathesar_ui/src/component-library/button/Button.scss
@@ -199,8 +199,7 @@
     &:not(:disabled) {
       &:hover,
       &.hover {
-        background: var(--sand-200);
-        border-color: var(--sand-500);
+        border-color: var(--sand-400);
       }
 
       &:active,

From f61362b6d191dd13634cf909026f6ac9525acb84 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Mon, 23 Sep 2024 23:06:47 +0530
Subject: [PATCH 0996/1141] add sql functions for granting/revoking members

---
 db/sql/00_msar.sql | 62 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 4e85cc69c7..7ced382b81 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1192,6 +1192,68 @@ WHERE role_data.name = rolename;
 $$ LANGUAGE SQL STABLE;
 
 
+CREATE OR REPLACE FUNCTION
+msar.build_grant_membership_expr(parent_rol_id regrole, g_roles bigint[]) RETURNS TEXT AS $$
+SELECT string_agg(
+  format(
+    'GRANT %1$s TO %2$s',
+    msar.get_role_name(parent_rol_id),
+    msar.get_role_name(rol_id)
+  ),
+  E';\n'
+) || E';\n'
+FROM unnest(g_roles) as x(rol_id);
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION
+msar.build_revoke_membership_expr(parent_rol_id regrole, r_roles bigint[]) RETURNS TEXT AS $$
+SELECT string_agg(
+  format(
+    'REVOKE %1$s FROM %2$s',
+    msar.get_role_name(parent_rol_id),
+    msar.get_role_name(rol_id)
+  ),
+  E';\n'
+) || E';\n'
+FROM unnest(r_roles) as x(rol_id);
+$$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION msar.set_members_to_role(parent_rol_id regrole, members bigint[]) RETURNS jsonb AS $$
+DECLARE
+  parent_role_info jsonb := msar.get_role(parent_rol_id::regrole::text);
+  all_members_array bigint[];
+  revoke_members_array bigint[];
+  set_members_expr text;
+BEGIN
+  -- Get all the members of parent_role.
+  SELECT array_agg(x.oid)
+    FROM jsonb_to_recordset(
+      CASE WHEN parent_role_info ->> 'members' IS NOT NULL
+      THEN parent_role_info -> 'members'
+      ELSE NULL END
+    ) AS x(oid oid, admin boolean)
+  INTO all_members_array;
+  -- Find all the roles whose membership we want to revoke.
+  SELECT ARRAY(
+    SELECT unnest(all_members_array)
+    EXCEPT
+    SELECT unnest(members)
+  ) INTO revoke_members_array;
+  -- REVOKE/GRANT membership for parent_role.
+  set_members_expr := concat_ws(
+    E'\n',
+    msar.build_revoke_membership_expr(parent_rol_id, revoke_members_array),
+    msar.build_grant_membership_expr(parent_rol_id, members)
+  );
+  EXECUTE set_members_expr;
+  -- Return the updated parent_role info including membership details.
+  RETURN msar.get_role(parent_rol_id::regrole::text);
+END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
 CREATE OR REPLACE FUNCTION
 msar.get_current_role() RETURNS jsonb AS $$/*
 Returns a JSON object describing the current_role and the parent role(s) whose

From 30cf558e71ec2689ea4718e3f0b350e72e2f2a45 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 24 Sep 2024 00:32:59 +0530
Subject: [PATCH 0997/1141] add docstring to sql function

---
 db/sql/00_msar.sql | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 7ced382b81..b5443abf82 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1193,7 +1193,7 @@ $$ LANGUAGE SQL STABLE;
 
 
 CREATE OR REPLACE FUNCTION
-msar.build_grant_membership_expr(parent_rol_id regrole, g_roles bigint[]) RETURNS TEXT AS $$
+msar.build_grant_membership_expr(parent_rol_id regrole, g_roles oid[]) RETURNS TEXT AS $$
 SELECT string_agg(
   format(
     'GRANT %1$s TO %2$s',
@@ -1207,7 +1207,7 @@ $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
 CREATE OR REPLACE FUNCTION
-msar.build_revoke_membership_expr(parent_rol_id regrole, r_roles bigint[]) RETURNS TEXT AS $$
+msar.build_revoke_membership_expr(parent_rol_id regrole, r_roles oid[]) RETURNS TEXT AS $$
 SELECT string_agg(
   format(
     'REVOKE %1$s FROM %2$s',
@@ -1220,7 +1220,31 @@ FROM unnest(r_roles) as x(rol_id);
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 
-CREATE OR REPLACE FUNCTION msar.set_members_to_role(parent_rol_id regrole, members bigint[]) RETURNS jsonb AS $$
+CREATE OR REPLACE FUNCTION msar.set_members_to_role(parent_rol_id regrole, members oid[]) RETURNS jsonb AS $$/*
+Grant/Revoke direct membership to/from roles.
+
+Returns a json object describing the updated information of the parent role.
+
+  {
+    "oid": <int>
+    "name": <str>
+    "super": <bool>
+    "inherits": <bool>
+    "create_role": <bool>
+    "create_db": <bool>
+    "login": <bool>
+    "description": <str|null>
+    "members": <[
+        { "oid": <int>, "admin": <bool> }
+      ]|null>
+  }
+
+Args:
+  parent_rol_id: The OID of role whose membership will be granted/revoked to/from other roles.
+  members: An array of role OID(s) whom we want to grant direct membership of the parent role.
+           Only the OID(s) present in the array will be granted membership of parent role,
+           Membership will be revoked for existing members not present in this array.
+*/
 DECLARE
   parent_role_info jsonb := msar.get_role(parent_rol_id::regrole::text);
   all_members_array bigint[];

From 9a1b91dd27af00f3954010d93d060467f4f9d8b0 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 24 Sep 2024 00:35:13 +0530
Subject: [PATCH 0998/1141] add python functions for roles.set_members

---
 db/roles/operations/membership.py |  5 +++++
 mathesar/rpc/roles/base.py        | 29 +++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 db/roles/operations/membership.py

diff --git a/db/roles/operations/membership.py b/db/roles/operations/membership.py
new file mode 100644
index 0000000000..4b963653b9
--- /dev/null
+++ b/db/roles/operations/membership.py
@@ -0,0 +1,5 @@
+from db.connection import exec_msar_func
+
+
+def set_members_to_role(parent_role_oid, members, conn):
+    return exec_msar_func(conn, 'set_members_to_role', parent_role_oid, members).fetchone()[0]
diff --git a/mathesar/rpc/roles/base.py b/mathesar/rpc/roles/base.py
index ce1f7d3e8a..463e42e893 100644
--- a/mathesar/rpc/roles/base.py
+++ b/mathesar/rpc/roles/base.py
@@ -11,6 +11,7 @@
 from db.roles.operations.select import list_roles, get_current_role_from_db
 from db.roles.operations.create import create_role
 from db.roles.operations.drop import drop_role
+from db.roles.operations.membership import set_members_to_role
 
 
 class RoleMember(TypedDict):
@@ -161,3 +162,31 @@ def get_current_role(*, database_id: int, **kwargs) -> dict:
         "current_role": RoleInfo.from_dict(current_role["current_role"]),
         "parent_roles": [RoleInfo.from_dict(role) for role in current_role["parent_roles"]]
     }
+
+
+@rpc_method(name="roles.set_members")
+@http_basic_auth_login_required
+@handle_rpc_exceptions
+def set_members(
+    *,
+    parent_role_oid: int,
+    members: list,
+    database_id: int,
+    **kwargs
+) -> RoleInfo:
+    """
+    Grant/Revoke direct membership to/from roles.
+
+    Args:
+      parent_rol_id: The OID of role whose membership will be granted/revoked to/from other roles.
+      members: An array of role OID(s) whom we want to grant direct membership of the parent role.
+               Only the OID(s) present in the array will be granted membership of parent role,
+               Membership will be revoked for existing members not present in this array.
+
+    Returns:
+        A dict describing the updated information of the parent role.
+    """
+    user = kwargs.get(REQUEST_KEY).user
+    with connect(database_id, user) as conn:
+        parent_role = set_members_to_role(parent_role_oid, members, conn)
+    return RoleInfo.from_dict(parent_role)

From 4967d6e88cb3a03463df72dc37e83a95d02daba8 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 24 Sep 2024 01:02:18 +0530
Subject: [PATCH 0999/1141] add mocks and docs

---
 docs/docs/api/rpc.md                 |  1 +
 mathesar/tests/rpc/test_endpoints.py |  5 ++++
 mathesar/tests/rpc/test_roles.py     | 42 ++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index bc88e9f725..9f91c2f4b8 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -256,6 +256,7 @@ To use an RPC function:
       - add
       - delete
       - get_current_role
+      - set_members
       - RoleInfo
       - RoleMember
 
diff --git a/mathesar/tests/rpc/test_endpoints.py b/mathesar/tests/rpc/test_endpoints.py
index 3a8f5a38d0..0a169e3c53 100644
--- a/mathesar/tests/rpc/test_endpoints.py
+++ b/mathesar/tests/rpc/test_endpoints.py
@@ -275,6 +275,11 @@
         "roles.get_current_role",
         [user_is_authenticated]
     ),
+    (
+        roles.set_members,
+        "roles.set_members",
+        [user_is_authenticated]
+    ),
 
     (
         roles.configured.add,
diff --git a/mathesar/tests/rpc/test_roles.py b/mathesar/tests/rpc/test_roles.py
index 35b82cdd17..f6ebb516b1 100644
--- a/mathesar/tests/rpc/test_roles.py
+++ b/mathesar/tests/rpc/test_roles.py
@@ -187,3 +187,45 @@ def mock_get_current_role(conn):
     monkeypatch.setattr(roles.base, 'connect', mock_connect)
     monkeypatch.setattr(roles.base, 'get_current_role_from_db', mock_get_current_role)
     roles.get_current_role(database_id=_database_id, request=request)
+
+
+def test_roles_set_members(rf, monkeypatch):
+    _username = 'alice'
+    _password = 'pass1234'
+    _database_id = 2
+    _parent_role_oid = 10
+    _members = [2573031, 2573040]
+    request = rf.post('/api/rpc/v0/', data={})
+    request.user = User(username=_username, password=_password)
+
+    @contextmanager
+    def mock_connect(database_id, user):
+        if database_id == _database_id and user.username == _username:
+            try:
+                yield True
+            finally:
+                pass
+        else:
+            raise AssertionError('incorrect parameters passed')
+
+    def mock_set_roles(parent_role_oid, members, conn):
+        if (
+            parent_role_oid != _parent_role_oid
+            or members != _members
+        ):
+            raise AssertionError('incorrect parameters passed')
+        return {
+            'oid': 10,
+            'name': 'mathesar',
+            'login': True,
+            'super': True,
+            'members': [{'oid': 2573031, 'admin': False}, {'oid': 2573040, 'admin': False}],
+            'inherits': True,
+            'create_db': True,
+            'create_role': True,
+            'description': None
+        }
+
+    monkeypatch.setattr(roles.base, 'connect', mock_connect)
+    monkeypatch.setattr(roles.base, 'set_members_to_role', mock_set_roles)
+    roles.set_members(parent_role_oid=_parent_role_oid, database_id=_database_id, members=_members, request=request)

From fde6fa6b8f7622586048a91770c98fc467deaff7 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 24 Sep 2024 01:10:35 +0530
Subject: [PATCH 1000/1141] fix docs

---
 mathesar/rpc/roles/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/rpc/roles/base.py b/mathesar/rpc/roles/base.py
index 463e42e893..167359c529 100644
--- a/mathesar/rpc/roles/base.py
+++ b/mathesar/rpc/roles/base.py
@@ -178,7 +178,7 @@ def set_members(
     Grant/Revoke direct membership to/from roles.
 
     Args:
-      parent_rol_id: The OID of role whose membership will be granted/revoked to/from other roles.
+      parent_role_oid: The OID of role whose membership will be granted/revoked to/from other roles.
       members: An array of role OID(s) whom we want to grant direct membership of the parent role.
                Only the OID(s) present in the array will be granted membership of parent role,
                Membership will be revoked for existing members not present in this array.

From fb14fd232dbe9a865e42b2398adc6f3a2d2d4e91 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 23 Sep 2024 19:25:33 -0400
Subject: [PATCH 1001/1141] Add transformResolved method to CancellablePromise

---
 .../component-library/common/utils/CancellablePromise.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mathesar_ui/src/component-library/common/utils/CancellablePromise.ts b/mathesar_ui/src/component-library/common/utils/CancellablePromise.ts
index 7015025b24..52a2aef4e7 100644
--- a/mathesar_ui/src/component-library/common/utils/CancellablePromise.ts
+++ b/mathesar_ui/src/component-library/common/utils/CancellablePromise.ts
@@ -56,4 +56,13 @@ export default class CancellablePromise<T> extends Promise<T> {
     }
     return super.then(resolve, reject);
   }
+
+  transformResolved<S>(f: (v: T) => S): CancellablePromise<S> {
+    return new CancellablePromise(
+      (resolve, reject) => {
+        this.then((v) => resolve(f(v)), reject).catch(reject);
+      },
+      () => this.cancel(),
+    );
+  }
 }

From afd96310119f5b5337767e9933891f7e3e8fbca8 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 23 Sep 2024 19:27:01 -0400
Subject: [PATCH 1002/1141] Add batchRun RPC helper function

---
 .../packages/json-rpc-client-builder/index.ts |  2 +-
 .../json-rpc-client-builder/requests.ts       | 65 ++++++++++++++++---
 2 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/mathesar_ui/src/packages/json-rpc-client-builder/index.ts b/mathesar_ui/src/packages/json-rpc-client-builder/index.ts
index d8eb45d709..4a19fa0e14 100644
--- a/mathesar_ui/src/packages/json-rpc-client-builder/index.ts
+++ b/mathesar_ui/src/packages/json-rpc-client-builder/index.ts
@@ -1,9 +1,9 @@
 export { type RpcError } from './RpcError';
 export { buildRpcApi, rpcMethodTypeContainer } from './builder';
 export {
+  batchRun,
   batchSend,
   runner,
-  type RpcBatchResponse,
   type RpcRequest,
   type RpcResponse,
   type RpcResult,
diff --git a/mathesar_ui/src/packages/json-rpc-client-builder/requests.ts b/mathesar_ui/src/packages/json-rpc-client-builder/requests.ts
index c25af1f163..94f56792a8 100644
--- a/mathesar_ui/src/packages/json-rpc-client-builder/requests.ts
+++ b/mathesar_ui/src/packages/json-rpc-client-builder/requests.ts
@@ -73,18 +73,20 @@ function send<T>(request: RpcRequest<T>): CancellablePromise<RpcResponse<T>> {
 
 function makeRpcBatchResponse<T extends RpcRequest<unknown>[]>(
   values: unknown,
-): RpcBatchResponse<T> {
+): RpcBatchSendResponse<T> {
   if (!Array.isArray(values)) {
     throw new Error('Response is not an array');
   }
-  return values.map((value) => makeRpcResponse(value)) as RpcBatchResponse<T>;
+  return values.map((value) =>
+    makeRpcResponse(value),
+  ) as RpcBatchSendResponse<T>;
 }
 
 function sendBatchRequest<T extends RpcRequest<unknown>[]>(
   endpoint: string,
   headers: Record<string, string | undefined>,
   requests: T,
-): CancellablePromise<RpcBatchResponse<T>> {
+): CancellablePromise<RpcBatchSendResponse<T>> {
   const fetch = cancellableFetch(endpoint, {
     method: 'POST',
     headers: {
@@ -104,7 +106,7 @@ function sendBatchRequest<T extends RpcRequest<unknown>[]>(
             resolve(
               requests.map(() =>
                 RpcError.fromAnything(rejectionReason),
-              ) as RpcBatchResponse<T>,
+              ) as RpcBatchSendResponse<T>,
             ),
         )
         .then((json) => resolve(makeRpcBatchResponse(json))),
@@ -171,13 +173,23 @@ export class RpcRequest<T> {
   }
 }
 
-export type RpcBatchResponse<T extends RpcRequest<unknown>[]> = {
+type RpcBatchSendResponse<T extends RpcRequest<unknown>[]> = {
   [K in keyof T]: T[K] extends RpcRequest<infer R> ? RpcResponse<R> : never;
 };
 
-export function batchSend<T extends RpcRequest<unknown>[]>(
-  requests: T,
-): CancellablePromise<RpcBatchResponse<T>> {
+/**
+ * Use this to run multiple RPC requests in a single batch and handle errors on
+ * a per-request basis.
+ *
+ * This function will not throw any errors when awaited.
+ *
+ * For less boilerplate, use `batchRun` which is simpler but less powerful.
+ */
+export function batchSend<
+  T extends
+    | [RpcRequest<unknown>, ...RpcRequest<unknown>[]]
+    | RpcRequest<unknown>[],
+>(requests: T): CancellablePromise<RpcBatchSendResponse<T>> {
   if (requests.length === 0) {
     throw new Error('There must be atleast one request');
   }
@@ -190,6 +202,43 @@ export function batchSend<T extends RpcRequest<unknown>[]>(
   return sendBatchRequest(endpoint, firstRequest.getHeaders(), requests);
 }
 
+type RpcBatchRunResponse<T extends RpcRequest<unknown>[]> = {
+  [K in keyof T]: T[K] extends RpcRequest<infer R> ? R : never;
+};
+
+/**
+ * Use this to run multiple RPC requests without fine-grained error handling.
+ *
+ * For more control over error handling, use `batchSend` and handle errors
+ * manually.
+ *
+ * @throws `RpcError` when awaited if any errors are encountered. When multiple
+ * requests are run, there can be multiple errors. In that case, the first error
+ * encountered is thrown.
+ */
+export function batchRun<
+  T extends
+    | [RpcRequest<unknown>, ...RpcRequest<unknown>[]]
+    | RpcRequest<unknown>[],
+>(requests: T): CancellablePromise<RpcBatchRunResponse<T>> {
+  const promise = batchSend(requests);
+  return new CancellablePromise(
+    (resolve, reject) => {
+      promise
+        .then((responses) => {
+          const values = [];
+          for (const response of responses as RpcResponse<unknown>[]) {
+            if (response.status !== 'ok') return reject(response);
+            values.push(response.value);
+          }
+          return resolve(values as RpcBatchRunResponse<T>);
+        }, reject)
+        .catch(reject);
+    },
+    () => promise.cancel(),
+  );
+}
+
 /**
  * A factory function to builds a function that directly runs a specific RPC
  * request. The built function will then accept all the props of the RPC method

From a1d3abae123a63e387118f7d5716827a99496d63 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 23 Sep 2024 19:28:58 -0400
Subject: [PATCH 1003/1141] Get columns of exploration base table showing

---
 .../src/systems/data-explorer/QueryManager.ts |  70 ++------
 .../src/systems/data-explorer/utils.ts        | 152 +++++++++++-------
 2 files changed, 103 insertions(+), 119 deletions(-)

diff --git a/mathesar_ui/src/systems/data-explorer/QueryManager.ts b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
index d689ac99ae..f7f9b5ae2e 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryManager.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
@@ -3,15 +3,10 @@ import { get, writable } from 'svelte/store';
 import { _ } from 'svelte-i18n';
 
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
-import { api } from '@mathesar/api/rpc';
 import type {
   ExplorationResult,
   SavedExploration,
 } from '@mathesar/api/rpc/explorations';
-import type {
-  JoinableTablesResult,
-  RawTableWithMetadata,
-} from '@mathesar/api/rpc/tables';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
 import { currentDatabase } from '@mathesar/stores/databases';
 import { createQuery, putQuery } from '@mathesar/stores/queries';
@@ -23,12 +18,8 @@ import QueryModel from './QueryModel';
 import QueryRunner from './QueryRunner';
 import QuerySummarizationTransformationModel from './QuerySummarizationTransformationModel';
 import QueryUndoRedoManager from './QueryUndoRedoManager';
-import type { InputColumnsStoreSubstance } from './utils';
-import {
-  getBaseTableColumnsWithLinks,
-  getColumnInformationMap,
-  getTablesThatReferenceBaseTable,
-} from './utils';
+import type { InputColumnsStoreSubstance, QueryTableStructure } from './utils';
+import { getInputColumns, getQueryTableStructure } from './utils';
 
 export default class QueryManager extends QueryRunner {
   private undoRedoManager: QueryUndoRedoManager;
@@ -65,12 +56,8 @@ export default class QueryManager extends QueryRunner {
 
   // Promises
 
-  private baseTableFetchPromise:
-    | CancellablePromise<RawTableWithMetadata>
-    | undefined;
-
-  private joinableColumnsFetchPromise:
-    | CancellablePromise<JoinableTablesResult>
+  private tableStructurePromise:
+    | CancellablePromise<QueryTableStructure>
     | undefined;
 
   private querySavePromise: CancellablePromise<SavedExploration> | undefined;
@@ -119,9 +106,7 @@ export default class QueryManager extends QueryRunner {
 
     const cachedResult = this.cacheManagers.inputColumns.get(baseTableId);
     if (cachedResult) {
-      this.inputColumns.set({
-        ...cachedResult,
-      });
+      this.inputColumns.set({ ...cachedResult });
       this.state.update((state) => ({
         ...state,
         inputColumnsFetchState: { state: 'success' },
@@ -132,48 +117,18 @@ export default class QueryManager extends QueryRunner {
 
     try {
       const database = get(currentDatabase);
-      this.baseTableFetchPromise?.cancel();
-      this.joinableColumnsFetchPromise?.cancel();
-
       this.state.update((state) => ({
         ...state,
         inputColumnsFetchState: { state: 'processing' },
       }));
 
-      this.baseTableFetchPromise = api.tables
-        .get_with_metadata({
-          database_id: database.id,
-          table_oid: baseTableId,
-        })
-        .run();
+      this.tableStructurePromise?.cancel();
+      this.tableStructurePromise = getQueryTableStructure({
+        database,
+        baseTableId,
+      });
+      const inputColumns = getInputColumns(await this.tableStructurePromise);
 
-      this.joinableColumnsFetchPromise = api.tables
-        .list_joinable({
-          database_id: database.id,
-          table_oid: baseTableId,
-        })
-        .run();
-      const [baseTableResult, joinableColumnsResult] = await Promise.all([
-        this.baseTableFetchPromise,
-        this.joinableColumnsFetchPromise,
-      ]);
-      const baseTableColumns = getBaseTableColumnsWithLinks(
-        joinableColumnsResult,
-        baseTableResult,
-      );
-      const tablesThatReferenceBaseTable = getTablesThatReferenceBaseTable(
-        joinableColumnsResult,
-        baseTableResult,
-      );
-      const inputColumnInformationMap = getColumnInformationMap(
-        joinableColumnsResult,
-        baseTableResult,
-      );
-      const inputColumns = {
-        baseTableColumns,
-        tablesThatReferenceBaseTable,
-        inputColumnInformationMap,
-      };
       this.cacheManagers.inputColumns.set(baseTableId, inputColumns);
       this.inputColumns.set(inputColumns);
       this.speculateColumns();
@@ -388,8 +343,7 @@ export default class QueryManager extends QueryRunner {
 
   destroy(): void {
     super.destroy();
-    this.baseTableFetchPromise?.cancel();
-    this.joinableColumnsFetchPromise?.cancel();
+    this.tableStructurePromise?.cancel();
     this.querySavePromise?.cancel();
   }
 }
diff --git a/mathesar_ui/src/systems/data-explorer/utils.ts b/mathesar_ui/src/systems/data-explorer/utils.ts
index 525321ef0a..ae39e5b6fb 100644
--- a/mathesar_ui/src/systems/data-explorer/utils.ts
+++ b/mathesar_ui/src/systems/data-explorer/utils.ts
@@ -1,3 +1,4 @@
+import { api } from '@mathesar/api/rpc';
 import type { Column } from '@mathesar/api/rpc/columns';
 import type {
   ExplorationResult,
@@ -14,7 +15,9 @@ import {
   getDisplayFormatter,
   getInitialInputValue,
 } from '@mathesar/components/cell-fabric/utils';
+import type { Database } from '@mathesar/models/Database';
 import type { Table } from '@mathesar/models/Table';
+import { batchRun } from '@mathesar/packages/json-rpc-client-builder';
 import {
   getAbstractTypeForDbType,
   getFiltersForAbstractType,
@@ -28,7 +31,10 @@ import type {
   AbstractTypesMap,
 } from '@mathesar/stores/abstract-types/types';
 import { ImmutableMap } from '@mathesar-component-library';
-import type { ComponentAndProps } from '@mathesar-component-library/types';
+import type {
+  CancellablePromise,
+  ComponentAndProps,
+} from '@mathesar-component-library/types';
 
 import type QueryModel from './QueryModel';
 
@@ -176,26 +182,50 @@ export function getLinkFromColumn(
   };
 }
 
-export function getColumnInformationMap(
-  result: JoinableTablesResult,
-  baseTable: Pick<Table, 'oid' | 'name'>,
-): InputColumnsStoreSubstance['inputColumnInformationMap'] {
-  const map: InputColumnsStoreSubstance['inputColumnInformationMap'] =
-    new Map();
+export interface QueryTableStructure {
+  joinableTables: JoinableTablesResult;
+  baseTable: Pick<Table, 'oid' | 'name'>;
+  columns: Pick<Column, 'id' | 'name' | 'type'>[];
+}
 
-  // TODO_BETA: figure out how to deal with the fact that our `Table` type no
-  // longer has a `columns` field.
+export function getQueryTableStructure(p: {
+  database: Pick<Database, 'id'>;
+  baseTableId: Table['oid'];
+}): CancellablePromise<QueryTableStructure> {
+  const args = {
+    database_id: p.database.id,
+    table_oid: p.baseTableId,
+  };
+  return batchRun([
+    api.tables.list_joinable(args),
+    api.tables.get(args),
+    api.columns.list(args),
+  ]).transformResolved(([joinableTables, baseTable, columns]) => ({
+    joinableTables,
+    baseTable,
+    columns,
+  }));
+}
 
-  // baseTable.columns.forEach((column) => {
-  //   map.set(column.id, {
-  //     id: column.id,
-  //     name: column.name,
-  //     type: column.type,
-  //     tableId: baseTable.oid,
-  //     tableName: baseTable.name,
-  //   });
-  // });
-  for (const [tableIdKey, table] of Object.entries(result.target_table_info)) {
+function getColumnInformationMap({
+  joinableTables,
+  baseTable,
+  columns,
+}: QueryTableStructure): InputColumnsStoreSubstance['inputColumnInformationMap'] {
+  const map: InputColumnsStoreSubstance['inputColumnInformationMap'] =
+    new Map();
+  columns.forEach((column) => {
+    map.set(column.id, {
+      id: column.id,
+      name: column.name,
+      type: column.type,
+      tableId: baseTable.oid,
+      tableName: baseTable.name,
+    });
+  });
+  for (const [tableIdKey, table] of Object.entries(
+    joinableTables.target_table_info,
+  )) {
     const tableId = parseInt(tableIdKey, 10);
     for (const [columnIdKey, column] of Object.entries(table.columns)) {
       const columnId = parseInt(columnIdKey, 10);
@@ -211,58 +241,47 @@ export function getColumnInformationMap(
   return map;
 }
 
-export function getBaseTableColumnsWithLinks(
-  result: JoinableTablesResult,
-  baseTable: Pick<Table, 'oid' | 'name'>,
-): Map<ColumnWithLink['id'], ColumnWithLink> {
-  // TODO_BETA: figure out how to deal with the fact that our `Table` type no
-  // longer has a `columns` field.
-
-  // const columnMapEntries: [ColumnWithLink['id'], ColumnWithLink][] =
-  //   baseTable.columns.map((column) => [
-  //     column.id,
-  //     {
-  //       id: column.id,
-  //       name: column.name,
-  //       type: column.type,
-  //       tableName: baseTable.name,
-  //       linksTo: getLinkFromColumn(result, column.id, 1),
-  //       producesMultipleResults: false,
-  //     },
-  //   ]);
-
-  const columnMapEntries: [ColumnWithLink['id'], ColumnWithLink][] = [];
-
+function getBaseTableColumnsWithLinks({
+  joinableTables,
+  baseTable,
+  columns,
+}: QueryTableStructure): Map<ColumnWithLink['id'], ColumnWithLink> {
+  const columnMapEntries: [ColumnWithLink['id'], ColumnWithLink][] =
+    columns.map(({ id, name, type }) => [
+      id,
+      {
+        id,
+        name,
+        type,
+        tableName: baseTable.name,
+        linksTo: getLinkFromColumn(joinableTables, id, 1),
+        producesMultipleResults: false,
+      },
+    ]);
   return new Map(columnMapEntries.sort(compareColumnByLinks));
 }
 
-export function getTablesThatReferenceBaseTable(
-  result: JoinableTablesResult,
-  baseTable: Pick<Table, 'oid' | 'name'>,
-): ReferencedByTable[] {
-  const referenceLinks = result.joinable_tables.filter(
+function getTablesThatReferenceBaseTable({
+  joinableTables,
+  columns,
+}: QueryTableStructure): ReferencedByTable[] {
+  const referenceLinks = joinableTables.joinable_tables.filter(
     (entry) => entry.depth === 1 && entry.fkey_path[0][1] === true,
   );
   const references: ReferencedByTable[] = [];
 
   referenceLinks.forEach((reference) => {
     const tableId = reference.target;
-    const table = result.target_table_info[tableId];
-    const baseTableColumnId = reference.join_path[0][0];
+    const table = joinableTables.target_table_info[tableId];
+    const baseTableColumnId = reference.join_path[0][0][0]; // TODO_3855: verify
     const referenceTableColumnId = reference.join_path[0][1][1];
 
-    // TODO_BETA: figure out how to deal with the fact that our `Table` type no
-    // longer has a `columns` field.
-
-    // const baseTableColumn = baseTable.columns.find(
-    //   (column) => column.id === baseTableColumnId,
-    // );
-    const baseTableColumn = undefined;
-
+    const baseTableColumn = columns.find(
+      (column) => column.id === baseTableColumnId,
+    );
     if (!baseTableColumn) {
       return;
     }
-    // const table = 0;
     const columnMapEntries: [ColumnWithLink['id'], ColumnWithLink][] =
       Object.entries(table.columns)
         .filter(([columnId]) => columnId !== String(referenceTableColumnId))
@@ -276,7 +295,12 @@ export function getTablesThatReferenceBaseTable(
               name: column.name,
               type: column.type,
               tableName: table.name,
-              linksTo: getLinkFromColumn(result, columnId, 2, parentPath),
+              linksTo: getLinkFromColumn(
+                joinableTables,
+                columnId,
+                2,
+                parentPath,
+              ),
               jpPath: reference.join_path,
               producesMultipleResults: reference.multiple_results,
             },
@@ -298,9 +322,15 @@ export function getTablesThatReferenceBaseTable(
   return references;
 }
 
-// type T = SimplifyDeep<Pick<QueryColumnMetaData, 'alias'> &
-// ProcessedQueryResultColumnSource &
-// Partial<QueryColumnMetaData>>;
+export function getInputColumns(
+  s: QueryTableStructure,
+): InputColumnsStoreSubstance {
+  return {
+    baseTableColumns: getBaseTableColumnsWithLinks(s),
+    tablesThatReferenceBaseTable: getTablesThatReferenceBaseTable(s),
+    inputColumnInformationMap: getColumnInformationMap(s),
+  };
+}
 
 function processColumn(
   columnInfo: Pick<QueryColumnMetaData, 'alias'> &

From 5c3f441d830f52a7a371ad2341fe9581cf058826 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 24 Sep 2024 08:20:11 -0400
Subject: [PATCH 1004/1141] Update column property to match API changes

---
 mathesar_ui/src/api/rpc/explorations.ts                |  2 +-
 mathesar_ui/src/systems/data-explorer/QueryManager.ts  |  2 +-
 mathesar_ui/src/systems/data-explorer/QueryModel.ts    | 10 +++++-----
 .../data-explorer/input-sidebar/InputSidebar.svelte    |  2 +-
 .../src/systems/data-explorer/urlSerializationUtils.ts |  2 +-
 mathesar_ui/src/systems/data-explorer/utils.ts         |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/explorations.ts b/mathesar_ui/src/api/rpc/explorations.ts
index f1f3f3e0c6..6ea145bcf2 100644
--- a/mathesar_ui/src/api/rpc/explorations.ts
+++ b/mathesar_ui/src/api/rpc/explorations.ts
@@ -7,7 +7,7 @@ import type { FilterId } from '@mathesar/stores/abstract-types/types';
 export interface InitialColumn {
   alias: string;
   /** The PostgreSQL attnum of the column */
-  id: Column['id'];
+  attnum: Column['id'];
   jp_path?: JoinPath;
 }
 
diff --git a/mathesar_ui/src/systems/data-explorer/QueryManager.ts b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
index f7f9b5ae2e..73c990f0bb 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryManager.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
@@ -328,7 +328,7 @@ export default class QueryManager extends QueryRunner {
     const { baseTableColumns } = get(this.inputColumns);
     const firstBaseTableInitialColumn =
       this.getQueryModel().initial_columns.find((initialColumn) =>
-        baseTableColumns.has(initialColumn.id),
+        baseTableColumns.has(initialColumn.attnum),
       );
     if (firstBaseTableInitialColumn) {
       return new QuerySummarizationTransformationModel({
diff --git a/mathesar_ui/src/systems/data-explorer/QueryModel.ts b/mathesar_ui/src/systems/data-explorer/QueryModel.ts
index 5fc0b2440c..5dcec3652a 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryModel.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryModel.ts
@@ -305,7 +305,7 @@ export default class QueryModel {
 
   getInitialColumnsAndTransformsUtilizingThemByColumnIds(columnIds: number[]) {
     const initialColumnsUsingColumnIds = this.initial_columns.filter((entry) =>
-      columnIds.includes(entry.id),
+      columnIds.includes(entry.attnum),
     );
     const initialColumnAliases = initialColumnsUsingColumnIds.map(
       (entry) => entry.alias,
@@ -350,7 +350,7 @@ export default class QueryModel {
 
   withoutColumnsById(columnIds: number[]): QueryModelUpdateDiff {
     const initialColumns = this.initial_columns.filter(
-      (entry) => !columnIds.includes(entry.id),
+      (entry) => !columnIds.includes(entry.attnum),
     );
     let retainedTransformationModels = this.transformationModels;
     const firstSummarizationTransformIndex =
@@ -364,7 +364,7 @@ export default class QueryModel {
       );
     }
     const alaisesForTheIds = this.initial_columns
-      .filter((entry) => columnIds.includes(entry.id))
+      .filter((entry) => columnIds.includes(entry.attnum))
       .map((entry) => entry.alias);
     const transformationModels = retainedTransformationModels.filter(
       (model) =>
@@ -454,8 +454,8 @@ export default class QueryModel {
     };
   }
 
-  getColumnCount(id: InitialColumn['id']): number {
-    return this.initial_columns.filter((entry) => entry.id === id).length;
+  getColumnCount(id: InitialColumn['attnum']): number {
+    return this.initial_columns.filter((entry) => entry.attnum === id).length;
   }
 
   toJson(): UnsavedExploration {
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/InputSidebar.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/InputSidebar.svelte
index 6c8c100e96..bd3194d627 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/InputSidebar.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/InputSidebar.svelte
@@ -62,7 +62,7 @@
     await queryManager.update((q) => {
       const newQuery = q.withInitialColumn({
         alias,
-        id: column.id,
+        attnum: column.id,
         jp_path: column.jpPath,
       });
       if (addNewAutoSummarization) {
diff --git a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
index 2cca570faf..6d1c0151ec 100644
--- a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
+++ b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
@@ -138,7 +138,7 @@ export function constructQueryModelFromHash(
 
   initialColumns = [...groupingColumns, ...aggregatedColumns].map((column) => ({
     alias: column.name,
-    id: column.id,
+    attnum: column.id,
   }));
 
   const groupingExpressions = groupingColumns.map((entry, index) => ({
diff --git a/mathesar_ui/src/systems/data-explorer/utils.ts b/mathesar_ui/src/systems/data-explorer/utils.ts
index ae39e5b6fb..91d058b2b8 100644
--- a/mathesar_ui/src/systems/data-explorer/utils.ts
+++ b/mathesar_ui/src/systems/data-explorer/utils.ts
@@ -440,7 +440,7 @@ export function speculateColumnMetaData({
   if (initialColumnsWithoutMetaData.length > 0) {
     initialColumnsWithoutMetaData.forEach((initialColumn) => {
       const inputColumnInformation = inputColumnInformationMap.get(
-        initialColumn.id,
+        initialColumn.attnum,
       );
       updatedColumnsMetaData = updatedColumnsMetaData.with(
         initialColumn.alias,

From 8aa34d0eb006c9307ce7ac0bbeda1cd856109841 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 24 Sep 2024 19:42:59 +0530
Subject: [PATCH 1005/1141] bugfix get_current_role when only one role exists

---
 db/sql/00_msar.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 4e85cc69c7..aaac47841c 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1199,12 +1199,12 @@ privileges are immediately available to current_role without doing SET ROLE.
 */
 SELECT jsonb_build_object(
   'current_role', msar.get_role(current_role),
-  'parent_roles', array_remove(
+  'parent_roles', COALESCE(array_remove(
     array_agg(
       CASE WHEN pg_has_role(role_data.name, current_role, 'USAGE')
       THEN msar.get_role(role_data.name) END
     ), NULL
-  )
+  ), ARRAY[]::jsonb[])
 )
 FROM msar.role_info_table() AS role_data
 WHERE role_data.name NOT LIKE 'pg_%'

From 2b472b3a723fb0f653a9019346fa0103a6fc3a0c Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 24 Sep 2024 12:32:55 -0400
Subject: [PATCH 1006/1141] Fix join_path property name to conform to new API

---
 mathesar_ui/src/api/rpc/explorations.ts                         | 2 +-
 .../src/systems/data-explorer/input-sidebar/InputSidebar.svelte | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/explorations.ts b/mathesar_ui/src/api/rpc/explorations.ts
index 6ea145bcf2..636cb66515 100644
--- a/mathesar_ui/src/api/rpc/explorations.ts
+++ b/mathesar_ui/src/api/rpc/explorations.ts
@@ -8,7 +8,7 @@ export interface InitialColumn {
   alias: string;
   /** The PostgreSQL attnum of the column */
   attnum: Column['id'];
-  jp_path?: JoinPath;
+  join_path?: JoinPath;
 }
 
 type FilterConditionParams = [
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/InputSidebar.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/InputSidebar.svelte
index bd3194d627..eb5c18ce5b 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/InputSidebar.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/InputSidebar.svelte
@@ -63,7 +63,7 @@
       const newQuery = q.withInitialColumn({
         alias,
         attnum: column.id,
-        jp_path: column.jpPath,
+        join_path: column.jpPath,
       });
       if (addNewAutoSummarization) {
         const autoSummarization =

From 22cb3bf5f66f0ddc7719129d5774536f1a73b92d Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Tue, 24 Sep 2024 23:04:10 +0530
Subject: [PATCH 1007/1141] deserialize transformations before creating DBQuery
 object

---
 mathesar/utils/explorations.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mathesar/utils/explorations.py b/mathesar/utils/explorations.py
index 4b236686e5..222e36a96e 100644
--- a/mathesar/utils/explorations.py
+++ b/mathesar/utils/explorations.py
@@ -2,6 +2,7 @@
 from db.records.operations.select import get_count
 from db.queries.base import DBQuery, InitialColumn, JoinParameter
 from db.tables.operations.select import get_table
+from db.transforms.operations.deserialize import deserialize_transformation
 from mathesar.api.utils import process_annotated_records
 from mathesar.models.base import Explorations, ColumnMetaData, Database
 from mathesar.rpc.columns.metadata import ColumnMetaDataRecord
@@ -78,11 +79,15 @@ def run_exploration(exploration_def, conn, limit=100, offset=0):
                 jp_path=join_path if jp_path else None
             )
         )
+    transformations = tuple(
+        deserialize_transformation(i)
+        for i in exploration_def.get("transformations", [])
+    )
     db_query = DBQuery(
         base_table_oid=base_table_oid,
         initial_columns=processed_initial_columns,
         engine=engine,
-        transformations=exploration_def.get("transformations", []),
+        transformations=transformations,
         name=None,
         metadata=metadata
     )

From 6b3215d021ebc1507680516d016780835b39a631 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 24 Sep 2024 15:13:52 -0400
Subject: [PATCH 1008/1141] Get reverse links to show up in data explorer

---
 .../src/systems/data-explorer/utils.ts        | 41 +++++++++----------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/mathesar_ui/src/systems/data-explorer/utils.ts b/mathesar_ui/src/systems/data-explorer/utils.ts
index 91d058b2b8..fdc379326f 100644
--- a/mathesar_ui/src/systems/data-explorer/utils.ts
+++ b/mathesar_ui/src/systems/data-explorer/utils.ts
@@ -263,61 +263,60 @@ function getBaseTableColumnsWithLinks({
 
 function getTablesThatReferenceBaseTable({
   joinableTables,
+  baseTable,
   columns,
 }: QueryTableStructure): ReferencedByTable[] {
-  const referenceLinks = joinableTables.joinable_tables.filter(
+  const links = joinableTables.joinable_tables.filter(
     (entry) => entry.depth === 1 && entry.fkey_path[0][1] === true,
   );
   const references: ReferencedByTable[] = [];
 
-  referenceLinks.forEach((reference) => {
-    const tableId = reference.target;
-    const table = joinableTables.target_table_info[tableId];
-    const baseTableColumnId = reference.join_path[0][0][0]; // TODO_3855: verify
-    const referenceTableColumnId = reference.join_path[0][1][1];
+  for (const link of links) {
+    const baseTableColumnId = link.join_path[0][0][1];
+    const referenceTableColumnId = link.join_path[0][1][1];
 
-    const baseTableColumn = columns.find(
-      (column) => column.id === baseTableColumnId,
-    );
-    if (!baseTableColumn) {
-      return;
-    }
+    const baseTableColumn = columns.find((c) => c.id === baseTableColumnId);
+    if (!baseTableColumn) continue;
+    const targetTableId = link.target;
+    const targetTable = joinableTables.target_table_info[targetTableId];
+    const targetTableColumn = targetTable.columns[referenceTableColumnId];
     const columnMapEntries: [ColumnWithLink['id'], ColumnWithLink][] =
-      Object.entries(table.columns)
+      Object.entries(targetTable.columns)
         .filter(([columnId]) => columnId !== String(referenceTableColumnId))
         .map(([columnIdKey, column]) => {
           const columnId = parseInt(columnIdKey, 10);
-          const parentPath = reference.join_path.join(',');
+          const parentPath = link.join_path.join(',');
           return [
             columnId,
             {
               id: columnId,
               name: column.name,
               type: column.type,
-              tableName: table.name,
+              tableName: baseTable.name,
               linksTo: getLinkFromColumn(
                 joinableTables,
                 columnId,
                 2,
                 parentPath,
               ),
-              jpPath: reference.join_path,
-              producesMultipleResults: reference.multiple_results,
+              jpPath: link.join_path,
+              producesMultipleResults: link.multiple_results,
             },
           ];
         });
 
     references.push({
-      id: tableId,
-      name: table.name,
+      id: targetTableId,
+      name: targetTable.name,
       referencedViaColumn: {
         id: referenceTableColumnId,
-        ...table.columns[referenceTableColumnId],
+        name: targetTableColumn.name,
+        type: targetTableColumn.type,
       },
       linkedToColumn: baseTableColumn,
       columns: new Map(columnMapEntries.sort(compareColumnByLinks)),
     });
-  });
+  }
 
   return references;
 }

From 558accf72d0dd578bec84b89d098ffdf7f5b3e03 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 25 Sep 2024 08:16:19 -0400
Subject: [PATCH 1009/1141] Fix bug sometimes preventing updating table name

---
 mathesar_ui/src/stores/tables.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index 1ef05c01c9..6d834bc03b 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -237,11 +237,14 @@ function updateTableStoreIfPresent({
   });
   const tablesStore = tablesStores.get([schema.database.id, schema.oid]);
   if (tablesStore) {
-    tablesStore.update((tablesData) => {
-      const tables = sortTables([...tablesData.tablesMap.values(), fullTable]);
+    tablesStore.update(({ requestStatus, tablesMap }) => {
+      tablesMap.set(fullTable.oid, fullTable);
+      const newTablesMap = new Map(
+        sortTables(tablesMap.values()).map((t) => [t.oid, t]),
+      );
       return {
-        ...tablesData,
-        tablesMap: new Map(tables.map((t) => [t.oid, t])),
+        requestStatus,
+        tablesMap: newTablesMap,
       };
     });
     schema.setTableCount(get(tablesStore).tablesMap.size);

From 607150419e4b1b6c1d96c353ec93ea9719a2083b Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Wed, 25 Sep 2024 18:18:16 +0530
Subject: [PATCH 1010/1141] Update key in frontend request

---
 mathesar_ui/src/api/rpc/roles.ts | 2 +-
 mathesar_ui/src/models/Role.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/roles.ts b/mathesar_ui/src/api/rpc/roles.ts
index d481a70485..3252d78dbe 100644
--- a/mathesar_ui/src/api/rpc/roles.ts
+++ b/mathesar_ui/src/api/rpc/roles.ts
@@ -47,7 +47,7 @@ export const roles = {
   set_members: rpcMethodTypeContainer<
     {
       database_id: RawDatabase['id'];
-      role_oid: RawRole['oid'];
+      parent_role_oid: RawRole['oid'];
       members: RawRole['oid'][];
     },
     RawRole
diff --git a/mathesar_ui/src/models/Role.ts b/mathesar_ui/src/models/Role.ts
index 80397c58a3..3ec5dad652 100644
--- a/mathesar_ui/src/models/Role.ts
+++ b/mathesar_ui/src/models/Role.ts
@@ -85,7 +85,7 @@ export class Role {
     const promise = api.roles
       .set_members({
         database_id: this.database.id,
-        role_oid: this.oid,
+        parent_role_oid: this.oid,
         members: [...memberOids],
       })
       .run();

From 7f41f7edd4e7c5a25f1c8b5e210e964652903be0 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 26 Sep 2024 00:18:32 +0530
Subject: [PATCH 1011/1141] grant appropriate permissions for msar, __msar and
 mathesar_types to public

---
 db/install.py       |  4 ++--
 db/sql/00_msar.sql  | 37 +++++++++++++++++++++++++++++++++++++
 db/types/install.py |  5 +++--
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/db/install.py b/db/install.py
index fbeede2466..878fe18557 100644
--- a/db/install.py
+++ b/db/install.py
@@ -28,8 +28,8 @@ def install_mathesar(
             "Installing Mathesar on preexisting PostgreSQL database"
             f" {database_name} at host {hostname}..."
         )
-        sql_install.install(user_db_engine)
         types_install.install_mathesar_on_database(user_db_engine)
+        sql_install.install(user_db_engine)
         user_db_engine.dispose()
     except OperationalError as e:
         if create_db:
@@ -49,8 +49,8 @@ def install_mathesar(
                 "Installing Mathesar on PostgreSQL database"
                 f" {database_name} at host {hostname}..."
             )
-            sql_install.install(user_db_engine)
             types_install.install_mathesar_on_database(user_db_engine)
+            sql_install.install(user_db_engine)
             user_db_engine.dispose()
         else:
             print(f"Skipping installing on DB with key {database_name}.")
diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 21cf2304b8..f17c96f62d 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -5146,3 +5146,40 @@ BEGIN
   );
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+----------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------------------------------------
+-- FUNCTIONS/COMMANDS RELATED TO GRANTING APPROPRIATE PERMISSIONS FOR msar, __msar AND mathesar_types
+-- SCHEMAS TO PUBLIC. 
+--
+-- !!! DO NOT ADD ANY FUNCTIONS PAST THIS POINT !!!
+----------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------------------------------------
+
+CREATE OR REPLACE FUNCTION
+msar.grant_usage_on_custom_mathesar_types_to_public() RETURNS void AS $$
+BEGIN
+  EXECUTE string_agg(
+    format(
+      'GRANT USAGE ON TYPE %1$I.%2$I TO PUBLIC',
+      pgn.nspname,
+      pgt.typname
+    ),
+    E';\n'
+  ) || E';\n'
+  FROM pg_catalog.pg_type AS pgt
+  JOIN pg_catalog.pg_namespace pgn ON pgn.oid = pgt.typnamespace
+  WHERE (pgn.nspname = 'msar'
+  OR pgn.nspname = '__msar'
+  OR pgn.nspname = 'mathesar_types')
+  AND (pgt.typtype = 'c' OR pgt.typtype = 'd')
+  AND pgt.typcategory != 'A';
+END;
+$$ LANGUAGE plpgsql;
+
+
+GRANT USAGE ON SCHEMA __msar, msar, mathesar_types TO PUBLIC;
+GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA msar, __msar, mathesar_types TO PUBLIC;
+GRANT SELECT ON ALL TABLES IN SCHEMA msar, __msar, mathesar_types TO PUBLIC;
+SELECT msar.grant_usage_on_custom_mathesar_types_to_public();
diff --git a/db/types/install.py b/db/types/install.py
index 7c1dfd92d6..d9cc96f357 100644
--- a/db/types/install.py
+++ b/db/types/install.py
@@ -1,12 +1,13 @@
 from db.types.custom import email, money, multicurrency, uri, json_array, json_object
 from db.constants import TYPES_SCHEMA
-from db.schemas.operations.create import create_schema_if_not_exists_via_sql_alchemy
 from db.types.operations.cast import install_all_casts
 import psycopg
 
 
 def create_type_schema(engine) -> None:
-    create_schema_if_not_exists_via_sql_alchemy(TYPES_SCHEMA, engine)
+    conn_str = str(engine.url)
+    with psycopg.connect(conn_str) as conn:
+        conn.execute(f"CREATE SCHEMA IF NOT EXISTS {TYPES_SCHEMA}")
 
 
 def install_mathesar_on_database(engine):

From f180944f5cf763a45091ea01033d02366f0e30cd Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 26 Sep 2024 08:57:49 +0200
Subject: [PATCH 1012/1141] translate outcome box title

---
 mathesar_ui/src/components/message-boxes/OutcomeBox.svelte | 5 ++---
 mathesar_ui/src/i18n/languages/en/dict.json                | 5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte b/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte
index fdfea4ae6d..697379fbf1 100644
--- a/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte
+++ b/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte
@@ -1,14 +1,13 @@
 <script lang="ts">
   import type { ComponentProps } from 'svelte';
-
   import { iconOutcome } from '@mathesar/icons';
-
   import MessageBox from './MessageBox.svelte';
+  import { _ } from 'svelte-i18n';
 
   type $$Props = ComponentProps<MessageBox>;
 
   export let fullWidth = true;
-  export let title = "What's Changing";
+  export let title = $_('whats_changing');
 </script>
 
 <div class="outcome-box">
diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 29181e115f..0504d603c2 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -684,5 +684,6 @@
   "write": "Write",
   "yes": "Yes",
   "yes_summarize_as_list": "Yes, summarize as a list",
-  "yesterday": "Yesterday"
-}
+  "yesterday": "Yesterday",
+  "whats_changing": "What's Changing"
+}
\ No newline at end of file

From 80e4cc51ce6caef3238f65b7713a993531868af6 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 26 Sep 2024 09:11:21 +0200
Subject: [PATCH 1013/1141] remove min width

---
 mathesar_ui/src/component-library/window/Window.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mathesar_ui/src/component-library/window/Window.scss b/mathesar_ui/src/component-library/window/Window.scss
index f5a0a506b6..0371af9809 100644
--- a/mathesar_ui/src/component-library/window/Window.scss
+++ b/mathesar_ui/src/component-library/window/Window.scss
@@ -3,7 +3,6 @@
   border-radius: 0.4em;
   min-height: var(--window-min-height, 7em);
   width: var(--window-width, 100%);
-  min-width: var(--window-min-width, 40em);
   overflow: hidden;
   display: grid;
   grid-template: auto 1fr auto / auto;

From f266ee309694ea88bc69b7466fcb9ad636e711c0 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 26 Sep 2024 15:32:10 +0530
Subject: [PATCH 1014/1141] fix conftest

---
 conftest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conftest.py b/conftest.py
index 05cd0978ba..f0b9d52a45 100644
--- a/conftest.py
+++ b/conftest.py
@@ -74,8 +74,8 @@ def __create_db(db_name):
         create_database(engine.url)
         created_dbs.add(db_name)
         # Our default testing database has our types and functions preinstalled.
-        sql_install.install(engine)
         install.install_mathesar_on_database(engine)
+        sql_install.install(engine)
         engine.dispose()
         return db_name
     yield __create_db

From 26680337e9f943a985bf95b03a7f2c97b586ab10 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 26 Sep 2024 12:28:59 +0200
Subject: [PATCH 1015/1141] format fix

---
 mathesar_ui/src/i18n/languages/en/dict.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 0504d603c2..49faeebfb6 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -677,6 +677,7 @@
   "what_is_a_table": "Tables store your data. It's good to have one table per entity. An entity is a thing you wish to keep data about. For example, in your personal financial schema, you may have a table for your bank accounts and another for your transactions. You can have as many tables as you wish.",
   "what_is_an_exploration": "Explorations let you query your data to uncover trends and insights. They may be stored and run anytime to see the latest data. Explorations make great reports. You might, for example, create an exploration that shows your monthly spending.",
   "what_is_an_exploration_mini": "Explorations let you query your data to uncover trends and insights.",
+  "whats_changing": "What's Changing",
   "where": "where",
   "while_upgrading": "While Upgrading",
   "why_is_this_needed": "Why is this needed?",
@@ -684,6 +685,5 @@
   "write": "Write",
   "yes": "Yes",
   "yes_summarize_as_list": "Yes, summarize as a list",
-  "yesterday": "Yesterday",
-  "whats_changing": "What's Changing"
-}
\ No newline at end of file
+  "yesterday": "Yesterday"
+}

From f039915d1e27a24682dcc31e9af6e22337ddd4e1 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 26 Sep 2024 12:29:07 +0200
Subject: [PATCH 1016/1141] remove global styles

---
 .../src/component-library/button/Button.scss  | 14 ++++++++++++
 .../src/component-library/commonTypes.ts      |  3 ++-
 .../table-inspector/TableInspector.svelte     | 22 ++-----------------
 .../table-inspector/column/ColumnMode.svelte  | 12 +++++-----
 .../table-inspector/record/RecordMode.svelte  |  2 +-
 .../table-inspector/table/TableMode.svelte    | 16 +++++++++-----
 6 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/mathesar_ui/src/component-library/button/Button.scss b/mathesar_ui/src/component-library/button/Button.scss
index 7956465979..cf44410b79 100644
--- a/mathesar_ui/src/component-library/button/Button.scss
+++ b/mathesar_ui/src/component-library/button/Button.scss
@@ -224,6 +224,20 @@
       border: 1px solid var(--purple-300);
     }
   }
+
+  &.btn-inspector {
+    background-color: var(--sand-200);
+    transition: all 0.2s ease;
+    border: 2px solid transparent;
+
+    &:hover {
+      background-color: var(--sand-300);
+    }
+
+    &:active {
+      background-color: var(--sand-400);
+    }
+  }
 }
 a.btn {
   text-decoration: none;
diff --git a/mathesar_ui/src/component-library/commonTypes.ts b/mathesar_ui/src/component-library/commonTypes.ts
index 094b0e8376..172d23a991 100644
--- a/mathesar_ui/src/component-library/commonTypes.ts
+++ b/mathesar_ui/src/component-library/commonTypes.ts
@@ -7,7 +7,8 @@ export type Appearance =
   | 'plain-primary'
   | 'action'
   | 'outcome'
-  | 'outline-primary';
+  | 'outline-primary'
+  | 'inspector';
 
 export type Size = 'small' | 'medium' | 'large';
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte b/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
index a82a1c2bef..3cdfa82c6c 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/TableInspector.svelte
@@ -55,26 +55,8 @@
     background-color: var(--sand-100);
     isolation: isolate;
 
-    :global(.tabs-container) {
-      padding: 3px;
-    }
-
-    :global(.collapsible > .collapsible-header > button.btn) {
-      background-color: var(--sand-200);
-      transition: all 0.2s ease;
-      border-radius: 4px;
-      margin: 3px 0;
-      font-weight: var(--font-weight-medium);
-      outline: none;
-      border: 2px solid transparent;
-
-      &:hover {
-        background-color: var(--sand-300);
-      }
-
-      &:active {
-        background-color: var(--sand-400);
-      }
+    .tabs-container {
+      padding: var(--size-super-ultra-small);
     }
   }
 </style>
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
index 0a3e765713..f95e20234a 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/column/ColumnMode.svelte
@@ -59,7 +59,7 @@
     {/if}
     {#if column}
       {#key column}
-        <Collapsible isOpen triggerAppearance="plain">
+        <Collapsible isOpen triggerAppearance="inspector">
           <CollapsibleHeader
             slot="header"
             title={$_('properties')}
@@ -90,7 +90,7 @@
     {/if}
 
     {#if column}
-      <Collapsible isOpen triggerAppearance="plain">
+      <Collapsible isOpen triggerAppearance="inspector">
         <CollapsibleHeader
           slot="header"
           title={$_('data_type')}
@@ -103,7 +103,7 @@
     {/if}
 
     {#if column && !column.column.default?.is_dynamic}
-      <Collapsible isOpen triggerAppearance="plain">
+      <Collapsible isOpen triggerAppearance="inspector">
         <CollapsibleHeader
           slot="header"
           title={$_('default_value')}
@@ -116,7 +116,7 @@
     {/if}
 
     {#if column}
-      <Collapsible isOpen triggerAppearance="plain">
+      <Collapsible isOpen triggerAppearance="inspector">
         <CollapsibleHeader slot="header" title={$_('formatting')} />
         <div slot="content" class="content-container">
           {#key column}
@@ -134,7 +134,7 @@
           ? undefined
           : $currentTablesData.tablesMap.get(referentTableId)}
       {#if referentTable !== undefined}
-        <Collapsible triggerAppearance="plain">
+        <Collapsible triggerAppearance="inspector">
           <CollapsibleHeader
             slot="header"
             title={$_('linked_record_summary')}
@@ -146,7 +146,7 @@
       {/if}
     {/if} -->
 
-    <Collapsible isOpen triggerAppearance="plain">
+    <Collapsible isOpen triggerAppearance="inspector">
       <CollapsibleHeader slot="header" title={$_('actions')} />
       <div slot="content" class="content-container">
         <ColumnActions columns={selectedColumns} />
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
index 7dc5944026..645c1a6951 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/record/RecordMode.svelte
@@ -24,7 +24,7 @@
         })}
       </span>
     {/if}
-    <Collapsible isOpen triggerAppearance="plain">
+    <Collapsible isOpen triggerAppearance="inspector">
       <CollapsibleHeader slot="header" title={$_('actions')} />
       <div slot="content" class="content-container">
         <RowActions
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
index 3226c8ee01..dba1e991d5 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
@@ -19,7 +19,7 @@
 </script>
 
 <div class="table-mode-container">
-  <Collapsible isOpen triggerAppearance="plain">
+  <Collapsible isOpen triggerAppearance="inspector">
     <CollapsibleHeader
       slot="header"
       title={$_('properties')}
@@ -31,14 +31,14 @@
     </div>
   </Collapsible>
 
-  <Collapsible isOpen triggerAppearance="plain">
+  <Collapsible isOpen triggerAppearance="inspector">
     <CollapsibleHeader slot="header" title={$_('table_permissions')} />
     <div slot="content" class="content-container">
       <TablePermissions />
     </div>
   </Collapsible>
 
-  <Collapsible isOpen triggerAppearance="plain">
+  <Collapsible isOpen triggerAppearance="inspector">
     <CollapsibleHeader
       slot="header"
       title={$_('links')}
@@ -57,14 +57,14 @@
     </div>
   </Collapsible> -->
 
-  <Collapsible isOpen triggerAppearance="plain">
+  <Collapsible isOpen triggerAppearance="inspector">
     <CollapsibleHeader slot="header" title={$_('actions')} />
     <div slot="content" class="content-container">
       <TableActions />
     </div>
   </Collapsible>
 
-  <Collapsible triggerAppearance="plain">
+  <Collapsible triggerAppearance="inspector">
     <CollapsibleHeader slot="header" title={$_('advanced')} />
     <div slot="content" class="content-container">
       <AdvancedActions />
@@ -75,6 +75,12 @@
 <style lang="scss">
   .table-mode-container {
     padding-bottom: var(--size-small);
+
+    :global {
+      > * + * {
+        margin-top: var(--size-super-ultra-small);
+      }
+    }
   }
 
   .content-container {

From 9d4bf9c41f2fd9315dde5a45d1c3b0238c12679a Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 26 Sep 2024 13:25:15 +0200
Subject: [PATCH 1017/1141] remove global styles

---
 .../link-table/LinkTableForm.svelte           | 185 ++++++++++--------
 .../table-view/link-table/NewColumn.svelte    |  29 ++-
 2 files changed, 119 insertions(+), 95 deletions(-)

diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index 283d4da2ef..7f107efb1d 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -264,40 +264,88 @@
 
     <FieldLayout>
       <OutcomeBox>
-        {#if $linkType === 'oneToMany'}
-          <NewColumn
-            base={target}
-            target={base}
-            field={columnNameInTarget}
-            {targetColumnsAreLoading}
-          />
-        {:else if $linkType === 'manyToOne'}
-          <NewColumn {base} {target} field={columnNameInBase} />
-        {:else if $linkType === 'manyToMany'}
-          {#if isSelfReferential}
-            <Collapsible
-              bind:isOpen={isNewTableOpen}
-              triggerAppearance="outcome"
-            >
-              <svelte:fragment slot="header">
-                <RichText text={$_('we_will_create_a_new_table')} let:slotName>
-                  {#if slotName === 'mappingTable'}
-                    <Pill table={{ name: $mappingTableName }} which="mapping" />
-                  {/if}
-                </RichText>
-              </svelte:fragment>
-              <svelte:fragment slot="content">
-                <Field field={mappingTableName} label={$_('table_name')} />
-              </svelte:fragment>
-            </Collapsible>
-            {#if $mappingTableName}
+        <div class="collapsible-sections">
+          {#if $linkType === 'oneToMany'}
+            <NewColumn
+              base={target}
+              target={base}
+              field={columnNameInTarget}
+              {targetColumnsAreLoading}
+            />
+          {:else if $linkType === 'manyToOne'}
+            <NewColumn {base} {target} field={columnNameInBase} />
+          {:else if $linkType === 'manyToMany'}
+            {#if isSelfReferential}
               <Collapsible
-                bind:isOpen={isNewColumnsOpen}
+                bind:isOpen={isNewTableOpen}
                 triggerAppearance="outcome"
               >
                 <svelte:fragment slot="header">
                   <RichText
-                    text={$_('we_will_add_two_columns_in_x_to_y')}
+                    text={$_('we_will_create_a_new_table')}
+                    let:slotName
+                  >
+                    {#if slotName === 'mappingTable'}
+                      <Pill
+                        table={{ name: $mappingTableName }}
+                        which="mapping"
+                      />
+                    {/if}
+                  </RichText>
+                </svelte:fragment>
+                <svelte:fragment slot="content">
+                  <div class="collapsible-detail">
+                    <Field field={mappingTableName} label={$_('table_name')} />
+                  </div>
+                </svelte:fragment>
+              </Collapsible>
+              {#if $mappingTableName}
+                <Collapsible
+                  bind:isOpen={isNewColumnsOpen}
+                  triggerAppearance="outcome"
+                >
+                  <svelte:fragment slot="header">
+                    <RichText
+                      text={$_('we_will_add_two_columns_in_x_to_y')}
+                      let:slotName
+                    >
+                      {#if slotName === 'mappingTable'}
+                        <Pill
+                          table={{ name: $mappingTableName }}
+                          which="mapping"
+                        />
+                      {:else if slotName === 'targetTable'}
+                        <Pill table={target} which="target" />
+                      {/if}
+                    </RichText>
+                  </svelte:fragment>
+
+                  <svelte:fragment slot="content">
+                    <div class="collapsible-detail">
+                      <Field
+                        field={columnNameMappingToBase}
+                        label={$_('column_number_name', {
+                          values: { number: 1 },
+                        })}
+                      />
+                      <Field
+                        field={columnNameMappingToTarget}
+                        label={$_('column_number_name', {
+                          values: { number: 2 },
+                        })}
+                      />
+                    </div>
+                  </svelte:fragment>
+                </Collapsible>
+              {/if}
+            {:else}
+              <Collapsible
+                bind:isOpen={isNewTableOpen}
+                triggerAppearance="outcome"
+              >
+                <svelte:fragment slot="header">
+                  <RichText
+                    text={$_('we_will_create_a_new_table')}
                     let:slotName
                   >
                     {#if slotName === 'mappingTable'}
@@ -305,60 +353,36 @@
                         table={{ name: $mappingTableName }}
                         which="mapping"
                       />
-                    {:else if slotName === 'targetTable'}
-                      <Pill table={target} which="target" />
                     {/if}
                   </RichText>
                 </svelte:fragment>
 
                 <svelte:fragment slot="content">
-                  <Field
-                    field={columnNameMappingToBase}
-                    label={$_('column_number_name', { values: { number: 1 } })}
-                  />
-                  <Field
-                    field={columnNameMappingToTarget}
-                    label={$_('column_number_name', { values: { number: 2 } })}
-                  />
+                  <div class="collapsible-detail">
+                    <Field field={mappingTableName} label={$_('table_name')} />
+                  </div>
                 </svelte:fragment>
               </Collapsible>
+              {#if $mappingTableName}
+                <NewColumn
+                  base={{ name: $mappingTableName }}
+                  baseWhich="mapping"
+                  target={base}
+                  targetWhich="base"
+                  field={columnNameMappingToBase}
+                />
+                <NewColumn
+                  base={{ name: $mappingTableName }}
+                  baseWhich="mapping"
+                  {target}
+                  field={columnNameMappingToTarget}
+                />
+              {/if}
             {/if}
           {:else}
-            <Collapsible
-              bind:isOpen={isNewTableOpen}
-              triggerAppearance="outcome"
-            >
-              <svelte:fragment slot="header">
-                <RichText text={$_('we_will_create_a_new_table')} let:slotName>
-                  {#if slotName === 'mappingTable'}
-                    <Pill table={{ name: $mappingTableName }} which="mapping" />
-                  {/if}
-                </RichText>
-              </svelte:fragment>
-
-              <svelte:fragment slot="content">
-                <Field field={mappingTableName} label={$_('table_name')} />
-              </svelte:fragment>
-            </Collapsible>
-            {#if $mappingTableName}
-              <NewColumn
-                base={{ name: $mappingTableName }}
-                baseWhich="mapping"
-                target={base}
-                targetWhich="base"
-                field={columnNameMappingToBase}
-              />
-              <NewColumn
-                base={{ name: $mappingTableName }}
-                baseWhich="mapping"
-                {target}
-                field={columnNameMappingToTarget}
-              />
-            {/if}
+            {assertExhaustive($linkType)}
           {/if}
-        {:else}
-          {assertExhaustive($linkType)}
-        {/if}
+        </div>
       </OutcomeBox>
     </FieldLayout>
   {/if}
@@ -392,20 +416,11 @@
   .description {
     margin-bottom: 1rem;
   }
-  :global(
-      .form
-        .collapsible
-        .collapsible-header
-        .collapsible-header-btn
-        .collapsible-header-title
-    ) {
-    font-weight: var(--font-weight-medium);
-  }
-  :global(.form .collapsible-content) {
+  .collapsible-detail {
     padding: var(--size-xx-small);
     margin-top: 0.25em;
   }
-  :global(.form .collapsible:not(:last-child)) {
-    margin-bottom: var(--size-xx-small);
+  .collapsible-sections > :global(* + *) {
+    margin-top: var(--size-xx-small);
   }
 </style>
diff --git a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
index 2b5a24a33d..50d82f5fa1 100644
--- a/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/NewColumn.svelte
@@ -36,15 +36,24 @@
   </svelte:fragment>
 
   <svelte:fragment slot="content">
-    {#if targetColumnsAreLoading}
-      <!--
-        We need to wait for the columns to load because we can't suggest a valid
-        column name until we know the existing columns in the table.
-      -->
-      {label}
-      <Spinner />
-    {:else}
-      <Field {field} {label} />
-    {/if}
+    <div class="collapsible-detail">
+      {#if targetColumnsAreLoading}
+        <!--
+          We need to wait for the columns to load because we can't suggest a valid
+          column name until we know the existing columns in the table.
+        -->
+        {label}
+        <Spinner />
+      {:else}
+        <Field {field} {label} />
+      {/if}
+    </div>
   </svelte:fragment>
 </Collapsible>
+
+<style>
+  .collapsible-detail {
+    padding: var(--size-xx-small);
+    margin-top: 0.25em;
+  }
+</style>

From a418d98b051416d05a6c4a1cfa32da4eca75be33 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 26 Sep 2024 13:41:47 +0200
Subject: [PATCH 1018/1141] fix error

---
 mathesar_ui/src/components/message-boxes/OutcomeBox.svelte | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte b/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte
index 697379fbf1..f0ae064017 100644
--- a/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte
+++ b/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte
@@ -1,8 +1,10 @@
 <script lang="ts">
   import type { ComponentProps } from 'svelte';
+
+  import { _ } from 'svelte-i18n';
+
   import { iconOutcome } from '@mathesar/icons';
   import MessageBox from './MessageBox.svelte';
-  import { _ } from 'svelte-i18n';
 
   type $$Props = ComponentProps<MessageBox>;
 

From 9a83078dff66b544297ebc5b5dd1d5d47591e3cc Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 26 Sep 2024 13:48:58 +0200
Subject: [PATCH 1019/1141] fix selector

---
 .../table-view/table-inspector/table/TableMode.svelte       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
index dba1e991d5..3427453d3e 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
@@ -76,10 +76,8 @@
   .table-mode-container {
     padding-bottom: var(--size-small);
 
-    :global {
-      > * + * {
-        margin-top: var(--size-super-ultra-small);
-      }
+    > :global(* + *) {
+      margin-top: var(--size-super-ultra-small);
     }
   }
 

From ac446b2a250ccd922af72fb986149f19c15bf674 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 26 Sep 2024 13:54:34 +0200
Subject: [PATCH 1020/1141] remove empty line

---
 mathesar_ui/src/components/message-boxes/OutcomeBox.svelte | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte b/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte
index f0ae064017..fdc95c7dcd 100644
--- a/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte
+++ b/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte
@@ -1,8 +1,6 @@
 <script lang="ts">
   import type { ComponentProps } from 'svelte';
-
   import { _ } from 'svelte-i18n';
-
   import { iconOutcome } from '@mathesar/icons';
   import MessageBox from './MessageBox.svelte';
 

From 341237b4c99163df04b49f5884fe19db398a8d7f Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 26 Sep 2024 17:35:28 +0530
Subject: [PATCH 1021/1141] bugfix summarizations

---
 mathesar/utils/explorations.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mathesar/utils/explorations.py b/mathesar/utils/explorations.py
index 222e36a96e..a8bad7cec5 100644
--- a/mathesar/utils/explorations.py
+++ b/mathesar/utils/explorations.py
@@ -1,6 +1,7 @@
 from db.engine import create_future_engine_with_custom_types
 from db.records.operations.select import get_count
 from db.queries.base import DBQuery, InitialColumn, JoinParameter
+from db.queries.operations.process import get_transforms_with_summarizes_speced
 from db.tables.operations.select import get_table
 from db.transforms.operations.deserialize import deserialize_transformation
 from mathesar.api.utils import process_annotated_records
@@ -91,6 +92,8 @@ def run_exploration(exploration_def, conn, limit=100, offset=0):
         name=None,
         metadata=metadata
     )
+    transformations = get_transforms_with_summarizes_speced(db_query, engine, metadata)
+    db_query.transformations = transformations
     records = db_query.get_records(
         limit=limit,
         offset=offset

From fb91ac7889577517416d4021dc102369b2cb0ea8 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 26 Sep 2024 14:20:17 +0200
Subject: [PATCH 1022/1141] add spaces

---
 mathesar_ui/src/components/message-boxes/OutcomeBox.svelte | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte b/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte
index fdc95c7dcd..c559c63885 100644
--- a/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte
+++ b/mathesar_ui/src/components/message-boxes/OutcomeBox.svelte
@@ -1,7 +1,9 @@
 <script lang="ts">
   import type { ComponentProps } from 'svelte';
   import { _ } from 'svelte-i18n';
+
   import { iconOutcome } from '@mathesar/icons';
+
   import MessageBox from './MessageBox.svelte';
 
   type $$Props = ComponentProps<MessageBox>;

From 4f700cbef53d5456fc4695247decb117fc40b4ff Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 26 Sep 2024 18:25:28 +0530
Subject: [PATCH 1023/1141] fix record insert for tables with just an id column

---
 db/sql/00_msar.sql | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 21cf2304b8..070705b5c5 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -5035,15 +5035,25 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 CREATE OR REPLACE FUNCTION
 msar.build_single_insert_expr(tab_id oid, rec_def jsonb) RETURNS TEXT AS $$
-SELECT
+SELECT CASE WHEN NULLIF(rec_def, '{}'::jsonb) IS NOT NULL THEN
+  (
+    SELECT
+      format(
+        'INSERT INTO %I.%I (%s) VALUES (%s)',
+        msar.get_relation_schema_name(tab_id),
+        msar.get_relation_name(tab_id),
+        string_agg(format('%I', msar.get_column_name(tab_id, key::smallint)), ', '),
+        string_agg(format('%L', value), ', ')
+      )
+    FROM jsonb_each_text(rec_def)
+  )
+ELSE
   format(
-    'INSERT INTO %I.%I (%s) VALUES (%s)',
+    'INSERT INTO %I.%I DEFAULT VALUES',
     msar.get_relation_schema_name(tab_id),
-    msar.get_relation_name(tab_id),
-    string_agg(format('%I', msar.get_column_name(tab_id, key::smallint)), ', '),
-    string_agg(format('%L', value), ', ')
+    msar.get_relation_name(tab_id)
   )
-FROM jsonb_each_text(rec_def);
+END;
 $$ LANGUAGE SQL STABLE RETURNS NULL ON NULL INPUT;
 
 

From 6785b6922956fb9a6e642bb16cf1564c50b1f23f Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 26 Sep 2024 18:34:38 +0530
Subject: [PATCH 1024/1141] add tests

---
 db/sql/test_00_msar.sql | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index c49ae6c519..14e4e9bef7 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -4293,6 +4293,47 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+CREATE OR REPLACE FUNCTION __setup_add_records_table_only_pk() RETURNS SETOF TEXT AS $$
+BEGIN
+  CREATE TABLE atable (
+    id integer PRIMARY KEY GENERATED ALWAYS AS IDENTITY
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_add_record_to_table_only_pk() RETURNS SETOF TEXT AS $$
+DECLARE
+  rel_id oid;
+BEGIN
+  PERFORM __setup_add_records_table_only_pk();
+  rel_id := 'atable'::regclass::oid;
+  RETURN NEXT is(
+    msar.add_record_to_table(
+      rel_id,
+      '{}'::jsonb
+    ),
+    $a${
+      "results": [{"1": 1}],
+      "linked_record_summaries": null,
+      "record_summaries": null
+    }$a$
+  );
+  RETURN NEXT is(
+    msar.add_record_to_table(
+      rel_id,
+      '{}'::jsonb
+    ),
+    $a${
+      "results": [{"1": 2}],
+      "linked_record_summaries": null,
+      "record_summaries": null
+    }$a$
+  );
+END;
+$$ LANGUAGE plpgsql;
+
+
 CREATE OR REPLACE FUNCTION __setup_preview_fkey_cols() RETURNS SETOF TEXT AS $$
 BEGIN
 CREATE TABLE "Counselors" (

From f3a64c169a56027194cd3fc7389738a11d9221de Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 27 Sep 2024 00:10:39 +0530
Subject: [PATCH 1025/1141] add schema_oid to Explorations model

---
 .../0017_explorations_schema_oid.py           | 18 ++++++++++++++++++
 mathesar/models/base.py                       |  1 +
 mathesar/rpc/explorations.py                  | 19 +++++++++++++++++++
 mathesar/tests/rpc/test_explorations.py       |  4 ++++
 mathesar/utils/explorations.py                |  2 ++
 5 files changed, 44 insertions(+)
 create mode 100644 mathesar/migrations/0017_explorations_schema_oid.py

diff --git a/mathesar/migrations/0017_explorations_schema_oid.py b/mathesar/migrations/0017_explorations_schema_oid.py
new file mode 100644
index 0000000000..9e55c7b19d
--- /dev/null
+++ b/mathesar/migrations/0017_explorations_schema_oid.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.11 on 2024-09-26 18:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mathesar', '0016_alter_explorations_display_names'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='explorations',
+            name='schema_oid',
+            field=models.PositiveBigIntegerField(),
+        ),
+    ]
diff --git a/mathesar/models/base.py b/mathesar/models/base.py
index 59759d1324..83b01e331b 100644
--- a/mathesar/models/base.py
+++ b/mathesar/models/base.py
@@ -151,6 +151,7 @@ class Explorations(BaseModel):
     database = models.ForeignKey('Database', on_delete=models.CASCADE)
     name = models.CharField(max_length=128, unique=True)
     base_table_oid = models.PositiveBigIntegerField()
+    schema_oid = models.PositiveBigIntegerField()
     initial_columns = models.JSONField()
     transformations = models.JSONField(null=True)
     display_options = models.JSONField(null=True)
diff --git a/mathesar/rpc/explorations.py b/mathesar/rpc/explorations.py
index a01bf1d0b8..5c13cf2a11 100644
--- a/mathesar/rpc/explorations.py
+++ b/mathesar/rpc/explorations.py
@@ -29,6 +29,7 @@ class ExplorationInfo(TypedDict):
         database_id: The Django id of the database containing the exploration.
         name: The name of the exploration.
         base_table_oid: The OID of the base table of the exploration on the database.
+        schema_oid: The OID of the schema containing the base table of the exploration.
         initial_columns: A list describing the columns to be included in the exploration.
         transformations: A list describing the transformations to be made on the included columns.
         display_options: A list describing metadata for the columns in the explorations.
@@ -39,6 +40,7 @@ class ExplorationInfo(TypedDict):
     database_id: int
     name: str
     base_table_oid: int
+    schema_oid: int
     initial_columns: list
     transformations: Optional[list]
     display_options: Optional[list]
@@ -52,6 +54,7 @@ def from_model(cls, model):
             database_id=model.database.id,
             name=model.name,
             base_table_oid=model.base_table_oid,
+            schema_oid=model.schema_oid,
             initial_columns=model.initial_columns,
             transformations=model.transformations,
             display_options=model.display_options,
@@ -68,6 +71,7 @@ class ExplorationDef(TypedDict):
         database_id: The Django id of the database containing the exploration.
         name: The name of the exploration.
         base_table_oid: The OID of the base table of the exploration on the database.
+        schema_oid: The OID of the schema containing the base table of the exploration.
         initial_columns: A list describing the columns to be included in the exploration.
         transformations: A list describing the transformations to be made on the included columns.
         display_options: A list describing metadata for the columns in the explorations.
@@ -77,6 +81,7 @@ class ExplorationDef(TypedDict):
     database_id: int
     name: str
     base_table_oid: int
+    schema_oid: int
     initial_columns: list
     transformations: Optional[list]
     display_options: Optional[list]
@@ -183,6 +188,11 @@ def run(*, exploration_def: ExplorationDef, limit: int = 100, offset: int = 0, *
 
     Args:
         exploration_def: A dict describing an exploration to run.
+        limit: The max number of rows to return.(default 100)
+        offset: The number of rows to skip.(default 0)
+
+    Returns:
+        The result of the exploration run.
     """
     user = kwargs.get(REQUEST_KEY).user
     with connect(exploration_def['database_id'], user) as conn:
@@ -201,6 +211,9 @@ def run_saved(*, exploration_id: int, limit: int = 100, offset: int = 0, **kwarg
         exploration_id: The Django id of the exploration to run.
         limit: The max number of rows to return.(default 100)
         offset: The number of rows to skip.(default 0)
+
+    Returns:
+        The result of the exploration run.
     """
     user = kwargs.get(REQUEST_KEY).user
     exp_model = Explorations.objects.get(id=exploration_id)
@@ -218,6 +231,9 @@ def replace(*, new_exploration: ExplorationInfo) -> ExplorationInfo:
 
     Args:
         new_exploration: A dict describing the exploration to replace, including the updated fields.
+
+    Returns:
+        The exploration details for the replaced exploration.
     """
     replaced_exp_model = replace_exploration(new_exploration)
     return ExplorationInfo.from_model(replaced_exp_model)
@@ -232,6 +248,9 @@ def add(*, exploration_def: ExplorationDef) -> ExplorationInfo:
 
     Args:
         exploration_def: A dict describing the exploration to create.
+
+    Returns:
+        The exploration details for the newly created exploration.
     """
     exp_model = create_exploration(exploration_def)
     return ExplorationInfo.from_model(exp_model)
diff --git a/mathesar/tests/rpc/test_explorations.py b/mathesar/tests/rpc/test_explorations.py
index 74059f231e..9a9b4abbae 100644
--- a/mathesar/tests/rpc/test_explorations.py
+++ b/mathesar/tests/rpc/test_explorations.py
@@ -24,6 +24,7 @@ def mock_exploration_info(_database_id):
                 database=Database(id=1),
                 name='page count',
                 base_table_oid=12375,
+                schema_oid=2200,
                 initial_columns=[
                     {'id': 51586, 'alias': 'Items_Acquisition Date'},
                     {'id': 51598, 'alias': 'Items_id'},
@@ -49,6 +50,7 @@ def mock_exploration_info(_database_id):
                 database=Database(id=1),
                 name='ISBN',
                 base_table_oid=12356,
+                schema_oid=2200,
                 initial_columns=[
                     {'id': 51594, 'alias': 'Publishers_Name'},
                     {'id': 51575, 'alias': 'Books_ISBN', 'jp_path': [[51593, 51579]]}
@@ -81,6 +83,7 @@ def mock_exploration_info(_database_id):
             'database_id': 1,
             'name': 'page count',
             'base_table_oid': 12375,
+            'schema_oid': 2200,
             'initial_columns': [
                 {'id': 51586, 'alias': 'Items_Acquisition Date'},
                 {'id': 51598, 'alias': 'Items_id'},
@@ -105,6 +108,7 @@ def mock_exploration_info(_database_id):
             'database_id': 1,
             'name': 'ISBN',
             'base_table_oid': 12356,
+            'schema_oid': 2200,
             'initial_columns': [
                 {'id': 51594, 'alias': 'Publishers_Name'},
                 {'id': 51575, 'alias': 'Books_ISBN', 'jp_path': [[51593, 51579]]}
diff --git a/mathesar/utils/explorations.py b/mathesar/utils/explorations.py
index a8bad7cec5..b9bbe10d0a 100644
--- a/mathesar/utils/explorations.py
+++ b/mathesar/utils/explorations.py
@@ -27,6 +27,7 @@ def replace_exploration(new_exploration):
         database=Database.objects.get(id=new_exploration["database_id"]),
         name=new_exploration["name"],
         base_table_oid=new_exploration["base_table_oid"],
+        schema_oid=new_exploration["schema_oid"],
         initial_columns=new_exploration["initial_columns"],
         transformations=new_exploration.get("transformations"),
         display_options=new_exploration.get("display_options"),
@@ -41,6 +42,7 @@ def create_exploration(exploration_def):
         database=Database.objects.get(id=exploration_def["database_id"]),
         name=exploration_def["name"],
         base_table_oid=exploration_def["base_table_oid"],
+        schema_oid=exploration_def["schema_oid"],
         initial_columns=exploration_def["initial_columns"],
         transformations=exploration_def.get("transformations"),
         display_options=exploration_def.get("display_options"),

From 116988dc40ef1273063a7ab168df23118befd020 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 26 Sep 2024 14:59:52 -0400
Subject: [PATCH 1026/1141] Fix incorrect column counts in explorations

---
 mathesar_ui/src/systems/data-explorer/QueryModel.ts      | 9 +++++++--
 .../column-selection-pane/ColumnSelectionPane.svelte     | 2 +-
 .../column-selection-pane/SelectableColumnTree.svelte    | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/mathesar_ui/src/systems/data-explorer/QueryModel.ts b/mathesar_ui/src/systems/data-explorer/QueryModel.ts
index 5dcec3652a..1b9f7d65e6 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryModel.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryModel.ts
@@ -11,6 +11,7 @@ import QueryFilterTransformationModel from './QueryFilterTransformationModel';
 import QueryHideTransformationModel from './QueryHideTransformationModel';
 import QuerySortTransformationModel from './QuerySortTransformationModel';
 import QuerySummarizationTransformationModel from './QuerySummarizationTransformationModel';
+import type { ColumnWithLink } from './utils';
 
 export interface QueryModelUpdateDiff {
   model: QueryModel;
@@ -454,8 +455,12 @@ export default class QueryModel {
     };
   }
 
-  getColumnCount(id: InitialColumn['attnum']): number {
-    return this.initial_columns.filter((entry) => entry.attnum === id).length;
+  getColumnCount(column: ColumnWithLink): number {
+    const columnJoinPath = JSON.stringify(column.jpPath);
+    return this.initial_columns.filter((entry) => {
+      const entryJoinPath = JSON.stringify(entry.join_path);
+      return entry.attnum === column.id && entryJoinPath === columnJoinPath;
+    }).length;
   }
 
   toJson(): UnsavedExploration {
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/ColumnSelectionPane.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/ColumnSelectionPane.svelte
index 41fefe8421..19bf2865c7 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/ColumnSelectionPane.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/ColumnSelectionPane.svelte
@@ -29,7 +29,7 @@
       {#each [...baseTableColumns] as [columnId, column] (columnId)}
         <SelectableColumn
           {column}
-          usageCount={$query.getColumnCount(columnId)}
+          usageCount={$query.getColumnCount(column)}
           on:add
         />
       {/each}
diff --git a/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/SelectableColumnTree.svelte b/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/SelectableColumnTree.svelte
index 0222009b9f..e926526cc5 100644
--- a/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/SelectableColumnTree.svelte
+++ b/mathesar_ui/src/systems/data-explorer/input-sidebar/column-selection-pane/SelectableColumnTree.svelte
@@ -31,7 +31,7 @@
     {:else}
       <SelectableColumn
         {column}
-        usageCount={$query.getColumnCount(columnId)}
+        usageCount={$query.getColumnCount(column)}
         on:add
       />
     {/if}

From 51187994afd197934aa0ec46de18bc39015f3ae5 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 27 Sep 2024 01:19:37 +0530
Subject: [PATCH 1027/1141] filter explorations.list by schema_oid

---
 mathesar/rpc/explorations.py   | 5 +++--
 mathesar/utils/explorations.py | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/mathesar/rpc/explorations.py b/mathesar/rpc/explorations.py
index 5c13cf2a11..c5a9786218 100644
--- a/mathesar/rpc/explorations.py
+++ b/mathesar/rpc/explorations.py
@@ -135,17 +135,18 @@ def from_dict(cls, e):
 @rpc_method(name="explorations.list")
 @http_basic_auth_login_required
 @handle_rpc_exceptions
-def list_(*, database_id: int, **kwargs) -> list[ExplorationInfo]:
+def list_(*, database_id: int, schema_oid: int = None, **kwargs) -> list[ExplorationInfo]:
     """
     List information about explorations for a database. Exposed as `list`.
 
     Args:
         database_id: The Django id of the database containing the explorations.
+        schema_oid: The OID of the schema containing the base table(s) of the exploration(s).(optional)
 
     Returns:
         A list of exploration details.
     """
-    explorations = list_explorations(database_id)
+    explorations = list_explorations(database_id, schema_oid)
     return [ExplorationInfo.from_model(exploration) for exploration in explorations]
 
 
diff --git a/mathesar/utils/explorations.py b/mathesar/utils/explorations.py
index b9bbe10d0a..8035bcc163 100644
--- a/mathesar/utils/explorations.py
+++ b/mathesar/utils/explorations.py
@@ -10,7 +10,9 @@
 from mathesar.state import get_cached_metadata
 
 
-def list_explorations(database_id):
+def list_explorations(database_id, schema_oid=None):
+    if schema_oid is not None:
+        return Explorations.objects.filter(database__id=database_id, schema_oid=schema_oid)
     return Explorations.objects.filter(database__id=database_id)
 
 

From 24c13dab19cf92eda61e0beda76c9b9dfaa5bc18 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 27 Sep 2024 01:32:24 +0530
Subject: [PATCH 1028/1141] fix test

---
 mathesar/tests/rpc/test_explorations.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar/tests/rpc/test_explorations.py b/mathesar/tests/rpc/test_explorations.py
index 9a9b4abbae..ad66245296 100644
--- a/mathesar/tests/rpc/test_explorations.py
+++ b/mathesar/tests/rpc/test_explorations.py
@@ -15,7 +15,7 @@ def test_explorations_list(rf, monkeypatch):
     request.user = User(username='alice', password='pass1234')
     database_id = 11
 
-    def mock_exploration_info(_database_id):
+    def mock_exploration_info(_database_id, _schema_oid):
         if _database_id != database_id:
             raise AssertionError('incorrect parameters passed')
         return [

From ec3558ea0ecdd29aad94353f5852c5692b04f703 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 26 Sep 2024 16:04:32 -0400
Subject: [PATCH 1029/1141] Implement exploration saving RPC APIs on front end

---
 mathesar_ui/src/api/rpc/explorations.ts       |  58 +++++-
 .../src/pages/schema/SchemaOverview.svelte    |   4 +-
 .../src/routes/DataExplorerRoute.svelte       |  11 +-
 mathesar_ui/src/stores/queries.ts             | 189 ++++++++----------
 .../systems/data-explorer/QueryListEntry.ts   |   6 +-
 .../src/systems/data-explorer/QueryManager.ts |  28 ++-
 .../src/systems/data-explorer/QueryModel.ts   |  32 +--
 .../src/systems/data-explorer/QueryRunner.ts  |   4 +-
 .../data-explorer/QueryUndoRedoManager.ts     |  10 +-
 .../ExplorationTab.svelte                     |  12 +-
 .../data-explorer/urlSerializationUtils.ts    |  29 ++-
 .../table-inspector/table/TableActions.svelte |   1 +
 12 files changed, 212 insertions(+), 172 deletions(-)

diff --git a/mathesar_ui/src/api/rpc/explorations.ts b/mathesar_ui/src/api/rpc/explorations.ts
index 636cb66515..dae99561bb 100644
--- a/mathesar_ui/src/api/rpc/explorations.ts
+++ b/mathesar_ui/src/api/rpc/explorations.ts
@@ -78,11 +78,14 @@ export type QueryInstanceTransformation =
   | QueryInstanceHideTransformation
   | QueryInstanceSortTransformation;
 
-export interface SavedExploration {
-  id: number;
+/** The data an exploration contains when the data explorer opens */
+export interface InitialExploration {
   database_id: number;
-  name: string;
-  description?: string;
+  schema_oid: number;
+}
+
+/** The data needed to run an exploration without it being saved */
+export interface AnonymousExploration extends InitialExploration {
   base_table_oid: number;
   initial_columns: InitialColumn[];
   transformations?: QueryInstanceTransformation[];
@@ -90,11 +93,38 @@ export interface SavedExploration {
   display_options?: unknown[];
 }
 
-export type UnsavedExploration = Partial<SavedExploration> & {
-  database_id: number;
-};
+export interface AddableExploration extends AnonymousExploration {
+  name: string;
+  description?: string;
+}
 
-export type AnonymousExploration = Omit<SavedExploration, 'id' | 'name'>;
+export interface SavedExploration extends AddableExploration {
+  id: number;
+}
+
+export type MaybeSavedExploration = Partial<SavedExploration> &
+  InitialExploration;
+
+export function explorationIsAddable(
+  e: MaybeSavedExploration,
+): e is MaybeSavedExploration & AddableExploration {
+  return (
+    'name' in e &&
+    e.name !== '' &&
+    e.name !== undefined &&
+    'base_table_oid' in e &&
+    e.base_table_oid !== undefined &&
+    'initial_columns' in e &&
+    e.initial_columns !== undefined &&
+    e.initial_columns.length > 0
+  );
+}
+
+export function explorationIsSaved(
+  e: MaybeSavedExploration,
+): e is SavedExploration {
+  return explorationIsAddable(e) && 'id' in e && e.id !== undefined;
+}
 
 export interface ExplorationRunParams {
   exploration_def: AnonymousExploration;
@@ -164,17 +194,23 @@ export interface ExplorationResult {
 }
 
 export const explorations = {
-  list: rpcMethodTypeContainer<{ database_id: number }, SavedExploration[]>(),
+  list: rpcMethodTypeContainer<
+    { database_id: number; schema_oid: number },
+    SavedExploration[]
+  >(),
 
   get: rpcMethodTypeContainer<{ exploration_id: number }, SavedExploration>(),
 
-  add: rpcMethodTypeContainer<AnonymousExploration & { name: string }, void>(),
+  add: rpcMethodTypeContainer<
+    { exploration_def: AddableExploration },
+    SavedExploration
+  >(),
 
   delete: rpcMethodTypeContainer<{ exploration_id: number }, void>(),
 
   replace: rpcMethodTypeContainer<
     { new_exploration: SavedExploration },
-    void
+    SavedExploration
   >(),
 
   run: rpcMethodTypeContainer<ExplorationRunParams, ExplorationResult>(),
diff --git a/mathesar_ui/src/pages/schema/SchemaOverview.svelte b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
index f254d002fd..c33ad6abe7 100644
--- a/mathesar_ui/src/pages/schema/SchemaOverview.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
@@ -10,7 +10,7 @@
   import type { Schema } from '@mathesar/models/Schema';
   import type { Table } from '@mathesar/models/Table';
   import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
-  import { refetchQueriesForSchema } from '@mathesar/stores/queries';
+  import { refetchExplorationsForSchema } from '@mathesar/stores/queries';
   import { refetchTablesForSchema } from '@mathesar/stores/tables';
   import { AnchorButton, Button } from '@mathesar-component-library';
 
@@ -88,7 +88,7 @@
           <div>
             <SpinnerButton
               onClick={async () => {
-                await refetchQueriesForSchema(schema.oid);
+                await refetchExplorationsForSchema(schema);
               }}
               label={$_('retry')}
               icon={iconRefresh}
diff --git a/mathesar_ui/src/routes/DataExplorerRoute.svelte b/mathesar_ui/src/routes/DataExplorerRoute.svelte
index bd6db3d9dc..905defdf1a 100644
--- a/mathesar_ui/src/routes/DataExplorerRoute.svelte
+++ b/mathesar_ui/src/routes/DataExplorerRoute.svelte
@@ -4,8 +4,8 @@
   import { router } from 'tinro';
 
   import type {
+    MaybeSavedExploration,
     SavedExploration,
-    UnsavedExploration,
   } from '@mathesar/api/rpc/explorations';
   import type { CancellablePromise } from '@mathesar/component-library';
   import AppendBreadcrumb from '@mathesar/components/breadcrumb/AppendBreadcrumb.svelte';
@@ -19,7 +19,7 @@
     getExplorationEditorPageUrl,
   } from '@mathesar/routes/urls';
   import { abstractTypesMap } from '@mathesar/stores/abstract-types';
-  import { getQuery } from '@mathesar/stores/queries';
+  import { getExploration } from '@mathesar/stores/queries';
   import {
     QueryManager,
     QueryModel,
@@ -36,7 +36,7 @@
   let queryLoadPromise: CancellablePromise<SavedExploration>;
   let query: Readable<QueryModel | undefined> = readable(undefined);
 
-  function createQueryManager(queryInstance: UnsavedExploration) {
+  function createQueryManager(queryInstance: MaybeSavedExploration) {
     queryManager?.destroy();
     queryManager = new QueryManager({
       query: new QueryModel(queryInstance),
@@ -80,6 +80,7 @@
         router.location.hash.clear();
         createQueryManager({
           database_id: database.id,
+          schema_oid: schema.oid,
           ...(newQueryModel ?? {}),
         });
         return;
@@ -88,7 +89,7 @@
         console.error('Unable to create query model from hash', hash);
       }
     }
-    createQueryManager({ database_id: database.id });
+    createQueryManager({ database_id: database.id, schema_oid: schema.oid });
   }
 
   async function loadSavedQuery(_queryId: number) {
@@ -103,7 +104,7 @@
     }
 
     queryLoadPromise?.cancel();
-    queryLoadPromise = getQuery(_queryId);
+    queryLoadPromise = getExploration(_queryId);
     try {
       const queryInstance = await queryLoadPromise;
       createQueryManager(queryInstance);
diff --git a/mathesar_ui/src/stores/queries.ts b/mathesar_ui/src/stores/queries.ts
index 0b5d541b2a..65ed5910a3 100644
--- a/mathesar_ui/src/stores/queries.ts
+++ b/mathesar_ui/src/stores/queries.ts
@@ -41,27 +41,19 @@ import {
   writable,
 } from 'svelte/store';
 
-import {
-  type PaginatedResponse,
-  type RequestStatus,
-  addQueryParamsToUrl,
-  deleteAPI,
-  getAPI,
-  postAPI,
-  putAPI,
-} from '@mathesar/api/rest/utils/requestUtils';
+import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
+import { api } from '@mathesar/api/rpc';
 import type {
+  AddableExploration,
   ExplorationResult,
   SavedExploration,
-  UnsavedExploration,
 } from '@mathesar/api/rpc/explorations';
 import type { Schema } from '@mathesar/models/Schema';
 import CacheManager from '@mathesar/utils/CacheManager';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
-import type { SHARED_LINK_UUID_QUERY_PARAM } from '@mathesar/utils/shares';
-import { CancellablePromise } from '@mathesar-component-library';
+import type { CancellablePromise } from '@mathesar-component-library';
 
-import { currentSchemaId } from './schemas';
+import { currentSchema } from './schemas';
 
 const commonData = preloadCommonData();
 
@@ -79,7 +71,7 @@ const schemasCacheManager = new CacheManager<
 
 const requestMap: Map<
   Schema['oid'],
-  CancellablePromise<PaginatedResponse<SavedExploration>>
+  CancellablePromise<SavedExploration[]>
 > = new Map();
 
 function sortedQueryEntries(
@@ -121,12 +113,13 @@ function findSchemaStoreForQuery(id: SavedExploration['id']) {
   );
 }
 
-export async function refetchQueriesForSchema(
-  schemaId: Schema['oid'],
-): Promise<QueriesStoreSubstance | undefined> {
-  const store = schemasCacheManager.get(schemaId);
+export async function refetchExplorationsForSchema(schema: {
+  oid: number;
+  database: { id: number };
+}): Promise<QueriesStoreSubstance | undefined> {
+  const store = schemasCacheManager.get(schema.oid);
   if (!store) {
-    console.error(`Queries store for schema: ${schemaId} not found.`);
+    console.error(`Queries store for schema: ${schema.oid} not found.`);
     return undefined;
   }
 
@@ -136,17 +129,18 @@ export async function refetchQueriesForSchema(
       requestStatus: { state: 'processing' },
     }));
 
-    requestMap.get(schemaId)?.cancel();
-
-    const queriesRequest = getAPI<PaginatedResponse<SavedExploration>>(
-      `/api/db/v0/queries/?schema=${schemaId}&limit=500`,
-    );
-    requestMap.set(schemaId, queriesRequest);
+    requestMap.get(schema.oid)?.cancel();
 
-    const response = await queriesRequest;
-    const queriesResult = response.results || [];
+    const queriesRequest = api.explorations
+      .list({
+        database_id: schema.database.id,
+        schema_oid: schema.oid,
+      })
+      .run();
+    requestMap.set(schema.oid, queriesRequest);
 
-    const schemaQueriesStore = setSchemaQueriesStore(schemaId, queriesResult);
+    const queriesResult = await queriesRequest;
+    const schemaQueriesStore = setSchemaQueriesStore(schema.oid, queriesResult);
 
     return get(schemaQueriesStore);
   } catch (err) {
@@ -165,40 +159,41 @@ export async function refetchQueriesForSchema(
 
 let preload = true;
 
-export function getQueriesStoreForSchema(
-  schemaId: Schema['oid'],
-): Writable<QueriesStoreSubstance> {
-  let store = schemasCacheManager.get(schemaId);
+export function getExplorationsStoreForSchema(schema: {
+  oid: number;
+  database: { id: number };
+}): Writable<QueriesStoreSubstance> {
+  let store = schemasCacheManager.get(schema.oid);
   if (!store) {
     store = writable({
-      schemaId,
+      schemaId: schema.oid,
       requestStatus: { state: 'processing' },
       data: new Map(),
     });
-    schemasCacheManager.set(schemaId, store);
-    if (preload && commonData.current_schema === schemaId) {
-      store = setSchemaQueriesStore(schemaId, commonData.queries ?? []);
+    schemasCacheManager.set(schema.oid, store);
+    if (preload && commonData.current_schema === schema.oid) {
+      store = setSchemaQueriesStore(schema.oid, commonData.queries ?? []);
     } else {
-      void refetchQueriesForSchema(schemaId);
+      void refetchExplorationsForSchema(schema);
     }
     preload = false;
   } else if (get(store).requestStatus.state === 'failure') {
-    void refetchQueriesForSchema(schemaId);
+    void refetchExplorationsForSchema(schema);
   }
   return store;
 }
 
 export const queries: Readable<Omit<QueriesStoreSubstance, 'schemaId'>> =
-  derived(currentSchemaId, ($currentSchemaId, set) => {
+  derived(currentSchema, ($currentSchema, set) => {
     let unsubscribe: Unsubscriber;
 
-    if (!$currentSchemaId) {
+    if (!$currentSchema) {
       set({
         requestStatus: { state: 'success' },
         data: new Map(),
       });
     } else {
-      const store = getQueriesStoreForSchema($currentSchemaId);
+      const store = getExplorationsStoreForSchema($currentSchema);
       unsubscribe = store.subscribe((dbSchemasData) => {
         set(dbSchemasData);
       });
@@ -209,99 +204,71 @@ export const queries: Readable<Omit<QueriesStoreSubstance, 'schemaId'>> =
     };
   });
 
-export function createQuery(
-  newQuery: UnsavedExploration,
-): CancellablePromise<SavedExploration & { schema: number }> {
-  const promise = postAPI<SavedExploration & { schema: number }>(
-    '/api/db/v0/queries/',
-    newQuery,
-  );
-  void promise.then((instance) => {
-    void refetchQueriesForSchema(instance.schema);
-    return instance;
+export function addExploration(
+  exploration: AddableExploration,
+): CancellablePromise<SavedExploration> {
+  const promise = api.explorations.add({ exploration_def: exploration }).run();
+  void promise.then((savedExploration) => {
+    void refetchExplorationsForSchema({
+      oid: savedExploration.schema_oid,
+      database: { id: exploration.database_id },
+    });
+    return savedExploration;
   });
   return promise;
 }
 
-export function putQuery(
-  query: SavedExploration,
+export function replaceExploration(
+  exploration: SavedExploration,
 ): CancellablePromise<SavedExploration> {
-  const promise = putAPI<SavedExploration>(
-    `/api/db/v0/queries/${query.id}/`,
-    query,
-  );
-  void promise.then((result) => {
-    // TODO: Get schemaId as a query property
-    const schemaId = get(currentSchemaId);
-    if (schemaId) {
-      const store = getQueriesStoreForSchema(schemaId);
-      get(store).data.set(query.id, result);
-      setSchemaQueriesStore(schemaId, [...get(store).data.values()]);
-    }
+  const promise = api.explorations
+    .replace({ new_exploration: exploration })
+    .run();
+
+  void promise.then((newlySavedExploration) => {
+    const schemaId = newlySavedExploration.schema_oid;
+    const store = getExplorationsStoreForSchema({
+      oid: schemaId,
+      database: { id: newlySavedExploration.database_id },
+    });
+    get(store).data.set(exploration.id, newlySavedExploration);
+    setSchemaQueriesStore(schemaId, [...get(store).data.values()]);
     return undefined;
   });
+
   return promise;
 }
 
-export function getQuery(
-  queryId: SavedExploration['id'],
+export function getExploration(
+  id: SavedExploration['id'],
 ): CancellablePromise<SavedExploration> {
-  // TODO: Get schemaId as a query property
-  const schemaId = get(currentSchemaId);
-  let innerRequest: CancellablePromise<SavedExploration>;
-  if (schemaId) {
-    return new CancellablePromise<SavedExploration>(
-      (resolve, reject) => {
-        const store = getQueriesStoreForSchema(schemaId);
-        const storeSubstance = get(store);
-        const queryResponse = storeSubstance.data.get(queryId);
-        if (queryResponse) {
-          resolve(queryResponse);
-          return;
-        }
-        if (storeSubstance.requestStatus.state !== 'success') {
-          innerRequest = getAPI<SavedExploration>(
-            `/api/db/v0/queries/${queryId}/`,
-          );
-          void innerRequest.then(
-            (result) => resolve(result),
-            (reason) => reject(reason),
-          );
-        } else {
-          reject(new Error('Query not found'));
-        }
-      },
-      () => {
-        innerRequest?.cancel();
-      },
-    );
-  }
-  return new CancellablePromise((resolve) => resolve());
+  return api.explorations.get({ exploration_id: id }).run();
 }
 
-export function fetchQueryResults(
-  queryId: number,
-  params?: {
+export function runSavedExploration(
+  id: number,
+  params: {
     limit: number;
     offset: number;
-    [SHARED_LINK_UUID_QUERY_PARAM]?: string;
   },
 ): CancellablePromise<ExplorationResult> {
-  const url = addQueryParamsToUrl(
-    `/api/db/v0/queries/${queryId}/results/`,
-    params,
-  );
-  return getAPI(url);
+  return api.explorations
+    .run_saved({
+      exploration_id: id,
+      limit: params.limit,
+      offset: params.offset,
+    })
+    .run();
 }
 
-export function deleteQuery(queryId: number): CancellablePromise<void> {
-  const promise = deleteAPI<void>(`/api/db/v0/queries/${queryId}/`);
+export function deleteExploration(id: number): CancellablePromise<void> {
+  const promise = api.explorations.delete({ exploration_id: id }).run();
 
   void promise.then(() => {
-    const store = findSchemaStoreForQuery(queryId);
+    const store = findSchemaStoreForQuery(id);
     if (store) {
       store.update((storeData) => {
-        storeData.data.delete(queryId);
+        storeData.data.delete(id);
         return { ...storeData, data: new Map(storeData.data) };
       });
     }
diff --git a/mathesar_ui/src/systems/data-explorer/QueryListEntry.ts b/mathesar_ui/src/systems/data-explorer/QueryListEntry.ts
index eb7e13f2bc..30aff750f2 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryListEntry.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryListEntry.ts
@@ -1,7 +1,7 @@
-import type { UnsavedExploration } from '@mathesar/api/rpc/explorations';
+import type { MaybeSavedExploration } from '@mathesar/api/rpc/explorations';
 
 export default class QueryListEntry {
-  queryJSON: UnsavedExploration;
+  queryJSON: MaybeSavedExploration;
 
   isValid: boolean;
 
@@ -9,7 +9,7 @@ export default class QueryListEntry {
 
   prev: QueryListEntry | undefined = undefined;
 
-  constructor(queryJSON: UnsavedExploration, isValid: boolean) {
+  constructor(queryJSON: MaybeSavedExploration, isValid: boolean) {
     this.queryJSON = queryJSON;
     this.isValid = isValid;
   }
diff --git a/mathesar_ui/src/systems/data-explorer/QueryManager.ts b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
index 73c990f0bb..4dcac13942 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryManager.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryManager.ts
@@ -3,13 +3,15 @@ import { get, writable } from 'svelte/store';
 import { _ } from 'svelte-i18n';
 
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
-import type {
-  ExplorationResult,
-  SavedExploration,
+import {
+  type ExplorationResult,
+  type SavedExploration,
+  explorationIsAddable,
+  explorationIsSaved,
 } from '@mathesar/api/rpc/explorations';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
 import { currentDatabase } from '@mathesar/stores/databases';
-import { createQuery, putQuery } from '@mathesar/stores/queries';
+import { addExploration, replaceExploration } from '@mathesar/stores/queries';
 import CacheManager from '@mathesar/utils/CacheManager';
 import type { CancellablePromise } from '@mathesar-component-library';
 
@@ -78,7 +80,11 @@ export default class QueryManager extends QueryRunner {
       abstractTypeMap,
       onRunWithObject: (response: ExplorationResult) => {
         this.checkAndUpdateSummarizationAfterRun(
-          new QueryModel({ database_id: query.database_id, ...response.query }),
+          new QueryModel({
+            database_id: query.database_id,
+            schema_oid: query.schema_oid,
+            ...response.query,
+          }),
         );
       },
     });
@@ -285,7 +291,8 @@ export default class QueryManager extends QueryRunner {
    * @throws Error if unable to save
    */
   async save(): Promise<QueryModel> {
-    const queryJSON = this.getQueryModel().toJson();
+    const maybeSavedExploration =
+      this.getQueryModel().toMaybeSavedExploration();
     this.state.update((_state) => ({
       ..._state,
       saveState: { state: 'processing' },
@@ -293,11 +300,12 @@ export default class QueryManager extends QueryRunner {
     try {
       this.querySavePromise?.cancel();
       // TODO: Check for latest validation status here
-      if (queryJSON.id !== undefined) {
-        // TODO: Figure out a better way to help TS identify this as a saved instance
-        this.querySavePromise = putQuery(queryJSON as SavedExploration);
+      if (explorationIsSaved(maybeSavedExploration)) {
+        this.querySavePromise = replaceExploration(maybeSavedExploration);
+      } else if (explorationIsAddable(maybeSavedExploration)) {
+        this.querySavePromise = addExploration(maybeSavedExploration);
       } else {
-        this.querySavePromise = createQuery(queryJSON);
+        throw new Error(get(_)('error_saving_query'));
       }
       const result = await this.querySavePromise;
       this.query.update((qr) => qr.withId(result.id).model);
diff --git a/mathesar_ui/src/systems/data-explorer/QueryModel.ts b/mathesar_ui/src/systems/data-explorer/QueryModel.ts
index 5dcec3652a..1ba26eaa30 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryModel.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryModel.ts
@@ -1,9 +1,9 @@
 import type {
   AnonymousExploration,
   InitialColumn,
+  MaybeSavedExploration,
   QueryInstanceTransformation,
   SavedExploration,
-  UnsavedExploration,
 } from '@mathesar/api/rpc/explorations';
 import { assertExhaustive } from '@mathesar-component-library';
 
@@ -22,7 +22,7 @@ export interface QueryModelUpdateDiff {
     | 'initialColumnName'
     | 'transformations'
     | 'initialColumnsAndTransformations';
-  diff: Partial<UnsavedExploration>;
+  diff: Partial<MaybeSavedExploration>;
 }
 
 export type QueryTransformationModel =
@@ -61,15 +61,17 @@ function validate(
 }
 
 export default class QueryModel {
-  readonly database_id: UnsavedExploration['database_id'];
+  readonly database_id: MaybeSavedExploration['database_id'];
 
-  readonly base_table_oid: UnsavedExploration['base_table_oid'];
+  readonly schema_oid: MaybeSavedExploration['schema_oid'];
 
-  readonly id: UnsavedExploration['id'];
+  readonly base_table_oid: MaybeSavedExploration['base_table_oid'];
 
-  readonly name: UnsavedExploration['name'];
+  readonly id: MaybeSavedExploration['id'];
 
-  readonly description: UnsavedExploration['description'];
+  readonly name: MaybeSavedExploration['name'];
+
+  readonly description: MaybeSavedExploration['description'];
 
   readonly initial_columns: InitialColumn[];
 
@@ -81,8 +83,9 @@ export default class QueryModel {
 
   readonly isRunnable: boolean;
 
-  constructor(model: UnsavedExploration | QueryModel) {
+  constructor(model: MaybeSavedExploration | QueryModel) {
     this.database_id = model.database_id;
+    this.schema_oid = model.schema_oid;
     this.base_table_oid = model.base_table_oid;
     this.id = model.id;
     this.name = model.name;
@@ -108,6 +111,7 @@ export default class QueryModel {
   withBaseTable(base_table?: number): QueryModelUpdateDiff {
     const model = new QueryModel({
       database_id: this.database_id,
+      schema_oid: this.schema_oid,
       base_table_oid: base_table,
       id: this.id,
       name: this.name,
@@ -235,7 +239,7 @@ export default class QueryModel {
       model,
       type: 'transformations',
       diff: {
-        transformations: model.toJson().transformations,
+        transformations: model.toMaybeSavedExploration().transformations,
       },
     };
   }
@@ -279,7 +283,7 @@ export default class QueryModel {
       model,
       type: 'transformations',
       diff: {
-        transformations: model.toJson().transformations,
+        transformations: model.toMaybeSavedExploration().transformations,
       },
     };
   }
@@ -298,7 +302,7 @@ export default class QueryModel {
       model,
       type: 'transformations',
       diff: {
-        transformations: model.toJson().transformations,
+        transformations: model.toMaybeSavedExploration().transformations,
       },
     };
   }
@@ -382,7 +386,7 @@ export default class QueryModel {
       type: 'initialColumnsAndTransformations',
       diff: {
         initial_columns: initialColumns,
-        transformations: model.toJson().transformations,
+        transformations: model.toMaybeSavedExploration().transformations,
       },
     };
   }
@@ -447,6 +451,7 @@ export default class QueryModel {
       : this.transformationModels.filter((transform) => transform.isValid());
     return {
       database_id: this.database_id,
+      schema_oid: this.schema_oid,
       base_table_oid: this.base_table_oid,
       initial_columns: this.initial_columns,
       transformations: transformations.map((entry) => entry.toJson()),
@@ -458,9 +463,10 @@ export default class QueryModel {
     return this.initial_columns.filter((entry) => entry.attnum === id).length;
   }
 
-  toJson(): UnsavedExploration {
+  toMaybeSavedExploration(): MaybeSavedExploration {
     return {
       database_id: this.database_id,
+      schema_oid: this.schema_oid,
       id: this.id,
       name: this.name,
       description: this.description,
diff --git a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
index e115876d59..388bd31e57 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryRunner.ts
@@ -13,7 +13,7 @@ import Plane from '@mathesar/components/sheet/selection/Plane';
 import Series from '@mathesar/components/sheet/selection/Series';
 import SheetSelectionStore from '@mathesar/components/sheet/selection/SheetSelectionStore';
 import type { AbstractTypesMap } from '@mathesar/stores/abstract-types/types';
-import { fetchQueryResults } from '@mathesar/stores/queries';
+import { runSavedExploration } from '@mathesar/stores/queries';
 import Pagination from '@mathesar/utils/Pagination';
 import type { ShareConsumer } from '@mathesar/utils/shares';
 import { CancellablePromise, ImmutableMap } from '@mathesar-component-library';
@@ -188,7 +188,7 @@ export default class QueryRunner {
           });
           return undefined;
         }
-        this.runPromise = fetchQueryResults(queryModel.id, {
+        this.runPromise = runSavedExploration(queryModel.id, {
           ...paginationParams,
           ...this.shareConsumer?.getQueryParams(),
         });
diff --git a/mathesar_ui/src/systems/data-explorer/QueryUndoRedoManager.ts b/mathesar_ui/src/systems/data-explorer/QueryUndoRedoManager.ts
index 06587809e3..6aa0103bee 100644
--- a/mathesar_ui/src/systems/data-explorer/QueryUndoRedoManager.ts
+++ b/mathesar_ui/src/systems/data-explorer/QueryUndoRedoManager.ts
@@ -1,4 +1,4 @@
-import type { UnsavedExploration } from '@mathesar/api/rpc/explorations';
+import type { MaybeSavedExploration } from '@mathesar/api/rpc/explorations';
 
 import QueryListEntry from './QueryListEntry';
 import QueryModel from './QueryModel';
@@ -10,8 +10,8 @@ export default class QueryUndoRedoManager {
     if (queryInfo) {
       const { query, isValid } = queryInfo;
       const json = JSON.parse(
-        JSON.stringify(query.toJson()),
-      ) as UnsavedExploration;
+        JSON.stringify(query.toMaybeSavedExploration()),
+      ) as MaybeSavedExploration;
       this.current = new QueryListEntry(json, isValid);
     }
   }
@@ -21,8 +21,8 @@ export default class QueryUndoRedoManager {
       this.current.next.prev = undefined;
     }
     const json = JSON.parse(
-      JSON.stringify(query.toJson()),
-    ) as UnsavedExploration;
+      JSON.stringify(query.toMaybeSavedExploration()),
+    ) as MaybeSavedExploration;
     const newNode = new QueryListEntry(json, isValid);
     if (this.current && !this.current.isValid) {
       newNode.prev = this.current.prev;
diff --git a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte
index bca709cdf0..667ed13964 100644
--- a/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte
+++ b/mathesar_ui/src/systems/data-explorer/exploration-inspector/ExplorationTab.svelte
@@ -7,7 +7,11 @@
   import FormField from '@mathesar/components/FormField.svelte';
   import { iconDeleteMajor } from '@mathesar/icons';
   import { confirmDelete } from '@mathesar/stores/confirmation';
-  import { deleteQuery, putQuery, queries } from '@mathesar/stores/queries';
+  import {
+    deleteExploration,
+    queries,
+    replaceExploration,
+  } from '@mathesar/stores/queries';
   import { toast } from '@mathesar/stores/toast';
   import { getAvailableName } from '@mathesar/utils/db';
   import {
@@ -74,7 +78,9 @@
         .withName(name)
         .model.withDescription(description).model;
       // TODO: Write better utility methods to identify saved instances
-      await putQuery(updatedQuery.toJson() as SavedExploration);
+      await replaceExploration(
+        updatedQuery.toMaybeSavedExploration() as SavedExploration,
+      );
       query.set(updatedQuery);
     } catch (err) {
       const message =
@@ -89,7 +95,7 @@
       void confirmDelete({
         identifierType: 'Exploration',
         onProceed: async () => {
-          await deleteQuery(queryId);
+          await deleteExploration(queryId);
           dispatch('delete');
         },
       });
diff --git a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
index 6d1c0151ec..7564f05683 100644
--- a/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
+++ b/mathesar_ui/src/systems/data-explorer/urlSerializationUtils.ts
@@ -1,7 +1,7 @@
 import type { Column } from '@mathesar/api/rpc/columns';
 import type {
+  MaybeSavedExploration,
   QueryInstanceSummarizationTransformation,
-  UnsavedExploration,
 } from '@mathesar/api/rpc/explorations';
 import type { Table } from '@mathesar/models/Table';
 import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
@@ -13,6 +13,7 @@ type BaseTable = Pick<Table, 'oid' | 'name'>;
 
 interface TerseSummarization {
   databaseId: number;
+  schemaOid: number;
   baseTable: BaseTable;
   columns: TerseSummarizedColumn[];
   terseGrouping: TerseGrouping;
@@ -43,6 +44,7 @@ class Streamline {
   static terseSummarization(t: TerseSummarization): TerseSummarization {
     return {
       databaseId: t.databaseId,
+      schemaOid: t.schemaOid,
       baseTable: Streamline.baseTable(t.baseTable),
       columns: t.columns.map((c) => Streamline.terseSummarizedColumn(c)),
       terseGrouping: t.terseGrouping,
@@ -62,6 +64,7 @@ export function createDataExplorerUrlToExploreATable(
   const dataExplorerRouteUrl = getDataExplorerPageUrl(databaseId, schemaId);
   const tableInformationHash = buildTableInformationHash({
     databaseId,
+    schemaOid: schemaId,
     baseTable,
     columns: [],
     terseGrouping: [],
@@ -91,7 +94,7 @@ export function constructDataExplorerUrlToSummarizeFromGroup(
 
 export function constructQueryModelFromHash(
   hash: string,
-): UnsavedExploration | undefined {
+): MaybeSavedExploration | undefined {
   const terseSummarization = JSON.parse(
     Url64.decode(hash),
   ) as Partial<TerseSummarization>;
@@ -102,16 +105,23 @@ export function constructQueryModelFromHash(
   if (!terseSummarization.baseTable) {
     return undefined;
   }
+  if (!terseSummarization.schemaOid) {
+    return undefined;
+  }
 
-  const { baseTable, databaseId } = terseSummarization;
-  let initialColumns: UnsavedExploration['initial_columns'] = [];
-  let transformations: UnsavedExploration['transformations'] = [];
+  const { baseTable, databaseId, schemaOid } = terseSummarization;
+  let initialColumns: MaybeSavedExploration['initial_columns'] = [];
+  let transformations: MaybeSavedExploration['transformations'] = [];
 
   if (
     !terseSummarization.terseGrouping?.length ||
     !terseSummarization.columns
   ) {
-    return { database_id: databaseId, base_table_oid: baseTable.oid };
+    return {
+      database_id: databaseId,
+      schema_oid: schemaOid,
+      base_table_oid: baseTable.oid,
+    };
   }
 
   const columnMap = new Map(
@@ -125,7 +135,11 @@ export function constructQueryModelFromHash(
     .filter((entry): entry is TerseSummarizedColumn => entry !== undefined);
 
   if (groupingColumns.length === 0) {
-    return { database_id: databaseId, base_table_oid: baseTable.oid };
+    return {
+      database_id: databaseId,
+      schema_oid: schemaOid,
+      base_table_oid: baseTable.oid,
+    };
   }
 
   const baseGroupingColumn = groupingColumns[0];
@@ -182,6 +196,7 @@ export function constructQueryModelFromHash(
 
   return {
     database_id: databaseId,
+    schema_oid: schemaOid,
     base_table_oid: baseTable.oid,
     initial_columns: initialColumns,
     transformations,
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
index db2cfef1a3..3873c6e059 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableActions.svelte
@@ -37,6 +37,7 @@
       table.schema.oid,
       {
         databaseId: table.schema.database.id,
+        schemaOid: table.schema.oid,
         baseTable: table,
         columns: $columns,
         terseGrouping: $grouping.terse(),

From d4bfe0723223f28f8d2c10be042c1a6a7337fb7c Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 26 Sep 2024 16:17:10 -0400
Subject: [PATCH 1030/1141] Add explorations list to common_data

---
 mathesar/views.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mathesar/views.py b/mathesar/views.py
index f005822e72..7d5c140955 100644
--- a/mathesar/views.py
+++ b/mathesar/views.py
@@ -8,6 +8,7 @@
 from rest_framework.response import Response
 
 from mathesar.rpc.databases.configured import list_ as databases_list
+from mathesar.rpc.explorations import list_ as explorations_list
 from mathesar.rpc.schemas import list_ as schemas_list
 from mathesar.rpc.servers.configured import list_ as get_servers_list
 from mathesar.rpc.tables import list_with_metadata as tables_list
@@ -44,9 +45,8 @@ def get_table_list(request, database_id, schema_oid):
         return []
 
 
-def get_queries_list(request, schema_id):
-    # TODO_BETA: Fill this method
-    return []
+def get_queries_list(request, database_id, schema_id):
+    return explorations_list(request=request, database_id=database_id, schema_oid=schema_id)
 
 
 def get_ui_type_list(request, database_id):
@@ -104,7 +104,7 @@ def get_common_data(request, database_id=None, schema_id=None):
     return {
         **_get_base_data_all_routes(request, database_id, schema_id),
         'tables': get_table_list(request, database_id, schema_id),
-        'queries': get_queries_list(request, schema_id),
+        'queries': get_queries_list(request, database_id, schema_id),
         'routing_context': 'normal',
     }
 

From cd4d8e7fcd3b913f056b23cc1ee0f708fc16f8ca Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 27 Sep 2024 18:38:12 +0530
Subject: [PATCH 1031/1141] filter dbs for admin and standard mathesar users

---
 mathesar/rpc/databases/configured.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/mathesar/rpc/databases/configured.py b/mathesar/rpc/databases/configured.py
index 4758785d66..d2eceed9bb 100644
--- a/mathesar/rpc/databases/configured.py
+++ b/mathesar/rpc/databases/configured.py
@@ -1,6 +1,6 @@
 from typing import TypedDict
 
-from modernrpc.core import rpc_method
+from modernrpc.core import rpc_method, REQUEST_KEY
 from modernrpc.auth.basic import http_basic_auth_login_required
 
 from mathesar.models.base import Database
@@ -44,10 +44,18 @@ def list_(*, server_id: int = None, **kwargs) -> list[ConfiguredDatabaseInfo]:
     Returns:
         A list of database details.
     """
-    if server_id is not None:
-        database_qs = Database.objects.filter(server__id=server_id)
+    user = kwargs.get(REQUEST_KEY).user
+    if user.is_superuser:
+        database_qs = Database.objects.filter(
+            server__id=server_id
+        ) if server_id is not None else Database.objects.all()
     else:
-        database_qs = Database.objects.all()
+        database_qs = Database.objects.filter(
+            server__id=server_id,
+            userdatabaserolemap__user=user
+        ) if server_id is not None else Database.objects.filter(
+            userdatabaserolemap__user=user
+        )
 
     return [ConfiguredDatabaseInfo.from_model(db_model) for db_model in database_qs]
 

From 5e9b9d4e4df008aab4987bc57da164766b1aaa24 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 30 Sep 2024 13:01:12 +0530
Subject: [PATCH 1032/1141] Fix duplicate requests for databases.get

---
 .../pages/database/DatabasePageWrapper.svelte   |  2 +-
 .../database/schemas/SchemasSection.svelte      |  3 +--
 .../settings/collaborators/Collaborators.svelte |  2 +-
 .../pages/database/settings/roles/Roles.svelte  |  2 +-
 mathesar_ui/src/stores/AsyncRpcApiStore.ts      | 17 ++++++++---------
 mathesar_ui/src/stores/AsyncStore.ts            | 14 ++++++++++----
 6 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
index d238a38a7e..495e1aed6b 100644
--- a/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
+++ b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
@@ -34,7 +34,7 @@
 
   const databaseRouteContext = DatabaseRouteContext.get();
   $: ({ database, underlyingDatabase } = $databaseRouteContext);
-  $: void underlyingDatabase.run({ database_id: database.id });
+  $: void underlyingDatabase.runOptimally({ database_id: database.id });
 
   const commonData = preloadCommonData();
 
diff --git a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
index a71420b6e4..b435544285 100644
--- a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
@@ -7,7 +7,6 @@
   import { RichText } from '@mathesar/components/rich-text';
   import { DatabaseRouteContext } from '@mathesar/contexts/DatabaseRouteContext';
   import { iconAddNew } from '@mathesar/icons';
-  import type { Database } from '@mathesar/models/Database';
   import type { Schema } from '@mathesar/models/Schema';
   import { confirmDelete } from '@mathesar/stores/confirmation';
   import { modal } from '@mathesar/stores/modal';
@@ -31,7 +30,7 @@
   const databaseRouteContext = DatabaseRouteContext.get();
 
   $: ({ database, underlyingDatabase } = $databaseRouteContext);
-  $: void underlyingDatabase.run({ database_id: database.id });
+  $: void underlyingDatabase.runOptimally({ database_id: database.id });
   $: schemasMap = $schemasStore.data;
   $: schemasRequestStatus = $schemasStore.requestStatus;
   $: isLoading =
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
index 78970e3981..f04ba69e37 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
@@ -36,7 +36,7 @@
     collaborators.batchRunner({ database_id: database.id }),
     configuredRoles.batchRunner({ server_id: database.server.id }),
   ]);
-  $: void users.runIfNotInitialized();
+  $: void users.runOptimally();
   $: isLoading =
     $collaborators.isLoading || $configuredRoles.isLoading || $users.isLoading;
   $: isSuccess = $collaborators.isOk && $configuredRoles.isOk && $users.isOk;
diff --git a/mathesar_ui/src/pages/database/settings/roles/Roles.svelte b/mathesar_ui/src/pages/database/settings/roles/Roles.svelte
index 7f7777a5aa..5778618f17 100644
--- a/mathesar_ui/src/pages/database/settings/roles/Roles.svelte
+++ b/mathesar_ui/src/pages/database/settings/roles/Roles.svelte
@@ -22,7 +22,7 @@
 
   $: ({ database, roles } = $routeContext.databaseRouteContext);
 
-  $: void roles.runIfNotInitialized({ database_id: database.id });
+  $: void roles.runOptimally({ database_id: database.id });
   $: roleList = [...($roles.resolvedValue?.values() ?? [])];
 
   let targetRole: Role | undefined = undefined;
diff --git a/mathesar_ui/src/stores/AsyncRpcApiStore.ts b/mathesar_ui/src/stores/AsyncRpcApiStore.ts
index b6d482c0c3..b21a999a98 100644
--- a/mathesar_ui/src/stores/AsyncRpcApiStore.ts
+++ b/mathesar_ui/src/stores/AsyncRpcApiStore.ts
@@ -72,31 +72,30 @@ export default class AsyncRpcApiStore<Props, T, U = T> extends AsyncStore<
   static async runBatched(
     batchRunners: BatchRunner[],
     options?: Partial<{
-      when?: 'always' | 'not-initialized' | ('always' | 'not-initialized')[];
-      onlyRunIfNotInitialized: boolean;
+      mode?: 'force-run' | 'optimal' | ('force-run' | 'optimal')[];
     }>,
   ) {
     const toRun = (() => {
-      if (options?.when && Array.isArray(options.when)) {
-        if (options.when.length !== batchRunners.length) {
+      if (options?.mode && Array.isArray(options.mode)) {
+        if (options.mode.length !== batchRunners.length) {
           throw new Error(
             'Number of run options do not match number of batchRunners',
           );
         }
         return batchRunners.filter((runner, index) => {
-          switch (options.when?.[index]) {
-            case 'always':
+          switch (options.mode?.[index]) {
+            case 'force-run':
               return true;
-            case 'not-initialized':
+            case 'optimal':
             default:
               return !runner.getValue().hasInitialized;
           }
         });
       }
-      if (options?.when === 'always') {
+      if (options?.mode === 'force-run') {
         return batchRunners;
       }
-      // default is `not-initialized`
+      // default is `optimal`
       return batchRunners.filter((runner) => !runner.getValue().hasInitialized);
     })();
 
diff --git a/mathesar_ui/src/stores/AsyncStore.ts b/mathesar_ui/src/stores/AsyncStore.ts
index 94c46640f8..b6a48a48b3 100644
--- a/mathesar_ui/src/stores/AsyncStore.ts
+++ b/mathesar_ui/src/stores/AsyncStore.ts
@@ -152,12 +152,18 @@ export default class AsyncStore<Props = void, T = unknown>
     }
   }
 
-  async runIfNotInitialized(props: Props): Promise<AsyncStoreValue<T, string>> {
+  /**
+   * Only runs if the current value is one of
+   * - not initialized
+   * - rejected
+   * - not loading
+   */
+  async runOptimally(props: Props): Promise<AsyncStoreValue<T, string>> {
     const value = get(this.value);
-    if (!value.hasInitialized) {
-      return this.run(props);
+    if (value.isLoading || value.isOk) {
+      return value;
     }
-    return value;
+    return this.run(props);
   }
 
   /**

From ceb899802f1cbd5b6f3b895763c610e22cf4c853 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 30 Sep 2024 13:08:41 +0530
Subject: [PATCH 1033/1141] Remove caching in schemas store

---
 .../database/schemas/SchemasSection.svelte    |   4 +-
 mathesar_ui/src/stores/schemas.ts             | 179 +++++++-----------
 2 files changed, 68 insertions(+), 115 deletions(-)

diff --git a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
index b435544285..1aa5237f54 100644
--- a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
@@ -11,7 +11,7 @@
   import { confirmDelete } from '@mathesar/stores/confirmation';
   import { modal } from '@mathesar/stores/modal';
   import {
-    type DBSchemaStoreData,
+    type SchemaStoreData,
     deleteSchema as deleteSchemaAPI,
     schemas as schemasStore,
   } from '@mathesar/stores/schemas';
@@ -43,7 +43,7 @@
   let targetSchema: Schema | undefined;
 
   function filterSchemas(
-    schemaData: DBSchemaStoreData['data'],
+    schemaData: SchemaStoreData['data'],
     filter: string,
   ): Schema[] {
     const filtered: Schema[] = [];
diff --git a/mathesar_ui/src/stores/schemas.ts b/mathesar_ui/src/stores/schemas.ts
index 25af9a80a4..658035084a 100644
--- a/mathesar_ui/src/stores/schemas.ts
+++ b/mathesar_ui/src/stores/schemas.ts
@@ -1,6 +1,5 @@
 import {
   type Readable,
-  type Unsubscriber,
   type Writable,
   derived,
   get,
@@ -12,8 +11,9 @@ import { api } from '@mathesar/api/rpc';
 import type { RawSchema } from '@mathesar/api/rpc/schemas';
 import type { Database } from '@mathesar/models/Database';
 import { Schema } from '@mathesar/models/Schema';
+import { getErrorMessage } from '@mathesar/utils/errors';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
-import type { CancellablePromise } from '@mathesar-component-library';
+import { type CancellablePromise, collapse } from '@mathesar-component-library';
 
 import { databasesStore } from './databases';
 
@@ -23,50 +23,41 @@ export const currentSchemaId: Writable<Schema['oid'] | undefined> = writable(
   commonData.current_schema ?? undefined,
 );
 
-export interface DBSchemaStoreData {
+export interface SchemaStoreData {
+  databaseId?: Database['id'];
   requestStatus: RequestStatus;
   data: Map<Schema['oid'], Schema>;
 }
 
-const dbSchemaStoreMap: Map<
-  Database['id'],
-  Writable<DBSchemaStoreData>
-> = new Map();
-const dbSchemasRequestMap: Map<
-  Database['id'],
-  CancellablePromise<RawSchema[]>
-> = new Map();
+function makeEmptySchemasData(): SchemaStoreData {
+  return {
+    requestStatus: { state: 'success' },
+    data: new Map(),
+  };
+}
 
-function setDBSchemaStore(
-  database: Database,
-  rawSchemas: RawSchema[],
-): Writable<DBSchemaStoreData> {
-  const schemaMap: DBSchemaStoreData['data'] = new Map();
+const schemasStore: Writable<SchemaStoreData> = writable(
+  makeEmptySchemasData(),
+);
+
+let request: CancellablePromise<RawSchema[]>;
+
+function setSchemasInStore(database: Database, rawSchemas: RawSchema[]) {
+  const schemasMap = new Map<Schema['oid'], Schema>();
   rawSchemas.forEach((rawSchema) => {
-    schemaMap.set(rawSchema.oid, new Schema({ database, rawSchema }));
+    schemasMap.set(rawSchema.oid, new Schema({ database, rawSchema }));
   });
-  const storeValue: DBSchemaStoreData = {
+  schemasStore.set({
+    databaseId: database.id,
     requestStatus: { state: 'success' },
-    data: schemaMap,
-  };
-
-  let store = dbSchemaStoreMap.get(database.id);
-  if (!store) {
-    store = writable(storeValue);
-    dbSchemaStoreMap.set(database.id, store);
-  } else {
-    store.set(storeValue);
-  }
-  return store;
+    data: schemasMap,
+  });
 }
 
-function updateSchemaInDBSchemaStore(
-  databaseId: Database['id'],
-  schema: Schema,
-) {
-  const store = dbSchemaStoreMap.get(databaseId);
-  if (store) {
-    store.update((value) => {
+function updateSchemaInStore(database: Database, schema: Schema) {
+  const $schemasStore = get(schemasStore);
+  if ($schemasStore.databaseId === database.id) {
+    schemasStore.update((value) => {
       value.data?.set(schema.oid, schema);
       return {
         ...value,
@@ -76,10 +67,10 @@ function updateSchemaInDBSchemaStore(
   }
 }
 
-function removeSchemaInDBSchemaStore(database: Database, schema: Schema) {
-  const store = dbSchemaStoreMap.get(database.id);
-  if (store) {
-    store.update((value) => {
+function removeSchemaInStore(database: Database, schema: Schema) {
+  const $schemasStore = get(schemasStore);
+  if ($schemasStore.databaseId === database.id) {
+    schemasStore.update((value) => {
       value.data?.delete(schema.oid);
       return {
         ...value,
@@ -89,64 +80,30 @@ function removeSchemaInDBSchemaStore(database: Database, schema: Schema) {
   }
 }
 
-async function refetchSchemasForDB(
-  database: Database,
-): Promise<DBSchemaStoreData | undefined> {
-  const store = dbSchemaStoreMap.get(database.id);
-  if (!store) {
-    console.error(`DB Schemas store for database: ${database.id} not found.`);
-    return undefined;
+async function fetchSchemasForCurrentDatabase() {
+  request?.cancel();
+  const $currentDatabase = get(databasesStore.currentDatabase);
+  if (!$currentDatabase) {
+    schemasStore.set(makeEmptySchemasData());
+    return;
   }
 
+  schemasStore.set({
+    databaseId: $currentDatabase.id,
+    requestStatus: { state: 'processing' },
+    data: new Map(),
+  });
   try {
-    store.update((currentData) => ({
-      ...currentData,
-      requestStatus: { state: 'processing' },
-    }));
-
-    dbSchemasRequestMap.get(database.id)?.cancel();
-
-    const schemaRequest = api.schemas.list({ database_id: database.id }).run();
-    dbSchemasRequestMap.set(database.id, schemaRequest);
-    const schemas = await schemaRequest;
-
-    const dbSchemasStore = setDBSchemaStore(database, schemas);
-
-    return get(dbSchemasStore);
+    request = api.schemas.list({ database_id: $currentDatabase.id }).run();
+    const rawSchemas = await request;
+    setSchemasInStore($currentDatabase, rawSchemas);
   } catch (err) {
-    store.update((currentData) => ({
-      ...currentData,
-      requestStatus: {
-        state: 'failure',
-        errors: [
-          err instanceof Error ? err.message : 'Error in fetching schemas',
-        ],
-      },
-    }));
-    return undefined;
-  }
-}
-
-let preload = true;
-
-function getSchemasStoreForDB(database: Database): Writable<DBSchemaStoreData> {
-  let store = dbSchemaStoreMap.get(database.id);
-  if (!store) {
-    store = writable({
-      requestStatus: { state: 'processing' },
+    schemasStore.set({
+      databaseId: $currentDatabase.id,
+      requestStatus: { state: 'failure', errors: [getErrorMessage(err)] },
       data: new Map(),
     });
-    dbSchemaStoreMap.set(database.id, store);
-    if (preload && commonData.current_database === database.id) {
-      store = setDBSchemaStore(database, commonData.schemas ?? []);
-    } else {
-      void refetchSchemasForDB(database);
-    }
-    preload = false;
-  } else if (get(store).requestStatus.state === 'failure') {
-    void refetchSchemasForDB(database);
   }
-  return store;
 }
 
 export async function createSchema(
@@ -163,35 +120,31 @@ export async function createSchema(
       description: props.description,
     })
     .run();
-  updateSchemaInDBSchemaStore(database.id, new Schema({ database, rawSchema }));
+  updateSchemaInStore(database, new Schema({ database, rawSchema }));
 }
 
 export async function deleteSchema(schema: Schema): Promise<void> {
   await schema.delete();
-  removeSchemaInDBSchemaStore(schema.database, schema);
+  removeSchemaInStore(schema.database, schema);
 }
 
-export const schemas: Readable<DBSchemaStoreData> = derived(
-  databasesStore.currentDatabase,
-  ($currentDatabase, set) => {
-    let unsubscribe: Unsubscriber;
-
-    if (!$currentDatabase) {
-      set({
-        requestStatus: { state: 'success' },
-        data: new Map(),
-      });
-    } else {
-      const store = getSchemasStoreForDB($currentDatabase);
-      unsubscribe = store.subscribe((dbSchemasData) => {
-        set(dbSchemasData);
-      });
-    }
+let preload = true;
 
-    return () => {
-      unsubscribe?.();
-    };
-  },
+export const schemas = collapse(
+  derived(databasesStore.currentDatabase, ($currentDatabase) => {
+    const $schemasStore = get(schemasStore);
+    if ($schemasStore.databaseId !== $currentDatabase?.id) {
+      if (preload && commonData.current_database === $currentDatabase?.id) {
+        setSchemasInStore($currentDatabase, commonData.schemas);
+      } else {
+        void fetchSchemasForCurrentDatabase();
+      }
+      preload = false;
+    } else if ($schemasStore.requestStatus.state === 'failure') {
+      void fetchSchemasForCurrentDatabase();
+    }
+    return schemasStore;
+  }),
 );
 
 export const currentSchema: Readable<Schema | undefined> = derived(

From 23de40715c09707bf545e8878a7b6b8580100349 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 30 Sep 2024 16:15:05 +0530
Subject: [PATCH 1034/1141] Remove table list caching for multiple schemas in
 tables store

---
 .../database/schemas/SchemasSection.svelte    |   3 -
 .../src/pages/schema/SchemaOverview.svelte    |   4 +-
 mathesar_ui/src/stores/tables.ts              | 277 ++++++++----------
 .../link-table/LinkTableForm.svelte           |   4 +-
 4 files changed, 130 insertions(+), 158 deletions(-)

diff --git a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
index 1aa5237f54..1f4907a5c2 100644
--- a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
@@ -15,7 +15,6 @@
     deleteSchema as deleteSchemaAPI,
     schemas as schemasStore,
   } from '@mathesar/stores/schemas';
-  import { removeTablesStore } from '@mathesar/stores/tables';
   import AddEditSchemaModal from '@mathesar/systems/schemas/AddEditSchemaModal.svelte';
   import {
     Button,
@@ -74,8 +73,6 @@
       body: [$_('schema_delete_warning'), $_('are_you_sure_to_proceed')],
       onProceed: async () => {
         await deleteSchemaAPI(schema);
-        // TODO: Create common util to handle data clearing & sync between stores
-        removeTablesStore(schema);
       },
     });
   }
diff --git a/mathesar_ui/src/pages/schema/SchemaOverview.svelte b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
index c33ad6abe7..593aa8b424 100644
--- a/mathesar_ui/src/pages/schema/SchemaOverview.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
@@ -11,7 +11,7 @@
   import type { Table } from '@mathesar/models/Table';
   import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
   import { refetchExplorationsForSchema } from '@mathesar/stores/queries';
-  import { refetchTablesForSchema } from '@mathesar/stores/tables';
+  import { fetchTablesForCurrentSchema } from '@mathesar/stores/tables';
   import { AnchorButton, Button } from '@mathesar-component-library';
 
   import CreateNewExplorationTutorial from './CreateNewExplorationTutorial.svelte';
@@ -59,7 +59,7 @@
         <div>
           <SpinnerButton
             onClick={async () => {
-              await refetchTablesForSchema(schema);
+              await fetchTablesForCurrentSchema();
             }}
             label={$_('retry')}
             icon={iconRefresh}
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index 6d834bc03b..a19b56e513 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -10,14 +10,7 @@
  */
 
 import { execPipe, filter, map } from 'iter-tools';
-import {
-  type Readable,
-  type Writable,
-  derived,
-  get,
-  readable,
-  writable,
-} from 'svelte/store';
+import { type Readable, derived, get, writable } from 'svelte/store';
 import { _ } from 'svelte-i18n';
 
 import type { DataFile } from '@mathesar/api/rest/types/dataFiles';
@@ -33,7 +26,7 @@ import {
   type RpcRequest,
   batchSend,
 } from '@mathesar/packages/json-rpc-client-builder';
-import { TupleMap } from '@mathesar/packages/tuple-map';
+import { getErrorMessage } from '@mathesar/utils/errors';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
 import { tableRequiresImportConfirmation } from '@mathesar/utils/tables';
 import {
@@ -49,6 +42,8 @@ const commonData = preloadCommonData();
 type TablesMap = Map<Table['oid'], Table>;
 
 interface TablesData {
+  databaseId?: Database['id'];
+  schemaOid?: Schema['oid'];
   tablesMap: TablesMap;
   requestStatus: RequestStatus;
 }
@@ -60,136 +55,100 @@ function makeEmptyTablesData(): TablesData {
   };
 }
 
-type TablesStore = Writable<TablesData>;
-
-/** Maps [databaseId, schemaOid] to TablesStore */
-const tablesStores = new TupleMap<
-  [Database['id'], Schema['oid']],
-  TablesStore
->();
-
-const tablesRequests = new TupleMap<
-  [Database['id'], Schema['oid']],
-  CancellablePromise<RawTableWithMetadata[]>
->();
+const tablesStore = writable(makeEmptyTablesData());
 
 function sortTables(tables: Iterable<Table>): Table[] {
   return [...tables].sort((a, b) => a.name.localeCompare(b.name));
 }
 
-function setTablesStore(schema: Schema, tables: Table[]): TablesStore {
+function setTablesStore(
+  schema: Schema,
+  rawTablesWithMetadata: RawTableWithMetadata[],
+) {
+  const tables = rawTablesWithMetadata.map(
+    (t) =>
+      new Table({
+        schema,
+        rawTableWithMetadata: t,
+      }),
+  );
+
   const tablesMap: TablesMap = new Map();
-  if (tables) {
-    sortTables(tables).forEach((t) => tablesMap.set(t.oid, t));
-  }
+  sortTables(tables).forEach((t) => tablesMap.set(t.oid, t));
 
-  const storeValue: TablesData = {
+  tablesStore.set({
+    databaseId: schema.database.id,
+    schemaOid: schema.oid,
     tablesMap,
     requestStatus: { state: 'success' },
-  };
-
-  let store = tablesStores.get([schema.database.id, schema.oid]);
-  if (!store) {
-    store = writable(storeValue);
-    tablesStores.set([schema.database.id, schema.oid], store);
-  } else {
-    store.set(storeValue);
-  }
-  return store;
+  });
 }
 
-export function removeTablesStore(schema: Schema): void {
-  tablesStores.delete([schema.database.id, schema.oid]);
-}
+let request: CancellablePromise<RawTableWithMetadata[]>;
 
-export async function refetchTablesForSchema(
-  schema: Schema,
-): Promise<TablesData | undefined> {
-  const store = tablesStores.get([schema.database.id, schema.oid]);
-  if (!store) {
-    // TODO: why are we logging an error here? I would expect that we'd either
-    // throw or ignore. If there's a reason for this logging, please add a code
-    // comment explaining why.
-    console.error('Tables store not found.');
-    return undefined;
+export async function fetchTablesForCurrentSchema() {
+  request?.cancel();
+
+  const $currentSchema = get(currentSchema);
+  if (!$currentSchema) {
+    tablesStore.set(makeEmptyTablesData());
+    return;
   }
 
   try {
-    store.update((currentData) => ({
-      ...currentData,
-      requestStatus: { state: 'processing' },
-    }));
-
-    tablesRequests.get([schema.database.id, schema.oid])?.cancel();
+    tablesStore.update(($tablesStore) => {
+      if (
+        $tablesStore.databaseId === $currentSchema.database.id &&
+        $tablesStore.schemaOid === $currentSchema.oid
+      ) {
+        return {
+          ...$tablesStore,
+          requestStatus: { state: 'processing' },
+        };
+      }
+      return {
+        databaseId: $currentSchema.database.id,
+        schemaOid: $currentSchema.oid,
+        tablesMap: new Map(),
+        requestStatus: { state: 'processing' },
+      };
+    });
 
-    const tablesRequest = api.tables
+    request = api.tables
       .list_with_metadata({
-        database_id: schema.database.id,
-        schema_oid: schema.oid,
+        database_id: $currentSchema.database.id,
+        schema_oid: $currentSchema.oid,
       })
       .run();
-    tablesRequests.set([schema.database.id, schema.oid], tablesRequest);
-    const tableEntries = await tablesRequest;
-
-    const schemaTablesStore = setTablesStore(
-      schema,
-      tableEntries.map(
-        (t) =>
-          new Table({
-            schema,
-            rawTableWithMetadata: t,
-          }),
-      ),
-    );
-
-    return get(schemaTablesStore);
-  } catch (err) {
-    store.update((currentData) => ({
-      ...currentData,
-      requestStatus: {
-        state: 'failure',
-        errors: [
-          err instanceof Error ? err.message : 'Error in fetching schemas',
-        ],
-      },
-    }));
-    return undefined;
-  }
-}
 
-let preload = true;
+    const tableEntries = await request;
 
-function getTablesStore(schema: Schema): TablesStore {
-  let store = tablesStores.get([schema.database.id, schema.oid]);
-  if (!store) {
-    store = writable({
-      requestStatus: { state: 'processing' },
-      tablesMap: new Map(),
+    setTablesStore($currentSchema, tableEntries);
+  } catch (err) {
+    tablesStore.update(($tablesStore) => {
+      if (
+        $tablesStore.databaseId === $currentSchema.database.id &&
+        $tablesStore.schemaOid === $currentSchema.oid
+      ) {
+        return {
+          ...$tablesStore,
+          requestStatus: {
+            state: 'failure',
+            errors: [getErrorMessage(err)],
+          },
+        };
+      }
+      return {
+        databaseId: $currentSchema.database.id,
+        schemaOid: $currentSchema.oid,
+        tablesMap: new Map(),
+        requestStatus: {
+          state: 'failure',
+          errors: [getErrorMessage(err)],
+        },
+      };
     });
-    tablesStores.set([schema.database.id, schema.oid], store);
-    if (
-      preload &&
-      commonData.current_schema === schema.oid &&
-      commonData.current_database === schema.database.id
-    ) {
-      store = setTablesStore(
-        schema,
-        commonData.tables.map(
-          (t) =>
-            new Table({
-              schema,
-              rawTableWithMetadata: t,
-            }),
-        ),
-      );
-    } else {
-      void refetchTablesForSchema(schema);
-    }
-    preload = false;
-  } else if (get(store).requestStatus.state === 'failure') {
-    void refetchTablesForSchema(schema);
   }
-  return store;
 }
 
 export function deleteTable(
@@ -206,15 +165,19 @@ export function deleteTable(
     (resolve, reject) => {
       void promise.then(() => {
         schema.setTableCount(get(schema.tableCount) - 1);
-        tablesStores
-          .get([schema.database.id, schema.oid])
-          ?.update((tableStoreData) => {
+        const $tablesStore = get(tablesStore);
+        if (
+          $tablesStore.databaseId === schema.database.id &&
+          $tablesStore.schemaOid === schema.oid
+        ) {
+          tablesStore.update((tableStoreData) => {
             tableStoreData.tablesMap.delete(tableOid);
             return {
               ...tableStoreData,
               tablesMap: new Map(tableStoreData.tablesMap),
             };
           });
+        }
         return resolve();
       }, reject);
     },
@@ -224,7 +187,7 @@ export function deleteTable(
   );
 }
 
-function updateTableStoreIfPresent({
+function putTableInStore({
   schema,
   rawTableWithMetadata,
 }: {
@@ -235,8 +198,11 @@ function updateTableStoreIfPresent({
     schema,
     rawTableWithMetadata,
   });
-  const tablesStore = tablesStores.get([schema.database.id, schema.oid]);
-  if (tablesStore) {
+  const $tablesStore = get(tablesStore);
+  if (
+    $tablesStore.databaseId === schema.database.id &&
+    $tablesStore.schemaOid === schema.oid
+  ) {
     tablesStore.update(({ requestStatus, tablesMap }) => {
       tablesMap.set(fullTable.oid, fullTable);
       const newTablesMap = new Map(
@@ -314,7 +280,7 @@ export async function updateTable({
       table_oid: rawPartialTable.oid,
     })
     .run();
-  return updateTableStoreIfPresent({ schema, rawTableWithMetadata });
+  return putTableInStore({ schema, rawTableWithMetadata });
 }
 
 export async function createTable({
@@ -338,7 +304,7 @@ export async function createTable({
     .run();
 
   schema.setTableCount(get(schema.tableCount) + 1);
-  return updateTableStoreIfPresent({ schema, rawTableWithMetadata });
+  return putTableInStore({ schema, rawTableWithMetadata });
 }
 
 export async function createTableFromDataFile(props: {
@@ -378,39 +344,34 @@ export function getTableFromStoreOrApi({
   schema: Schema;
   tableOid: Table['oid'];
 }): CancellablePromise<Table> {
-  const tablesStore = tablesStores.get([schema.database.id, schema.oid]);
-  if (tablesStore) {
-    const table = get(tablesStore).tablesMap.get(tableOid);
+  const $tablesStore = get(tablesStore);
+
+  if (
+    $tablesStore.databaseId === schema.database.id &&
+    $tablesStore.schemaOid === schema.oid
+  ) {
+    const table = $tablesStore.tablesMap.get(tableOid);
     if (table) {
       return new CancellablePromise((resolve) => {
         resolve(table);
       });
     }
   }
+
   const promise = api.tables
     .get_with_metadata({
       database_id: schema.database.id,
       table_oid: tableOid,
     })
     .run();
+
   return new CancellablePromise(
     (resolve, reject) => {
       void promise.then((rawTableWithMetadata) => {
-        const table = new Table({ schema, rawTableWithMetadata });
-        const store = tablesStores.get([schema.database.id, schema.oid]);
-        if (store) {
-          store.update((existing) => {
-            const tableMap = new Map<number, Table>();
-            const tables = [...existing.tablesMap.values(), table];
-            sortTables(tables).forEach((t) => {
-              tableMap.set(t.oid, t);
-            });
-            return {
-              ...existing,
-              tablesMap: tableMap,
-            };
-          });
-        }
+        const table = putTableInStore({
+          schema,
+          rawTableWithMetadata,
+        });
         return resolve(table);
       }, reject);
     },
@@ -420,10 +381,30 @@ export function getTableFromStoreOrApi({
   );
 }
 
+let preload = true;
+
 export const currentTablesData = collapse(
-  derived([currentSchema], ([schema]) =>
-    !schema ? readable(makeEmptyTablesData()) : getTablesStore(schema),
-  ),
+  derived(currentSchema, ($currentSchema) => {
+    const $tablesStore = get(tablesStore);
+    if (
+      $tablesStore.databaseId !== $currentSchema?.database.id ||
+      $tablesStore.schemaOid !== $currentSchema?.oid
+    ) {
+      if (
+        preload &&
+        commonData.current_schema === $currentSchema?.oid &&
+        commonData.current_database === $currentSchema?.database.id
+      ) {
+        setTablesStore($currentSchema, commonData.tables);
+      } else {
+        void fetchTablesForCurrentSchema();
+      }
+      preload = false;
+    } else if ($tablesStore.requestStatus.state === 'failure') {
+      void fetchTablesForCurrentSchema();
+    }
+    return tablesStore;
+  }),
 );
 
 export const currentTablesMap = derived(
@@ -466,12 +447,6 @@ export const currentTable = derived(
 export function factoryToGetTableNameValidationErrors(
   table: Table,
 ): Readable<(n: string) => string[]> {
-  const tablesStore = tablesStores.get([
-    table.schema.database.id,
-    table.schema.oid,
-  ]);
-  if (!tablesStore) throw new Error('Tables store not found');
-
   const otherTableNames = derived(
     tablesStore,
     (d) =>
diff --git a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
index 7f107efb1d..5a5d15d98c 100644
--- a/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
+++ b/mathesar_ui/src/systems/table-view/link-table/LinkTableForm.svelte
@@ -23,8 +23,8 @@
   } from '@mathesar/stores/table-data';
   import {
     currentTables,
+    fetchTablesForCurrentSchema,
     importVerifiedTables as importVerifiedTablesStore,
-    refetchTablesForSchema,
     validateNewTableName,
   } from '@mathesar/stores/tables';
   import { toast } from '@mathesar/stores/toast';
@@ -161,7 +161,7 @@
 
   async function reFetchOtherThingsThatChanged() {
     if ($linkType === 'manyToMany') {
-      await refetchTablesForSchema(base.schema);
+      await fetchTablesForCurrentSchema();
       return;
     }
     const tableWithNewColumn = $linkType === 'oneToMany' ? target : base;

From bc7863bf5cf70cccf6abfd90a2c1a0d3b3896d62 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 30 Sep 2024 17:26:03 +0530
Subject: [PATCH 1035/1141] Fix: Re-add accidentally removed translation from
 https://github.com/mathesar-foundation/mathesar/commit/a66873b866a2ec34125a204bf86e3090c1fbf191#r147380449

---
 mathesar_ui/src/i18n/languages/en/dict.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 49faeebfb6..4fccfa95bb 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -531,6 +531,7 @@
   "select_columns_cells_view_properties": "Select one or more columns or cells to view the associated column properties and actions.",
   "select_columns_extract": "Select the columns you want to extract",
   "select_columns_extract_into_table": "Select the columns you want to extract into [targetTableName]",
+  "select_columns_for_exploration_help": "Select the columns that will be used for the exploration. Columns are limited to those from the base table and its linked tables.",
   "select_columns_move": "Select the columns you want to move",
   "select_columns_move_into_table": "Select the columns you want to move into [targetTableName]",
   "select_columns_to_hide": "Select Columns to Hide",

From dfb8336168706b35094450c3ac7a40276069b68e Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 30 Sep 2024 17:27:40 +0530
Subject: [PATCH 1036/1141] Fix: Handle None case while providing explorations
 list in common data, remove abstract_types from common data

---
 mathesar/views.py | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/mathesar/views.py b/mathesar/views.py
index 7d5c140955..be4246eb0d 100644
--- a/mathesar/views.py
+++ b/mathesar/views.py
@@ -45,19 +45,15 @@ def get_table_list(request, database_id, schema_oid):
         return []
 
 
-def get_queries_list(request, database_id, schema_id):
-    return explorations_list(request=request, database_id=database_id, schema_oid=schema_id)
-
-
-def get_ui_type_list(request, database_id):
-    if database_id is None:
+def get_queries_list(request, database_id, schema_oid):
+    if database_id is not None and schema_oid is not None:
+        return explorations_list(
+            request=request,
+            database_id=database_id,
+            schema_oid=schema_oid
+        )
+    else:
         return []
-    type_serializer = TypeSerializer(
-        UIType,
-        many=True,
-        context={'request': request}
-    )
-    return type_serializer.data
 
 
 def get_user_data(request):
@@ -84,7 +80,6 @@ def _get_internal_db_meta():
 
 def _get_base_data_all_routes(request, database_id=None, schema_id=None):
     return {
-        'abstract_types': get_ui_type_list(request, database_id),
         'current_database': int(database_id) if database_id else None,
         'current_schema': int(schema_id) if schema_id else None,
         'current_release_tag_name': __version__,

From 63a3980e25b171e6132c9f9b08b8e840daca882c Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 30 Sep 2024 17:36:45 +0530
Subject: [PATCH 1037/1141] Only cache explorations of current schema

---
 .../src/pages/schema/SchemaOverview.svelte    |   4 +-
 mathesar_ui/src/stores/queries.ts             | 275 +++++++++---------
 2 files changed, 133 insertions(+), 146 deletions(-)

diff --git a/mathesar_ui/src/pages/schema/SchemaOverview.svelte b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
index 593aa8b424..f38ef5e373 100644
--- a/mathesar_ui/src/pages/schema/SchemaOverview.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaOverview.svelte
@@ -10,7 +10,7 @@
   import type { Schema } from '@mathesar/models/Schema';
   import type { Table } from '@mathesar/models/Table';
   import { getDataExplorerPageUrl } from '@mathesar/routes/urls';
-  import { refetchExplorationsForSchema } from '@mathesar/stores/queries';
+  import { fetchExplorationsForCurrentSchema } from '@mathesar/stores/queries';
   import { fetchTablesForCurrentSchema } from '@mathesar/stores/tables';
   import { AnchorButton, Button } from '@mathesar-component-library';
 
@@ -88,7 +88,7 @@
           <div>
             <SpinnerButton
               onClick={async () => {
-                await refetchExplorationsForSchema(schema);
+                await fetchExplorationsForCurrentSchema();
               }}
               label={$_('retry')}
               icon={iconRefresh}
diff --git a/mathesar_ui/src/stores/queries.ts b/mathesar_ui/src/stores/queries.ts
index 65ed5910a3..1b21e692cf 100644
--- a/mathesar_ui/src/stores/queries.ts
+++ b/mathesar_ui/src/stores/queries.ts
@@ -32,14 +32,7 @@
  * to having us use the currentSchemaId store directly.
  */
 
-import {
-  type Readable,
-  type Unsubscriber,
-  type Writable,
-  derived,
-  get,
-  writable,
-} from 'svelte/store';
+import { derived, get, writable } from 'svelte/store';
 
 import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
 import { api } from '@mathesar/api/rpc';
@@ -48,31 +41,31 @@ import type {
   ExplorationResult,
   SavedExploration,
 } from '@mathesar/api/rpc/explorations';
+import type { Database } from '@mathesar/models/Database';
 import type { Schema } from '@mathesar/models/Schema';
-import CacheManager from '@mathesar/utils/CacheManager';
+import { getErrorMessage } from '@mathesar/utils/errors';
 import { preloadCommonData } from '@mathesar/utils/preloadData';
-import type { CancellablePromise } from '@mathesar-component-library';
+import { type CancellablePromise, collapse } from '@mathesar-component-library';
 
 import { currentSchema } from './schemas';
 
 const commonData = preloadCommonData();
 
 export interface QueriesStoreSubstance {
-  schemaId: Schema['oid'];
+  databaseId?: Database['id'];
+  schemaOid?: Schema['oid'];
   requestStatus: RequestStatus;
   data: Map<SavedExploration['id'], SavedExploration>;
 }
 
-// Cache the query list of the last 3 opened schemas
-const schemasCacheManager = new CacheManager<
-  Schema['oid'],
-  Writable<QueriesStoreSubstance>
->(3);
+function makeEmptyQueriesStoreSubstance(): QueriesStoreSubstance {
+  return {
+    data: new Map(),
+    requestStatus: { state: 'success' },
+  };
+}
 
-const requestMap: Map<
-  Schema['oid'],
-  CancellablePromise<SavedExploration[]>
-> = new Map();
+const queriesStore = writable(makeEmptyQueriesStoreSubstance());
 
 function sortedQueryEntries(
   queryEntries: SavedExploration[],
@@ -80,139 +73,110 @@ function sortedQueryEntries(
   return [...queryEntries].sort((a, b) => a.name?.localeCompare(b.name));
 }
 
-function setSchemaQueriesStore(
-  schemaId: Schema['oid'],
-  queryEntries?: SavedExploration[],
-): Writable<QueriesStoreSubstance> {
+function setExplorationsStore(
+  schema: Schema,
+  queryEntries: SavedExploration[],
+) {
   const queries: QueriesStoreSubstance['data'] = new Map();
-  if (queryEntries) {
-    sortedQueryEntries(queryEntries).forEach((entry) => {
-      queries.set(entry.id, entry);
-    });
-  }
+  sortedQueryEntries(queryEntries).forEach((entry) => {
+    queries.set(entry.id, entry);
+  });
 
-  const storeValue: QueriesStoreSubstance = {
-    schemaId,
-    requestStatus: { state: 'success' },
+  queriesStore.set({
+    databaseId: schema.database.id,
+    schemaOid: schema.oid,
     data: queries,
-  };
-
-  let store = schemasCacheManager.get(schemaId);
-  if (!store) {
-    store = writable(storeValue);
-    schemasCacheManager.set(schemaId, store);
-  } else {
-    store.set(storeValue);
-  }
-  return store;
+    requestStatus: { state: 'success' },
+  });
 }
 
-function findSchemaStoreForQuery(id: SavedExploration['id']) {
-  return [...schemasCacheManager.cache.values()].find((entry) =>
-    get(entry).data.has(id),
-  );
-}
+let request: CancellablePromise<SavedExploration[]>;
 
-export async function refetchExplorationsForSchema(schema: {
-  oid: number;
-  database: { id: number };
-}): Promise<QueriesStoreSubstance | undefined> {
-  const store = schemasCacheManager.get(schema.oid);
-  if (!store) {
-    console.error(`Queries store for schema: ${schema.oid} not found.`);
-    return undefined;
+export async function fetchExplorationsForCurrentSchema(): Promise<void> {
+  request?.cancel();
+
+  const $currentSchema = get(currentSchema);
+  if (!$currentSchema) {
+    queriesStore.set(makeEmptyQueriesStoreSubstance());
+    return;
   }
 
   try {
-    store.update((currentData) => ({
-      ...currentData,
-      requestStatus: { state: 'processing' },
-    }));
-
-    requestMap.get(schema.oid)?.cancel();
+    queriesStore.update(($queriesStore) => {
+      if (
+        $queriesStore.databaseId === $currentSchema.database.id &&
+        $queriesStore.schemaOid === $currentSchema.oid
+      ) {
+        return {
+          ...$queriesStore,
+          requestStatus: { state: 'processing' },
+        };
+      }
+      return {
+        databaseId: $currentSchema.database.id,
+        schemaOid: $currentSchema.oid,
+        data: new Map(),
+        requestStatus: { state: 'processing' },
+      };
+    });
 
-    const queriesRequest = api.explorations
+    request = api.explorations
       .list({
-        database_id: schema.database.id,
-        schema_oid: schema.oid,
+        database_id: $currentSchema.database.id,
+        schema_oid: $currentSchema.oid,
       })
       .run();
-    requestMap.set(schema.oid, queriesRequest);
-
-    const queriesResult = await queriesRequest;
-    const schemaQueriesStore = setSchemaQueriesStore(schema.oid, queriesResult);
 
-    return get(schemaQueriesStore);
+    const queriesResult = await request;
+    setExplorationsStore($currentSchema, queriesResult);
   } catch (err) {
-    store.update((currentData) => ({
-      ...currentData,
-      requestStatus: {
-        state: 'failure',
-        errors: [
-          err instanceof Error ? err.message : 'Error in fetching schemas',
-        ],
-      },
-    }));
-    return undefined;
+    queriesStore.update(($queriesStore) => {
+      if (
+        $queriesStore.databaseId === $currentSchema.database.id &&
+        $queriesStore.schemaOid === $currentSchema.oid
+      ) {
+        return {
+          ...$queriesStore,
+          requestStatus: {
+            state: 'failure',
+            errors: [getErrorMessage(err)],
+          },
+        };
+      }
+      return {
+        databaseId: $currentSchema.database.id,
+        schemaOid: $currentSchema.oid,
+        data: new Map(),
+        requestStatus: {
+          state: 'failure',
+          errors: [getErrorMessage(err)],
+        },
+      };
+    });
   }
 }
 
-let preload = true;
+function putExplorationInStore(exploration: SavedExploration) {
+  const $currentSchema = get(currentSchema);
+  if (!$currentSchema) {
+    return;
+  }
 
-export function getExplorationsStoreForSchema(schema: {
-  oid: number;
-  database: { id: number };
-}): Writable<QueriesStoreSubstance> {
-  let store = schemasCacheManager.get(schema.oid);
-  if (!store) {
-    store = writable({
-      schemaId: schema.oid,
-      requestStatus: { state: 'processing' },
-      data: new Map(),
-    });
-    schemasCacheManager.set(schema.oid, store);
-    if (preload && commonData.current_schema === schema.oid) {
-      store = setSchemaQueriesStore(schema.oid, commonData.queries ?? []);
-    } else {
-      void refetchExplorationsForSchema(schema);
-    }
-    preload = false;
-  } else if (get(store).requestStatus.state === 'failure') {
-    void refetchExplorationsForSchema(schema);
+  if (
+    exploration.database_id === $currentSchema.database.id &&
+    exploration.schema_oid === $currentSchema.oid
+  ) {
+    const queryData = get(queriesStore).data.set(exploration.id, exploration);
+    setExplorationsStore($currentSchema, [...queryData.values()]);
   }
-  return store;
 }
 
-export const queries: Readable<Omit<QueriesStoreSubstance, 'schemaId'>> =
-  derived(currentSchema, ($currentSchema, set) => {
-    let unsubscribe: Unsubscriber;
-
-    if (!$currentSchema) {
-      set({
-        requestStatus: { state: 'success' },
-        data: new Map(),
-      });
-    } else {
-      const store = getExplorationsStoreForSchema($currentSchema);
-      unsubscribe = store.subscribe((dbSchemasData) => {
-        set(dbSchemasData);
-      });
-    }
-
-    return () => {
-      unsubscribe?.();
-    };
-  });
-
 export function addExploration(
   exploration: AddableExploration,
 ): CancellablePromise<SavedExploration> {
   const promise = api.explorations.add({ exploration_def: exploration }).run();
   void promise.then((savedExploration) => {
-    void refetchExplorationsForSchema({
-      oid: savedExploration.schema_oid,
-      database: { id: exploration.database_id },
-    });
+    putExplorationInStore(savedExploration);
     return savedExploration;
   });
   return promise;
@@ -226,14 +190,8 @@ export function replaceExploration(
     .run();
 
   void promise.then((newlySavedExploration) => {
-    const schemaId = newlySavedExploration.schema_oid;
-    const store = getExplorationsStoreForSchema({
-      oid: schemaId,
-      database: { id: newlySavedExploration.database_id },
-    });
-    get(store).data.set(exploration.id, newlySavedExploration);
-    setSchemaQueriesStore(schemaId, [...get(store).data.values()]);
-    return undefined;
+    putExplorationInStore(newlySavedExploration);
+    return newlySavedExploration;
   });
 
   return promise;
@@ -264,15 +222,44 @@ export function runSavedExploration(
 export function deleteExploration(id: number): CancellablePromise<void> {
   const promise = api.explorations.delete({ exploration_id: id }).run();
 
-  void promise.then(() => {
-    const store = findSchemaStoreForQuery(id);
-    if (store) {
-      store.update((storeData) => {
-        storeData.data.delete(id);
-        return { ...storeData, data: new Map(storeData.data) };
-      });
-    }
-    return undefined;
-  });
+  const $queriesStore = get(queriesStore);
+  const $currentSchema = get(currentSchema);
+  if (
+    $queriesStore.databaseId === $currentSchema?.database.id &&
+    $queriesStore.schemaOid === $currentSchema?.oid
+  ) {
+    $queriesStore.data.delete(id);
+    queriesStore.update((store) => ({
+      ...store,
+      data: new Map($queriesStore.data),
+    }));
+  }
+
   return promise;
 }
+
+let preload = true;
+
+export const queries = collapse(
+  derived(currentSchema, ($currentSchema) => {
+    const $queriesStore = get(queriesStore);
+    if (
+      $queriesStore.databaseId !== $currentSchema?.database.id ||
+      $queriesStore.schemaOid !== $currentSchema?.oid
+    ) {
+      if (
+        preload &&
+        commonData.current_schema === $currentSchema?.oid &&
+        commonData.current_database === $currentSchema?.database.id
+      ) {
+        setExplorationsStore($currentSchema, commonData.queries);
+      } else {
+        void fetchExplorationsForCurrentSchema();
+      }
+      preload = false;
+    } else if ($queriesStore.requestStatus.state === 'failure') {
+      void fetchExplorationsForCurrentSchema();
+    }
+    return queriesStore;
+  }),
+);

From 800dae7a603f2bc23a811859c7c58be77768998f Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 30 Sep 2024 17:37:22 +0530
Subject: [PATCH 1038/1141] Hide count in schema page when tables &
 explorations are being loaded

---
 mathesar_ui/src/pages/schema/SchemaPage.svelte | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mathesar_ui/src/pages/schema/SchemaPage.svelte b/mathesar_ui/src/pages/schema/SchemaPage.svelte
index 4106eec79b..3f5b07b4cd 100644
--- a/mathesar_ui/src/pages/schema/SchemaPage.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPage.svelte
@@ -56,12 +56,14 @@
     {
       label: $_('tables'),
       id: 'tables',
+      showCount: tablesRequestStatus.state === 'success',
       count: tablesMap.size,
       href: getSchemaPageTablesSectionUrl(database.id, schema.oid),
     },
     {
       label: $_('explorations'),
       id: 'explorations',
+      showCount: explorationsRequestStatus.state === 'success',
       count: explorationsMap.size,
       href: getSchemaPageExplorationsSectionUrl(database.id, schema.oid),
     },
@@ -125,7 +127,7 @@
   <TabContainer {activeTab} {tabs} uniformTabWidth={false}>
     <div slot="tab" let:tab class="tab-header-container">
       <span>{tab.label}</span>
-      {#if tab.count !== undefined}
+      {#if tab.count !== undefined && tab.showCount}
         <span class="count">{tab.count}</span>
       {/if}
     </div>

From 901c4612ed58179ea89c07727222fd3ae3c41f2e Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 30 Sep 2024 17:39:46 +0530
Subject: [PATCH 1039/1141] Fix: Translate toast message when role is created

---
 .../src/pages/database/settings/roles/CreateRoleModal.svelte    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte b/mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte
index a2637b057b..386a494c4d 100644
--- a/mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte
+++ b/mathesar_ui/src/pages/database/settings/roles/CreateRoleModal.svelte
@@ -60,7 +60,7 @@
         login: false,
       });
     }
-    toast.success('role_created_successfully');
+    toast.success($_('role_created_successfully'));
     controller.close();
   }
 </script>

From c621e9071a228134beb74c75b3925b828818672b Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 30 Sep 2024 18:38:06 +0530
Subject: [PATCH 1040/1141] Handle side effects when collaborator changes for
 currently logged in admin user

---
 mathesar_ui/src/i18n/languages/en/dict.json   |  1 +
 .../collaborators/CollaboratorRow.svelte      | 10 +++++-
 .../collaborators/Collaborators.svelte        | 33 +++++++++++++++--
 .../EditRoleForCollaboratorModal.svelte       |  2 ++
 mathesar_ui/src/stores/schemas.ts             | 35 ++++++++++++++-----
 5 files changed, 69 insertions(+), 12 deletions(-)

diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 4fccfa95bb..f1429c3cf2 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -66,6 +66,7 @@
   "click_save_button_to_save_changes": "Click Save button to save changes.",
   "collaborator": "Collaborator",
   "collaborator_added_successfully": "Collaborator added successfully",
+  "collaborator_removed_successfully": "Collaborator removed successfully",
   "collaborator_role_help": "This role determines permissions for this collaborator. Mathesar will use this PostgreSQL role for all database interactions by this user.",
   "collaborator_role_updated_successfully": "Role updated successfully for collaborator.",
   "collaborators": "Collaborators",
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
index f5048b68ee..810caa0d14 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
@@ -7,11 +7,13 @@
   import { iconDeleteMajor, iconEdit } from '@mathesar/icons';
   import type { Collaborator } from '@mathesar/models/Collaborator';
   import { confirmDelete } from '@mathesar/stores/confirmation';
+  import { toast } from '@mathesar/stores/toast';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import { Button, SpinnerButton } from '@mathesar-component-library';
 
   export let collaborator: Collaborator;
   export let editRoleForCollaborator: (collaborator: Collaborator) => void;
+  export let checkAndHandleSideEffects: (collaboror: Collaborator) => void;
 
   const routeContext = DatabaseSettingsRouteContext.get();
   $: ({ configuredRoles, users } = $routeContext);
@@ -23,6 +25,12 @@
   $: configuredRoleId = collaborator.configuredRoleId;
   $: configuredRole = $configuredRoles.resolvedValue?.get($configuredRoleId);
   $: userName = user ? user.full_name || user.username : '';
+
+  async function deleteCollaborator() {
+    await $routeContext.deleteCollaborator(collaborator);
+    checkAndHandleSideEffects(collaborator);
+    toast.success($_('collaborator_removed_successfully'));
+  }
 </script>
 
 <GridTableCell>
@@ -62,7 +70,7 @@
         identifierName: userName,
         identifierType: $_('collaborator'),
       })}
-    onClick={() => $routeContext.deleteCollaborator(collaborator)}
+    onClick={deleteCollaborator}
     icon={{ ...iconDeleteMajor, size: '0.8em' }}
     label=""
     appearance="secondary"
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
index f04ba69e37..e0a92134a2 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
@@ -10,6 +10,7 @@
   import type { Collaborator } from '@mathesar/models/Collaborator';
   import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
   import { modal } from '@mathesar/stores/modal';
+  import { fetchSchemasForCurrentDatabase } from '@mathesar/stores/schemas';
   import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
   import {
     Button,
@@ -30,7 +31,13 @@
   const userProfileStore = getUserProfileStoreFromContext();
   $: ({ isMathesarAdmin } = $userProfileStore);
 
-  $: ({ database, configuredRoles, collaborators, users } = $routeContext);
+  $: ({
+    database,
+    configuredRoles,
+    collaborators,
+    users,
+    databaseRouteContext,
+  } = $routeContext);
 
   $: void AsyncRpcApiStore.runBatched([
     collaborators.batchRunner({ database_id: database.id }),
@@ -52,6 +59,23 @@
     targetCollaborator = collaborator;
     editCollaboratorRoleModal.open();
   }
+
+  function checkAndHandleSideEffects(collaborator: Collaborator) {
+    if (collaborator.userId === $userProfileStore.id) {
+      void AsyncRpcApiStore.runBatched(
+        [
+          databaseRouteContext.underlyingDatabase.batchRunner({
+            database_id: database.id,
+          }),
+          databaseRouteContext.roles.batchRunner({ database_id: database.id }),
+        ],
+        {
+          mode: 'force-run',
+        },
+      );
+      void fetchSchemasForCurrentDatabase();
+    }
+  }
 </script>
 
 <SettingsContentLayout>
@@ -79,7 +103,11 @@
         <GridTableCell header>{$_('role')}</GridTableCell>
         <GridTableCell header>{$_('actions')}</GridTableCell>
         {#each [...($collaborators.resolvedValue?.values() ?? [])] as collaborator (collaborator.id)}
-          <CollaboratorRow {collaborator} {editRoleForCollaborator} />
+          <CollaboratorRow
+            {collaborator}
+            {editRoleForCollaborator}
+            {checkAndHandleSideEffects}
+          />
         {/each}
       </GridTable>
     </div>
@@ -103,6 +131,7 @@
     usersMap={$users.resolvedValue}
     controller={editCollaboratorRoleModal}
     configuredRolesMap={$configuredRoles.resolvedValue}
+    {checkAndHandleSideEffects}
   />
 {/if}
 
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte b/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte
index 77f1eb1155..44ebac328a 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte
@@ -23,6 +23,7 @@
   export let collaborator: Collaborator;
   export let configuredRolesMap: ImmutableMap<number, ConfiguredRole>;
   export let usersMap: ImmutableMap<number, User>;
+  export let checkAndHandleSideEffects: (collaboror: Collaborator) => void;
 
   $: savedConfiguredRoleId = collaborator.configuredRoleId;
   $: configuredRoleId = requiredField<number>($savedConfiguredRoleId);
@@ -33,6 +34,7 @@
 
   async function updateRoleForCollaborator() {
     await collaborator.setConfiguredRole($configuredRoleId);
+    checkAndHandleSideEffects(collaborator);
     controller.close();
     toast.success($_('collaborator_role_updated_successfully'));
   }
diff --git a/mathesar_ui/src/stores/schemas.ts b/mathesar_ui/src/stores/schemas.ts
index 658035084a..493ff7e5da 100644
--- a/mathesar_ui/src/stores/schemas.ts
+++ b/mathesar_ui/src/stores/schemas.ts
@@ -80,7 +80,7 @@ function removeSchemaInStore(database: Database, schema: Schema) {
   }
 }
 
-async function fetchSchemasForCurrentDatabase() {
+export async function fetchSchemasForCurrentDatabase() {
   request?.cancel();
   const $currentDatabase = get(databasesStore.currentDatabase);
   if (!$currentDatabase) {
@@ -88,20 +88,37 @@ async function fetchSchemasForCurrentDatabase() {
     return;
   }
 
-  schemasStore.set({
-    databaseId: $currentDatabase.id,
-    requestStatus: { state: 'processing' },
-    data: new Map(),
+  schemasStore.update(($schemasStore) => {
+    if ($schemasStore.databaseId === $currentDatabase.id) {
+      return {
+        ...$schemasStore,
+        requestStatus: { state: 'processing' },
+      };
+    }
+    return {
+      databaseId: $currentDatabase.id,
+      requestStatus: { state: 'processing' },
+      data: new Map(),
+    };
   });
+
   try {
     request = api.schemas.list({ database_id: $currentDatabase.id }).run();
     const rawSchemas = await request;
     setSchemasInStore($currentDatabase, rawSchemas);
   } catch (err) {
-    schemasStore.set({
-      databaseId: $currentDatabase.id,
-      requestStatus: { state: 'failure', errors: [getErrorMessage(err)] },
-      data: new Map(),
+    schemasStore.update(($schemasStore) => {
+      if ($schemasStore.databaseId === $currentDatabase.id) {
+        return {
+          ...$schemasStore,
+          requestStatus: { state: 'failure', errors: [getErrorMessage(err)] },
+        };
+      }
+      return {
+        databaseId: $currentDatabase.id,
+        requestStatus: { state: 'failure', errors: [getErrorMessage(err)] },
+        data: new Map(),
+      };
     });
   }
 }

From 96c846b89d096545739248a3ba32ae908688cb7d Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 30 Sep 2024 19:43:01 +0530
Subject: [PATCH 1041/1141] Handle side effects for role member change or
 deletion

---
 .../contexts/DatabaseSettingsRouteContext.ts  | 17 +++++-----
 mathesar_ui/src/models/Database.ts            |  2 +-
 .../settings/roles/ModifyRoleMembers.svelte   |  2 ++
 .../database/settings/roles/RoleRow.svelte    |  6 ++--
 .../database/settings/roles/Roles.svelte      | 33 ++++++++++++++++++-
 .../systems/permissions/permissionsUtils.ts   |  2 +-
 6 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/mathesar_ui/src/contexts/DatabaseSettingsRouteContext.ts b/mathesar_ui/src/contexts/DatabaseSettingsRouteContext.ts
index fd2a9bda62..6dbac9318f 100644
--- a/mathesar_ui/src/contexts/DatabaseSettingsRouteContext.ts
+++ b/mathesar_ui/src/contexts/DatabaseSettingsRouteContext.ts
@@ -70,11 +70,19 @@ export class DatabaseSettingsRouteContext {
           (cr) => cr.name,
         );
         if (isStable && loginRoles && configuredRoles) {
-          return [...loginRoles.values()].map((role) => ({
+          const allRoles = [...loginRoles.values()].map((role) => ({
             name: role.name,
             role,
             configuredRole: configuredRoles.get(role.name),
           }));
+          const allLoginRoleNames = new Set(allRoles.map((ar) => ar.name));
+          const configuredRolesNotInAllRoles = [...configuredRoles.values()]
+            .filter((cr) => !allLoginRoleNames.has(cr.name))
+            .map((configuredRole) => ({
+              name: configuredRole.name,
+              configuredRole,
+            }));
+          return [...allRoles, ...configuredRolesNotInAllRoles];
         }
         if ($configuredRoles.isStable && configuredRoles) {
           return [...configuredRoles.values()].map((configuredRole) => ({
@@ -136,13 +144,6 @@ export class DatabaseSettingsRouteContext {
     this.collaborators.updateResolvedValue((c) => c.without(collaborator.id));
   }
 
-  async deleteRoleAndResetDependents(role: Role) {
-    await this.databaseRouteContext.deleteRole(role);
-    // When a role is deleted, both Collaborators & ConfiguredRoles need to be reset
-    this.configuredRoles.reset();
-    this.collaborators.reset();
-  }
-
   static construct(databaseRouteContext: DatabaseRouteContext) {
     return setRouteContext(
       contextKey,
diff --git a/mathesar_ui/src/models/Database.ts b/mathesar_ui/src/models/Database.ts
index 35c90a72dc..166b17264a 100644
--- a/mathesar_ui/src/models/Database.ts
+++ b/mathesar_ui/src/models/Database.ts
@@ -90,7 +90,7 @@ export class Database {
     return new AsyncRpcApiStore(api.roles.get_current_role, {
       postProcess: (currentRole) => ({
         currentRoleOid: currentRole.current_role.oid,
-        parentRoleOids: currentRole.parent_roles.map((pr) => pr.oid),
+        parentRoleOids: new Set(currentRole.parent_roles.map((pr) => pr.oid)),
       }),
     });
   }
diff --git a/mathesar_ui/src/pages/database/settings/roles/ModifyRoleMembers.svelte b/mathesar_ui/src/pages/database/settings/roles/ModifyRoleMembers.svelte
index cdfd9db7df..121bc8b6d4 100644
--- a/mathesar_ui/src/pages/database/settings/roles/ModifyRoleMembers.svelte
+++ b/mathesar_ui/src/pages/database/settings/roles/ModifyRoleMembers.svelte
@@ -26,6 +26,7 @@
   export let controller: ModalController;
   export let parentRole: Role;
   export let rolesMap: ImmutableMap<number, Role>;
+  export let handleRoleChangeSideEffects: (role: Role) => void;
 
   $: savedMembers = parentRole.members;
   $: savedMemberOids = new Set([...$savedMembers.keys()]);
@@ -51,6 +52,7 @@
 
   async function saveMembers() {
     await parentRole.setMembers(new Set($memberOids));
+    handleRoleChangeSideEffects(parentRole);
     controller.close();
     toast.success($_('child_roles_saved_successfully'));
   }
diff --git a/mathesar_ui/src/pages/database/settings/roles/RoleRow.svelte b/mathesar_ui/src/pages/database/settings/roles/RoleRow.svelte
index a0f8b33953..60c95adb1f 100644
--- a/mathesar_ui/src/pages/database/settings/roles/RoleRow.svelte
+++ b/mathesar_ui/src/pages/database/settings/roles/RoleRow.svelte
@@ -20,13 +20,15 @@
 
   export let role: Role;
   export let rolesMap: ImmutableMap<number, Role>;
-  export let modifyMembersForRole: (role: Role) => unknown;
+  export let modifyMembersForRole: (role: Role) => void;
+  export let handleRoleChangeSideEffects: (role: Role) => void;
 
   $: members = role.members;
 
   async function dropRole() {
     try {
-      await $routeContext.deleteRoleAndResetDependents(role);
+      await $routeContext.databaseRouteContext.deleteRole(role);
+      handleRoleChangeSideEffects(role);
       toast.success($_('role_dropped_successfully'));
     } catch (err) {
       toast.error(getErrorMessage(err));
diff --git a/mathesar_ui/src/pages/database/settings/roles/Roles.svelte b/mathesar_ui/src/pages/database/settings/roles/Roles.svelte
index 5778618f17..2611897101 100644
--- a/mathesar_ui/src/pages/database/settings/roles/Roles.svelte
+++ b/mathesar_ui/src/pages/database/settings/roles/Roles.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { get } from 'svelte/store';
   import { _ } from 'svelte-i18n';
 
   import GridTable from '@mathesar/components/grid-table/GridTable.svelte';
@@ -7,7 +8,9 @@
   import { DatabaseSettingsRouteContext } from '@mathesar/contexts/DatabaseSettingsRouteContext';
   import { iconAddNew } from '@mathesar/icons';
   import type { Role } from '@mathesar/models/Role';
+  import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
   import { modal } from '@mathesar/stores/modal';
+  import { fetchSchemasForCurrentDatabase } from '@mathesar/stores/schemas';
   import { Button, Icon, Spinner } from '@mathesar-component-library';
 
   import SettingsContentLayout from '../SettingsContentLayout.svelte';
@@ -20,7 +23,9 @@
   const createRoleModalController = modal.spawnModalController();
   const modifyRoleMembersModalController = modal.spawnModalController();
 
-  $: ({ database, roles } = $routeContext.databaseRouteContext);
+  $: ({ databaseRouteContext, configuredRoles, collaborators } = $routeContext);
+  $: ({ database, roles, underlyingDatabase, currentRole } =
+    databaseRouteContext);
 
   $: void roles.runOptimally({ database_id: database.id });
   $: roleList = [...($roles.resolvedValue?.values() ?? [])];
@@ -31,6 +36,30 @@
     targetRole = role;
     modifyRoleMembersModalController.open();
   }
+
+  function handleRoleChangeSideEffects(role: Role) {
+    configuredRoles.reset();
+    collaborators.reset();
+
+    const currentRoleValue = get(currentRole).resolvedValue;
+    const currentRoleInheritsOrIsEditedRole = Boolean(
+      currentRoleValue?.currentRoleOid === role.oid ||
+        currentRoleValue?.parentRoleOids.has(role.oid),
+    );
+
+    if (currentRoleInheritsOrIsEditedRole) {
+      void AsyncRpcApiStore.runBatched(
+        [
+          currentRole.batchRunner({ database_id: database.id }),
+          underlyingDatabase.batchRunner({ database_id: database.id }),
+        ],
+        {
+          mode: 'force-run',
+        },
+      );
+      void fetchSchemasForCurrentDatabase();
+    }
+  }
 </script>
 
 <SettingsContentLayout>
@@ -65,6 +94,7 @@
             {role}
             rolesMap={$roles.resolvedValue}
             {modifyMembersForRole}
+            {handleRoleChangeSideEffects}
           />
         {/each}
       </GridTable>
@@ -83,6 +113,7 @@
     parentRole={targetRole}
     rolesMap={$roles.resolvedValue}
     controller={modifyRoleMembersModalController}
+    {handleRoleChangeSideEffects}
   />
 {/if}
 
diff --git a/mathesar_ui/src/systems/permissions/permissionsUtils.ts b/mathesar_ui/src/systems/permissions/permissionsUtils.ts
index d715f7b4b2..bf3bcfd45f 100644
--- a/mathesar_ui/src/systems/permissions/permissionsUtils.ts
+++ b/mathesar_ui/src/systems/permissions/permissionsUtils.ts
@@ -21,7 +21,7 @@ export interface PermissionsStoreValues<Privilege> {
   permissionsMetaData: PermissionsMetaData<Privilege>;
   currentRole: {
     currentRoleOid: Role['oid'];
-    parentRoleOids: Role['oid'][];
+    parentRoleOids: Set<Role['oid']>;
   };
 }
 

From 2a2bb6e5acf2fcc22b87701e605f387ee1311079 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 30 Sep 2024 19:54:23 +0530
Subject: [PATCH 1042/1141] Fixes linting errors

---
 mathesar/views.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mathesar/views.py b/mathesar/views.py
index be4246eb0d..2a5e4b8f4c 100644
--- a/mathesar/views.py
+++ b/mathesar/views.py
@@ -12,12 +12,10 @@
 from mathesar.rpc.schemas import list_ as schemas_list
 from mathesar.rpc.servers.configured import list_ as get_servers_list
 from mathesar.rpc.tables import list_with_metadata as tables_list
-from mathesar.api.serializers.databases import TypeSerializer
 from mathesar.api.serializers.tables import TableSerializer
 from mathesar.api.serializers.queries import QuerySerializer
 from mathesar.api.ui.serializers.users import UserSerializer
 from mathesar.api.utils import is_valid_uuid_v4
-from mathesar.database.types import UIType
 from mathesar.models.shares import SharedTable, SharedQuery
 from mathesar.state import reset_reflection
 from mathesar import __version__

From 2c39ff9229700115cd76a79f52c21bec01bb4afc Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 30 Sep 2024 13:55:36 -0400
Subject: [PATCH 1043/1141] Adjust some naming

---
 .../src/pages/database/DatabasePageWrapper.svelte     |  2 +-
 .../src/pages/database/schemas/SchemasSection.svelte  |  2 +-
 .../settings/collaborators/CollaboratorRow.svelte     |  8 ++++----
 .../settings/collaborators/Collaborators.svelte       |  8 ++++----
 .../collaborators/EditRoleForCollaboratorModal.svelte |  4 ++--
 .../database/settings/roles/ModifyRoleMembers.svelte  |  4 ++--
 .../src/pages/database/settings/roles/RoleRow.svelte  | 11 ++++-------
 .../src/pages/database/settings/roles/Roles.svelte    |  8 ++++----
 mathesar_ui/src/stores/AsyncStore.ts                  |  2 +-
 9 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
index 495e1aed6b..5c20d303c4 100644
--- a/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
+++ b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
@@ -34,7 +34,7 @@
 
   const databaseRouteContext = DatabaseRouteContext.get();
   $: ({ database, underlyingDatabase } = $databaseRouteContext);
-  $: void underlyingDatabase.runOptimally({ database_id: database.id });
+  $: void underlyingDatabase.runConservatively({ database_id: database.id });
 
   const commonData = preloadCommonData();
 
diff --git a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
index 1f4907a5c2..a911f24042 100644
--- a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
+++ b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
@@ -29,7 +29,7 @@
   const databaseRouteContext = DatabaseRouteContext.get();
 
   $: ({ database, underlyingDatabase } = $databaseRouteContext);
-  $: void underlyingDatabase.runOptimally({ database_id: database.id });
+  $: void underlyingDatabase.runConservatively({ database_id: database.id });
   $: schemasMap = $schemasStore.data;
   $: schemasRequestStatus = $schemasStore.requestStatus;
   $: isLoading =
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
index 810caa0d14..076a27e7e3 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
@@ -12,8 +12,8 @@
   import { Button, SpinnerButton } from '@mathesar-component-library';
 
   export let collaborator: Collaborator;
-  export let editRoleForCollaborator: (collaborator: Collaborator) => void;
-  export let checkAndHandleSideEffects: (collaboror: Collaborator) => void;
+  export let onClickEditRole: (collaborator: Collaborator) => void;
+  export let onDelete: (collaborator: Collaborator) => void;
 
   const routeContext = DatabaseSettingsRouteContext.get();
   $: ({ configuredRoles, users } = $routeContext);
@@ -28,7 +28,7 @@
 
   async function deleteCollaborator() {
     await $routeContext.deleteCollaborator(collaborator);
-    checkAndHandleSideEffects(collaborator);
+    onDelete(collaborator);
     toast.success($_('collaborator_removed_successfully'));
   }
 </script>
@@ -55,7 +55,7 @@
     <div class="actions">
       <Button
         appearance="secondary"
-        on:click={() => editRoleForCollaborator(collaborator)}
+        on:click={() => onClickEditRole(collaborator)}
         disabled={!isMathesarAdmin}
       >
         <Icon {...iconEdit} size="0.8em" />
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
index e0a92134a2..040dc771a0 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
@@ -43,7 +43,7 @@
     collaborators.batchRunner({ database_id: database.id }),
     configuredRoles.batchRunner({ server_id: database.server.id }),
   ]);
-  $: void users.runOptimally();
+  $: void users.runConservatively();
   $: isLoading =
     $collaborators.isLoading || $configuredRoles.isLoading || $users.isLoading;
   $: isSuccess = $collaborators.isOk && $configuredRoles.isOk && $users.isOk;
@@ -105,8 +105,8 @@
         {#each [...($collaborators.resolvedValue?.values() ?? [])] as collaborator (collaborator.id)}
           <CollaboratorRow
             {collaborator}
-            {editRoleForCollaborator}
-            {checkAndHandleSideEffects}
+            onClickEditRole={editRoleForCollaborator}
+            onDelete={checkAndHandleSideEffects}
           />
         {/each}
       </GridTable>
@@ -131,7 +131,7 @@
     usersMap={$users.resolvedValue}
     controller={editCollaboratorRoleModal}
     configuredRolesMap={$configuredRoles.resolvedValue}
-    {checkAndHandleSideEffects}
+    onUpdateRole={checkAndHandleSideEffects}
   />
 {/if}
 
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte b/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte
index 44ebac328a..f0e8a08dfe 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte
@@ -23,7 +23,7 @@
   export let collaborator: Collaborator;
   export let configuredRolesMap: ImmutableMap<number, ConfiguredRole>;
   export let usersMap: ImmutableMap<number, User>;
-  export let checkAndHandleSideEffects: (collaboror: Collaborator) => void;
+  export let onUpdateRole: (collaborator: Collaborator) => void;
 
   $: savedConfiguredRoleId = collaborator.configuredRoleId;
   $: configuredRoleId = requiredField<number>($savedConfiguredRoleId);
@@ -34,7 +34,7 @@
 
   async function updateRoleForCollaborator() {
     await collaborator.setConfiguredRole($configuredRoleId);
-    checkAndHandleSideEffects(collaborator);
+    onUpdateRole(collaborator);
     controller.close();
     toast.success($_('collaborator_role_updated_successfully'));
   }
diff --git a/mathesar_ui/src/pages/database/settings/roles/ModifyRoleMembers.svelte b/mathesar_ui/src/pages/database/settings/roles/ModifyRoleMembers.svelte
index 121bc8b6d4..1b02217d59 100644
--- a/mathesar_ui/src/pages/database/settings/roles/ModifyRoleMembers.svelte
+++ b/mathesar_ui/src/pages/database/settings/roles/ModifyRoleMembers.svelte
@@ -26,7 +26,7 @@
   export let controller: ModalController;
   export let parentRole: Role;
   export let rolesMap: ImmutableMap<number, Role>;
-  export let handleRoleChangeSideEffects: (role: Role) => void;
+  export let onSave: (props: { parentRole: Role }) => void;
 
   $: savedMembers = parentRole.members;
   $: savedMemberOids = new Set([...$savedMembers.keys()]);
@@ -52,7 +52,7 @@
 
   async function saveMembers() {
     await parentRole.setMembers(new Set($memberOids));
-    handleRoleChangeSideEffects(parentRole);
+    onSave({ parentRole });
     controller.close();
     toast.success($_('child_roles_saved_successfully'));
   }
diff --git a/mathesar_ui/src/pages/database/settings/roles/RoleRow.svelte b/mathesar_ui/src/pages/database/settings/roles/RoleRow.svelte
index 60c95adb1f..b5f49a1382 100644
--- a/mathesar_ui/src/pages/database/settings/roles/RoleRow.svelte
+++ b/mathesar_ui/src/pages/database/settings/roles/RoleRow.svelte
@@ -20,15 +20,15 @@
 
   export let role: Role;
   export let rolesMap: ImmutableMap<number, Role>;
-  export let modifyMembersForRole: (role: Role) => void;
-  export let handleRoleChangeSideEffects: (role: Role) => void;
+  export let onClickEditMembers: (role: Role) => void;
+  export let onDrop: (role: Role) => void;
 
   $: members = role.members;
 
   async function dropRole() {
     try {
       await $routeContext.databaseRouteContext.deleteRole(role);
-      handleRoleChangeSideEffects(role);
+      onDrop(role);
       toast.success($_('role_dropped_successfully'));
     } catch (err) {
       toast.error(getErrorMessage(err));
@@ -52,10 +52,7 @@
       {/each}
     </div>
     <div class="actions">
-      <Button
-        appearance="secondary"
-        on:click={() => modifyMembersForRole(role)}
-      >
+      <Button appearance="secondary" on:click={() => onClickEditMembers(role)}>
         <Icon {...iconEdit} size="0.8em" />
       </Button>
     </div>
diff --git a/mathesar_ui/src/pages/database/settings/roles/Roles.svelte b/mathesar_ui/src/pages/database/settings/roles/Roles.svelte
index 2611897101..6cfa45c2d5 100644
--- a/mathesar_ui/src/pages/database/settings/roles/Roles.svelte
+++ b/mathesar_ui/src/pages/database/settings/roles/Roles.svelte
@@ -27,7 +27,7 @@
   $: ({ database, roles, underlyingDatabase, currentRole } =
     databaseRouteContext);
 
-  $: void roles.runOptimally({ database_id: database.id });
+  $: void roles.runConservatively({ database_id: database.id });
   $: roleList = [...($roles.resolvedValue?.values() ?? [])];
 
   let targetRole: Role | undefined = undefined;
@@ -93,8 +93,8 @@
           <RoleRow
             {role}
             rolesMap={$roles.resolvedValue}
-            {modifyMembersForRole}
-            {handleRoleChangeSideEffects}
+            onClickEditMembers={modifyMembersForRole}
+            onDrop={handleRoleChangeSideEffects}
           />
         {/each}
       </GridTable>
@@ -113,7 +113,7 @@
     parentRole={targetRole}
     rolesMap={$roles.resolvedValue}
     controller={modifyRoleMembersModalController}
-    {handleRoleChangeSideEffects}
+    onSave={({ parentRole }) => handleRoleChangeSideEffects(parentRole)}
   />
 {/if}
 
diff --git a/mathesar_ui/src/stores/AsyncStore.ts b/mathesar_ui/src/stores/AsyncStore.ts
index b6a48a48b3..d7192c80d0 100644
--- a/mathesar_ui/src/stores/AsyncStore.ts
+++ b/mathesar_ui/src/stores/AsyncStore.ts
@@ -158,7 +158,7 @@ export default class AsyncStore<Props = void, T = unknown>
    * - rejected
    * - not loading
    */
-  async runOptimally(props: Props): Promise<AsyncStoreValue<T, string>> {
+  async runConservatively(props: Props): Promise<AsyncStoreValue<T, string>> {
     const value = get(this.value);
     if (value.isLoading || value.isOk) {
       return value;

From 7b0604ecab3adf3ec501040ed7e82e127421f29a Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 30 Sep 2024 14:13:04 -0400
Subject: [PATCH 1044/1141] Simplify AsyncRpcApiStore.runBatch

---
 .../DatabasePermissionsModal.svelte           |  2 +-
 .../collaborators/Collaborators.svelte        | 19 +++----
 .../RoleConfiguration.svelte                  |  2 +-
 .../database/settings/roles/Roles.svelte      | 13 ++---
 .../schema/SchemaPermissionsModal.svelte      |  2 +-
 mathesar_ui/src/stores/AsyncRpcApiStore.ts    | 51 +++++--------------
 .../table/TablePermissions.svelte             |  2 +-
 7 files changed, 28 insertions(+), 63 deletions(-)

diff --git a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
index 1368844383..215337f097 100644
--- a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
+++ b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
@@ -65,7 +65,7 @@
   };
 
   function getAsyncStoresForPermissions() {
-    void AsyncRpcApiStore.runBatched([
+    void AsyncRpcApiStore.runBatchConservatively([
       databasePrivileges.batchRunner({ database_id: database.id }),
       roles.batchRunner({ database_id: database.id }),
       underlyingDatabase.batchRunner({ database_id: database.id }),
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
index 040dc771a0..dae579b3b0 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
@@ -39,7 +39,7 @@
     databaseRouteContext,
   } = $routeContext);
 
-  $: void AsyncRpcApiStore.runBatched([
+  $: void AsyncRpcApiStore.runBatchConservatively([
     collaborators.batchRunner({ database_id: database.id }),
     configuredRoles.batchRunner({ server_id: database.server.id }),
   ]);
@@ -62,17 +62,12 @@
 
   function checkAndHandleSideEffects(collaborator: Collaborator) {
     if (collaborator.userId === $userProfileStore.id) {
-      void AsyncRpcApiStore.runBatched(
-        [
-          databaseRouteContext.underlyingDatabase.batchRunner({
-            database_id: database.id,
-          }),
-          databaseRouteContext.roles.batchRunner({ database_id: database.id }),
-        ],
-        {
-          mode: 'force-run',
-        },
-      );
+      void AsyncRpcApiStore.runBatch([
+        databaseRouteContext.underlyingDatabase.batchRunner({
+          database_id: database.id,
+        }),
+        databaseRouteContext.roles.batchRunner({ database_id: database.id }),
+      ]);
       void fetchSchemasForCurrentDatabase();
     }
   }
diff --git a/mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte b/mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte
index 852b17fd87..8b038f39ae 100644
--- a/mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte
+++ b/mathesar_ui/src/pages/database/settings/role-configuration/RoleConfiguration.svelte
@@ -39,7 +39,7 @@
   $: ({ database, databaseRouteContext, configuredRoles, combinedLoginRoles } =
     $routeContext);
   $: ({ roles } = databaseRouteContext);
-  $: void AsyncRpcApiStore.runBatched([
+  $: void AsyncRpcApiStore.runBatchConservatively([
     configuredRoles.batchRunner({ server_id: database.server.id }),
     roles.batchRunner({ database_id: database.id }),
   ]);
diff --git a/mathesar_ui/src/pages/database/settings/roles/Roles.svelte b/mathesar_ui/src/pages/database/settings/roles/Roles.svelte
index 6cfa45c2d5..0a9cea19b1 100644
--- a/mathesar_ui/src/pages/database/settings/roles/Roles.svelte
+++ b/mathesar_ui/src/pages/database/settings/roles/Roles.svelte
@@ -48,15 +48,10 @@
     );
 
     if (currentRoleInheritsOrIsEditedRole) {
-      void AsyncRpcApiStore.runBatched(
-        [
-          currentRole.batchRunner({ database_id: database.id }),
-          underlyingDatabase.batchRunner({ database_id: database.id }),
-        ],
-        {
-          mode: 'force-run',
-        },
-      );
+      void AsyncRpcApiStore.runBatch([
+        currentRole.batchRunner({ database_id: database.id }),
+        underlyingDatabase.batchRunner({ database_id: database.id }),
+      ]);
       void fetchSchemasForCurrentDatabase();
     }
   }
diff --git a/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte b/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte
index cc02e589a0..452f9970d6 100644
--- a/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte
@@ -66,7 +66,7 @@
   };
 
   function getAsyncStoresForPermissions() {
-    void AsyncRpcApiStore.runBatched([
+    void AsyncRpcApiStore.runBatchConservatively([
       schemaPrivileges.batchRunner({
         database_id: schema.database.id,
         schema_oid: schema.oid,
diff --git a/mathesar_ui/src/stores/AsyncRpcApiStore.ts b/mathesar_ui/src/stores/AsyncRpcApiStore.ts
index b21a999a98..32c4a3b74f 100644
--- a/mathesar_ui/src/stores/AsyncRpcApiStore.ts
+++ b/mathesar_ui/src/stores/AsyncRpcApiStore.ts
@@ -69,44 +69,19 @@ export default class AsyncRpcApiStore<Props, T, U = T> extends AsyncStore<
     };
   }
 
-  static async runBatched(
-    batchRunners: BatchRunner[],
-    options?: Partial<{
-      mode?: 'force-run' | 'optimal' | ('force-run' | 'optimal')[];
-    }>,
-  ) {
-    const toRun = (() => {
-      if (options?.mode && Array.isArray(options.mode)) {
-        if (options.mode.length !== batchRunners.length) {
-          throw new Error(
-            'Number of run options do not match number of batchRunners',
-          );
-        }
-        return batchRunners.filter((runner, index) => {
-          switch (options.mode?.[index]) {
-            case 'force-run':
-              return true;
-            case 'optimal':
-            default:
-              return !runner.getValue().hasInitialized;
-          }
-        });
-      }
-      if (options?.mode === 'force-run') {
-        return batchRunners;
-      }
-      // default is `optimal`
-      return batchRunners.filter((runner) => !runner.getValue().hasInitialized);
-    })();
+  static async runBatch(runners: BatchRunner[]) {
+    if (runners.length === 0) return;
+    runners.forEach((runner) => runner.beforeRequest());
+    const results = await batchSend(runners.map((runner) => runner.send));
+    runners.forEach((runner, index) => runner.onResponse(results[index]));
+  }
 
-    if (toRun.length > 0) {
-      toRun.forEach((runner) => {
-        runner.beforeRequest();
-      });
-      const results = await batchSend(toRun.map((runner) => runner.send));
-      toRun.forEach((runner, index) => {
-        runner.onResponse(results[index]);
-      });
-    }
+  /**
+   * Runs the BatchRunners that have not yet been initialized. Skips the ones
+   * that have already been initialized.
+   */
+  static async runBatchConservatively(runners: BatchRunner[]) {
+    const toRun = runners.filter((runner) => !runner.getValue().hasInitialized);
+    await AsyncRpcApiStore.runBatch(toRun);
   }
 }
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
index 8ebeb20635..d6a27bf2d1 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
@@ -86,7 +86,7 @@
   };
 
   function getAsyncStoresForPermissions() {
-    void AsyncRpcApiStore.runBatched([
+    void AsyncRpcApiStore.runBatchConservatively([
       tablePrivileges.batchRunner({
         database_id: table.schema.database.id,
         table_oid: table.oid,

From 4291b3b96985f40a575f0270ea057239abdf4068 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Tue, 1 Oct 2024 13:58:30 +0530
Subject: [PATCH 1045/1141] Make conservative run and conservative batchRun
 consistent with eachother

---
 .../import/preview/ImportPreviewContent.svelte |  2 +-
 mathesar_ui/src/stores/AsyncRpcApiStore.ts     |  4 +++-
 mathesar_ui/src/stores/AsyncStore.ts           | 18 ++++++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
index fb21769193..9cb4763cc5 100644
--- a/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
+++ b/mathesar_ui/src/pages/import/preview/ImportPreviewContent.svelte
@@ -227,7 +227,7 @@
           on:retry={init}
           on:delete={cancel}
         />
-      {:else if !$previewRequest.hasInitialized}
+      {:else if !$previewRequest.hasSettled}
         <div class="loading"><Spinner /></div>
       {:else if $previewRequest.error}
         <ErrorInfo
diff --git a/mathesar_ui/src/stores/AsyncRpcApiStore.ts b/mathesar_ui/src/stores/AsyncRpcApiStore.ts
index 32c4a3b74f..0fa98105b3 100644
--- a/mathesar_ui/src/stores/AsyncRpcApiStore.ts
+++ b/mathesar_ui/src/stores/AsyncRpcApiStore.ts
@@ -81,7 +81,9 @@ export default class AsyncRpcApiStore<Props, T, U = T> extends AsyncStore<
    * that have already been initialized.
    */
   static async runBatchConservatively(runners: BatchRunner[]) {
-    const toRun = runners.filter((runner) => !runner.getValue().hasInitialized);
+    const toRun = runners.filter(
+      (runner) => runner.getValue().isIdleAndUnsettled,
+    );
     await AsyncRpcApiStore.runBatch(toRun);
   }
 }
diff --git a/mathesar_ui/src/stores/AsyncStore.ts b/mathesar_ui/src/stores/AsyncStore.ts
index d7192c80d0..15e93a026d 100644
--- a/mathesar_ui/src/stores/AsyncStore.ts
+++ b/mathesar_ui/src/stores/AsyncStore.ts
@@ -94,9 +94,13 @@ export class AsyncStoreValue<T, E> {
     return !this.isLoading && this.settlement?.state === 'rejected';
   }
 
-  get hasInitialized(): boolean {
+  get hasSettled(): boolean {
     return this.settlement !== undefined;
   }
+
+  get isIdleAndUnsettled(): boolean {
+    return !this.hasSettled && !this.isLoading;
+  }
 }
 
 export default class AsyncStore<Props = void, T = unknown>
@@ -152,18 +156,12 @@ export default class AsyncStore<Props = void, T = unknown>
     }
   }
 
-  /**
-   * Only runs if the current value is one of
-   * - not initialized
-   * - rejected
-   * - not loading
-   */
   async runConservatively(props: Props): Promise<AsyncStoreValue<T, string>> {
     const value = get(this.value);
-    if (value.isLoading || value.isOk) {
-      return value;
+    if (value.isIdleAndUnsettled) {
+      return this.run(props);
     }
-    return this.run(props);
+    return value;
   }
 
   /**

From 98e48eab1534c24b4c6734040270f5e298b75b4b Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Tue, 1 Oct 2024 14:01:50 +0530
Subject: [PATCH 1046/1141] Handle side effects when logged in user is added as
 a collaborator

---
 mathesar_ui/src/contexts/DatabaseSettingsRouteContext.ts   | 1 +
 .../settings/collaborators/AddCollaboratorModal.svelte     | 7 ++++++-
 .../database/settings/collaborators/Collaborators.svelte   | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/mathesar_ui/src/contexts/DatabaseSettingsRouteContext.ts b/mathesar_ui/src/contexts/DatabaseSettingsRouteContext.ts
index 6dbac9318f..810e4ed0d0 100644
--- a/mathesar_ui/src/contexts/DatabaseSettingsRouteContext.ts
+++ b/mathesar_ui/src/contexts/DatabaseSettingsRouteContext.ts
@@ -137,6 +137,7 @@ export class DatabaseSettingsRouteContext {
     this.collaborators.updateResolvedValue((collaborators) =>
       collaborators.with(newCollaborator.id, newCollaborator),
     );
+    return newCollaborator;
   }
 
   async deleteCollaborator(collaborator: Collaborator) {
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte b/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte
index db762e0a97..0be74c4447 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/AddCollaboratorModal.svelte
@@ -28,6 +28,7 @@
   export let configuredRolesMap: ImmutableMap<number, ConfiguredRole>;
   export let usersMap: ImmutableMap<number, User>;
   export let collaboratorsMap: ImmutableMap<number, Collaborator>;
+  export let onAdd: (collaborator: Collaborator) => void;
 
   const userId = requiredField<number | undefined>(undefined);
   const configuredRoleId = requiredField<number | undefined>(undefined);
@@ -41,7 +42,11 @@
 
   async function addCollaborator() {
     if ($userId && $configuredRoleId) {
-      await $routeContext.addCollaborator($userId, $configuredRoleId);
+      const collaborator = await $routeContext.addCollaborator(
+        $userId,
+        $configuredRoleId,
+      );
+      onAdd(collaborator);
       controller.close();
       toast.success($_('collaborator_added_successfully'));
       form.reset();
diff --git a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
index dae579b3b0..093f736d53 100644
--- a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
+++ b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
@@ -117,6 +117,7 @@
     usersMap={$users.resolvedValue}
     configuredRolesMap={$configuredRoles.resolvedValue}
     collaboratorsMap={$collaborators.resolvedValue}
+    onAdd={checkAndHandleSideEffects}
   />
 {/if}
 

From b16d3802d977a3add35f14d32820af17e75e0c64 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 1 Oct 2024 12:13:04 -0400
Subject: [PATCH 1047/1141] Fix bug when updating table name

---
 mathesar_ui/src/stores/tables.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index a19b56e513..d6022cd06e 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -203,13 +203,13 @@ function putTableInStore({
     $tablesStore.databaseId === schema.database.id &&
     $tablesStore.schemaOid === schema.oid
   ) {
-    tablesStore.update(({ requestStatus, tablesMap }) => {
-      tablesMap.set(fullTable.oid, fullTable);
+    tablesStore.update((tablesData) => {
+      tablesData.tablesMap.set(fullTable.oid, fullTable);
       const newTablesMap = new Map(
-        sortTables(tablesMap.values()).map((t) => [t.oid, t]),
+        sortTables(tablesData.tablesMap.values()).map((t) => [t.oid, t]),
       );
       return {
-        requestStatus,
+        ...tablesData,
         tablesMap: newTablesMap,
       };
     });

From 332512644f0e23c92417edb0785788acf2d47b81 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Wed, 2 Oct 2024 13:54:16 +0200
Subject: [PATCH 1048/1141] add permissions outline

---
 docs/docs/user-guide/permissions.md | 106 ++++++++++++++++++++++++++++
 docs/docs/user-guide/users.md       | 103 +--------------------------
 2 files changed, 107 insertions(+), 102 deletions(-)
 create mode 100644 docs/docs/user-guide/permissions.md

diff --git a/docs/docs/user-guide/permissions.md b/docs/docs/user-guide/permissions.md
new file mode 100644
index 0000000000..46d5ab990e
--- /dev/null
+++ b/docs/docs/user-guide/permissions.md
@@ -0,0 +1,106 @@
+# Mathesar's Role-Based Permissions
+
+Mathesar uses PostgreSQL roles to manage permissions at the database, schema, and table levels. These roles define the actions users can perform, allowing fine-grained control over access.
+
+## Database Settings
+
+Mathesar provides three main sections for role management within the database settings:
+
+- **Role Configuration**: Used to manage credentials (passwords) for roles that exist on the server. These roles can then be assigned to collaborators.
+- **Collaborators**: This section allows you to add users and assign them configured roles, dictating their access levels within the database.
+- **Server Roles**: Here you can manage roles available on the server itself, defining inheritance, creating new roles, or deleting existing ones.
+
+> **Note:** Role Configuration is Mathesar-specific, managing credentials for existing roles within a connected database. Server Roles, however, exist on the PostgreSQL server itself and affect all databases.
+
+### Role Configuration
+
+In the **Role Configuration** section, all LOGIN roles that exist on the server are listed. These roles can then be assigned to collaborators once configured. A configured role has a password set.
+
+- **Password Management**: For each role, you can configure or change the password directly within Mathesar.
+- **Remove Role Configuration**: Role configurations can be removed from the database as necessary. This only removes the credentials, not the role from the server.
+
+### Collaborators
+
+Collaborators are users who have been added to work on the database. Each collaborator is assigned a PostgreSQL LOGIN role that dictates their level of access to the database and its objects (schemas, tables, etc.).
+
+- **Add Collaborators**: In the **Collaborators** section, you can add new users as collaborators to the database. When adding a collaborator, you assign them one of the roles that have been configured in Mathesar.
+
+- **Remove Collaborators**: Collaborators can be removed if they no longer require access to the database. The Mathesar user will still exist and can be added back as a collaborator at a later time.
+
+### Server Roles
+
+The **Server Roles** section, found under the **Settings** tab, shows the roles available on the server for the current database.
+
+These roles will be displayed for all databases on the server. Also, any changes made to a server role will be reflected in all databases on the server.
+
+- **Create Roles**: New server-level roles can be created here. These roles can be configured in two ways:
+  1. With login capability and a password, which can be assigned to collaborators.
+  2. Without login capability, it is to be used as a parent role exclusively. These roles cannot be assigned to collaborators directly.
+- **Define Child Roles**: For existing server-level roles, you can specify which other roles should be their child roles. This allows for creating hierarchies of roles where permissions can be inherited from parent to child roles.
+- **Drop Roles**: Server-level roles that are no longer needed can be dropped. This action removes the role from the server and all databases where it has been assigned. Exercise caution when dropping roles, as it may affect existing permissions and user access across multiple databases.
+
+> **Note:** Server roles, once added, must be configured in Mathesar under the **Role Configuration** section before they can be assigned to collaborators.
+
+---
+
+## Permissions Management at Different Levels
+
+Mathesar manages permissions at three levels:
+
+1. **Database**
+2. **Schema**
+3. **Table**
+
+Owners of each object (database, schema, or table) can set permissions for other users. Ownership is determined by the user's assigned collaborator role in the database.
+
+### Ownership of New Objects
+
+When a new object (database, schema, or table) is created, the owner of the object is the collaborator who created it. This automatic ownership assignment allows the creator to have immediate and full control over the objects they create, including the ability to manage permissions and transfer ownership if needed.
+
+You can find and manage permissions in the following sections:
+
+- **Database Permissions**: On the database settings page.
+- **Schema Permissions**: On each schema's page.
+- **Table Permissions**: In each table's inspector panel.
+
+### Database Permissions
+
+Database permissions control access and actions at the database level.
+
+- **Owner**: Each database has an owner who has full control over the database, including managing permissions and transferring ownership.
+- **Granted Access**: Specific permissions can be granted to roles for various actions within the database.
+- **Transfer Ownership**: The current owner can transfer ownership to another role, granting them full administrative control.
+
+For each database, the following permission levels can be granted:
+
+- **Connect**: Allows the role to access and connect to the database.
+- **Create**: Includes Connect permissions and allows the role to create new schemas within the database.
+- **Custom**: Enables the granular setting of permissions beyond the predefined options.
+
+### Schema Permissions
+
+Schema permissions control access and actions at the schema level.
+
+- **Owner**: Each schema has an owner who has full control over the schema, including managing permissions and transferring ownership.
+- **Granted Access**: Specific permissions can be granted to roles for various actions within the schema.
+- **Transfer Ownership**: The current owner can transfer ownership to another role, granting them full administrative control over the schema.
+
+For each schema, the following permission levels can be granted:
+
+- **Read**: Allows the role to access the schema and view its objects.
+- **Create**: Includes Read permissions and allows the role to create new tables within the schema.
+- **Custom**: Enables the granular setting of permissions beyond the predefined options.
+
+### Table Permissions
+
+Table permissions control access and actions at the table level.
+
+- **Owner**: Each table has an owner who has full control over the table, including managing permissions, transferring ownership, and modifying the table's structure (such as adding, removing, or altering columns).
+- **Granted Access**: Specific permissions can be granted to roles for various actions on the table.
+- **Transfer Ownership**: The current owner can transfer ownership to another role, granting them full administrative control over the table.
+
+For each table, the following permission levels can be granted:
+
+- **Read**: Allows the role to access the table and read records.
+- **Write**: Includes Read permissions and allows the role to insert, update, and delete records in the table.
+- **Custom**: Enables the granular setting of permissions beyond the predefined options.
diff --git a/docs/docs/user-guide/users.md b/docs/docs/user-guide/users.md
index 7cef8d20f5..a3670df927 100644
--- a/docs/docs/user-guide/users.md
+++ b/docs/docs/user-guide/users.md
@@ -1,4 +1,4 @@
-# Users & Access Levels
+# Users
 
 Mathesar allows you to set up users with different access levels. A user's access levels determine what they can do with the data managed in Mathesar.
 
@@ -30,104 +30,3 @@ You cannot set granular permissions for an **Admin** user.
 ### Standard users
 
 By default, **Standard** users cannot see anything in Mathesar. They will need to be granted database or schema roles individually.
-
-## Database Roles
-
-There are three levels of database roles:
-
-- **Managers** own the database. They can edit all data in the database, as well as edit the structure of data (e.g. create tables, add and remove columns, etc.). They also manage access to the database.
-- **Editors** can edit all data in the database, but cannot change the underlying data structures or manage access.
-- **Viewers** have read-only access to all data in the database. They cannot make any changes.
-
-### Manager
-
-- Receives **Manager** permissions on all schemas in the database.
-- Can view, add, and remove other users' access to the database.
-- Can view, add, edit, and remove any schema in the database.
-- Can view, add, edit, and remove any table in the database.
-- Can view, add, edit, and remove any column in the database.
-- Can view, add, edit, and remove any constraint in the database.
-- Can view, add, edit, and remove any record in the database.
-- Can view, add, edit, and remove any exploration in the database.
-- Can perform "extract column" and "move column" actions
-
-### Editor
-
-- Receives **Editor** permissions on all schemas in the database.
-- Can view any schema in the database.
-- Can view any table in the database.
-- Can view any column in the database.
-- Can view any constraint in the database.
-- Can view, add, edit, and remove any exploration in the database.
-- Can view, add, edit, and remove any record in the database.
-
-### Viewer
-
-- Receives **Viewer** permissions on all schemas in the database.
-- Can view any schema in the database.
-- Can view any table in the database.
-- Can view any column in the database.
-- Can view any constraint in the database.
-- Can view any exploration in the database.
-- Can use the **Data Explorer** to create ad-hoc explorations using data in the database, but cannot save them.
-
-## Managing Database Roles
-
-!!! note
-    - Only **Admins** and **Database Managers** can manage access to a database.
-
-1. Click on the Mathesar logo on the top left of the application to go to the database page.
-2. Click on the **Manage Access** button.
-
-## Schema Roles
-
-There are three levels of schema roles:
-
-- **Managers** own the schema. They can edit all data in the schema, as well as edit the structure of data (e.g. create tables, add and remove columns, etc.). They also manage access to the schema.
-- **Editors** can edit all data in the schema, but cannot change the underlying data structures or manage access.
-- **Viewers** have read-only access to all data in the schema. They cannot make any changes.
-
-### Manager
-
-- Can view, add, and remove other users' access to the schema.
-- Can view, add, edit, and remove any schema in the schema.
-- Can view, add, edit, and remove any table in the schema.
-- Can view, add, edit, and remove any column in the schema.
-- Can view, add, edit, and remove any constraint in the schema.
-- Can view, add, edit, and remove any record in the schema.
-- Can view, add, edit, and remove any exploration in the schema.
-- Can perform "extract column" and "move column" actions
-
-### Editor
-
-- Can view any table in the schema.
-- Can view any column in the schema.
-- Can view any constraint in the schema.
-- Can view, add, edit, and remove any record in the schema.
-- Can view, add, edit, and remove any exploration in the schema.
-
-### Viewer
-
-- Can view any table in the schema.
-- Can view any column in the schema.
-- Can view any constraint in the schema.
-- Can view any exploration in the schema.
-- Can use the **Data Explorer** to create ad-hoc explorations using data in the schema, but cannot save them.
-
-## Managing Schema Roles
-
-!!! note
-    - Only **Admins**, **Database Managers**, and **Schema Managers** can manage access to a schema.
-
-1. Click on the Mathesar logo on the top left of the application to go to the database page.
-2. Select the appropriate schema from the list to navigate to the schema's homepage.
-3. Click on the **Manage Access** button.
-
-## Order of Precedence
-
-If a user has both a **Database Role** and a **Schema Role** for a schema within the same database, the **Schema Role** will only have an effect if it grants more permissions.
-
-Examples:
-
-- If a user is a **Database Manager** but has **Viewer** permissions on a given schema, the schema role has no effect.
-- If a user is a **Database Editor** but has **Manager** permissions on a given schema, the schema role will take precedence.

From 314711b335574a39cbb5a528c04b86f585e4d58c Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 2 Oct 2024 10:09:21 -0400
Subject: [PATCH 1049/1141] Ignore built mkdocs site files

---
 docs/.gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docs/.gitignore

diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644
index 0000000000..d97e100637
--- /dev/null
+++ b/docs/.gitignore
@@ -0,0 +1 @@
+site
\ No newline at end of file

From 90c4beca462c19e7edf97d9144c0c5e02e76ae94 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 2 Oct 2024 10:03:17 -0400
Subject: [PATCH 1050/1141] Enable mike within mkdocs

---
 docs/mkdocs.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 58875327c4..9d569e569a 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -118,3 +118,6 @@ markdown_extensions:
 
 extra:
   mathesar_version: 0.1.7
+  version:
+    provider: mike
+    alias: true

From 6eaa456a027967a37141c1e0687888760ee6d35a Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 3 Oct 2024 02:15:51 +0530
Subject: [PATCH 1051/1141] convert python types_install to sql

---
 db/sql/40_msar_types.sql | 4504 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 4504 insertions(+)
 create mode 100644 db/sql/40_msar_types.sql

diff --git a/db/sql/40_msar_types.sql b/db/sql/40_msar_types.sql
new file mode 100644
index 0000000000..74e40bf57e
--- /dev/null
+++ b/db/sql/40_msar_types.sql
@@ -0,0 +1,4504 @@
+CREATE SCHEMA IF NOT EXISTS mathesar_types;
+
+-- mathesar_types.email
+DO $$
+BEGIN
+  CREATE DOMAIN mathesar_types.email AS text CHECK (value ~ '^[a-zA-Z0-9.!#$%&''*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$');
+EXCEPTION
+  WHEN duplicate_object THEN null;
+END $$;
+
+CREATE OR REPLACE FUNCTION mathesar_types.email_domain_name(mathesar_types.email)
+RETURNS text AS $$
+    SELECT split_part($1, '@', 2);
+$$
+LANGUAGE SQL IMMUTABLE RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.email_local_part(mathesar_types.email)
+RETURNS text AS $$
+    SELECT split_part($1, '@', 1);
+$$
+LANGUAGE SQL IMMUTABLE RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.money
+DO $$
+BEGIN
+  CREATE DOMAIN mathesar_types.mathesar_money AS NUMERIC;
+EXCEPTION
+  WHEN duplicate_object THEN null;
+END $$;
+
+-- mathesar_types.multicurrency
+DO $$
+BEGIN
+  CREATE TYPE mathesar_types.multicurrency_money AS (value NUMERIC, currency CHAR(3));
+EXCEPTION
+  WHEN duplicate_object THEN null;
+END $$;
+
+-- mathesar_types.uri
+CREATE OR REPLACE FUNCTION mathesar_types.uri_parts(text)
+RETURNS text[] AS $$
+    SELECT regexp_match($1, '^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?');
+$$
+LANGUAGE SQL IMMUTABLE RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.uri_scheme(text)
+RETURNS text AS $$
+    SELECT (mathesar_types.uri_parts($1))[2];
+$$
+LANGUAGE SQL IMMUTABLE RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.uri_authority(text)
+RETURNS text AS $$
+    SELECT (mathesar_types.uri_parts($1))[4];
+$$
+LANGUAGE SQL IMMUTABLE RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.uri_path(text)
+RETURNS text AS $$
+    SELECT (mathesar_types.uri_parts($1))[5];
+$$
+LANGUAGE SQL IMMUTABLE RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.uri_query(text)
+RETURNS text AS $$
+    SELECT (mathesar_types.uri_parts($1))[7];
+$$
+LANGUAGE SQL IMMUTABLE RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.uri_fragment(text)
+RETURNS text AS $$
+    SELECT (mathesar_types.uri_parts($1))[9];
+$$
+LANGUAGE SQL IMMUTABLE RETURNS NULL ON NULL INPUT;
+
+DO $$
+BEGIN
+  CREATE DOMAIN mathesar_types.uri AS text CHECK (
+    (value IS NULL) OR (mathesar_types.uri_scheme(value) IS NOT NULL
+    AND mathesar_types.uri_path(value) IS NOT NULL)
+  );
+EXCEPTION
+  WHEN duplicate_object THEN null;
+END $$;
+
+-- mathesar_types.json_array
+DO $$
+BEGIN
+  CREATE DOMAIN mathesar_types.mathesar_json_array AS JSONB CHECK (jsonb_typeof(VALUE) = 'array');
+EXCEPTION
+  WHEN duplicate_object THEN null;
+END $$;
+
+-- mathesar_types.json_object
+DO $$
+BEGIN
+  CREATE DOMAIN mathesar_types.mathesar_json_object AS JSONB CHECK (jsonb_typeof(VALUE) = 'object');
+EXCEPTION
+  WHEN duplicate_object THEN null;
+END $$;
+
+-- mathesar_types.cast_to_boolean
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_boolean(boolean)
+RETURNS boolean
+AS $$
+
+    BEGIN
+      RETURN $1::boolean;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_boolean(smallint)
+RETURNS boolean
+AS $$
+  BEGIN
+    IF $1<>0 AND $1<>1 THEN
+      RAISE EXCEPTION '% is not a boolean', $1; END IF;
+    RETURN $1<>0;
+  END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_boolean(real)
+RETURNS boolean
+AS $$
+  BEGIN
+    IF $1<>0 AND $1<>1 THEN
+      RAISE EXCEPTION '% is not a boolean', $1; END IF;
+    RETURN $1<>0;
+  END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_boolean(bigint)
+RETURNS boolean
+AS $$
+  BEGIN
+    IF $1<>0 AND $1<>1 THEN
+      RAISE EXCEPTION '% is not a boolean', $1; END IF;
+    RETURN $1<>0;
+  END;  
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_boolean(double precision)
+RETURNS boolean
+AS $$
+
+    BEGIN
+      IF $1<>0 AND $1<>1 THEN
+        RAISE EXCEPTION '% is not a boolean', $1; END IF;
+      RETURN $1<>0;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_boolean(numeric)
+RETURNS boolean
+AS $$
+  BEGIN
+    IF $1<>0 AND $1<>1 THEN
+      RAISE EXCEPTION '% is not a boolean', $1; END IF;
+    RETURN $1<>0;
+  END;  
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_boolean(integer)
+RETURNS boolean
+AS $$
+  BEGIN
+    IF $1<>0 AND $1<>1 THEN
+      RAISE EXCEPTION '% is not a boolean', $1; END IF;
+    RETURN $1<>0;
+  END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_boolean(character varying)
+RETURNS boolean
+AS $$
+  DECLARE
+  istrue boolean;
+  BEGIN
+    SELECT
+      $1='1' OR lower($1) = 'on'
+      OR lower($1)='t' OR lower($1)='true'
+      OR lower($1)='y' OR lower($1)='yes'
+    INTO istrue;
+    IF istrue
+      OR $1='0' OR lower($1) = 'off'
+      OR lower($1)='f' OR lower($1)='false'
+      OR lower($1)='n' OR lower($1)='no'
+    THEN
+      RETURN istrue;
+    END IF;
+    RAISE EXCEPTION '% is not a boolean', $1;
+  END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_boolean(text)
+RETURNS boolean
+AS $$
+  DECLARE
+  istrue boolean;
+  BEGIN
+    SELECT
+      $1='1' OR lower($1) = 'on'
+      OR lower($1)='t' OR lower($1)='true'
+      OR lower($1)='y' OR lower($1)='yes'
+    INTO istrue;
+    IF istrue
+      OR $1='0' OR lower($1) = 'off'
+      OR lower($1)='f' OR lower($1)='false'
+      OR lower($1)='n' OR lower($1)='no'
+    THEN
+      RETURN istrue;
+    END IF;
+    RAISE EXCEPTION '% is not a boolean', $1;
+  END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_boolean(character)
+RETURNS boolean
+AS $$
+  DECLARE
+  istrue boolean;
+  BEGIN
+    SELECT
+      $1='1' OR lower($1) = 'on'
+      OR lower($1)='t' OR lower($1)='true'
+      OR lower($1)='y' OR lower($1)='yes'
+    INTO istrue;
+    IF istrue
+      OR $1='0' OR lower($1) = 'off'
+      OR lower($1)='f' OR lower($1)='false'
+      OR lower($1)='n' OR lower($1)='no'
+    THEN
+      RETURN istrue;
+    END IF;
+    RAISE EXCEPTION '% is not a boolean', $1;
+  END;
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_real
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_real(smallint)
+RETURNS real
+AS $$
+
+    BEGIN
+      RETURN $1::real;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_real(bigint)
+RETURNS real
+AS $$
+
+    BEGIN
+      RETURN $1::real;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_real(double precision)
+RETURNS real
+AS $$
+
+    BEGIN
+      RETURN $1::real;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_real(character)
+RETURNS real
+AS $$
+
+    BEGIN
+      RETURN $1::real;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_real(integer)
+RETURNS real
+AS $$
+
+    BEGIN
+      RETURN $1::real;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_real(real)
+RETURNS real
+AS $$
+
+    BEGIN
+      RETURN $1::real;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_real(character varying)
+RETURNS real
+AS $$
+
+    BEGIN
+      RETURN $1::real;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_real(mathesar_types.mathesar_money)
+RETURNS real
+AS $$
+
+    BEGIN
+      RETURN $1::real;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_real(numeric)
+RETURNS real
+AS $$
+
+    BEGIN
+      RETURN $1::real;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_real(text)
+RETURNS real
+AS $$
+
+    BEGIN
+      RETURN $1::real;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_real(money)
+RETURNS real
+AS $$
+
+    BEGIN
+      RETURN $1::real;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_real(boolean)
+RETURNS real
+AS $$
+
+BEGIN
+  IF $1 THEN
+    RETURN 1::real;
+  END IF;
+  RETURN 0::real;
+END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_double_precision
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_double_precision(smallint)
+RETURNS double precision
+AS $$
+
+    BEGIN
+      RETURN $1::double precision;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_double_precision(bigint)
+RETURNS double precision
+AS $$
+
+    BEGIN
+      RETURN $1::double precision;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_double_precision(double precision)
+RETURNS double precision
+AS $$
+
+    BEGIN
+      RETURN $1::double precision;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_double_precision(character)
+RETURNS double precision
+AS $$
+
+    BEGIN
+      RETURN $1::double precision;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_double_precision(integer)
+RETURNS double precision
+AS $$
+
+    BEGIN
+      RETURN $1::double precision;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_double_precision(real)
+RETURNS double precision
+AS $$
+
+    BEGIN
+      RETURN $1::double precision;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_double_precision(character varying)
+RETURNS double precision
+AS $$
+
+    BEGIN
+      RETURN $1::double precision;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_double_precision(mathesar_types.mathesar_money)
+RETURNS double precision
+AS $$
+
+    BEGIN
+      RETURN $1::double precision;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_double_precision(numeric)
+RETURNS double precision
+AS $$
+
+    BEGIN
+      RETURN $1::double precision;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_double_precision(text)
+RETURNS double precision
+AS $$
+
+    BEGIN
+      RETURN $1::double precision;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_double_precision(money)
+RETURNS double precision
+AS $$
+
+    BEGIN
+      RETURN $1::double precision;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_double_precision(boolean)
+RETURNS double precision
+AS $$
+
+BEGIN
+  IF $1 THEN
+    RETURN 1::double precision;
+  END IF;
+  RETURN 0::double precision;
+END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_email
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_email(mathesar_types.email)
+RETURNS mathesar_types.email
+AS $$
+
+    BEGIN
+      RETURN $1::mathesar_types.email;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_email(character varying)
+RETURNS mathesar_types.email
+AS $$
+
+    BEGIN
+      RETURN $1::mathesar_types.email;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_email(text)
+RETURNS mathesar_types.email
+AS $$
+
+    BEGIN
+      RETURN $1::mathesar_types.email;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_email(character)
+RETURNS mathesar_types.email
+AS $$
+
+    BEGIN
+      RETURN $1::mathesar_types.email;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_smallint
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_smallint(smallint)
+RETURNS smallint
+AS $$
+
+    BEGIN
+      RETURN $1::smallint;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_smallint(character varying)
+RETURNS smallint
+AS $$
+
+    BEGIN
+      RETURN $1::smallint;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_smallint(bigint)
+RETURNS smallint
+AS $$
+
+    BEGIN
+      RETURN $1::smallint;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_smallint(character)
+RETURNS smallint
+AS $$
+
+    BEGIN
+      RETURN $1::smallint;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_smallint(text)
+RETURNS smallint
+AS $$
+
+    BEGIN
+      RETURN $1::smallint;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_smallint(integer)
+RETURNS smallint
+AS $$
+
+    BEGIN
+      RETURN $1::smallint;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_smallint(real)
+RETURNS smallint
+AS $$
+
+    DECLARE integer_res smallint;
+    BEGIN
+      SELECT $1::smallint INTO integer_res;
+      IF integer_res = $1 THEN
+        RETURN integer_res;
+      END IF;
+      RAISE EXCEPTION '% cannot be cast to smallint without loss', $1;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_smallint(mathesar_types.mathesar_money)
+RETURNS smallint
+AS $$
+
+    DECLARE integer_res smallint;
+    BEGIN
+      SELECT $1::smallint INTO integer_res;
+      IF integer_res = $1 THEN
+        RETURN integer_res;
+      END IF;
+      RAISE EXCEPTION '% cannot be cast to smallint without loss', $1;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_smallint(double precision)
+RETURNS smallint
+AS $$
+
+    DECLARE integer_res smallint;
+    BEGIN
+      SELECT $1::smallint INTO integer_res;
+      IF integer_res = $1 THEN
+        RETURN integer_res;
+      END IF;
+      RAISE EXCEPTION '% cannot be cast to smallint without loss', $1;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_smallint(numeric)
+RETURNS smallint
+AS $$
+
+    DECLARE integer_res smallint;
+    BEGIN
+      SELECT $1::smallint INTO integer_res;
+      IF integer_res = $1 THEN
+        RETURN integer_res;
+      END IF;
+      RAISE EXCEPTION '% cannot be cast to smallint without loss', $1;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_smallint(money)
+RETURNS smallint
+AS $$
+
+    DECLARE integer_res smallint;
+    BEGIN
+      SELECT $1::smallint INTO integer_res;
+      IF integer_res = $1 THEN
+        RETURN integer_res;
+      END IF;
+      RAISE EXCEPTION '% cannot be cast to smallint without loss', $1;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_smallint(boolean)
+RETURNS smallint
+AS $$
+
+BEGIN
+  IF $1 THEN
+    RETURN 1::smallint;
+  END IF;
+  RETURN 0::smallint;
+END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_bigint(smallint)
+RETURNS bigint
+AS $$
+
+    BEGIN
+      RETURN $1::bigint;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_bigint
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_bigint(character varying)
+RETURNS bigint
+AS $$
+
+    BEGIN
+      RETURN $1::bigint;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_bigint(bigint)
+RETURNS bigint
+AS $$
+
+    BEGIN
+      RETURN $1::bigint;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_bigint(character)
+RETURNS bigint
+AS $$
+
+    BEGIN
+      RETURN $1::bigint;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_bigint(text)
+RETURNS bigint
+AS $$
+
+    BEGIN
+      RETURN $1::bigint;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_bigint(integer)
+RETURNS bigint
+AS $$
+
+    BEGIN
+      RETURN $1::bigint;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_bigint(real)
+RETURNS bigint
+AS $$
+
+    DECLARE integer_res bigint;
+    BEGIN
+      SELECT $1::bigint INTO integer_res;
+      IF integer_res = $1 THEN
+        RETURN integer_res;
+      END IF;
+      RAISE EXCEPTION '% cannot be cast to bigint without loss', $1;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_bigint(mathesar_types.mathesar_money)
+RETURNS bigint
+AS $$
+
+    DECLARE integer_res bigint;
+    BEGIN
+      SELECT $1::bigint INTO integer_res;
+      IF integer_res = $1 THEN
+        RETURN integer_res;
+      END IF;
+      RAISE EXCEPTION '% cannot be cast to bigint without loss', $1;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_bigint(double precision)
+RETURNS bigint
+AS $$
+
+    DECLARE integer_res bigint;
+    BEGIN
+      SELECT $1::bigint INTO integer_res;
+      IF integer_res = $1 THEN
+        RETURN integer_res;
+      END IF;
+      RAISE EXCEPTION '% cannot be cast to bigint without loss', $1;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_bigint(numeric)
+RETURNS bigint
+AS $$
+
+    DECLARE integer_res bigint;
+    BEGIN
+      SELECT $1::bigint INTO integer_res;
+      IF integer_res = $1 THEN
+        RETURN integer_res;
+      END IF;
+      RAISE EXCEPTION '% cannot be cast to bigint without loss', $1;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_bigint(money)
+RETURNS bigint
+AS $$
+
+    DECLARE integer_res bigint;
+    BEGIN
+      SELECT $1::bigint INTO integer_res;
+      IF integer_res = $1 THEN
+        RETURN integer_res;
+      END IF;
+      RAISE EXCEPTION '% cannot be cast to bigint without loss', $1;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_bigint(boolean)
+RETURNS bigint
+AS $$
+
+BEGIN
+  IF $1 THEN
+    RETURN 1::bigint;
+  END IF;
+  RETURN 0::bigint;
+END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_integer
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_integer(smallint)
+RETURNS integer
+AS $$
+
+    BEGIN
+      RETURN $1::integer;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_integer(character varying)
+RETURNS integer
+AS $$
+
+    BEGIN
+      RETURN $1::integer;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_integer(bigint)
+RETURNS integer
+AS $$
+
+    BEGIN
+      RETURN $1::integer;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_integer(character)
+RETURNS integer
+AS $$
+
+    BEGIN
+      RETURN $1::integer;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_integer(text)
+RETURNS integer
+AS $$
+
+    BEGIN
+      RETURN $1::integer;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_integer(integer)
+RETURNS integer
+AS $$
+
+    BEGIN
+      RETURN $1::integer;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_integer(real)
+RETURNS integer
+AS $$
+
+    DECLARE integer_res integer;
+    BEGIN
+      SELECT $1::integer INTO integer_res;
+      IF integer_res = $1 THEN
+        RETURN integer_res;
+      END IF;
+      RAISE EXCEPTION '% cannot be cast to integer without loss', $1;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_integer(mathesar_types.mathesar_money)
+RETURNS integer
+AS $$
+
+    DECLARE integer_res integer;
+    BEGIN
+      SELECT $1::integer INTO integer_res;
+      IF integer_res = $1 THEN
+        RETURN integer_res;
+      END IF;
+      RAISE EXCEPTION '% cannot be cast to integer without loss', $1;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_integer(double precision)
+RETURNS integer
+AS $$
+
+    DECLARE integer_res integer;
+    BEGIN
+      SELECT $1::integer INTO integer_res;
+      IF integer_res = $1 THEN
+        RETURN integer_res;
+      END IF;
+      RAISE EXCEPTION '% cannot be cast to integer without loss', $1;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_integer(numeric)
+RETURNS integer
+AS $$
+
+    DECLARE integer_res integer;
+    BEGIN
+      SELECT $1::integer INTO integer_res;
+      IF integer_res = $1 THEN
+        RETURN integer_res;
+      END IF;
+      RAISE EXCEPTION '% cannot be cast to integer without loss', $1;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_integer(money)
+RETURNS integer
+AS $$
+
+    DECLARE integer_res integer;
+    BEGIN
+      SELECT $1::integer INTO integer_res;
+      IF integer_res = $1 THEN
+        RETURN integer_res;
+      END IF;
+      RAISE EXCEPTION '% cannot be cast to integer without loss', $1;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_integer(boolean)
+RETURNS integer
+AS $$
+
+BEGIN
+  IF $1 THEN
+    RETURN 1::integer;
+  END IF;
+  RETURN 0::integer;
+END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_interval
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_interval(interval)
+RETURNS interval
+AS $$
+
+    BEGIN
+      RETURN $1;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_interval(character varying)
+RETURNS interval
+AS $$
+ BEGIN
+      PERFORM $1::numeric;
+      RAISE EXCEPTION '% is a numeric', $1;
+      EXCEPTION
+        WHEN sqlstate '22P02' THEN
+          RETURN $1::interval;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_interval(text)
+RETURNS interval
+AS $$
+ BEGIN
+      PERFORM $1::numeric;
+      RAISE EXCEPTION '% is a numeric', $1;
+      EXCEPTION
+        WHEN sqlstate '22P02' THEN
+          RETURN $1::interval;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_interval(character)
+RETURNS interval
+AS $$
+ BEGIN
+      PERFORM $1::numeric;
+      RAISE EXCEPTION '% is a numeric', $1;
+      EXCEPTION
+        WHEN sqlstate '22P02' THEN
+          RETURN $1::interval;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_time_without_time_zone
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_time_without_time_zone(text)
+RETURNS time without time zone
+AS $$
+
+    BEGIN
+      RETURN $1::time without time zone;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_time_without_time_zone(character varying)
+RETURNS time without time zone
+AS $$
+
+    BEGIN
+      RETURN $1::time without time zone;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_time_without_time_zone(time without time zone)
+RETURNS time without time zone
+AS $$
+
+    BEGIN
+      RETURN $1::time without time zone;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_time_without_time_zone(time with time zone)
+RETURNS time without time zone
+AS $$
+
+    BEGIN
+      RETURN $1::time without time zone;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_time_with_time_zone
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_time_with_time_zone(text)
+RETURNS time with time zone
+AS $$
+
+    BEGIN
+      RETURN $1::time with time zone;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_time_with_time_zone(character varying)
+RETURNS time with time zone
+AS $$
+
+    BEGIN
+      RETURN $1::time with time zone;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_time_with_time_zone(time without time zone)
+RETURNS time with time zone
+AS $$
+
+    BEGIN
+      RETURN $1::time with time zone;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_time_with_time_zone(time with time zone)
+RETURNS time with time zone
+AS $$
+
+    BEGIN
+      RETURN $1::time with time zone;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_timestamp_with_time_zone
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_timestamp_with_time_zone(character varying)
+RETURNS timestamp with time zone
+AS $$
+
+    BEGIN
+      RETURN $1::timestamp with time zone;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_timestamp_with_time_zone(timestamp with time zone)
+RETURNS timestamp with time zone
+AS $$
+
+    BEGIN
+      RETURN $1::timestamp with time zone;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_timestamp_with_time_zone(character)
+RETURNS timestamp with time zone
+AS $$
+
+    BEGIN
+      RETURN $1::timestamp with time zone;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_timestamp_with_time_zone(timestamp without time zone)
+RETURNS timestamp with time zone
+AS $$
+
+    BEGIN
+      RETURN $1::timestamp with time zone;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_timestamp_with_time_zone(text)
+RETURNS timestamp with time zone
+AS $$
+
+    BEGIN
+      RETURN $1::timestamp with time zone;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_timestamp_without_time_zone
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_timestamp_without_time_zone(timestamp without time zone)
+RETURNS timestamp without time zone
+AS $$
+
+    BEGIN
+      RETURN $1::timestamp without time zone;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_timestamp_without_time_zone(character varying)
+RETURNS timestamp without time zone
+AS $$
+
+DECLARE
+timestamp_value_with_tz NUMERIC;
+timestamp_value NUMERIC;
+date_value NUMERIC;
+BEGIN
+    SET LOCAL TIME ZONE 'UTC';
+    SELECT EXTRACT(EPOCH FROM $1::TIMESTAMP WITH TIME ZONE ) INTO timestamp_value_with_tz;
+    SELECT EXTRACT(EPOCH FROM $1::TIMESTAMP WITHOUT TIME ZONE) INTO timestamp_value;
+    SELECT EXTRACT(EPOCH FROM $1::DATE ) INTO date_value;
+    
+        IF (timestamp_value_with_tz = timestamp_value) THEN
+        RETURN $1::timestamp without time zone;
+        END IF;
+  
+  RAISE EXCEPTION '% is not a timestamp without time zone', $1;
+END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_timestamp_without_time_zone(text)
+RETURNS timestamp without time zone
+AS $$
+
+DECLARE
+timestamp_value_with_tz NUMERIC;
+timestamp_value NUMERIC;
+date_value NUMERIC;
+BEGIN
+    SET LOCAL TIME ZONE 'UTC';
+    SELECT EXTRACT(EPOCH FROM $1::TIMESTAMP WITH TIME ZONE ) INTO timestamp_value_with_tz;
+    SELECT EXTRACT(EPOCH FROM $1::TIMESTAMP WITHOUT TIME ZONE) INTO timestamp_value;
+    SELECT EXTRACT(EPOCH FROM $1::DATE ) INTO date_value;
+    
+        IF (timestamp_value_with_tz = timestamp_value) THEN
+        RETURN $1::timestamp without time zone;
+        END IF;
+  
+  RAISE EXCEPTION '% is not a timestamp without time zone', $1;
+END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_timestamp_without_time_zone(character)
+RETURNS timestamp without time zone
+AS $$
+
+DECLARE
+timestamp_value_with_tz NUMERIC;
+timestamp_value NUMERIC;
+date_value NUMERIC;
+BEGIN
+    SET LOCAL TIME ZONE 'UTC';
+    SELECT EXTRACT(EPOCH FROM $1::TIMESTAMP WITH TIME ZONE ) INTO timestamp_value_with_tz;
+    SELECT EXTRACT(EPOCH FROM $1::TIMESTAMP WITHOUT TIME ZONE) INTO timestamp_value;
+    SELECT EXTRACT(EPOCH FROM $1::DATE ) INTO date_value;
+    
+        IF (timestamp_value_with_tz = timestamp_value) THEN
+        RETURN $1::timestamp without time zone;
+        END IF;
+  
+  RAISE EXCEPTION '% is not a timestamp without time zone', $1;
+END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_timestamp_without_time_zone(date)
+RETURNS timestamp without time zone
+AS $$
+
+DECLARE
+timestamp_value_with_tz NUMERIC;
+timestamp_value NUMERIC;
+date_value NUMERIC;
+BEGIN
+    SET LOCAL TIME ZONE 'UTC';
+    SELECT EXTRACT(EPOCH FROM $1::TIMESTAMP WITH TIME ZONE ) INTO timestamp_value_with_tz;
+    SELECT EXTRACT(EPOCH FROM $1::TIMESTAMP WITHOUT TIME ZONE) INTO timestamp_value;
+    SELECT EXTRACT(EPOCH FROM $1::DATE ) INTO date_value;
+    
+        IF (timestamp_value_with_tz = timestamp_value) THEN
+        RETURN $1::timestamp without time zone;
+        END IF;
+  
+  RAISE EXCEPTION '% is not a timestamp without time zone', $1;
+END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_timestamp_without_time_zone(timestamp with time zone)
+RETURNS timestamp without time zone
+AS $$
+
+DECLARE
+timestamp_value_with_tz NUMERIC;
+timestamp_value NUMERIC;
+date_value NUMERIC;
+BEGIN
+    SET LOCAL TIME ZONE 'UTC';
+    SELECT EXTRACT(EPOCH FROM $1::TIMESTAMP WITH TIME ZONE ) INTO timestamp_value_with_tz;
+    SELECT EXTRACT(EPOCH FROM $1::TIMESTAMP WITHOUT TIME ZONE) INTO timestamp_value;
+    SELECT EXTRACT(EPOCH FROM $1::DATE ) INTO date_value;
+    
+        IF (timestamp_value_with_tz = timestamp_value) THEN
+        RETURN $1::timestamp without time zone;
+        END IF;
+  
+  RAISE EXCEPTION '% is not a timestamp without time zone', $1;
+END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_date
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_date(date)
+RETURNS date
+AS $$
+
+    BEGIN
+      RETURN $1::timestamp with time zone;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_date(character varying)
+RETURNS date
+AS $$
+
+DECLARE
+timestamp_value_with_tz NUMERIC;
+timestamp_value NUMERIC;
+date_value NUMERIC;
+BEGIN
+    SET LOCAL TIME ZONE 'UTC';
+    SELECT EXTRACT(EPOCH FROM $1::TIMESTAMP WITH TIME ZONE ) INTO timestamp_value_with_tz;
+    SELECT EXTRACT(EPOCH FROM $1::TIMESTAMP WITHOUT TIME ZONE) INTO timestamp_value;
+    SELECT EXTRACT(EPOCH FROM $1::DATE ) INTO date_value;
+    
+        IF (timestamp_value_with_tz = date_value) THEN
+        RETURN $1::date;
+        END IF;
+  
+  RAISE EXCEPTION '% is not a date', $1;
+END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_date(text)
+RETURNS date
+AS $$
+
+DECLARE
+timestamp_value_with_tz NUMERIC;
+timestamp_value NUMERIC;
+date_value NUMERIC;
+BEGIN
+    SET LOCAL TIME ZONE 'UTC';
+    SELECT EXTRACT(EPOCH FROM $1::TIMESTAMP WITH TIME ZONE ) INTO timestamp_value_with_tz;
+    SELECT EXTRACT(EPOCH FROM $1::TIMESTAMP WITHOUT TIME ZONE) INTO timestamp_value;
+    SELECT EXTRACT(EPOCH FROM $1::DATE ) INTO date_value;
+    
+        IF (timestamp_value_with_tz = date_value) THEN
+        RETURN $1::date;
+        END IF;
+  
+  RAISE EXCEPTION '% is not a date', $1;
+END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_date(character)
+RETURNS date
+AS $$
+
+DECLARE
+timestamp_value_with_tz NUMERIC;
+timestamp_value NUMERIC;
+date_value NUMERIC;
+BEGIN
+    SET LOCAL TIME ZONE 'UTC';
+    SELECT EXTRACT(EPOCH FROM $1::TIMESTAMP WITH TIME ZONE ) INTO timestamp_value_with_tz;
+    SELECT EXTRACT(EPOCH FROM $1::TIMESTAMP WITHOUT TIME ZONE) INTO timestamp_value;
+    SELECT EXTRACT(EPOCH FROM $1::DATE ) INTO date_value;
+    
+        IF (timestamp_value_with_tz = date_value) THEN
+        RETURN $1::date;
+        END IF;
+  
+  RAISE EXCEPTION '% is not a date', $1;
+END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_date(timestamp without time zone)
+RETURNS date
+AS $$
+
+DECLARE
+timestamp_value_with_tz NUMERIC;
+timestamp_value NUMERIC;
+date_value NUMERIC;
+BEGIN
+    SET LOCAL TIME ZONE 'UTC';
+    SELECT EXTRACT(EPOCH FROM $1::TIMESTAMP WITH TIME ZONE ) INTO timestamp_value_with_tz;
+    SELECT EXTRACT(EPOCH FROM $1::TIMESTAMP WITHOUT TIME ZONE) INTO timestamp_value;
+    SELECT EXTRACT(EPOCH FROM $1::DATE ) INTO date_value;
+    
+        IF (timestamp_value_with_tz = date_value) THEN
+        RETURN $1::date;
+        END IF;
+  
+  RAISE EXCEPTION '% is not a date', $1;
+END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_date(timestamp with time zone)
+RETURNS date
+AS $$
+
+DECLARE
+timestamp_value_with_tz NUMERIC;
+timestamp_value NUMERIC;
+date_value NUMERIC;
+BEGIN
+    SET LOCAL TIME ZONE 'UTC';
+    SELECT EXTRACT(EPOCH FROM $1::TIMESTAMP WITH TIME ZONE ) INTO timestamp_value_with_tz;
+    SELECT EXTRACT(EPOCH FROM $1::TIMESTAMP WITHOUT TIME ZONE) INTO timestamp_value;
+    SELECT EXTRACT(EPOCH FROM $1::DATE ) INTO date_value;
+    
+        IF (timestamp_value_with_tz = date_value) THEN
+        RETURN $1::date;
+        END IF;
+  
+  RAISE EXCEPTION '% is not a date', $1;
+END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_mathesar_money
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_money(mathesar_types.mathesar_money)
+RETURNS mathesar_types.mathesar_money
+AS $$
+
+    BEGIN
+      RETURN $1::mathesar_types.mathesar_money;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_money(smallint)
+RETURNS mathesar_types.mathesar_money
+AS $$
+
+    BEGIN
+      RETURN $1::numeric::mathesar_types.mathesar_money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_money(real)
+RETURNS mathesar_types.mathesar_money
+AS $$
+
+    BEGIN
+      RETURN $1::numeric::mathesar_types.mathesar_money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_money(bigint)
+RETURNS mathesar_types.mathesar_money
+AS $$
+
+    BEGIN
+      RETURN $1::numeric::mathesar_types.mathesar_money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_money(double precision)
+RETURNS mathesar_types.mathesar_money
+AS $$
+
+    BEGIN
+      RETURN $1::numeric::mathesar_types.mathesar_money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_money(numeric)
+RETURNS mathesar_types.mathesar_money
+AS $$
+
+    BEGIN
+      RETURN $1::numeric::mathesar_types.mathesar_money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_money(integer)
+RETURNS mathesar_types.mathesar_money
+AS $$
+
+    BEGIN
+      RETURN $1::numeric::mathesar_types.mathesar_money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_money(character varying)
+RETURNS mathesar_types.mathesar_money
+AS $$
+
+    DECLARE decimal_point text;
+    DECLARE is_negative boolean;
+    DECLARE money_arr text[];
+    DECLARE money_num text;
+    BEGIN
+      SELECT mathesar_types.get_mathesar_money_array($1::text) INTO money_arr;
+      IF money_arr IS NULL THEN
+        RAISE EXCEPTION '% cannot be cast to mathesar_types.mathesar_money', $1;
+      END IF;
+      SELECT money_arr[1] INTO money_num;
+      SELECT ltrim(to_char(1, 'D'), ' ') INTO decimal_point;
+      SELECT $1::text ~ '^.*(-|\(.+\)).*$' INTO is_negative;
+      IF money_arr[2] IS NOT NULL THEN
+        SELECT regexp_replace(money_num, money_arr[2], '', 'gq') INTO money_num;
+      END IF;
+      IF money_arr[3] IS NOT NULL THEN
+        SELECT regexp_replace(money_num, money_arr[3], decimal_point, 'q') INTO money_num;
+      END IF;
+      IF is_negative THEN
+        RETURN ('-' || money_num)::mathesar_types.mathesar_money;
+      END IF;
+      RETURN money_num::mathesar_types.mathesar_money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_money(text)
+RETURNS mathesar_types.mathesar_money
+AS $$
+
+    DECLARE decimal_point text;
+    DECLARE is_negative boolean;
+    DECLARE money_arr text[];
+    DECLARE money_num text;
+    BEGIN
+      SELECT mathesar_types.get_mathesar_money_array($1::text) INTO money_arr;
+      IF money_arr IS NULL THEN
+        RAISE EXCEPTION '% cannot be cast to mathesar_types.mathesar_money', $1;
+      END IF;
+      SELECT money_arr[1] INTO money_num;
+      SELECT ltrim(to_char(1, 'D'), ' ') INTO decimal_point;
+      SELECT $1::text ~ '^.*(-|\(.+\)).*$' INTO is_negative;
+      IF money_arr[2] IS NOT NULL THEN
+        SELECT regexp_replace(money_num, money_arr[2], '', 'gq') INTO money_num;
+      END IF;
+      IF money_arr[3] IS NOT NULL THEN
+        SELECT regexp_replace(money_num, money_arr[3], decimal_point, 'q') INTO money_num;
+      END IF;
+      IF is_negative THEN
+        RETURN ('-' || money_num)::mathesar_types.mathesar_money;
+      END IF;
+      RETURN money_num::mathesar_types.mathesar_money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_money(money)
+RETURNS mathesar_types.mathesar_money
+AS $$
+
+    DECLARE decimal_point text;
+    DECLARE is_negative boolean;
+    DECLARE money_arr text[];
+    DECLARE money_num text;
+    BEGIN
+      SELECT mathesar_types.get_mathesar_money_array($1::text) INTO money_arr;
+      IF money_arr IS NULL THEN
+        RAISE EXCEPTION '% cannot be cast to mathesar_types.mathesar_money', $1;
+      END IF;
+      SELECT money_arr[1] INTO money_num;
+      SELECT ltrim(to_char(1, 'D'), ' ') INTO decimal_point;
+      SELECT $1::text ~ '^.*(-|\(.+\)).*$' INTO is_negative;
+      IF money_arr[2] IS NOT NULL THEN
+        SELECT regexp_replace(money_num, money_arr[2], '', 'gq') INTO money_num;
+      END IF;
+      IF money_arr[3] IS NOT NULL THEN
+        SELECT regexp_replace(money_num, money_arr[3], decimal_point, 'q') INTO money_num;
+      END IF;
+      IF is_negative THEN
+        RETURN ('-' || money_num)::mathesar_types.mathesar_money;
+      END IF;
+      RETURN money_num::mathesar_types.mathesar_money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_money(character)
+RETURNS mathesar_types.mathesar_money
+AS $$
+
+    DECLARE decimal_point text;
+    DECLARE is_negative boolean;
+    DECLARE money_arr text[];
+    DECLARE money_num text;
+    BEGIN
+      SELECT mathesar_types.get_mathesar_money_array($1::text) INTO money_arr;
+      IF money_arr IS NULL THEN
+        RAISE EXCEPTION '% cannot be cast to mathesar_types.mathesar_money', $1;
+      END IF;
+      SELECT money_arr[1] INTO money_num;
+      SELECT ltrim(to_char(1, 'D'), ' ') INTO decimal_point;
+      SELECT $1::text ~ '^.*(-|\(.+\)).*$' INTO is_negative;
+      IF money_arr[2] IS NOT NULL THEN
+        SELECT regexp_replace(money_num, money_arr[2], '', 'gq') INTO money_num;
+      END IF;
+      IF money_arr[3] IS NOT NULL THEN
+        SELECT regexp_replace(money_num, money_arr[3], decimal_point, 'q') INTO money_num;
+      END IF;
+      IF is_negative THEN
+        RETURN ('-' || money_num)::mathesar_types.mathesar_money;
+      END IF;
+      RETURN money_num::mathesar_types.mathesar_money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_money
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_money(mathesar_types.mathesar_money)
+RETURNS money
+AS $$
+
+    BEGIN
+      RETURN $1::money;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_money(money)
+RETURNS money
+AS $$
+
+    BEGIN
+      RETURN $1::money;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_money(smallint)
+RETURNS money
+AS $$
+
+    BEGIN
+      RETURN $1::numeric::money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_money(real)
+RETURNS money
+AS $$
+
+    BEGIN
+      RETURN $1::numeric::money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_money(bigint)
+RETURNS money
+AS $$
+
+    BEGIN
+      RETURN $1::numeric::money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_money(double precision)
+RETURNS money
+AS $$
+
+    BEGIN
+      RETURN $1::numeric::money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_money(numeric)
+RETURNS money
+AS $$
+
+    BEGIN
+      RETURN $1::numeric::money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_money(integer)
+RETURNS money
+AS $$
+
+    BEGIN
+      RETURN $1::numeric::money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_money(character varying)
+RETURNS money
+AS $$
+
+    DECLARE currency text;
+    BEGIN
+      SELECT to_char(1, 'L') INTO currency;
+      IF ($1 LIKE '%' || currency) OR ($1 LIKE currency || '%') THEN
+        RETURN $1::money;
+      END IF;
+      RAISE EXCEPTION '% cannot be cast to money as currency symbol is missing', $1;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_money(text)
+RETURNS money
+AS $$
+
+    DECLARE currency text;
+    BEGIN
+      SELECT to_char(1, 'L') INTO currency;
+      IF ($1 LIKE '%' || currency) OR ($1 LIKE currency || '%') THEN
+        RETURN $1::money;
+      END IF;
+      RAISE EXCEPTION '% cannot be cast to money as currency symbol is missing', $1;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_money(character)
+RETURNS money
+AS $$
+
+    DECLARE currency text;
+    BEGIN
+      SELECT to_char(1, 'L') INTO currency;
+      IF ($1 LIKE '%' || currency) OR ($1 LIKE currency || '%') THEN
+        RETURN $1::money;
+      END IF;
+      RAISE EXCEPTION '% cannot be cast to money as currency symbol is missing', $1;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_multicurrency_money
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_multicurrency_money(mathesar_types.multicurrency_money)
+RETURNS mathesar_types.multicurrency_money
+AS $$
+
+    BEGIN
+      RETURN $1::mathesar_types.multicurrency_money;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_multicurrency_money(smallint)
+RETURNS mathesar_types.multicurrency_money
+AS $$
+
+    BEGIN
+      RETURN ROW($1, 'USD')::mathesar_types.multicurrency_money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_multicurrency_money(real)
+RETURNS mathesar_types.multicurrency_money
+AS $$
+
+    BEGIN
+      RETURN ROW($1, 'USD')::mathesar_types.multicurrency_money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_multicurrency_money(mathesar_types.mathesar_money)
+RETURNS mathesar_types.multicurrency_money
+AS $$
+
+    BEGIN
+      RETURN ROW($1, 'USD')::mathesar_types.multicurrency_money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_multicurrency_money(bigint)
+RETURNS mathesar_types.multicurrency_money
+AS $$
+
+    BEGIN
+      RETURN ROW($1, 'USD')::mathesar_types.multicurrency_money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_multicurrency_money(double precision)
+RETURNS mathesar_types.multicurrency_money
+AS $$
+
+    BEGIN
+      RETURN ROW($1, 'USD')::mathesar_types.multicurrency_money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_multicurrency_money(numeric)
+RETURNS mathesar_types.multicurrency_money
+AS $$
+
+    BEGIN
+      RETURN ROW($1, 'USD')::mathesar_types.multicurrency_money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_multicurrency_money(integer)
+RETURNS mathesar_types.multicurrency_money
+AS $$
+
+    BEGIN
+      RETURN ROW($1, 'USD')::mathesar_types.multicurrency_money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_multicurrency_money(character varying)
+RETURNS mathesar_types.multicurrency_money
+AS $$
+
+    BEGIN
+      RETURN ROW($1::numeric, 'USD')::mathesar_types.multicurrency_money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_multicurrency_money(text)
+RETURNS mathesar_types.multicurrency_money
+AS $$
+
+    BEGIN
+      RETURN ROW($1::numeric, 'USD')::mathesar_types.multicurrency_money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_multicurrency_money(money)
+RETURNS mathesar_types.multicurrency_money
+AS $$
+
+    BEGIN
+      RETURN ROW($1::numeric, 'USD')::mathesar_types.multicurrency_money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_multicurrency_money(character)
+RETURNS mathesar_types.multicurrency_money
+AS $$
+
+    BEGIN
+      RETURN ROW($1::numeric, 'USD')::mathesar_types.multicurrency_money;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_character_varying
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(time without time zone)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(bigint)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(double precision)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(mathesar_types.multicurrency_money)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(mathesar_types.uri)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(time with time zone)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(integer)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(real)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(mathesar_types.mathesar_money)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(tsvector)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(jsonb)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying("char")
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(interval)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(macaddr)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(smallint)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(timestamp with time zone)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(inet)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(boolean)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(int4range)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(mathesar_types.mathesar_json_object)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(tstzrange)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(regclass)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(character)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(tsrange)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(numrange)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(cidr)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(character varying)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(numeric)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(mathesar_types.email)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(bit)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(money)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(int8range)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(oid)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(json)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(daterange)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(timestamp without time zone)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(bytea)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(date)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(mathesar_types.mathesar_json_array)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(text)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character_varying(uuid)
+RETURNS character varying
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_character
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(time without time zone)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(bigint)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(double precision)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(mathesar_types.multicurrency_money)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(mathesar_types.uri)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(time with time zone)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(integer)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(real)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(mathesar_types.mathesar_money)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(tsvector)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(jsonb)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character("char")
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(interval)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(macaddr)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(smallint)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(timestamp with time zone)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(inet)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(boolean)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(int4range)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(mathesar_types.mathesar_json_object)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(tstzrange)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(regclass)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(character)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(tsrange)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(numrange)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(cidr)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(character varying)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(numeric)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(mathesar_types.email)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(bit)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(money)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(int8range)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(oid)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(json)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(daterange)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(timestamp without time zone)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(bytea)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(date)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(mathesar_types.mathesar_json_array)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(text)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_character(uuid)
+RETURNS character
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to__double_quote_char_double_quote_
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(time without time zone)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(bigint)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(double precision)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(mathesar_types.multicurrency_money)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(mathesar_types.uri)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(time with time zone)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(integer)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(real)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(mathesar_types.mathesar_money)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(tsvector)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(jsonb)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_("char")
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(interval)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(macaddr)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(smallint)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(timestamp with time zone)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(inet)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(boolean)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(int4range)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(mathesar_types.mathesar_json_object)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(tstzrange)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(regclass)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(character)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(tsrange)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(numrange)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(cidr)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(character varying)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(numeric)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(mathesar_types.email)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(bit)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(money)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(int8range)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(oid)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(json)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(daterange)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(timestamp without time zone)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(bytea)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(date)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(mathesar_types.mathesar_json_array)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(text)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to__double_quote_char_double_quote_(uuid)
+RETURNS "char"
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_text
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(time without time zone)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(bigint)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(double precision)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(mathesar_types.multicurrency_money)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(mathesar_types.uri)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(time with time zone)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(integer)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(real)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(mathesar_types.mathesar_money)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(tsvector)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(jsonb)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text("char")
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(interval)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(macaddr)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(smallint)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(timestamp with time zone)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(inet)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(boolean)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(int4range)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(mathesar_types.mathesar_json_object)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(tstzrange)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(regclass)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(character)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(tsrange)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(numrange)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(cidr)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(character varying)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(numeric)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(mathesar_types.email)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(bit)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(money)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(int8range)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(oid)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(json)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(daterange)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(timestamp without time zone)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(bytea)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(date)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(mathesar_types.mathesar_json_array)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(text)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_text(uuid)
+RETURNS text
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_name
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(time without time zone)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(bigint)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(double precision)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(mathesar_types.multicurrency_money)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(mathesar_types.uri)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(time with time zone)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(integer)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(real)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(mathesar_types.mathesar_money)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(tsvector)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(jsonb)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name("char")
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(interval)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(macaddr)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(smallint)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(timestamp with time zone)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(inet)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(boolean)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(int4range)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(mathesar_types.mathesar_json_object)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(tstzrange)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(regclass)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(character)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(tsrange)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(numrange)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(cidr)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(character varying)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(numeric)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(mathesar_types.email)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(bit)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(money)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(int8range)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(oid)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(json)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(daterange)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(timestamp without time zone)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(bytea)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(date)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(mathesar_types.mathesar_json_array)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(text)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_name(uuid)
+RETURNS name
+AS $$
+
+    BEGIN
+      RETURN $1::text;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_uri
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_uri(character varying)
+RETURNS mathesar_types.uri
+AS $$
+
+    DECLARE uri_res mathesar_types.uri := 'https://centerofci.org';
+    DECLARE uri_tld text;
+    BEGIN
+      RETURN $1::mathesar_types.uri;
+      EXCEPTION WHEN SQLSTATE '23514' THEN
+          SELECT lower(('http://' || $1)::mathesar_types.uri) INTO uri_res;
+          SELECT (regexp_match(mathesar_types.uri_authority(uri_res), '(?<=\.)(?:.(?!\.))+$'))[1]
+            INTO uri_tld;
+          IF EXISTS(SELECT 1 FROM mathesar_types.top_level_domains WHERE tld = uri_tld) THEN
+            RETURN uri_res;
+          END IF;
+      RAISE EXCEPTION '% is not a mathesar_types.uri', $1;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_uri(text)
+RETURNS mathesar_types.uri
+AS $$
+
+    DECLARE uri_res mathesar_types.uri := 'https://centerofci.org';
+    DECLARE uri_tld text;
+    BEGIN
+      RETURN $1::mathesar_types.uri;
+      EXCEPTION WHEN SQLSTATE '23514' THEN
+          SELECT lower(('http://' || $1)::mathesar_types.uri) INTO uri_res;
+          SELECT (regexp_match(mathesar_types.uri_authority(uri_res), '(?<=\.)(?:.(?!\.))+$'))[1]
+            INTO uri_tld;
+          IF EXISTS(SELECT 1 FROM mathesar_types.top_level_domains WHERE tld = uri_tld) THEN
+            RETURN uri_res;
+          END IF;
+      RAISE EXCEPTION '% is not a mathesar_types.uri', $1;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_uri(mathesar_types.uri)
+RETURNS mathesar_types.uri
+AS $$
+
+    DECLARE uri_res mathesar_types.uri := 'https://centerofci.org';
+    DECLARE uri_tld text;
+    BEGIN
+      RETURN $1::mathesar_types.uri;
+      EXCEPTION WHEN SQLSTATE '23514' THEN
+          SELECT lower(('http://' || $1)::mathesar_types.uri) INTO uri_res;
+          SELECT (regexp_match(mathesar_types.uri_authority(uri_res), '(?<=\.)(?:.(?!\.))+$'))[1]
+            INTO uri_tld;
+          IF EXISTS(SELECT 1 FROM mathesar_types.top_level_domains WHERE tld = uri_tld) THEN
+            RETURN uri_res;
+          END IF;
+      RAISE EXCEPTION '% is not a mathesar_types.uri', $1;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_uri(character)
+RETURNS mathesar_types.uri
+AS $$
+
+    DECLARE uri_res mathesar_types.uri := 'https://centerofci.org';
+    DECLARE uri_tld text;
+    BEGIN
+      RETURN $1::mathesar_types.uri;
+      EXCEPTION WHEN SQLSTATE '23514' THEN
+          SELECT lower(('http://' || $1)::mathesar_types.uri) INTO uri_res;
+          SELECT (regexp_match(mathesar_types.uri_authority(uri_res), '(?<=\.)(?:.(?!\.))+$'))[1]
+            INTO uri_tld;
+          IF EXISTS(SELECT 1 FROM mathesar_types.top_level_domains WHERE tld = uri_tld) THEN
+            RETURN uri_res;
+          END IF;
+      RAISE EXCEPTION '% is not a mathesar_types.uri', $1;
+    END;
+    
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_numeric
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_numeric(smallint)
+RETURNS numeric
+AS $$
+
+    BEGIN
+      RETURN $1::numeric;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_numeric(real)
+RETURNS numeric
+AS $$
+
+    BEGIN
+      RETURN $1::numeric;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_numeric(bigint)
+RETURNS numeric
+AS $$
+
+    BEGIN
+      RETURN $1::numeric;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_numeric(double precision)
+RETURNS numeric
+AS $$
+
+    BEGIN
+      RETURN $1::numeric;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_numeric(numeric)
+RETURNS numeric
+AS $$
+
+    BEGIN
+      RETURN $1::numeric;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_numeric(money)
+RETURNS numeric
+AS $$
+
+    BEGIN
+      RETURN $1::numeric;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_numeric(integer)
+RETURNS numeric
+AS $$
+
+    BEGIN
+      RETURN $1::numeric;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_numeric(character varying)
+RETURNS numeric
+AS $$
+
+DECLARE decimal_point text;
+DECLARE is_negative boolean;
+DECLARE numeric_arr text[];
+DECLARE numeric text;
+BEGIN
+    SELECT mathesar_types.get_numeric_array($1::text) INTO numeric_arr;
+    IF numeric_arr IS NULL THEN
+        RAISE EXCEPTION '% cannot be cast to numeric', $1;
+    END IF;
+    SELECT numeric_arr[1] INTO numeric;
+    SELECT ltrim(to_char(1, 'D'), ' ') INTO decimal_point;
+    SELECT $1::text ~ '^-.*$' INTO is_negative;
+    IF numeric_arr[2] IS NOT NULL THEN
+        SELECT regexp_replace(numeric, numeric_arr[2], '', 'gq') INTO numeric;
+    END IF;
+    IF numeric_arr[3] IS NOT NULL THEN
+        SELECT regexp_replace(numeric, numeric_arr[3], decimal_point, 'q') INTO numeric;
+    END IF;
+    IF is_negative THEN
+        RETURN ('-' || numeric)::numeric;
+    END IF;
+    RETURN numeric::numeric;
+END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_numeric(text)
+RETURNS numeric
+AS $$
+
+DECLARE decimal_point text;
+DECLARE is_negative boolean;
+DECLARE numeric_arr text[];
+DECLARE numeric text;
+BEGIN
+    SELECT mathesar_types.get_numeric_array($1::text) INTO numeric_arr;
+    IF numeric_arr IS NULL THEN
+        RAISE EXCEPTION '% cannot be cast to numeric', $1;
+    END IF;
+    SELECT numeric_arr[1] INTO numeric;
+    SELECT ltrim(to_char(1, 'D'), ' ') INTO decimal_point;
+    SELECT $1::text ~ '^-.*$' INTO is_negative;
+    IF numeric_arr[2] IS NOT NULL THEN
+        SELECT regexp_replace(numeric, numeric_arr[2], '', 'gq') INTO numeric;
+    END IF;
+    IF numeric_arr[3] IS NOT NULL THEN
+        SELECT regexp_replace(numeric, numeric_arr[3], decimal_point, 'q') INTO numeric;
+    END IF;
+    IF is_negative THEN
+        RETURN ('-' || numeric)::numeric;
+    END IF;
+    RETURN numeric::numeric;
+END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_numeric(character)
+RETURNS numeric
+AS $$
+
+DECLARE decimal_point text;
+DECLARE is_negative boolean;
+DECLARE numeric_arr text[];
+DECLARE numeric text;
+BEGIN
+    SELECT mathesar_types.get_numeric_array($1::text) INTO numeric_arr;
+    IF numeric_arr IS NULL THEN
+        RAISE EXCEPTION '% cannot be cast to numeric', $1;
+    END IF;
+    SELECT numeric_arr[1] INTO numeric;
+    SELECT ltrim(to_char(1, 'D'), ' ') INTO decimal_point;
+    SELECT $1::text ~ '^-.*$' INTO is_negative;
+    IF numeric_arr[2] IS NOT NULL THEN
+        SELECT regexp_replace(numeric, numeric_arr[2], '', 'gq') INTO numeric;
+    END IF;
+    IF numeric_arr[3] IS NOT NULL THEN
+        SELECT regexp_replace(numeric, numeric_arr[3], decimal_point, 'q') INTO numeric;
+    END IF;
+    IF is_negative THEN
+        RETURN ('-' || numeric)::numeric;
+    END IF;
+    RETURN numeric::numeric;
+END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_numeric(boolean)
+RETURNS numeric
+AS $$
+
+BEGIN
+  IF $1 THEN
+    RETURN 1::numeric;
+  END IF;
+  RETURN 0::numeric;
+END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_jsonb
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_jsonb(character varying)
+RETURNS jsonb
+AS $$
+
+    BEGIN
+      RETURN $1::jsonb;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_jsonb(json)
+RETURNS jsonb
+AS $$
+
+    BEGIN
+      RETURN $1::jsonb;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_jsonb(character)
+RETURNS jsonb
+AS $$
+
+    BEGIN
+      RETURN $1::jsonb;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_jsonb(jsonb)
+RETURNS jsonb
+AS $$
+
+    BEGIN
+      RETURN $1::jsonb;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_jsonb(mathesar_types.mathesar_json_array)
+RETURNS jsonb
+AS $$
+
+    BEGIN
+      RETURN $1::jsonb;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_jsonb(text)
+RETURNS jsonb
+AS $$
+
+    BEGIN
+      RETURN $1::jsonb;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_jsonb(mathesar_types.mathesar_json_object)
+RETURNS jsonb
+AS $$
+
+    BEGIN
+      RETURN $1::jsonb;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_mathesar_json_array
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_json_array(character varying)
+RETURNS mathesar_types.mathesar_json_array
+AS $$
+
+    BEGIN
+      RETURN $1::mathesar_types.mathesar_json_array;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_json_array(json)
+RETURNS mathesar_types.mathesar_json_array
+AS $$
+
+    BEGIN
+      RETURN $1::mathesar_types.mathesar_json_array;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_json_array(character)
+RETURNS mathesar_types.mathesar_json_array
+AS $$
+
+    BEGIN
+      RETURN $1::mathesar_types.mathesar_json_array;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_json_array(jsonb)
+RETURNS mathesar_types.mathesar_json_array
+AS $$
+
+    BEGIN
+      RETURN $1::mathesar_types.mathesar_json_array;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_json_array(mathesar_types.mathesar_json_array)
+RETURNS mathesar_types.mathesar_json_array
+AS $$
+
+    BEGIN
+      RETURN $1::mathesar_types.mathesar_json_array;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_json_array(text)
+RETURNS mathesar_types.mathesar_json_array
+AS $$
+
+    BEGIN
+      RETURN $1::mathesar_types.mathesar_json_array;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_json_array(mathesar_types.mathesar_json_object)
+RETURNS mathesar_types.mathesar_json_array
+AS $$
+
+    BEGIN
+      RETURN $1::mathesar_types.mathesar_json_array;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_mathesar_json_object
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_json_object(character varying)
+RETURNS mathesar_types.mathesar_json_object
+AS $$
+
+    BEGIN
+      RETURN $1::mathesar_types.mathesar_json_object;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_json_object(json)
+RETURNS mathesar_types.mathesar_json_object
+AS $$
+
+    BEGIN
+      RETURN $1::mathesar_types.mathesar_json_object;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_json_object(character)
+RETURNS mathesar_types.mathesar_json_object
+AS $$
+
+    BEGIN
+      RETURN $1::mathesar_types.mathesar_json_object;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_json_object(jsonb)
+RETURNS mathesar_types.mathesar_json_object
+AS $$
+
+    BEGIN
+      RETURN $1::mathesar_types.mathesar_json_object;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_json_object(mathesar_types.mathesar_json_array)
+RETURNS mathesar_types.mathesar_json_object
+AS $$
+
+    BEGIN
+      RETURN $1::mathesar_types.mathesar_json_object;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_json_object(text)
+RETURNS mathesar_types.mathesar_json_object
+AS $$
+
+    BEGIN
+      RETURN $1::mathesar_types.mathesar_json_object;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_json_object(mathesar_types.mathesar_json_object)
+RETURNS mathesar_types.mathesar_json_object
+AS $$
+
+    BEGIN
+      RETURN $1::mathesar_types.mathesar_json_object;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+
+-- mathesar_types.cast_to_json
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_json(character varying)
+RETURNS json
+AS $$
+
+    BEGIN
+      RETURN $1::json;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_json(json)
+RETURNS json
+AS $$
+
+    BEGIN
+      RETURN $1::json;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_json(character)
+RETURNS json
+AS $$
+
+    BEGIN
+      RETURN $1::json;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_json(jsonb)
+RETURNS json
+AS $$
+
+    BEGIN
+      RETURN $1::json;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_json(mathesar_types.mathesar_json_array)
+RETURNS json
+AS $$
+
+    BEGIN
+      RETURN $1::json;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_json(text)
+RETURNS json
+AS $$
+
+    BEGIN
+      RETURN $1::json;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION mathesar_types.cast_to_json(mathesar_types.mathesar_json_object)
+RETURNS json
+AS $$
+
+    BEGIN
+      RETURN $1::json;
+    END;
+
+$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;

From dd600567f7587a35a3f524a714402123401d0441 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 3 Oct 2024 02:17:39 +0530
Subject: [PATCH 1052/1141] extract permissions related commands and functions
 to new sql and run at it at the very end

---
 db/sql/00_msar.sql             | 37 ----------------------------------
 db/sql/50_msar_permissions.sql | 35 ++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 37 deletions(-)
 create mode 100644 db/sql/50_msar_permissions.sql

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 56bb5ecdd8..78b37c80a5 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -5157,40 +5157,3 @@ BEGIN
   );
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
-
-
-----------------------------------------------------------------------------------------------------
-----------------------------------------------------------------------------------------------------
--- FUNCTIONS/COMMANDS RELATED TO GRANTING APPROPRIATE PERMISSIONS FOR msar, __msar AND mathesar_types
--- SCHEMAS TO PUBLIC. 
---
--- !!! DO NOT ADD ANY FUNCTIONS PAST THIS POINT !!!
-----------------------------------------------------------------------------------------------------
-----------------------------------------------------------------------------------------------------
-
-CREATE OR REPLACE FUNCTION
-msar.grant_usage_on_custom_mathesar_types_to_public() RETURNS void AS $$
-BEGIN
-  EXECUTE string_agg(
-    format(
-      'GRANT USAGE ON TYPE %1$I.%2$I TO PUBLIC',
-      pgn.nspname,
-      pgt.typname
-    ),
-    E';\n'
-  ) || E';\n'
-  FROM pg_catalog.pg_type AS pgt
-  JOIN pg_catalog.pg_namespace pgn ON pgn.oid = pgt.typnamespace
-  WHERE (pgn.nspname = 'msar'
-  OR pgn.nspname = '__msar'
-  OR pgn.nspname = 'mathesar_types')
-  AND (pgt.typtype = 'c' OR pgt.typtype = 'd')
-  AND pgt.typcategory != 'A';
-END;
-$$ LANGUAGE plpgsql;
-
-
-GRANT USAGE ON SCHEMA __msar, msar, mathesar_types TO PUBLIC;
-GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA msar, __msar, mathesar_types TO PUBLIC;
-GRANT SELECT ON ALL TABLES IN SCHEMA msar, __msar, mathesar_types TO PUBLIC;
-SELECT msar.grant_usage_on_custom_mathesar_types_to_public();
diff --git a/db/sql/50_msar_permissions.sql b/db/sql/50_msar_permissions.sql
new file mode 100644
index 0000000000..9b5631e425
--- /dev/null
+++ b/db/sql/50_msar_permissions.sql
@@ -0,0 +1,35 @@
+----------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------------------------------------
+-- FUNCTIONS/COMMANDS RELATED TO GRANTING APPROPRIATE PERMISSIONS FOR msar, __msar AND mathesar_types
+-- SCHEMAS TO PUBLIC. 
+--
+-- !!! DO NOT ADD ANY FUNCTIONS PAST THIS POINT !!!
+----------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------------------------------------
+
+CREATE OR REPLACE FUNCTION
+msar.grant_usage_on_custom_mathesar_types_to_public() RETURNS void AS $$
+BEGIN
+  EXECUTE string_agg(
+    format(
+      'GRANT USAGE ON TYPE %1$I.%2$I TO PUBLIC',
+      pgn.nspname,
+      pgt.typname
+    ),
+    E';\n'
+  ) || E';\n'
+  FROM pg_catalog.pg_type AS pgt
+  JOIN pg_catalog.pg_namespace pgn ON pgn.oid = pgt.typnamespace
+  WHERE (pgn.nspname = 'msar'
+  OR pgn.nspname = '__msar'
+  OR pgn.nspname = 'mathesar_types')
+  AND (pgt.typtype = 'c' OR pgt.typtype = 'd')
+  AND pgt.typcategory != 'A';
+END;
+$$ LANGUAGE plpgsql;
+
+
+GRANT USAGE ON SCHEMA __msar, msar, mathesar_types TO PUBLIC;
+GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA msar, __msar, mathesar_types TO PUBLIC;
+GRANT SELECT ON ALL TABLES IN SCHEMA msar, __msar, mathesar_types TO PUBLIC;
+SELECT msar.grant_usage_on_custom_mathesar_types_to_public();

From 2b804468c791aa5bfc8a88c399f8a3b6d9e651f7 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 3 Oct 2024 02:37:05 +0530
Subject: [PATCH 1053/1141] add array functions for type install

---
 db/sql/40_msar_types.sql | 50 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/db/sql/40_msar_types.sql b/db/sql/40_msar_types.sql
index 74e40bf57e..e032ec42cc 100644
--- a/db/sql/40_msar_types.sql
+++ b/db/sql/40_msar_types.sql
@@ -1446,6 +1446,31 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 -- mathesar_types.cast_to_mathesar_money
 
+CREATE OR REPLACE FUNCTION mathesar_types.get_mathesar_money_array(text) RETURNS text[]
+AS $$
+  DECLARE
+    raw_arr text[];
+    actual_number_arr text[];
+    group_divider_arr text[];
+    decimal_point_arr text[];
+    actual_number text;
+    group_divider text;
+    decimal_point text;
+  BEGIN
+    SELECT regexp_matches($1, '^(?:(?:[^.,0-9]+)([0-9]{4,}(?:([,.])[0-9]+)?|[0-9]{1,3}(?:([,.])[0-9]{1,2}|[0-9]{4,})?|[0-9]{1,3}(,)[0-9]{3}(\.)[0-9]+|[0-9]{1,3}(\.)[0-9]{3}(,)[0-9]+|[0-9]{1,3}(?:(,)[0-9]{3}){2,}(?:(\.)[0-9]+)?|[0-9]{1,3}(?:(\.)[0-9]{3}){2,}(?:(,)[0-9]+)?|[0-9]{1,3}(?:( )[0-9]{3})+(?:([,.])[0-9]+)?|[0-9]{1,2}(?:(,)[0-9]{2})+,[0-9]{3}(?:(\.)[0-9]+)?)(?:[^.,0-9]+)?|(?:[^.,0-9]+)?([0-9]{4,}(?:([,.])[0-9]+)?|[0-9]{1,3}(?:([,.])[0-9]{1,2}|[0-9]{4,})?|[0-9]{1,3}(,)[0-9]{3}(\.)[0-9]+|[0-9]{1,3}(\.)[0-9]{3}(,)[0-9]+|[0-9]{1,3}(?:(,)[0-9]{3}){2,}(?:(\.)[0-9]+)?|[0-9]{1,3}(?:(\.)[0-9]{3}){2,}(?:(,)[0-9]+)?|[0-9]{1,3}(?:( )[0-9]{3})+(?:([,.])[0-9]+)?|[0-9]{1,2}(?:(,)[0-9]{2})+,[0-9]{3}(?:(\.)[0-9]+)?)(?:[^.,0-9]+))$') INTO raw_arr;
+    IF raw_arr IS NULL THEN
+      RETURN NULL;
+    END IF;
+    SELECT array_remove(ARRAY[raw_arr[1],raw_arr[16]], null) INTO actual_number_arr;
+    SELECT array_remove(ARRAY[raw_arr[4],raw_arr[6],raw_arr[8],raw_arr[10],raw_arr[12],raw_arr[14],raw_arr[19],raw_arr[21],raw_arr[23],raw_arr[25],raw_arr[27],raw_arr[29]], null) INTO group_divider_arr;
+    SELECT array_remove(ARRAY[raw_arr[2],raw_arr[3],raw_arr[5],raw_arr[7],raw_arr[9],raw_arr[11],raw_arr[13],raw_arr[15],raw_arr[17],raw_arr[18],raw_arr[20],raw_arr[22],raw_arr[24],raw_arr[26],raw_arr[28],raw_arr[30]], null) INTO decimal_point_arr;
+    SELECT actual_number_arr[1] INTO actual_number;
+    SELECT group_divider_arr[1] INTO group_divider;
+    SELECT decimal_point_arr[1] INTO decimal_point;
+    RETURN ARRAY[actual_number, group_divider, decimal_point, replace($1, actual_number, '')];
+  END;
+$$ LANGUAGE plpgsql;
+
 CREATE OR REPLACE FUNCTION mathesar_types.cast_to_mathesar_money(mathesar_types.mathesar_money)
 RETURNS mathesar_types.mathesar_money
 AS $$
@@ -4038,6 +4063,31 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 -- mathesar_types.cast_to_numeric
 
+CREATE OR REPLACE FUNCTION mathesar_types.get_numeric_array(text) RETURNS text[]
+AS $$
+  DECLARE
+    raw_arr text[];
+    actual_number_arr text[];
+    group_divider_arr text[];
+    decimal_point_arr text[];
+    actual_number text;
+    group_divider text;
+    decimal_point text;
+  BEGIN
+    SELECT regexp_matches($1, '^(?:[+-]?([0-9]{4,}(?:([,.])[0-9]+)?|[0-9]{1,3}(?:([,.])[0-9]{1,2}|[0-9]{4,})?|[0-9]{1,3}(,)[0-9]{3}(\.)[0-9]+|[0-9]{1,3}(\.)[0-9]{3}(,)[0-9]+|[0-9]{1,3}(?:(,)[0-9]{3}){2,}(?:(\.)[0-9]+)?|[0-9]{1,3}(?:(\.)[0-9]{3}){2,}(?:(,)[0-9]+)?|[0-9]{1,3}(?:( )[0-9]{3})+(?:([,.])[0-9]+)?|[0-9]{1,2}(?:(,)[0-9]{2})+,[0-9]{3}(?:(\.)[0-9]+)?|[0-9]{1,3}(?:(\'')[0-9]{3})+(?:([.])[0-9]+)?))$') INTO raw_arr;
+    IF raw_arr IS NULL THEN
+      RETURN NULL;
+    END IF;
+    SELECT array_remove(ARRAY[raw_arr[1]], null) INTO actual_number_arr;
+    SELECT array_remove(ARRAY[raw_arr[4],raw_arr[6],raw_arr[8],raw_arr[10],raw_arr[12],raw_arr[14],raw_arr[16]], null) INTO group_divider_arr;
+    SELECT array_remove(ARRAY[raw_arr[2],raw_arr[3],raw_arr[5],raw_arr[7],raw_arr[9],raw_arr[11],raw_arr[13],raw_arr[15],raw_arr[17]], null) INTO decimal_point_arr;
+    SELECT actual_number_arr[1] INTO actual_number;
+    SELECT group_divider_arr[1] INTO group_divider;
+    SELECT decimal_point_arr[1] INTO decimal_point;
+    RETURN ARRAY[actual_number, group_divider, decimal_point];
+  END;
+$$ LANGUAGE plpgsql;
+
 CREATE OR REPLACE FUNCTION mathesar_types.cast_to_numeric(smallint)
 RETURNS numeric
 AS $$

From 1f186c93d1d0ee27d850a7eceb8b9eefc829f33d Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 3 Oct 2024 02:38:01 +0530
Subject: [PATCH 1054/1141] alter install_tld_lookup_table func to use conn
 instead of engine

---
 db/types/custom/uri.py | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/db/types/custom/uri.py b/db/types/custom/uri.py
index 27803db5ec..a69283843f 100644
--- a/db/types/custom/uri.py
+++ b/db/types/custom/uri.py
@@ -1,11 +1,12 @@
 from enum import Enum
 import os
-from sqlalchemy import text, Table, Column, String, MetaData, TEXT
-from sqlalchemy.exc import ProgrammingError
+
+from sqlalchemy import TEXT, text
 from sqlalchemy.types import UserDefinedType
-from psycopg2.errors import DuplicateTable
+from psycopg.errors import DuplicateTable
+from psycopg import sql
 
-from db.types.base import MathesarCustomType, PostgresType, get_qualified_name, get_ma_qualified_schema
+from db.types.base import MathesarCustomType, PostgresType, get_qualified_name
 from db.types.custom.underlying_type import HasUnderlyingType
 from db.utils import ignore_duplicate_wrapper
 
@@ -81,20 +82,17 @@ def install(engine):
         conn.commit()
 
 
-def install_tld_lookup_table(engine):
-    tlds_table = Table(
-        TLDS_TABLE_NAME,
-        MetaData(bind=engine),
-        Column("tld", String, primary_key=True),
-        schema=get_ma_qualified_schema(),
-    )
+def install_tld_lookup_table(conn):
     try:
-        tlds_table.create()
-        with engine.begin() as conn, open(TLDS_PATH) as f:
-            conn.execute(
-                tlds_table.insert(),
-                [{"tld": tld.strip().lower()} for tld in f if tld[:2] != "# "],
-            )
-    except ProgrammingError as e:
-        if e.orig == DuplicateTable:
-            pass
+        create_tlds_table_sql = sql.SQL("CREATE TABLE mathesar_types.top_level_domains (tld text PRIMARY KEY)")
+        copy_tld_sql = sql.SQL("COPY mathesar_types.top_level_domains(tld) FROM STDIN")
+
+        with open(TLDS_PATH) as f:
+            tld_insert = [(tld.strip().lower()) for tld in f if tld[:2] != "# "]
+            data_buffer = "\n".join(tld_insert).encode('utf-8')
+        with conn.transaction():
+            conn.execute(create_tlds_table_sql)
+            with conn.cursor().copy(copy_tld_sql) as copy:
+                copy.write(data_buffer)
+    except DuplicateTable:
+        pass

From 5b05785592c76c144ca0d00196ef69645bb4c0fc Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 3 Oct 2024 02:39:37 +0530
Subject: [PATCH 1055/1141] remove types.install function

---
 db/tests/types/test_install.py |  7 -------
 db/types/install.py            | 20 --------------------
 2 files changed, 27 deletions(-)

diff --git a/db/tests/types/test_install.py b/db/tests/types/test_install.py
index 0578001502..ec85f9ccdf 100644
--- a/db/tests/types/test_install.py
+++ b/db/tests/types/test_install.py
@@ -2,7 +2,6 @@
 from db.constants import TYPES_SCHEMA
 from db.types import install
 from db.types.custom import email
-from db.types.install import install_mathesar_on_database
 
 
 def test_create_type_schema(engine):
@@ -25,9 +24,3 @@ def test_create_email_when_exists(engine):
     # already exists when it's run.
     email.install(engine)
     email.install(engine)
-
-
-def test_install_when_exists(engine):
-    # This just checks that the function is idempotent
-    install_mathesar_on_database(engine)
-    install_mathesar_on_database(engine)
diff --git a/db/types/install.py b/db/types/install.py
index d9cc96f357..27c5db696e 100644
--- a/db/types/install.py
+++ b/db/types/install.py
@@ -1,27 +1,7 @@
-from db.types.custom import email, money, multicurrency, uri, json_array, json_object
 from db.constants import TYPES_SCHEMA
-from db.types.operations.cast import install_all_casts
 import psycopg
 
 
-def create_type_schema(engine) -> None:
-    conn_str = str(engine.url)
-    with psycopg.connect(conn_str) as conn:
-        conn.execute(f"CREATE SCHEMA IF NOT EXISTS {TYPES_SCHEMA}")
-
-
-def install_mathesar_on_database(engine):
-    create_type_schema(engine)
-    email.install(engine)
-    money.install(engine)
-    multicurrency.install(engine)
-    uri.install(engine)
-    uri.install_tld_lookup_table(engine)
-    json_array.install(engine)
-    json_object.install(engine)
-    install_all_casts(engine)
-
-
 def uninstall_mathesar_from_database(engine):
     conn_str = str(engine.url)
     with psycopg.connect(conn_str) as conn:

From b71c85804e9bc261f3952c0ef4d3d7e22ba96e47 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 3 Oct 2024 02:41:26 +0530
Subject: [PATCH 1056/1141] change load_file_with_engine -> load_file_with_conn

---
 db/connection.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/db/connection.py b/db/connection.py
index 2f6f64a56b..1430e5b902 100644
--- a/db/connection.py
+++ b/db/connection.py
@@ -18,7 +18,7 @@ def execute_msar_func_with_engine(engine, func_name, *args):
     with psycopg.connect(conn_str) as conn:
         # Returns a cursor
         return conn.execute(
-            f"SELECT msar.{func_name}({','.join(['%s']*len(args))})",
+            f"SELECT msar.{func_name}({','.join(['%s'] * len(args))})",
             args
         )
 
@@ -52,7 +52,7 @@ def exec_msar_func(conn, func_name, *args):
     """
     # Returns a cursor
     return conn.execute(
-        f"SELECT msar.{func_name}({','.join(['%s']*len(args))})", args
+        f"SELECT msar.{func_name}({','.join(['%s'] * len(args))})", args
     )
 
 
@@ -66,14 +66,12 @@ def select_from_msar_func(conn, func_name, *args):
         *args: The list of parameters to pass
     """
     cursor = conn.execute(
-        f"SELECT * FROM msar.{func_name}({','.join(['%s']*len(args))})", args
+        f"SELECT * FROM msar.{func_name}({','.join(['%s'] * len(args))})", args
     )
     cursor.row_factory = dict_row
     return cursor.fetchall()
 
 
-def load_file_with_engine(engine, file_handle):
+def load_file_with_conn(conn, file_handle):
     """Run an SQL script from a file, using psycopg."""
-    conn_str = str(engine.url)
-    with psycopg.connect(conn_str) as conn:
-        conn.execute(file_handle.read())
+    conn.execute(file_handle.read())

From f9abf8234ba466dc2ca75e92f78af3f1b420e4f4 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 3 Oct 2024 02:41:56 +0530
Subject: [PATCH 1057/1141] add new sql files to install script

---
 db/sql/install.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/db/sql/install.py b/db/sql/install.py
index eb46915338..0e8263a76a 100644
--- a/db/sql/install.py
+++ b/db/sql/install.py
@@ -1,17 +1,25 @@
 import os
-from db.connection import load_file_with_engine
+from db.connection import load_file_with_conn
+from db.types.custom import uri
 
 FILE_DIR = os.path.abspath(os.path.dirname(__file__))
 MSAR_SQL = os.path.join(FILE_DIR, '00_msar.sql')
 MSAR_JOIN_SQL = os.path.join(FILE_DIR, '10_msar_joinable_tables.sql')
 MSAR_AGGREGATE_SQL = os.path.join(FILE_DIR, '30_msar_custom_aggregates.sql')
+MSAR_TYPES = os.path.join(FILE_DIR, '40_msar_types.sql')
+MSAR_PERMS = os.path.join(FILE_DIR, '50_msar_permissions.sql')
 
 
-def install(engine):
-    """Install SQL pieces using the given engine."""
+def install(conn):
+    """Install SQL pieces using the given conn."""
     with open(MSAR_SQL) as file_handle:
-        load_file_with_engine(engine, file_handle)
+        load_file_with_conn(conn, file_handle)
     with open(MSAR_JOIN_SQL) as file_handle:
-        load_file_with_engine(engine, file_handle)
+        load_file_with_conn(conn, file_handle)
     with open(MSAR_AGGREGATE_SQL) as custom_aggregates:
-        load_file_with_engine(engine, custom_aggregates)
+        load_file_with_conn(conn, custom_aggregates)
+    with open(MSAR_TYPES) as file_handle:
+        load_file_with_conn(conn, file_handle)
+    uri.install_tld_lookup_table(conn)
+    with open(MSAR_PERMS) as file_handle:
+        load_file_with_conn(conn, file_handle)

From ef321ec99b36cc908997310634b8dea0154053e2 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 3 Oct 2024 02:44:01 +0530
Subject: [PATCH 1058/1141] alter install script to only install using sql

---
 conftest.py   |  6 ++---
 db/install.py | 64 +++++++++++++++++++++++++++++----------------------
 2 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/conftest.py b/conftest.py
index f0b9d52a45..a452c313e2 100644
--- a/conftest.py
+++ b/conftest.py
@@ -2,6 +2,7 @@
 import random
 import string
 import os
+import psycopg
 
 # These imports come from the mathesar namespace, because our DB setup logic depends on it.
 from django.db import connection as dj_connection
@@ -11,7 +12,6 @@
 from sqlalchemy_utils import database_exists, create_database, drop_database
 
 from db.engine import add_custom_types_to_ischema_names, create_engine as sa_create_engine
-from db.types import install
 from db.sql import install as sql_install
 from db.schemas.operations.drop import drop_schema_via_name as drop_sa_schema
 from db.schemas.operations.create import create_schema_if_not_exists_via_sql_alchemy
@@ -74,8 +74,8 @@ def __create_db(db_name):
         create_database(engine.url)
         created_dbs.add(db_name)
         # Our default testing database has our types and functions preinstalled.
-        install.install_mathesar_on_database(engine)
-        sql_install.install(engine)
+        with psycopg.connect(str(engine.url)) as conn:
+            sql_install.install(conn)
         engine.dispose()
         return db_name
     yield __create_db
diff --git a/db/install.py b/db/install.py
index 878fe18557..2fd67ef57e 100644
--- a/db/install.py
+++ b/db/install.py
@@ -1,10 +1,8 @@
-from psycopg.errors import InsufficientPrivilege
-from sqlalchemy import text
-from sqlalchemy.exc import OperationalError, ProgrammingError
+import psycopg
+from psycopg.errors import OperationalError, InsufficientPrivilege
+from psycopg import sql
 
-from db import engine
 from db.sql import install as sql_install
-from db.types import install as types_install
 
 
 def install_mathesar(
@@ -18,19 +16,22 @@ def install_mathesar(
         root_db='postgres'
 ):
     """Create database and install Mathesar on it."""
-    user_db_engine = engine.create_future_engine(
-        username, password, hostname, database_name, port,
-        connect_args={"connect_timeout": 10}
-    )
+
     try:
-        user_db_engine.connect()
+        conn = psycopg.connect(
+            host=hostname,
+            port=port,
+            dbname=database_name,
+            user=username,
+            password=password,
+        )
         print(
             "Installing Mathesar on preexisting PostgreSQL database"
             f" {database_name} at host {hostname}..."
         )
-        types_install.install_mathesar_on_database(user_db_engine)
-        sql_install.install(user_db_engine)
-        user_db_engine.dispose()
+        with conn:
+            sql_install.install(conn)
+
     except OperationalError as e:
         if create_db:
             database_created = _create_database(
@@ -45,13 +46,19 @@ def install_mathesar(
         else:
             database_created = False
         if database_created:
+            conn = psycopg.connect(
+                host=hostname,
+                port=port,
+                dbname=database_name,
+                user=username,
+                password=password,
+            )
             print(
                 "Installing Mathesar on PostgreSQL database"
                 f" {database_name} at host {hostname}..."
             )
-            types_install.install_mathesar_on_database(user_db_engine)
-            sql_install.install(user_db_engine)
-            user_db_engine.dispose()
+            with conn:
+                sql_install.install(conn)
         else:
             print(f"Skipping installing on DB with key {database_name}.")
             raise e
@@ -71,21 +78,24 @@ def _create_database(
         # Database.  So we use the default database `postgres` that comes with
         # postgres.
         # TODO Throw correct error when the root database does not exist.
-        root_db_engine = engine.create_future_engine(
-            username, password, hostname, root_database, port,
-            connect_args={"connect_timeout": 10}
+        root_db_conn = psycopg.connect(
+            host=hostname,
+            port=port,
+            dbname=root_database,
+            user=username,
+            password=password,
         )
         try:
-            with root_db_engine.connect() as conn:
-                conn.execution_options(isolation_level="AUTOCOMMIT")
-                conn.execute(text(f'CREATE DATABASE "{db_name}"'))
-            root_db_engine.dispose()
+            with root_db_conn as conn:
+                cursor = conn.cursor()
+                conn.autocommit = True
+                cursor.execute(sql.SQL(f'CREATE DATABASE "{db_name}"'))
+                cursor.close()
             print(f"Created DB is {db_name}.")
             return True
-        except ProgrammingError as e:
-            if isinstance(e.orig, InsufficientPrivilege):
-                print(f"Database {db_name} could not be created due to Insufficient Privilege")
-                return False
+        except InsufficientPrivilege:
+            print(f"Database {db_name} could not be created due to Insufficient Privilege")
+            return False
         except Exception:
             print(f"Database {db_name} could not be created!")
             return False

From 14027070f73e94cd2ab101c3f7beb0c428010301 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 3 Oct 2024 03:23:14 +0530
Subject: [PATCH 1059/1141] remove redundant test

---
 db/tests/types/test_install.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/db/tests/types/test_install.py b/db/tests/types/test_install.py
index ec85f9ccdf..17c4b59c63 100644
--- a/db/tests/types/test_install.py
+++ b/db/tests/types/test_install.py
@@ -12,13 +12,6 @@ def test_create_type_schema(engine):
     assert TYPES_SCHEMA in schemata
 
 
-def test_create_type_schema_when_exists(engine):
-    # This just checks that the function doesn't error if the type schema
-    # already exists when it's run.
-    install.create_type_schema(engine)
-    install.create_type_schema(engine)
-
-
 def test_create_email_when_exists(engine):
     # This just checks that the function doesn't error if the type email
     # already exists when it's run.

From d1c75a5f88954d838a47b6debaa60c1d91e4719a Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 3 Oct 2024 03:24:43 +0530
Subject: [PATCH 1060/1141] remove redundant test

---
 db/tests/types/test_install.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/db/tests/types/test_install.py b/db/tests/types/test_install.py
index 17c4b59c63..533a6138e4 100644
--- a/db/tests/types/test_install.py
+++ b/db/tests/types/test_install.py
@@ -1,17 +1,6 @@
-from sqlalchemy import text
-from db.constants import TYPES_SCHEMA
-from db.types import install
 from db.types.custom import email
 
 
-def test_create_type_schema(engine):
-    install.create_type_schema(engine)
-    with engine.connect() as conn:
-        res = conn.execute(text("SELECT * FROM information_schema.schemata"))
-    schemata = {row['schema_name'] for row in res.fetchall()}
-    assert TYPES_SCHEMA in schemata
-
-
 def test_create_email_when_exists(engine):
     # This just checks that the function doesn't error if the type email
     # already exists when it's run.

From e7ca3c0416b203974ac941e8561a267c2872044a Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 3 Oct 2024 10:58:22 -0400
Subject: [PATCH 1061/1141] Make docs header more compact

---
 docs/docs/stylesheets/extra.css | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docs/docs/stylesheets/extra.css b/docs/docs/stylesheets/extra.css
index fa915bb3c3..ded3c27abd 100644
--- a/docs/docs/stylesheets/extra.css
+++ b/docs/docs/stylesheets/extra.css
@@ -151,3 +151,17 @@
   border-bottom: 2px solid var(--md-primary-fg-color--light);
   color: var(--md-primary-bg-color--lightest);
 }
+
+/* Make header title smaller */
+.md-header__title { font-size: 0.8rem; }
+[dir="ltr"] .md-header__title { margin-left: 0; }
+
+/* Make header theme switcher smaller */
+.md-header__option .md-header__button { padding: 0.2rem; }
+.md-header__option .md-header__button { padding: 0.2rem; }
+.md-header__option .md-header__button svg { height: 1rem; width: 1rem; }
+
+/* Make version switcher smaller */
+.md-version { font-size: 0.7rem; font-weight: normal; }
+[dir="ltr"] .md-version__current { margin-left: 0.6rem; }
+.md-version__list { margin: 1.7rem 0 0 0; }

From 2e3b4c935c787913f3a03df36e879471ae84e82f Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 3 Oct 2024 17:46:14 +0200
Subject: [PATCH 1062/1141] fix structure

---
 docs/docs/user-guide/permissions.md | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/docs/docs/user-guide/permissions.md b/docs/docs/user-guide/permissions.md
index 46d5ab990e..a00369d836 100644
--- a/docs/docs/user-guide/permissions.md
+++ b/docs/docs/user-guide/permissions.md
@@ -47,22 +47,16 @@ These roles will be displayed for all databases on the server. Also, any changes
 
 Mathesar manages permissions at three levels:
 
-1. **Database**
-2. **Schema**
-3. **Table**
+1. **Database Level:** Manageable from the database page
+2. **Schema Level:** Manageable from the schema page
+3. **Table Level:** Manageable from the inspector panel for each table
 
-Owners of each object (database, schema, or table) can set permissions for other users. Ownership is determined by the user's assigned collaborator role in the database.
+### Ownership of Objects
 
-### Ownership of New Objects
+Owners of each object (database, schema, or table) can set permissions for other users. Ownership is determined by the user's assigned collaborator role in the database.
 
 When a new object (database, schema, or table) is created, the owner of the object is the collaborator who created it. This automatic ownership assignment allows the creator to have immediate and full control over the objects they create, including the ability to manage permissions and transfer ownership if needed.
 
-You can find and manage permissions in the following sections:
-
-- **Database Permissions**: On the database settings page.
-- **Schema Permissions**: On each schema's page.
-- **Table Permissions**: In each table's inspector panel.
-
 ### Database Permissions
 
 Database permissions control access and actions at the database level.

From 4669c872ea7056b41c1373add307619551c380f4 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 3 Oct 2024 17:47:38 +0200
Subject: [PATCH 1063/1141] fix and add punctuation

---
 docs/docs/user-guide/permissions.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/docs/user-guide/permissions.md b/docs/docs/user-guide/permissions.md
index a00369d836..d9c7679989 100644
--- a/docs/docs/user-guide/permissions.md
+++ b/docs/docs/user-guide/permissions.md
@@ -47,9 +47,9 @@ These roles will be displayed for all databases on the server. Also, any changes
 
 Mathesar manages permissions at three levels:
 
-1. **Database Level:** Manageable from the database page
-2. **Schema Level:** Manageable from the schema page
-3. **Table Level:** Manageable from the inspector panel for each table
+1. **Database Level:** Managed from the database page.
+2. **Schema Level:** Managed from the schema page.
+3. **Table Level:** Managed from the inspector panel for each table.
 
 ### Ownership of Objects
 

From 9ed19a17621b7c16b33d8845a814e1b07de072d6 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 3 Oct 2024 17:56:17 +0200
Subject: [PATCH 1064/1141] use active voice

---
 docs/docs/user-guide/permissions.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/docs/user-guide/permissions.md b/docs/docs/user-guide/permissions.md
index d9c7679989..f656cb8137 100644
--- a/docs/docs/user-guide/permissions.md
+++ b/docs/docs/user-guide/permissions.md
@@ -17,7 +17,7 @@ Mathesar provides three main sections for role management within the database se
 In the **Role Configuration** section, all LOGIN roles that exist on the server are listed. These roles can then be assigned to collaborators once configured. A configured role has a password set.
 
 - **Password Management**: For each role, you can configure or change the password directly within Mathesar.
-- **Remove Role Configuration**: Role configurations can be removed from the database as necessary. This only removes the credentials, not the role from the server.
+- **Remove Role Configuration**: You can remove role configurations from Mathesar as needed. This only removes the credentials, not the role from the server.
 
 ### Collaborators
 
@@ -25,7 +25,7 @@ Collaborators are users who have been added to work on the database. Each collab
 
 - **Add Collaborators**: In the **Collaborators** section, you can add new users as collaborators to the database. When adding a collaborator, you assign them one of the roles that have been configured in Mathesar.
 
-- **Remove Collaborators**: Collaborators can be removed if they no longer require access to the database. The Mathesar user will still exist and can be added back as a collaborator at a later time.
+- **Remove Collaborators**: You can remove collaborators if they no longer require access to the database. The Mathesar user will still exist and you can add them back as a collaborator at a later time.
 
 ### Server Roles
 
@@ -33,11 +33,11 @@ The **Server Roles** section, found under the **Settings** tab, shows the roles
 
 These roles will be displayed for all databases on the server. Also, any changes made to a server role will be reflected in all databases on the server.
 
-- **Create Roles**: New server-level roles can be created here. These roles can be configured in two ways:
-  1. With login capability and a password, which can be assigned to collaborators.
-  2. Without login capability, it is to be used as a parent role exclusively. These roles cannot be assigned to collaborators directly.
+- **Create Roles**: You can create new server-level roles from this section. You can configure these roles in two ways:
+  1. With login capability and a password, which you can assign to collaborators.
+  2. Without login capability, to be used as a parent role exclusively. You cannot assign these roles to collaborators directly.
 - **Define Child Roles**: For existing server-level roles, you can specify which other roles should be their child roles. This allows for creating hierarchies of roles where permissions can be inherited from parent to child roles.
-- **Drop Roles**: Server-level roles that are no longer needed can be dropped. This action removes the role from the server and all databases where it has been assigned. Exercise caution when dropping roles, as it may affect existing permissions and user access across multiple databases.
+- **Drop Roles**: You can drop server-level roles that are no longer needed. This action removes the role from the server and all databases where it has been assigned. Exercise caution when dropping roles, as it may affect existing permissions and user access across multiple databases.
 
 > **Note:** Server roles, once added, must be configured in Mathesar under the **Role Configuration** section before they can be assigned to collaborators.
 

From 424421c7fed8f385e6c9747e7a150c553661a3e5 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 3 Oct 2024 14:44:56 -0400
Subject: [PATCH 1065/1141] Update Users page title in nav

---
 docs/mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index e2488e3424..4fe4dcd983 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -25,7 +25,7 @@ nav:
       - Introduction: user-guide/index.md
       - Importing data: user-guide/importing-data.md
       - Syncing database changes: user-guide/syncing-db.md
-      - Users & access levels: user-guide/users.md
+      - Users: user-guide/users.md
       - Glossary: user-guide/glossary.md
   - API:
       - REST: api/rest.md

From e2d629edddc954fc5140799a2a559ad450636d23 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 3 Oct 2024 14:45:16 -0400
Subject: [PATCH 1066/1141] Add Permissions page to nav

---
 docs/mkdocs.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 4fe4dcd983..b6fd79956a 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -26,6 +26,7 @@ nav:
       - Importing data: user-guide/importing-data.md
       - Syncing database changes: user-guide/syncing-db.md
       - Users: user-guide/users.md
+      - Permissions: user-guide/permissions.md
       - Glossary: user-guide/glossary.md
   - API:
       - REST: api/rest.md

From 2facda34e0028ad7910bc5fc042a51a0e43c98e6 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 3 Oct 2024 14:46:49 -0400
Subject: [PATCH 1067/1141] Remove page on "Syncing database changes"

---
 docs/docs/index.md                 | 1 -
 docs/docs/user-guide/syncing-db.md | 7 -------
 docs/mkdocs.yml                    | 2 --
 3 files changed, 10 deletions(-)
 delete mode 100644 docs/docs/user-guide/syncing-db.md

diff --git a/docs/docs/index.md b/docs/docs/index.md
index 9b77bf0621..6876a21f3a 100644
--- a/docs/docs/index.md
+++ b/docs/docs/index.md
@@ -51,7 +51,6 @@ You can self-host Mathesar by following one of the guides below:
 
 Mathesar should be pretty intuitive to use. More documentation is coming soon, but for now, we've written some documentation for some things that could be tricky.
 
-- [Syncing database changes](./user-guide/syncing-db.md) if the database's structure is changed outside of Mathesar.
 - How to set up [users with different access levels](./user-guide/users.md)
 
 ## Contribute to Mathesar
diff --git a/docs/docs/user-guide/syncing-db.md b/docs/docs/user-guide/syncing-db.md
deleted file mode 100644
index e36f7bf89d..0000000000
--- a/docs/docs/user-guide/syncing-db.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Syncing Database Changes
-
-Mathesar is designed to be used in tandem with other database tools. This means that if you make changes to your database structure or data outside of Mathesar, those changes will be reflected in Mathesar's UI.
-
-If you make structural changes to the database outside Mathesar (e.g. using another tool to add a schema, table, or column), those changes will not be reflected in Mathesar until you manually sync them. You can sync them using the "Sync Database Changes" button in the database homepage.
-
-External changes to data (e.g. adding, editing, or deleting *records*) will be automatically reflected without clicking this button.
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index b6fd79956a..b28ef23409 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -24,7 +24,6 @@ nav:
   - Using Mathesar:
       - Introduction: user-guide/index.md
       - Importing data: user-guide/importing-data.md
-      - Syncing database changes: user-guide/syncing-db.md
       - Users: user-guide/users.md
       - Permissions: user-guide/permissions.md
       - Glossary: user-guide/glossary.md
@@ -48,7 +47,6 @@ plugins:
       redirect_maps:
         "installation-dc/ansible-setup.md": "installation/docker-compose/index.md"
         "product/intro.md": "user-guide/index.md"
-        "product/syncing-db.md": "user-guide/syncing-db.md"
         "product/users.md": "user-guide/users.md"
         "install/index.md": "index.md"
         "install/docker-compose/index.md": "installation/docker-compose/index.md"

From d88deaeb6792cb24f2bcc312d93a696e45d949da Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 3 Oct 2024 14:56:21 -0400
Subject: [PATCH 1068/1141] Improve flow towards user-focused docs

---
 docs/docs/index.md            | 4 +---
 docs/docs/user-guide/index.md | 5 +++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/docs/docs/index.md b/docs/docs/index.md
index 6876a21f3a..ea09a26144 100644
--- a/docs/docs/index.md
+++ b/docs/docs/index.md
@@ -49,9 +49,7 @@ You can self-host Mathesar by following one of the guides below:
 
 ## Use Mathesar
 
-Mathesar should be pretty intuitive to use. More documentation is coming soon, but for now, we've written some documentation for some things that could be tricky.
-
-- How to set up [users with different access levels](./user-guide/users.md)
+See our [Using Mathesar](user-guide/index.md) section for documentation on Mathesar's features.
 
 ## Contribute to Mathesar
 
diff --git a/docs/docs/user-guide/index.md b/docs/docs/user-guide/index.md
index 56e2e69edf..d82d5092a3 100644
--- a/docs/docs/user-guide/index.md
+++ b/docs/docs/user-guide/index.md
@@ -2,6 +2,7 @@
 
 Welcome! At this point, we assume you've installed Mathesar successfully and have logged into the web UI.
 
-If you've connected Mathesar to an existing database, you should see all your schemas once you log in, and you can work with them as you please.
+If you've connected Mathesar to an existing database, you should see all your schemas and tables once you log in, and you can work with them as you please.
 
-If you're starting from scratch, we recommend **creating a new schema**.
+!!! tip "More..."
+    👈 Browse the "Using Mathesar" navigation section to find more detailed documentation pages.

From 2f92e0d6db3bf05ada4d7f1014276d4d2b81eed8 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 3 Oct 2024 14:57:46 -0400
Subject: [PATCH 1069/1141] Fix indentation

---
 docs/docs/user-guide/permissions.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/docs/user-guide/permissions.md b/docs/docs/user-guide/permissions.md
index f656cb8137..92d5a6c792 100644
--- a/docs/docs/user-guide/permissions.md
+++ b/docs/docs/user-guide/permissions.md
@@ -34,8 +34,8 @@ The **Server Roles** section, found under the **Settings** tab, shows the roles
 These roles will be displayed for all databases on the server. Also, any changes made to a server role will be reflected in all databases on the server.
 
 - **Create Roles**: You can create new server-level roles from this section. You can configure these roles in two ways:
-  1. With login capability and a password, which you can assign to collaborators.
-  2. Without login capability, to be used as a parent role exclusively. You cannot assign these roles to collaborators directly.
+    1. With login capability and a password, which you can assign to collaborators.
+    2. Without login capability, to be used as a parent role exclusively. You cannot assign these roles to collaborators directly.
 - **Define Child Roles**: For existing server-level roles, you can specify which other roles should be their child roles. This allows for creating hierarchies of roles where permissions can be inherited from parent to child roles.
 - **Drop Roles**: You can drop server-level roles that are no longer needed. This action removes the role from the server and all databases where it has been assigned. Exercise caution when dropping roles, as it may affect existing permissions and user access across multiple databases.
 

From 7c5da7558e510790ffad70a9668b1f16d032300c Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 3 Oct 2024 15:39:50 -0400
Subject: [PATCH 1070/1141] Clean up RPC docs

---
 docs/docs/api/rpc.md | 355 +++++++++++++++++++++----------------------
 1 file changed, 177 insertions(+), 178 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 9f91c2f4b8..ab9021a2d8 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -2,16 +2,12 @@
 
 Mathesar has an API available at `/api/rpc/v0/` which follows the [JSON-RPC](https://www.jsonrpc.org/specification) spec version 2.0.
 
-## About
+!!! caution "Not yet stable"
+    The RPC API is not yet stable and may change in the future. If you build logic that depends on this API, be mindful that it may change in the future without warning or notice.
 
-### Status
+## Usage
 
-We are currently in the process of [transitioning](https://wiki.mathesar.org/projects/2024/architecture-transition/rpc/) our API architecture from a [RESTful](rest.md) API to this RPC-style API, and we hope to have all functionality available through the RPC API by Mathesar's beta release.
-
-!!! caution "Stability"
-    The RPC API is not yet stable and may change in the future, even after we've completed the transition to the RPC API architecture. If you build logic that depends on this API, be mindful that it may change in the future without warning or notice.
-
-### Usage
+### Requests
 
 To use an RPC function:
 
@@ -23,7 +19,7 @@ To use an RPC function:
 
     To call function `add_from_known_connection` from the `connections` section of this page, you'd send something like:
 
-    `POST /api/rpc/v0/`
+    `POST /api/rpc/v0/`b
 
     ```json
     {
@@ -37,127 +33,63 @@ To use an RPC function:
     }
     ```
 
-## Collaborators
-
-::: collaborators
-    options:
-      members:
-      - list_
-      - add
-      - delete
-      - set_role
-      - CollaboratorInfo
-
-## Connections
-
-::: connections
-    options:
-      members:
-      - add_from_known_connection
-      - add_from_scratch
-      - grant_access_to_user
-      - ConnectionReturn
+### Responses
 
-## Databases
+#### Success
 
-::: databases
-    options:
-      members:
-      - get
-      - delete
-      - DatabaseInfo
+Upon a successful call to an RPC function, the API will return a success object. Such an object has the following form:
 
-## Configured Databases
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 234,
+  "result": <any>
+}
+```
 
-::: databases.configured
-    options:
-      members:
-      - list_
-      - disconnect
-      - ConfiguredDatabaseInfo
+The `result` is whatever was returned by the underlying function.
 
-## Database Privileges
+#### Errors
 
-::: databases.privileges
-    options:
-      members:
-      - list_direct
-      - replace_for_roles
-      - transfer_ownership
-      - DBPrivileges
+When an error is produced by a call to the RPC endpoint, we produce an error of the following form:
 
-## Database Setup
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 234,
+  "error": {
+    "code": <int>,
+    "message": <str>
+  }
+}
+```
 
-::: databases.setup
-    options:
-      members:
-      - create_new
-      - connect_existing
-      - DatabaseConnectionResult
+The `code` is a negative integer. Some codes are produced according to the [JSON-RPC spec](https://www.jsonrpc.org/specification#error_object).
 
-## Schemas
+Other error codes are grouped according to the library that produced the Exception:
 
-::: schemas
-    options:
-      members:
-      - list_
-      - get
-      - add
-      - delete
-      - patch
-      - SchemaInfo
-      - SchemaPatch
+- `builtins`: -31xxx
+- `psycopg` or `psycopg2`: -30xxx
+- `django`: -29xxx
+- `mathesar` (our code): -28xxx
+- `db` (our code): -27xxx
+- `sqlalchemy`: -26xxx
+- other: -25xxx
 
-## Schema Privileges
+Unrecognized errors from a given library return a "round number" code, so an unknown `builtins` error gets the code -31000.
 
-::: schemas.privileges
-    options:
-      members:
-      - list_direct
-      - replace_for_roles
-      - transfer_ownership
-      - SchemaPrivileges
+---
 
-## Tables
+## Collaborators
 
-::: tables
+::: collaborators
     options:
       members:
       - list_
-      - get
       - add
       - delete
-      - patch
-      - import_
-      - get_import_preview
-      - list_joinable
-      - list_with_metadata
-      - get_with_metadata
-      - TableInfo
-      - AddedTableInfo
-      - SettableTableInfo
-      - JoinableTableRecord
-      - JoinableTableInfo
-
-## Table Privileges
-
-::: tables.privileges
-    options:
-      members:
-      - list_direct
-      - replace_for_roles
-      - transfer_ownership
-      - TablePrivileges
-
-## Table Metadata
-
-::: tables.metadata
-    options:
-      members:
-      - list_
-      - set_
-      - TableMetaDataBlob
-      - TableMetaDataRecord
+      - set_role
+      - CollaboratorInfo
 
 ## Columns
 
@@ -187,13 +119,25 @@ To use an RPC function:
       - ColumnMetaDataRecord
       - ColumnMetaDataBlob
 
-## Types
+## Configured Databases
 
-::: types
+::: databases.configured
     options:
       members:
       - list_
-      - TypeInfo
+      - disconnect
+      - ConfiguredDatabaseInfo
+
+
+## Connections
+
+::: connections
+    options:
+      members:
+      - add_from_known_connection
+      - add_from_scratch
+      - grant_access_to_user
+      - ConnectionReturn
 
 ## Constraints
 
@@ -209,27 +153,46 @@ To use an RPC function:
       - UniqueConstraint
       - CreatableConstraintInfo
 
-## Records
+## Data Modeling
 
-:::records
+:::data_modeling
+    options:
+      members:
+      - add_foreign_key_column
+      - add_mapping_table
+      - suggest_types
+      - split_table
+      - move_columns
+      - MappingColumn
+      - SplitTableInfo
+
+## Databases
+
+::: databases
     options:
       members:
-      - list_
       - get
-      - add
-      - patch
       - delete
-      - search
-      - RecordList
-      - RecordAdded
-      - OrderBy
-      - Filter
-      - FilterAttnum
-      - FilterLiteral
-      - Grouping
-      - Group
-      - GroupingResponse
-      - SearchParam
+      - DatabaseInfo
+
+## Database Privileges
+
+::: databases.privileges
+    options:
+      members:
+      - list_direct
+      - replace_for_roles
+      - transfer_ownership
+      - DBPrivileges
+
+## Database Setup
+
+::: databases.setup
+    options:
+      members:
+      - create_new
+      - connect_existing
+      - DatabaseConnectionResult
 
 ## Explorations
 
@@ -247,6 +210,28 @@ To use an RPC function:
       - ExplorationDef
       - ExplorationResult
 
+## Records
+
+:::records
+    options:
+      members:
+      - list_
+      - get
+      - add
+      - patch
+      - delete
+      - search
+      - RecordList
+      - RecordAdded
+      - OrderBy
+      - Filter
+      - FilterAttnum
+      - FilterLiteral
+      - Grouping
+      - Group
+      - GroupingResponse
+      - SearchParam
+
 ## Roles
 
 ::: roles
@@ -260,7 +245,7 @@ To use an RPC function:
       - RoleInfo
       - RoleMember
 
-## Configured Roles
+## Roles Configured
 
 ::: roles.configured
     options:
@@ -271,68 +256,82 @@ To use an RPC function:
       - set_password
       - ConfiguredRoleInfo
 
-## Servers
+## Schemas
 
-::: servers
+::: schemas
     options:
       members:
       - list_
-      - ConfiguredServerInfo
+      - get
+      - add
+      - delete
+      - patch
+      - SchemaInfo
+      - SchemaPatch
 
-## Data Modeling
+## Schema Privileges
 
-:::data_modeling
+::: schemas.privileges
     options:
       members:
-      - add_foreign_key_column
-      - add_mapping_table
-      - suggest_types
-      - split_table
-      - move_columns
-      - MappingColumn
-      - SplitTableInfo
-
-## Responses
-
-### Success
+      - list_direct
+      - replace_for_roles
+      - transfer_ownership
+      - SchemaPrivileges
 
-Upon a successful call to an RPC function, the API will return a success object. Such an object has the following form:
+## Servers
 
-```json
-{
-  "jsonrpc": "2.0",
-  "id": 234,
-  "result": <any>
-}
-```
+::: servers
+    options:
+      members:
+      - list_
+      - ConfiguredServerInfo
 
-The `result` is whatever was returned by the underlying function.
+## Tables
 
-### Errors
+::: tables
+    options:
+      members:
+      - list_
+      - get
+      - add
+      - delete
+      - patch
+      - import_
+      - get_import_preview
+      - list_joinable
+      - list_with_metadata
+      - get_with_metadata
+      - TableInfo
+      - AddedTableInfo
+      - SettableTableInfo
+      - JoinableTableRecord
+      - JoinableTableInfo
 
-When an error is produced by a call to the RPC endpoint, we produce an error of the following form:
+## Table Metadata
 
-```json
-{
-  "jsonrpc": "2.0",
-  "id": 234,
-  "error": {
-    "code": <int>,
-    "message": <str>
-  }
-}
-```
+::: tables.metadata
+    options:
+      members:
+      - list_
+      - set_
+      - TableMetaDataBlob
+      - TableMetaDataRecord
 
-The `code` is a negative integer. Some codes are produced according to the [JSON-RPC spec](https://www.jsonrpc.org/specification#error_object).
+## Table Privileges
 
-Other error codes are grouped according to the library that produced the Exception:
+::: tables.privileges
+    options:
+      members:
+      - list_direct
+      - replace_for_roles
+      - transfer_ownership
+      - TablePrivileges
 
-- `builtins`: -31xxx
-- `psycopg` or `psycopg2`: -30xxx
-- `django`: -29xxx
-- `mathesar` (our code): -28xxx
-- `db` (our code): -27xxx
-- `sqlalchemy`: -26xxx
-- other: -25xxx
+## Types
 
-Unrecognized errors from a given library return a "round number" code, so an unknown `builtins` error gets the code -31000.
+::: types
+    options:
+      members:
+      - list_
+      - TypeInfo

From b3506faa03833d787f8ca4c9c298709fe7204cee Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 3 Oct 2024 15:40:02 -0400
Subject: [PATCH 1071/1141] Add Databases page

---
 docs/docs/user-guide/databases.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 docs/docs/user-guide/databases.md

diff --git a/docs/docs/user-guide/databases.md b/docs/docs/user-guide/databases.md
new file mode 100644
index 0000000000..d8695ea18d
--- /dev/null
+++ b/docs/docs/user-guide/databases.md
@@ -0,0 +1,5 @@
+# Databases
+
+Each installation of Mathesar can connect to multiple Databases.
+
+TODO

From dbbcfc4047d605daa0b62dc892f0b39dff13ec2a Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Thu, 3 Oct 2024 15:40:32 -0400
Subject: [PATCH 1072/1141] Re-order pages in nav

---
 docs/mkdocs.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index b28ef23409..bc61f19893 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -23,13 +23,14 @@ nav:
       - Debug Mathesar: administration/debug.md
   - Using Mathesar:
       - Introduction: user-guide/index.md
-      - Importing data: user-guide/importing-data.md
+      - Databases: user-guide/databases.md
       - Users: user-guide/users.md
       - Permissions: user-guide/permissions.md
+      - Importing data: user-guide/importing-data.md
       - Glossary: user-guide/glossary.md
   - API:
-      - REST: api/rest.md
       - RPC: api/rpc.md
+      - REST: api/rest.md
   - Releases:
       - '0.1.7': releases/0.1.7.md
       - '0.1.6': releases/0.1.6.md

From 95f10ee72d85df8fe3de7a90a4aa84143c4ba4ed Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 4 Oct 2024 02:42:31 +0530
Subject: [PATCH 1073/1141] fix get_current_role parent_roles

---
 db/sql/00_msar.sql      |  2 +-
 db/sql/run_tests.sh     |  2 +-
 db/sql/test_00_msar.sql | 71 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 56bb5ecdd8..19963df730 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1287,7 +1287,7 @@ SELECT jsonb_build_object(
   'current_role', msar.get_role(current_role),
   'parent_roles', COALESCE(array_remove(
     array_agg(
-      CASE WHEN pg_has_role(role_data.name, current_role, 'USAGE')
+      CASE WHEN pg_has_role(current_role, role_data.name, 'USAGE')
       THEN msar.get_role(role_data.name) END
     ), NULL
   ), ARRAY[]::jsonb[])
diff --git a/db/sql/run_tests.sh b/db/sql/run_tests.sh
index 6da1268ce5..60d77c0379 100755
--- a/db/sql/run_tests.sh
+++ b/db/sql/run_tests.sh
@@ -13,7 +13,7 @@ psql -q -U mathesar -d postgres -f "$sql"/test_startup.sql
 for i in {1..50}; do
   pg_isready -U mathesar -d mathesar_testing && break || sleep 0.5
 done
-pg_prove --runtests -U mathesar -d mathesar_testing "$@"
+pg_prove -v --runtests -U mathesar -d mathesar_testing "$@"
 exit_code=$?
 psql -q -U mathesar -d postgres -f "$sql"/test_shutdown.sql
 exit $exit_code
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 99c607f29c..ad2a7a3cad 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -3466,6 +3466,77 @@ END;
 $$ LANGUAGE plpgsql;
 
 
+-- msar.get_current_role ---------------------------------------------------------------------------
+
+CREATE OR REPLACE FUNCTION __setup_get_current_role() RETURNS SETOF TEXT AS $$
+BEGIN
+  CREATE USER parent1;
+  CREATE ROLE parent2;
+  CREATE ROLE child_role;
+  GRANT parent1 TO child_role;
+  GRANT parent2 TO child_role;
+  GRANT USAGE ON SCHEMA msar, __msar TO child_role;
+  -- GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA msar, __msar TO intern_no_pkey;
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_get_current_role() RETURNS SETOF TEXT AS $$
+DECLARE
+  child_role_oid oid;
+  parent1_oid oid;
+  parent2_oid oid;
+BEGIN
+  PERFORM __setup_get_current_role();
+  SET ROLE child_role;
+  child_role_oid := 'child_role'::regrole::oid;
+  parent1_oid := 'parent1'::regrole::oid;
+  parent2_oid := 'parent2'::regrole::oid;
+  RETURN NEXT is(
+    msar.get_current_role(),
+    format($j${
+        "current_role":{
+          "oid": %1$s,
+          "name": "child_role",
+          "login": false,
+          "super": false,
+          "members": null,
+          "inherits": true,
+          "create_db": false,
+          "create_role": false,
+          "description": null
+        },
+        "parent_roles": [
+          {
+            "oid": %2$s,
+            "name": "parent1",
+            "login": true,
+            "super": false,
+            "members": [{"oid": %1$s, "admin": false}],
+            "inherits": true,
+            "create_db": false,
+            "create_role": false,
+            "description": null
+          }, 
+          {
+            "oid": %3$s,
+            "name": "parent2",
+            "login": false,
+            "super": false,
+            "members": [{"oid": %1$s, "admin": false}],
+            "inherits": true,
+            "create_db": false,
+            "create_role": false,
+            "description": null
+          }
+        ]
+      }
+      $j$, child_role_oid, parent1_oid, parent2_oid
+    )::jsonb
+  );
+END;
+$$ LANGUAGE plpgsql;
+
 -- msar.build_order_by_expr ------------------------------------------------------------------------
 
 CREATE OR REPLACE FUNCTION test_build_order_by_expr() RETURNS SETOF TEXT AS $$

From 95806abef1795dcb2d839d9d137662937f601bbc Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Fri, 4 Oct 2024 02:43:33 +0530
Subject: [PATCH 1074/1141] restore run_tests.sh

---
 db/sql/run_tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/sql/run_tests.sh b/db/sql/run_tests.sh
index 60d77c0379..6da1268ce5 100755
--- a/db/sql/run_tests.sh
+++ b/db/sql/run_tests.sh
@@ -13,7 +13,7 @@ psql -q -U mathesar -d postgres -f "$sql"/test_startup.sql
 for i in {1..50}; do
   pg_isready -U mathesar -d mathesar_testing && break || sleep 0.5
 done
-pg_prove -v --runtests -U mathesar -d mathesar_testing "$@"
+pg_prove --runtests -U mathesar -d mathesar_testing "$@"
 exit_code=$?
 psql -q -U mathesar -d postgres -f "$sql"/test_shutdown.sql
 exit $exit_code

From dabefb9bfbd9bc2bfc2436d7cd4917a15f13f098 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 4 Oct 2024 07:00:10 -0400
Subject: [PATCH 1075/1141] Improve Users content

---
 docs/docs/user-guide/users.md | 54 ++++++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 17 deletions(-)

diff --git a/docs/docs/user-guide/users.md b/docs/docs/user-guide/users.md
index a3670df927..a813811dec 100644
--- a/docs/docs/user-guide/users.md
+++ b/docs/docs/user-guide/users.md
@@ -1,32 +1,52 @@
 # Users
 
-Mathesar allows you to set up users with different access levels. A user's access levels determine what they can do with the data managed in Mathesar.
-
-Mathesar's installation process includes setting up the first user. This user is an **Admin**.
+Mathesar allows multiple users to collaborate on the same data using a [role-based permissioning](./permissions.md) system.
 
 ## Managing Users
 
 1. Click on the gear icon on the top right of the application and select **Administration**.
-2. In the left sidebar, click on **Users**.
+1. In the left sidebar, click on **Users**.
+
+!!! info "Admin-assigned passwords"
+    Any user with an admin-assigned password (new or edited) will be prompted to change their password after logging in.
+
+
+## Admin vs Standard users
+
+Each Mathesar user is either **Admin** or **Standard**.
+
+Admin users have the following capabilities which Standard users do not:
+
+- Admins can can manage other Mathesar users (view, add, edit, delete).
+- Admins can add and remove [Databases](./databases.md).
+- Admins can manage [Collaborators](./permissions.md#collaborators). This allows an Admin user to grant any Mathesar user access to a database through a PostgreSQL role that the Admin specifies.
+
+Upon installing Mathesar, your first user will be an Admin user.
+
+## Users vs Roles
+
+- A **"user"** is a Mathesar construct. Each Mathesar installation has multiple users.
+- A **"role"** is a PostgreSQL construct ([docs](https://www.postgresql.org/docs/current/user-manag.html)). Each PostgreSQL server has multiple roles and multiple databases.
 
-!!! note
-    - Only **Admins** can add new users.
-    - Mathesar does not send invitation emails to new users (yet). You'll need to send the user their username and password yourself.
-    - The user will be prompted to change the password when they log in for the first time.
+!!! caution "Why this distinction is important"
+    Outside of Mathesar, it's not uncommon for people to say _user_ when referring to a PostgreSQL _role_. However, within the context of Mathesar users and roles are different things! Our documentation maintains this distinction pedantically.
 
-## User Types
+How users and roles work together:
 
-Users can be either **Admin** or **Standard** users.
+- To access a database, each Mathesar user must be assigned a PostgreSQL role to be used for that database.
+- The user's permissions on anything _inside_ the database are determined by the corresponding role's permissions within PostgreSQL.
 
-### Admin users
+    !!! info "Admin doesn't matter here"
+        The user's "admin" status with Mathesar _has no effect_ on the user's ability to do things within a database! It only affects operations outside the database.
 
-Admin users:
+- You can configure separate Mathesar users to share the same PostgreSQL role if you like. This is a good option if you want those users to have the same permissions on the data.
+- Or you can use separate PostgreSQL roles for different users. This is necessary any time you want different users to have different permissions on the data.
+- You cannot configure one Mathesar user with two PostgreSQL role simultaneously — though you can save multiple PostgreSQL roles in Mathesar and manually switch between them if necessary.
 
-- can manage other users (view, add, edit, delete)
-- have **Manager** permissions on all databases and schemas
+See [Permissions](./permissions.md) for more information on managing roles.
 
-You cannot set granular permissions for an **Admin** user.
+## Limitations
 
-### Standard users
+- Mathesar does not send invitation emails to new users (yet). You'll need to send the user their username and password yourself.
+- Nor is there yet an email-based password recovery mechanism. If you are locked out of your Mathesar installation's web interface, your system administrator can still [use the command line reset any user's password](https://stackoverflow.com/questions/6358030/how-to-reset-django-admin-password).
 
-By default, **Standard** users cannot see anything in Mathesar. They will need to be granted database or schema roles individually.

From aee4c2c09788cda1c637a76ee84d8313b0b73362 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 4 Oct 2024 07:02:09 -0400
Subject: [PATCH 1076/1141] Improve permissions content

---
 docs/docs/user-guide/permissions.md | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/docs/docs/user-guide/permissions.md b/docs/docs/user-guide/permissions.md
index 92d5a6c792..839a2ff3ce 100644
--- a/docs/docs/user-guide/permissions.md
+++ b/docs/docs/user-guide/permissions.md
@@ -1,6 +1,12 @@
 # Mathesar's Role-Based Permissions
 
-Mathesar uses PostgreSQL roles to manage permissions at the database, schema, and table levels. These roles define the actions users can perform, allowing fine-grained control over access.
+Mathesar uses [PostgreSQL roles](https://www.postgresql.org/docs/current/user-manag.html) to manage permissions within a database. These roles define the actions users can perform, allowing fine-grained control over access.
+
+## Roles vs Users
+
+Each Mathesar user accesses a database through one PostgreSQL role — and the user's permissions are determined by the _role's_ permissions within PostgreSQL.
+
+You can read more about [how users and roles work together](./users.md#users-vs-roles).
 
 ## Database Settings
 
@@ -10,18 +16,19 @@ Mathesar provides three main sections for role management within the database se
 - **Collaborators**: This section allows you to add users and assign them configured roles, dictating their access levels within the database.
 - **Server Roles**: Here you can manage roles available on the server itself, defining inheritance, creating new roles, or deleting existing ones.
 
-> **Note:** Role Configuration is Mathesar-specific, managing credentials for existing roles within a connected database. Server Roles, however, exist on the PostgreSQL server itself and affect all databases.
+!!! note
+    Role Configuration is Mathesar-specific, managing credentials for existing roles within a connected database. Server Roles, however, exist on the PostgreSQL server itself and affect all databases.
 
 ### Role Configuration
 
-In the **Role Configuration** section, all LOGIN roles that exist on the server are listed. These roles can then be assigned to collaborators once configured. A configured role has a password set.
+In the **Role Configuration** section, all [LOGIN roles](https://www.postgresql.org/docs/current/role-attributes.html#ROLE-ATTRIBUTES) that exist on the server are listed. These roles can then be assigned to collaborators once configured. A configured role has a password set.
 
 - **Password Management**: For each role, you can configure or change the password directly within Mathesar.
 - **Remove Role Configuration**: You can remove role configurations from Mathesar as needed. This only removes the credentials, not the role from the server.
 
 ### Collaborators
 
-Collaborators are users who have been added to work on the database. Each collaborator is assigned a PostgreSQL LOGIN role that dictates their level of access to the database and its objects (schemas, tables, etc.).
+Collaborators are users who have been added to work on a database. Each collaborator is assigned a PostgreSQL LOGIN role that dictates their level of access to the database and its objects (schemas, tables, etc.).
 
 - **Add Collaborators**: In the **Collaborators** section, you can add new users as collaborators to the database. When adding a collaborator, you assign them one of the roles that have been configured in Mathesar.
 
@@ -36,10 +43,11 @@ These roles will be displayed for all databases on the server. Also, any changes
 - **Create Roles**: You can create new server-level roles from this section. You can configure these roles in two ways:
     1. With login capability and a password, which you can assign to collaborators.
     2. Without login capability, to be used as a parent role exclusively. You cannot assign these roles to collaborators directly.
-- **Define Child Roles**: For existing server-level roles, you can specify which other roles should be their child roles. This allows for creating hierarchies of roles where permissions can be inherited from parent to child roles.
+- **Define Child Roles**: PostgreSQL has a mechanism for [Role Membership](https://www.postgresql.org/docs/current/role-membership.html) wherein any role can be "granted" to any other role to form simple hierarchies or complex graph-based inheritance structures. For any role you've configured within Mathesar, you can use Mathesar to grant the role to other "child roles".
 - **Drop Roles**: You can drop server-level roles that are no longer needed. This action removes the role from the server and all databases where it has been assigned. Exercise caution when dropping roles, as it may affect existing permissions and user access across multiple databases.
 
-> **Note:** Server roles, once added, must be configured in Mathesar under the **Role Configuration** section before they can be assigned to collaborators.
+!!! note
+    Server roles, once added, must be configured in Mathesar under the **Role Configuration** section before they can be assigned to collaborators.
 
 ---
 

From 992b5fae7748504fd795637989b8b25097543961 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Mon, 7 Oct 2024 09:24:15 +0200
Subject: [PATCH 1077/1141] add more detail to configurations

---
 docs/docs/user-guide/permissions.md | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/docs/user-guide/permissions.md b/docs/docs/user-guide/permissions.md
index f656cb8137..97c548a8b2 100644
--- a/docs/docs/user-guide/permissions.md
+++ b/docs/docs/user-guide/permissions.md
@@ -6,11 +6,18 @@ Mathesar uses PostgreSQL roles to manage permissions at the database, schema, an
 
 Mathesar provides three main sections for role management within the database settings:
 
+### In Mathesar
+
+These configurations specifically control how you interact with the database within the Mathesar interface.
+
 - **Role Configuration**: Used to manage credentials (passwords) for roles that exist on the server. These roles can then be assigned to collaborators.
 - **Collaborators**: This section allows you to add users and assign them configured roles, dictating their access levels within the database.
-- **Server Roles**: Here you can manage roles available on the server itself, defining inheritance, creating new roles, or deleting existing ones.
 
-> **Note:** Role Configuration is Mathesar-specific, managing credentials for existing roles within a connected database. Server Roles, however, exist on the PostgreSQL server itself and affect all databases.
+### On the Server
+
+These configurations affect the underlying PostgreSQL server where your database lives. Changes to these configurations will be reflected in all databases on the server.
+
+- **Roles**: Here you can manage roles available on the server, defining their inheritance, creating new roles, or deleting existing ones.
 
 ### Role Configuration
 

From 3e70cd974d9a9147d4130c4662d436d75f624943 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Mon, 7 Oct 2024 09:29:23 +0200
Subject: [PATCH 1078/1141] clarify collaborators

---
 docs/docs/user-guide/permissions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/user-guide/permissions.md b/docs/docs/user-guide/permissions.md
index 97c548a8b2..220c8537d5 100644
--- a/docs/docs/user-guide/permissions.md
+++ b/docs/docs/user-guide/permissions.md
@@ -11,7 +11,7 @@ Mathesar provides three main sections for role management within the database se
 These configurations specifically control how you interact with the database within the Mathesar interface.
 
 - **Role Configuration**: Used to manage credentials (passwords) for roles that exist on the server. These roles can then be assigned to collaborators.
-- **Collaborators**: This section allows you to add users and assign them configured roles, dictating their access levels within the database.
+- **Collaborators**: This section enables you to manage user access to the database. You can add existing Mathesar users as collaborators and assign them configured roles, which determine their specific access levels and permissions within the database.
 
 ### On the Server
 

From 2125bc410a7c236c39f0386a97e5c81a6469c220 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Mon, 7 Oct 2024 11:44:43 +0200
Subject: [PATCH 1079/1141] update permissions documentation

---
 docs/docs/user-guide/permissions.md | 49 +++++++++++++++--------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/docs/docs/user-guide/permissions.md b/docs/docs/user-guide/permissions.md
index e9b6ad31e1..985d027533 100644
--- a/docs/docs/user-guide/permissions.md
+++ b/docs/docs/user-guide/permissions.md
@@ -21,36 +21,39 @@ These configurations specifically control how you interact with the database wit
 
 ### On the Server
 
-These configurations affect the underlying PostgreSQL server where your database lives. Changes to these configurations will be reflected in all databases on the server.
+These configurations affect the underlying PostgreSQL server where your database lives.
 
 - **Roles**: Here you can manage roles available on the server, defining their inheritance, creating new roles, or deleting existing ones.
 
+!!! note
+    Changes to this configuration will be reflected in all databases on the server.
+
 ### Role Configuration
 
 In the **Role Configuration** section, all [LOGIN roles](https://www.postgresql.org/docs/current/role-attributes.html#ROLE-ATTRIBUTES) that exist on the server are listed. These roles can then be assigned to collaborators once configured. A configured role has a password set.
 
-- **Password Management**: For each role, you can configure or change the password directly within Mathesar.
-- **Remove Role Configuration**: You can remove role configurations from Mathesar as needed. This only removes the credentials, not the role from the server.
+- **Configure Password**: For each role, you can configure or change the password directly within Mathesar.
+- **Remove Role**: You can remove role configurations from Mathesar as needed. This only removes the configured credentials (password), not the role from the server.
 
 ### Collaborators
 
-Collaborators are users who have been added to work on a database. Each collaborator is assigned a PostgreSQL LOGIN role that dictates their level of access to the database and its objects (schemas, tables, etc.).
+Collaborators are existing Mathesar users who have been added to work on a database. Each collaborator is assigned a PostgreSQL LOGIN role that dictates their level of access to the database and its objects (schemas, tables, etc.).
 
-- **Add Collaborators**: In the **Collaborators** section, you can add new users as collaborators to the database. When adding a collaborator, you assign them one of the roles that have been configured in Mathesar.
+- **Add Collaborators**: In the **Collaborators** section, you can add existing Mathesar users as collaborators to the database. When adding a collaborator, you assign them one of the roles that have been configured in Mathesar.
 
-- **Remove Collaborators**: You can remove collaborators if they no longer require access to the database. The Mathesar user will still exist and you can add them back as a collaborator at a later time.
+- **Remove Collaborator**: You can remove a collaborator if they no longer require access to the database. The Mathesar user will still exist, and you can add them back as a collaborator at a later time.
 
 ### Server Roles
 
-The **Server Roles** section, found under the **Settings** tab, shows the roles available on the server for the current database.
+The **Roles** section, found under the **Settings** tab, shows the roles available on the PostgreSQL server of the connected database.
 
-These roles will be displayed for all databases on the server. Also, any changes made to a server role will be reflected in all databases on the server.
+These roles are displayed for all databases on the server, and any changes made to a server role will be reflected across all databases on the server.
 
 - **Create Roles**: You can create new server-level roles from this section. You can configure these roles in two ways:
     1. With login capability and a password, which you can assign to collaborators.
-    2. Without login capability, to be used as a parent role exclusively. You cannot assign these roles to collaborators directly.
+    2. Without login capability, to be used exclusively as a parent role to group permissions that can be inherited by other roles. You cannot assign these non-login roles to collaborators directly.
 - **Define Child Roles**: PostgreSQL has a mechanism for [Role Membership](https://www.postgresql.org/docs/current/role-membership.html) wherein any role can be "granted" to any other role to form simple hierarchies or complex graph-based inheritance structures. For any role you've configured within Mathesar, you can use Mathesar to grant the role to other "child roles".
-- **Drop Roles**: You can drop server-level roles that are no longer needed. This action removes the role from the server and all databases where it has been assigned. Exercise caution when dropping roles, as it may affect existing permissions and user access across multiple databases.
+- **Drop Roles**: You can drop server-level roles that are no longer needed. This action removes the role from the server, however if the role is configured in Mathesar, it will still be displayed. Exercise caution when dropping roles, as it may affect collaborators using the dropped role in Mathesar.
 
 !!! note
     Server roles, once added, must be configured in Mathesar under the **Role Configuration** section before they can be assigned to collaborators.
@@ -59,25 +62,23 @@ These roles will be displayed for all databases on the server. Also, any changes
 
 ## Permissions Management at Different Levels
 
-Mathesar manages permissions at three levels:
+Mathesar provides an interface to manage permissions at different levels in the underlying PostgreSQL database:
 
-1. **Database Level:** Managed from the database page.
-2. **Schema Level:** Managed from the schema page.
-3. **Table Level:** Managed from the inspector panel for each table.
+1. **Database Level:** Accessible from the database page.
+2. **Schema Level:** Accessible from the schema page.
+3. **Table Level:** Accessible from the inspector panel for each table.
 
 ### Ownership of Objects
 
-Owners of each object (database, schema, or table) can set permissions for other users. Ownership is determined by the user's assigned collaborator role in the database.
-
-When a new object (database, schema, or table) is created, the owner of the object is the collaborator who created it. This automatic ownership assignment allows the creator to have immediate and full control over the objects they create, including the ability to manage permissions and transfer ownership if needed.
+When a new object (database, schema, or table) is created, the owner of the object is the configured role that the collaborator uses to create it. This automatic ownership assignment allows the role to have immediate and administrative control over the objects created under it, including the ability to manage permissions and transfer ownership if needed.
 
 ### Database Permissions
 
 Database permissions control access and actions at the database level.
 
-- **Owner**: Each database has an owner who has full control over the database, including managing permissions and transferring ownership.
+- **Owner**: Each database has an owner who has administrative control over the database itself, including managing database-level permissions and transferring ownership. Ownership does not automatically extend to the objects within the database (such as schemas and tables), which may have their own separate ownership and permission settings.
 - **Granted Access**: Specific permissions can be granted to roles for various actions within the database.
-- **Transfer Ownership**: The current owner can transfer ownership to another role, granting them full administrative control.
+- **Transfer Ownership**: The current owner can transfer ownership to another role, granting them administrative control.
 
 For each database, the following permission levels can be granted:
 
@@ -89,9 +90,9 @@ For each database, the following permission levels can be granted:
 
 Schema permissions control access and actions at the schema level.
 
-- **Owner**: Each schema has an owner who has full control over the schema, including managing permissions and transferring ownership.
+- **Owner**: Each schema has an owner who has administrative control over the schema itself, including managing schema-level permissions and transferring ownership. Ownership does not automatically extend to the objects within the schema (such as tables), which may have their own separate ownership and permission settings.
 - **Granted Access**: Specific permissions can be granted to roles for various actions within the schema.
-- **Transfer Ownership**: The current owner can transfer ownership to another role, granting them full administrative control over the schema.
+- **Transfer Ownership**: The current owner can transfer ownership to another role, granting them administrative control over the schema.
 
 For each schema, the following permission levels can be granted:
 
@@ -103,12 +104,14 @@ For each schema, the following permission levels can be granted:
 
 Table permissions control access and actions at the table level.
 
-- **Owner**: Each table has an owner who has full control over the table, including managing permissions, transferring ownership, and modifying the table's structure (such as adding, removing, or altering columns).
+- **Owner**: Each table has an owner who has administrative control over the table itself, including managing table-level permissions, transferring ownership, and modifying the table's structure (such as adding, removing, or altering columns).
 - **Granted Access**: Specific permissions can be granted to roles for various actions on the table.
-- **Transfer Ownership**: The current owner can transfer ownership to another role, granting them full administrative control over the table.
+- **Transfer Ownership**: The current owner can transfer ownership to another role, granting them administrative control over the table.
 
 For each table, the following permission levels can be granted:
 
 - **Read**: Allows the role to access the table and read records.
 - **Write**: Includes Read permissions and allows the role to insert, update, and delete records in the table.
 - **Custom**: Enables the granular setting of permissions beyond the predefined options.
+
+You can read more on custom permissions and the specific privileges that can be granted on the [PostgreSQL GRANT documentation](https://www.postgresql.org/docs/current/sql-grant.html).

From fe3806c9064e5ae670c79d33d20313f0444a50cb Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Mon, 7 Oct 2024 18:25:58 +0800
Subject: [PATCH 1080/1141] fix quoting for role grant/revoke expressions

---
 db/sql/00_msar.sql      |  4 ++--
 db/sql/test_00_msar.sql | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 78b37c80a5..709f314035 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1196,7 +1196,7 @@ CREATE OR REPLACE FUNCTION
 msar.build_grant_membership_expr(parent_rol_id regrole, g_roles oid[]) RETURNS TEXT AS $$
 SELECT string_agg(
   format(
-    'GRANT %1$s TO %2$s',
+    'GRANT %1$I TO %2$I',
     msar.get_role_name(parent_rol_id),
     msar.get_role_name(rol_id)
   ),
@@ -1210,7 +1210,7 @@ CREATE OR REPLACE FUNCTION
 msar.build_revoke_membership_expr(parent_rol_id regrole, r_roles oid[]) RETURNS TEXT AS $$
 SELECT string_agg(
   format(
-    'REVOKE %1$s FROM %2$s',
+    'REVOKE %1$I FROM %2$I',
     msar.get_role_name(parent_rol_id),
     msar.get_role_name(rol_id)
   ),
diff --git a/db/sql/test_00_msar.sql b/db/sql/test_00_msar.sql
index 99c607f29c..b7b4db3bb4 100644
--- a/db/sql/test_00_msar.sql
+++ b/db/sql/test_00_msar.sql
@@ -5369,3 +5369,33 @@ BEGIN
   );
 END;
 $$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test_build_grant_revoke_membership_expr() RETURNS SETOF TEXT AS $$
+BEGIN
+  CREATE USER "Alice";
+  CREATE USER "Bob";
+  CREATE USER carol;
+  RETURN NEXT is(
+    msar.build_grant_membership_expr('"Alice"'::regrole::oid, ARRAY['"Bob"'::regrole::oid]),
+    E'GRANT "Alice" TO "Bob";\n'
+  );
+  RETURN NEXT is(
+    msar.build_grant_membership_expr(
+      '"Alice"'::regrole::oid, ARRAY['"Bob"'::regrole::oid, 'carol'::regrole::oid]
+    ),
+    E'GRANT "Alice" TO "Bob";\nGRANT "Alice" TO carol;\n'
+  );
+
+  RETURN NEXT is(
+    msar.build_revoke_membership_expr('"Alice"'::regrole::oid, ARRAY['"Bob"'::regrole::oid]),
+    E'REVOKE "Alice" FROM "Bob";\n'
+  );
+  RETURN NEXT is(
+    msar.build_revoke_membership_expr(
+      '"Alice"'::regrole::oid, ARRAY['"Bob"'::regrole::oid, 'carol'::regrole::oid]
+    ),
+    E'REVOKE "Alice" FROM "Bob";\nREVOKE "Alice" FROM carol;\n'
+  );
+END;
+$$ LANGUAGE plpgsql;

From 03f9ba3f6f74f129f75bc61c6135cb78ab733a42 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Mon, 7 Oct 2024 13:02:49 +0200
Subject: [PATCH 1081/1141] Update label

---
 docs/docs/user-guide/permissions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/user-guide/permissions.md b/docs/docs/user-guide/permissions.md
index 985d027533..0b0d178e9c 100644
--- a/docs/docs/user-guide/permissions.md
+++ b/docs/docs/user-guide/permissions.md
@@ -33,7 +33,7 @@ These configurations affect the underlying PostgreSQL server where your database
 In the **Role Configuration** section, all [LOGIN roles](https://www.postgresql.org/docs/current/role-attributes.html#ROLE-ATTRIBUTES) that exist on the server are listed. These roles can then be assigned to collaborators once configured. A configured role has a password set.
 
 - **Configure Password**: For each role, you can configure or change the password directly within Mathesar.
-- **Remove Role**: You can remove role configurations from Mathesar as needed. This only removes the configured credentials (password), not the role from the server.
+- **Remove**: You can remove role configurations from Mathesar as needed. This only removes the configured credentials (password), not the role from the server.
 
 ### Collaborators
 

From 0425df7a3602c5ce798713bdcdd09cfaa4b5fbe5 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Mon, 7 Oct 2024 13:07:22 +0200
Subject: [PATCH 1082/1141] update documentation link

---
 docs/docs/user-guide/permissions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/user-guide/permissions.md b/docs/docs/user-guide/permissions.md
index 0b0d178e9c..a5bf47a7ff 100644
--- a/docs/docs/user-guide/permissions.md
+++ b/docs/docs/user-guide/permissions.md
@@ -114,4 +114,4 @@ For each table, the following permission levels can be granted:
 - **Write**: Includes Read permissions and allows the role to insert, update, and delete records in the table.
 - **Custom**: Enables the granular setting of permissions beyond the predefined options.
 
-You can read more on custom permissions and the specific privileges that can be granted on the [PostgreSQL GRANT documentation](https://www.postgresql.org/docs/current/sql-grant.html).
+You can read more about the specific privileges that can be granted in the [PostgreSQL documentation on Privileges](https://www.postgresql.org/docs/current/ddl-priv.html).

From 491ec91b325848b8fdbf7cc5dfb2f66c9c7f7a3c Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Mon, 7 Oct 2024 13:29:07 +0200
Subject: [PATCH 1083/1141] update users documentation

---
 docs/docs/user-guide/users.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/docs/user-guide/users.md b/docs/docs/user-guide/users.md
index a813811dec..cf5c45eeed 100644
--- a/docs/docs/user-guide/users.md
+++ b/docs/docs/user-guide/users.md
@@ -10,7 +10,6 @@ Mathesar allows multiple users to collaborate on the same data using a [role-bas
 !!! info "Admin-assigned passwords"
     Any user with an admin-assigned password (new or edited) will be prompted to change their password after logging in.
 
-
 ## Admin vs Standard users
 
 Each Mathesar user is either **Admin** or **Standard**.
@@ -37,7 +36,7 @@ How users and roles work together:
 - The user's permissions on anything _inside_ the database are determined by the corresponding role's permissions within PostgreSQL.
 
     !!! info "Admin doesn't matter here"
-        The user's "admin" status with Mathesar _has no effect_ on the user's ability to do things within a database! It only affects operations outside the database.
+        The user's "admin" status with Mathesar _has no effect_ on the user's ability to do things within a database! It only affects operations outside the database. This includes configuring database roles and managing collaborators, even though those operations are presented within the Database section of the UI they are considered to be _outside_ the database.
 
 - You can configure separate Mathesar users to share the same PostgreSQL role if you like. This is a good option if you want those users to have the same permissions on the data.
 - Or you can use separate PostgreSQL roles for different users. This is necessary any time you want different users to have different permissions on the data.
@@ -49,4 +48,3 @@ See [Permissions](./permissions.md) for more information on managing roles.
 
 - Mathesar does not send invitation emails to new users (yet). You'll need to send the user their username and password yourself.
 - Nor is there yet an email-based password recovery mechanism. If you are locked out of your Mathesar installation's web interface, your system administrator can still [use the command line reset any user's password](https://stackoverflow.com/questions/6358030/how-to-reset-django-admin-password).
-

From bffdb4bfa7cdd6fb7b714f4611e3b1c5e6310830 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 7 Oct 2024 09:56:35 -0400
Subject: [PATCH 1084/1141] Clarify language around admin status.

---
 docs/docs/user-guide/users.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/docs/user-guide/users.md b/docs/docs/user-guide/users.md
index cf5c45eeed..39d1f42330 100644
--- a/docs/docs/user-guide/users.md
+++ b/docs/docs/user-guide/users.md
@@ -33,10 +33,10 @@ Upon installing Mathesar, your first user will be an Admin user.
 How users and roles work together:
 
 - To access a database, each Mathesar user must be assigned a PostgreSQL role to be used for that database.
-- The user's permissions on anything _inside_ the database are determined by the corresponding role's permissions within PostgreSQL.
+- The user's permissions on actual data (in the [user database](./glossary.md#user-db)) are determined by the corresponding role's permissions within PostgreSQL.
 
     !!! info "Admin doesn't matter here"
-        The user's "admin" status with Mathesar _has no effect_ on the user's ability to do things within a database! It only affects operations outside the database. This includes configuring database roles and managing collaborators, even though those operations are presented within the Database section of the UI they are considered to be _outside_ the database.
+        The user's "admin" status with Mathesar _has no effect_ on the user's ability to do things with the _data_ in a database! The admin status only affects operations on Mathesar's [internal database](./glossary.md#internal-db) such as managing collaborators and their corresponding roles.
 
 - You can configure separate Mathesar users to share the same PostgreSQL role if you like. This is a good option if you want those users to have the same permissions on the data.
 - Or you can use separate PostgreSQL roles for different users. This is necessary any time you want different users to have different permissions on the data.

From b2e805ef775bfa44f0a1ad2eb50c4ca5c15be63d Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 7 Oct 2024 12:54:49 -0400
Subject: [PATCH 1085/1141] Add more content to Databases page

---
 docs/docs/user-guide/databases.md | 32 +++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/docs/docs/user-guide/databases.md b/docs/docs/user-guide/databases.md
index d8695ea18d..f0068b88ae 100644
--- a/docs/docs/user-guide/databases.md
+++ b/docs/docs/user-guide/databases.md
@@ -1,5 +1,33 @@
 # Databases
 
-Each installation of Mathesar can connect to multiple Databases.
+Each installation of Mathesar can connect to multiple PostgreSQL databases. Connecting your first database will likely be your first step in using Mathesar.
+
+## PostgreSQL servers
+
+Every PostgreSQL database lives within a PostgreSQL server.
+
+- **External servers:** Mathesar can connect to any Internet-exposed PostgreSQL server to access the databases within it. We'll refer to these PostgreSQL servers as "external servers".
+
+- The **Internal Server:** Most Mathesar installations have an internal PostgreSQL server which the Mathesar application controls and utilizes for storage of application-specific metadata.
+
+    !!! info "Some Mathesar installations don't have an internal server"
+        It's possible (though not recommended) to configure Mathesar to store its internal metadata in SQLite, thereby circumventing the need for an internal server.
+
+## Creating a new database
+
+If you're starting your database from scratch with Mathesar you can either:
+
+- Use Mathesar to create a new database within Mathesar's internal server and connect to it. This is a good option to get up and running quickly, but it might require more work later should you decide to set up periodic backups or connect other tools to the same database. Also, this option won't be possible if Mathesar was installed without an internal server.
+
+    _OR_
+
+- Use another tool to create your database on an external server and then connect Mathesar to it. You can administer that external server yourself, or choose from a variety of hosted PostgreSQL solutions such as [Amazon RDS](https://aws.amazon.com/rds/postgresql/pricing/), [Google Cloud SQL](https://cloud.google.com/sql/postgresql), [Supabase](https://supabase.com/database), and others.
+
+## Connecting a database
+
+Click the **Connect Database** button from the home page of your Mathesar application and follow the prompts.
+
+Once you've connected a database, you can navigate to Mathesar's page for it where you can browse the database's schemas and configure various [permissions](./permissions.md) for it.
+
+Mathesar will remember the connection even after the application is shut down. Your Mathesar user will be added as a "collaborator" on the database (along with the PostgreSQL role you entered). And the password you entered for that role will be stored in Mathesar's internal database, encrypted using Mathesar's [SECRET_KEY](../configuration/env-variables.md#secret_key).
 
-TODO

From acd06b8fba0b368a19fb92615a15899df6cf7ed5 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 7 Oct 2024 14:35:39 -0400
Subject: [PATCH 1086/1141] Improve Permissions content

---
 docs/docs/user-guide/permissions.md | 76 ++++++++++++++++-------------
 1 file changed, 41 insertions(+), 35 deletions(-)

diff --git a/docs/docs/user-guide/permissions.md b/docs/docs/user-guide/permissions.md
index a5bf47a7ff..8c3d4afcb4 100644
--- a/docs/docs/user-guide/permissions.md
+++ b/docs/docs/user-guide/permissions.md
@@ -1,6 +1,6 @@
 # Mathesar's Role-Based Permissions
 
-Mathesar uses [PostgreSQL roles](https://www.postgresql.org/docs/current/user-manag.html) to manage permissions within a database. These roles define the actions users can perform, allowing fine-grained control over access.
+Mathesar uses [PostgreSQL roles](https://www.postgresql.org/docs/current/user-manag.html) to manage permissions on your data. These roles define the actions users can perform, allowing fine-grained control over access.
 
 ## Roles vs Users
 
@@ -8,46 +8,41 @@ Each Mathesar user accesses a database through one PostgreSQL role — and the u
 
 You can read more about [how users and roles work together](./users.md#users-vs-roles).
 
-## Database Settings
+## The Database "Settings" tab {:#database_settings}
 
-Mathesar provides three main sections for role management within the database settings:
+Each database has its own page within Mathesar. And on that page you'll find a "Settings" tab where you can manage roles and collaborators.
 
-### In Mathesar
+### _In Mathesar:_ Role Configuration {:#role_configuration}
 
-These configurations specifically control how you interact with the database within the Mathesar interface.
+Use this section to manage the credentials (i.e. passwords) for roles that you'd like to assign to collaborators within Mathesar. Mathesar will display all [LOGIN roles](https://www.postgresql.org/docs/current/role-attributes.html#ROLE-ATTRIBUTES) that exist on the server.
 
-- **Role Configuration**: Used to manage credentials (passwords) for roles that exist on the server. These roles can then be assigned to collaborators.
-- **Collaborators**: This section enables you to manage user access to the database. You can add existing Mathesar users as collaborators and assign them configured roles, which determine their specific access levels and permissions within the database.
+- Click **Configure in Mathesar** to store the role's password in Mathesar and allow the role to be associated with collaborators.
 
-### On the Server
+- Click **Configure Password** to update the password of an already configured role.
 
-These configurations affect the underlying PostgreSQL server where your database lives.
+- Click **Remove** to remove Mathesar's stored password for a role. The role will remain on the server.
 
-- **Roles**: Here you can manage roles available on the server, defining their inheritance, creating new roles, or deleting existing ones.
 
-!!! note
-    Changes to this configuration will be reflected in all databases on the server.
-
-### Role Configuration
-
-In the **Role Configuration** section, all [LOGIN roles](https://www.postgresql.org/docs/current/role-attributes.html#ROLE-ATTRIBUTES) that exist on the server are listed. These roles can then be assigned to collaborators once configured. A configured role has a password set.
+### _In Mathesar:_ Collaborators {:#collaborators}
 
-- **Configure Password**: For each role, you can configure or change the password directly within Mathesar.
-- **Remove**: You can remove role configurations from Mathesar as needed. This only removes the configured credentials (password), not the role from the server.
+A "collaborator" is a Mathesar users who has access to a database through a specific PostgreSQL sole.
 
-### Collaborators
+The Collaborators section allows you to add and remove collaborators and edit their corresponding PostgreSQL roles.
 
-Collaborators are existing Mathesar users who have been added to work on a database. Each collaborator is assigned a PostgreSQL LOGIN role that dictates their level of access to the database and its objects (schemas, tables, etc.).
+!!! tip "Keep in mind"
 
-- **Add Collaborators**: In the **Collaborators** section, you can add existing Mathesar users as collaborators to the database. When adding a collaborator, you assign them one of the roles that have been configured in Mathesar.
+    - You'll only be able to choose roles that have been "configured" in the above section — roles for which Mathesar has passwords stored.
 
-- **Remove Collaborator**: You can remove a collaborator if they no longer require access to the database. The Mathesar user will still exist, and you can add them back as a collaborator at a later time.
+    - Removing a collaborator revokes that user's access to the database _but_:
 
-### Server Roles
+        - If the user is a Mathesar [admin](./users.md#admin-vs-standard-users), they'll be able to gain access again.
+        - The user will still remain in Mathesar, potentially with access to other Databases.
+        - The role (and it's corresponding password) will still remain configured in Mathesar.
+        - The role will still remain on the PostgreSQL server.
 
-The **Roles** section, found under the **Settings** tab, shows the roles available on the PostgreSQL server of the connected database.
+### _On the Server:_ Roles {:#roles}
 
-These roles are displayed for all databases on the server, and any changes made to a server role will be reflected across all databases on the server.
+Here you can manage roles available on the server, defining their inheritance, creating new roles, or deleting existing ones. Any changes here will be reflected for all connected databases which share this server.
 
 - **Create Roles**: You can create new server-level roles from this section. You can configure these roles in two ways:
     1. With login capability and a password, which you can assign to collaborators.
@@ -60,21 +55,32 @@ These roles are displayed for all databases on the server, and any changes made
 
 ---
 
-## Permissions Management at Different Levels
+## PostgreSQL objects {:#objects}
+
+In PostgreSQL, an "object" is a thing like: a database, a schema, a table, _(and some other things too, which we won't cover here)_.
+
+### Privileges and ownership
+
+- **Privileges:** Specific privileges on an object can be granted to specific roles.
 
-Mathesar provides an interface to manage permissions at different levels in the underlying PostgreSQL database:
+    !!! example
+        A role can be granted the `CREATE` privilege on a schema. This allows the role to create new tables within the schema.
 
-1. **Database Level:** Accessible from the database page.
-2. **Schema Level:** Accessible from the schema page.
-3. **Table Level:** Accessible from the inspector panel for each table.
+- **Ownership**: Every PostgreSQL object has one and only one role said to be its "owner". The owner generally can do anything directly to the object, but not necessarily other objects contained within it. By default the owner is set to the role which created the object.
 
-### Ownership of Objects
+- **Shared ownership:** While PostgreSQL has a variety of granular privileges for different actions, there are still certain actions which remain restricted to object owners. For example only the owner of a table can add new columns to it.
 
-When a new object (database, schema, or table) is created, the owner of the object is the configured role that the collaborator uses to create it. This automatic ownership assignment allows the role to have immediate and administrative control over the objects created under it, including the ability to manage permissions and transfer ownership if needed.
+    While this behavior may seem limiting, it's still possible configure multiple roles to effectively "own" a single object by leveraging PostgreSQL's powerful role inheritance functionality:
+    
+    1. We can create a third role to directly own the object and act as a sort of proxy "group". (The group role doesn't need to be a `LOGIN` role and thus doesn't require a password to be configured.)
+    1. Then we can grant _that group role_ to any other roles we'd like.
+    1. Those granted roles will then have permission do things _as if they were the owner themselves_.
+    
+    You can use the Mathesar UI to configure an arrangement like the above, though it will require many steps.
 
 ### Database Permissions
 
-Database permissions control access and actions at the database level.
+The "Database Permissions" modal is accessible via a button at the top right of the database page and allows you to configure the owner and granted privileges for a database.
 
 - **Owner**: Each database has an owner who has administrative control over the database itself, including managing database-level permissions and transferring ownership. Ownership does not automatically extend to the objects within the database (such as schemas and tables), which may have their own separate ownership and permission settings.
 - **Granted Access**: Specific permissions can be granted to roles for various actions within the database.
@@ -88,7 +94,7 @@ For each database, the following permission levels can be granted:
 
 ### Schema Permissions
 
-Schema permissions control access and actions at the schema level.
+The "Schema Permissions" modal is accessible via a button at the top right of the schema page and allows you to configure the owner and granted privileges for a schema.
 
 - **Owner**: Each schema has an owner who has administrative control over the schema itself, including managing schema-level permissions and transferring ownership. Ownership does not automatically extend to the objects within the schema (such as tables), which may have their own separate ownership and permission settings.
 - **Granted Access**: Specific permissions can be granted to roles for various actions within the schema.
@@ -102,7 +108,7 @@ For each schema, the following permission levels can be granted:
 
 ### Table Permissions
 
-Table permissions control access and actions at the table level.
+The Table Permissions modal is accessible via a button from within the right-side inspector panel for each table and allows you to configure the owner and granted privileges for a table.
 
 - **Owner**: Each table has an owner who has administrative control over the table itself, including managing table-level permissions, transferring ownership, and modifying the table's structure (such as adding, removing, or altering columns).
 - **Granted Access**: Specific permissions can be granted to roles for various actions on the table.

From 217889d95d5b045a4099af5bc099939de993affb Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 7 Oct 2024 15:57:49 -0400
Subject: [PATCH 1087/1141] Install compare-versions package

---
 mathesar_ui/package-lock.json | 6 ++++++
 mathesar_ui/package.json      | 1 +
 2 files changed, 7 insertions(+)

diff --git a/mathesar_ui/package-lock.json b/mathesar_ui/package-lock.json
index cd79da17a9..11e3b932d8 100644
--- a/mathesar_ui/package-lock.json
+++ b/mathesar_ui/package-lock.json
@@ -10,6 +10,7 @@
       "dependencies": {
         "@fortawesome/free-solid-svg-icons": "^6.2.0",
         "@popperjs/core": "^2.11.6",
+        "compare-versions": "^6.1.1",
         "dayjs": "^1.11.5",
         "fast-diff": "^1.2.0",
         "flatpickr": "^4.6.13",
@@ -2867,6 +2868,11 @@
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
+    "node_modules/compare-versions": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.1.tgz",
+      "integrity": "sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg=="
+    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
diff --git a/mathesar_ui/package.json b/mathesar_ui/package.json
index e6ab0e021c..cd1dc272c5 100644
--- a/mathesar_ui/package.json
+++ b/mathesar_ui/package.json
@@ -53,6 +53,7 @@
   "dependencies": {
     "@fortawesome/free-solid-svg-icons": "^6.2.0",
     "@popperjs/core": "^2.11.6",
+    "compare-versions": "^6.1.1",
     "dayjs": "^1.11.5",
     "fast-diff": "^1.2.0",
     "flatpickr": "^4.6.13",

From 8211d3d15fbbcbaa16e4e6cc839c952d814a8b2d Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Mon, 7 Oct 2024 16:16:50 -0400
Subject: [PATCH 1088/1141] Compare versions using semver logic

---
 mathesar_ui/src/stores/releases.ts | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/mathesar_ui/src/stores/releases.ts b/mathesar_ui/src/stores/releases.ts
index 7502290a67..f2ed065c43 100644
--- a/mathesar_ui/src/stores/releases.ts
+++ b/mathesar_ui/src/stores/releases.ts
@@ -1,3 +1,4 @@
+import { compare } from 'compare-versions';
 import { getContext, setContext } from 'svelte';
 
 import {
@@ -31,20 +32,6 @@ function buildRelease(gh: GitHubRelease | undefined): Release | undefined {
   };
 }
 
-function orderableTag(tagName: string): number | undefined {
-  try {
-    const [major, minor, patch] = tagName
-      .split('.')
-      .map((s) => parseInt(s, 10));
-    if (Number.isNaN(major) || Number.isNaN(minor) || Number.isNaN(patch)) {
-      return undefined;
-    }
-    return major * 1000000 + minor * 1000 + patch;
-  } catch (e) {
-    return undefined;
-  }
-}
-
 type UpgradeStatus = 'upgradable' | 'up-to-date';
 
 function getUpgradeStatus(
@@ -54,12 +41,9 @@ function getUpgradeStatus(
   if (current === undefined || latest === undefined) {
     return undefined;
   }
-  const currentNum = orderableTag(current.tagName);
-  const LatestNum = orderableTag(latest.tagName);
-  if (currentNum && LatestNum && LatestNum > currentNum) {
-    return 'upgradable';
-  }
-  return 'up-to-date';
+  return compare(latest.tagName, current.tagName, '>')
+    ? 'upgradable'
+    : 'up-to-date';
 }
 
 export class ReleaseData {

From 82c2663707027d655844c0643abd3c25cba4dccb Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Tue, 8 Oct 2024 10:04:04 +0200
Subject: [PATCH 1089/1141] Update version numbers to 0.2.0-testing.1

---
 docs/mkdocs.yml      | 2 +-
 mathesar/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index e2488e3424..0c3e440b6c 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -117,4 +117,4 @@ markdown_extensions:
       permalink: true
 
 extra:
-  mathesar_version: 0.1.7
+  mathesar_version: 0.2.0-testing.1
diff --git a/mathesar/__init__.py b/mathesar/__init__.py
index c5b35f12fe..9cb87736d0 100644
--- a/mathesar/__init__.py
+++ b/mathesar/__init__.py
@@ -1,3 +1,3 @@
 default_app_config = 'mathesar.apps.MathesarConfig'
 
-__version__ = "0.1.7"
+__version__ = "0.2.0-testing.1"

From 32a99d55a563bb206b2a39e6924129e65a8d8dab Mon Sep 17 00:00:00 2001
From: Pavish Kumar Ramani Gopal <pavishkumar.r@gmail.com>
Date: Tue, 8 Oct 2024 17:41:52 +0530
Subject: [PATCH 1090/1141] Update docs/docs/user-guide/permissions.md

---
 docs/docs/user-guide/permissions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/user-guide/permissions.md b/docs/docs/user-guide/permissions.md
index 8c3d4afcb4..e625a71e87 100644
--- a/docs/docs/user-guide/permissions.md
+++ b/docs/docs/user-guide/permissions.md
@@ -25,7 +25,7 @@ Use this section to manage the credentials (i.e. passwords) for roles that you'd
 
 ### _In Mathesar:_ Collaborators {:#collaborators}
 
-A "collaborator" is a Mathesar users who has access to a database through a specific PostgreSQL sole.
+A "collaborator" is a Mathesar user who has access to a database through a specific PostgreSQL role.
 
 The Collaborators section allows you to add and remove collaborators and edit their corresponding PostgreSQL roles.
 

From e7fc8e142fc10b6995e169b977b524c5243748e8 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 8 Oct 2024 08:10:49 -0400
Subject: [PATCH 1091/1141] Use "child role" terminology

---
 docs/docs/user-guide/permissions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/user-guide/permissions.md b/docs/docs/user-guide/permissions.md
index e625a71e87..2a096f96ff 100644
--- a/docs/docs/user-guide/permissions.md
+++ b/docs/docs/user-guide/permissions.md
@@ -74,7 +74,7 @@ In PostgreSQL, an "object" is a thing like: a database, a schema, a table, _(and
     
     1. We can create a third role to directly own the object and act as a sort of proxy "group". (The group role doesn't need to be a `LOGIN` role and thus doesn't require a password to be configured.)
     1. Then we can grant _that group role_ to any other roles we'd like.
-    1. Those granted roles will then have permission do things _as if they were the owner themselves_.
+    1. Those child roles will then have permission do things _as if they were the owner themselves_.
     
     You can use the Mathesar UI to configure an arrangement like the above, though it will require many steps.
 

From 5151bd89503c912d82a6b5036d5d83bbc032e15b Mon Sep 17 00:00:00 2001
From: Brent Moran <brentmoran@gmail.com>
Date: Tue, 20 Aug 2024 13:20:56 +0800
Subject: [PATCH 1092/1141] update mkdocs dependencies to get pipeline passing

---
 docs/requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 489148efae..700485f293 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -3,5 +3,5 @@ mkdocs-material==8.5.11
 mkdocs-redirects==1.2.0
 mkdocs-macros-plugin==0.7.0
 mkdocs-placeholder-plugin==0.3.1
-mkdocstrings==0.24.2
-mkdocstrings-python==1.9.2
+mkdocstrings==0.25.2
+mkdocstrings-python==1.10.8

From fbeefc3cce4ff7942164abbdbd23f5d1da32e560 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Tue, 8 Oct 2024 10:45:39 -0400
Subject: [PATCH 1093/1141] Remove GH action to auto-deploy docs

---
 .github/workflows/deploy-docs.yml | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 .github/workflows/deploy-docs.yml

diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
deleted file mode 100644
index c20fa7ad23..0000000000
--- a/.github/workflows/deploy-docs.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: deploy-docs
-on:
-  push:
-    branches:
-      - master
-permissions:
-  contents: write
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: 3.11
-      - run: pip install -r ./docs/requirements.txt
-      - working-directory: ./docs
-        run: mkdocs gh-deploy --strict --force

From e60542aeee79d94eb677e749816c2c29adfd5e39 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 9 Oct 2024 02:35:18 +0530
Subject: [PATCH 1094/1141] fix response for explorations.run for
 summarizations

---
 mathesar/utils/explorations.py | 93 ++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)

diff --git a/mathesar/utils/explorations.py b/mathesar/utils/explorations.py
index 8035bcc163..621d1f18b8 100644
--- a/mathesar/utils/explorations.py
+++ b/mathesar/utils/explorations.py
@@ -3,7 +3,22 @@
 from db.queries.base import DBQuery, InitialColumn, JoinParameter
 from db.queries.operations.process import get_transforms_with_summarizes_speced
 from db.tables.operations.select import get_table
+from db.transforms.base import Summarize
 from db.transforms.operations.deserialize import deserialize_transformation
+from db.functions.base import (
+    Count,
+    ArrayAgg,
+    Sum,
+    Median,
+    Mode,
+    Percentage_True,
+    Max,
+    Min,
+    Mean,
+    PeakTime,
+    PeakMonth,
+)
+from db.functions.packed import DistinctArrayAgg
 from mathesar.api.utils import process_annotated_records
 from mathesar.models.base import Explorations, ColumnMetaData, Database
 from mathesar.rpc.columns.metadata import ColumnMetaDataRecord
@@ -98,6 +113,11 @@ def run_exploration(exploration_def, conn, limit=100, offset=0):
     )
     transformations = get_transforms_with_summarizes_speced(db_query, engine, metadata)
     db_query.transformations = transformations
+    exploration_def["transformations"] = [transformation.spec for transformation in transformations]
+    exploration_def["display_names"] = _get_default_display_names_for_summarize_transforms(
+        transformations,
+        exploration_def.get("display_names", {})
+    )
     records = db_query.get_records(
         limit=limit,
         offset=offset
@@ -174,3 +194,76 @@ def _get_exploration_column_metadata(
             "input_alias": db_query.get_input_alias_for_output_alias(alias)
         }
     return exploration_column_metadata
+
+
+def _get_default_display_names_for_summarize_transforms(transformations, current_display_names=dict()):
+    default_display_names = dict()
+    if not current_display_names:
+        return default_display_names
+    summarize_transforms = [
+        db_transform
+        for db_transform in transformations
+        if isinstance(db_transform, Summarize)
+    ]
+    for summarize_transform in summarize_transforms:
+        # Find default display names for grouping output aliases
+        for output_alias in summarize_transform.grouping_output_aliases:
+            default_display_name = _get_default_display_name_for_group_output_alias(
+                summarize_transform,
+                output_alias,
+                current_display_names,
+            )
+            if default_display_name:
+                default_display_names[output_alias] = default_display_name
+        # Find default display names for aggregation output aliases
+        for agg_col_spec in summarize_transform.aggregation_col_specs:
+            input_alias = agg_col_spec.get("input_alias")
+            output_alias = agg_col_spec.get("output_alias")
+            agg_function = agg_col_spec.get("function")
+            default_display_name = _get_default_display_name_for_agg_output_alias(
+                output_alias,
+                input_alias,
+                agg_function,
+                current_display_names,
+            )
+            if default_display_name:
+                default_display_names[output_alias] = default_display_name
+    return default_display_names | current_display_names
+
+
+def _get_default_display_name_for_agg_output_alias(
+    output_alias,
+    input_alias,
+    agg_function,
+    current_display_names,
+):
+    if output_alias and input_alias and agg_function:
+        map_of_agg_function_to_suffix = {
+            DistinctArrayAgg.id: " distinct list",
+            ArrayAgg.id: " list",
+            Count.id: " count",
+            Sum.id: " sum",
+            Max.id: " max",
+            Median.id: " median",
+            Mode.id: " mode",
+            Percentage_True.id: " percentage true",
+            Min.id: " min",
+            Mean.id: " mean",
+            PeakTime.id: " peak_time",
+            PeakMonth.id: " peak_month",
+        }
+        suffix_to_add = map_of_agg_function_to_suffix.get(agg_function)
+        if suffix_to_add:
+            input_alias_display_name = current_display_names.get(input_alias)
+            if input_alias_display_name:
+                return input_alias_display_name + suffix_to_add
+
+
+def _get_default_display_name_for_group_output_alias(
+    summarize_transform,
+    output_alias,
+    current_display_names,
+):
+    input_alias = summarize_transform.map_of_output_alias_to_input_alias[output_alias]
+    input_alias_display_name = current_display_names.get(input_alias)
+    return input_alias_display_name

From 9c5a11230b545117c5aa2ddc0508697ed606c4be Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Wed, 9 Oct 2024 02:58:54 +0530
Subject: [PATCH 1095/1141] add a check

---
 mathesar/utils/explorations.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mathesar/utils/explorations.py b/mathesar/utils/explorations.py
index 621d1f18b8..f3b288df07 100644
--- a/mathesar/utils/explorations.py
+++ b/mathesar/utils/explorations.py
@@ -113,7 +113,11 @@ def run_exploration(exploration_def, conn, limit=100, offset=0):
     )
     transformations = get_transforms_with_summarizes_speced(db_query, engine, metadata)
     db_query.transformations = transformations
-    exploration_def["transformations"] = [transformation.spec for transformation in transformations]
+    if exploration_def.get("transformations") is not None:
+        exploration_def["transformations"] = [
+            {"type": transformation.type, "spec": transformation.spec}
+            for transformation in transformations
+        ]
     exploration_def["display_names"] = _get_default_display_names_for_summarize_transforms(
         transformations,
         exploration_def.get("display_names", {})

From a5d318c35624ba5c9c788a04fd11922628b3b521 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 9 Oct 2024 11:22:22 -0400
Subject: [PATCH 1096/1141] Add custom 404 page with redirection logic

---
 docs/mkdocs.yml         |  1 +
 docs/overrides/404.html | 67 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 docs/overrides/404.html

diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 9d569e569a..2040e86f05 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -91,6 +91,7 @@ theme:
       toggle:
         icon: material/brightness-4
         name: Switch to light mode
+  custom_dir: overrides
 
 extra_css:
   - stylesheets/extra.css
diff --git a/docs/overrides/404.html b/docs/overrides/404.html
new file mode 100644
index 0000000000..68ca7a6de8
--- /dev/null
+++ b/docs/overrides/404.html
@@ -0,0 +1,67 @@
+{% extends "base.html" %}
+
+{% block content %}
+  <h1>Page Not Found</h1>
+
+  <p>
+    If you followed a link here, we'd appreciate it if you would open a
+    <a href="https://github.com/mathesar-foundation/mathesar/issues">
+      GitHub issue
+    </a>
+    describing how you got here so we can fix the link.
+  </p>
+
+  <p>
+    You can also ask the Mathesar team for help by reaching out on
+    <a href="https://wiki.mathesar.org/community/matrix/">Matrix</a>.
+  </p>
+{% endblock %}
+
+{% block scripts %}
+  {{ super() }}
+  <script>
+    // @ts-check
+    
+    const defaultVersionAlias = 'latest';
+
+    /**
+     * Add strings here if your docs URL has any prefixes before the version
+     * such as a repo name, a subdirectory, or a language code.
+     * 
+     * If your docs URLs look like `https://example.com/docs/en/1.0/foo/bar`
+     * then set this value to `['docs', 'en']`.
+     */
+    const pathPartsBeforeVersion = [];
+    const versionPositionInPath = pathPartsBeforeVersion.length;
+
+    async function handleMissingVersion() {
+      try {
+        const response = await fetch('/versions.json');
+        if (!response.ok) return;
+        
+        /** @type {({ version: string; title: string; aliases: string[]; })[]} */
+        const versionBlobs = await response.json();
+        const versionLikeStrings = versionBlobs.flatMap(v => [v.version, ...v.aliases]);
+  
+        const url = new URL(window.location.href);
+        const pathParts = url.pathname.split('/').filter(Boolean);
+        const firstPathPart = pathParts[versionPositionInPath];
+
+        if (versionLikeStrings.includes(firstPathPart)) return;
+
+        window.location.href = [
+          '',
+          ...pathPartsBeforeVersion,
+          defaultVersionAlias,
+          ...pathParts,
+          url.search + url.hash
+        ].join('/');
+      }
+      catch (e) {
+        // Ignore errors
+      }
+    }
+
+    handleMissingVersion();
+  </script>
+{% endblock %}
\ No newline at end of file

From 0eb6611cc97357255b01bdadcf78d1efde9fd49c Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 9 Oct 2024 14:49:32 -0400
Subject: [PATCH 1097/1141] Handle loading state in 404 page

---
 docs/overrides/404.html | 64 ++++++++++++++++++++++++++++-------------
 1 file changed, 44 insertions(+), 20 deletions(-)

diff --git a/docs/overrides/404.html b/docs/overrides/404.html
index 68ca7a6de8..6a3bbee7e0 100644
--- a/docs/overrides/404.html
+++ b/docs/overrides/404.html
@@ -1,20 +1,21 @@
 {% extends "base.html" %}
 
 {% block content %}
-  <h1>Page Not Found</h1>
+  <h1>Loading...</h1>
 
-  <p>
-    If you followed a link here, we'd appreciate it if you would open a
-    <a href="https://github.com/mathesar-foundation/mathesar/issues">
-      GitHub issue
-    </a>
-    describing how you got here so we can fix the link.
-  </p>
-
-  <p>
-    You can also ask the Mathesar team for help by reaching out on
-    <a href="https://wiki.mathesar.org/community/matrix/">Matrix</a>.
-  </p>
+  <div class="help-404" style="display:none;">
+    <p>
+      If you followed a link here, we'd appreciate it if you would open a
+      <a href="https://github.com/mathesar-foundation/mathesar/issues">
+        GitHub issue
+      </a>
+      describing how you got here so we can fix the link.
+    </p>
+    <p>
+      You can also ask the Mathesar team for help by reaching out on
+      <a href="https://wiki.mathesar.org/community/matrix/">Matrix</a>.
+    </p>
+  </div>
 {% endblock %}
 
 {% block scripts %}
@@ -33,11 +34,12 @@ <h1>Page Not Found</h1>
      */
     const pathPartsBeforeVersion = [];
     const versionPositionInPath = pathPartsBeforeVersion.length;
-
-    async function handleMissingVersion() {
+    
+    /** @returns {Promise<string | undefined>} */
+    async function getRedirectionTarget() {
       try {
         const response = await fetch('/versions.json');
-        if (!response.ok) return;
+        if (!response.ok) return undefined;
         
         /** @type {({ version: string; title: string; aliases: string[]; })[]} */
         const versionBlobs = await response.json();
@@ -47,9 +49,9 @@ <h1>Page Not Found</h1>
         const pathParts = url.pathname.split('/').filter(Boolean);
         const firstPathPart = pathParts[versionPositionInPath];
 
-        if (versionLikeStrings.includes(firstPathPart)) return;
+        if (versionLikeStrings.includes(firstPathPart)) return undefined;
 
-        window.location.href = [
+        return [
           '',
           ...pathPartsBeforeVersion,
           defaultVersionAlias,
@@ -58,10 +60,32 @@ <h1>Page Not Found</h1>
         ].join('/');
       }
       catch (e) {
-        // Ignore errors
+        return undefined;
+      }
+    }
+
+    function setupErrorPageContent() {
+      const h1 = document.querySelector('h1');
+      if (h1) {
+        h1.textContent = 'Page Not Found';
+      }
+
+      /** @type {HTMLElement | null} */
+      const help404 = document.querySelector('.help-404');
+      if (help404) {
+        help404.style.display = 'block';
+      }
+    }
+
+    async function init() {
+      const redirectionTarget = await getRedirectionTarget();
+      if (redirectionTarget) {
+        window.location.href = redirectionTarget;
+      } else {
+        setupErrorPageContent();
       }
     }
 
-    handleMissingVersion();
+    init();
   </script>
 {% endblock %}
\ No newline at end of file

From 6bf66a308b3efb79952d572d0e4f2748b0dc1183 Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Thu, 10 Oct 2024 01:48:59 +0530
Subject: [PATCH 1098/1141] improvements for build from scrach docs

---
 .../installation/build-from-source/index.md   | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/docs/docs/installation/build-from-source/index.md b/docs/docs/installation/build-from-source/index.md
index e28efe0bf7..2321ebfcf9 100644
--- a/docs/docs/installation/build-from-source/index.md
+++ b/docs/docs/installation/build-from-source/index.md
@@ -23,7 +23,7 @@ You should have **root access** to the machine you're installing Mathesar on.
 
 You'll need to install the following system packages before you install Mathesar:
 
-- [Python](https://www.python.org/downloads/) 3.9, 3.10, or 3.11
+- [Python](https://www.python.org/downloads/) 3.9, 3.10, or 3.11 (along with appropriate [`venv`](https://docs.python.org/3/library/venv.html) module)
 
     !!! note "Python version"
 
@@ -39,6 +39,8 @@ You'll need to install the following system packages before you install Mathesar
 
 - [GNU gettext](https://www.gnu.org/software/gettext/) (Verify with `gettext --version`)
 
+- [unzip](https://packages.debian.org/search?keywords=unzip) A utility tool to de-archive .zip files (Verify with `unzip -v`)
+
 ### Domain (optional)
 
 If you want Mathesar to be accessible over the internet, you'll probably want to set up a domain or sub-domain to use. **If you don't need a domain, you can skip this section.**
@@ -177,23 +179,31 @@ Then press <kbd>Enter</kbd> to customize this guide with your domain name.
             Your `.env` file should look something like this
             
             ```
+            SECRET_KEY='REPLACE_THIS_WITH_YOUR_RANDOMLY_GENERATED_VALUE'
             DOMAIN_NAME='xDOMAIN_NAMEx'
             ALLOWED_HOSTS='xDOMAIN_NAMEx'
-            SECRET_KEY='REPLACE_THIS_WITH_YOUR_RANDOMLY_GENERATED_VALUE' # REPLACE THIS!
             POSTGRES_DB=mathesar_django
             POSTGRES_USER=mathesar
-            POSTGRES_PASSWORD=mathesar1234  # Do not use this password!
+            POSTGRES_PASSWORD=REPLACE_THIS_WITH_APPROPRIATE_PASSWORD_FOR_THE_CHOSEN_POSTGRES_USER
             POSTGRES_HOST=localhost
             POSTGRES_PORT=5432
             ```
 
         !!! tip
-            You can generate a [SECRET_KEY variable](../../configuration/env-variables.md#secret_key) by running:
+            To generate a [`SECRET_KEY`](../../configuration/env-variables.md#secret_key) you can use this [browser-based generator](https://djecrety.ir/) or run this command on MacOS or Linux:
 
             ```
             echo $(cat /dev/urandom | LC_CTYPE=C tr -dc 'a-zA-Z0-9' | head -c 50)
             ```
 
+        !!! tip
+            If you want to host Mathesar on multiple domains/subdomains you can do so by adding multiple comma separated domain names to the following env variables without a whitespace: 
+
+            ```
+            DOMAIN_NAME='xDOMAIN_NAMEx,xDOMAIN_NAMEx.example.org'
+            ALLOWED_HOSTS='xDOMAIN_NAMEx,xDOMAIN_NAMEx.example.org'
+            ```
+
     1. Add the environment variables to the shell
    
         You need to `export` the environment variables listed in the `.env` file to your shell. The easiest way would be to run the below command.
@@ -290,7 +300,7 @@ Then press <kbd>Enter</kbd> to customize this guide with your domain name.
 1. Check the logs to verify if Gunicorn is running without any errors
     
     ```
-    journalctl --priority=notice --unit=gunicorn.service
+    journalctl --unit=gunicorn.service
     ```
 
 ### Set up the Caddy reverse proxy
@@ -307,7 +317,7 @@ Then press <kbd>Enter</kbd> to customize this guide with your domain name.
 2. Add the configuration details to the CaddyFile
 
     ```
-    https://xDOMAIN_NAMEx {
+    $DOMAIN_NAME {
         log {
             output stdout
         }
@@ -385,7 +395,7 @@ Then press <kbd>Enter</kbd> to customize this guide with your domain name.
 1. Check the logs to verify if Caddy is running without any errors
     
     ```
-    journalctl --priority=notice --unit=caddy.service
+    journalctl --unit=caddy.service
     ```
 
 ### Set up your user account

From 101818d467a7fdf63447c0ba32b760eb02d0a174 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Thu, 10 Oct 2024 13:16:48 +0530
Subject: [PATCH 1099/1141] Fix 500s when rpc errors are thrown while rendering
 common data

---
 mathesar/urls.py                     |  12 +--
 mathesar/views.py                    | 149 ++++++++++-----------------
 mathesar_ui/src/stores/schemas.ts    |  13 ++-
 mathesar_ui/src/stores/tables.ts     |  14 ++-
 mathesar_ui/src/utils/preloadData.ts |  17 ++-
 5 files changed, 98 insertions(+), 107 deletions(-)

diff --git a/mathesar/urls.py b/mathesar/urls.py
index c8726b347c..17f821d555 100644
--- a/mathesar/urls.py
+++ b/mathesar/urls.py
@@ -54,18 +54,16 @@
     path('administration/users/', views.admin_home, name='admin_users_home'),
     path('administration/users/<int:user_id>/', views.admin_home, name='admin_users_edit'),
     path('administration/update/', views.admin_home, name='admin_update'),
-    path('shares/tables/<slug>/', views.shared_table, name='shared_table'),
-    path('shares/explorations/<slug>/', views.shared_query, name='shared_query'),
-    path('databases/', views.databases, name='databases'),
+    path('databases/', views.databases_list_route, name='databases_list_route'),
     path('i18n/', include('django.conf.urls.i18n')),
     re_path(
         r'^db/(?P<database_id>\d+)/schemas/(?P<schema_id>\d+)/',
-        views.schemas_home,
-        name='schema_home'
+        views.schema_route,
+        name='schema_route'
     ),
     re_path(
         r'^db/(?P<database_id>\d+)/((schemas|settings)/)?',
-        views.schemas,
-        name='schemas'
+        views.database_route,
+        name='database_route'
     ),
 ]
diff --git a/mathesar/views.py b/mathesar/views.py
index 2a5e4b8f4c..84153c34dc 100644
--- a/mathesar/views.py
+++ b/mathesar/views.py
@@ -1,8 +1,11 @@
+from functools import wraps
+
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.shortcuts import render, redirect
 from modernrpc.views import RPCEntryPoint
+from modernrpc.exceptions import RPCException
 from rest_framework import status
 from rest_framework.decorators import api_view
 from rest_framework.response import Response
@@ -12,15 +15,35 @@
 from mathesar.rpc.schemas import list_ as schemas_list
 from mathesar.rpc.servers.configured import list_ as get_servers_list
 from mathesar.rpc.tables import list_with_metadata as tables_list
-from mathesar.api.serializers.tables import TableSerializer
-from mathesar.api.serializers.queries import QuerySerializer
 from mathesar.api.ui.serializers.users import UserSerializer
-from mathesar.api.utils import is_valid_uuid_v4
-from mathesar.models.shares import SharedTable, SharedQuery
 from mathesar.state import reset_reflection
 from mathesar import __version__
 
 
+def get_database_list(request):
+    return databases_list(request=request)
+
+
+def wrap_data_and_rpc_exceptions(f):
+    @wraps(f)
+    def safe_func(*args, **kwargs):
+        try:
+            return {
+                'state': 'success',
+                'data': f(*args, **kwargs)
+            }
+        except RPCException as exp:
+            return {
+                'state': 'failure',
+                'error': {
+                    'code': exp.code,
+                    'message': exp.message
+                }
+            }
+    return safe_func
+
+
+@wrap_data_and_rpc_exceptions
 def get_schema_list(request, database_id):
     if database_id is not None:
         return schemas_list(request=request, database_id=database_id)
@@ -28,10 +51,7 @@ def get_schema_list(request, database_id):
         return []
 
 
-def get_database_list(request):
-    return databases_list(request=request)
-
-
+@wrap_data_and_rpc_exceptions
 def get_table_list(request, database_id, schema_oid):
     if database_id is not None and schema_oid is not None:
         return tables_list(
@@ -76,74 +96,35 @@ def _get_internal_db_meta():
         return {'type': 'sqlite'}
 
 
-def _get_base_data_all_routes(request, database_id=None, schema_id=None):
+def get_common_data(request, database_id=None, schema_oid=None):
+    databases = get_database_list(request)
+    database_id_int = int(database_id) if database_id else None
+    current_database = next((database for database in databases if database['id'] == database_id_int), None)
+    current_database_id = current_database['id'] if current_database else None
+
+    schemas = get_schema_list(request, current_database_id)
+    schema_oid_int = int(schema_oid) if schema_oid else None
+    schemas_data = schemas['data'] if 'data' in schemas else []
+    current_schema = next((schema for schema in schemas_data if schema['oid'] == schema_oid_int), None)
+    current_schema_oid = current_schema['oid'] if current_schema else None
+
     return {
-        'current_database': int(database_id) if database_id else None,
-        'current_schema': int(schema_id) if schema_id else None,
+        'current_database': current_database_id,
+        'current_schema': current_schema_oid,
         'current_release_tag_name': __version__,
-        'databases': get_database_list(request),
-        'servers': get_servers_list(),
+        'databases': databases,
         'internal_db': _get_internal_db_meta(),
         'is_authenticated': not request.user.is_anonymous,
-        'queries': [],
-        'schemas': get_schema_list(request, database_id),
+        'servers': get_servers_list(),
+        'schemas': schemas,
         'supported_languages': dict(getattr(settings, 'LANGUAGES', [])),
-        'tables': [],
-        'user': get_user_data(request)
-    }
-
-
-def get_common_data(request, database_id=None, schema_id=None):
-    return {
-        **_get_base_data_all_routes(request, database_id, schema_id),
-        'tables': get_table_list(request, database_id, schema_id),
-        'queries': get_queries_list(request, database_id, schema_id),
+        'tables': get_table_list(request, current_database_id, current_schema_oid),
+        'user': get_user_data(request),
+        'queries': get_queries_list(request, current_database_id, current_schema_oid),
         'routing_context': 'normal',
     }
 
 
-def get_common_data_for_shared_entity(request, schema=None):
-    # TODO: Provide only authorized schemas & databases
-    # database = schema.database if schema else None
-    # schemas = [schema] if schema else []
-    # databases = [database] if database else []
-    return {
-        # **_get_base_data_all_routes(request, database, schema),
-        # 'schemas': serialized_schemas,
-        # 'databases': serialized_databases,
-        **_get_base_data_all_routes(request),
-        'routing_context': 'anonymous',
-    }
-
-
-def get_common_data_for_shared_table(request, table):
-    tables = [table] if table else []
-    serialized_tables = TableSerializer(
-        tables,
-        many=True,
-        context={'request': request}
-    ).data
-    schema = table.schema if table else None
-    return {
-        **get_common_data_for_shared_entity(request, schema),
-        'tables': serialized_tables,
-    }
-
-
-def get_common_data_for_shared_query(request, query):
-    queries = [query] if query else []
-    serialized_queries = QuerySerializer(
-        queries,
-        many=True,
-        context={'request': request}
-    ).data
-    schema = query.base_table.schema if query else None
-    return {
-        **get_common_data_for_shared_entity(request, schema),
-        'queries': serialized_queries,
-    }
-
-
 class MathesarRPCEntryPoint(LoginRequiredMixin, RPCEntryPoint):
     pass
 
@@ -160,10 +141,10 @@ def home(request):
     database_list = get_database_list(request)
     number_of_databases = len(database_list)
     if number_of_databases > 1:
-        return redirect('databases')
+        return redirect('databases_list_route')
     elif number_of_databases == 1:
         db = database_list[0]
-        return redirect('schemas', database_id=db['id'])
+        return redirect('database_route', database_id=db['id'])
     else:
         return render(request, 'mathesar/index.html', {
             'common_data': get_common_data(request)
@@ -171,7 +152,7 @@ def home(request):
 
 
 @login_required
-def databases(request):
+def databases_list_route(request):
     return render(request, 'mathesar/index.html', {
         'common_data': get_common_data(request)
     })
@@ -192,43 +173,19 @@ def admin_home(request, **kwargs):
 
 
 @login_required
-def schemas(request, database_id, **kwargs):
+def database_route(request, database_id, **kwargs):
     return render(request, 'mathesar/index.html', {
         'common_data': get_common_data(request, database_id, None)
     })
 
 
 @login_required
-def schemas_home(request, database_id, schema_id, **kwargs):
+def schema_route(request, database_id, schema_id, **kwargs):
     return render(request, 'mathesar/index.html', {
         'common_data': get_common_data(request, database_id, schema_id)
     })
 
 
-def shared_table(request, slug):
-    shared_table_link = SharedTable.get_by_slug(slug) if is_valid_uuid_v4(slug) else None
-    table = shared_table_link.table if shared_table_link else None
-
-    return render(request, 'mathesar/index.html', {
-        'common_data': get_common_data_for_shared_table(request, table),
-        'route_specific_data': {
-            'shared_table': {'table_id': table.id if table else None}
-        }
-    })
-
-
-def shared_query(request, slug):
-    shared_query_link = SharedQuery.get_by_slug(slug) if is_valid_uuid_v4(slug) else None
-    query = shared_query_link.query if shared_query_link else None
-
-    return render(request, 'mathesar/index.html', {
-        'common_data': get_common_data_for_shared_query(request, query),
-        'route_specific_data': {
-            'shared_query': {'query_id': query.id if query else None}
-        }
-    })
-
-
 def page_not_found_view(request, exception):
     return render(request, 'mathesar/index.html', {
         'common_data': get_common_data(request),
diff --git a/mathesar_ui/src/stores/schemas.ts b/mathesar_ui/src/stores/schemas.ts
index 493ff7e5da..a3a231a1c9 100644
--- a/mathesar_ui/src/stores/schemas.ts
+++ b/mathesar_ui/src/stores/schemas.ts
@@ -152,7 +152,18 @@ export const schemas = collapse(
     const $schemasStore = get(schemasStore);
     if ($schemasStore.databaseId !== $currentDatabase?.id) {
       if (preload && commonData.current_database === $currentDatabase?.id) {
-        setSchemasInStore($currentDatabase, commonData.schemas);
+        if (commonData.schemas.state === 'success') {
+          setSchemasInStore($currentDatabase, commonData.schemas.data);
+        } else {
+          schemasStore.set({
+            databaseId: $currentDatabase.id,
+            requestStatus: {
+              state: 'failure',
+              errors: [getErrorMessage(commonData.schemas.error)],
+            },
+            data: new Map(),
+          });
+        }
       } else {
         void fetchSchemasForCurrentDatabase();
       }
diff --git a/mathesar_ui/src/stores/tables.ts b/mathesar_ui/src/stores/tables.ts
index d6022cd06e..3b7104340f 100644
--- a/mathesar_ui/src/stores/tables.ts
+++ b/mathesar_ui/src/stores/tables.ts
@@ -395,7 +395,19 @@ export const currentTablesData = collapse(
         commonData.current_schema === $currentSchema?.oid &&
         commonData.current_database === $currentSchema?.database.id
       ) {
-        setTablesStore($currentSchema, commonData.tables);
+        if (commonData.tables.state === 'success') {
+          setTablesStore($currentSchema, commonData.tables.data);
+        } else {
+          tablesStore.set({
+            databaseId: $currentSchema.database.id,
+            schemaOid: $currentSchema.oid,
+            tablesMap: new Map(),
+            requestStatus: {
+              state: 'failure',
+              errors: [getErrorMessage(commonData.tables.error)],
+            },
+          });
+        }
       } else {
         void fetchTablesForCurrentSchema();
       }
diff --git a/mathesar_ui/src/utils/preloadData.ts b/mathesar_ui/src/utils/preloadData.ts
index c44f0d00c1..f80c22a766 100644
--- a/mathesar_ui/src/utils/preloadData.ts
+++ b/mathesar_ui/src/utils/preloadData.ts
@@ -5,11 +5,24 @@ import type { RawSchema } from '@mathesar/api/rpc/schemas';
 import type { RawServer } from '@mathesar/api/rpc/servers';
 import type { RawTableWithMetadata } from '@mathesar/api/rpc/tables';
 
+type WithStatus<D> =
+  | {
+      state: 'success';
+      data: D;
+    }
+  | {
+      state: 'failure';
+      error: {
+        code: number;
+        message: string;
+      };
+    };
+
 export interface CommonData {
   databases: RawDatabase[];
   servers: RawServer[];
-  schemas: RawSchema[];
-  tables: RawTableWithMetadata[];
+  schemas: WithStatus<RawSchema[]>;
+  tables: WithStatus<RawTableWithMetadata[]>;
   queries: SavedExploration[];
   current_database: RawDatabase['id'] | null;
   internal_db: {

From ce219abe6cc4d51cae0018b83c441403d22abaaa Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 10 Oct 2024 15:19:45 +0200
Subject: [PATCH 1100/1141] add release notes

---
 docs/docs/releases/0.2.0-testing.1.md | 173 ++++++++++++++++++++++++++
 1 file changed, 173 insertions(+)
 create mode 100644 docs/docs/releases/0.2.0-testing.1.md

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
new file mode 100644
index 0000000000..68b38d2f42
--- /dev/null
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -0,0 +1,173 @@
+# Mathesar 0.2.0-testing.1
+
+## Summary
+
+Mathesar 0.2.0-testing.1 introduces two major changes: a new permissions system and a significant transition from REST to RPC for most of the API. This testing release also includes some performance optimizations and bug fixes.
+
+This release is intended for evaluation and feedback, particularly on the new features. Users should note that this version may contain unstable elements and is not recommended for production use.
+
+_This page provides a comprehensive list of all changes in the release._
+
+## Upgrading to 0.2.0-testing.1
+
+See our guide on [upgrading Mathesar to 0.2.0-testing.1](../administration/upgrade/0.2.0-testing.1.md).
+
+## Breaking changes
+
+### RPC API
+
+The API has been largely transitioned from REST to RPC, with the exception of the `/users/` and `/data-files/` endpoints which remain REST-based.
+
+- First Steps of RPC Implementation for Table Page _[#3704](https://github.com/mathesar-foundation/mathesar/pull/3704 "First Steps of RPC Implementation for Table Page")_
+- Implement Tables List and Delete RPC APIs _[#3651](https://github.com/mathesar-foundation/mathesar/pull/3651 "Implement Tables List and Delete RPC APIs")_
+- Connections RPC Front End _[#3543](https://github.com/mathesar-foundation/mathesar/pull/3543 "Connections RPC Front End")_
+- Add `records.list` RPC Function _[#3691](https://github.com/mathesar-foundation/mathesar/pull/3691 "Add `records.list` RPC Function")_
+- Constraints RPC Transition _[#3664](https://github.com/mathesar-foundation/mathesar/pull/3664 "Constraints RPC Transition")_
+- Enabling Running of Very Simple Explorations _[#3855](https://github.com/mathesar-foundation/mathesar/pull/3855 "Enabling Running of Very Simple Explorations")_
+- Move Columns SQL _[#3809](https://github.com/mathesar-foundation/mathesar/pull/3809 "Move Columns SQL")_
+- Add Simplified Record Summaries _[#3761](https://github.com/mathesar-foundation/mathesar/pull/3761 "Add Simplified Record Summaries")_
+- Records Grouping _[#3721](https://github.com/mathesar-foundation/mathesar/pull/3721 "Records Grouping")_
+- RPC Records List Filtering _[#3700](https://github.com/mathesar-foundation/mathesar/pull/3700 "RPC Records List Filtering")_
+- Add `records.search` RPC Function _[#3708](https://github.com/mathesar-foundation/mathesar/pull/3708 "Add `records.search` RPC Function")_
+- Reorganize Namespacing _[#3799](https://github.com/mathesar-foundation/mathesar/pull/3799 "Reorganize Namespacing")_
+- Get Imports Working Again _[#3819](https://github.com/mathesar-foundation/mathesar/pull/3819 "Get Imports Working Again")_
+- Merge Breaking Changes into Develop _[#3695](https://github.com/mathesar-foundation/mathesar/pull/3695 "Merge Breaking Changes into Develop")_
+- Add `columns.metadata.list` RPC Function _[#3641](https://github.com/mathesar-foundation/mathesar/pull/3641 "Add `columns.metadata.list` RPC Function")_
+- Add Link-Adding RPC Functions _[#3767](https://github.com/mathesar-foundation/mathesar/pull/3767 "Add Link-Adding RPC Functions")_
+- Implement `tables.metadata` `list` & `patch` RPC Endpoint _[#3646](https://github.com/mathesar-foundation/mathesar/pull/3646 "Implement `tables.metadata` `list` & `patch` RPC Endpoint")_
+- Add Summaries to Self _[#3808](https://github.com/mathesar-foundation/mathesar/pull/3808 "Add Summaries to Self")_
+- Implement `roles.add` RPC Endpoint _[#3769](https://github.com/mathesar-foundation/mathesar/pull/3769 "Implement `roles.add` RPC Endpoint")_
+- RPC Transition for Explorations `list` and `delete` _[#3694](https://github.com/mathesar-foundation/mathesar/pull/3694 "RPC Transition for Explorations `list` and `delete`")_
+- Add `records.delete` RPC Function _[#3741](https://github.com/mathesar-foundation/mathesar/pull/3741 "Add `records.delete` RPC Function")_
+- Add `records.add` RPC Function _[#3745](https://github.com/mathesar-foundation/mathesar/pull/3745 "Add `records.add` RPC Function")_
+- Implement `table.import` RPC Endpoint _[#3623](https://github.com/mathesar-foundation/mathesar/pull/3623 "Implement `table.import` RPC Endpoint")_
+- Implement `explorations.run` RPC Endpoint _[#3696](https://github.com/mathesar-foundation/mathesar/pull/3696 "Implement `explorations.run` RPC Endpoint")_
+- Add `columns.patch` RPC Function _[#3615](https://github.com/mathesar-foundation/mathesar/pull/3615 "Add `columns.patch` RPC Function")_
+- Handle New Records Filtering on the Front End _[#3728](https://github.com/mathesar-foundation/mathesar/pull/3728 "Handle New Records Filtering on the Front End")_
+- Get Explorations CRUD Working Again _[#3893](https://github.com/mathesar-foundation/mathesar/pull/3893 "Get Explorations CRUD Working Again")_
+- Implement RPC Endpoint for Listing Roles in Server _[#3663](https://github.com/mathesar-foundation/mathesar/pull/3663 "Implement RPC Endpoint for Listing Roles in Server")_
+- Add `records.patch` RPC Function _[#3749](https://github.com/mathesar-foundation/mathesar/pull/3749 "Add `records.patch` RPC Function")_
+- Implement `roles.delete`, `databases.drop` & `databases.configured.disconnect` Endpoints _[#3858](https://github.com/mathesar-foundation/mathesar/pull/3858 "Implement `roles.delete`, `databases.drop` & `databases.configured.disconnect` Endpoints")_
+- Implement `schemas.add` RPC Method _[#3620](https://github.com/mathesar-foundation/mathesar/pull/3620 "Implement `schemas.add` RPC Method")_
+- Add `records.get` RPC Function _[#3740](https://github.com/mathesar-foundation/mathesar/pull/3740 "Add `records.get` RPC Function")_
+- Use RPC API for Column Metadata _[#3845](https://github.com/mathesar-foundation/mathesar/pull/3845 "Use RPC API for Column Metadata")_
+- Implement `tables.patch` RPC Endpoint _[#3618](https://github.com/mathesar-foundation/mathesar/pull/3618 "Implement `tables.patch` RPC Endpoint")_
+- RPC Endpoint for Column Info with Metadata _[#3703](https://github.com/mathesar-foundation/mathesar/pull/3703 "RPC Endpoint for Column Info with Metadata")_
+- Adapt Front End to New RPC-Based Joinable Tables API _[#3746](https://github.com/mathesar-foundation/mathesar/pull/3746 "Adapt Front End to New RPC-Based Joinable Tables API")_
+- Implement RPC Records CRUD Operations on Front End _[#3759](https://github.com/mathesar-foundation/mathesar/pull/3759 "Implement RPC Records CRUD Operations on Front End")_
+- Columns Meta RPC Patch _[#3653](https://github.com/mathesar-foundation/mathesar/pull/3653 "Columns Meta RPC Patch")_
+- Implement `schemas.patch` RPC Method _[#3628](https://github.com/mathesar-foundation/mathesar/pull/3628 "Implement `schemas.patch` RPC Method")_
+- Records Grouping Bugfix _[#3751](https://github.com/mathesar-foundation/mathesar/pull/3751 "Records Grouping Bugfix")_
+- Hard-Code Abstract Types Response in Client _[#3800](https://github.com/mathesar-foundation/mathesar/pull/3800 "Hard-Code Abstract Types Response in Client")_
+- Implement `schemas.delete` RPC Method _[#3610](https://github.com/mathesar-foundation/mathesar/pull/3610 "Implement `schemas.delete` RPC Method")_
+- Implement `tables.get` RPC Endpoint _[#3612](https://github.com/mathesar-foundation/mathesar/pull/3612 "Implement `tables.get` RPC Endpoint")_
+- Improve Tables Metadata _[#3672](https://github.com/mathesar-foundation/mathesar/pull/3672 "Improve Tables Metadata")_
+- Propagate RPC Changes to Link Table Dialog _[#3847](https://github.com/mathesar-foundation/mathesar/pull/3847 "Propagate RPC Changes to Link Table Dialog")_
+- Implement Explorations `add` & `replace` Endpoint _[#3731](https://github.com/mathesar-foundation/mathesar/pull/3731 "Implement Explorations `add` & `replace` Endpoint")_
+- Wire RPC Functions to New Models _[#3632](https://github.com/mathesar-foundation/mathesar/pull/3632 "Wire RPC Functions to New Models")_
+- Auto Generate Table Name _[#3637](https://github.com/mathesar-foundation/mathesar/pull/3637 "Auto Generate Table Name")_
+- RPC Implementation for `types.list` _[#3676](https://github.com/mathesar-foundation/mathesar/pull/3676 "RPC Implementation for `types.list`")_
+- Alter Response for Schemas `add` and `patch` Endpoints & Implement `schemas.get` _[#3837](https://github.com/mathesar-foundation/mathesar/pull/3837 "Alter Response for Schemas `add` and `patch` Endpoints & Implement `schemas.get`")_
+- Alter Column Metadata Fields _[#3717](https://github.com/mathesar-foundation/mathesar/pull/3717 "Alter Column Metadata Fields")_
+- Change Response Structure for Record Summary _[#3802](https://github.com/mathesar-foundation/mathesar/pull/3802 "Change Response Structure for Record Summary")_
+- Change Response for `tables.add` and `tables.import` _[#3807](https://github.com/mathesar-foundation/mathesar/pull/3807 "Change Response for `tables.add` and `tables.import`")_
+- Get "Extract Columns" and "Move Columns" Functionality Working Again _[#3856](https://github.com/mathesar-foundation/mathesar/pull/3856 "Get 'Extract Columns' and 'Move Columns' Functionality Working Again")_
+- Propagate RPC Changes to Record Selector _[#3843](https://github.com/mathesar-foundation/mathesar/pull/3843 "Propagate RPC Changes to Record Selector")_
+- Exception Handler Tests _[#3547](https://github.com/mathesar-foundation/mathesar/pull/3547 "Exception Handler Tests")_
+- Adapt Front End to New Records Grouping API _[#3755](https://github.com/mathesar-foundation/mathesar/pull/3755 "Adapt Front End to New Records Grouping API")_
+- Cast OIDs to Bigint Before Putting in JSON _[#3666](https://github.com/mathesar-foundation/mathesar/pull/3666 "Cast OIDs to Bigint Before Putting in JSON")_
+- Records Delete Bugfix _[#3754](https://github.com/mathesar-foundation/mathesar/pull/3754 "Records Delete Bugfix")_
+- A Couple Small Front End RPC Changes _[#3825](https://github.com/mathesar-foundation/mathesar/pull/3825 "A Couple Small Front End RPC Changes")_
+- Make `records.get` Work with Stringified PK Values _[#3853](https://github.com/mathesar-foundation/mathesar/pull/3853 "Make `records.get` Work with Stringified PK Values")_
+- Use Data File Name as Table Name During Import _[#3824](https://github.com/mathesar-foundation/mathesar/pull/3824 "Use Data File Name as Table Name During Import")_
+- Allow Patching Records via String PKs _[#3857](https://github.com/mathesar-foundation/mathesar/pull/3857 "Allow Patching Records via String PKs")_
+- Fix Broken Exploration "Column Added" Indicators _[#3894](https://github.com/mathesar-foundation/mathesar/pull/3894 "Fix Broken Exploration 'Column Added' Indicators")_
+- Resolve Merge Conflict for #3558 _[#3559](https://github.com/mathesar-foundation/mathesar/pull/3559 "Resolve Merge Conflict for #3558")_
+- Bugfix Summarizations _[#3884](https://github.com/mathesar-foundation/mathesar/pull/3884 "Bugfix Summarizations")_
+- Fix Edge Case While Getting Joinable Tables for Tables with No Links _[#3748](https://github.com/mathesar-foundation/mathesar/pull/3748 "Fix Edge Case While Getting Joinable Tables for Tables with No Links")_
+- Fix SQL Syntax Highlighting in VS Code for SQL Tests _[#3588](https://github.com/mathesar-foundation/mathesar/pull/3588 "Fix SQL Syntax Highlighting in VS Code for SQL Tests")_
+- Remove Dead Front End API Client Code to GET One Schema _[#3589](https://github.com/mathesar-foundation/mathesar/pull/3589 "Remove Dead Front End API Client Code to GET One Schema")_
+- Revert #3559 _[#3567](https://github.com/mathesar-foundation/mathesar/pull/3567 "Revert #3559")_
+- Remove Debian Build _[#3546](https://github.com/mathesar-foundation/mathesar/pull/3546 "Remove Debian Build")_
+- Remove API Documentation Infrastructure _[#3541](https://github.com/mathesar-foundation/mathesar/pull/3541 "Remove API Documentation Infrastructure")_
+- Remove E2E Infrastructure _[#3551](https://github.com/mathesar-foundation/mathesar/pull/3551 "Remove E2E Infrastructure")_
+- Implement `tables.delete` RPC Endpoint _[#3608](https://github.com/mathesar-foundation/mathesar/pull/3608 "Implement `tables.delete` RPC Endpoint")_
+- Implement `tables.add` RPC Endpoint _[#3614](https://github.com/mathesar-foundation/mathesar/pull/3614 "Implement `tables.add` RPC Endpoint")_
+- Add `columns.add` RPC Function _[#3616](https://github.com/mathesar-foundation/mathesar/pull/3616 "Add `columns.add` RPC Function")_
+- Fix Issues with `tables.patch` RPC Method _[#3699](https://github.com/mathesar-foundation/mathesar/pull/3699 "Fix Issues with `tables.patch` RPC Method")_
+- Propagate RPC Record Summary Changes to Front End _[#3811](https://github.com/mathesar-foundation/mathesar/pull/3811 "Propagate RPC Record Summary Changes to Front End")_
+- Bugfix Listing Records from a Table with Self-Referential FK _[#3831](https://github.com/mathesar-foundation/mathesar/pull/3831 "Bugfix Listing Records from a Table with Self-Referential FK")_
+- Fix Insert for Table with Only ID Column _[#3885](https://github.com/mathesar-foundation/mathesar/pull/3885 "Fix Insert for Table with Only ID Column")_
+
+## Improvements
+
+### Permissions system
+
+The new permissions system introduces comprehensive access control features, including role configurations, ownership transfers, and granular permission management for databases, schemas, and tables.
+
+- Database Page Role Configuration, Collaborators, Roles _[#3762](https://github.com/mathesar-foundation/mathesar/pull/3762 "Database Page Role Configuration, Collaborators, Roles")_
+- Initial Permissions Remodel _[#3626](https://github.com/mathesar-foundation/mathesar/pull/3626 "Initial Permissions Remodel")_
+- Database Permissions Modal 'Share' Tab _[#3810](https://github.com/mathesar-foundation/mathesar/pull/3810 "Database Permissions Modal 'Share' Tab")_
+- Implement 'Transfer Ownership' Tabs _[#3859](https://github.com/mathesar-foundation/mathesar/pull/3859 "Implement 'Transfer Ownership' Tabs")_
+- Permission Checks in All Pages, Disconnect Database Option _[#3861](https://github.com/mathesar-foundation/mathesar/pull/3861 "Permission Checks in All Pages, Disconnect Database Option")_
+- Implement Permissions Modal for Schemas and Tables _[#3836](https://github.com/mathesar-foundation/mathesar/pull/3836 "Implement Permissions Modal for Schemas and Tables")_, _[#3838](https://github.com/mathesar-foundation/mathesar/pull/3838 "Implement Permissions Modal for Schemas and Tables")_
+- Homepage Changes for Database Connections _[#3710](https://github.com/mathesar-foundation/mathesar/pull/3710 "Homepage Changes for Database Connections")_
+- Add Privilege Information Fields _[#3795](https://github.com/mathesar-foundation/mathesar/pull/3795 "Add Privilege Information Fields")_
+- Allow Setting Owner at Creation _[#3840](https://github.com/mathesar-foundation/mathesar/pull/3840 "Allow Setting Owner at Creation")_
+- Fix Quoting for Role Grant/Revoke Expressions _[#3931](https://github.com/mathesar-foundation/mathesar/pull/3931 "Fix Quoting for Role Grant/Revoke Expressions")_
+- Filter Databases for Admin and Standard Users _[#3895](https://github.com/mathesar-foundation/mathesar/pull/3895 "Filter Databases for Admin and Standard Users")_
+- Move db page contexts to the route level _[#3789](https://github.com/mathesar-foundation/mathesar/pull/3789 "Move db page contexts to the route level")_
+- Endpoints for Servers, Collaborators _[#3684](https://github.com/mathesar-foundation/mathesar/pull/3684 "Endpoints for Servers, Collaborators")_
+- Endpoints for Configured Roles _[#3685](https://github.com/mathesar-foundation/mathesar/pull/3685 "Endpoints for Configured Roles")_
+- Remove Existing Permissions Logic on the Frontend _[#3689](https://github.com/mathesar-foundation/mathesar/pull/3689 "Remove Existing Permissions Logic on the Frontend")_
+- Homepage UI _[#3711](https://github.com/mathesar-foundation/mathesar/pull/3711 "Homepage UI")_
+
+### Performance optimizations
+
+These changes improve Mathesar's performance by speeding up installation and optimizing cell selection.
+
+- Fast Install _[#3917](https://github.com/mathesar-foundation/mathesar/pull/3917 "Fast Install")_
+- Refactor CellSelection Data Structure and Store _[#3037](https://github.com/mathesar-foundation/mathesar/pull/3037 "Refactor CellSelection Data Structure and Store")_
+- Handle Negative Numbers in TSV Serialization for Copy _[#3582](https://github.com/mathesar-foundation/mathesar/pull/3582 "Handle Negative Numbers in TSV Serialization for Copy")_
+
+### UI improvements
+
+- UI Consistency Improvements _[#3860](https://github.com/mathesar-foundation/mathesar/pull/3860 "UI Consistency Improvements")_
+- Show a Loading Spinner for Table Pages _[#3602](https://github.com/mathesar-foundation/mathesar/pull/3602 "Show a Loading Spinner for Table Pages")_
+
+## Groundwork
+
+- Hard-Code Type Cast Map on Front End _[#3832](https://github.com/mathesar-foundation/mathesar/pull/3832 "Hard-Code Type Cast Map on Front End")_
+
+## Bug fixes
+
+- Reduces Frontend Caching, Fixes a Few Bugs _[#3897](https://github.com/mathesar-foundation/mathesar/pull/3897 "Reduces Frontend Caching, Fixes a Few Bugs")_
+- Fix Install Script _[#3678](https://github.com/mathesar-foundation/mathesar/pull/3678 "Fix Install Script")_
+- Fix "No Current Database" Error _[#3723](https://github.com/mathesar-foundation/mathesar/pull/3723 "Fix 'No Current Database' Error")_
+- Allow Unsetting Schema Comment Using NULL _[#3649](https://github.com/mathesar-foundation/mathesar/pull/3649 "Allow Unsetting Schema Comment Using NULL")_
+- Fix Updating of Table Name _[#3879](https://github.com/mathesar-foundation/mathesar/pull/3879 "Fix Updating of Table Name")_
+- Alter Response for Record Summaries with Null Records _[#3852](https://github.com/mathesar-foundation/mathesar/pull/3852 "Alter Response for Record Summaries with Null Records")_
+- Fix bug when updating table twice _[#3909](https://github.com/mathesar-foundation/mathesar/pull/3909 "Fix bug when updating table twice")_
+- Fix quoting refactor for role grant/revoke expressions _[#3931](https://github.com/mathesar-foundation/mathesar/pull/3931 "Fix quoting refactor for role grant/revoke expressions")_
+- Fix Change Password Error _[#3536](https://github.com/mathesar-foundation/mathesar/pull/3536 "Fix Change Password Error")_
+- Modify Pkey Finder to Return False When No Pkey Exists _[#3804](https://github.com/mathesar-foundation/mathesar/pull/3804 "Modify Pkey Finder to Return False When No Pkey Exists")_
+- Return Empty Array When Schema Has No Tables _[#3702](https://github.com/mathesar-foundation/mathesar/pull/3702 "Return Empty Array When Schema Has No Tables")_
+
+## Documentation
+
+- Update Docs to Add Instructions for Loading Data from Playground _[#3535](https://github.com/mathesar-foundation/mathesar/pull/3535 "Update Docs to Add Instructions for Loading Data from Playground")_
+
+## Maintenance
+
+- Architectural Overhaul _[#3587](https://github.com/mathesar-foundation/mathesar/pull/3587 "Architectural Overhaul")_
+- Quoting Refactor _[#3633](https://github.com/mathesar-foundation/mathesar/pull/3633 "Quoting Refactor")_
+- Remove Demo Code and E2E Infrastructure _[#3538](https://github.com/mathesar-foundation/mathesar/pull/3538 "Remove Demo Code and E2E Infrastructure")_, _[#3551](https://github.com/mathesar-foundation/mathesar/pull/3551 "Remove E2E Infrastructure")_
+- Add GitHub Workflow to Reset Demo _[#3577](https://github.com/mathesar-foundation/mathesar/pull/3577 "Add GitHub Workflow to Reset Demo")_
+- Update MkDocs Dependencies _[#3763](https://github.com/mathesar-foundation/mathesar/pull/3763 "Update MkDocs Dependencies")_
+- Sort Frontend Imports _[#3552](https://github.com/mathesar-foundation/mathesar/pull/3552 "Sort Frontend Imports")_
+- Bump Dependencies _[#3544](https://github.com/mathesar-foundation/mathesar/pull/3544 "Bump Dependencies")_, _[#3604](https://github.com/mathesar-foundation/mathesar/pull/3604 "Bump Dependencies")_
+- Updates to GH Workflow for Resetting Demo _[#3579](https://github.com/mathesar-foundation/mathesar/pull/3579 "Updates to GH Workflow for Resetting Demo")_
+- Updates to GH Workflow to Reset Demo _[#3580](https://github.com/mathesar-foundation/mathesar/pull/3580 "Updates to GH Workflow to Reset Demo")_
+- Remove the Demo Reset Workflow _[#3581](https://github.com.mathesar-foundation/mathesar/pull/3581 "Remove the Demo Reset Workflow")_
+- Add SQL Code Standard for Casting OIDs to Bigint _[#3643](https://github.com/mathesar-foundation/mathesar/pull/3643 "Add SQL Code Standard for Casting OIDs to Bigint")_
+- Drop Old SQL Function Signature _[#3650](https://github.com/mathesar-foundation/mathesar/pull/3650 "Drop Old SQL Function Signature")_

From dfc364e6d52ca832c85943ef1262a1f8fb86ef08 Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 10 Oct 2024 22:39:03 +0200
Subject: [PATCH 1101/1141] add upgrade instructions placeholder

---
 docs/docs/administration/upgrade/0.2.0-testing.1.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docs/docs/administration/upgrade/0.2.0-testing.1.md

diff --git a/docs/docs/administration/upgrade/0.2.0-testing.1.md b/docs/docs/administration/upgrade/0.2.0-testing.1.md
new file mode 100644
index 0000000000..125b4c5134
--- /dev/null
+++ b/docs/docs/administration/upgrade/0.2.0-testing.1.md
@@ -0,0 +1 @@
+# Upgrade Mathesar to 0.2.0-testing.1

From 4d646d92f4d2781420698dafd22fc6b9b41018cd Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Thu, 10 Oct 2024 22:45:25 +0200
Subject: [PATCH 1102/1141] sort PRs by number

---
 docs/docs/releases/0.2.0-testing.1.md | 174 +++++++++++++-------------
 1 file changed, 87 insertions(+), 87 deletions(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index 68b38d2f42..98a9f5d788 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -18,86 +18,86 @@ See our guide on [upgrading Mathesar to 0.2.0-testing.1](../administration/upgra
 
 The API has been largely transitioned from REST to RPC, with the exception of the `/users/` and `/data-files/` endpoints which remain REST-based.
 
-- First Steps of RPC Implementation for Table Page _[#3704](https://github.com/mathesar-foundation/mathesar/pull/3704 "First Steps of RPC Implementation for Table Page")_
-- Implement Tables List and Delete RPC APIs _[#3651](https://github.com/mathesar-foundation/mathesar/pull/3651 "Implement Tables List and Delete RPC APIs")_
+- Remove API Documentation Infrastructure _[#3541](https://github.com/mathesar-foundation/mathesar/pull/3541 "Remove API Documentation Infrastructure")_
 - Connections RPC Front End _[#3543](https://github.com/mathesar-foundation/mathesar/pull/3543 "Connections RPC Front End")_
-- Add `records.list` RPC Function _[#3691](https://github.com/mathesar-foundation/mathesar/pull/3691 "Add `records.list` RPC Function")_
-- Constraints RPC Transition _[#3664](https://github.com/mathesar-foundation/mathesar/pull/3664 "Constraints RPC Transition")_
-- Enabling Running of Very Simple Explorations _[#3855](https://github.com/mathesar-foundation/mathesar/pull/3855 "Enabling Running of Very Simple Explorations")_
-- Move Columns SQL _[#3809](https://github.com/mathesar-foundation/mathesar/pull/3809 "Move Columns SQL")_
-- Add Simplified Record Summaries _[#3761](https://github.com/mathesar-foundation/mathesar/pull/3761 "Add Simplified Record Summaries")_
-- Records Grouping _[#3721](https://github.com/mathesar-foundation/mathesar/pull/3721 "Records Grouping")_
-- RPC Records List Filtering _[#3700](https://github.com/mathesar-foundation/mathesar/pull/3700 "RPC Records List Filtering")_
-- Add `records.search` RPC Function _[#3708](https://github.com/mathesar-foundation/mathesar/pull/3708 "Add `records.search` RPC Function")_
-- Reorganize Namespacing _[#3799](https://github.com/mathesar-foundation/mathesar/pull/3799 "Reorganize Namespacing")_
-- Get Imports Working Again _[#3819](https://github.com/mathesar-foundation/mathesar/pull/3819 "Get Imports Working Again")_
-- Merge Breaking Changes into Develop _[#3695](https://github.com/mathesar-foundation/mathesar/pull/3695 "Merge Breaking Changes into Develop")_
+- Remove Debian Build _[#3546](https://github.com/mathesar-foundation/mathesar/pull/3546 "Remove Debian Build")_
+- Exception Handler Tests _[#3547](https://github.com/mathesar-foundation/mathesar/pull/3547 "Exception Handler Tests")_
+- Remove E2E Infrastructure _[#3551](https://github.com/mathesar-foundation/mathesar/pull/3551 "Remove E2E Infrastructure")_
+- Resolve Merge Conflict for #3558 _[#3559](https://github.com/mathesar-foundation/mathesar/pull/3559 "Resolve Merge Conflict for #3558")_
+- Revert #3559 _[#3567](https://github.com/mathesar-foundation/mathesar/pull/3567 "Revert #3559")_
+- Fix SQL Syntax Highlighting in VS Code for SQL Tests _[#3588](https://github.com/mathesar-foundation/mathesar/pull/3588 "Fix SQL Syntax Highlighting in VS Code for SQL Tests")_
+- Remove Dead Front End API Client Code to GET One Schema _[#3589](https://github.com/mathesar-foundation/mathesar/pull/3589 "Remove Dead Front End API Client Code to GET One Schema")_
+- Implement `tables.delete` RPC Endpoint _[#3608](https://github.com/mathesar-foundation/mathesar/pull/3608 "Implement `tables.delete` RPC Endpoint")_
+- Implement `schemas.delete` RPC Method _[#3610](https://github.com/mathesar-foundation/mathesar/pull/3610 "Implement `schemas.delete` RPC Method")_
+- Implement `tables.get` RPC Endpoint _[#3612](https://github.com/mathesar-foundation/mathesar/pull/3612 "Implement `tables.get` RPC Endpoint")_
+- Implement `tables.add` RPC Endpoint _[#3614](https://github.com/mathesar-foundation/mathesar/pull/3614 "Implement `tables.add` RPC Endpoint")_
+- Add `columns.patch` RPC Function _[#3615](https://github.com/mathesar-foundation/mathesar/pull/3615 "Add `columns.patch` RPC Function")_
+- Add `columns.add` RPC Function _[#3616](https://github.com/mathesar-foundation/mathesar/pull/3616 "Add `columns.add` RPC Function")_
+- Implement `tables.patch` RPC Endpoint _[#3618](https://github.com/mathesar-foundation/mathesar/pull/3618 "Implement `tables.patch` RPC Endpoint")_
+- Implement `schemas.add` RPC Method _[#3620](https://github.com/mathesar-foundation/mathesar/pull/3620 "Implement `schemas.add` RPC Method")_
+- Implement `table.import` RPC Endpoint _[#3623](https://github.com/mathesar-foundation/mathesar/pull/3623 "Implement `table.import` RPC Endpoint")_
+- Implement `schemas.patch` RPC Method _[#3628](https://github.com/mathesar-foundation/mathesar/pull/3628 "Implement `schemas.patch` RPC Method")_
+- Wire RPC Functions to New Models _[#3632](https://github.com/mathesar-foundation/mathesar/pull/3632 "Wire RPC Functions to New Models")_
+- Auto Generate Table Name _[#3637](https://github.com/mathesar-foundation/mathesar/pull/3637 "Auto Generate Table Name")_
 - Add `columns.metadata.list` RPC Function _[#3641](https://github.com/mathesar-foundation/mathesar/pull/3641 "Add `columns.metadata.list` RPC Function")_
-- Add Link-Adding RPC Functions _[#3767](https://github.com/mathesar-foundation/mathesar/pull/3767 "Add Link-Adding RPC Functions")_
 - Implement `tables.metadata` `list` & `patch` RPC Endpoint _[#3646](https://github.com/mathesar-foundation/mathesar/pull/3646 "Implement `tables.metadata` `list` & `patch` RPC Endpoint")_
-- Add Summaries to Self _[#3808](https://github.com/mathesar-foundation/mathesar/pull/3808 "Add Summaries to Self")_
-- Implement `roles.add` RPC Endpoint _[#3769](https://github.com/mathesar-foundation/mathesar/pull/3769 "Implement `roles.add` RPC Endpoint")_
+- Implement Tables List and Delete RPC APIs _[#3651](https://github.com/mathesar-foundation/mathesar/pull/3651 "Implement Tables List and Delete RPC APIs")_
+- Columns Meta RPC Patch _[#3653](https://github.com/mathesar-foundation/mathesar/pull/3653 "Columns Meta RPC Patch")_
+- Implement RPC Endpoint for Listing Roles in Server _[#3663](https://github.com/mathesar-foundation/mathesar/pull/3663 "Implement RPC Endpoint for Listing Roles in Server")_
+- Constraints RPC Transition _[#3664](https://github.com/mathesar-foundation/mathesar/pull/3664 "Constraints RPC Transition")_
+- Cast OIDs to Bigint Before Putting in JSON _[#3666](https://github.com/mathesar-foundation/mathesar/pull/3666 "Cast OIDs to Bigint Before Putting in JSON")_
+- Improve Tables Metadata _[#3672](https://github.com/mathesar-foundation/mathesar/pull/3672 "Improve Tables Metadata")_
+- RPC Implementation for `types.list` _[#3676](https://github.com/mathesar-foundation/mathesar/pull/3676 "RPC Implementation for `types.list`")_
+- Add `records.list` RPC Function _[#3691](https://github.com/mathesar-foundation/mathesar/pull/3691 "Add `records.list` RPC Function")_
 - RPC Transition for Explorations `list` and `delete` _[#3694](https://github.com/mathesar-foundation/mathesar/pull/3694 "RPC Transition for Explorations `list` and `delete`")_
-- Add `records.delete` RPC Function _[#3741](https://github.com/mathesar-foundation/mathesar/pull/3741 "Add `records.delete` RPC Function")_
-- Add `records.add` RPC Function _[#3745](https://github.com/mathesar-foundation/mathesar/pull/3745 "Add `records.add` RPC Function")_
-- Implement `table.import` RPC Endpoint _[#3623](https://github.com/mathesar-foundation/mathesar/pull/3623 "Implement `table.import` RPC Endpoint")_
+- Merge Breaking Changes into Develop _[#3695](https://github.com/mathesar-foundation/mathesar/pull/3695 "Merge Breaking Changes into Develop")_
 - Implement `explorations.run` RPC Endpoint _[#3696](https://github.com/mathesar-foundation/mathesar/pull/3696 "Implement `explorations.run` RPC Endpoint")_
-- Add `columns.patch` RPC Function _[#3615](https://github.com/mathesar-foundation/mathesar/pull/3615 "Add `columns.patch` RPC Function")_
+- Fix Issues with `tables.patch` RPC Method _[#3699](https://github.com/mathesar-foundation/mathesar/pull/3699 "Fix Issues with `tables.patch` RPC Method")_
+- RPC Records List Filtering _[#3700](https://github.com/mathesar-foundation/mathesar/pull/3700 "RPC Records List Filtering")_
+- RPC Endpoint for Column Info with Metadata _[#3703](https://github.com/mathesar-foundation/mathesar/pull/3703 "RPC Endpoint for Column Info with Metadata")_
+- First Steps of RPC Implementation for Table Page _[#3704](https://github.com/mathesar-foundation/mathesar/pull/3704 "First Steps of RPC Implementation for Table Page")_
+- Add `records.search` RPC Function _[#3708](https://github.com/mathesar-foundation/mathesar/pull/3708 "Add `records.search` RPC Function")_
+- Alter Column Metadata Fields _[#3717](https://github.com/mathesar-foundation/mathesar/pull/3717 "Alter Column Metadata Fields")_
+- Records Grouping _[#3721](https://github.com/mathesar-foundation/mathesar/pull/3721 "Records Grouping")_
 - Handle New Records Filtering on the Front End _[#3728](https://github.com/mathesar-foundation/mathesar/pull/3728 "Handle New Records Filtering on the Front End")_
-- Get Explorations CRUD Working Again _[#3893](https://github.com/mathesar-foundation/mathesar/pull/3893 "Get Explorations CRUD Working Again")_
-- Implement RPC Endpoint for Listing Roles in Server _[#3663](https://github.com/mathesar-foundation/mathesar/pull/3663 "Implement RPC Endpoint for Listing Roles in Server")_
-- Add `records.patch` RPC Function _[#3749](https://github.com/mathesar-foundation/mathesar/pull/3749 "Add `records.patch` RPC Function")_
-- Implement `roles.delete`, `databases.drop` & `databases.configured.disconnect` Endpoints _[#3858](https://github.com/mathesar-foundation/mathesar/pull/3858 "Implement `roles.delete`, `databases.drop` & `databases.configured.disconnect` Endpoints")_
-- Implement `schemas.add` RPC Method _[#3620](https://github.com/mathesar-foundation/mathesar/pull/3620 "Implement `schemas.add` RPC Method")_
+- Implement Explorations `add` & `replace` Endpoint _[#3731](https://github.com/mathesar-foundation/mathesar/pull/3731 "Implement Explorations `add` & `replace` Endpoint")_
 - Add `records.get` RPC Function _[#3740](https://github.com/mathesar-foundation/mathesar/pull/3740 "Add `records.get` RPC Function")_
-- Use RPC API for Column Metadata _[#3845](https://github.com/mathesar-foundation/mathesar/pull/3845 "Use RPC API for Column Metadata")_
-- Implement `tables.patch` RPC Endpoint _[#3618](https://github.com/mathesar-foundation/mathesar/pull/3618 "Implement `tables.patch` RPC Endpoint")_
-- RPC Endpoint for Column Info with Metadata _[#3703](https://github.com/mathesar-foundation/mathesar/pull/3703 "RPC Endpoint for Column Info with Metadata")_
+- Add `records.delete` RPC Function _[#3741](https://github.com/mathesar-foundation/mathesar/pull/3741 "Add `records.delete` RPC Function")_
+- Add `records.add` RPC Function _[#3745](https://github.com/mathesar-foundation/mathesar/pull/3745 "Add `records.add` RPC Function")_
 - Adapt Front End to New RPC-Based Joinable Tables API _[#3746](https://github.com/mathesar-foundation/mathesar/pull/3746 "Adapt Front End to New RPC-Based Joinable Tables API")_
-- Implement RPC Records CRUD Operations on Front End _[#3759](https://github.com/mathesar-foundation/mathesar/pull/3759 "Implement RPC Records CRUD Operations on Front End")_
-- Columns Meta RPC Patch _[#3653](https://github.com/mathesar-foundation/mathesar/pull/3653 "Columns Meta RPC Patch")_
-- Implement `schemas.patch` RPC Method _[#3628](https://github.com/mathesar-foundation/mathesar/pull/3628 "Implement `schemas.patch` RPC Method")_
+- Fix Edge Case While Getting Joinable Tables for Tables with No Links _[#3748](https://github.com/mathesar-foundation/mathesar/pull/3748 "Fix Edge Case While Getting Joinable Tables for Tables with No Links")_
+- Add `records.patch` RPC Function _[#3749](https://github.com/mathesar-foundation/mathesar/pull/3749 "Add `records.patch` RPC Function")_
 - Records Grouping Bugfix _[#3751](https://github.com/mathesar-foundation/mathesar/pull/3751 "Records Grouping Bugfix")_
+- Records Delete Bugfix _[#3754](https://github.com/mathesar-foundation/mathesar/pull/3754 "Records Delete Bugfix")_
+- Adapt Front End to New Records Grouping API _[#3755](https://github.com/mathesar-foundation/mathesar/pull/3755 "Adapt Front End to New Records Grouping API")_
+- Implement RPC Records CRUD Operations on Front End _[#3759](https://github.com/mathesar-foundation/mathesar/pull/3759 "Implement RPC Records CRUD Operations on Front End")_
+- Add Simplified Record Summaries _[#3761](https://github.com/mathesar-foundation/mathesar/pull/3761 "Add Simplified Record Summaries")_
+- Add Link-Adding RPC Functions _[#3767](https://github.com/mathesar-foundation/mathesar/pull/3767 "Add Link-Adding RPC Functions")_
+- Implement `roles.add` RPC Endpoint _[#3769](https://github.com/mathesar-foundation/mathesar/pull/3769 "Implement `roles.add` RPC Endpoint")_
+- Reorganize Namespacing _[#3799](https://github.com/mathesar-foundation/mathesar/pull/3799 "Reorganize Namespacing")_
 - Hard-Code Abstract Types Response in Client _[#3800](https://github.com/mathesar-foundation/mathesar/pull/3800 "Hard-Code Abstract Types Response in Client")_
-- Implement `schemas.delete` RPC Method _[#3610](https://github.com/mathesar-foundation/mathesar/pull/3610 "Implement `schemas.delete` RPC Method")_
-- Implement `tables.get` RPC Endpoint _[#3612](https://github.com/mathesar-foundation/mathesar/pull/3612 "Implement `tables.get` RPC Endpoint")_
-- Improve Tables Metadata _[#3672](https://github.com/mathesar-foundation/mathesar/pull/3672 "Improve Tables Metadata")_
-- Propagate RPC Changes to Link Table Dialog _[#3847](https://github.com/mathesar-foundation/mathesar/pull/3847 "Propagate RPC Changes to Link Table Dialog")_
-- Implement Explorations `add` & `replace` Endpoint _[#3731](https://github.com/mathesar-foundation/mathesar/pull/3731 "Implement Explorations `add` & `replace` Endpoint")_
-- Wire RPC Functions to New Models _[#3632](https://github.com/mathesar-foundation/mathesar/pull/3632 "Wire RPC Functions to New Models")_
-- Auto Generate Table Name _[#3637](https://github.com/mathesar-foundation/mathesar/pull/3637 "Auto Generate Table Name")_
-- RPC Implementation for `types.list` _[#3676](https://github.com/mathesar-foundation/mathesar/pull/3676 "RPC Implementation for `types.list`")_
-- Alter Response for Schemas `add` and `patch` Endpoints & Implement `schemas.get` _[#3837](https://github.com/mathesar-foundation/mathesar/pull/3837 "Alter Response for Schemas `add` and `patch` Endpoints & Implement `schemas.get`")_
-- Alter Column Metadata Fields _[#3717](https://github.com/mathesar-foundation/mathesar/pull/3717 "Alter Column Metadata Fields")_
 - Change Response Structure for Record Summary _[#3802](https://github.com/mathesar-foundation/mathesar/pull/3802 "Change Response Structure for Record Summary")_
 - Change Response for `tables.add` and `tables.import` _[#3807](https://github.com/mathesar-foundation/mathesar/pull/3807 "Change Response for `tables.add` and `tables.import`")_
-- Get "Extract Columns" and "Move Columns" Functionality Working Again _[#3856](https://github.com/mathesar-foundation/mathesar/pull/3856 "Get 'Extract Columns' and 'Move Columns' Functionality Working Again")_
-- Propagate RPC Changes to Record Selector _[#3843](https://github.com/mathesar-foundation/mathesar/pull/3843 "Propagate RPC Changes to Record Selector")_
-- Exception Handler Tests _[#3547](https://github.com/mathesar-foundation/mathesar/pull/3547 "Exception Handler Tests")_
-- Adapt Front End to New Records Grouping API _[#3755](https://github.com/mathesar-foundation/mathesar/pull/3755 "Adapt Front End to New Records Grouping API")_
-- Cast OIDs to Bigint Before Putting in JSON _[#3666](https://github.com/mathesar-foundation/mathesar/pull/3666 "Cast OIDs to Bigint Before Putting in JSON")_
-- Records Delete Bugfix _[#3754](https://github.com/mathesar-foundation/mathesar/pull/3754 "Records Delete Bugfix")_
+- Add Summaries to Self _[#3808](https://github.com/mathesar-foundation/mathesar/pull/3808 "Add Summaries to Self")_
+- Move Columns SQL _[#3809](https://github.com/mathesar-foundation/mathesar/pull/3809 "Move Columns SQL")_
+- Propagate RPC Record Summary Changes to Front End _[#3811](https://github.com/mathesar-foundation/mathesar/pull/3811 "Propagate RPC Record Summary Changes to Front End")_
+- Get Imports Working Again _[#3819](https://github.com/mathesar-foundation/mathesar/pull/3819 "Get Imports Working Again")_
+- Use Data File Name as Table Name During Import _[#3824](https://github.com/mathesar-foundation/mathesar/pull/3824 "Use Data File Name as Table Name During Import")_
 - A Couple Small Front End RPC Changes _[#3825](https://github.com/mathesar-foundation/mathesar/pull/3825 "A Couple Small Front End RPC Changes")_
+- Bugfix Listing Records from a Table with Self-Referential FK _[#3831](https://github.com/mathesar-foundation/mathesar/pull/3831 "Bugfix Listing Records from a Table with Self-Referential FK")_
+- Alter Response for Schemas `add` and `patch` Endpoints & Implement `schemas.get` _[#3837](https://github.com/mathesar-foundation/mathesar/pull/3837 "Alter Response for Schemas `add` and `patch` Endpoints & Implement `schemas.get`")_
+- Propagate RPC Changes to Record Selector _[#3843](https://github.com/mathesar-foundation/mathesar/pull/3843 "Propagate RPC Changes to Record Selector")_
+- Use RPC API for Column Metadata _[#3845](https://github.com/mathesar-foundation/mathesar/pull/3845 "Use RPC API for Column Metadata")_
+- Propagate RPC Changes to Link Table Dialog _[#3847](https://github.com/mathesar-foundation/mathesar/pull/3847 "Propagate RPC Changes to Link Table Dialog")_
 - Make `records.get` Work with Stringified PK Values _[#3853](https://github.com/mathesar-foundation/mathesar/pull/3853 "Make `records.get` Work with Stringified PK Values")_
-- Use Data File Name as Table Name During Import _[#3824](https://github.com/mathesar-foundation/mathesar/pull/3824 "Use Data File Name as Table Name During Import")_
+- Enabling Running of Very Simple Explorations _[#3855](https://github.com/mathesar-foundation/mathesar/pull/3855 "Enabling Running of Very Simple Explorations")_
+- Get "Extract Columns" and "Move Columns" Functionality Working Again _[#3856](https://github.com/mathesar-foundation/mathesar/pull/3856 "Get 'Extract Columns' and 'Move Columns' Functionality Working Again")_
 - Allow Patching Records via String PKs _[#3857](https://github.com/mathesar-foundation/mathesar/pull/3857 "Allow Patching Records via String PKs")_
-- Fix Broken Exploration "Column Added" Indicators _[#3894](https://github.com/mathesar-foundation/mathesar/pull/3894 "Fix Broken Exploration 'Column Added' Indicators")_
-- Resolve Merge Conflict for #3558 _[#3559](https://github.com/mathesar-foundation/mathesar/pull/3559 "Resolve Merge Conflict for #3558")_
+- Implement `roles.delete`, `databases.drop` & `databases.configured.disconnect` Endpoints _[#3858](https://github.com/mathesar-foundation/mathesar/pull/3858 "Implement `roles.delete`, `databases.drop` & `databases.configured.disconnect` Endpoints")_
 - Bugfix Summarizations _[#3884](https://github.com/mathesar-foundation/mathesar/pull/3884 "Bugfix Summarizations")_
-- Fix Edge Case While Getting Joinable Tables for Tables with No Links _[#3748](https://github.com/mathesar-foundation/mathesar/pull/3748 "Fix Edge Case While Getting Joinable Tables for Tables with No Links")_
-- Fix SQL Syntax Highlighting in VS Code for SQL Tests _[#3588](https://github.com/mathesar-foundation/mathesar/pull/3588 "Fix SQL Syntax Highlighting in VS Code for SQL Tests")_
-- Remove Dead Front End API Client Code to GET One Schema _[#3589](https://github.com/mathesar-foundation/mathesar/pull/3589 "Remove Dead Front End API Client Code to GET One Schema")_
-- Revert #3559 _[#3567](https://github.com/mathesar-foundation/mathesar/pull/3567 "Revert #3559")_
-- Remove Debian Build _[#3546](https://github.com/mathesar-foundation/mathesar/pull/3546 "Remove Debian Build")_
-- Remove API Documentation Infrastructure _[#3541](https://github.com/mathesar-foundation/mathesar/pull/3541 "Remove API Documentation Infrastructure")_
-- Remove E2E Infrastructure _[#3551](https://github.com/mathesar-foundation/mathesar/pull/3551 "Remove E2E Infrastructure")_
-- Implement `tables.delete` RPC Endpoint _[#3608](https://github.com/mathesar-foundation/mathesar/pull/3608 "Implement `tables.delete` RPC Endpoint")_
-- Implement `tables.add` RPC Endpoint _[#3614](https://github.com/mathesar-foundation/mathesar/pull/3614 "Implement `tables.add` RPC Endpoint")_
-- Add `columns.add` RPC Function _[#3616](https://github.com/mathesar-foundation/mathesar/pull/3616 "Add `columns.add` RPC Function")_
-- Fix Issues with `tables.patch` RPC Method _[#3699](https://github.com/mathesar-foundation/mathesar/pull/3699 "Fix Issues with `tables.patch` RPC Method")_
-- Propagate RPC Record Summary Changes to Front End _[#3811](https://github.com/mathesar-foundation/mathesar/pull/3811 "Propagate RPC Record Summary Changes to Front End")_
-- Bugfix Listing Records from a Table with Self-Referential FK _[#3831](https://github.com/mathesar-foundation/mathesar/pull/3831 "Bugfix Listing Records from a Table with Self-Referential FK")_
 - Fix Insert for Table with Only ID Column _[#3885](https://github.com/mathesar-foundation/mathesar/pull/3885 "Fix Insert for Table with Only ID Column")_
+- Get Explorations CRUD Working Again _[#3893](https://github.com/mathesar-foundation/mathesar/pull/3893 "Get Explorations CRUD Working Again")_
+- Fix Broken Exploration "Column Added" Indicators _[#3894](https://github.com/mathesar-foundation/mathesar/pull/3894 "Fix Broken Exploration 'Column Added' Indicators")_
 
 ## Improvements
 
@@ -105,35 +105,35 @@ The API has been largely transitioned from REST to RPC, with the exception of th
 
 The new permissions system introduces comprehensive access control features, including role configurations, ownership transfers, and granular permission management for databases, schemas, and tables.
 
-- Database Page Role Configuration, Collaborators, Roles _[#3762](https://github.com/mathesar-foundation/mathesar/pull/3762 "Database Page Role Configuration, Collaborators, Roles")_
 - Initial Permissions Remodel _[#3626](https://github.com/mathesar-foundation/mathesar/pull/3626 "Initial Permissions Remodel")_
-- Database Permissions Modal 'Share' Tab _[#3810](https://github.com/mathesar-foundation/mathesar/pull/3810 "Database Permissions Modal 'Share' Tab")_
-- Implement 'Transfer Ownership' Tabs _[#3859](https://github.com/mathesar-foundation/mathesar/pull/3859 "Implement 'Transfer Ownership' Tabs")_
-- Permission Checks in All Pages, Disconnect Database Option _[#3861](https://github.com/mathesar-foundation/mathesar/pull/3861 "Permission Checks in All Pages, Disconnect Database Option")_
-- Implement Permissions Modal for Schemas and Tables _[#3836](https://github.com/mathesar-foundation/mathesar/pull/3836 "Implement Permissions Modal for Schemas and Tables")_, _[#3838](https://github.com/mathesar-foundation/mathesar/pull/3838 "Implement Permissions Modal for Schemas and Tables")_
-- Homepage Changes for Database Connections _[#3710](https://github.com/mathesar-foundation/mathesar/pull/3710 "Homepage Changes for Database Connections")_
-- Add Privilege Information Fields _[#3795](https://github.com/mathesar-foundation/mathesar/pull/3795 "Add Privilege Information Fields")_
-- Allow Setting Owner at Creation _[#3840](https://github.com/mathesar-foundation/mathesar/pull/3840 "Allow Setting Owner at Creation")_
-- Fix Quoting for Role Grant/Revoke Expressions _[#3931](https://github.com/mathesar-foundation/mathesar/pull/3931 "Fix Quoting for Role Grant/Revoke Expressions")_
-- Filter Databases for Admin and Standard Users _[#3895](https://github.com/mathesar-foundation/mathesar/pull/3895 "Filter Databases for Admin and Standard Users")_
-- Move db page contexts to the route level _[#3789](https://github.com/mathesar-foundation/mathesar/pull/3789 "Move db page contexts to the route level")_
 - Endpoints for Servers, Collaborators _[#3684](https://github.com/mathesar-foundation/mathesar/pull/3684 "Endpoints for Servers, Collaborators")_
 - Endpoints for Configured Roles _[#3685](https://github.com/mathesar-foundation/mathesar/pull/3685 "Endpoints for Configured Roles")_
 - Remove Existing Permissions Logic on the Frontend _[#3689](https://github.com/mathesar-foundation/mathesar/pull/3689 "Remove Existing Permissions Logic on the Frontend")_
+- Homepage Changes for Database Connections _[#3710](https://github.com/mathesar-foundation/mathesar/pull/3710 "Homepage Changes for Database Connections")_
 - Homepage UI _[#3711](https://github.com/mathesar-foundation/mathesar/pull/3711 "Homepage UI")_
+- Database Page Role Configuration, Collaborators, Roles _[#3762](https://github.com/mathesar-foundation/mathesar/pull/3762 "Database Page Role Configuration, Collaborators, Roles")_
+- Move db page contexts to the route level _[#3789](https://github.com/mathesar-foundation/mathesar/pull/3789 "Move db page contexts to the route level")_
+- Add Privilege Information Fields _[#3795](https://github.com/mathesar-foundation/mathesar/pull/3795 "Add Privilege Information Fields")_
+- Database Permissions Modal 'Share' Tab _[#3810](https://github.com/mathesar-foundation/mathesar/pull/3810 "Database Permissions Modal 'Share' Tab")_
+- Implement Permissions Modal for Schemas and Tables _[#3836](https://github.com/mathesar-foundation/mathesar/pull/3836 "Implement Permissions Modal for Schemas and Tables")_, _[#3838](https://github.com/mathesar-foundation/mathesar/pull/3838 "Implement Permissions Modal for Schemas and Tables")_
+- Allow Setting Owner at Creation _[#3840](https://github.com/mathesar-foundation/mathesar/pull/3840 "Allow Setting Owner at Creation")_
+- Implement 'Transfer Ownership' Tabs _[#3859](https://github.com/mathesar-foundation/mathesar/pull/3859 "Implement 'Transfer Ownership' Tabs")_
+- Permission Checks in All Pages, Disconnect Database Option _[#3861](https://github.com/mathesar-foundation/mathesar/pull/3861 "Permission Checks in All Pages, Disconnect Database Option")_
+- Filter Databases for Admin and Standard Users _[#3895](https://github.com/mathesar-foundation/mathesar/pull/3895 "Filter Databases for Admin and Standard Users")_
+- Fix Quoting for Role Grant/Revoke Expressions _[#3931](https://github.com/mathesar-foundation/mathesar/pull/3931 "Fix Quoting for Role Grant/Revoke Expressions")_
 
 ### Performance optimizations
 
 These changes improve Mathesar's performance by speeding up installation and optimizing cell selection.
 
-- Fast Install _[#3917](https://github.com/mathesar-foundation/mathesar/pull/3917 "Fast Install")_
 - Refactor CellSelection Data Structure and Store _[#3037](https://github.com/mathesar-foundation/mathesar/pull/3037 "Refactor CellSelection Data Structure and Store")_
 - Handle Negative Numbers in TSV Serialization for Copy _[#3582](https://github.com/mathesar-foundation/mathesar/pull/3582 "Handle Negative Numbers in TSV Serialization for Copy")_
+- Fast Install _[#3917](https://github.com/mathesar-foundation/mathesar/pull/3917 "Fast Install")_
 
 ### UI improvements
 
-- UI Consistency Improvements _[#3860](https://github.com/mathesar-foundation/mathesar/pull/3860 "UI Consistency Improvements")_
 - Show a Loading Spinner for Table Pages _[#3602](https://github.com/mathesar-foundation/mathesar/pull/3602 "Show a Loading Spinner for Table Pages")_
+- UI Consistency Improvements _[#3860](https://github.com/mathesar-foundation/mathesar/pull/3860 "UI Consistency Improvements")_
 
 ## Groundwork
 
@@ -141,17 +141,17 @@ These changes improve Mathesar's performance by speeding up installation and opt
 
 ## Bug fixes
 
-- Reduces Frontend Caching, Fixes a Few Bugs _[#3897](https://github.com/mathesar-foundation/mathesar/pull/3897 "Reduces Frontend Caching, Fixes a Few Bugs")_
+- Fix Change Password Error _[#3536](https://github.com/mathesar-foundation/mathesar/pull/3536 "Fix Change Password Error")_
+- Allow Unsetting Schema Comment Using NULL _[#3649](https://github.com/mathesar-foundation/mathesar/pull/3649 "Allow Unsetting Schema Comment Using NULL")_
 - Fix Install Script _[#3678](https://github.com/mathesar-foundation/mathesar/pull/3678 "Fix Install Script")_
+- Return Empty Array When Schema Has No Tables _[#3702](https://github.com/mathesar-foundation/mathesar/pull/3702 "Return Empty Array When Schema Has No Tables")_
 - Fix "No Current Database" Error _[#3723](https://github.com/mathesar-foundation/mathesar/pull/3723 "Fix 'No Current Database' Error")_
-- Allow Unsetting Schema Comment Using NULL _[#3649](https://github.com/mathesar-foundation/mathesar/pull/3649 "Allow Unsetting Schema Comment Using NULL")_
-- Fix Updating of Table Name _[#3879](https://github.com/mathesar-foundation/mathesar/pull/3879 "Fix Updating of Table Name")_
+- Modify Pkey Finder to Return False When No Pkey Exists _[#3804](https://github.com/mathesar-foundation/mathesar/pull/3804 "Modify Pkey Finder to Return False When No Pkey Exists")_
 - Alter Response for Record Summaries with Null Records _[#3852](https://github.com/mathesar-foundation/mathesar/pull/3852 "Alter Response for Record Summaries with Null Records")_
+- Fix Updating of Table Name _[#3879](https://github.com/mathesar-foundation/mathesar/pull/3879 "Fix Updating of Table Name")_
+- Reduces Frontend Caching, Fixes a Few Bugs _[#3897](https://github.com/mathesar-foundation/mathesar/pull/3897 "Reduces Frontend Caching, Fixes a Few Bugs")_
 - Fix bug when updating table twice _[#3909](https://github.com/mathesar-foundation/mathesar/pull/3909 "Fix bug when updating table twice")_
 - Fix quoting refactor for role grant/revoke expressions _[#3931](https://github.com/mathesar-foundation/mathesar/pull/3931 "Fix quoting refactor for role grant/revoke expressions")_
-- Fix Change Password Error _[#3536](https://github.com/mathesar-foundation/mathesar/pull/3536 "Fix Change Password Error")_
-- Modify Pkey Finder to Return False When No Pkey Exists _[#3804](https://github.com/mathesar-foundation/mathesar/pull/3804 "Modify Pkey Finder to Return False When No Pkey Exists")_
-- Return Empty Array When Schema Has No Tables _[#3702](https://github.com/mathesar-foundation/mathesar/pull/3702 "Return Empty Array When Schema Has No Tables")_
 
 ## Documentation
 
@@ -159,15 +159,15 @@ These changes improve Mathesar's performance by speeding up installation and opt
 
 ## Maintenance
 
-- Architectural Overhaul _[#3587](https://github.com/mathesar-foundation/mathesar/pull/3587 "Architectural Overhaul")_
-- Quoting Refactor _[#3633](https://github.com/mathesar-foundation/mathesar/pull/3633 "Quoting Refactor")_
 - Remove Demo Code and E2E Infrastructure _[#3538](https://github.com/mathesar-foundation/mathesar/pull/3538 "Remove Demo Code and E2E Infrastructure")_, _[#3551](https://github.com/mathesar-foundation/mathesar/pull/3551 "Remove E2E Infrastructure")_
-- Add GitHub Workflow to Reset Demo _[#3577](https://github.com/mathesar-foundation/mathesar/pull/3577 "Add GitHub Workflow to Reset Demo")_
-- Update MkDocs Dependencies _[#3763](https://github.com/mathesar-foundation/mathesar/pull/3763 "Update MkDocs Dependencies")_
-- Sort Frontend Imports _[#3552](https://github.com/mathesar-foundation/mathesar/pull/3552 "Sort Frontend Imports")_
 - Bump Dependencies _[#3544](https://github.com/mathesar-foundation/mathesar/pull/3544 "Bump Dependencies")_, _[#3604](https://github.com/mathesar-foundation/mathesar/pull/3604 "Bump Dependencies")_
+- Sort Frontend Imports _[#3552](https://github.com/mathesar-foundation/mathesar/pull/3552 "Sort Frontend Imports")_
+- Add GitHub Workflow to Reset Demo _[#3577](https://github.com/mathesar-foundation/mathesar/pull/3577 "Add GitHub Workflow to Reset Demo")_
 - Updates to GH Workflow for Resetting Demo _[#3579](https://github.com/mathesar-foundation/mathesar/pull/3579 "Updates to GH Workflow for Resetting Demo")_
 - Updates to GH Workflow to Reset Demo _[#3580](https://github.com/mathesar-foundation/mathesar/pull/3580 "Updates to GH Workflow to Reset Demo")_
 - Remove the Demo Reset Workflow _[#3581](https://github.com.mathesar-foundation/mathesar/pull/3581 "Remove the Demo Reset Workflow")_
+- Architectural Overhaul _[#3587](https://github.com/mathesar-foundation/mathesar/pull/3587 "Architectural Overhaul")_
+- Quoting Refactor _[#3633](https://github.com/mathesar-foundation/mathesar/pull/3633 "Quoting Refactor")_
 - Add SQL Code Standard for Casting OIDs to Bigint _[#3643](https://github.com/mathesar-foundation/mathesar/pull/3643 "Add SQL Code Standard for Casting OIDs to Bigint")_
 - Drop Old SQL Function Signature _[#3650](https://github.com/mathesar-foundation/mathesar/pull/3650 "Drop Old SQL Function Signature")_
+- Update MkDocs Dependencies _[#3763](https://github.com/mathesar-foundation/mathesar/pull/3763 "Update MkDocs Dependencies")_

From 975027b64e4df33743bcae3a0e364ae20232af4a Mon Sep 17 00:00:00 2001
From: Ghislaine Guerin <me@ghislaineguerin.com>
Date: Fri, 11 Oct 2024 10:10:35 +0200
Subject: [PATCH 1103/1141] remove upgrade instructions

---
 docs/docs/administration/upgrade/0.2.0-testing.1.md | 1 -
 docs/docs/releases/0.2.0-testing.1.md               | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 docs/docs/administration/upgrade/0.2.0-testing.1.md

diff --git a/docs/docs/administration/upgrade/0.2.0-testing.1.md b/docs/docs/administration/upgrade/0.2.0-testing.1.md
deleted file mode 100644
index 125b4c5134..0000000000
--- a/docs/docs/administration/upgrade/0.2.0-testing.1.md
+++ /dev/null
@@ -1 +0,0 @@
-# Upgrade Mathesar to 0.2.0-testing.1
diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index 98a9f5d788..3e3109e6b0 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -10,7 +10,7 @@ _This page provides a comprehensive list of all changes in the release._
 
 ## Upgrading to 0.2.0-testing.1
 
-See our guide on [upgrading Mathesar to 0.2.0-testing.1](../administration/upgrade/0.2.0-testing.1.md).
+This testing release cannot be upgraded to from previous versions. It requires a fresh installation.
 
 ## Breaking changes
 

From d852322378cc33ebb66ff1b4c6a887642e88e950 Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Sat, 12 Oct 2024 03:33:10 -0400
Subject: [PATCH 1104/1141] Rewrote release notes.

---
 .../0.2.0-testing.1/create-link-changes.png   | Bin 0 -> 539798 bytes
 .../db-settings-collaborators.png             | Bin 0 -> 198515 bytes
 docs/docs/releases/0.2.0-testing.1.md         | 308 +++++++++---------
 docs/mkdocs.yml                               |   2 +
 4 files changed, 164 insertions(+), 146 deletions(-)
 create mode 100644 docs/docs/assets/releases/0.2.0-testing.1/create-link-changes.png
 create mode 100644 docs/docs/assets/releases/0.2.0-testing.1/db-settings-collaborators.png

diff --git a/docs/docs/assets/releases/0.2.0-testing.1/create-link-changes.png b/docs/docs/assets/releases/0.2.0-testing.1/create-link-changes.png
new file mode 100644
index 0000000000000000000000000000000000000000..271f306dac0363f8093bb85e1021964b56293551
GIT binary patch
literal 539798
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%0A*S$U#^o{>n(Qb`+8e0IKtA&Gs#-jrd38BxxQA0
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%0Dki+*xgk=6kejGd=%sW8|FdqR
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%0AE%=p<$
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

literal 0
HcmV?d00001

diff --git a/docs/docs/assets/releases/0.2.0-testing.1/db-settings-collaborators.png b/docs/docs/assets/releases/0.2.0-testing.1/db-settings-collaborators.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fbb6676b5b5b8cbe22104d1a0ff89e7dd04ca3a
GIT binary patch
literal 198515
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
S3RtCI)RZ(8GyY-z;C}#U@OG>K

literal 0
HcmV?d00001

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index 3e3109e6b0..4baebde145 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -1,173 +1,189 @@
-# Mathesar 0.2.0-testing.1
+# 🧪 Mathesar 0.2.0-testing.1
 
-## Summary
+!!! danger "Not a stable release"
+    This is a testing build released with the goal of gathering feedback from our community. It has **[many known issues](https://github.com/mathesar-foundation/mathesar/issues?q=is%3Aissue+milestone%3Av0.2.0-testing.2+)** and is not recommended for production use.
 
-Mathesar 0.2.0-testing.1 introduces two major changes: a new permissions system and a significant transition from REST to RPC for most of the API. This testing release also includes some performance optimizations and bug fixes.
+## Summary
 
-This release is intended for evaluation and feedback, particularly on the new features. Users should note that this version may contain unstable elements and is not recommended for production use.
+**Mathesar 0.2.0-testing.1** provides an early preview of improvements we plan to release in our beta version. We have a brand new access control system based entirely on PostgreSQL database permissions, and we've also made major improvements to the responsiveness of the Mathesar UI. We've also built out a new RPC API, and we're deprecating our REST API in favor of it.
 
 _This page provides a comprehensive list of all changes in the release._
 
-## Upgrading to 0.2.0-testing.1
-
-This testing release cannot be upgraded to from previous versions. It requires a fresh installation.
+## Installing 0.2.0-testing.1
 
-## Breaking changes
+You will need to create a new installation of Mathesar to use this version, which you can do via [Docker Compose](../../installation/docker-compose/) or [from source](../../installation/build-from-source/).
 
-### RPC API
-
-The API has been largely transitioned from REST to RPC, with the exception of the `/users/` and `/data-files/` endpoints which remain REST-based.
-
-- Remove API Documentation Infrastructure _[#3541](https://github.com/mathesar-foundation/mathesar/pull/3541 "Remove API Documentation Infrastructure")_
-- Connections RPC Front End _[#3543](https://github.com/mathesar-foundation/mathesar/pull/3543 "Connections RPC Front End")_
-- Remove Debian Build _[#3546](https://github.com/mathesar-foundation/mathesar/pull/3546 "Remove Debian Build")_
-- Exception Handler Tests _[#3547](https://github.com/mathesar-foundation/mathesar/pull/3547 "Exception Handler Tests")_
-- Remove E2E Infrastructure _[#3551](https://github.com/mathesar-foundation/mathesar/pull/3551 "Remove E2E Infrastructure")_
-- Resolve Merge Conflict for #3558 _[#3559](https://github.com/mathesar-foundation/mathesar/pull/3559 "Resolve Merge Conflict for #3558")_
-- Revert #3559 _[#3567](https://github.com/mathesar-foundation/mathesar/pull/3567 "Revert #3559")_
-- Fix SQL Syntax Highlighting in VS Code for SQL Tests _[#3588](https://github.com/mathesar-foundation/mathesar/pull/3588 "Fix SQL Syntax Highlighting in VS Code for SQL Tests")_
-- Remove Dead Front End API Client Code to GET One Schema _[#3589](https://github.com/mathesar-foundation/mathesar/pull/3589 "Remove Dead Front End API Client Code to GET One Schema")_
-- Implement `tables.delete` RPC Endpoint _[#3608](https://github.com/mathesar-foundation/mathesar/pull/3608 "Implement `tables.delete` RPC Endpoint")_
-- Implement `schemas.delete` RPC Method _[#3610](https://github.com/mathesar-foundation/mathesar/pull/3610 "Implement `schemas.delete` RPC Method")_
-- Implement `tables.get` RPC Endpoint _[#3612](https://github.com/mathesar-foundation/mathesar/pull/3612 "Implement `tables.get` RPC Endpoint")_
-- Implement `tables.add` RPC Endpoint _[#3614](https://github.com/mathesar-foundation/mathesar/pull/3614 "Implement `tables.add` RPC Endpoint")_
-- Add `columns.patch` RPC Function _[#3615](https://github.com/mathesar-foundation/mathesar/pull/3615 "Add `columns.patch` RPC Function")_
-- Add `columns.add` RPC Function _[#3616](https://github.com/mathesar-foundation/mathesar/pull/3616 "Add `columns.add` RPC Function")_
-- Implement `tables.patch` RPC Endpoint _[#3618](https://github.com/mathesar-foundation/mathesar/pull/3618 "Implement `tables.patch` RPC Endpoint")_
-- Implement `schemas.add` RPC Method _[#3620](https://github.com/mathesar-foundation/mathesar/pull/3620 "Implement `schemas.add` RPC Method")_
-- Implement `table.import` RPC Endpoint _[#3623](https://github.com/mathesar-foundation/mathesar/pull/3623 "Implement `table.import` RPC Endpoint")_
-- Implement `schemas.patch` RPC Method _[#3628](https://github.com/mathesar-foundation/mathesar/pull/3628 "Implement `schemas.patch` RPC Method")_
-- Wire RPC Functions to New Models _[#3632](https://github.com/mathesar-foundation/mathesar/pull/3632 "Wire RPC Functions to New Models")_
-- Auto Generate Table Name _[#3637](https://github.com/mathesar-foundation/mathesar/pull/3637 "Auto Generate Table Name")_
-- Add `columns.metadata.list` RPC Function _[#3641](https://github.com/mathesar-foundation/mathesar/pull/3641 "Add `columns.metadata.list` RPC Function")_
-- Implement `tables.metadata` `list` & `patch` RPC Endpoint _[#3646](https://github.com/mathesar-foundation/mathesar/pull/3646 "Implement `tables.metadata` `list` & `patch` RPC Endpoint")_
-- Implement Tables List and Delete RPC APIs _[#3651](https://github.com/mathesar-foundation/mathesar/pull/3651 "Implement Tables List and Delete RPC APIs")_
-- Columns Meta RPC Patch _[#3653](https://github.com/mathesar-foundation/mathesar/pull/3653 "Columns Meta RPC Patch")_
-- Implement RPC Endpoint for Listing Roles in Server _[#3663](https://github.com/mathesar-foundation/mathesar/pull/3663 "Implement RPC Endpoint for Listing Roles in Server")_
-- Constraints RPC Transition _[#3664](https://github.com/mathesar-foundation/mathesar/pull/3664 "Constraints RPC Transition")_
-- Cast OIDs to Bigint Before Putting in JSON _[#3666](https://github.com/mathesar-foundation/mathesar/pull/3666 "Cast OIDs to Bigint Before Putting in JSON")_
-- Improve Tables Metadata _[#3672](https://github.com/mathesar-foundation/mathesar/pull/3672 "Improve Tables Metadata")_
-- RPC Implementation for `types.list` _[#3676](https://github.com/mathesar-foundation/mathesar/pull/3676 "RPC Implementation for `types.list`")_
-- Add `records.list` RPC Function _[#3691](https://github.com/mathesar-foundation/mathesar/pull/3691 "Add `records.list` RPC Function")_
-- RPC Transition for Explorations `list` and `delete` _[#3694](https://github.com/mathesar-foundation/mathesar/pull/3694 "RPC Transition for Explorations `list` and `delete`")_
-- Merge Breaking Changes into Develop _[#3695](https://github.com/mathesar-foundation/mathesar/pull/3695 "Merge Breaking Changes into Develop")_
-- Implement `explorations.run` RPC Endpoint _[#3696](https://github.com/mathesar-foundation/mathesar/pull/3696 "Implement `explorations.run` RPC Endpoint")_
-- Fix Issues with `tables.patch` RPC Method _[#3699](https://github.com/mathesar-foundation/mathesar/pull/3699 "Fix Issues with `tables.patch` RPC Method")_
-- RPC Records List Filtering _[#3700](https://github.com/mathesar-foundation/mathesar/pull/3700 "RPC Records List Filtering")_
-- RPC Endpoint for Column Info with Metadata _[#3703](https://github.com/mathesar-foundation/mathesar/pull/3703 "RPC Endpoint for Column Info with Metadata")_
-- First Steps of RPC Implementation for Table Page _[#3704](https://github.com/mathesar-foundation/mathesar/pull/3704 "First Steps of RPC Implementation for Table Page")_
-- Add `records.search` RPC Function _[#3708](https://github.com/mathesar-foundation/mathesar/pull/3708 "Add `records.search` RPC Function")_
-- Alter Column Metadata Fields _[#3717](https://github.com/mathesar-foundation/mathesar/pull/3717 "Alter Column Metadata Fields")_
-- Records Grouping _[#3721](https://github.com/mathesar-foundation/mathesar/pull/3721 "Records Grouping")_
-- Handle New Records Filtering on the Front End _[#3728](https://github.com/mathesar-foundation/mathesar/pull/3728 "Handle New Records Filtering on the Front End")_
-- Implement Explorations `add` & `replace` Endpoint _[#3731](https://github.com/mathesar-foundation/mathesar/pull/3731 "Implement Explorations `add` & `replace` Endpoint")_
-- Add `records.get` RPC Function _[#3740](https://github.com/mathesar-foundation/mathesar/pull/3740 "Add `records.get` RPC Function")_
-- Add `records.delete` RPC Function _[#3741](https://github.com/mathesar-foundation/mathesar/pull/3741 "Add `records.delete` RPC Function")_
-- Add `records.add` RPC Function _[#3745](https://github.com/mathesar-foundation/mathesar/pull/3745 "Add `records.add` RPC Function")_
-- Adapt Front End to New RPC-Based Joinable Tables API _[#3746](https://github.com/mathesar-foundation/mathesar/pull/3746 "Adapt Front End to New RPC-Based Joinable Tables API")_
-- Fix Edge Case While Getting Joinable Tables for Tables with No Links _[#3748](https://github.com/mathesar-foundation/mathesar/pull/3748 "Fix Edge Case While Getting Joinable Tables for Tables with No Links")_
-- Add `records.patch` RPC Function _[#3749](https://github.com/mathesar-foundation/mathesar/pull/3749 "Add `records.patch` RPC Function")_
-- Records Grouping Bugfix _[#3751](https://github.com/mathesar-foundation/mathesar/pull/3751 "Records Grouping Bugfix")_
-- Records Delete Bugfix _[#3754](https://github.com/mathesar-foundation/mathesar/pull/3754 "Records Delete Bugfix")_
-- Adapt Front End to New Records Grouping API _[#3755](https://github.com/mathesar-foundation/mathesar/pull/3755 "Adapt Front End to New Records Grouping API")_
-- Implement RPC Records CRUD Operations on Front End _[#3759](https://github.com/mathesar-foundation/mathesar/pull/3759 "Implement RPC Records CRUD Operations on Front End")_
-- Add Simplified Record Summaries _[#3761](https://github.com/mathesar-foundation/mathesar/pull/3761 "Add Simplified Record Summaries")_
-- Add Link-Adding RPC Functions _[#3767](https://github.com/mathesar-foundation/mathesar/pull/3767 "Add Link-Adding RPC Functions")_
-- Implement `roles.add` RPC Endpoint _[#3769](https://github.com/mathesar-foundation/mathesar/pull/3769 "Implement `roles.add` RPC Endpoint")_
-- Reorganize Namespacing _[#3799](https://github.com/mathesar-foundation/mathesar/pull/3799 "Reorganize Namespacing")_
-- Hard-Code Abstract Types Response in Client _[#3800](https://github.com/mathesar-foundation/mathesar/pull/3800 "Hard-Code Abstract Types Response in Client")_
-- Change Response Structure for Record Summary _[#3802](https://github.com/mathesar-foundation/mathesar/pull/3802 "Change Response Structure for Record Summary")_
-- Change Response for `tables.add` and `tables.import` _[#3807](https://github.com/mathesar-foundation/mathesar/pull/3807 "Change Response for `tables.add` and `tables.import`")_
-- Add Summaries to Self _[#3808](https://github.com/mathesar-foundation/mathesar/pull/3808 "Add Summaries to Self")_
-- Move Columns SQL _[#3809](https://github.com/mathesar-foundation/mathesar/pull/3809 "Move Columns SQL")_
-- Propagate RPC Record Summary Changes to Front End _[#3811](https://github.com/mathesar-foundation/mathesar/pull/3811 "Propagate RPC Record Summary Changes to Front End")_
-- Get Imports Working Again _[#3819](https://github.com/mathesar-foundation/mathesar/pull/3819 "Get Imports Working Again")_
-- Use Data File Name as Table Name During Import _[#3824](https://github.com/mathesar-foundation/mathesar/pull/3824 "Use Data File Name as Table Name During Import")_
-- A Couple Small Front End RPC Changes _[#3825](https://github.com/mathesar-foundation/mathesar/pull/3825 "A Couple Small Front End RPC Changes")_
-- Bugfix Listing Records from a Table with Self-Referential FK _[#3831](https://github.com/mathesar-foundation/mathesar/pull/3831 "Bugfix Listing Records from a Table with Self-Referential FK")_
-- Alter Response for Schemas `add` and `patch` Endpoints & Implement `schemas.get` _[#3837](https://github.com/mathesar-foundation/mathesar/pull/3837 "Alter Response for Schemas `add` and `patch` Endpoints & Implement `schemas.get`")_
-- Propagate RPC Changes to Record Selector _[#3843](https://github.com/mathesar-foundation/mathesar/pull/3843 "Propagate RPC Changes to Record Selector")_
-- Use RPC API for Column Metadata _[#3845](https://github.com/mathesar-foundation/mathesar/pull/3845 "Use RPC API for Column Metadata")_
-- Propagate RPC Changes to Link Table Dialog _[#3847](https://github.com/mathesar-foundation/mathesar/pull/3847 "Propagate RPC Changes to Link Table Dialog")_
-- Make `records.get` Work with Stringified PK Values _[#3853](https://github.com/mathesar-foundation/mathesar/pull/3853 "Make `records.get` Work with Stringified PK Values")_
-- Enabling Running of Very Simple Explorations _[#3855](https://github.com/mathesar-foundation/mathesar/pull/3855 "Enabling Running of Very Simple Explorations")_
-- Get "Extract Columns" and "Move Columns" Functionality Working Again _[#3856](https://github.com/mathesar-foundation/mathesar/pull/3856 "Get 'Extract Columns' and 'Move Columns' Functionality Working Again")_
-- Allow Patching Records via String PKs _[#3857](https://github.com/mathesar-foundation/mathesar/pull/3857 "Allow Patching Records via String PKs")_
-- Implement `roles.delete`, `databases.drop` & `databases.configured.disconnect` Endpoints _[#3858](https://github.com/mathesar-foundation/mathesar/pull/3858 "Implement `roles.delete`, `databases.drop` & `databases.configured.disconnect` Endpoints")_
-- Bugfix Summarizations _[#3884](https://github.com/mathesar-foundation/mathesar/pull/3884 "Bugfix Summarizations")_
-- Fix Insert for Table with Only ID Column _[#3885](https://github.com/mathesar-foundation/mathesar/pull/3885 "Fix Insert for Table with Only ID Column")_
-- Get Explorations CRUD Working Again _[#3893](https://github.com/mathesar-foundation/mathesar/pull/3893 "Get Explorations CRUD Working Again")_
-- Fix Broken Exploration "Column Added" Indicators _[#3894](https://github.com/mathesar-foundation/mathesar/pull/3894 "Fix Broken Exploration 'Column Added' Indicators")_
+We do not support upgrading from previous versions to `0.2.0-testing.1`. 
 
 ## Improvements
 
-### Permissions system
+### Access control based on PostgreSQL roles and privileges
 
-The new permissions system introduces comprehensive access control features, including role configurations, ownership transfers, and granular permission management for databases, schemas, and tables.
+![image](../../assets/releases/0.2.0-testing.1/db-settings-collaborators.png)
 
-- Initial Permissions Remodel _[#3626](https://github.com/mathesar-foundation/mathesar/pull/3626 "Initial Permissions Remodel")_
-- Endpoints for Servers, Collaborators _[#3684](https://github.com/mathesar-foundation/mathesar/pull/3684 "Endpoints for Servers, Collaborators")_
-- Endpoints for Configured Roles _[#3685](https://github.com/mathesar-foundation/mathesar/pull/3685 "Endpoints for Configured Roles")_
-- Remove Existing Permissions Logic on the Frontend _[#3689](https://github.com/mathesar-foundation/mathesar/pull/3689 "Remove Existing Permissions Logic on the Frontend")_
-- Homepage Changes for Database Connections _[#3710](https://github.com/mathesar-foundation/mathesar/pull/3710 "Homepage Changes for Database Connections")_
-- Homepage UI _[#3711](https://github.com/mathesar-foundation/mathesar/pull/3711 "Homepage UI")_
-- Database Page Role Configuration, Collaborators, Roles _[#3762](https://github.com/mathesar-foundation/mathesar/pull/3762 "Database Page Role Configuration, Collaborators, Roles")_
-- Move db page contexts to the route level _[#3789](https://github.com/mathesar-foundation/mathesar/pull/3789 "Move db page contexts to the route level")_
-- Add Privilege Information Fields _[#3795](https://github.com/mathesar-foundation/mathesar/pull/3795 "Add Privilege Information Fields")_
-- Database Permissions Modal 'Share' Tab _[#3810](https://github.com/mathesar-foundation/mathesar/pull/3810 "Database Permissions Modal 'Share' Tab")_
-- Implement Permissions Modal for Schemas and Tables _[#3836](https://github.com/mathesar-foundation/mathesar/pull/3836 "Implement Permissions Modal for Schemas and Tables")_, _[#3838](https://github.com/mathesar-foundation/mathesar/pull/3838 "Implement Permissions Modal for Schemas and Tables")_
-- Allow Setting Owner at Creation _[#3840](https://github.com/mathesar-foundation/mathesar/pull/3840 "Allow Setting Owner at Creation")_
-- Implement 'Transfer Ownership' Tabs _[#3859](https://github.com/mathesar-foundation/mathesar/pull/3859 "Implement 'Transfer Ownership' Tabs")_
-- Permission Checks in All Pages, Disconnect Database Option _[#3861](https://github.com/mathesar-foundation/mathesar/pull/3861 "Permission Checks in All Pages, Disconnect Database Option")_
-- Filter Databases for Admin and Standard Users _[#3895](https://github.com/mathesar-foundation/mathesar/pull/3895 "Filter Databases for Admin and Standard Users")_
-- Fix Quoting for Role Grant/Revoke Expressions _[#3931](https://github.com/mathesar-foundation/mathesar/pull/3931 "Fix Quoting for Role Grant/Revoke Expressions")_
+We have a brand new access control system based entirely on PostgreSQL database roles and privileges. Mathesar users must now be assigned a database role, and any operations performed by the user through the Mathesar UI will connect to the database using that role. 
 
-### Performance optimizations
+This gives Mathesar several new capabilities. Database administrators can set up access control directly on the database and use those roles in Mathesar. Mathesar also supports setting up PostgreSQL roles and privileges via the UI, including granular access control at the individual table level.
 
-These changes improve Mathesar's performance by speeding up installation and optimizing cell selection.
+This replaces our previous access control system (which was enforced at the API layer, and only supported permissions at the database and schema levels). It also eliminates the need for Mathesar to use a database superuser for day-to-day operations.
 
-- Refactor CellSelection Data Structure and Store _[#3037](https://github.com/mathesar-foundation/mathesar/pull/3037 "Refactor CellSelection Data Structure and Store")_
-- Handle Negative Numbers in TSV Serialization for Copy _[#3582](https://github.com/mathesar-foundation/mathesar/pull/3582 "Handle Negative Numbers in TSV Serialization for Copy")_
-- Fast Install _[#3917](https://github.com/mathesar-foundation/mathesar/pull/3917 "Fast Install")_
+- Initial permissions remodel _[#3626](https://github.com/mathesar-foundation/mathesar/pull/3626 "Initial permissions remodel")_
+- Implement RPC endpoint for listing roles in server _[#3663](https://github.com/mathesar-foundation/mathesar/pull/3663 "Implement RPC endpoint for listing roles in server")_
+- Endpoints for servers, collaborators _[#3684](https://github.com/mathesar-foundation/mathesar/pull/3684 "Endpoints for servers, collaborators")_
+- Endpoints for configured roles _[#3685](https://github.com/mathesar-foundation/mathesar/pull/3685 "Endpoints for configured roles")_
+- Remove existing permissions logic on the frontend _[#3689](https://github.com/mathesar-foundation/mathesar/pull/3689 "Remove existing permissions logic on the frontend")_
+- Homepage changes for database connections _[#3710](https://github.com/mathesar-foundation/mathesar/pull/3710 "Homepage changes for database connections")_
+- Homepage UI _[#3711](https://github.com/mathesar-foundation/mathesar/pull/3711 "Homepage UI")_
+- Database page role configuration, collaborators, roles _[#3762](https://github.com/mathesar-foundation/mathesar/pull/3762 "Database page role configuration, collaborators, roles")_
+- Implement `roles.add` RPC endpoint _[#3769](https://github.com/mathesar-foundation/mathesar/pull/3769 "Implement `roles.add` RPC endpoint")_
+- Move DB page contexts to the route level _[#3789](https://github.com/mathesar-foundation/mathesar/pull/3789 "Move DB page contexts to the route level")_
+- Add privilege information fields _[#3795](https://github.com/mathesar-foundation/mathesar/pull/3795 "Add privilege information fields")_
+- Database permissions modal - 'Share' tab _[#3810](https://github.com/mathesar-foundation/mathesar/pull/3810 "Database permissions modal - 'Share' tab")_
+- Implement permissions modal for schemas and tables _[#3836](https://github.com/mathesar-foundation/mathesar/pull/3836 "Implement permissions modal for schemas and tables")_, _[#3838](https://github.com/mathesar-foundation/mathesar/pull/3838 "Implement permissions modal for schemas and tables")_
+- Allow setting owner at creation _[#3840](https://github.com/mathesar-foundation/mathesar/pull/3840 "Allow setting owner at Creation")_
+- Implement `roles.delete`, `databases.drop` & `databases.configured.disconnect` endpoints _[#3858](https://github.com/mathesar-foundation/mathesar/pull/3858 "Implement `roles.delete`, `databases.drop` & `databases.configured.disconnect` endpoints")_
+- Implement 'Transfer ownership' tabs _[#3859](https://github.com/mathesar-foundation/mathesar/pull/3859 "Implement 'Transfer ownership' tabs")_
+- Permission checks in all pages, disconnect database option _[#3861](https://github.com/mathesar-foundation/mathesar/pull/3861 "permission checks in all pages, Disconnect database option")_
+- Filter databases for admin and standard users _[#3895](https://github.com/mathesar-foundation/mathesar/pull/3895 "Filter databases for admin and standard users")_
+- Fix quoting for role grant/revoke expressions _[#3931](https://github.com/mathesar-foundation/mathesar/pull/3931 "Fix quoting for role grant/revoke expressions")_
+
+### Performance improvements and RPC API
+
+We've made major improvements to the responsiveness of the Mathesar UI. Loading data and data entry should be much more snappy, and importing data into Mathsar is around 50 times faster.
+
+To achieve these performance benefits, we needed to overhaul our backend architecture and API. We have built out a new RPC API and our frontend UI now primarily uses that API.
+
+Most of our REST API endpoints are now deprecated and will be removed soon. The `/users/` and `/data-files/` endpoints remain in use.
+
+- Connections RPC front end _[#3543](https://github.com/mathesar-foundation/mathesar/pull/3543 "Connections RPC front end")_
+- Exception handler tests _[#3547](https://github.com/mathesar-foundation/mathesar/pull/3547 "Exception handler tests")_
+- Fix SQL syntax highlighting in VS code for SQL tests _[#3588](https://github.com/mathesar-foundation/mathesar/pull/3588 "Fix SQL syntax highlighting in VS code for SQL tests")_
+- Remove dead front end API client code to GET one schema _[#3589](https://github.com/mathesar-foundation/mathesar/pull/3589 "Remove dead front end API client code to GET one schema")_
+- Implement `tables.delete` RPC endpoint _[#3608](https://github.com/mathesar-foundation/mathesar/pull/3608 "Implement `tables.delete` RPC endpoint")_
+- Implement `schemas.delete` RPC method _[#3610](https://github.com/mathesar-foundation/mathesar/pull/3610 "Implement `schemas.delete` RPC method")_
+- Implement `tables.get` RPC endpoint _[#3612](https://github.com/mathesar-foundation/mathesar/pull/3612 "Implement `tables.get` RPC endpoint")_
+- Implement `tables.add` RPC endpoint _[#3614](https://github.com/mathesar-foundation/mathesar/pull/3614 "Implement `tables.add` RPC endpoint")_
+- Add `columns.patch` RPC function _[#3615](https://github.com/mathesar-foundation/mathesar/pull/3615 "Add `columns.patch` RPC function")_
+- Add `columns.add` RPC function _[#3616](https://github.com/mathesar-foundation/mathesar/pull/3616 "Add `columns.add` RPC function")_
+- Implement `tables.patch` RPC endpoint _[#3618](https://github.com/mathesar-foundation/mathesar/pull/3618 "Implement `tables.patch` RPC endpoint")_
+- Implement `schemas.add` RPC method _[#3620](https://github.com/mathesar-foundation/mathesar/pull/3620 "Implement `schemas.add` RPC method")_
+- Implement `table.import` RPC endpoint _[#3623](https://github.com/mathesar-foundation/mathesar/pull/3623 "Implement `table.import` RPC endpoint")_
+- Implement `schemas.patch` RPC method _[#3628](https://github.com/mathesar-foundation/mathesar/pull/3628 "Implement `schemas.patch` RPC method")_
+- Wire RPC functions to new models _[#3632](https://github.com/mathesar-foundation/mathesar/pull/3632 "Wire RPC functions to new models")_
+- Quoting refactor _[#3633](https://github.com/mathesar-foundation/mathesar/pull/3633 "Quoting refactor")_
+- Auto generate table name _[#3637](https://github.com/mathesar-foundation/mathesar/pull/3637 "Auto generate table name")_
+- Add `columns.metadata.list` RPC function _[#3641](https://github.com/mathesar-foundation/mathesar/pull/3641 "Add `columns.metadata.list` RPC function")_
+- Implement `tables.metadata` `list` & `patch` RPC endpoint _[#3646](https://github.com/mathesar-foundation/mathesar/pull/3646 "Implement `tables.metadata` `list` & `patch` RPC endpoint")_
+- Fix issue with removing comments on schemas _[#3649](https://github.com/mathesar-foundation/mathesar/pull/3649 "Allow unsetting schema comment using NULL")_
+- Drop old SQL function signature _[#3650](https://github.com/mathesar-foundation/mathesar/pull/3650 "Drop old SQL function signature")_
+- Implement tables list and delete RPC APIs _[#3651](https://github.com/mathesar-foundation/mathesar/pull/3651 "Implement tables list and delete RPC APIs")_
+- Columns meta RPC patch _[#3653](https://github.com/mathesar-foundation/mathesar/pull/3653 "Columns meta RPC patch")_
+- Constraints RPC transition _[#3664](https://github.com/mathesar-foundation/mathesar/pull/3664 "Constraints RPC transition")_
+- Cast OIDs to bigint before putting in JSON _[#3666](https://github.com/mathesar-foundation/mathesar/pull/3666 "Cast OIDs to bigint before putting in JSON")_
+- Improve tables metadata _[#3672](https://github.com/mathesar-foundation/mathesar/pull/3672 "Improve tables metadata")_
+- RPC implementation for `types.list` _[#3676](https://github.com/mathesar-foundation/mathesar/pull/3676 "RPC implementation for `types.list`")_
+- Add `records.list` RPC function _[#3691](https://github.com/mathesar-foundation/mathesar/pull/3691 "Add `records.list` RPC function")_
+- RPC transition for explorations `list` and `delete` _[#3694](https://github.com/mathesar-foundation/mathesar/pull/3694 "RPC transition for explorations `list` and `delete`")_
+- Implement `explorations.run` RPC endpoint _[#3696](https://github.com/mathesar-foundation/mathesar/pull/3696 "Implement `explorations.run` RPC endpoint")_
+- Fix Issues with `tables.patch` RPC method _[#3699](https://github.com/mathesar-foundation/mathesar/pull/3699 "Fix Issues with `tables.patch` RPC method")_
+- RPC records list filtering _[#3700](https://github.com/mathesar-foundation/mathesar/pull/3700 "RPC records list filtering")_
+- Return empty array when schema has no tables _[#3702](https://github.com/mathesar-foundation/mathesar/pull/3702 "Return empty array when schema has no tables")_
+- RPC endpoint for column info with metadata _[#3703](https://github.com/mathesar-foundation/mathesar/pull/3703 "RPC endpoint for column info with metadata")_
+- First steps of RPC implementation for table page _[#3704](https://github.com/mathesar-foundation/mathesar/pull/3704 "First steps of RPC implementation for table page")_
+- Add `records.search` RPC function _[#3708](https://github.com/mathesar-foundation/mathesar/pull/3708 "Add `records.search` RPC function")_
+- Alter column metadata fields _[#3717](https://github.com/mathesar-foundation/mathesar/pull/3717 "Alter column metadata fields")_
+- Records grouping _[#3721](https://github.com/mathesar-foundation/mathesar/pull/3721 "Records grouping")_
+- Fix "no current database" error _[#3723](https://github.com/mathesar-foundation/mathesar/pull/3723 "Fix 'no current database' error")_
+- Handle new records filtering on the front end _[#3728](https://github.com/mathesar-foundation/mathesar/pull/3728 "Handle new records filtering on the front end")_
+- Implement explorations `add` & `replace` endpoint _[#3731](https://github.com/mathesar-foundation/mathesar/pull/3731 "Implement explorations `add` & `replace` endpoint")_
+- Add `records.get` RPC function _[#3740](https://github.com/mathesar-foundation/mathesar/pull/3740 "Add `records.get` RPC function")_
+- Add `records.delete` RPC function _[#3741](https://github.com/mathesar-foundation/mathesar/pull/3741 "Add `records.delete` RPC function")_
+- Add `records.add` RPC function _[#3745](https://github.com/mathesar-foundation/mathesar/pull/3745 "Add `records.add` RPC function")_
+- Adapt front end to new RPC-based joinable tables API _[#3746](https://github.com/mathesar-foundation/mathesar/pull/3746 "Adapt front end to new RPC-based joinable tables API")_
+- Fix edge case while getting joinable tables for tables with no links _[#3748](https://github.com/mathesar-foundation/mathesar/pull/3748 "Fix edge case while getting joinable tables for tables with no links")_
+- Add `records.patch` RPC function _[#3749](https://github.com/mathesar-foundation/mathesar/pull/3749 "Add `records.patch` RPC function")_
+- Records grouping bugfix _[#3751](https://github.com/mathesar-foundation/mathesar/pull/3751 "Records grouping bugfix")_
+- Records delete bugfix _[#3754](https://github.com/mathesar-foundation/mathesar/pull/3754 "Records delete bugfix")_
+- Adapt front end to new records grouping API _[#3755](https://github.com/mathesar-foundation/mathesar/pull/3755 "Adapt front end to new records grouping API")_
+- Implement RPC records CRUD operations on front end _[#3759](https://github.com/mathesar-foundation/mathesar/pull/3759 "Implement RPC records CRUD operations on front end")_
+- Add simplified record summaries _[#3761](https://github.com/mathesar-foundation/mathesar/pull/3761 "Add simplified record summaries")_
+- Add link-adding RPC functions _[#3767](https://github.com/mathesar-foundation/mathesar/pull/3767 "Add link-adding RPC functions")_
+- Reorganize namespacing _[#3799](https://github.com/mathesar-foundation/mathesar/pull/3799 "Reorganize namespacing")_
+- Hard-code abstract types response in client _[#3800](https://github.com/mathesar-foundation/mathesar/pull/3800 "Hard-code abstract types response in client")_
+- Change response structure for record summary _[#3802](https://github.com/mathesar-foundation/mathesar/pull/3802 "Change response structure for record summary")_
+- Modify pkey finder to return False when no pkey exists _[#3804](https://github.com/mathesar-foundation/mathesar/pull/3804 "Modify pkey finder to return False when no pkey exists")_
+- Change response for `tables.add` and `tables.import` _[#3807](https://github.com/mathesar-foundation/mathesar/pull/3807 "Change response for `tables.add` and `tables.import`")_
+- Add summaries to self _[#3808](https://github.com/mathesar-foundation/mathesar/pull/3808 "Add summaries to self")_
+- Move columns SQL _[#3809](https://github.com/mathesar-foundation/mathesar/pull/3809 "Move columns SQL")_
+- Propagate RPC record summary changes to front end _[#3811](https://github.com/mathesar-foundation/mathesar/pull/3811 "Propagate RPC record summary changes to front end")_
+- Get imports working again _[#3819](https://github.com/mathesar-foundation/mathesar/pull/3819 "Get imports working again")_
+- Use data file name as table name during import _[#3824](https://github.com/mathesar-foundation/mathesar/pull/3824 "Use data file name as table name during import")_
+- A couple small front end RPC changes _[#3825](https://github.com/mathesar-foundation/mathesar/pull/3825 "A couple small front end RPC changes")_
+- Bugfix listing records from a table with self-Referential FK _[#3831](https://github.com/mathesar-foundation/mathesar/pull/3831 "Bugfix listing records from a table with self-Referential FK")_
+- Hard-code type cast map on front end _[#3832](https://github.com/mathesar-foundation/mathesar/pull/3832 "Hard-code type cast map on front end")_
+- Alter response for schemas `add` and `patch` endpoints & implement `schemas.get` _[#3837](https://github.com/mathesar-foundation/mathesar/pull/3837 "Alter response for schemas `add` and `patch` endpoints & implement `schemas.get`")_
+- Propagate RPC changes to record selector _[#3843](https://github.com/mathesar-foundation/mathesar/pull/3843 "Propagate RPC changes to record selector")_
+- Use RPC API for column metadata _[#3845](https://github.com/mathesar-foundation/mathesar/pull/3845 "Use RPC API for column metadata")_
+- Propagate RPC changes to link table dialog _[#3847](https://github.com/mathesar-foundation/mathesar/pull/3847 "Propagate RPC changes to link table dialog")_
+- Alter response for record summaries with NULL records _[#3852](https://github.com/mathesar-foundation/mathesar/pull/3852 "Alter response for record summaries with NULL records")_
+- Make `records.get` work with stringified PK values _[#3853](https://github.com/mathesar-foundation/mathesar/pull/3853 "Make `records.get` work with stringified PK values")_
+- Enabling running of very simple explorations _[#3855](https://github.com/mathesar-foundation/mathesar/pull/3855 "Enabling running of very simple explorations")_
+- Get "extract columns" and "move columns" functionality working again _[#3856](https://github.com/mathesar-foundation/mathesar/pull/3856 "Get 'extract columns' and 'move columns' functionality working again")_
+- Allow patching records via string PKs _[#3857](https://github.com/mathesar-foundation/mathesar/pull/3857 "Allow patching records via string PKs")_
+- Fix updating of table name _[#3879](https://github.com/mathesar-foundation/mathesar/pull/3879 "Fix ypdating of table name")_
+- Bugfix summarizations _[#3884](https://github.com/mathesar-foundation/mathesar/pull/3884 "Bugfix summarizations")_
+- Fix insert for table with only ID column _[#3885](https://github.com/mathesar-foundation/mathesar/pull/3885 "Fix insert for table with only ID column")_
+- Get explorations CRUD working again _[#3893](https://github.com/mathesar-foundation/mathesar/pull/3893 "Get explorations CRUD working again")_
+- Reduces frontend caching, fixes a few bugs _[#3897](https://github.com/mathesar-foundation/mathesar/pull/3897 "Reduces frontend caching, fixes a few bugs")_
+- Fix broken exploration "column added" indicators _[#3894](https://github.com/mathesar-foundation/mathesar/pull/3894 "Fix broken exploration 'column added' indicators")_
+- Fix bug when updating table twice _[#3909](https://github.com/mathesar-foundation/mathesar/pull/3909 "Fix bug when updating table twice")
+
+### Visual improvements
+
+We made several visual improvements to Mathesar to ensure consistency, better usability, and adherence to design guidelines. The changes were mainly to various modals and to the table inspector.
+
+A before-and-after comparison of the "Create Link" modal can be seen below.
+
+![image](../../assets/releases/0.2.0-testing.1/create-link-changes.png)
+
+- Show a loading spinner for table pages _[#3602](https://github.com/mathesar-foundation/mathesar/pull/3602 "Show a loading spinner for table pages")_
+- UI consistency improvements for modals and table inspector _[#3860](https://github.com/mathesar-foundation/mathesar/pull/3860 "UI consistency improvements")_
 
-### UI improvements
+## Bug fixes
 
-- Show a Loading Spinner for Table Pages _[#3602](https://github.com/mathesar-foundation/mathesar/pull/3602 "Show a Loading Spinner for Table Pages")_
-- UI Consistency Improvements _[#3860](https://github.com/mathesar-foundation/mathesar/pull/3860 "UI Consistency Improvements")_
+Bugs related to permissions or the backend overhaul are listed in the relevant sections above. The bugs listed here are unrelated to those changes.
 
-## Groundwork
+- Fix error when trying to reset password of other user _[#3536](https://github.com/mathesar-foundation/mathesar/pull/3536 "Fix change password error")_
+- Handle negative numbers not being serialized correctly when copying  _[#3582](https://github.com/mathesar-foundation/mathesar/pull/3582 "Handle negative numbers in TSV serialization for copy")_
+- Fix timeout when installing Mathesar on a remote DB _[#3917](https://github.com/mathesar-foundation/mathesar/pull/3917 "Fast install")_
 
-- Hard-Code Type Cast Map on Front End _[#3832](https://github.com/mathesar-foundation/mathesar/pull/3832 "Hard-Code Type Cast Map on Front End")_
 
-## Bug fixes
+## Live demo changes
 
-- Fix Change Password Error _[#3536](https://github.com/mathesar-foundation/mathesar/pull/3536 "Fix Change Password Error")_
-- Allow Unsetting Schema Comment Using NULL _[#3649](https://github.com/mathesar-foundation/mathesar/pull/3649 "Allow Unsetting Schema Comment Using NULL")_
-- Fix Install Script _[#3678](https://github.com/mathesar-foundation/mathesar/pull/3678 "Fix Install Script")_
-- Return Empty Array When Schema Has No Tables _[#3702](https://github.com/mathesar-foundation/mathesar/pull/3702 "Return Empty Array When Schema Has No Tables")_
-- Fix "No Current Database" Error _[#3723](https://github.com/mathesar-foundation/mathesar/pull/3723 "Fix 'No Current Database' Error")_
-- Modify Pkey Finder to Return False When No Pkey Exists _[#3804](https://github.com/mathesar-foundation/mathesar/pull/3804 "Modify Pkey Finder to Return False When No Pkey Exists")_
-- Alter Response for Record Summaries with Null Records _[#3852](https://github.com/mathesar-foundation/mathesar/pull/3852 "Alter Response for Record Summaries with Null Records")_
-- Fix Updating of Table Name _[#3879](https://github.com/mathesar-foundation/mathesar/pull/3879 "Fix Updating of Table Name")_
-- Reduces Frontend Caching, Fixes a Few Bugs _[#3897](https://github.com/mathesar-foundation/mathesar/pull/3897 "Reduces Frontend Caching, Fixes a Few Bugs")_
-- Fix bug when updating table twice _[#3909](https://github.com/mathesar-foundation/mathesar/pull/3909 "Fix bug when updating table twice")_
-- Fix quoting refactor for role grant/revoke expressions _[#3931](https://github.com/mathesar-foundation/mathesar/pull/3931 "Fix quoting refactor for role grant/revoke expressions")_
+We have removed code related to Mathesar's "live demo" mode since we didn't think it made sense to include code for our promotional website in the core product. If we do choose to maintain our live demo in the future, we will set up a separate microservice that performs some of these functions.
 
-## Documentation
+We also set up a workflow to reset the live demo regularly to mitigate reliability issues.
 
-- Update Docs to Add Instructions for Loading Data from Playground _[#3535](https://github.com/mathesar-foundation/mathesar/pull/3535 "Update Docs to Add Instructions for Loading Data from Playground")_
+- Remove demo code and E2E infrastructure _[#3538](https://github.com/mathesar-foundation/mathesar/pull/3538 "Remove demo code and E2E infrastructure")_, _[#3551](https://github.com/mathesar-foundation/mathesar/pull/3551 "Remove E2E infrastructure")_
+- Add GitHub workflow to reset demo _[#3577](https://github.com/mathesar-foundation/mathesar/pull/3577 "Add GitHub workflow to reset demo")_
+- Updates to GH workflow for resetting demo _[#3579](https://github.com/mathesar-foundation/mathesar/pull/3579 "Updates to GH workflow for resetting demo")_
+- Updates to GH workflow to reset demo _[#3580](https://github.com/mathesar-foundation/mathesar/pull/3580 "Updates to GH workflow to reset demo")_
+- Remove the demo reset workflow _[#3581](https://github.com.mathesar-foundation/mathesar/pull/3581 "Remove the demo reset workflow")_
 
 ## Maintenance
 
-- Remove Demo Code and E2E Infrastructure _[#3538](https://github.com/mathesar-foundation/mathesar/pull/3538 "Remove Demo Code and E2E Infrastructure")_, _[#3551](https://github.com/mathesar-foundation/mathesar/pull/3551 "Remove E2E Infrastructure")_
-- Bump Dependencies _[#3544](https://github.com/mathesar-foundation/mathesar/pull/3544 "Bump Dependencies")_, _[#3604](https://github.com/mathesar-foundation/mathesar/pull/3604 "Bump Dependencies")_
-- Sort Frontend Imports _[#3552](https://github.com/mathesar-foundation/mathesar/pull/3552 "Sort Frontend Imports")_
-- Add GitHub Workflow to Reset Demo _[#3577](https://github.com/mathesar-foundation/mathesar/pull/3577 "Add GitHub Workflow to Reset Demo")_
-- Updates to GH Workflow for Resetting Demo _[#3579](https://github.com/mathesar-foundation/mathesar/pull/3579 "Updates to GH Workflow for Resetting Demo")_
-- Updates to GH Workflow to Reset Demo _[#3580](https://github.com/mathesar-foundation/mathesar/pull/3580 "Updates to GH Workflow to Reset Demo")_
-- Remove the Demo Reset Workflow _[#3581](https://github.com.mathesar-foundation/mathesar/pull/3581 "Remove the Demo Reset Workflow")_
-- Architectural Overhaul _[#3587](https://github.com/mathesar-foundation/mathesar/pull/3587 "Architectural Overhaul")_
-- Quoting Refactor _[#3633](https://github.com/mathesar-foundation/mathesar/pull/3633 "Quoting Refactor")_
-- Add SQL Code Standard for Casting OIDs to Bigint _[#3643](https://github.com/mathesar-foundation/mathesar/pull/3643 "Add SQL Code Standard for Casting OIDs to Bigint")_
-- Drop Old SQL Function Signature _[#3650](https://github.com/mathesar-foundation/mathesar/pull/3650 "Drop Old SQL Function Signature")_
-- Update MkDocs Dependencies _[#3763](https://github.com/mathesar-foundation/mathesar/pull/3763 "Update MkDocs Dependencies")_
+Miscellanous work done to reduce technical debt, improve developer documentation, and maintain our workflow.
+
+- Refactor CellSelection data structure and store _[#3037](https://github.com/mathesar-foundation/mathesar/pull/3037 "Refactor CellSelection data structure and store")_
+- Remove API documentation infrastructure _[#3541](https://github.com/mathesar-foundation/mathesar/pull/3541 "Remove API documentation infrastructure")_
+- Remove Debian build _[#3546](https://github.com/mathesar-foundation/mathesar/pull/3546 "Remove Debian build")_
+- Update docs to add instructions for loading data from playground _[#3535](https://github.com/mathesar-foundation/mathesar/pull/3535 "Update docs to add instructions for loading data from playground")_
+- Resolve merge conflict for #3558 _[#3559](https://github.com/mathesar-foundation/mathesar/pull/3559 "Resolve merge conflict for #3558")_
+- Revert #3559 _[#3567](https://github.com/mathesar-foundation/mathesar/pull/3567 "Revert #3559")_
+- Bump dependencies _[#3544](https://github.com/mathesar-foundation/mathesar/pull/3544 "Bump dependencies")_, _[#3604](https://github.com/mathesar-foundation/mathesar/pull/3604 "Bump dependencies")_
+- Sort frontend imports _[#3552](https://github.com/mathesar-foundation/mathesar/pull/3552 "Sort frontend imports")_
+- Architectural overhaul _[#3587](https://github.com/mathesar-foundation/mathesar/pull/3587 "Architectural overhaul")_
+- Add SQL code standard for casting OIDs to bigint _[#3643](https://github.com/mathesar-foundation/mathesar/pull/3643 "Add SQL code standard for casting OIDs to bigint")_
+- Fix issue with SQL migrations not running when service restarts _[#3678](https://github.com/mathesar-foundation/mathesar/pull/3678 "Fix install script")_
+- Merge breaking changes into `develop` _[#3695](https://github.com/mathesar-foundation/mathesar/pull/3695 "Merge breaking changes into `develop`")_
+- Update MkDocs dependencies _[#3763](https://github.com/mathesar-foundation/mathesar/pull/3763 "Update MkDocs dependencies")_
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 0c3e440b6c..80d2e4f6c1 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -30,6 +30,8 @@ nav:
   - API:
       - REST: api/rest.md
       - RPC: api/rpc.md
+  - Test Builds:
+      - '0.2.0-testing.1': releases/0.2.0-testing.1.md
   - Releases:
       - '0.1.7': releases/0.1.7.md
       - '0.1.6': releases/0.1.6.md

From 935e01a808226573fda17050f299328145d2d9af Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Sat, 12 Oct 2024 03:43:57 -0400
Subject: [PATCH 1105/1141] Added RPC docs note.

---
 docs/docs/api/rpc.md                  | 2 +-
 docs/docs/releases/0.2.0-testing.1.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/docs/api/rpc.md b/docs/docs/api/rpc.md
index 9f91c2f4b8..2617eb0db2 100644
--- a/docs/docs/api/rpc.md
+++ b/docs/docs/api/rpc.md
@@ -8,7 +8,7 @@ Mathesar has an API available at `/api/rpc/v0/` which follows the [JSON-RPC](htt
 
 We are currently in the process of [transitioning](https://wiki.mathesar.org/projects/2024/architecture-transition/rpc/) our API architecture from a [RESTful](rest.md) API to this RPC-style API, and we hope to have all functionality available through the RPC API by Mathesar's beta release.
 
-!!! caution "Stability"
+!!! danger "Stability"
     The RPC API is not yet stable and may change in the future, even after we've completed the transition to the RPC API architecture. If you build logic that depends on this API, be mindful that it may change in the future without warning or notice.
 
 ### Usage
diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index 4baebde145..da6f55a2b3 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -51,7 +51,7 @@ This replaces our previous access control system (which was enforced at the API
 
 We've made major improvements to the responsiveness of the Mathesar UI. Loading data and data entry should be much more snappy, and importing data into Mathsar is around 50 times faster.
 
-To achieve these performance benefits, we needed to overhaul our backend architecture and API. We have built out a new RPC API and our frontend UI now primarily uses that API.
+To achieve these performance benefits, we needed to overhaul our backend architecture and API. We have built out a new RPC API and our frontend UI now primarily uses that API. The RPC API is [has some documentation here](../../api/rpc.md), but should not be considered stable yet.
 
 Most of our REST API endpoints are now deprecated and will be removed soon. The `/users/` and `/data-files/` endpoints remain in use.
 

From 17b4e5c0edf03fb80008879ada2eecd7d7aeee6b Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Sat, 12 Oct 2024 03:45:56 -0400
Subject: [PATCH 1106/1141] Fixed link.

---
 docs/docs/releases/0.2.0-testing.1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index da6f55a2b3..fa7615de4e 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -51,7 +51,7 @@ This replaces our previous access control system (which was enforced at the API
 
 We've made major improvements to the responsiveness of the Mathesar UI. Loading data and data entry should be much more snappy, and importing data into Mathsar is around 50 times faster.
 
-To achieve these performance benefits, we needed to overhaul our backend architecture and API. We have built out a new RPC API and our frontend UI now primarily uses that API. The RPC API is [has some documentation here](../../api/rpc.md), but should not be considered stable yet.
+To achieve these performance benefits, we needed to overhaul our backend architecture and API. We have built out a new RPC API and our frontend UI now primarily uses that API. The RPC API is [has some documentation here](../api/rpc.md), but should not be considered stable yet.
 
 Most of our REST API endpoints are now deprecated and will be removed soon. The `/users/` and `/data-files/` endpoints remain in use.
 

From e8f304302f17dd37373443a72bf7096b77583d36 Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Sat, 12 Oct 2024 04:23:07 -0400
Subject: [PATCH 1107/1141] Added missing PRs.

---
 docs/docs/releases/0.2.0-testing.1.md | 66 ++++++++++++++++++++++-----
 1 file changed, 55 insertions(+), 11 deletions(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index fa7615de4e..6af4f537e2 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -19,32 +19,46 @@ We do not support upgrading from previous versions to `0.2.0-testing.1`.
 
 ### Access control based on PostgreSQL roles and privileges
 
-![image](../../assets/releases/0.2.0-testing.1/db-settings-collaborators.png)
-
 We have a brand new access control system based entirely on PostgreSQL database roles and privileges. Mathesar users must now be assigned a database role, and any operations performed by the user through the Mathesar UI will connect to the database using that role. 
 
+![image](../../assets/releases/0.2.0-testing.1/db-settings-collaborators.png)
+
 This gives Mathesar several new capabilities. Database administrators can set up access control directly on the database and use those roles in Mathesar. Mathesar also supports setting up PostgreSQL roles and privileges via the UI, including granular access control at the individual table level.
 
 This replaces our previous access control system (which was enforced at the API layer, and only supported permissions at the database and schema levels). It also eliminates the need for Mathesar to use a database superuser for day-to-day operations.
 
+More detailed documentation can be found in our User Guide under [Permissions](../../user-guide/permissions/) and [Users](../../user-guide/users/).
+
+------
+
 - Initial permissions remodel _[#3626](https://github.com/mathesar-foundation/mathesar/pull/3626 "Initial permissions remodel")_
 - Implement RPC endpoint for listing roles in server _[#3663](https://github.com/mathesar-foundation/mathesar/pull/3663 "Implement RPC endpoint for listing roles in server")_
+- Initial `database_setup` RPC functions _[#3665](https://github.com/mathesar-foundation/mathesar/pull/3665 "Initial `database_setup` RPC functions")_
+- Cast OID values to bigint in msar.get_roles _[#3667](https://github.com/mathesar-foundation/mathesar/pull/3667 "Cast OID values to bigint in msar.get_roles")_
 - Endpoints for servers, collaborators _[#3684](https://github.com/mathesar-foundation/mathesar/pull/3684 "Endpoints for servers, collaborators")_
 - Endpoints for configured roles _[#3685](https://github.com/mathesar-foundation/mathesar/pull/3685 "Endpoints for configured roles")_
 - Remove existing permissions logic on the frontend _[#3689](https://github.com/mathesar-foundation/mathesar/pull/3689 "Remove existing permissions logic on the frontend")_
 - Homepage changes for database connections _[#3710](https://github.com/mathesar-foundation/mathesar/pull/3710 "Homepage changes for database connections")_
 - Homepage UI _[#3711](https://github.com/mathesar-foundation/mathesar/pull/3711 "Homepage UI")_
+- Implement `database_privileges.list_direct` RPC endpoint. _[#3750](https://github.com/mathesar-foundation/mathesar/pull/3750 "Implement `database_privileges.list_direct` RPC endpoint.")_
+- Implement `database_privileges.get_owner_oid_and_curr_role_db_priv` RPC endpoint _[#3760](https://github.com/mathesar-foundation/mathesar/pull/3760 "Implement `database_privileges.get_owner_oid_and_curr_role_db_priv` RPC endpoint")_
 - Database page role configuration, collaborators, roles _[#3762](https://github.com/mathesar-foundation/mathesar/pull/3762 "Database page role configuration, collaborators, roles")_
 - Implement `roles.add` RPC endpoint _[#3769](https://github.com/mathesar-foundation/mathesar/pull/3769 "Implement `roles.add` RPC endpoint")_
+- Add `database_privileges.replace_for_roles` RPC function. _[#3781](https://github.com/mathesar-foundation/mathesar/pull/3781 "Add `database_privileges.replace_for_roles` RPC function.")_
+- Add `schema_privileges.replace_for_roles` RPC function _[#3786](https://github.com/mathesar-foundation/mathesar/pull/3786 "Add `schema_privileges.replace_for_roles` RPC function")_
 - Move DB page contexts to the route level _[#3789](https://github.com/mathesar-foundation/mathesar/pull/3789 "Move DB page contexts to the route level")_
 - Add privilege information fields _[#3795](https://github.com/mathesar-foundation/mathesar/pull/3795 "Add privilege information fields")_
 - Database permissions modal - 'Share' tab _[#3810](https://github.com/mathesar-foundation/mathesar/pull/3810 "Database permissions modal - 'Share' tab")_
+- Implement `transfer_ownership` for schemas and tables _[#3833](https://github.com/mathesar-foundation/mathesar/pull/3833 "Implement `transfer_ownership` for schemas and tables")_
 - Implement permissions modal for schemas and tables _[#3836](https://github.com/mathesar-foundation/mathesar/pull/3836 "Implement permissions modal for schemas and tables")_, _[#3838](https://github.com/mathesar-foundation/mathesar/pull/3838 "Implement permissions modal for schemas and tables")_
 - Allow setting owner at creation _[#3840](https://github.com/mathesar-foundation/mathesar/pull/3840 "Allow setting owner at Creation")_
 - Implement `roles.delete`, `databases.drop` & `databases.configured.disconnect` endpoints _[#3858](https://github.com/mathesar-foundation/mathesar/pull/3858 "Implement `roles.delete`, `databases.drop` & `databases.configured.disconnect` endpoints")_
 - Implement 'Transfer ownership' tabs _[#3859](https://github.com/mathesar-foundation/mathesar/pull/3859 "Implement 'Transfer ownership' tabs")_
 - Permission checks in all pages, disconnect database option _[#3861](https://github.com/mathesar-foundation/mathesar/pull/3861 "permission checks in all pages, Disconnect database option")_
+- Bugfix `get_current_role` when only one role exists _[#3869](https://github.com/mathesar-foundation/mathesar/pull/3869 "Bugfix `get_current_role` when only one role exists")_
+- Grant appropriate permissions for `msar`, `__msar` and `mathesar_types` to `PUBLIC` _[#3881](https://github.com/mathesar-foundation/mathesar/pull/3881 "Grant appropriate permissions for `msar`, `__msar` and `mathesar_types` to `PUBLIC`")_
 - Filter databases for admin and standard users _[#3895](https://github.com/mathesar-foundation/mathesar/pull/3895 "Filter databases for admin and standard users")_
+- Fix logic in `get_current_role` _[#3922](https://github.com/mathesar-foundation/mathesar/pull/3922 "Fix logic in `get_current_role`")_
 - Fix quoting for role grant/revoke expressions _[#3931](https://github.com/mathesar-foundation/mathesar/pull/3931 "Fix quoting for role grant/revoke expressions")_
 
 ### Performance improvements and RPC API
@@ -71,6 +85,7 @@ Most of our REST API endpoints are now deprecated and will be removed soon. The
 - Implement `schemas.patch` RPC method _[#3628](https://github.com/mathesar-foundation/mathesar/pull/3628 "Implement `schemas.patch` RPC method")_
 - Wire RPC functions to new models _[#3632](https://github.com/mathesar-foundation/mathesar/pull/3632 "Wire RPC functions to new models")_
 - Quoting refactor _[#3633](https://github.com/mathesar-foundation/mathesar/pull/3633 "Quoting refactor")_
+- Implement `tables.get_import_preview` RPC endpoint _[#3635](https://github.com/mathesar-foundation/mathesar/pull/3635 "Implement `tables.get_import_preview` RPC endpoint")_
 - Auto generate table name _[#3637](https://github.com/mathesar-foundation/mathesar/pull/3637 "Auto generate table name")_
 - Add `columns.metadata.list` RPC function _[#3641](https://github.com/mathesar-foundation/mathesar/pull/3641 "Add `columns.metadata.list` RPC function")_
 - Implement `tables.metadata` `list` & `patch` RPC endpoint _[#3646](https://github.com/mathesar-foundation/mathesar/pull/3646 "Implement `tables.metadata` `list` & `patch` RPC endpoint")_
@@ -80,20 +95,25 @@ Most of our REST API endpoints are now deprecated and will be removed soon. The
 - Columns meta RPC patch _[#3653](https://github.com/mathesar-foundation/mathesar/pull/3653 "Columns meta RPC patch")_
 - Constraints RPC transition _[#3664](https://github.com/mathesar-foundation/mathesar/pull/3664 "Constraints RPC transition")_
 - Cast OIDs to bigint before putting in JSON _[#3666](https://github.com/mathesar-foundation/mathesar/pull/3666 "Cast OIDs to bigint before putting in JSON")_
+- RPC implementation for `tables.list_joinable` _[#3669](https://github.com/mathesar-foundation/mathesar/pull/3669 "RPC implementation for `tables.list_joinable`")_
 - Improve tables metadata _[#3672](https://github.com/mathesar-foundation/mathesar/pull/3672 "Improve tables metadata")_
 - RPC implementation for `types.list` _[#3676](https://github.com/mathesar-foundation/mathesar/pull/3676 "RPC implementation for `types.list`")_
 - Add `records.list` RPC function _[#3691](https://github.com/mathesar-foundation/mathesar/pull/3691 "Add `records.list` RPC function")_
 - RPC transition for explorations `list` and `delete` _[#3694](https://github.com/mathesar-foundation/mathesar/pull/3694 "RPC transition for explorations `list` and `delete`")_
 - Implement `explorations.run` RPC endpoint _[#3696](https://github.com/mathesar-foundation/mathesar/pull/3696 "Implement `explorations.run` RPC endpoint")_
+- Fix return type error when re-defining `get_constraints_for_table` SQL function _[#3698](https://github.com/mathesar-foundation/mathesar/pull/3698 "Fix return type error when re-defining `get_constraints_for_table` SQL function")_
 - Fix Issues with `tables.patch` RPC method _[#3699](https://github.com/mathesar-foundation/mathesar/pull/3699 "Fix Issues with `tables.patch` RPC method")_
 - RPC records list filtering _[#3700](https://github.com/mathesar-foundation/mathesar/pull/3700 "RPC records list filtering")_
 - Return empty array when schema has no tables _[#3702](https://github.com/mathesar-foundation/mathesar/pull/3702 "Return empty array when schema has no tables")_
 - RPC endpoint for column info with metadata _[#3703](https://github.com/mathesar-foundation/mathesar/pull/3703 "RPC endpoint for column info with metadata")_
 - First steps of RPC implementation for table page _[#3704](https://github.com/mathesar-foundation/mathesar/pull/3704 "First steps of RPC implementation for table page")_
 - Add `records.search` RPC function _[#3708](https://github.com/mathesar-foundation/mathesar/pull/3708 "Add `records.search` RPC function")_
+- Wire up valid_target_type function to column lister _[#3709](https://github.com/mathesar-foundation/mathesar/pull/3709 "Wire up valid_target_type function to column lister")_
 - Alter column metadata fields _[#3717](https://github.com/mathesar-foundation/mathesar/pull/3717 "Alter column metadata fields")_
+- Add target_table_info in `tables.list_joinable's` response _[#3718](https://github.com/mathesar-foundation/mathesar/pull/3718 "Add target_table_info in `tables.list_joinable's` response")_
 - Records grouping _[#3721](https://github.com/mathesar-foundation/mathesar/pull/3721 "Records grouping")_
 - Fix "no current database" error _[#3723](https://github.com/mathesar-foundation/mathesar/pull/3723 "Fix 'no current database' error")_
+- Implement explorations `run_saved` & `get` RPC endpoints _[#3725](https://github.com/mathesar-foundation/mathesar/pull/3725 "Implement explorations `run_saved` & `get` RPC endpoints")_
 - Handle new records filtering on the front end _[#3728](https://github.com/mathesar-foundation/mathesar/pull/3728 "Handle new records filtering on the front end")_
 - Implement explorations `add` & `replace` endpoint _[#3731](https://github.com/mathesar-foundation/mathesar/pull/3731 "Implement explorations `add` & `replace` endpoint")_
 - Add `records.get` RPC function _[#3740](https://github.com/mathesar-foundation/mathesar/pull/3740 "Add `records.get` RPC function")_
@@ -108,15 +128,25 @@ Most of our REST API endpoints are now deprecated and will be removed soon. The
 - Implement RPC records CRUD operations on front end _[#3759](https://github.com/mathesar-foundation/mathesar/pull/3759 "Implement RPC records CRUD operations on front end")_
 - Add simplified record summaries _[#3761](https://github.com/mathesar-foundation/mathesar/pull/3761 "Add simplified record summaries")_
 - Add link-adding RPC functions _[#3767](https://github.com/mathesar-foundation/mathesar/pull/3767 "Add link-adding RPC functions")_
+- Add `data_modeling.suggest_types` function. _[#3771](https://github.com/mathesar-foundation/mathesar/pull/3771 "Add `data_modeling.suggest_types` function.")_
+- Add `schema_privileges.list_direct` RPC function _[#3782](https://github.com/mathesar-foundation/mathesar/pull/3782 "Add `schema_privileges.list_direct` RPC function")_
+- Add `table_privileges.list_direct` RPC function _[#3783](https://github.com/mathesar-foundation/mathesar/pull/3783 "Add `table_privileges.list_direct` RPC function")_
+- Add `table_privileges.replace_for_roles` RPC function _[#3791](https://github.com/mathesar-foundation/mathesar/pull/3791 "Add `table_privileges.replace_for_roles` RPC function")_
+- Add `roles.get_current_role` RPC function _[#3796](https://github.com/mathesar-foundation/mathesar/pull/3796 "Add `roles.get_current_role` RPC function")_
 - Reorganize namespacing _[#3799](https://github.com/mathesar-foundation/mathesar/pull/3799 "Reorganize namespacing")_
 - Hard-code abstract types response in client _[#3800](https://github.com/mathesar-foundation/mathesar/pull/3800 "Hard-code abstract types response in client")_
 - Change response structure for record summary _[#3802](https://github.com/mathesar-foundation/mathesar/pull/3802 "Change response structure for record summary")_
+- Implement `data_modeling.split_table` RPC functions _[#3803](https://github.com/mathesar-foundation/mathesar/pull/3803 "Implement `data_modeling.split_table` RPC functions")_
 - Modify pkey finder to return False when no pkey exists _[#3804](https://github.com/mathesar-foundation/mathesar/pull/3804 "Modify pkey finder to return False when no pkey exists")_
 - Change response for `tables.add` and `tables.import` _[#3807](https://github.com/mathesar-foundation/mathesar/pull/3807 "Change response for `tables.add` and `tables.import`")_
 - Add summaries to self _[#3808](https://github.com/mathesar-foundation/mathesar/pull/3808 "Add summaries to self")_
 - Move columns SQL _[#3809](https://github.com/mathesar-foundation/mathesar/pull/3809 "Move columns SQL")_
 - Propagate RPC record summary changes to front end _[#3811](https://github.com/mathesar-foundation/mathesar/pull/3811 "Propagate RPC record summary changes to front end")_
+- Add `data_file_id` field to `TableMetaData` _[#3813](https://github.com/mathesar-foundation/mathesar/pull/3813 "Add `data_file_id` field to `TableMetaData`")_
+- Implement `data_modeling.move_columns` RPC endpoint _[#3814](https://github.com/mathesar-foundation/mathesar/pull/3814 "Implement `data_modeling.move_columns` RPC endpoint")_
 - Get imports working again _[#3819](https://github.com/mathesar-foundation/mathesar/pull/3819 "Get imports working again")_
+- Implement `databases.privileges.transfer_ownership` RPC endpoint _[#3821](https://github.com/mathesar-foundation/mathesar/pull/3821 "Implement `databases.privileges.transfer_ownership` RPC endpoint")_
+- Implement `tables.get_with_metadata` RPC endpoint _[#3823](https://github.com/mathesar-foundation/mathesar/pull/3823 "Implement `tables.get_with_metadata` RPC endpoint")_
 - Use data file name as table name during import _[#3824](https://github.com/mathesar-foundation/mathesar/pull/3824 "Use data file name as table name during import")_
 - A couple small front end RPC changes _[#3825](https://github.com/mathesar-foundation/mathesar/pull/3825 "A couple small front end RPC changes")_
 - Bugfix listing records from a table with self-Referential FK _[#3831](https://github.com/mathesar-foundation/mathesar/pull/3831 "Bugfix listing records from a table with self-Referential FK")_
@@ -125,18 +155,22 @@ Most of our REST API endpoints are now deprecated and will be removed soon. The
 - Propagate RPC changes to record selector _[#3843](https://github.com/mathesar-foundation/mathesar/pull/3843 "Propagate RPC changes to record selector")_
 - Use RPC API for column metadata _[#3845](https://github.com/mathesar-foundation/mathesar/pull/3845 "Use RPC API for column metadata")_
 - Propagate RPC changes to link table dialog _[#3847](https://github.com/mathesar-foundation/mathesar/pull/3847 "Propagate RPC changes to link table dialog")_
+- Fix response for `split_table` _[#3850](https://github.com/mathesar-foundation/mathesar/pull/3850 "Fix response for `split_table`")_
 - Alter response for record summaries with NULL records _[#3852](https://github.com/mathesar-foundation/mathesar/pull/3852 "Alter response for record summaries with NULL records")_
 - Make `records.get` work with stringified PK values _[#3853](https://github.com/mathesar-foundation/mathesar/pull/3853 "Make `records.get` work with stringified PK values")_
 - Enabling running of very simple explorations _[#3855](https://github.com/mathesar-foundation/mathesar/pull/3855 "Enabling running of very simple explorations")_
 - Get "extract columns" and "move columns" functionality working again _[#3856](https://github.com/mathesar-foundation/mathesar/pull/3856 "Get 'extract columns' and 'move columns' functionality working again")_
 - Allow patching records via string PKs _[#3857](https://github.com/mathesar-foundation/mathesar/pull/3857 "Allow patching records via string PKs")_
+- Implement `roles.set_members` RPC endpoint _[#3866](https://github.com/mathesar-foundation/mathesar/pull/3866 "Implement `roles.set_members` RPC endpoint")_
 - Fix updating of table name _[#3879](https://github.com/mathesar-foundation/mathesar/pull/3879 "Fix ypdating of table name")_
 - Bugfix summarizations _[#3884](https://github.com/mathesar-foundation/mathesar/pull/3884 "Bugfix summarizations")_
 - Fix insert for table with only ID column _[#3885](https://github.com/mathesar-foundation/mathesar/pull/3885 "Fix insert for table with only ID column")_
+- Add `schema_oid` to `Explorations` model _[#3892](https://github.com/mathesar-foundation/mathesar/pull/3892 "Add `schema_oid` to `Explorations` model")_
 - Get explorations CRUD working again _[#3893](https://github.com/mathesar-foundation/mathesar/pull/3893 "Get explorations CRUD working again")_
 - Reduces frontend caching, fixes a few bugs _[#3897](https://github.com/mathesar-foundation/mathesar/pull/3897 "Reduces frontend caching, fixes a few bugs")_
 - Fix broken exploration "column added" indicators _[#3894](https://github.com/mathesar-foundation/mathesar/pull/3894 "Fix broken exploration 'column added' indicators")_
 - Fix bug when updating table twice _[#3909](https://github.com/mathesar-foundation/mathesar/pull/3909 "Fix bug when updating table twice")
+- Fixes server errors when RPC exceptions are thrown while rendering common_data _[#3948](https://github.com/mathesar-foundation/mathesar/pull/3948 "Fixes server errors when RPC exceptions are thrown while rendering common_data")_
 
 ### Visual improvements
 
@@ -153,22 +187,17 @@ A before-and-after comparison of the "Create Link" modal can be seen below.
 
 Bugs related to permissions or the backend overhaul are listed in the relevant sections above. The bugs listed here are unrelated to those changes.
 
+- Remove nonsensical cast_to_email and cast_to_uri functions _[#3564](https://github.com/mathesar-foundation/mathesar/pull/3564 "Remove nonsensical cast_to_email and cast_to_uri functions")_
+- Add 0.1.7 release notes to the nav menu _[#3569](https://github.com/mathesar-foundation/mathesar/pull/3569 "Merge pull request #3568 from mathesar-foundation/release_notes_nav")_
 - Fix error when trying to reset password of other user _[#3536](https://github.com/mathesar-foundation/mathesar/pull/3536 "Fix change password error")_
 - Handle negative numbers not being serialized correctly when copying  _[#3582](https://github.com/mathesar-foundation/mathesar/pull/3582 "Handle negative numbers in TSV serialization for copy")_
 - Fix timeout when installing Mathesar on a remote DB _[#3917](https://github.com/mathesar-foundation/mathesar/pull/3917 "Fast install")_
 
 
-## Live demo changes
+## Documentation
 
-We have removed code related to Mathesar's "live demo" mode since we didn't think it made sense to include code for our promotional website in the core product. If we do choose to maintain our live demo in the future, we will set up a separate microservice that performs some of these functions.
-
-We also set up a workflow to reset the live demo regularly to mitigate reliability issues.
+- Improvements to build from scratch documentation _[#3945](https://github.com/mathesar-foundation/mathesar/pull/3945 "Docs improvements for build from scrach")_
 
-- Remove demo code and E2E infrastructure _[#3538](https://github.com/mathesar-foundation/mathesar/pull/3538 "Remove demo code and E2E infrastructure")_, _[#3551](https://github.com/mathesar-foundation/mathesar/pull/3551 "Remove E2E infrastructure")_
-- Add GitHub workflow to reset demo _[#3577](https://github.com/mathesar-foundation/mathesar/pull/3577 "Add GitHub workflow to reset demo")_
-- Updates to GH workflow for resetting demo _[#3579](https://github.com/mathesar-foundation/mathesar/pull/3579 "Updates to GH workflow for resetting demo")_
-- Updates to GH workflow to reset demo _[#3580](https://github.com/mathesar-foundation/mathesar/pull/3580 "Updates to GH workflow to reset demo")_
-- Remove the demo reset workflow _[#3581](https://github.com.mathesar-foundation/mathesar/pull/3581 "Remove the demo reset workflow")_
 
 ## Maintenance
 
@@ -178,6 +207,7 @@ Miscellanous work done to reduce technical debt, improve developer documentation
 - Remove API documentation infrastructure _[#3541](https://github.com/mathesar-foundation/mathesar/pull/3541 "Remove API documentation infrastructure")_
 - Remove Debian build _[#3546](https://github.com/mathesar-foundation/mathesar/pull/3546 "Remove Debian build")_
 - Update docs to add instructions for loading data from playground _[#3535](https://github.com/mathesar-foundation/mathesar/pull/3535 "Update docs to add instructions for loading data from playground")_
+- Merge 0.1.7 release back into develop _[#3558](https://github.com/mathesar-foundation/mathesar/pull/3558 "Merge pull request #3539 from mathesar-foundation/0.1.7")_
 - Resolve merge conflict for #3558 _[#3559](https://github.com/mathesar-foundation/mathesar/pull/3559 "Resolve merge conflict for #3558")_
 - Revert #3559 _[#3567](https://github.com/mathesar-foundation/mathesar/pull/3567 "Revert #3559")_
 - Bump dependencies _[#3544](https://github.com/mathesar-foundation/mathesar/pull/3544 "Bump dependencies")_, _[#3604](https://github.com/mathesar-foundation/mathesar/pull/3604 "Bump dependencies")_
@@ -187,3 +217,17 @@ Miscellanous work done to reduce technical debt, improve developer documentation
 - Fix issue with SQL migrations not running when service restarts _[#3678](https://github.com/mathesar-foundation/mathesar/pull/3678 "Fix install script")_
 - Merge breaking changes into `develop` _[#3695](https://github.com/mathesar-foundation/mathesar/pull/3695 "Merge breaking changes into `develop`")_
 - Update MkDocs dependencies _[#3763](https://github.com/mathesar-foundation/mathesar/pull/3763 "Update MkDocs dependencies")_
+- Merge develop into release branch. _[#3950](https://github.com/mathesar-foundation/mathesar/pull/3950 "Merge develop into release branch.")_
+
+
+## Live demo changes
+
+We have removed code related to Mathesar's "live demo" mode since we didn't think it made sense to include code for our promotional website in the core product. If we do choose to maintain our live demo in the future, we will set up a separate microservice that performs some of these functions.
+
+We also set up a workflow to reset the live demo regularly to mitigate reliability issues.
+
+- Remove demo code and E2E infrastructure _[#3538](https://github.com/mathesar-foundation/mathesar/pull/3538 "Remove demo code and E2E infrastructure")_, _[#3551](https://github.com/mathesar-foundation/mathesar/pull/3551 "Remove E2E infrastructure")_
+- Add GitHub workflow to reset demo _[#3577](https://github.com/mathesar-foundation/mathesar/pull/3577 "Add GitHub workflow to reset demo")_
+- Updates to GH workflow for resetting demo _[#3579](https://github.com/mathesar-foundation/mathesar/pull/3579 "Updates to GH workflow for resetting demo")_
+- Updates to GH workflow to reset demo _[#3580](https://github.com/mathesar-foundation/mathesar/pull/3580 "Updates to GH workflow to reset demo")_
+- Remove the demo reset workflow _[#3581](https://github.com/mathesar-foundation/mathesar/pull/3581 "Remove the demo reset workflow")_

From 46fdb111a2317af71607c4e5e87728e5ceab51ed Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Sat, 12 Oct 2024 04:33:19 -0400
Subject: [PATCH 1108/1141] Added PRs merged into develop.

---
 docs/docs/releases/0.2.0-testing.1.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index 6af4f537e2..f3fa7e5c86 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -63,7 +63,7 @@ More detailed documentation can be found in our User Guide under [Permissions](.
 
 ### Performance improvements and RPC API
 
-We've made major improvements to the responsiveness of the Mathesar UI. Loading data and data entry should be much more snappy, and importing data into Mathsar is around 50 times faster.
+We've made major improvements to the responsiveness of the Mathesar UI. Loading data and data entry should be much more snappy, and importing data into Mathsar is around 50 times faster. We've also eliminated the need to manually sync database schema changes to Mathesar, any DDL changes will be reflected in the UI automatically.
 
 To achieve these performance benefits, we needed to overhaul our backend architecture and API. We have built out a new RPC API and our frontend UI now primarily uses that API. The RPC API is [has some documentation here](../api/rpc.md), but should not be considered stable yet.
 
@@ -170,6 +170,7 @@ Most of our REST API endpoints are now deprecated and will be removed soon. The
 - Reduces frontend caching, fixes a few bugs _[#3897](https://github.com/mathesar-foundation/mathesar/pull/3897 "Reduces frontend caching, fixes a few bugs")_
 - Fix broken exploration "column added" indicators _[#3894](https://github.com/mathesar-foundation/mathesar/pull/3894 "Fix broken exploration 'column added' indicators")_
 - Fix bug when updating table twice _[#3909](https://github.com/mathesar-foundation/mathesar/pull/3909 "Fix bug when updating table twice")
+- Fix response of `explorations.run` for summarizations _[#3940](https://github.com/mathesar-foundation/mathesar/pull/3940 "Fix response of `explorations.run` for summarizations")_
 - Fixes server errors when RPC exceptions are thrown while rendering common_data _[#3948](https://github.com/mathesar-foundation/mathesar/pull/3948 "Fixes server errors when RPC exceptions are thrown while rendering common_data")_
 
 ### Visual improvements
@@ -192,11 +193,11 @@ Bugs related to permissions or the backend overhaul are listed in the relevant s
 - Fix error when trying to reset password of other user _[#3536](https://github.com/mathesar-foundation/mathesar/pull/3536 "Fix change password error")_
 - Handle negative numbers not being serialized correctly when copying  _[#3582](https://github.com/mathesar-foundation/mathesar/pull/3582 "Handle negative numbers in TSV serialization for copy")_
 - Fix timeout when installing Mathesar on a remote DB _[#3917](https://github.com/mathesar-foundation/mathesar/pull/3917 "Fast install")_
-
+- Use a semver library to parse our version strings on the front end _[#3938](https://github.com/mathesar-foundation/mathesar/pull/3938 "Use a semver library to parse our version strings on the front end")_
 
 ## Documentation
-
-- Improvements to build from scratch documentation _[#3945](https://github.com/mathesar-foundation/mathesar/pull/3945 "Docs improvements for build from scrach")_
+- Updated user guide to cover new features and remove unnecessary pages _[#3910](https://github.com/mathesar-foundation/mathesar/pull/3910 "Permissions Documentation Updates")_
+- Improvements to installation from scratch documentation _[#3945](https://github.com/mathesar-foundation/mathesar/pull/3945 "Docs improvements for build from scrach")_
 
 
 ## Maintenance

From 1417729a41737befcf0d23bf727ff76cfa75285f Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Sat, 12 Oct 2024 04:39:22 -0400
Subject: [PATCH 1109/1141] Fixed internal links.

---
 docs/docs/releases/0.2.0-testing.1.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index f3fa7e5c86..d3a6112dbf 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -11,7 +11,7 @@ _This page provides a comprehensive list of all changes in the release._
 
 ## Installing 0.2.0-testing.1
 
-You will need to create a new installation of Mathesar to use this version, which you can do via [Docker Compose](../../installation/docker-compose/) or [from source](../../installation/build-from-source/).
+You will need to create a new installation of Mathesar to use this version, which you can do via [Docker Compose](../installation/docker-compose/index.md) or [from source](../installation/build-from-source/index.md).
 
 We do not support upgrading from previous versions to `0.2.0-testing.1`. 
 
@@ -21,13 +21,13 @@ We do not support upgrading from previous versions to `0.2.0-testing.1`.
 
 We have a brand new access control system based entirely on PostgreSQL database roles and privileges. Mathesar users must now be assigned a database role, and any operations performed by the user through the Mathesar UI will connect to the database using that role. 
 
-![image](../../assets/releases/0.2.0-testing.1/db-settings-collaborators.png)
+![image](../assets/releases/0.2.0-testing.1/db-settings-collaborators.png)
 
 This gives Mathesar several new capabilities. Database administrators can set up access control directly on the database and use those roles in Mathesar. Mathesar also supports setting up PostgreSQL roles and privileges via the UI, including granular access control at the individual table level.
 
 This replaces our previous access control system (which was enforced at the API layer, and only supported permissions at the database and schema levels). It also eliminates the need for Mathesar to use a database superuser for day-to-day operations.
 
-More detailed documentation can be found in our User Guide under [Permissions](../../user-guide/permissions/) and [Users](../../user-guide/users/).
+More detailed documentation can be found in our User Guide under [Permissions](../user-guide/permissions.md) and [Users](../user-guide/users.md).
 
 ------
 
@@ -179,7 +179,7 @@ We made several visual improvements to Mathesar to ensure consistency, better us
 
 A before-and-after comparison of the "Create Link" modal can be seen below.
 
-![image](../../assets/releases/0.2.0-testing.1/create-link-changes.png)
+![image](../assets/releases/0.2.0-testing.1/create-link-changes.png)
 
 - Show a loading spinner for table pages _[#3602](https://github.com/mathesar-foundation/mathesar/pull/3602 "Show a loading spinner for table pages")_
 - UI consistency improvements for modals and table inspector _[#3860](https://github.com/mathesar-foundation/mathesar/pull/3860 "UI consistency improvements")_

From a7815c87d075bd8d2cfc89f7a4d8e399507da4cd Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Sat, 12 Oct 2024 04:58:11 -0400
Subject: [PATCH 1110/1141] Added note to main page.

---
 docs/docs/index.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/docs/index.md b/docs/docs/index.md
index ea09a26144..871fce249f 100644
--- a/docs/docs/index.md
+++ b/docs/docs/index.md
@@ -1,5 +1,10 @@
 # Mathesar Documentation
 
+!!! info "Help us get our beta out sooner – send us feedback!"
+    You're looking at the documentation for our **✨ new test build ✨**, see [release notes here](releases/0.2.0-testing.1.md).
+    
+    For a timely and stable beta release, we need feedback from as many users as possible about how this new version of Mathesar is working for you. Let us know on [this GitHub discussion](https://github.com/mathesar-foundation/mathesar/discussions/3956) or drop us a line at <hello@mathesar.org>.
+
 ## Welcome!
 
 Mathesar is a self-hostable open source project that provides a spreadsheet-like interface to a PostgreSQL database. Our web-based interface helps you and your collaborators set up data models, edit data, and build custom reports &mdash; no technical skills needed. You can create a new PostgreSQL database while setting up Mathesar or use our UI to interact with an existing database (or do both).

From 4fc486a837496bd9ffaa188327fb35f4177790eb Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Sat, 12 Oct 2024 05:04:12 -0400
Subject: [PATCH 1111/1141] Updated admonition type.

---
 docs/docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/index.md b/docs/docs/index.md
index 871fce249f..0b68310716 100644
--- a/docs/docs/index.md
+++ b/docs/docs/index.md
@@ -1,6 +1,6 @@
 # Mathesar Documentation
 
-!!! info "Help us get our beta out sooner – send us feedback!"
+!!! question "Help us get our beta out sooner – send us feedback!"
     You're looking at the documentation for our **✨ new test build ✨**, see [release notes here](releases/0.2.0-testing.1.md).
     
     For a timely and stable beta release, we need feedback from as many users as possible about how this new version of Mathesar is working for you. Let us know on [this GitHub discussion](https://github.com/mathesar-foundation/mathesar/discussions/3956) or drop us a line at <hello@mathesar.org>.

From 172f5e7e3762bff408be7c9aafb22fdb5827cf4f Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 14 Oct 2024 18:13:10 +0530
Subject: [PATCH 1112/1141] Update repo for testing release

---
 docker-compose.yml | 2 +-
 docs/docs/index.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7ff8c91d71..d1560a986c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -144,7 +144,7 @@ services:
   #
   service:
     container_name: mathesar_service
-    image: mathesar/mathesar-prod:latest
+    image: mathesar/mathesar-testing:latest
     environment: 
       # First we load the variables configured above.
       <<: *config
diff --git a/docs/docs/index.md b/docs/docs/index.md
index 0b68310716..8706f8e88d 100644
--- a/docs/docs/index.md
+++ b/docs/docs/index.md
@@ -22,7 +22,7 @@ This is a quick way to play with Mathesar locally, but is not appropriate for sa
 1. With [Docker](https://docs.docker.com/get-docker/) installed, run:
 
     ```
-    docker run -it --name mathesar -p 8000:8000 mathesar/mathesar-prod:latest
+    docker run -it --name mathesar -p 8000:8000 mathesar/mathesar-testing:latest
     ```
 
 1. Visit [http://localhost:8000/](http://localhost:8000/) to set up an admin user account and create a database connection.

From 70daf2e66e1327e002e933cc59845798b7cda9a6 Mon Sep 17 00:00:00 2001
From: pavish <pavishkumar.r@gmail.com>
Date: Mon, 14 Oct 2024 18:13:34 +0530
Subject: [PATCH 1113/1141] Update build from scratch docs on stability of
 testing release

---
 docs/docs/installation/build-from-source/index.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/docs/installation/build-from-source/index.md b/docs/docs/installation/build-from-source/index.md
index 2321ebfcf9..cf57c64c42 100644
--- a/docs/docs/installation/build-from-source/index.md
+++ b/docs/docs/installation/build-from-source/index.md
@@ -131,14 +131,14 @@ Then press <kbd>Enter</kbd> to customize this guide with your domain name.
     git clone https://github.com/mathesar-foundation/mathesar.git .
     ```
 
-1. Checkout the tag of the latest stable release, `{{mathesar_version}}`.
+1. Checkout the tag of the release you'd like to install.
 
     ```
     git checkout {{mathesar_version}}
     ```
 
     !!! warning "Important"
-        If you don't run the above command you'll end up installing the latest _development_ version of Mathesar, which will be less stable.
+        If you don't run the above command you'll end up installing the latest _development_ version of Mathesar.
 
 1. We need to create a python virtual environment for the Mathesar application.
 

From ea5b3bd77e20f53ffe259f83e925486c06d86eb9 Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:17:48 -0400
Subject: [PATCH 1114/1141] Update docs/docs/releases/0.2.0-testing.1.md

Co-authored-by: Brent Moran <brentmoran@gmail.com>
---
 docs/docs/releases/0.2.0-testing.1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index d3a6112dbf..f2159a6f89 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -32,7 +32,7 @@ More detailed documentation can be found in our User Guide under [Permissions](.
 ------
 
 - Initial permissions remodel _[#3626](https://github.com/mathesar-foundation/mathesar/pull/3626 "Initial permissions remodel")_
-- Implement RPC endpoint for listing roles in server _[#3663](https://github.com/mathesar-foundation/mathesar/pull/3663 "Implement RPC endpoint for listing roles in server")_
+- Implement RPC method for listing roles in server _[#3663](https://github.com/mathesar-foundation/mathesar/pull/3663 "Implement RPC endpoint for listing roles in server")_
 - Initial `database_setup` RPC functions _[#3665](https://github.com/mathesar-foundation/mathesar/pull/3665 "Initial `database_setup` RPC functions")_
 - Cast OID values to bigint in msar.get_roles _[#3667](https://github.com/mathesar-foundation/mathesar/pull/3667 "Cast OID values to bigint in msar.get_roles")_
 - Endpoints for servers, collaborators _[#3684](https://github.com/mathesar-foundation/mathesar/pull/3684 "Endpoints for servers, collaborators")_

From b15cf9d478d8d18d4c7c3dd074f973d87e3ef23d Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:17:55 -0400
Subject: [PATCH 1115/1141] Update docs/docs/releases/0.2.0-testing.1.md

Co-authored-by: Brent Moran <brentmoran@gmail.com>
---
 docs/docs/releases/0.2.0-testing.1.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index f2159a6f89..0c82a94e7e 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -35,8 +35,8 @@ More detailed documentation can be found in our User Guide under [Permissions](.
 - Implement RPC method for listing roles in server _[#3663](https://github.com/mathesar-foundation/mathesar/pull/3663 "Implement RPC endpoint for listing roles in server")_
 - Initial `database_setup` RPC functions _[#3665](https://github.com/mathesar-foundation/mathesar/pull/3665 "Initial `database_setup` RPC functions")_
 - Cast OID values to bigint in msar.get_roles _[#3667](https://github.com/mathesar-foundation/mathesar/pull/3667 "Cast OID values to bigint in msar.get_roles")_
-- Endpoints for servers, collaborators _[#3684](https://github.com/mathesar-foundation/mathesar/pull/3684 "Endpoints for servers, collaborators")_
-- Endpoints for configured roles _[#3685](https://github.com/mathesar-foundation/mathesar/pull/3685 "Endpoints for configured roles")_
+- RPC methods for servers, collaborators _[#3684](https://github.com/mathesar-foundation/mathesar/pull/3684 "Endpoints for servers, collaborators")_
+- RPC methods for configured roles _[#3685](https://github.com/mathesar-foundation/mathesar/pull/3685 "Endpoints for configured roles")_
 - Remove existing permissions logic on the frontend _[#3689](https://github.com/mathesar-foundation/mathesar/pull/3689 "Remove existing permissions logic on the frontend")_
 - Homepage changes for database connections _[#3710](https://github.com/mathesar-foundation/mathesar/pull/3710 "Homepage changes for database connections")_
 - Homepage UI _[#3711](https://github.com/mathesar-foundation/mathesar/pull/3711 "Homepage UI")_

From 9c774983236638869843ae4a93ca42a0e17c7079 Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:18:04 -0400
Subject: [PATCH 1116/1141] Update docs/docs/releases/0.2.0-testing.1.md

Co-authored-by: Brent Moran <brentmoran@gmail.com>
---
 docs/docs/releases/0.2.0-testing.1.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index 0c82a94e7e..618fdd4ed4 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -40,8 +40,8 @@ More detailed documentation can be found in our User Guide under [Permissions](.
 - Remove existing permissions logic on the frontend _[#3689](https://github.com/mathesar-foundation/mathesar/pull/3689 "Remove existing permissions logic on the frontend")_
 - Homepage changes for database connections _[#3710](https://github.com/mathesar-foundation/mathesar/pull/3710 "Homepage changes for database connections")_
 - Homepage UI _[#3711](https://github.com/mathesar-foundation/mathesar/pull/3711 "Homepage UI")_
-- Implement `database_privileges.list_direct` RPC endpoint. _[#3750](https://github.com/mathesar-foundation/mathesar/pull/3750 "Implement `database_privileges.list_direct` RPC endpoint.")_
-- Implement `database_privileges.get_owner_oid_and_curr_role_db_priv` RPC endpoint _[#3760](https://github.com/mathesar-foundation/mathesar/pull/3760 "Implement `database_privileges.get_owner_oid_and_curr_role_db_priv` RPC endpoint")_
+- Implement `database_privileges.list_direct` RPC method. _[#3750](https://github.com/mathesar-foundation/mathesar/pull/3750 "Implement `database_privileges.list_direct` RPC endpoint.")_
+- Implement `database_privileges.get_owner_oid_and_curr_role_db_priv` RPC method _[#3760](https://github.com/mathesar-foundation/mathesar/pull/3760 "Implement `database_privileges.get_owner_oid_and_curr_role_db_priv` RPC endpoint")_
 - Database page role configuration, collaborators, roles _[#3762](https://github.com/mathesar-foundation/mathesar/pull/3762 "Database page role configuration, collaborators, roles")_
 - Implement `roles.add` RPC endpoint _[#3769](https://github.com/mathesar-foundation/mathesar/pull/3769 "Implement `roles.add` RPC endpoint")_
 - Add `database_privileges.replace_for_roles` RPC function. _[#3781](https://github.com/mathesar-foundation/mathesar/pull/3781 "Add `database_privileges.replace_for_roles` RPC function.")_

From 620ba3618d6e5150dc08007ce9f0c2e97893c6d4 Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:18:14 -0400
Subject: [PATCH 1117/1141] Update docs/docs/releases/0.2.0-testing.1.md

Co-authored-by: Brent Moran <brentmoran@gmail.com>
---
 docs/docs/releases/0.2.0-testing.1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index 618fdd4ed4..e240c74f64 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -52,7 +52,7 @@ More detailed documentation can be found in our User Guide under [Permissions](.
 - Implement `transfer_ownership` for schemas and tables _[#3833](https://github.com/mathesar-foundation/mathesar/pull/3833 "Implement `transfer_ownership` for schemas and tables")_
 - Implement permissions modal for schemas and tables _[#3836](https://github.com/mathesar-foundation/mathesar/pull/3836 "Implement permissions modal for schemas and tables")_, _[#3838](https://github.com/mathesar-foundation/mathesar/pull/3838 "Implement permissions modal for schemas and tables")_
 - Allow setting owner at creation _[#3840](https://github.com/mathesar-foundation/mathesar/pull/3840 "Allow setting owner at Creation")_
-- Implement `roles.delete`, `databases.drop` & `databases.configured.disconnect` endpoints _[#3858](https://github.com/mathesar-foundation/mathesar/pull/3858 "Implement `roles.delete`, `databases.drop` & `databases.configured.disconnect` endpoints")_
+- Implement `roles.delete`, `databases.drop` & `databases.configured.disconnect` RPC methods _[#3858](https://github.com/mathesar-foundation/mathesar/pull/3858 "Implement `roles.delete`, `databases.drop` & `databases.configured.disconnect` endpoints")_
 - Implement 'Transfer ownership' tabs _[#3859](https://github.com/mathesar-foundation/mathesar/pull/3859 "Implement 'Transfer ownership' tabs")_
 - Permission checks in all pages, disconnect database option _[#3861](https://github.com/mathesar-foundation/mathesar/pull/3861 "permission checks in all pages, Disconnect database option")_
 - Bugfix `get_current_role` when only one role exists _[#3869](https://github.com/mathesar-foundation/mathesar/pull/3869 "Bugfix `get_current_role` when only one role exists")_

From 2e4dff816eb2d3e53fcd386468365f0745bf5965 Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:18:23 -0400
Subject: [PATCH 1118/1141] Update docs/docs/releases/0.2.0-testing.1.md

Co-authored-by: Brent Moran <brentmoran@gmail.com>
---
 docs/docs/releases/0.2.0-testing.1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index e240c74f64..375ea5782c 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -65,7 +65,7 @@ More detailed documentation can be found in our User Guide under [Permissions](.
 
 We've made major improvements to the responsiveness of the Mathesar UI. Loading data and data entry should be much more snappy, and importing data into Mathsar is around 50 times faster. We've also eliminated the need to manually sync database schema changes to Mathesar, any DDL changes will be reflected in the UI automatically.
 
-To achieve these performance benefits, we needed to overhaul our backend architecture and API. We have built out a new RPC API and our frontend UI now primarily uses that API. The RPC API is [has some documentation here](../api/rpc.md), but should not be considered stable yet.
+To achieve these performance benefits, we needed to overhaul our backend architecture and API. We have built out a new RPC API and our frontend UI now primarily uses that API. The RPC API [has some documentation here](../api/rpc.md), but should not be considered stable yet.
 
 Most of our REST API endpoints are now deprecated and will be removed soon. The `/users/` and `/data-files/` endpoints remain in use.
 

From c5f687a2935ea2a769d48c1f5a87085983f7f78d Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:18:32 -0400
Subject: [PATCH 1119/1141] Update docs/docs/releases/0.2.0-testing.1.md

Co-authored-by: Brent Moran <brentmoran@gmail.com>
---
 docs/docs/releases/0.2.0-testing.1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index 375ea5782c..b72d5e3fbb 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -105,7 +105,7 @@ Most of our REST API endpoints are now deprecated and will be removed soon. The
 - Fix Issues with `tables.patch` RPC method _[#3699](https://github.com/mathesar-foundation/mathesar/pull/3699 "Fix Issues with `tables.patch` RPC method")_
 - RPC records list filtering _[#3700](https://github.com/mathesar-foundation/mathesar/pull/3700 "RPC records list filtering")_
 - Return empty array when schema has no tables _[#3702](https://github.com/mathesar-foundation/mathesar/pull/3702 "Return empty array when schema has no tables")_
-- RPC endpoint for column info with metadata _[#3703](https://github.com/mathesar-foundation/mathesar/pull/3703 "RPC endpoint for column info with metadata")_
+- RPC function for column info with metadata _[#3703](https://github.com/mathesar-foundation/mathesar/pull/3703 "RPC endpoint for column info with metadata")_
 - First steps of RPC implementation for table page _[#3704](https://github.com/mathesar-foundation/mathesar/pull/3704 "First steps of RPC implementation for table page")_
 - Add `records.search` RPC function _[#3708](https://github.com/mathesar-foundation/mathesar/pull/3708 "Add `records.search` RPC function")_
 - Wire up valid_target_type function to column lister _[#3709](https://github.com/mathesar-foundation/mathesar/pull/3709 "Wire up valid_target_type function to column lister")_

From 10064f37842b1616210b7c02498f08f6efc5379d Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:18:52 -0400
Subject: [PATCH 1120/1141] Update docs/docs/releases/0.2.0-testing.1.md

Co-authored-by: Brent Moran <brentmoran@gmail.com>
---
 docs/docs/releases/0.2.0-testing.1.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index b72d5e3fbb..c981756ba0 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -73,15 +73,15 @@ Most of our REST API endpoints are now deprecated and will be removed soon. The
 - Exception handler tests _[#3547](https://github.com/mathesar-foundation/mathesar/pull/3547 "Exception handler tests")_
 - Fix SQL syntax highlighting in VS code for SQL tests _[#3588](https://github.com/mathesar-foundation/mathesar/pull/3588 "Fix SQL syntax highlighting in VS code for SQL tests")_
 - Remove dead front end API client code to GET one schema _[#3589](https://github.com/mathesar-foundation/mathesar/pull/3589 "Remove dead front end API client code to GET one schema")_
-- Implement `tables.delete` RPC endpoint _[#3608](https://github.com/mathesar-foundation/mathesar/pull/3608 "Implement `tables.delete` RPC endpoint")_
+- Implement `tables.delete` RPC method _[#3608](https://github.com/mathesar-foundation/mathesar/pull/3608 "Implement `tables.delete` RPC endpoint")_
 - Implement `schemas.delete` RPC method _[#3610](https://github.com/mathesar-foundation/mathesar/pull/3610 "Implement `schemas.delete` RPC method")_
-- Implement `tables.get` RPC endpoint _[#3612](https://github.com/mathesar-foundation/mathesar/pull/3612 "Implement `tables.get` RPC endpoint")_
-- Implement `tables.add` RPC endpoint _[#3614](https://github.com/mathesar-foundation/mathesar/pull/3614 "Implement `tables.add` RPC endpoint")_
-- Add `columns.patch` RPC function _[#3615](https://github.com/mathesar-foundation/mathesar/pull/3615 "Add `columns.patch` RPC function")_
-- Add `columns.add` RPC function _[#3616](https://github.com/mathesar-foundation/mathesar/pull/3616 "Add `columns.add` RPC function")_
-- Implement `tables.patch` RPC endpoint _[#3618](https://github.com/mathesar-foundation/mathesar/pull/3618 "Implement `tables.patch` RPC endpoint")_
+- Implement `tables.get` RPC method _[#3612](https://github.com/mathesar-foundation/mathesar/pull/3612 "Implement `tables.get` RPC endpoint")_
+- Implement `tables.add` RPC method _[#3614](https://github.com/mathesar-foundation/mathesar/pull/3614 "Implement `tables.add` RPC endpoint")_
+- Add `columns.patch` RPC method _[#3615](https://github.com/mathesar-foundation/mathesar/pull/3615 "Add `columns.patch` RPC function")_
+- Add `columns.add` RPC method _[#3616](https://github.com/mathesar-foundation/mathesar/pull/3616 "Add `columns.add` RPC function")_
+- Implement `tables.patch` RPC method _[#3618](https://github.com/mathesar-foundation/mathesar/pull/3618 "Implement `tables.patch` RPC endpoint")_
 - Implement `schemas.add` RPC method _[#3620](https://github.com/mathesar-foundation/mathesar/pull/3620 "Implement `schemas.add` RPC method")_
-- Implement `table.import` RPC endpoint _[#3623](https://github.com/mathesar-foundation/mathesar/pull/3623 "Implement `table.import` RPC endpoint")_
+- Implement `table.import` RPC method _[#3623](https://github.com/mathesar-foundation/mathesar/pull/3623 "Implement `table.import` RPC endpoint")_
 - Implement `schemas.patch` RPC method _[#3628](https://github.com/mathesar-foundation/mathesar/pull/3628 "Implement `schemas.patch` RPC method")_
 - Wire RPC functions to new models _[#3632](https://github.com/mathesar-foundation/mathesar/pull/3632 "Wire RPC functions to new models")_
 - Quoting refactor _[#3633](https://github.com/mathesar-foundation/mathesar/pull/3633 "Quoting refactor")_

From 2eed4c2d978edfbc3a212a8714c88055c74ac873 Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:19:04 -0400
Subject: [PATCH 1121/1141] Update docs/docs/releases/0.2.0-testing.1.md

Co-authored-by: Brent Moran <brentmoran@gmail.com>
---
 docs/docs/releases/0.2.0-testing.1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index c981756ba0..10c90cbc95 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -83,7 +83,7 @@ Most of our REST API endpoints are now deprecated and will be removed soon. The
 - Implement `schemas.add` RPC method _[#3620](https://github.com/mathesar-foundation/mathesar/pull/3620 "Implement `schemas.add` RPC method")_
 - Implement `table.import` RPC method _[#3623](https://github.com/mathesar-foundation/mathesar/pull/3623 "Implement `table.import` RPC endpoint")_
 - Implement `schemas.patch` RPC method _[#3628](https://github.com/mathesar-foundation/mathesar/pull/3628 "Implement `schemas.patch` RPC method")_
-- Wire RPC functions to new models _[#3632](https://github.com/mathesar-foundation/mathesar/pull/3632 "Wire RPC functions to new models")_
+- Wire RPC methods to new models _[#3632](https://github.com/mathesar-foundation/mathesar/pull/3632 "Wire RPC functions to new models")_
 - Quoting refactor _[#3633](https://github.com/mathesar-foundation/mathesar/pull/3633 "Quoting refactor")_
 - Implement `tables.get_import_preview` RPC endpoint _[#3635](https://github.com/mathesar-foundation/mathesar/pull/3635 "Implement `tables.get_import_preview` RPC endpoint")_
 - Auto generate table name _[#3637](https://github.com/mathesar-foundation/mathesar/pull/3637 "Auto generate table name")_

From fa2f1310ed60e2d628c0872474ee25b04fd83da2 Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:19:17 -0400
Subject: [PATCH 1122/1141] Update docs/docs/releases/0.2.0-testing.1.md

Co-authored-by: Brent Moran <brentmoran@gmail.com>
---
 docs/docs/releases/0.2.0-testing.1.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index 10c90cbc95..f192dad58e 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -44,8 +44,8 @@ More detailed documentation can be found in our User Guide under [Permissions](.
 - Implement `database_privileges.get_owner_oid_and_curr_role_db_priv` RPC method _[#3760](https://github.com/mathesar-foundation/mathesar/pull/3760 "Implement `database_privileges.get_owner_oid_and_curr_role_db_priv` RPC endpoint")_
 - Database page role configuration, collaborators, roles _[#3762](https://github.com/mathesar-foundation/mathesar/pull/3762 "Database page role configuration, collaborators, roles")_
 - Implement `roles.add` RPC endpoint _[#3769](https://github.com/mathesar-foundation/mathesar/pull/3769 "Implement `roles.add` RPC endpoint")_
-- Add `database_privileges.replace_for_roles` RPC function. _[#3781](https://github.com/mathesar-foundation/mathesar/pull/3781 "Add `database_privileges.replace_for_roles` RPC function.")_
-- Add `schema_privileges.replace_for_roles` RPC function _[#3786](https://github.com/mathesar-foundation/mathesar/pull/3786 "Add `schema_privileges.replace_for_roles` RPC function")_
+- Add `database_privileges.replace_for_roles` RPC method. _[#3781](https://github.com/mathesar-foundation/mathesar/pull/3781 "Add `database_privileges.replace_for_roles` RPC function.")_
+- Add `schema_privileges.replace_for_roles` RPC method _[#3786](https://github.com/mathesar-foundation/mathesar/pull/3786 "Add `schema_privileges.replace_for_roles` RPC function")_
 - Move DB page contexts to the route level _[#3789](https://github.com/mathesar-foundation/mathesar/pull/3789 "Move DB page contexts to the route level")_
 - Add privilege information fields _[#3795](https://github.com/mathesar-foundation/mathesar/pull/3795 "Add privilege information fields")_
 - Database permissions modal - 'Share' tab _[#3810](https://github.com/mathesar-foundation/mathesar/pull/3810 "Database permissions modal - 'Share' tab")_

From d4161839f51f3387ff4296d03bd587028f19922a Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:19:29 -0400
Subject: [PATCH 1123/1141] Update docs/docs/releases/0.2.0-testing.1.md

Co-authored-by: Brent Moran <brentmoran@gmail.com>
---
 docs/docs/releases/0.2.0-testing.1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index f192dad58e..87f7e66df5 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -33,7 +33,7 @@ More detailed documentation can be found in our User Guide under [Permissions](.
 
 - Initial permissions remodel _[#3626](https://github.com/mathesar-foundation/mathesar/pull/3626 "Initial permissions remodel")_
 - Implement RPC method for listing roles in server _[#3663](https://github.com/mathesar-foundation/mathesar/pull/3663 "Implement RPC endpoint for listing roles in server")_
-- Initial `database_setup` RPC functions _[#3665](https://github.com/mathesar-foundation/mathesar/pull/3665 "Initial `database_setup` RPC functions")_
+- Initial `database_setup` RPC methods _[#3665](https://github.com/mathesar-foundation/mathesar/pull/3665 "Initial `database_setup` RPC functions")_
 - Cast OID values to bigint in msar.get_roles _[#3667](https://github.com/mathesar-foundation/mathesar/pull/3667 "Cast OID values to bigint in msar.get_roles")_
 - RPC methods for servers, collaborators _[#3684](https://github.com/mathesar-foundation/mathesar/pull/3684 "Endpoints for servers, collaborators")_
 - RPC methods for configured roles _[#3685](https://github.com/mathesar-foundation/mathesar/pull/3685 "Endpoints for configured roles")_

From 10665eb00d478a60df41fa74d6fa81b2903b2cf4 Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:19:45 -0400
Subject: [PATCH 1124/1141] Update docs/docs/releases/0.2.0-testing.1.md

Co-authored-by: Brent Moran <brentmoran@gmail.com>
---
 docs/docs/releases/0.2.0-testing.1.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index 87f7e66df5..6db4766414 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -85,10 +85,10 @@ Most of our REST API endpoints are now deprecated and will be removed soon. The
 - Implement `schemas.patch` RPC method _[#3628](https://github.com/mathesar-foundation/mathesar/pull/3628 "Implement `schemas.patch` RPC method")_
 - Wire RPC methods to new models _[#3632](https://github.com/mathesar-foundation/mathesar/pull/3632 "Wire RPC functions to new models")_
 - Quoting refactor _[#3633](https://github.com/mathesar-foundation/mathesar/pull/3633 "Quoting refactor")_
-- Implement `tables.get_import_preview` RPC endpoint _[#3635](https://github.com/mathesar-foundation/mathesar/pull/3635 "Implement `tables.get_import_preview` RPC endpoint")_
+- Implement `tables.get_import_preview` RPC method _[#3635](https://github.com/mathesar-foundation/mathesar/pull/3635 "Implement `tables.get_import_preview` RPC endpoint")_
 - Auto generate table name _[#3637](https://github.com/mathesar-foundation/mathesar/pull/3637 "Auto generate table name")_
-- Add `columns.metadata.list` RPC function _[#3641](https://github.com/mathesar-foundation/mathesar/pull/3641 "Add `columns.metadata.list` RPC function")_
-- Implement `tables.metadata` `list` & `patch` RPC endpoint _[#3646](https://github.com/mathesar-foundation/mathesar/pull/3646 "Implement `tables.metadata` `list` & `patch` RPC endpoint")_
+- Add `columns.metadata.list` RPC method _[#3641](https://github.com/mathesar-foundation/mathesar/pull/3641 "Add `columns.metadata.list` RPC function")_
+- Implement `tables.metadata` `list` & `patch` RPC method _[#3646](https://github.com/mathesar-foundation/mathesar/pull/3646 "Implement `tables.metadata` `list` & `patch` RPC endpoint")_
 - Fix issue with removing comments on schemas _[#3649](https://github.com/mathesar-foundation/mathesar/pull/3649 "Allow unsetting schema comment using NULL")_
 - Drop old SQL function signature _[#3650](https://github.com/mathesar-foundation/mathesar/pull/3650 "Drop old SQL function signature")_
 - Implement tables list and delete RPC APIs _[#3651](https://github.com/mathesar-foundation/mathesar/pull/3651 "Implement tables list and delete RPC APIs")_

From 0b7a484e3f744c242fd4c077e8e2c749e064bd6c Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:19:54 -0400
Subject: [PATCH 1125/1141] Update docs/docs/releases/0.2.0-testing.1.md

Co-authored-by: Brent Moran <brentmoran@gmail.com>
---
 docs/docs/releases/0.2.0-testing.1.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index 6db4766414..ec208964fc 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -113,9 +113,9 @@ Most of our REST API endpoints are now deprecated and will be removed soon. The
 - Add target_table_info in `tables.list_joinable's` response _[#3718](https://github.com/mathesar-foundation/mathesar/pull/3718 "Add target_table_info in `tables.list_joinable's` response")_
 - Records grouping _[#3721](https://github.com/mathesar-foundation/mathesar/pull/3721 "Records grouping")_
 - Fix "no current database" error _[#3723](https://github.com/mathesar-foundation/mathesar/pull/3723 "Fix 'no current database' error")_
-- Implement explorations `run_saved` & `get` RPC endpoints _[#3725](https://github.com/mathesar-foundation/mathesar/pull/3725 "Implement explorations `run_saved` & `get` RPC endpoints")_
+- Implement explorations `run_saved` & `get` RPC methods _[#3725](https://github.com/mathesar-foundation/mathesar/pull/3725 "Implement explorations `run_saved` & `get` RPC endpoints")_
 - Handle new records filtering on the front end _[#3728](https://github.com/mathesar-foundation/mathesar/pull/3728 "Handle new records filtering on the front end")_
-- Implement explorations `add` & `replace` endpoint _[#3731](https://github.com/mathesar-foundation/mathesar/pull/3731 "Implement explorations `add` & `replace` endpoint")_
+- Implement explorations `add` & `replace` method _[#3731](https://github.com/mathesar-foundation/mathesar/pull/3731 "Implement explorations `add` & `replace` endpoint")_
 - Add `records.get` RPC function _[#3740](https://github.com/mathesar-foundation/mathesar/pull/3740 "Add `records.get` RPC function")_
 - Add `records.delete` RPC function _[#3741](https://github.com/mathesar-foundation/mathesar/pull/3741 "Add `records.delete` RPC function")_
 - Add `records.add` RPC function _[#3745](https://github.com/mathesar-foundation/mathesar/pull/3745 "Add `records.add` RPC function")_

From 9f9971068de8ec3910e3665e2f794084bf5fbdf7 Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:20:06 -0400
Subject: [PATCH 1126/1141] Update docs/docs/releases/0.2.0-testing.1.md

Co-authored-by: Brent Moran <brentmoran@gmail.com>
---
 docs/docs/releases/0.2.0-testing.1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index ec208964fc..79dc71e4ee 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -91,7 +91,7 @@ Most of our REST API endpoints are now deprecated and will be removed soon. The
 - Implement `tables.metadata` `list` & `patch` RPC method _[#3646](https://github.com/mathesar-foundation/mathesar/pull/3646 "Implement `tables.metadata` `list` & `patch` RPC endpoint")_
 - Fix issue with removing comments on schemas _[#3649](https://github.com/mathesar-foundation/mathesar/pull/3649 "Allow unsetting schema comment using NULL")_
 - Drop old SQL function signature _[#3650](https://github.com/mathesar-foundation/mathesar/pull/3650 "Drop old SQL function signature")_
-- Implement tables list and delete RPC APIs _[#3651](https://github.com/mathesar-foundation/mathesar/pull/3651 "Implement tables list and delete RPC APIs")_
+- Implement tables list and delete RPC methods _[#3651](https://github.com/mathesar-foundation/mathesar/pull/3651 "Implement tables list and delete RPC APIs")_
 - Columns meta RPC patch _[#3653](https://github.com/mathesar-foundation/mathesar/pull/3653 "Columns meta RPC patch")_
 - Constraints RPC transition _[#3664](https://github.com/mathesar-foundation/mathesar/pull/3664 "Constraints RPC transition")_
 - Cast OIDs to bigint before putting in JSON _[#3666](https://github.com/mathesar-foundation/mathesar/pull/3666 "Cast OIDs to bigint before putting in JSON")_

From 623dbb1351e91d38beef50138b3c284a5e374aa7 Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:20:18 -0400
Subject: [PATCH 1127/1141] Update docs/docs/releases/0.2.0-testing.1.md

Co-authored-by: Brent Moran <brentmoran@gmail.com>
---
 docs/docs/releases/0.2.0-testing.1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index 79dc71e4ee..fea860a864 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -98,7 +98,7 @@ Most of our REST API endpoints are now deprecated and will be removed soon. The
 - RPC implementation for `tables.list_joinable` _[#3669](https://github.com/mathesar-foundation/mathesar/pull/3669 "RPC implementation for `tables.list_joinable`")_
 - Improve tables metadata _[#3672](https://github.com/mathesar-foundation/mathesar/pull/3672 "Improve tables metadata")_
 - RPC implementation for `types.list` _[#3676](https://github.com/mathesar-foundation/mathesar/pull/3676 "RPC implementation for `types.list`")_
-- Add `records.list` RPC function _[#3691](https://github.com/mathesar-foundation/mathesar/pull/3691 "Add `records.list` RPC function")_
+- Add `records.list` RPC method _[#3691](https://github.com/mathesar-foundation/mathesar/pull/3691 "Add `records.list` RPC function")_
 - RPC transition for explorations `list` and `delete` _[#3694](https://github.com/mathesar-foundation/mathesar/pull/3694 "RPC transition for explorations `list` and `delete`")_
 - Implement `explorations.run` RPC endpoint _[#3696](https://github.com/mathesar-foundation/mathesar/pull/3696 "Implement `explorations.run` RPC endpoint")_
 - Fix return type error when re-defining `get_constraints_for_table` SQL function _[#3698](https://github.com/mathesar-foundation/mathesar/pull/3698 "Fix return type error when re-defining `get_constraints_for_table` SQL function")_

From 3478dee58296364a7c90c896bfa5d75c587fbd5f Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:20:32 -0400
Subject: [PATCH 1128/1141] Update docs/docs/releases/0.2.0-testing.1.md

Co-authored-by: Brent Moran <brentmoran@gmail.com>
---
 docs/docs/releases/0.2.0-testing.1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index fea860a864..b622968465 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -107,7 +107,7 @@ Most of our REST API endpoints are now deprecated and will be removed soon. The
 - Return empty array when schema has no tables _[#3702](https://github.com/mathesar-foundation/mathesar/pull/3702 "Return empty array when schema has no tables")_
 - RPC function for column info with metadata _[#3703](https://github.com/mathesar-foundation/mathesar/pull/3703 "RPC endpoint for column info with metadata")_
 - First steps of RPC implementation for table page _[#3704](https://github.com/mathesar-foundation/mathesar/pull/3704 "First steps of RPC implementation for table page")_
-- Add `records.search` RPC function _[#3708](https://github.com/mathesar-foundation/mathesar/pull/3708 "Add `records.search` RPC function")_
+- Add `records.search` RPC method _[#3708](https://github.com/mathesar-foundation/mathesar/pull/3708 "Add `records.search` RPC function")_
 - Wire up valid_target_type function to column lister _[#3709](https://github.com/mathesar-foundation/mathesar/pull/3709 "Wire up valid_target_type function to column lister")_
 - Alter column metadata fields _[#3717](https://github.com/mathesar-foundation/mathesar/pull/3717 "Alter column metadata fields")_
 - Add target_table_info in `tables.list_joinable's` response _[#3718](https://github.com/mathesar-foundation/mathesar/pull/3718 "Add target_table_info in `tables.list_joinable's` response")_

From f41cc7d594ce56827d7fdf962d2cff1008198347 Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:20:44 -0400
Subject: [PATCH 1129/1141] Update docs/docs/releases/0.2.0-testing.1.md

Co-authored-by: Brent Moran <brentmoran@gmail.com>
---
 docs/docs/releases/0.2.0-testing.1.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index b622968465..25b5900345 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -116,9 +116,9 @@ Most of our REST API endpoints are now deprecated and will be removed soon. The
 - Implement explorations `run_saved` & `get` RPC methods _[#3725](https://github.com/mathesar-foundation/mathesar/pull/3725 "Implement explorations `run_saved` & `get` RPC endpoints")_
 - Handle new records filtering on the front end _[#3728](https://github.com/mathesar-foundation/mathesar/pull/3728 "Handle new records filtering on the front end")_
 - Implement explorations `add` & `replace` method _[#3731](https://github.com/mathesar-foundation/mathesar/pull/3731 "Implement explorations `add` & `replace` endpoint")_
-- Add `records.get` RPC function _[#3740](https://github.com/mathesar-foundation/mathesar/pull/3740 "Add `records.get` RPC function")_
-- Add `records.delete` RPC function _[#3741](https://github.com/mathesar-foundation/mathesar/pull/3741 "Add `records.delete` RPC function")_
-- Add `records.add` RPC function _[#3745](https://github.com/mathesar-foundation/mathesar/pull/3745 "Add `records.add` RPC function")_
+- Add `records.get` RPC method _[#3740](https://github.com/mathesar-foundation/mathesar/pull/3740 "Add `records.get` RPC function")_
+- Add `records.delete` RPC method _[#3741](https://github.com/mathesar-foundation/mathesar/pull/3741 "Add `records.delete` RPC function")_
+- Add `records.add` RPC method _[#3745](https://github.com/mathesar-foundation/mathesar/pull/3745 "Add `records.add` RPC function")_
 - Adapt front end to new RPC-based joinable tables API _[#3746](https://github.com/mathesar-foundation/mathesar/pull/3746 "Adapt front end to new RPC-based joinable tables API")_
 - Fix edge case while getting joinable tables for tables with no links _[#3748](https://github.com/mathesar-foundation/mathesar/pull/3748 "Fix edge case while getting joinable tables for tables with no links")_
 - Add `records.patch` RPC function _[#3749](https://github.com/mathesar-foundation/mathesar/pull/3749 "Add `records.patch` RPC function")_

From aa175f25b389d6d0aa40e9d405ebbd307e01caab Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:20:54 -0400
Subject: [PATCH 1130/1141] Update docs/docs/releases/0.2.0-testing.1.md

Co-authored-by: Brent Moran <brentmoran@gmail.com>
---
 docs/docs/releases/0.2.0-testing.1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index 25b5900345..e1fec0e54a 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -121,7 +121,7 @@ Most of our REST API endpoints are now deprecated and will be removed soon. The
 - Add `records.add` RPC method _[#3745](https://github.com/mathesar-foundation/mathesar/pull/3745 "Add `records.add` RPC function")_
 - Adapt front end to new RPC-based joinable tables API _[#3746](https://github.com/mathesar-foundation/mathesar/pull/3746 "Adapt front end to new RPC-based joinable tables API")_
 - Fix edge case while getting joinable tables for tables with no links _[#3748](https://github.com/mathesar-foundation/mathesar/pull/3748 "Fix edge case while getting joinable tables for tables with no links")_
-- Add `records.patch` RPC function _[#3749](https://github.com/mathesar-foundation/mathesar/pull/3749 "Add `records.patch` RPC function")_
+- Add `records.patch` RPC method _[#3749](https://github.com/mathesar-foundation/mathesar/pull/3749 "Add `records.patch` RPC function")_
 - Records grouping bugfix _[#3751](https://github.com/mathesar-foundation/mathesar/pull/3751 "Records grouping bugfix")_
 - Records delete bugfix _[#3754](https://github.com/mathesar-foundation/mathesar/pull/3754 "Records delete bugfix")_
 - Adapt front end to new records grouping API _[#3755](https://github.com/mathesar-foundation/mathesar/pull/3755 "Adapt front end to new records grouping API")_

From 3448d01bc756c8a38ba52afe6a1cb09f28e27f19 Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:21:06 -0400
Subject: [PATCH 1131/1141] Update docs/docs/releases/0.2.0-testing.1.md

Co-authored-by: Brent Moran <brentmoran@gmail.com>
---
 docs/docs/releases/0.2.0-testing.1.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index e1fec0e54a..7111600234 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -127,12 +127,12 @@ Most of our REST API endpoints are now deprecated and will be removed soon. The
 - Adapt front end to new records grouping API _[#3755](https://github.com/mathesar-foundation/mathesar/pull/3755 "Adapt front end to new records grouping API")_
 - Implement RPC records CRUD operations on front end _[#3759](https://github.com/mathesar-foundation/mathesar/pull/3759 "Implement RPC records CRUD operations on front end")_
 - Add simplified record summaries _[#3761](https://github.com/mathesar-foundation/mathesar/pull/3761 "Add simplified record summaries")_
-- Add link-adding RPC functions _[#3767](https://github.com/mathesar-foundation/mathesar/pull/3767 "Add link-adding RPC functions")_
-- Add `data_modeling.suggest_types` function. _[#3771](https://github.com/mathesar-foundation/mathesar/pull/3771 "Add `data_modeling.suggest_types` function.")_
-- Add `schema_privileges.list_direct` RPC function _[#3782](https://github.com/mathesar-foundation/mathesar/pull/3782 "Add `schema_privileges.list_direct` RPC function")_
-- Add `table_privileges.list_direct` RPC function _[#3783](https://github.com/mathesar-foundation/mathesar/pull/3783 "Add `table_privileges.list_direct` RPC function")_
-- Add `table_privileges.replace_for_roles` RPC function _[#3791](https://github.com/mathesar-foundation/mathesar/pull/3791 "Add `table_privileges.replace_for_roles` RPC function")_
-- Add `roles.get_current_role` RPC function _[#3796](https://github.com/mathesar-foundation/mathesar/pull/3796 "Add `roles.get_current_role` RPC function")_
+- Add link-adding RPC methods _[#3767](https://github.com/mathesar-foundation/mathesar/pull/3767 "Add link-adding RPC functions")_
+- Add `data_modeling.suggest_types` method. _[#3771](https://github.com/mathesar-foundation/mathesar/pull/3771 "Add `data_modeling.suggest_types` function.")_
+- Add `schema_privileges.list_direct` RPC method _[#3782](https://github.com/mathesar-foundation/mathesar/pull/3782 "Add `schema_privileges.list_direct` RPC function")_
+- Add `table_privileges.list_direct` RPC method _[#3783](https://github.com/mathesar-foundation/mathesar/pull/3783 "Add `table_privileges.list_direct` RPC function")_
+- Add `table_privileges.replace_for_roles` RPC method _[#3791](https://github.com/mathesar-foundation/mathesar/pull/3791 "Add `table_privileges.replace_for_roles` RPC function")_
+- Add `roles.get_current_role` RPC method _[#3796](https://github.com/mathesar-foundation/mathesar/pull/3796 "Add `roles.get_current_role` RPC function")_
 - Reorganize namespacing _[#3799](https://github.com/mathesar-foundation/mathesar/pull/3799 "Reorganize namespacing")_
 - Hard-code abstract types response in client _[#3800](https://github.com/mathesar-foundation/mathesar/pull/3800 "Hard-code abstract types response in client")_
 - Change response structure for record summary _[#3802](https://github.com/mathesar-foundation/mathesar/pull/3802 "Change response structure for record summary")_

From 20c56dda107bb902a04a4eedd470a1d65601c5e8 Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:21:18 -0400
Subject: [PATCH 1132/1141] Update docs/docs/releases/0.2.0-testing.1.md

Co-authored-by: Brent Moran <brentmoran@gmail.com>
---
 docs/docs/releases/0.2.0-testing.1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index 7111600234..70f144e9c7 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -136,7 +136,7 @@ Most of our REST API endpoints are now deprecated and will be removed soon. The
 - Reorganize namespacing _[#3799](https://github.com/mathesar-foundation/mathesar/pull/3799 "Reorganize namespacing")_
 - Hard-code abstract types response in client _[#3800](https://github.com/mathesar-foundation/mathesar/pull/3800 "Hard-code abstract types response in client")_
 - Change response structure for record summary _[#3802](https://github.com/mathesar-foundation/mathesar/pull/3802 "Change response structure for record summary")_
-- Implement `data_modeling.split_table` RPC functions _[#3803](https://github.com/mathesar-foundation/mathesar/pull/3803 "Implement `data_modeling.split_table` RPC functions")_
+- Implement `data_modeling.split_table` RPC methods _[#3803](https://github.com/mathesar-foundation/mathesar/pull/3803 "Implement `data_modeling.split_table` RPC functions")_
 - Modify pkey finder to return False when no pkey exists _[#3804](https://github.com/mathesar-foundation/mathesar/pull/3804 "Modify pkey finder to return False when no pkey exists")_
 - Change response for `tables.add` and `tables.import` _[#3807](https://github.com/mathesar-foundation/mathesar/pull/3807 "Change response for `tables.add` and `tables.import`")_
 - Add summaries to self _[#3808](https://github.com/mathesar-foundation/mathesar/pull/3808 "Add summaries to self")_

From 892909653f04f736badae695c97f5f636ef1ef09 Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:21:39 -0400
Subject: [PATCH 1133/1141] Update docs/docs/releases/0.2.0-testing.1.md

Co-authored-by: Brent Moran <brentmoran@gmail.com>
---
 docs/docs/releases/0.2.0-testing.1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index 70f144e9c7..bad0f479be 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -100,7 +100,7 @@ Most of our REST API endpoints are now deprecated and will be removed soon. The
 - RPC implementation for `types.list` _[#3676](https://github.com/mathesar-foundation/mathesar/pull/3676 "RPC implementation for `types.list`")_
 - Add `records.list` RPC method _[#3691](https://github.com/mathesar-foundation/mathesar/pull/3691 "Add `records.list` RPC function")_
 - RPC transition for explorations `list` and `delete` _[#3694](https://github.com/mathesar-foundation/mathesar/pull/3694 "RPC transition for explorations `list` and `delete`")_
-- Implement `explorations.run` RPC endpoint _[#3696](https://github.com/mathesar-foundation/mathesar/pull/3696 "Implement `explorations.run` RPC endpoint")_
+- Implement `explorations.run` RPC method _[#3696](https://github.com/mathesar-foundation/mathesar/pull/3696 "Implement `explorations.run` RPC endpoint")_
 - Fix return type error when re-defining `get_constraints_for_table` SQL function _[#3698](https://github.com/mathesar-foundation/mathesar/pull/3698 "Fix return type error when re-defining `get_constraints_for_table` SQL function")_
 - Fix Issues with `tables.patch` RPC method _[#3699](https://github.com/mathesar-foundation/mathesar/pull/3699 "Fix Issues with `tables.patch` RPC method")_
 - RPC records list filtering _[#3700](https://github.com/mathesar-foundation/mathesar/pull/3700 "RPC records list filtering")_

From b4f153e25b8b28d736473f6b43eec507ca39e3a0 Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:21:55 -0400
Subject: [PATCH 1134/1141] Update docs/docs/releases/0.2.0-testing.1.md

Co-authored-by: Brent Moran <brentmoran@gmail.com>
---
 docs/docs/releases/0.2.0-testing.1.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index bad0f479be..0b0cabf5df 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -143,10 +143,10 @@ Most of our REST API endpoints are now deprecated and will be removed soon. The
 - Move columns SQL _[#3809](https://github.com/mathesar-foundation/mathesar/pull/3809 "Move columns SQL")_
 - Propagate RPC record summary changes to front end _[#3811](https://github.com/mathesar-foundation/mathesar/pull/3811 "Propagate RPC record summary changes to front end")_
 - Add `data_file_id` field to `TableMetaData` _[#3813](https://github.com/mathesar-foundation/mathesar/pull/3813 "Add `data_file_id` field to `TableMetaData`")_
-- Implement `data_modeling.move_columns` RPC endpoint _[#3814](https://github.com/mathesar-foundation/mathesar/pull/3814 "Implement `data_modeling.move_columns` RPC endpoint")_
+- Implement `data_modeling.move_columns` RPC method _[#3814](https://github.com/mathesar-foundation/mathesar/pull/3814 "Implement `data_modeling.move_columns` RPC endpoint")_
 - Get imports working again _[#3819](https://github.com/mathesar-foundation/mathesar/pull/3819 "Get imports working again")_
-- Implement `databases.privileges.transfer_ownership` RPC endpoint _[#3821](https://github.com/mathesar-foundation/mathesar/pull/3821 "Implement `databases.privileges.transfer_ownership` RPC endpoint")_
-- Implement `tables.get_with_metadata` RPC endpoint _[#3823](https://github.com/mathesar-foundation/mathesar/pull/3823 "Implement `tables.get_with_metadata` RPC endpoint")_
+- Implement `databases.privileges.transfer_ownership` RPC method _[#3821](https://github.com/mathesar-foundation/mathesar/pull/3821 "Implement `databases.privileges.transfer_ownership` RPC endpoint")_
+- Implement `tables.get_with_metadata` RPC method _[#3823](https://github.com/mathesar-foundation/mathesar/pull/3823 "Implement `tables.get_with_metadata` RPC endpoint")_
 - Use data file name as table name during import _[#3824](https://github.com/mathesar-foundation/mathesar/pull/3824 "Use data file name as table name during import")_
 - A couple small front end RPC changes _[#3825](https://github.com/mathesar-foundation/mathesar/pull/3825 "A couple small front end RPC changes")_
 - Bugfix listing records from a table with self-Referential FK _[#3831](https://github.com/mathesar-foundation/mathesar/pull/3831 "Bugfix listing records from a table with self-Referential FK")_

From a8e681a59810498ff31dc05be6318a1b7678b89c Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:22:19 -0400
Subject: [PATCH 1135/1141] Update docs/docs/releases/0.2.0-testing.1.md

Co-authored-by: Brent Moran <brentmoran@gmail.com>
---
 docs/docs/releases/0.2.0-testing.1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index 0b0cabf5df..9691fe31ea 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -151,7 +151,7 @@ Most of our REST API endpoints are now deprecated and will be removed soon. The
 - A couple small front end RPC changes _[#3825](https://github.com/mathesar-foundation/mathesar/pull/3825 "A couple small front end RPC changes")_
 - Bugfix listing records from a table with self-Referential FK _[#3831](https://github.com/mathesar-foundation/mathesar/pull/3831 "Bugfix listing records from a table with self-Referential FK")_
 - Hard-code type cast map on front end _[#3832](https://github.com/mathesar-foundation/mathesar/pull/3832 "Hard-code type cast map on front end")_
-- Alter response for schemas `add` and `patch` endpoints & implement `schemas.get` _[#3837](https://github.com/mathesar-foundation/mathesar/pull/3837 "Alter response for schemas `add` and `patch` endpoints & implement `schemas.get`")_
+- Alter response for schemas `add` and `patch` methods & implement `schemas.get` _[#3837](https://github.com/mathesar-foundation/mathesar/pull/3837 "Alter response for schemas `add` and `patch` endpoints & implement `schemas.get`")_
 - Propagate RPC changes to record selector _[#3843](https://github.com/mathesar-foundation/mathesar/pull/3843 "Propagate RPC changes to record selector")_
 - Use RPC API for column metadata _[#3845](https://github.com/mathesar-foundation/mathesar/pull/3845 "Use RPC API for column metadata")_
 - Propagate RPC changes to link table dialog _[#3847](https://github.com/mathesar-foundation/mathesar/pull/3847 "Propagate RPC changes to link table dialog")_

From aed2078af62befe24b0dc77749b85bbc3864b771 Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:22:36 -0400
Subject: [PATCH 1136/1141] Update docs/docs/releases/0.2.0-testing.1.md

Co-authored-by: Brent Moran <brentmoran@gmail.com>
---
 docs/docs/releases/0.2.0-testing.1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/releases/0.2.0-testing.1.md b/docs/docs/releases/0.2.0-testing.1.md
index 9691fe31ea..2ea7fcfcef 100644
--- a/docs/docs/releases/0.2.0-testing.1.md
+++ b/docs/docs/releases/0.2.0-testing.1.md
@@ -161,7 +161,7 @@ Most of our REST API endpoints are now deprecated and will be removed soon. The
 - Enabling running of very simple explorations _[#3855](https://github.com/mathesar-foundation/mathesar/pull/3855 "Enabling running of very simple explorations")_
 - Get "extract columns" and "move columns" functionality working again _[#3856](https://github.com/mathesar-foundation/mathesar/pull/3856 "Get 'extract columns' and 'move columns' functionality working again")_
 - Allow patching records via string PKs _[#3857](https://github.com/mathesar-foundation/mathesar/pull/3857 "Allow patching records via string PKs")_
-- Implement `roles.set_members` RPC endpoint _[#3866](https://github.com/mathesar-foundation/mathesar/pull/3866 "Implement `roles.set_members` RPC endpoint")_
+- Implement `roles.set_members` RPC method _[#3866](https://github.com/mathesar-foundation/mathesar/pull/3866 "Implement `roles.set_members` RPC endpoint")_
 - Fix updating of table name _[#3879](https://github.com/mathesar-foundation/mathesar/pull/3879 "Fix ypdating of table name")_
 - Bugfix summarizations _[#3884](https://github.com/mathesar-foundation/mathesar/pull/3884 "Bugfix summarizations")_
 - Fix insert for table with only ID column _[#3885](https://github.com/mathesar-foundation/mathesar/pull/3885 "Fix insert for table with only ID column")_

From 035c2ce278d7f286470ab85586f58818656a8d0e Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Mon, 14 Oct 2024 09:27:59 -0400
Subject: [PATCH 1137/1141] Add back variable name.

---
 docs/docs/installation/build-from-source/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/installation/build-from-source/index.md b/docs/docs/installation/build-from-source/index.md
index cf57c64c42..0e7aca9966 100644
--- a/docs/docs/installation/build-from-source/index.md
+++ b/docs/docs/installation/build-from-source/index.md
@@ -131,7 +131,7 @@ Then press <kbd>Enter</kbd> to customize this guide with your domain name.
     git clone https://github.com/mathesar-foundation/mathesar.git .
     ```
 
-1. Checkout the tag of the release you'd like to install.
+1. Check out the tag of the release or build you'd like to install, `{{mathesar_version}}`.
 
     ```
     git checkout {{mathesar_version}}

From 993d8ca8260cc0c2341c097ed10d40212503faae Mon Sep 17 00:00:00 2001
From: Anish Umale <umaleanish120@gmail.com>
Date: Mon, 14 Oct 2024 20:24:41 +0530
Subject: [PATCH 1138/1141] use unquoted parent role name for msar.set_members

---
 db/sql/00_msar.sql | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/db/sql/00_msar.sql b/db/sql/00_msar.sql
index 9633e0f710..dea812a9ba 100644
--- a/db/sql/00_msar.sql
+++ b/db/sql/00_msar.sql
@@ -1246,7 +1246,8 @@ Args:
            Membership will be revoked for existing members not present in this array.
 */
 DECLARE
-  parent_role_info jsonb := msar.get_role(parent_rol_id::regrole::text);
+  parent_role_name text := msar.get_role_name(parent_rol_id);
+  parent_role_info jsonb := msar.get_role(parent_role_name);
   all_members_array bigint[];
   revoke_members_array bigint[];
   set_members_expr text;
@@ -1273,7 +1274,7 @@ BEGIN
   );
   EXECUTE set_members_expr;
   -- Return the updated parent_role info including membership details.
-  RETURN msar.get_role(parent_rol_id::regrole::text);
+  RETURN msar.get_role(parent_role_name);
 END;
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 

From 9d4354ecf00676e43ee93737efc6a22218786fd9 Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Tue, 15 Oct 2024 01:01:39 -0400
Subject: [PATCH 1139/1141] Added admonition to installation from scratch page.

---
 docs/docs/installation/build-from-source/index.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/docs/installation/build-from-source/index.md b/docs/docs/installation/build-from-source/index.md
index 0e7aca9966..49b43a651a 100644
--- a/docs/docs/installation/build-from-source/index.md
+++ b/docs/docs/installation/build-from-source/index.md
@@ -1,5 +1,8 @@
 # Install Mathesar from source on Linux
 
+!!! danger "Not a stable release"
+    This is a testing build released with the goal of gathering feedback from our community. It has **[many known issues](https://github.com/mathesar-foundation/mathesar/issues?q=is%3Aissue+milestone%3Av0.2.0-testing.2+)** and is not recommended for production use.
+
 !!! warning "For experienced Linux sysadmins"
     To follow this guide you need be experienced with Linux server administration, including the command line interface and some common utilities.
 

From 75d55696626c88f2fbc2b1409c3884e8c67dbae9 Mon Sep 17 00:00:00 2001
From: Kriti Godey <kriti@kritigodey.com>
Date: Tue, 15 Oct 2024 01:02:27 -0400
Subject: [PATCH 1140/1141] Added admonition to Docker Compose install page.

---
 docs/docs/installation/docker-compose/index.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/docs/installation/docker-compose/index.md b/docs/docs/installation/docker-compose/index.md
index bb9cab73fd..c94849f1d2 100644
--- a/docs/docs/installation/docker-compose/index.md
+++ b/docs/docs/installation/docker-compose/index.md
@@ -1,5 +1,8 @@
 # Install Mathesar via Docker Compose
 
+!!! danger "Not a stable release"
+    This is a testing build released with the goal of gathering feedback from our community. It has **[many known issues](https://github.com/mathesar-foundation/mathesar/issues?q=is%3Aissue+milestone%3Av0.2.0-testing.2+)** and is not recommended for production use.
+
 ## Prerequisites
 
 {% include 'snippets/docker-compose-prerequisites.md' %}

From b1c28c9e3f3fcca07dcc0e1e39613088807db27d Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Wed, 2 Oct 2024 08:38:38 -0400
Subject: [PATCH 1141/1141] Install mike

---
 docs/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 700485f293..d8a12071ad 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,3 +1,4 @@
+mike==2.1.3
 mkdocs==1.4.2
 mkdocs-material==8.5.11
 mkdocs-redirects==1.2.0